From 3a0d8edcb57c25ff23b3e935d5342de2b25b1641 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 25 Mar 2020 19:12:11 +0100 Subject: [PATCH 1/2] rename npm namespace from @spotify-backstage to @backstage --- .eslintrc.js | 6 +++--- docs/getting-started/Plugin development.md | 2 +- docs/getting-started/structure-of-a-plugin.md | 2 +- docs/reference/createPlugin.md | 2 +- package.json | 2 +- packages/app/README.md | 2 +- packages/app/package.json | 10 +++++----- packages/app/src/App.tsx | 2 +- packages/app/src/apis.ts | 2 +- .../app/src/components/ErrorDisplay/ErrorDisplay.tsx | 2 +- packages/app/src/components/Root/Root.tsx | 2 +- packages/app/src/plugins.ts | 4 ++-- packages/cli/package.json | 2 +- .../src/commands/create-plugin/createPlugin.test.ts | 5 ++--- .../cli/src/commands/create-plugin/createPlugin.ts | 6 +++--- packages/cli/src/commands/watch-deps/index.ts | 2 +- packages/cli/templates/default-plugin/package.json.hbs | 4 ++-- .../ExampleComponent/ExampleComponent.test.tsx.hbs | 2 +- .../ExampleComponent/ExampleComponent.tsx.hbs | 2 +- .../ExampleFetchComponent.tsx.hbs | 2 +- .../cli/templates/default-plugin/src/plugin.ts.hbs | 2 +- packages/core/package.json | 4 ++-- plugins/home-page/package.json | 6 +++--- .../src/components/HomePage/HomePage.test.tsx | 2 +- plugins/home-page/src/components/HomePage/HomePage.tsx | 8 +------- .../src/components/HomePage/SquadTechHealth.tsx | 2 +- .../src/components/HomepageTimer/HomepageTimer.tsx | 2 +- plugins/home-page/src/plugin.ts | 2 +- plugins/welcome/package.json | 6 +++--- plugins/welcome/src/components/Timer/Timer.tsx | 2 +- .../src/components/WelcomePage/ErrorButton.test.tsx | 2 +- .../welcome/src/components/WelcomePage/ErrorButton.tsx | 2 +- .../src/components/WelcomePage/WelcomePage.test.tsx | 2 +- .../welcome/src/components/WelcomePage/WelcomePage.tsx | 2 +- plugins/welcome/src/plugin.ts | 2 +- 35 files changed, 51 insertions(+), 58 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index c227c17938..969b6d7d5e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,5 +1,5 @@ -const path = require('path') -const base = require('@spotify-backstage/cli/config/eslint'); +const path = require('path'); +const base = require('@backstage/cli/config/eslint'); module.exports = { ...base, @@ -8,7 +8,7 @@ module.exports = { 'notice/notice': [ 'error', { - templateFile: path.resolve(__dirname, "scripts/copyright.js"), + templateFile: path.resolve(__dirname, 'scripts/copyright.js'), }, ], }, diff --git a/docs/getting-started/Plugin development.md b/docs/getting-started/Plugin development.md index 45cb171ef9..774a02434e 100644 --- a/docs/getting-started/Plugin development.md +++ b/docs/getting-started/Plugin development.md @@ -40,7 +40,7 @@ The app will call the `createPlugin` method on each plugin, passing in a `router of methods on it. ```typescript -import { createPlugin } from '@spotify-backstage/core'; +import { createPlugin } from '@backstage/core'; import ExampleComponent from './components/ExampleComponent'; export default createPlugin({ diff --git a/docs/getting-started/structure-of-a-plugin.md b/docs/getting-started/structure-of-a-plugin.md index c6034261f1..2b31221373 100644 --- a/docs/getting-started/structure-of-a-plugin.md +++ b/docs/getting-started/structure-of-a-plugin.md @@ -43,7 +43,7 @@ In the root folder you have some configuration for typescript and jest, the test In the `src` folder we get to the interesting bits. Check out the `plugin.ts`: ```jsx -import { createPlugin } from '@spotify-backstage/core'; +import { createPlugin } from '@backstage/core'; import ExampleComponent from './components/ExampleComponent'; export default createPlugin({ diff --git a/docs/reference/createPlugin.md b/docs/reference/createPlugin.md index 779e1ef820..77048199ef 100644 --- a/docs/reference/createPlugin.md +++ b/docs/reference/createPlugin.md @@ -26,7 +26,7 @@ type PluginHooks = { Showcasing adding multiple routes and a redirect. ```jsx -import { createPlugin } from '@spotify-backstage/core'; +import { createPlugin } from '@backstage/core'; import ExampleComponent from './components/ExampleComponent'; export default createPlugin({ diff --git a/package.json b/package.json index a25335f659..736da36ac9 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "node": ">=12.0.0" }, "scripts": { - "start": "yarn build && yarn workspace @spotify-backstage/app start", + "start": "yarn build && yarn workspace @backstage/app start", "build": "lerna run build", "test": "cross-env CI=true lerna run test --since origin/master -- --coverage", "create-plugin": "backstage-cli create-plugin", diff --git a/packages/app/README.md b/packages/app/README.md index cabf812650..0e4aa9912e 100644 --- a/packages/app/README.md +++ b/packages/app/README.md @@ -1,3 +1,3 @@ -# @spotify-backstage/app +# @backstage/app This package is an example of a Backstage application. diff --git a/packages/app/package.json b/packages/app/package.json index 4f581599a5..468e2842db 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,15 +1,15 @@ { - "name": "@spotify-backstage/app", + "name": "@backstage/app", "version": "0.0.0", "private": true, "dependencies": { "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", - "@spotify-backstage/cli": "^0.1.0", - "@spotify-backstage/core": "^0.1.0", - "@spotify-backstage/plugin-home-page": "^0.1.0", - "@spotify-backstage/plugin-welcome": "^0.1.0", + "@backstage/cli": "^0.1.0", + "@backstage/core": "^0.1.0", + "@backstage/plugin-home-page": "^0.1.0", + "@backstage/plugin-welcome": "^0.1.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx index 91b588041c..09d7f55094 100644 --- a/packages/app/src/App.tsx +++ b/packages/app/src/App.tsx @@ -15,7 +15,7 @@ */ import { CssBaseline, makeStyles, ThemeProvider } from '@material-ui/core'; -import { BackstageTheme, createApp } from '@spotify-backstage/core'; +import { BackstageTheme, createApp } from '@backstage/core'; import React, { FC } from 'react'; import { BrowserRouter as Router } from 'react-router-dom'; import Root from './components/Root'; diff --git a/packages/app/src/apis.ts b/packages/app/src/apis.ts index 6e2de63795..c3315257d8 100644 --- a/packages/app/src/apis.ts +++ b/packages/app/src/apis.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { ApiHolder, ApiRegistry, errorApiRef } from '@spotify-backstage/core'; +import { ApiHolder, ApiRegistry, errorApiRef } from '@backstage/core'; import { ErrorDisplayForwarder } from './components/ErrorDisplay/ErrorDisplay'; const builder = ApiRegistry.builder(); diff --git a/packages/app/src/components/ErrorDisplay/ErrorDisplay.tsx b/packages/app/src/components/ErrorDisplay/ErrorDisplay.tsx index 307158d88c..25e87c7bff 100644 --- a/packages/app/src/components/ErrorDisplay/ErrorDisplay.tsx +++ b/packages/app/src/components/ErrorDisplay/ErrorDisplay.tsx @@ -18,7 +18,7 @@ import React, { FC, useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { Snackbar } from '@material-ui/core'; import { Alert } from '@material-ui/lab'; -import { ErrorApi, ErrorContext } from '@spotify-backstage/core'; +import { ErrorApi, ErrorContext } from '@backstage/core'; type SubscriberFunc = (error: Error) => void; type Unsubscribe = () => void; diff --git a/packages/app/src/components/Root/Root.tsx b/packages/app/src/components/Root/Root.tsx index 8795b50e1d..920f5c9871 100644 --- a/packages/app/src/components/Root/Root.tsx +++ b/packages/app/src/components/Root/Root.tsx @@ -28,7 +28,7 @@ import { SidebarSpacer, SidebarDivider, SidebarSpace, -} from '@spotify-backstage/core'; +} from '@backstage/core'; const useSidebarLogoStyles = makeStyles({ root: { diff --git a/packages/app/src/plugins.ts b/packages/app/src/plugins.ts index 12bba3ac06..3c757a59c9 100644 --- a/packages/app/src/plugins.ts +++ b/packages/app/src/plugins.ts @@ -1,3 +1,3 @@ /* eslint-disable notice/notice */ -export { default as HomePagePlugin } from '@spotify-backstage/plugin-home-page'; -export { default as WelcomePlugin } from '@spotify-backstage/plugin-welcome'; +export { default as HomePagePlugin } from '@backstage/plugin-home-page'; +export { default as WelcomePlugin } from '@backstage/plugin-welcome'; diff --git a/packages/cli/package.json b/packages/cli/package.json index 1e85c44c97..bf24095c61 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,5 +1,5 @@ { - "name": "@spotify-backstage/cli", + "name": "@backstage/cli", "description": "CLI for developing Backstage plugins and apps", "version": "0.1.0", "private": false, diff --git a/packages/cli/src/commands/create-plugin/createPlugin.test.ts b/packages/cli/src/commands/create-plugin/createPlugin.test.ts index 1d78cb9191..9bf50027e3 100644 --- a/packages/cli/src/commands/create-plugin/createPlugin.test.ts +++ b/packages/cli/src/commands/create-plugin/createPlugin.test.ts @@ -59,9 +59,8 @@ describe('createPlugin', () => { const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'test-')); try { const sourceData = - '{"name": "@spotify-backstage/{{id}}", "version": "{{version}}"}'; - const targetData = - '{"name": "@spotify-backstage/foo", "version": "0.0.0"}'; + '{"name": "@backstage/{{id}}", "version": "{{version}}"}'; + const targetData = '{"name": "@backstage/foo", "version": "0.0.0"}'; const sourcePath = path.join(tempDir, 'in.hbs'); const targetPath = path.join(tempDir, 'out.json'); fs.writeFileSync(sourcePath, sourceData); diff --git a/packages/cli/src/commands/create-plugin/createPlugin.ts b/packages/cli/src/commands/create-plugin/createPlugin.ts index 112377cbda..4d264b01f9 100644 --- a/packages/cli/src/commands/create-plugin/createPlugin.ts +++ b/packages/cli/src/commands/create-plugin/createPlugin.ts @@ -130,7 +130,7 @@ export const addPluginDependencyToApp = ( console.log(); console.log(chalk.green(' Adding plugin as dependency in app:')); - const pluginPackage = `@spotify-backstage/plugin-${pluginName}`; + const pluginPackage = `@backstage/plugin-${pluginName}`; const packageFile = path.join(rootDir, 'packages', 'app', 'package.json'); process.stdout.write( @@ -171,7 +171,7 @@ export const addPluginToApp = (rootDir: string, pluginName: string) => { console.log(); console.log(chalk.green(' Import plugin in app:')); - const pluginPackage = `@spotify-backstage/plugin-${pluginName}`; + const pluginPackage = `@backstage/plugin-${pluginName}`; const pluginNameCapitalized = pluginName .split('-') .map(name => capitalize(name)) @@ -414,7 +414,7 @@ const createPlugin = async () => { console.log( chalk.green( `🥇 Successfully created ${chalk.cyan( - `@spotify-backstage/plugin-${answers.id}`, + `@backstage/plugin-${answers.id}`, )}`, ), ); diff --git a/packages/cli/src/commands/watch-deps/index.ts b/packages/cli/src/commands/watch-deps/index.ts index e5993ae9d6..059c2a7b5e 100644 --- a/packages/cli/src/commands/watch-deps/index.ts +++ b/packages/cli/src/commands/watch-deps/index.ts @@ -26,7 +26,7 @@ import { waitForExit } from '../../helpers/run'; const PACKAGE_BLACKLIST = [ // We never want to watch for changes in the cli, but all packages will depend on it. - '@spotify-backstage/cli', + '@backstage/cli', ]; const WATCH_LOCATIONS = ['package.json', 'src', 'assets']; diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs index d8a303184c..6e416f3287 100644 --- a/packages/cli/templates/default-plugin/package.json.hbs +++ b/packages/cli/templates/default-plugin/package.json.hbs @@ -1,5 +1,5 @@ { - "name": "@spotify-backstage/plugin-{{id}}", + "name": "@backstage/plugin-{{id}}", "version": "{{version}}", "main": "dist/cjs/index.js", "types": "dist/cjs/index.d.ts", @@ -11,7 +11,7 @@ "test": "backstage-cli test" }, "devDependencies": { - "@spotify-backstage/cli": "^{{version}}", + "@backstage/cli": "^{{version}}", "@types/testing-library__jest-dom": "5.0.2", "jest-fetch-mock": "^3.0.3" }, diff --git a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs index 360055dc3d..15db0863d2 100644 --- a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs +++ b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.test.tsx.hbs @@ -19,7 +19,7 @@ import { render } from '@testing-library/react'; import mockFetch from 'jest-fetch-mock'; import ExampleComponent from './ExampleComponent'; import { ThemeProvider } from '@material-ui/core'; -import { BackstageTheme } from '@spotify-backstage/core'; +import { BackstageTheme } from '@backstage/core'; describe('ExampleComponent', () => { it('should render', () => { diff --git a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.tsx.hbs b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.tsx.hbs index b5c56422da..b96c970022 100644 --- a/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.tsx.hbs +++ b/packages/cli/templates/default-plugin/src/components/ExampleComponent/ExampleComponent.tsx.hbs @@ -25,7 +25,7 @@ import { ContentHeader, HeaderLabel, SupportButton, -} from '@spotify-backstage/core'; +} from '@backstage/core'; import ExampleFetchComponent from '../ExampleFetchComponent'; const ExampleComponent: FC<{}> = () => ( diff --git a/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.tsx.hbs b/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.tsx.hbs index 4801dea6dd..3420cc9d5a 100644 --- a/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.tsx.hbs +++ b/packages/cli/templates/default-plugin/src/components/ExampleFetchComponent/ExampleFetchComponent.tsx.hbs @@ -25,7 +25,7 @@ import TableHead from '@material-ui/core/TableHead'; import TableRow from '@material-ui/core/TableRow'; import Alert from '@material-ui/lab/Alert'; import { useAsync } from 'react-use'; -import { Progress } from '@spotify-backstage/core'; +import { Progress } from '@backstage/core'; const useStyles = makeStyles({ table: { diff --git a/packages/cli/templates/default-plugin/src/plugin.ts.hbs b/packages/cli/templates/default-plugin/src/plugin.ts.hbs index ccac096007..bb0b93ca25 100644 --- a/packages/cli/templates/default-plugin/src/plugin.ts.hbs +++ b/packages/cli/templates/default-plugin/src/plugin.ts.hbs @@ -14,7 +14,7 @@ * limitations under the License. */ -import { createPlugin } from '@spotify-backstage/core'; +import { createPlugin } from '@backstage/core'; import ExampleComponent from './components/ExampleComponent'; export default createPlugin({ diff --git a/packages/core/package.json b/packages/core/package.json index b18705316c..48bbe83cd6 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,5 +1,5 @@ { - "name": "@spotify-backstage/core", + "name": "@backstage/core", "description": "Core API used by Backstage plugins and apps", "version": "0.1.0", "private": false, @@ -42,7 +42,7 @@ "recompose": "0.30.0" }, "devDependencies": { - "@spotify-backstage/cli": "^0.1.0", + "@backstage/cli": "^0.1.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", diff --git a/plugins/home-page/package.json b/plugins/home-page/package.json index 5869b5fde0..2116215e94 100644 --- a/plugins/home-page/package.json +++ b/plugins/home-page/package.json @@ -1,12 +1,12 @@ { - "name": "@spotify-backstage/plugin-home-page", + "name": "@backstage/plugin-home-page", "version": "0.1.0", "main": "dist/cjs/index.js", "types": "dist/cjs/index.d.ts", "private": true, "devDependencies": { - "@spotify-backstage/cli": "^0.1.0", - "@spotify-backstage/core": "^0.1.0", + "@backstage/cli": "^0.1.0", + "@backstage/core": "^0.1.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", diff --git a/plugins/home-page/src/components/HomePage/HomePage.test.tsx b/plugins/home-page/src/components/HomePage/HomePage.test.tsx index 500d53397a..6b2c1bfd11 100644 --- a/plugins/home-page/src/components/HomePage/HomePage.test.tsx +++ b/plugins/home-page/src/components/HomePage/HomePage.test.tsx @@ -18,7 +18,7 @@ import React from 'react'; import { render } from '@testing-library/react'; import HomePage from './HomePage'; import { ThemeProvider } from '@material-ui/core'; -import { BackstageTheme } from '@spotify-backstage/core'; +import { BackstageTheme } from '@backstage/core'; describe('HomePage', () => { it('should render', () => { diff --git a/plugins/home-page/src/components/HomePage/HomePage.tsx b/plugins/home-page/src/components/HomePage/HomePage.tsx index f340b682fa..3ca572b367 100644 --- a/plugins/home-page/src/components/HomePage/HomePage.tsx +++ b/plugins/home-page/src/components/HomePage/HomePage.tsx @@ -17,13 +17,7 @@ import React, { FC } from 'react'; import { Typography, Link, Grid } from '@material-ui/core'; import HomePageTimer from '../HomepageTimer'; -import { - Content, - InfoCard, - Header, - Page, - pageTheme, -} from '@spotify-backstage/core'; +import { Content, InfoCard, Header, Page, pageTheme } from '@backstage/core'; import SquadTechHealth from './SquadTechHealth'; import Table from '@material-ui/core/Table'; import TableBody from '@material-ui/core/TableBody'; diff --git a/plugins/home-page/src/components/HomePage/SquadTechHealth.tsx b/plugins/home-page/src/components/HomePage/SquadTechHealth.tsx index 320205367c..c4e55c4dd5 100644 --- a/plugins/home-page/src/components/HomePage/SquadTechHealth.tsx +++ b/plugins/home-page/src/components/HomePage/SquadTechHealth.tsx @@ -17,7 +17,7 @@ import React, { FC } from 'react'; import { Grid, Typography } from '@material-ui/core'; -import { HorizontalScrollGrid, ProgressCard } from '@spotify-backstage/core'; +import { HorizontalScrollGrid, ProgressCard } from '@backstage/core'; const SquadTechHealth: FC<{}> = () => { return ( diff --git a/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx b/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx index 3407da4012..770f98e762 100644 --- a/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx +++ b/plugins/home-page/src/components/HomepageTimer/HomepageTimer.tsx @@ -15,7 +15,7 @@ */ import React, { FC } from 'react'; -import { HeaderLabel } from '@spotify-backstage/core'; +import { HeaderLabel } from '@backstage/core'; const timeFormat = { hour: '2-digit', minute: '2-digit' }; const utcOptions = { timeZone: 'UTC', ...timeFormat }; diff --git a/plugins/home-page/src/plugin.ts b/plugins/home-page/src/plugin.ts index 0ace719780..17eb89eb35 100644 --- a/plugins/home-page/src/plugin.ts +++ b/plugins/home-page/src/plugin.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { createPlugin } from '@spotify-backstage/core'; +import { createPlugin } from '@backstage/core'; import HomePage from './components/HomePage'; export default createPlugin({ diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json index 734ba4fea6..47d8be7033 100644 --- a/plugins/welcome/package.json +++ b/plugins/welcome/package.json @@ -1,5 +1,5 @@ { - "name": "@spotify-backstage/plugin-welcome", + "name": "@backstage/plugin-welcome", "version": "0.1.0", "main": "dist/cjs/index.js", "types": "dist/cjs/index.d.ts", @@ -11,8 +11,8 @@ "test": "backstage-cli test" }, "devDependencies": { - "@spotify-backstage/core": "^0.1.0", - "@spotify-backstage/cli": "^0.1.0", + "@backstage/core": "^0.1.0", + "@backstage/cli": "^0.1.0", "@types/testing-library__jest-dom": "5.0.2" }, "dependencies": { diff --git a/plugins/welcome/src/components/Timer/Timer.tsx b/plugins/welcome/src/components/Timer/Timer.tsx index 3407da4012..770f98e762 100644 --- a/plugins/welcome/src/components/Timer/Timer.tsx +++ b/plugins/welcome/src/components/Timer/Timer.tsx @@ -15,7 +15,7 @@ */ import React, { FC } from 'react'; -import { HeaderLabel } from '@spotify-backstage/core'; +import { HeaderLabel } from '@backstage/core'; const timeFormat = { hour: '2-digit', minute: '2-digit' }; const utcOptions = { timeZone: 'UTC', ...timeFormat }; diff --git a/plugins/welcome/src/components/WelcomePage/ErrorButton.test.tsx b/plugins/welcome/src/components/WelcomePage/ErrorButton.test.tsx index 791937a3b5..6a91a6c202 100644 --- a/plugins/welcome/src/components/WelcomePage/ErrorButton.test.tsx +++ b/plugins/welcome/src/components/WelcomePage/ErrorButton.test.tsx @@ -17,7 +17,7 @@ import React from 'react'; import { render, fireEvent } from '@testing-library/react'; import ErrorButton from './ErrorButton'; -import { ApiRegistry, errorApiRef, ApiProvider } from '@spotify-backstage/core'; +import { ApiRegistry, errorApiRef, ApiProvider } from '@backstage/core'; describe('ErrorButton', () => { it('should trigger an error', () => { diff --git a/plugins/welcome/src/components/WelcomePage/ErrorButton.tsx b/plugins/welcome/src/components/WelcomePage/ErrorButton.tsx index fa73115d18..390c434633 100644 --- a/plugins/welcome/src/components/WelcomePage/ErrorButton.tsx +++ b/plugins/welcome/src/components/WelcomePage/ErrorButton.tsx @@ -16,7 +16,7 @@ import React, { FC } from 'react'; import { Button } from '@material-ui/core'; -import { errorApiRef, useApi } from '@spotify-backstage/core'; +import { errorApiRef, useApi } from '@backstage/core'; const ErrorButton: FC<{}> = () => { const errorApi = useApi(errorApiRef); diff --git a/plugins/welcome/src/components/WelcomePage/WelcomePage.test.tsx b/plugins/welcome/src/components/WelcomePage/WelcomePage.test.tsx index 9787fa2a9a..b4139e4ed3 100644 --- a/plugins/welcome/src/components/WelcomePage/WelcomePage.test.tsx +++ b/plugins/welcome/src/components/WelcomePage/WelcomePage.test.tsx @@ -23,7 +23,7 @@ import { ApiProvider, ApiRegistry, errorApiRef, -} from '@spotify-backstage/core'; +} from '@backstage/core'; describe('WelcomePage', () => { it('should render', () => { diff --git a/plugins/welcome/src/components/WelcomePage/WelcomePage.tsx b/plugins/welcome/src/components/WelcomePage/WelcomePage.tsx index 755e19e0ff..69a892a95e 100644 --- a/plugins/welcome/src/components/WelcomePage/WelcomePage.tsx +++ b/plugins/welcome/src/components/WelcomePage/WelcomePage.tsx @@ -33,7 +33,7 @@ import { pageTheme, ContentHeader, SupportButton, -} from '@spotify-backstage/core'; +} from '@backstage/core'; import ErrorButton from './ErrorButton'; const WelcomePage: FC<{}> = () => { diff --git a/plugins/welcome/src/plugin.ts b/plugins/welcome/src/plugin.ts index bdc74209a7..20ec41d4c2 100644 --- a/plugins/welcome/src/plugin.ts +++ b/plugins/welcome/src/plugin.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { createPlugin } from '@spotify-backstage/core'; +import { createPlugin } from '@backstage/core'; import WelcomePage from './components/WelcomePage'; export default createPlugin({ From 019032a7a3db535177a21b21c0162413c46e72c2 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 25 Mar 2020 19:13:14 +0100 Subject: [PATCH 2/2] v0.1.1-alpha.0 --- lerna.json | 7 +++++-- packages/app/package.json | 10 +++++----- packages/cli/package.json | 5 +---- packages/core/package.json | 7 ++----- plugins/home-page/package.json | 12 ++++++------ plugins/welcome/package.json | 6 +++--- 6 files changed, 22 insertions(+), 25 deletions(-) diff --git a/lerna.json b/lerna.json index 322929db1d..1002c5f9be 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,9 @@ { - "packages": ["packages/*", "plugins/*"], + "packages": [ + "packages/*", + "plugins/*" + ], "npmClient": "yarn", "useWorkspaces": true, - "version": "0.1.0" + "version": "0.1.1-alpha.0" } diff --git a/packages/app/package.json b/packages/app/package.json index 468e2842db..2aa2c1312e 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,15 +1,15 @@ { "name": "@backstage/app", - "version": "0.0.0", + "version": "0.1.1-alpha.0", "private": true, "dependencies": { + "@backstage/cli": "^0.1.1-alpha.0", + "@backstage/core": "^0.1.1-alpha.0", + "@backstage/plugin-home-page": "^0.1.1-alpha.0", + "@backstage/plugin-welcome": "^0.1.1-alpha.0", "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", - "@backstage/cli": "^0.1.0", - "@backstage/core": "^0.1.0", - "@backstage/plugin-home-page": "^0.1.0", - "@backstage/plugin-welcome": "^0.1.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", diff --git a/packages/cli/package.json b/packages/cli/package.json index bf24095c61..f26b13a421 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/cli", "description": "CLI for developing Backstage plugins and apps", - "version": "0.1.0", + "version": "0.1.1-alpha.0", "private": false, "publishConfig": { "access": "public" @@ -24,9 +24,6 @@ "test": "backstage-cli test", "start": "nodemon ." }, - "publishConfig": { - "access": "public" - }, "devDependencies": { "@types/fs-extra": "^8.1.0", "@types/html-webpack-plugin": "^3.2.2", diff --git a/packages/core/package.json b/packages/core/package.json index 48bbe83cd6..8adb1307fe 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/core", "description": "Core API used by Backstage plugins and apps", - "version": "0.1.0", + "version": "0.1.1-alpha.0", "private": false, "publishConfig": { "access": "public" @@ -23,9 +23,6 @@ "lint": "backstage-cli lint", "test": "backstage-cli test" }, - "publishConfig": { - "access": "public" - }, "dependencies": { "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", @@ -42,7 +39,7 @@ "recompose": "0.30.0" }, "devDependencies": { - "@backstage/cli": "^0.1.0", + "@backstage/cli": "^0.1.1-alpha.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", diff --git a/plugins/home-page/package.json b/plugins/home-page/package.json index 2116215e94..33be457cba 100644 --- a/plugins/home-page/package.json +++ b/plugins/home-page/package.json @@ -1,12 +1,14 @@ { "name": "@backstage/plugin-home-page", - "version": "0.1.0", + "version": "0.1.1-alpha.0", "main": "dist/cjs/index.js", "types": "dist/cjs/index.d.ts", "private": true, "devDependencies": { - "@backstage/cli": "^0.1.0", - "@backstage/core": "^0.1.0", + "@backstage/cli": "^0.1.1-alpha.0", + "@backstage/core": "^0.1.1-alpha.0", + "@material-ui/core": "^4.9.1", + "@material-ui/icons": "^4.9.1", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", @@ -14,9 +16,7 @@ "@types/node": "^12.0.0", "@types/testing-library__jest-dom": "5.0.2", "react": "^16.12.0", - "react-dom": "^16.12.0", - "@material-ui/core": "^4.9.1", - "@material-ui/icons": "^4.9.1" + "react-dom": "^16.12.0" }, "scripts": { "build": "backstage-cli plugin:build", diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json index 47d8be7033..b38977afab 100644 --- a/plugins/welcome/package.json +++ b/plugins/welcome/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-welcome", - "version": "0.1.0", + "version": "0.1.1-alpha.0", "main": "dist/cjs/index.js", "types": "dist/cjs/index.d.ts", "license": "Apache-2.0", @@ -11,8 +11,8 @@ "test": "backstage-cli test" }, "devDependencies": { - "@backstage/core": "^0.1.0", - "@backstage/cli": "^0.1.0", + "@backstage/cli": "^0.1.1-alpha.0", + "@backstage/core": "^0.1.1-alpha.0", "@types/testing-library__jest-dom": "5.0.2" }, "dependencies": {