diff --git a/docs/design.md b/docs/design.md index e1a2af84b1..a75227b0cd 100644 --- a/docs/design.md +++ b/docs/design.md @@ -19,11 +19,21 @@ There are a lot of exciting things coming up and we want to keep you in the loop ## ๐Ÿ›  Our Practice The chart below details how we work. ***Stay tuned***: We are currently in the process of securing a Figma workspace for Backstage Open Source, and we plan on referencing Figma documents to share specs and prototypes with the community. +### Creating a New Design Component | Step 1 | Step 2 | Step 3 | Step 4 | Step 5 | Step 6 | |:---|:---|:---|:---|:---|:---| | Platform design team submits an issue to **spotify/Backstage GitHub** with a potential component. | Backstage community offers feedback or approval on **spotify/Backstage GitHub**. | Platform design team adjusts accordingly (as they see fit) and update the Figma DLS document. | Designed component is added to **spotify/Backstage GitHub** as an issue. | External or internal Backstage open source contributors build the component. | External or internal contributors add the component to the **Backstage Storybook**. ๐ŸŽ‰ | +### Building for Backstage +| Step 1 | Step 2 | Step 3 | Step 4 | +|:---|:---|:---|:---| +| External or internal contributors use Backstage and come up with an idea of an entity to build for Backstage. |External or internal contributors refer to the Backstage Open Source design system documentation in the Figma DLS document. | External or internal contributors leverage the components and tokens from the Backstage Storybook. | External or internal contributors build their Backstage entity. | + +| Step 5 | Step 6 | Step 7 | Step 8 | +|:---|:---|:---|:---| +| External or internal contributors make a pull request for their entity on spotify/Backstage GitHub for review. | Platform designers and devs review the entity and submit feedback or approval on spotify/Backstage GitHub. | External or internal contributors make the changes, pull request is approved and the entity is merged. Itโ€™s live on Backstage! ๐ŸŽ‰ | If the entity happens to be or include a UX component, itโ€™s added to Backstage Storybook as well. | + The following diagram shows the relationship between the Backstage Design System and our foundation, which comprises of [Material UI](https://material-ui.com/) that is shaped by user experience and user interface decisions made by our Backstage Design Team. Also note, we encourage you to take the core experience weโ€™ve crafted and add custom theming to better represent your organization! diff --git a/docs/designheader.png b/docs/designheader.png new file mode 100644 index 0000000000..e9ace5c2e7 Binary files /dev/null and b/docs/designheader.png differ diff --git a/lerna.json b/lerna.json index 7a9ee6a4cb..2cc439d190 100644 --- a/lerna.json +++ b/lerna.json @@ -5,5 +5,5 @@ ], "npmClient": "yarn", "useWorkspaces": true, - "version": "0.1.1-alpha.2" + "version": "0.1.1-alpha.3" } diff --git a/packages/app/package.json b/packages/app/package.json index e24ac9688c..0d7d29e480 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,13 +1,13 @@ { "name": "example-app", - "version": "0.1.1-alpha.2", + "version": "0.1.1-alpha.3", "private": true, "dependencies": { - "@backstage/cli": "^0.1.1-alpha.2", - "@backstage/core": "^0.1.1-alpha.2", - "@backstage/theme": "^0.1.1-alpha.2", - "@backstage/plugin-home-page": "^0.1.1-alpha.2", - "@backstage/plugin-welcome": "^0.1.1-alpha.2", + "@backstage/cli": "^0.1.1-alpha.3", + "@backstage/core": "^0.1.1-alpha.3", + "@backstage/plugin-home-page": "^0.1.1-alpha.3", + "@backstage/plugin-welcome": "^0.1.1-alpha.3", + "@backstage/theme": "^0.1.1-alpha.3", "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.45", diff --git a/packages/cli/package.json b/packages/cli/package.json index 40b5d78040..1764d19bf2 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.1-alpha.2", + "version": "0.1.1-alpha.3", "private": false, "publishConfig": { "access": "public" diff --git a/packages/cli/src/commands/create-app/createApp.ts b/packages/cli/src/commands/create-app/createApp.ts index 826f9866d2..5863d9e705 100644 --- a/packages/cli/src/commands/create-app/createApp.ts +++ b/packages/cli/src/commands/create-app/createApp.ts @@ -57,11 +57,11 @@ async function cleanUp(tempDir: string) { }); } -async function buildApp(pluginFolder: string) { +async function buildApp(appFolder: string) { const commands = ['yarn install', 'yarn build']; for (const command of commands) { await Task.forItem('executing', command, async () => { - process.chdir(pluginFolder); + process.chdir(appFolder); await exec(command).catch(error => { process.stdout.write(error.stderr); @@ -80,7 +80,7 @@ export async function moveApp( await Task.forItem('moving', id, async () => { await fs.move(tempDir, destination).catch(error => { throw new Error( - `Failed to move plugin from ${tempDir} to ${destination}: ${error.message}`, + `Failed to move app from ${tempDir} to ${destination}: ${error.message}`, ); }); }); @@ -97,7 +97,7 @@ export default async () => { return chalk.red('Please enter a name for the app'); } else if (!/^[a-z0-9]+(-[a-z0-9]+)*$/.test(value)) { return chalk.red( - 'Plugin name must be kebab-cased and contain only letters, digits, and dashes.', + 'App name must be kebab-cased and contain only letters, digits, and dashes.', ); } return true; diff --git a/packages/cli/templates/default-app/plugins/welcome/tsconfig.json b/packages/cli/templates/default-app/plugins/welcome/tsconfig.json index 596e2cf729..7b73db2f0f 100644 --- a/packages/cli/templates/default-app/plugins/welcome/tsconfig.json +++ b/packages/cli/templates/default-app/plugins/welcome/tsconfig.json @@ -1,4 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src"] + "include": ["src"], + "compilerOptions": { + "baseUrl": "src" + } } diff --git a/packages/cli/templates/default-plugin/tsconfig.json b/packages/cli/templates/default-plugin/tsconfig.json index 596e2cf729..7b73db2f0f 100644 --- a/packages/cli/templates/default-plugin/tsconfig.json +++ b/packages/cli/templates/default-plugin/tsconfig.json @@ -1,4 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src"] + "include": ["src"], + "compilerOptions": { + "baseUrl": "src" + } } diff --git a/packages/core/package.json b/packages/core/package.json index 85054eba14..cc30222cf4 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.1-alpha.2", + "version": "0.1.1-alpha.3", "private": false, "publishConfig": { "access": "public" @@ -41,9 +41,9 @@ "recompose": "0.30.0" }, "devDependencies": { - "@backstage/cli": "^0.1.1-alpha.2", - "@backstage/test-utils": "^0.1.1-alpha.2", - "@backstage/theme": "^0.1.1-alpha.2", + "@backstage/cli": "^0.1.1-alpha.3", + "@backstage/test-utils": "^0.1.1-alpha.3", + "@backstage/theme": "^0.1.1-alpha.3", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", diff --git a/packages/core/src/api/apis/definitions/featureFlags.ts b/packages/core/src/api/apis/definitions/featureFlags.ts index 926fe091d5..5d6a134f84 100644 --- a/packages/core/src/api/apis/definitions/featureFlags.ts +++ b/packages/core/src/api/apis/definitions/featureFlags.ts @@ -19,7 +19,7 @@ import { UserFlags, FeatureFlagsRegistry, FeatureFlagsRegistryItem, -} from '../../app/FeatureFlags'; +} from 'api/app/FeatureFlags'; /** * The feature flags API is used to toggle functionality to users across plugins and Backstage. diff --git a/packages/core/src/api/app/AppBuilder.tsx b/packages/core/src/api/app/AppBuilder.tsx index 23d0e17672..ccc1303ccb 100644 --- a/packages/core/src/api/app/AppBuilder.tsx +++ b/packages/core/src/api/app/AppBuilder.tsx @@ -18,16 +18,16 @@ import React, { ComponentType } from 'react'; import { Route, Switch, Redirect } from 'react-router-dom'; import { AppContextProvider } from './AppContext'; import { App } from './types'; -import BackstagePlugin from '../plugin/Plugin'; +import BackstagePlugin from 'api/plugin/Plugin'; import { FeatureFlagsRegistryItem } from './FeatureFlags'; -import { featureFlagsApiRef } from '../apis/definitions/featureFlags'; +import { featureFlagsApiRef } from 'api/apis/definitions/featureFlags'; import { IconComponent, SystemIcons, SystemIconKey, defaultSystemIcons, -} from '../../icons'; -import { ApiHolder, ApiProvider } from '../apis'; +} from 'icons'; +import { ApiHolder, ApiProvider } from 'api/apis'; import LoginPage from './LoginPage'; class AppImpl implements App { diff --git a/packages/core/src/api/app/FeatureFlags.test.tsx b/packages/core/src/api/app/FeatureFlags.test.tsx index b5bbb4d68e..cc09ebc61d 100644 --- a/packages/core/src/api/app/FeatureFlags.test.tsx +++ b/packages/core/src/api/app/FeatureFlags.test.tsx @@ -15,7 +15,7 @@ */ import { FeatureFlags as FeatureFlagsImpl } from './FeatureFlags'; -import { FeatureFlagState } from '../apis/definitions/featureFlags'; +import { FeatureFlagState } from 'api/apis/definitions/featureFlags'; describe('FeatureFlags', () => { beforeEach(() => { diff --git a/packages/core/src/api/app/FeatureFlags.tsx b/packages/core/src/api/app/FeatureFlags.tsx index 8e5a06b209..fcbefedb3e 100644 --- a/packages/core/src/api/app/FeatureFlags.tsx +++ b/packages/core/src/api/app/FeatureFlags.tsx @@ -14,11 +14,11 @@ * limitations under the License. */ -import { FeatureFlagName } from '../plugin/types'; +import { FeatureFlagName } from 'api/plugin/types'; import { FeatureFlagState, FeatureFlagsApi, -} from '../apis/definitions/featureFlags'; +} from 'api/apis/definitions/featureFlags'; /** * Helper method for validating compatibility and flag name. diff --git a/packages/core/src/api/app/LoginPage/LoginPage.tsx b/packages/core/src/api/app/LoginPage/LoginPage.tsx index 7352600f63..9176c4c522 100644 --- a/packages/core/src/api/app/LoginPage/LoginPage.tsx +++ b/packages/core/src/api/app/LoginPage/LoginPage.tsx @@ -16,10 +16,10 @@ import React, { FC, useState } from 'react'; import { GitHub as GitHubIcon } from '@material-ui/icons'; -import Page from '../../../layout/Page'; -import Header from '../../../layout/Header'; -import Content from '../../../layout/Content/Content'; -import ContentHeader from '../../../layout/ContentHeader/ContentHeader'; +import Page from 'layout/Page'; +import Header from 'layout/Header'; +import Content from 'layout/Content/Content'; +import ContentHeader from 'layout/ContentHeader/ContentHeader'; import { Grid, Typography, @@ -29,7 +29,7 @@ import { ListItem, Link, } from '@material-ui/core'; -import InfoCard from '../../../layout/InfoCard/InfoCard'; +import InfoCard from 'layout/InfoCard/InfoCard'; enum AuthType { GitHub, diff --git a/packages/core/src/api/app/types.ts b/packages/core/src/api/app/types.ts index 4a6efe66fb..cc54cef606 100644 --- a/packages/core/src/api/app/types.ts +++ b/packages/core/src/api/app/types.ts @@ -15,7 +15,7 @@ */ import { ComponentType } from 'react'; -import { IconComponent, SystemIconKey } from '../../icons'; +import { IconComponent, SystemIconKey } from 'icons'; export type App = { getSystemIcon(key: SystemIconKey): IconComponent; diff --git a/packages/core/src/api/plugin/Plugin.tsx b/packages/core/src/api/plugin/Plugin.tsx index aade5d0092..47f8331e10 100644 --- a/packages/core/src/api/plugin/Plugin.tsx +++ b/packages/core/src/api/plugin/Plugin.tsx @@ -21,8 +21,8 @@ import { RouteOptions, FeatureFlagName, } from './types'; -import { validateBrowserCompat, validateFlagName } from '../app/FeatureFlags'; -import { Widget } from '../widgetView/types'; +import { validateBrowserCompat, validateFlagName } from 'api/app/FeatureFlags'; +import { Widget } from 'api/widgetView/types'; export type PluginConfig = { id: string; diff --git a/packages/core/src/api/plugin/types.ts b/packages/core/src/api/plugin/types.ts index b006e06d9a..3192dfd095 100644 --- a/packages/core/src/api/plugin/types.ts +++ b/packages/core/src/api/plugin/types.ts @@ -15,7 +15,7 @@ */ import { ComponentType } from 'react'; -import { Widget } from '../widgetView/types'; +import { Widget } from 'api/widgetView/types'; export type RouteOptions = { // Whether the route path must match exactly, defaults to true. diff --git a/packages/core/src/api/widgetView/WidgetViewBuilder.tsx b/packages/core/src/api/widgetView/WidgetViewBuilder.tsx index fb26eadbe3..0bf873df86 100644 --- a/packages/core/src/api/widgetView/WidgetViewBuilder.tsx +++ b/packages/core/src/api/widgetView/WidgetViewBuilder.tsx @@ -15,10 +15,10 @@ */ import React, { ComponentType } from 'react'; -import { AppComponentBuilder } from '../app/types'; +import { AppComponentBuilder } from 'api/app/types'; import { Widget } from './types'; -import BackstagePlugin from '../plugin/Plugin'; -import DefaultWidgetView from '../../components/DefaultWidgetView'; +import BackstagePlugin from 'api/plugin/Plugin'; +import DefaultWidgetView from 'components/DefaultWidgetView'; type WidgetViewRegistration = | { diff --git a/packages/core/src/components/DefaultWidgetView/DefaultWidgetView.tsx b/packages/core/src/components/DefaultWidgetView/DefaultWidgetView.tsx index 26246d5341..990ecb0e92 100644 --- a/packages/core/src/components/DefaultWidgetView/DefaultWidgetView.tsx +++ b/packages/core/src/components/DefaultWidgetView/DefaultWidgetView.tsx @@ -16,7 +16,7 @@ import React, { FC } from 'react'; import { Grid, Paper, makeStyles, Theme } from '@material-ui/core'; -import { WidgetViewProps } from '../../api/widgetView/types'; +import { WidgetViewProps } from 'api/widgetView/types'; const useStyles = makeStyles(theme => ({ root: { diff --git a/packages/core/src/components/ProgressCard.tsx b/packages/core/src/components/ProgressCard.tsx index ef84c40499..1964f382e9 100644 --- a/packages/core/src/components/ProgressCard.tsx +++ b/packages/core/src/components/ProgressCard.tsx @@ -17,8 +17,8 @@ import React, { FC } from 'react'; import { makeStyles } from '@material-ui/core'; -import InfoCard from '../layout/InfoCard'; -import { Props as BottomLinkProps } from '../layout/InfoCard/BottomLink'; +import InfoCard from 'layout/InfoCard'; +import { Props as BottomLinkProps } from 'layout/InfoCard/BottomLink'; import CircleProgress from './CircleProgress'; type Props = { diff --git a/packages/core/src/icons/icons.tsx b/packages/core/src/icons/icons.tsx index 454a10c264..a8debf56b4 100644 --- a/packages/core/src/icons/icons.tsx +++ b/packages/core/src/icons/icons.tsx @@ -18,7 +18,7 @@ import { SvgIconProps } from '@material-ui/core'; import PeopleIcon from '@material-ui/icons/People'; import PersonIcon from '@material-ui/icons/Person'; import React, { FC } from 'react'; -import { useApp } from '../api/app/AppContext'; +import { useApp } from 'api/app/AppContext'; import { IconComponent, SystemIconKey, SystemIcons } from './types'; export const defaultSystemIcons: SystemIcons = { diff --git a/packages/core/src/layout/Header/Header.tsx b/packages/core/src/layout/Header/Header.tsx index 6af4019d13..5ed929d9a0 100644 --- a/packages/core/src/layout/Header/Header.tsx +++ b/packages/core/src/layout/Header/Header.tsx @@ -19,7 +19,7 @@ import Helmet from 'react-helmet'; import { Typography, Tooltip, makeStyles } from '@material-ui/core'; import { BackstageTheme } from '@backstage/theme'; -import { Theme } from '../Page/Page'; +import { Theme } from 'layout/Page/Page'; // import { Link } from 'shared/components'; import Waves from './Waves'; diff --git a/packages/core/src/layout/Header/Waves.test.tsx b/packages/core/src/layout/Header/Waves.test.tsx index 2c7d463052..02ea8da634 100644 --- a/packages/core/src/layout/Header/Waves.test.tsx +++ b/packages/core/src/layout/Header/Waves.test.tsx @@ -16,7 +16,7 @@ import React from 'react'; import { render } from '@testing-library/react'; -import { pageTheme } from '../Page/PageThemeProvider'; +import { pageTheme } from 'layout/Page/PageThemeProvider'; import Waves from './Waves'; describe('', () => { diff --git a/packages/core/src/layout/Header/Waves.tsx b/packages/core/src/layout/Header/Waves.tsx index f37ecf7b12..001f3d61c4 100644 --- a/packages/core/src/layout/Header/Waves.tsx +++ b/packages/core/src/layout/Header/Waves.tsx @@ -16,7 +16,7 @@ import React, { FC } from 'react'; import { makeStyles } from '@material-ui/core'; -import { PageTheme } from '../Page'; +import { PageTheme } from 'layout/Page'; const useStyles = makeStyles({ wave: { diff --git a/packages/core/src/layout/HeaderLabel/OwnerHeaderLabel.js b/packages/core/src/layout/HeaderLabel/OwnerHeaderLabel.js index d13f0bd07a..abe0ee8b33 100644 --- a/packages/core/src/layout/HeaderLabel/OwnerHeaderLabel.js +++ b/packages/core/src/layout/HeaderLabel/OwnerHeaderLabel.js @@ -18,7 +18,7 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { Tooltip, Link, withStyles } from '@material-ui/core'; -import { StatusError } from '../../components/Status'; +import { StatusError } from 'components/Status'; import HeaderLabel from './HeaderLabel'; const style = theme => ({ diff --git a/packages/core/src/layout/InfoCard/InfoCard.tsx b/packages/core/src/layout/InfoCard/InfoCard.tsx index 10f9f60da0..caa5f16513 100644 --- a/packages/core/src/layout/InfoCard/InfoCard.tsx +++ b/packages/core/src/layout/InfoCard/InfoCard.tsx @@ -24,7 +24,7 @@ import { withStyles, makeStyles, } from '@material-ui/core'; -import ErrorBoundary from '../ErrorBoundary/ErrorBoundary'; +import ErrorBoundary from 'layout/ErrorBoundary/ErrorBoundary'; import BottomLink, { Props as BottomLinkProps } from './BottomLink'; const useStyles = makeStyles(theme => ({ diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index ad43a0b986..5c5c42c25f 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../tsconfig.json", "include": ["src"], "compilerOptions": { + "baseUrl": "src", "noImplicitAny": false } } diff --git a/packages/storybook/.storybook/main.js b/packages/storybook/.storybook/main.js index afed6723d8..55d731c8e6 100644 --- a/packages/storybook/.storybook/main.js +++ b/packages/storybook/.storybook/main.js @@ -1,3 +1,5 @@ +const path = require('path'); + module.exports = { stories: [ '../../core/src/layout/**/*.stories.tsx', @@ -5,6 +7,7 @@ module.exports = { ], addons: ['@storybook/addon-actions', '@storybook/addon-links'], webpackFinal: async config => { + config.resolve.modules.push(path.resolve(__dirname, '../../core/src')); config.module.rules.push( { test: /\.(ts|tsx)$/, diff --git a/packages/storybook/package.json b/packages/storybook/package.json index fc15da6207..4dbf2990fa 100644 --- a/packages/storybook/package.json +++ b/packages/storybook/package.json @@ -1,6 +1,6 @@ { "name": "storybook", - "version": "0.1.1-alpha.2", + "version": "0.1.1-alpha.3", "description": "Storybook build for core package", "private": true, "scripts": { diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index ce2861353f..98b2dcd749 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/test-utils", "description": "Utilities to test Backstage plugins and apps.", - "version": "0.1.1-alpha.2", + "version": "0.1.1-alpha.3", "private": false, "publishConfig": { "access": "public" @@ -24,8 +24,8 @@ "test": "backstage-cli test" }, "devDependencies": { - "@backstage/cli": "^0.1.1-alpha.2", - "@backstage/theme": "^0.1.1-alpha.2", + "@backstage/cli": "^0.1.1-alpha.3", + "@backstage/theme": "^0.1.1-alpha.3", "@material-ui/core": "^4.9.1", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", diff --git a/packages/test-utils/tsconfig.json b/packages/test-utils/tsconfig.json index 596e2cf729..7b73db2f0f 100644 --- a/packages/test-utils/tsconfig.json +++ b/packages/test-utils/tsconfig.json @@ -1,4 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src"] + "include": ["src"], + "compilerOptions": { + "baseUrl": "src" + } } diff --git a/packages/theme/package.json b/packages/theme/package.json index 450f8f6f86..b08014e9d6 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/theme", "description": "material-ui theme for use with Backstage.", - "version": "0.1.1-alpha.2", + "version": "0.1.1-alpha.3", "private": false, "publishConfig": { "access": "public" @@ -23,7 +23,7 @@ "lint": "backstage-cli lint" }, "devDependencies": { - "@backstage/cli": "^0.1.1-alpha.2", + "@backstage/cli": "^0.1.1-alpha.3", "@material-ui/core": "^4.9.1" }, "peerDependencies": { diff --git a/packages/theme/tsconfig.json b/packages/theme/tsconfig.json index 596e2cf729..7b73db2f0f 100644 --- a/packages/theme/tsconfig.json +++ b/packages/theme/tsconfig.json @@ -1,4 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src"] + "include": ["src"], + "compilerOptions": { + "baseUrl": "src" + } } diff --git a/plugins/home-page/package.json b/plugins/home-page/package.json index 73e208b737..e5d90de209 100644 --- a/plugins/home-page/package.json +++ b/plugins/home-page/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-home-page", - "version": "0.1.1-alpha.2", + "version": "0.1.1-alpha.3", "main": "dist/index.cjs.js", "types": "dist/index.d.ts", "license": "Apache-2.0", @@ -11,9 +11,9 @@ "test": "backstage-cli test" }, "devDependencies": { - "@backstage/cli": "^0.1.1-alpha.2", - "@backstage/core": "^0.1.1-alpha.2", - "@backstage/theme": "^0.1.1-alpha.2", + "@backstage/cli": "^0.1.1-alpha.3", + "@backstage/core": "^0.1.1-alpha.3", + "@backstage/theme": "^0.1.1-alpha.3", "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", "@testing-library/jest-dom": "^4.2.4", diff --git a/plugins/home-page/src/components/HomePage/HomePage.tsx b/plugins/home-page/src/components/HomePage/HomePage.tsx index c3f0250d71..e9e71c3b0b 100644 --- a/plugins/home-page/src/components/HomePage/HomePage.tsx +++ b/plugins/home-page/src/components/HomePage/HomePage.tsx @@ -16,7 +16,7 @@ import React, { FC } from 'react'; import { Typography, Link, Grid } from '@material-ui/core'; -import HomePageTimer from '../HomepageTimer'; +import HomePageTimer from 'components/HomepageTimer'; import { Content, InfoCard, Header, Page, pageTheme } from '@backstage/core'; import SquadTechHealth from './SquadTechHealth'; import Table from '@material-ui/core/Table'; diff --git a/plugins/home-page/src/plugin.ts b/plugins/home-page/src/plugin.ts index 17eb89eb35..c3b4d30fe3 100644 --- a/plugins/home-page/src/plugin.ts +++ b/plugins/home-page/src/plugin.ts @@ -15,7 +15,7 @@ */ import { createPlugin } from '@backstage/core'; -import HomePage from './components/HomePage'; +import HomePage from 'components/HomePage'; export default createPlugin({ id: 'home-page', diff --git a/plugins/home-page/tsconfig.json b/plugins/home-page/tsconfig.json index 596e2cf729..7b73db2f0f 100644 --- a/plugins/home-page/tsconfig.json +++ b/plugins/home-page/tsconfig.json @@ -1,4 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src"] + "include": ["src"], + "compilerOptions": { + "baseUrl": "src" + } } diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json index f4f33d6265..0d31b0d635 100644 --- a/plugins/welcome/package.json +++ b/plugins/welcome/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-welcome", - "version": "0.1.1-alpha.2", + "version": "0.1.1-alpha.3", "main": "dist/index.cjs.js", "types": "dist/index.d.ts", "private": true, @@ -11,9 +11,9 @@ "test": "backstage-cli test" }, "devDependencies": { - "@backstage/cli": "^0.1.1-alpha.2", - "@backstage/core": "^0.1.1-alpha.2", - "@backstage/theme": "^0.1.1-alpha.2", + "@backstage/cli": "^0.1.1-alpha.3", + "@backstage/core": "^0.1.1-alpha.3", + "@backstage/theme": "^0.1.1-alpha.3", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", diff --git a/plugins/welcome/src/components/WelcomePage/WelcomePage.tsx b/plugins/welcome/src/components/WelcomePage/WelcomePage.tsx index eea582ab55..307369f5fd 100644 --- a/plugins/welcome/src/components/WelcomePage/WelcomePage.tsx +++ b/plugins/welcome/src/components/WelcomePage/WelcomePage.tsx @@ -24,7 +24,7 @@ import { ListItemText, Link, } from '@material-ui/core'; -import Timer from '../Timer'; +import Timer from 'components/Timer'; import { Content, InfoCard, diff --git a/plugins/welcome/src/plugin.ts b/plugins/welcome/src/plugin.ts index e7755862ff..740c6d2da3 100644 --- a/plugins/welcome/src/plugin.ts +++ b/plugins/welcome/src/plugin.ts @@ -15,7 +15,7 @@ */ import { createPlugin } from '@backstage/core'; -import WelcomePage from './components/WelcomePage'; +import WelcomePage from 'components/WelcomePage'; export default createPlugin({ id: 'welcome', diff --git a/plugins/welcome/tsconfig.json b/plugins/welcome/tsconfig.json index 596e2cf729..7b73db2f0f 100644 --- a/plugins/welcome/tsconfig.json +++ b/plugins/welcome/tsconfig.json @@ -1,4 +1,7 @@ { "extends": "../../tsconfig.json", - "include": ["src"] + "include": ["src"], + "compilerOptions": { + "baseUrl": "src" + } }