= ({ slackChannel }) => {
return (
- Something went wrong here. Please contact {slackChannel} for help.
+ Something went wrong here.{' '}
+ {slackChannel && <>Please contact {slackChannel} for help.}
);
};
diff --git a/packages/core/src/layout/Header/Header.test.tsx b/packages/core/src/layout/Header/Header.test.tsx
index 5213fe1ac3..79d74791c8 100644
--- a/packages/core/src/layout/Header/Header.test.tsx
+++ b/packages/core/src/layout/Header/Header.test.tsx
@@ -16,8 +16,8 @@
import React from 'react';
import { render } from '@testing-library/react';
+import { wrapInThemedTestApp } from '@backstage/test-utils';
import Header from './Header';
-import { wrapInThemedTestApp } from '../../testUtils';
jest.mock('react-helmet', () => {
return ({ defaultTitle }) => defaultTitle: {defaultTitle}
;
diff --git a/packages/core/src/layout/Header/Header.tsx b/packages/core/src/layout/Header/Header.tsx
index 5b3bb7ee60..6af4019d13 100644
--- a/packages/core/src/layout/Header/Header.tsx
+++ b/packages/core/src/layout/Header/Header.tsx
@@ -17,12 +17,13 @@
import React, { Fragment, ReactNode, CSSProperties, FC } from 'react';
import Helmet from 'react-helmet';
import { Typography, Tooltip, makeStyles } from '@material-ui/core';
+import { BackstageTheme } from '@backstage/theme';
+
import { Theme } from '../Page/Page';
// import { Link } from 'shared/components';
-import { BackstageTheme } from '../../theme/theme';
import Waves from './Waves';
-const useStyles = makeStyles(theme => ({
+const useStyles = makeStyles(theme => ({
header: {
gridArea: 'pageHeader',
padding: theme.spacing(3),
diff --git a/packages/core/src/layout/HeaderActionMenu/HeaderActionMenu.test.tsx b/packages/core/src/layout/HeaderActionMenu/HeaderActionMenu.test.tsx
index 3a32d9371e..17822228e8 100644
--- a/packages/core/src/layout/HeaderActionMenu/HeaderActionMenu.test.tsx
+++ b/packages/core/src/layout/HeaderActionMenu/HeaderActionMenu.test.tsx
@@ -16,7 +16,7 @@
import React from 'react';
import { render, fireEvent } from '@testing-library/react';
-import { wrapInThemedTestApp, Keyboard } from '../../testUtils';
+import { wrapInThemedTestApp, Keyboard } from '@backstage/test-utils';
import HeaderActionMenu from './HeaderActionMenu';
describe('', () => {
diff --git a/packages/core/src/layout/HeaderLabel/HeaderLabel.test.tsx b/packages/core/src/layout/HeaderLabel/HeaderLabel.test.tsx
index 727c890e35..cbdfb3da80 100644
--- a/packages/core/src/layout/HeaderLabel/HeaderLabel.test.tsx
+++ b/packages/core/src/layout/HeaderLabel/HeaderLabel.test.tsx
@@ -16,8 +16,8 @@
import React from 'react';
import { render } from '@testing-library/react';
+import { wrapInThemedTestApp } from '@backstage/test-utils';
import HeaderLabel from './HeaderLabel';
-import { wrapInThemedTestApp } from '../../testUtils';
describe('', () => {
it('should have a label', () => {
diff --git a/packages/core/src/layout/HeaderLabel/HeaderLabel.tsx b/packages/core/src/layout/HeaderLabel/HeaderLabel.tsx
index 4349399194..e2fd11ff15 100644
--- a/packages/core/src/layout/HeaderLabel/HeaderLabel.tsx
+++ b/packages/core/src/layout/HeaderLabel/HeaderLabel.tsx
@@ -14,12 +14,10 @@
* limitations under the License.
*/
+import { Link, makeStyles, Typography } from '@material-ui/core';
import React, { FC } from 'react';
-import { Typography, makeStyles } from '@material-ui/core';
-import { Link } from '@material-ui/core';
-import { BackstageTheme } from '../../theme/theme';
-const useStyles = makeStyles(theme => ({
+const useStyles = makeStyles(theme => ({
root: {
textAlign: 'left',
margin: theme.spacing(2),
diff --git a/packages/core/src/layout/InfoCard/BottomLink.test.tsx b/packages/core/src/layout/InfoCard/BottomLink.test.tsx
index d240a232b7..f301de1c84 100644
--- a/packages/core/src/layout/InfoCard/BottomLink.test.tsx
+++ b/packages/core/src/layout/InfoCard/BottomLink.test.tsx
@@ -16,7 +16,7 @@
import React from 'react';
import { render } from '@testing-library/react';
-import { wrapInTestApp } from '../../testUtils';
+import { wrapInTestApp } from '@backstage/test-utils';
import BottomLink from './BottomLink';
const minProps = {
diff --git a/packages/core/src/layout/InfoCard/BottomLink.tsx b/packages/core/src/layout/InfoCard/BottomLink.tsx
index bf82f6cd11..6721eda0f1 100644
--- a/packages/core/src/layout/InfoCard/BottomLink.tsx
+++ b/packages/core/src/layout/InfoCard/BottomLink.tsx
@@ -14,16 +14,20 @@
* limitations under the License.
*/
-import React, { FC } from 'react';
-import { Link } from '@material-ui/core';
-import { Divider, ListItemText, makeStyles } from '@material-ui/core';
-import { ListItem, ListItemIcon } from '@material-ui/core';
-import ArrowIcon from '@material-ui/icons/ArrowForward';
-import grey from '@material-ui/core/colors/grey';
+import {
+ Divider,
+ Link,
+ ListItem,
+ ListItemIcon,
+ ListItemText,
+ makeStyles,
+} from '@material-ui/core';
import Box from '@material-ui/core/Box';
-import { BackstageTheme } from '../../theme/theme';
+import grey from '@material-ui/core/colors/grey';
+import ArrowIcon from '@material-ui/icons/ArrowForward';
+import React, { FC } from 'react';
-const useStyles = makeStyles(theme => ({
+const useStyles = makeStyles(theme => ({
root: {
maxWidth: 'fit-content',
padding: theme.spacing(2, 2, 2, 2.5),
diff --git a/packages/core/src/layout/InfoCard/InfoCard.test.tsx b/packages/core/src/layout/InfoCard/InfoCard.test.tsx
index 7d184d2f89..4d8221d5b8 100644
--- a/packages/core/src/layout/InfoCard/InfoCard.test.tsx
+++ b/packages/core/src/layout/InfoCard/InfoCard.test.tsx
@@ -16,7 +16,7 @@
import React from 'react';
import { render } from '@testing-library/react';
-import { wrapInTestApp } from '../../testUtils';
+import { wrapInTestApp } from '@backstage/test-utils';
import InfoCard from './InfoCard';
const minProps = {
diff --git a/packages/core/src/layout/InfoCard/InfoCard.tsx b/packages/core/src/layout/InfoCard/InfoCard.tsx
index 5b3ab1cfd1..10f9f60da0 100644
--- a/packages/core/src/layout/InfoCard/InfoCard.tsx
+++ b/packages/core/src/layout/InfoCard/InfoCard.tsx
@@ -26,9 +26,8 @@ import {
} from '@material-ui/core';
import ErrorBoundary from '../ErrorBoundary/ErrorBoundary';
import BottomLink, { Props as BottomLinkProps } from './BottomLink';
-import { BackstageTheme } from '../../theme/theme';
-const useStyles = makeStyles(theme => ({
+const useStyles = makeStyles(theme => ({
header: {
padding: theme.spacing(2, 2, 2, 2.5),
},
diff --git a/packages/core/jest.setup.ts b/packages/core/src/setupTests.ts
similarity index 100%
rename from packages/core/jest.setup.ts
rename to packages/core/src/setupTests.ts
diff --git a/packages/core/src/theme/theme.d.ts b/packages/core/src/theme/theme.d.ts
deleted file mode 100644
index 7c9f552310..0000000000
--- a/packages/core/src/theme/theme.d.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2020 Spotify AB
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { Theme } from '@material-ui/core';
-
-export type BackstageTheme = Theme & {
- palette: {
- status: {
- ok: string;
- warning: string;
- error: string;
- pending: string;
- running: string;
- background: string;
- };
- border: string;
- textVerySubtle: string;
- textSubtle: string;
- highlight: string;
- errorBackground: string;
- warningBackground: string;
- infoBackground: string;
- errorText: string;
- infoText: string;
- warningText: string;
- linkHover: string;
- link: string;
- gold: string;
- bursts: {
- fontColor: string;
- slackChannelText: string;
- backgroundColor: {
- default: string;
- };
- };
- };
-};
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
index 056c80b963..fc15da6207 100644
--- a/packages/storybook/package.json
+++ b/packages/storybook/package.json
@@ -1,6 +1,6 @@
{
"name": "storybook",
- "version": "0.1.1-alpha.1",
+ "version": "0.1.1-alpha.2",
"description": "Storybook build for core package",
"private": true,
"scripts": {
diff --git a/packages/test-utils/.npmrc b/packages/test-utils/.npmrc
new file mode 100644
index 0000000000..214c29d139
--- /dev/null
+++ b/packages/test-utils/.npmrc
@@ -0,0 +1 @@
+registry=https://registry.npmjs.org/
diff --git a/packages/test-utils/README.md b/packages/test-utils/README.md
new file mode 100644
index 0000000000..46a2e2dab3
--- /dev/null
+++ b/packages/test-utils/README.md
@@ -0,0 +1,22 @@
+# @backstage/test-utils
+
+This package provides utilities that can be used to test plugins and apps for Backstage.
+
+## Installation
+
+Install the package via npm or yarn:
+
+```sh
+$ npm install --save-dev @backstage/test-utils
+```
+
+or
+
+```sh
+$ yarn add -D @backstage/test-utils
+```
+
+## Documentation
+
+- [Backstage Readme](https://github.com/spotify/backstage/blob/master/README.md)
+- [Backstage Documentation](https://github.com/spotify/backstage/blob/master/docs/README.md)
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
new file mode 100644
index 0000000000..ce2861353f
--- /dev/null
+++ b/packages/test-utils/package.json
@@ -0,0 +1,51 @@
+{
+ "name": "@backstage/test-utils",
+ "description": "Utilities to test Backstage plugins and apps.",
+ "version": "0.1.1-alpha.2",
+ "private": false,
+ "publishConfig": {
+ "access": "public"
+ },
+ "homepage": "https://backstage.io",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/spotify/backstage",
+ "directory": "packages/testUtils"
+ },
+ "keywords": [
+ "backstage"
+ ],
+ "license": "Apache-2.0",
+ "main": "dist/index.cjs.js",
+ "types": "dist/index.d.ts",
+ "scripts": {
+ "build": "backstage-cli plugin:build",
+ "lint": "backstage-cli lint",
+ "test": "backstage-cli test"
+ },
+ "devDependencies": {
+ "@backstage/cli": "^0.1.1-alpha.2",
+ "@backstage/theme": "^0.1.1-alpha.2",
+ "@material-ui/core": "^4.9.1",
+ "@testing-library/jest-dom": "^4.2.4",
+ "@testing-library/react": "^9.3.2",
+ "@testing-library/user-event": "^7.1.2",
+ "@types/jest": "^24.0.0",
+ "@types/node": "^12.0.0",
+ "react": "^16.12.0",
+ "react-dom": "^16.12.0",
+ "react-router": "^5.1.2",
+ "react-router-dom": "^5.1.2"
+ },
+ "peerDependencies": {
+ "@backstage/theme": "^0.1.1-alpha.2",
+ "@material-ui/core": "^4.9.1",
+ "@testing-library/jest-dom": "^4.2.4",
+ "@testing-library/react": "^9.3.2",
+ "@testing-library/user-event": "^7.1.2",
+ "react": "^16.12.0",
+ "react-dom": "^16.12.0",
+ "react-router": "^5.1.2",
+ "react-router-dom": "^5.1.2"
+ }
+}
diff --git a/scripts/copyright.js b/packages/test-utils/src/index.ts
similarity index 90%
rename from scripts/copyright.js
rename to packages/test-utils/src/index.ts
index 4376d55847..43faf28a4a 100644
--- a/scripts/copyright.js
+++ b/packages/test-utils/src/index.ts
@@ -1,5 +1,5 @@
/*
- * Copyright <%= YEAR %> Spotify AB
+ * Copyright 2020 Spotify AB
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,3 +13,4 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+export * from './testUtils';
diff --git a/packages/core/jest.config.ts b/packages/test-utils/src/setupTests.ts
similarity index 82%
rename from packages/core/jest.config.ts
rename to packages/test-utils/src/setupTests.ts
index 2e584f12dc..8925258421 100644
--- a/packages/core/jest.config.ts
+++ b/packages/test-utils/src/setupTests.ts
@@ -14,7 +14,4 @@
* limitations under the License.
*/
-module.exports = {
- ...require('@spotify/web-scripts/config/jest.config.js'),
- setupFilesAfterEnv: ['../jest.setup.ts'],
-};
+import '@testing-library/jest-dom/extend-expect';
diff --git a/packages/core/src/testUtils/Keyboard.js b/packages/test-utils/src/testUtils/Keyboard.js
similarity index 100%
rename from packages/core/src/testUtils/Keyboard.js
rename to packages/test-utils/src/testUtils/Keyboard.js
diff --git a/packages/core/src/testUtils/Keyboard.test.js b/packages/test-utils/src/testUtils/Keyboard.test.js
similarity index 100%
rename from packages/core/src/testUtils/Keyboard.test.js
rename to packages/test-utils/src/testUtils/Keyboard.test.js
diff --git a/packages/core/src/testUtils/index.js b/packages/test-utils/src/testUtils/index.tsx
similarity index 57%
rename from packages/core/src/testUtils/index.js
rename to packages/test-utils/src/testUtils/index.tsx
index a0eab3e72b..d9a4389ac8 100644
--- a/packages/core/src/testUtils/index.js
+++ b/packages/test-utils/src/testUtils/index.tsx
@@ -14,39 +14,52 @@
* limitations under the License.
*/
-import React from 'react';
-import { ThemeProvider } from '@material-ui/styles';
-
+import React, {
+ ComponentType,
+ ReactNode,
+ FunctionComponent,
+ ReactElement,
+} from 'react';
+import { ThemeProvider } from '@material-ui/core';
+import { act } from 'react-dom/test-utils';
+import { render, RenderResult } from '@testing-library/react';
import { MemoryRouter } from 'react-router';
import { Route } from 'react-router-dom';
-
-import { V1 } from '../theme/BackstageTheme';
-import ErrorBoundary from '../layout/ErrorBoundary';
-import { act } from 'react-dom/test-utils';
-import { render } from '@testing-library/react';
+import { BackstageTheme } from '@backstage/theme';
export { default as Keyboard } from './Keyboard';
export { default as mockBreakpoint } from './mockBreakpoint';
export * from './logCollector';
-export function wrapInTestApp(Component, initialRouterEntries) {
- const Wrapper = Component instanceof Function ? Component : () => Component;
+export function wrapInTestApp(
+ Component: ComponentType | ReactNode,
+ initialRouterEntries: string[] = ['/'],
+) {
+ let Wrapper: ComponentType;
+ if (Component instanceof Function) {
+ Wrapper = Component;
+ } else {
+ Wrapper = (() => Component) as FunctionComponent;
+ }
return (
-
-
-
-
+
+
);
}
-export function wrapInThemedTestApp(component, initialRouterEntries) {
- const themed = {component};
+export function wrapInThemedTestApp(
+ component: ReactNode,
+ initialRouterEntries: string[] = ['/'],
+) {
+ const themed = (
+ {component}
+ );
return wrapInTestApp(themed, initialRouterEntries);
}
-export const wrapInTheme = (component, theme = V1) => (
+export const wrapInTheme = (component: ReactNode, theme = BackstageTheme) => (
{component}
);
@@ -55,10 +68,13 @@ export const wrapInTheme = (component, theme = V1) => (
// cleaner, since act doesn't return the result of the evaluated function.
// https://github.com/testing-library/react-testing-library/issues/281
// https://github.com/facebook/react/pull/14853
-export async function renderWithEffects(nodes) {
- let value;
- await act(async () => {
- value = await render(nodes);
+export async function renderWithEffects(
+ nodes: ReactElement,
+): Promise {
+ let value: RenderResult;
+ await act(() => {
+ value = render(nodes);
});
+ // @ts-ignore
return value;
}
diff --git a/packages/core/src/testUtils/logCollector.js b/packages/test-utils/src/testUtils/logCollector.js
similarity index 100%
rename from packages/core/src/testUtils/logCollector.js
rename to packages/test-utils/src/testUtils/logCollector.js
diff --git a/packages/core/src/testUtils/mockBreakpoint.ts b/packages/test-utils/src/testUtils/mockBreakpoint.ts
similarity index 100%
rename from packages/core/src/testUtils/mockBreakpoint.ts
rename to packages/test-utils/src/testUtils/mockBreakpoint.ts
diff --git a/packages/test-utils/tsconfig.json b/packages/test-utils/tsconfig.json
new file mode 100644
index 0000000000..596e2cf729
--- /dev/null
+++ b/packages/test-utils/tsconfig.json
@@ -0,0 +1,4 @@
+{
+ "extends": "../../tsconfig.json",
+ "include": ["src"]
+}
diff --git a/packages/theme/.npmrc b/packages/theme/.npmrc
new file mode 100644
index 0000000000..214c29d139
--- /dev/null
+++ b/packages/theme/.npmrc
@@ -0,0 +1 @@
+registry=https://registry.npmjs.org/
diff --git a/packages/theme/README.md b/packages/theme/README.md
new file mode 100644
index 0000000000..a1b6f81f92
--- /dev/null
+++ b/packages/theme/README.md
@@ -0,0 +1,22 @@
+# @backstage/theme
+
+This package provides the extended Material UI Theme(s) that power Backstage.
+
+## Installation
+
+Install the package via npm or yarn:
+
+```sh
+$ npm install --save @backstage/theme
+```
+
+or
+
+```sh
+$ yarn add @backstage/theme
+```
+
+## Documentation
+
+- [Backstage Readme](https://github.com/spotify/backstage/blob/master/README.md)
+- [Backstage Documentation](https://github.com/spotify/backstage/blob/master/docs/README.md)
diff --git a/packages/theme/package.json b/packages/theme/package.json
new file mode 100644
index 0000000000..450f8f6f86
--- /dev/null
+++ b/packages/theme/package.json
@@ -0,0 +1,32 @@
+{
+ "name": "@backstage/theme",
+ "description": "material-ui theme for use with Backstage.",
+ "version": "0.1.1-alpha.2",
+ "private": false,
+ "publishConfig": {
+ "access": "public"
+ },
+ "homepage": "https://backstage.io",
+ "repository": {
+ "type": "git",
+ "url": "https://github.com/spotify/backstage",
+ "directory": "packages/theme"
+ },
+ "keywords": [
+ "backstage"
+ ],
+ "license": "Apache-2.0",
+ "main": "dist/index.cjs.js",
+ "types": "dist/index.d.ts",
+ "scripts": {
+ "build": "backstage-cli plugin:build",
+ "lint": "backstage-cli lint"
+ },
+ "devDependencies": {
+ "@backstage/cli": "^0.1.1-alpha.2",
+ "@material-ui/core": "^4.9.1"
+ },
+ "peerDependencies": {
+ "@material-ui/core": "^4.9.1"
+ }
+}
diff --git a/packages/core/src/theme/BackstageTheme.js b/packages/theme/src/BackstageTheme.ts
similarity index 93%
rename from packages/core/src/theme/BackstageTheme.js
rename to packages/theme/src/BackstageTheme.ts
index de4bbffca5..202bdbc08c 100644
--- a/packages/core/src/theme/BackstageTheme.js
+++ b/packages/theme/src/BackstageTheme.ts
@@ -18,6 +18,8 @@ import { createMuiTheme } from '@material-ui/core';
import { darken, lighten } from '@material-ui/core/styles/colorManipulator';
import { blue, yellow } from '@material-ui/core/colors';
+import { BackstageMuiTheme, BackstageMuiThemeOptions } from './types';
+
export const COLORS = {
PAGE_BACKGROUND: '#F8F8F8',
DEFAULT_PAGE_THEME_COLOR: '#7C3699',
@@ -37,7 +39,7 @@ export const COLORS = {
},
};
-const extendedThemeConfig = {
+const extendedThemeConfig: BackstageMuiThemeOptions = {
props: {
MuiGrid: {
spacing: 2,
@@ -49,6 +51,7 @@ const extendedThemeConfig = {
palette: {
background: {
default: COLORS.PAGE_BACKGROUND,
+ // @ts-ignore
informational: '#60a3cb',
},
status: {
@@ -66,6 +69,7 @@ const extendedThemeConfig = {
default: COLORS.DEFAULT_PAGE_THEME_COLOR,
},
},
+ // @ts-ignore
primary: {
main: blue[500],
},
@@ -115,7 +119,9 @@ const extendedThemeConfig = {
},
};
-const createOverrides = theme => {
+const createOverrides = (
+ theme: BackstageMuiTheme,
+): Partial => {
return {
overrides: {
MuiTableRow: {
@@ -211,7 +217,7 @@ const createOverrides = theme => {
MuiButton: {
text: {
// Text buttons have less padding by default, but we want to keep the original padding
- padding: null,
+ padding: undefined,
},
},
MuiChip: {
@@ -237,12 +243,15 @@ const createOverrides = theme => {
};
};
-const extendedTheme = createMuiTheme(extendedThemeConfig);
+const extendedTheme = createMuiTheme(extendedThemeConfig) as BackstageMuiTheme;
// V1 theming
// https://material-ui-next.com/customization/themes/
// For CSS it is advised to use JSS, see https://material-ui-next.com/customization/css-in-js/
-const BackstageTheme = { ...extendedTheme, ...createOverrides(extendedTheme) };
+const BackstageTheme: BackstageMuiTheme = {
+ ...extendedTheme,
+ ...createOverrides(extendedTheme),
+};
// Temporary workaround for files incorrectly importing the theme directly
export const V1 = BackstageTheme;
diff --git a/packages/core/src/theme/BackstageThemeDark.js b/packages/theme/src/BackstageThemeDark.ts
similarity index 94%
rename from packages/core/src/theme/BackstageThemeDark.js
rename to packages/theme/src/BackstageThemeDark.ts
index b5562a50ba..b8b89c8f0a 100644
--- a/packages/core/src/theme/BackstageThemeDark.js
+++ b/packages/theme/src/BackstageThemeDark.ts
@@ -18,6 +18,8 @@ import { createMuiTheme } from '@material-ui/core';
import { darken, lighten } from '@material-ui/core/styles/colorManipulator';
import { blue, yellow } from '@material-ui/core/colors';
+import { BackstageMuiTheme, BackstageMuiThemeOptions } from './types';
+
export const COLORS = {
PAGE_BACKGROUND: '#282828',
EFAULT_PAGE_THEME_COLOR: '#232323',
@@ -38,7 +40,7 @@ export const COLORS = {
},
};
-const extendedThemeConfig = {
+const extendedThemeConfig: BackstageMuiThemeOptions = {
props: {
MuiGrid: {
spacing: 2,
@@ -50,6 +52,7 @@ const extendedThemeConfig = {
palette: {
background: {
default: COLORS.PAGE_BACKGROUND,
+ // @ts-ignore
informational: '#60a3cb',
},
color: {
@@ -71,6 +74,7 @@ const extendedThemeConfig = {
default: COLORS.DEFAULT_PAGE_THEME_COLOR,
},
},
+ // @ts-ignore
primary: {
main: blue[500],
},
@@ -120,13 +124,15 @@ const extendedThemeConfig = {
},
};
-const createOverrides = theme => {
+const createOverrides = (theme: BackstageMuiTheme): BackstageMuiTheme => {
return {
overrides: {
+ // @ts-ignore
MuiCSSBaseline: {
'@global': {
body: {
backgroundColor: theme.palette.background.default,
+ // @ts-ignore
color: theme.palette.color.default,
},
},
@@ -224,7 +230,7 @@ const createOverrides = theme => {
MuiButton: {
text: {
// Text buttons have less padding by default, but we want to keep the original padding
- padding: null,
+ padding: undefined,
},
},
MuiChip: {
@@ -250,7 +256,7 @@ const createOverrides = theme => {
};
};
-const extendedTheme = createMuiTheme(extendedThemeConfig);
+const extendedTheme = createMuiTheme(extendedThemeConfig) as BackstageMuiTheme;
// V1 theming
// https://material-ui-next.com/customization/themes/
@@ -262,4 +268,5 @@ const BackstageThemeDark = {
// Temporary workaround for files incorrectly importing the theme directly
export const V1 = BackstageThemeDark;
+
export default BackstageThemeDark;
diff --git a/packages/core/src/theme/BackstageThemeLight.js b/packages/theme/src/BackstageThemeLight.ts
similarity index 94%
rename from packages/core/src/theme/BackstageThemeLight.js
rename to packages/theme/src/BackstageThemeLight.ts
index 4f44a0c2b2..14bc942910 100644
--- a/packages/core/src/theme/BackstageThemeLight.js
+++ b/packages/theme/src/BackstageThemeLight.ts
@@ -18,6 +18,8 @@ import { createMuiTheme } from '@material-ui/core';
import { darken, lighten } from '@material-ui/core/styles/colorManipulator';
import { blue, yellow } from '@material-ui/core/colors';
+import { BackstageMuiTheme, BackstageMuiThemeOptions } from './types';
+
export const COLORS = {
PAGE_BACKGROUND: '#F8F8F8',
DEFAULT_PAGE_THEME_COLOR: '#7C3699',
@@ -37,7 +39,7 @@ export const COLORS = {
},
};
-const extendedThemeConfig = {
+const extendedThemeConfig: BackstageMuiThemeOptions = {
props: {
MuiGrid: {
spacing: 2,
@@ -49,6 +51,7 @@ const extendedThemeConfig = {
palette: {
background: {
default: COLORS.PAGE_BACKGROUND,
+ // @ts-ignore
informational: '#60a3cb',
},
color: {
@@ -69,6 +72,7 @@ const extendedThemeConfig = {
default: COLORS.DEFAULT_PAGE_THEME_COLOR,
},
},
+ // @ts-ignore
primary: {
main: blue[500],
},
@@ -118,13 +122,17 @@ const extendedThemeConfig = {
},
};
-const createOverrides = theme => {
+const createOverrides = (
+ theme: BackstageMuiTheme,
+): Partial => {
return {
overrides: {
+ // @ts-ignore
MuiCSSBaseline: {
'@global': {
body: {
backgroundColor: theme.palette.background.default,
+ // @ts-ignore
color: theme.palette.color.default,
},
},
@@ -222,7 +230,7 @@ const createOverrides = theme => {
MuiButton: {
text: {
// Text buttons have less padding by default, but we want to keep the original padding
- padding: null,
+ padding: undefined,
},
},
MuiChip: {
@@ -248,7 +256,7 @@ const createOverrides = theme => {
};
};
-const extendedTheme = createMuiTheme(extendedThemeConfig);
+const extendedTheme = createMuiTheme(extendedThemeConfig) as BackstageMuiTheme;
// V1 theming
// https://material-ui-next.com/customization/themes/
@@ -260,4 +268,5 @@ const BackstageThemeLight = {
// Temporary workaround for files incorrectly importing the theme directly
export const V1 = BackstageThemeLight;
+
export default BackstageThemeLight;
diff --git a/packages/theme/src/index.ts b/packages/theme/src/index.ts
new file mode 100644
index 0000000000..136355dc37
--- /dev/null
+++ b/packages/theme/src/index.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export { default as BackstageThemeLight } from './BackstageThemeLight';
+export { default as BackstageThemeDark } from './BackstageThemeDark';
+export { default as BackstageTheme, COLORS } from './BackstageTheme';
diff --git a/packages/theme/src/types.ts b/packages/theme/src/types.ts
new file mode 100644
index 0000000000..9a3e93c3a9
--- /dev/null
+++ b/packages/theme/src/types.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Theme, ThemeOptions } from '@material-ui/core';
+
+export type BackstageMuiPalette = Theme['palette'] & {
+ status: {
+ ok: string;
+ warning: string;
+ error: string;
+ pending: string;
+ running: string;
+ background: string;
+ };
+ border: string;
+ textVerySubtle: string;
+ textSubtle: string;
+ highlight: string;
+ errorBackground: string;
+ warningBackground: string;
+ infoBackground: string;
+ errorText: string;
+ infoText: string;
+ warningText: string;
+ linkHover: string;
+ link: string;
+ gold: string;
+ bursts: {
+ fontColor: string;
+ slackChannelText: string;
+ backgroundColor: {
+ default: string;
+ };
+ };
+};
+
+export interface BackstageMuiTheme extends Theme {
+ palette: BackstageMuiPalette;
+}
+
+export interface BackstageMuiThemeOptions extends ThemeOptions {
+ palette: Partial;
+}
diff --git a/packages/theme/tsconfig.json b/packages/theme/tsconfig.json
new file mode 100644
index 0000000000..596e2cf729
--- /dev/null
+++ b/packages/theme/tsconfig.json
@@ -0,0 +1,4 @@
+{
+ "extends": "../../tsconfig.json",
+ "include": ["src"]
+}
diff --git a/plugins/home-page/package.json b/plugins/home-page/package.json
index 88afe98bd4..73e208b737 100644
--- a/plugins/home-page/package.json
+++ b/plugins/home-page/package.json
@@ -1,19 +1,19 @@
{
"name": "@backstage/plugin-home-page",
- "version": "0.1.1-alpha.1",
+ "version": "0.1.1-alpha.2",
"main": "dist/index.cjs.js",
"types": "dist/index.d.ts",
"license": "Apache-2.0",
"private": true,
"scripts": {
- "build:watch": "backstage-cli plugin:build --watch",
- "build": "backstage-cli build-cache -- backstage-cli plugin:build",
+ "build": "backstage-cli plugin:build",
"lint": "backstage-cli lint",
"test": "backstage-cli test"
},
"devDependencies": {
- "@backstage/cli": "^0.1.1-alpha.1",
- "@backstage/core": "^0.1.1-alpha.1",
+ "@backstage/cli": "^0.1.1-alpha.2",
+ "@backstage/core": "^0.1.1-alpha.2",
+ "@backstage/theme": "^0.1.1-alpha.2",
"@material-ui/core": "^4.9.1",
"@material-ui/icons": "^4.9.1",
"@testing-library/jest-dom": "^4.2.4",
@@ -26,7 +26,8 @@
"react-dom": "^16.12.0"
},
"peerDependencies": {
- "@backstage/core": "^0.1.1-alpha.1",
+ "@backstage/core": "^0.1.1-alpha.2",
+ "@backstage/theme": "^0.1.1-alpha.2",
"@material-ui/core": "^4.9.1",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.45",
diff --git a/plugins/home-page/src/components/HomePage/HomePage.test.tsx b/plugins/home-page/src/components/HomePage/HomePage.test.tsx
index 6b2c1bfd11..713f0afe1e 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 '@backstage/core';
+import { BackstageTheme } from '@backstage/theme';
describe('HomePage', () => {
it('should render', () => {
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index 8eb9f45f7f..f4f33d6265 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -1,19 +1,19 @@
{
"name": "@backstage/plugin-welcome",
- "version": "0.1.1-alpha.1",
+ "version": "0.1.1-alpha.2",
"main": "dist/index.cjs.js",
"types": "dist/index.d.ts",
"private": true,
"license": "Apache-2.0",
"scripts": {
- "build:watch": "backstage-cli plugin:build --watch",
- "build": "backstage-cli build-cache -- backstage-cli plugin:build",
+ "build": "backstage-cli plugin:build",
"lint": "backstage-cli lint",
"test": "backstage-cli test"
},
"devDependencies": {
- "@backstage/cli": "^0.1.1-alpha.1",
- "@backstage/core": "^0.1.1-alpha.1",
+ "@backstage/cli": "^0.1.1-alpha.2",
+ "@backstage/core": "^0.1.1-alpha.2",
+ "@backstage/theme": "^0.1.1-alpha.2",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
@@ -22,7 +22,8 @@
"@types/testing-library__jest-dom": "5.0.2"
},
"peerDependencies": {
- "@backstage/core": "^0.1.1-alpha.1",
+ "@backstage/core": "^0.1.1-alpha.2",
+ "@backstage/theme": "^0.1.1-alpha.2",
"@material-ui/core": "^4.9.1",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.45",
diff --git a/plugins/welcome/src/components/WelcomePage/WelcomePage.test.tsx b/plugins/welcome/src/components/WelcomePage/WelcomePage.test.tsx
index b4139e4ed3..9b78726f0a 100644
--- a/plugins/welcome/src/components/WelcomePage/WelcomePage.test.tsx
+++ b/plugins/welcome/src/components/WelcomePage/WelcomePage.test.tsx
@@ -18,12 +18,8 @@ import React from 'react';
import { render } from '@testing-library/react';
import WelcomePage from './WelcomePage';
import { ThemeProvider } from '@material-ui/core';
-import {
- BackstageTheme,
- ApiProvider,
- ApiRegistry,
- errorApiRef,
-} from '@backstage/core';
+import { BackstageTheme } from '@backstage/theme';
+import { ApiProvider, ApiRegistry, errorApiRef } from '@backstage/core';
describe('WelcomePage', () => {
it('should render', () => {
diff --git a/scripts/cli-e2e-test.js b/scripts/cli-e2e-test.js
index c1e90ea0ce..48058550d9 100644
--- a/scripts/cli-e2e-test.js
+++ b/scripts/cli-e2e-test.js
@@ -19,7 +19,7 @@ const childProcess = require('child_process');
const { spawn } = childProcess;
const Browser = require('zombie');
-const EXPECTED_LOAD_ERRORS = /connect ECONNREFUSED|did not get to load all resources/;
+const EXPECTED_LOAD_ERRORS = /ECONNREFUSED|ECONNRESET|did not get to load all resources/;
Browser.localhost('localhost', 3000);
diff --git a/tsconfig.json b/tsconfig.json
index abb10087ca..f278b2777d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,3 @@
{
- "extends": "@spotify/web-scripts/config/tsconfig.json",
- "exclude": ["**/*.test.*"],
- "compilerOptions": {
- "allowJs": true,
- "noEmit": false,
- "declarationMap": true,
- "incremental": true,
- "module": "es6"
- }
+ "extends": "@backstage/cli/config/tsconfig.json"
}
diff --git a/yarn.lock b/yarn.lock
index 78d92bfda5..1f7b93d669 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2783,6 +2783,13 @@
resolved "https://registry.npmjs.org/@spotify/eslint-config-base/-/eslint-config-base-6.1.0.tgz#b48d2764049d56a7d83a95709ec1e6733cb19f2a"
integrity sha512-oxR3OBBrms09Ih6yPrqcaeKgwchdw9XgRvKsF6x6uPiMy0OVYald/+GkBtyQy+IChD14WStV/XosqNxEZeTJ4Q==
+"@spotify/eslint-config-oss@^1.0.1":
+ version "1.0.1"
+ resolved "https://registry.npmjs.org/@spotify/eslint-config-oss/-/eslint-config-oss-1.0.1.tgz#01a95517e05063487c8e06b0b95cbdda33014a2a"
+ integrity sha512-G6eVEsp5WnvCglI9uhzhSeUnsKdpJ5gOLyhdZBEtqt8+MdpQSDECIfnkI8mV06dQ8FKtbqVd2NiMbkCC/gwrFQ==
+ dependencies:
+ eslint-plugin-notice "^0.8.9"
+
"@spotify/eslint-config-react@^6.0.0":
version "6.0.0"
resolved "https://registry.npmjs.org/@spotify/eslint-config-react/-/eslint-config-react-6.0.0.tgz#9cfc88362c7ffcd14e4dde73c196d1bc8583051d"
@@ -3650,6 +3657,11 @@
resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
+"@types/json5@^0.0.29":
+ version "0.0.29"
+ resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+ integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+
"@types/mime@*":
version "2.0.1"
resolved "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
@@ -5823,6 +5835,14 @@ chalk@^3.0.0:
ansi-styles "^4.1.0"
supports-color "^7.1.0"
+chalk@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
+ integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
+ dependencies:
+ ansi-styles "^4.1.0"
+ supports-color "^7.1.0"
+
change-emitter@^0.1.2:
version "0.1.6"
resolved "https://registry.npmjs.org/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515"
@@ -6095,7 +6115,7 @@ clone@^1.0.2:
resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
-clsx@^1.0.2, clsx@^1.0.4:
+clsx@^1.0.2, clsx@^1.0.4, clsx@^1.1.0:
version "1.1.0"
resolved "https://registry.npmjs.org/clsx/-/clsx-1.1.0.tgz#62937c6adfea771247c34b54d320fb99624f5702"
integrity sha512-3avwM37fSK5oP6M5rQ9CNe99lwxhXDOeSWVPAOYF6OazUTgZCMb0yWlJpmdD74REy1gkEaFiub2ULv4fq9GUhA==
@@ -6676,14 +6696,6 @@ cross-env@^7.0.0:
dependencies:
cross-spawn "^7.0.1"
-cross-fetch@^3.0.4:
- version "3.0.4"
- resolved "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.4.tgz#7bef7020207e684a7638ef5f2f698e24d9eb283c"
- integrity sha512-MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw==
- dependencies:
- node-fetch "2.6.0"
- whatwg-fetch "3.0.0"
-
cross-spawn-promise@^0.10.1:
version "0.10.2"
resolved "https://registry.npmjs.org/cross-spawn-promise/-/cross-spawn-promise-0.10.2.tgz#0e6338149caf53a6d557ac5c65efb3086d8704ac"
@@ -7434,7 +7446,7 @@ dir-glob@2.0.0:
arrify "^1.0.1"
path-type "^3.0.0"
-dir-glob@^2.2.2:
+dir-glob@^2.0.0, dir-glob@^2.2.2:
version "2.2.2"
resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
@@ -7979,6 +7991,14 @@ eslint-loader@3.0.3:
object-hash "^2.0.1"
schema-utils "^2.6.1"
+eslint-module-utils@^2.1.1:
+ version "2.6.0"
+ resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
+ integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
+ dependencies:
+ debug "^2.6.9"
+ pkg-dir "^2.0.0"
+
eslint-module-utils@^2.4.1:
version "2.5.2"
resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708"
@@ -8019,6 +8039,24 @@ eslint-plugin-import@2.20.1:
read-pkg-up "^2.0.0"
resolve "^1.12.0"
+eslint-plugin-import@^2.20.2:
+ version "2.20.2"
+ resolved "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d"
+ integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==
+ dependencies:
+ array-includes "^3.0.3"
+ array.prototype.flat "^1.2.1"
+ contains-path "^0.1.0"
+ debug "^2.6.9"
+ doctrine "1.5.0"
+ eslint-import-resolver-node "^0.3.2"
+ eslint-module-utils "^2.4.1"
+ has "^1.0.3"
+ minimatch "^3.0.4"
+ object.values "^1.1.0"
+ read-pkg-up "^2.0.0"
+ resolve "^1.12.0"
+
eslint-plugin-jest@^23.6.0:
version "23.8.2"
resolved "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-23.8.2.tgz#6f28b41c67ef635f803ebd9e168f6b73858eb8d4"
@@ -8041,6 +8079,19 @@ eslint-plugin-jsx-a11y@6.2.3, eslint-plugin-jsx-a11y@^6.2.1:
has "^1.0.3"
jsx-ast-utils "^2.2.1"
+eslint-plugin-monorepo@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.npmjs.org/eslint-plugin-monorepo/-/eslint-plugin-monorepo-0.2.1.tgz#96cfc4af241077675f40d7017377897fb8ea537b"
+ integrity sha512-82JaAjuajVAsDT+pMvdt275H6F55H3MEofaMZbJurGqfXpPDT4eayTgYyyjfd1XR8VD1S+ORbuHCULnSqNyD9g==
+ dependencies:
+ eslint-module-utils "^2.1.1"
+ get-monorepo-packages "^1.1.0"
+ globby "^7.1.1"
+ load-json-file "^4.0.0"
+ minimatch "^3.0.4"
+ parse-package-name "^0.1.0"
+ path-is-inside "^1.0.2"
+
eslint-plugin-notice@^0.8.9:
version "0.8.9"
resolved "https://registry.npmjs.org/eslint-plugin-notice/-/eslint-plugin-notice-0.8.9.tgz#b3b55ba218b36a01fd4de998f68c66a8bf238a82"
@@ -9123,6 +9174,14 @@ get-caller-file@^2.0.1:
resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+get-monorepo-packages@^1.1.0:
+ version "1.2.0"
+ resolved "https://registry.npmjs.org/get-monorepo-packages/-/get-monorepo-packages-1.2.0.tgz#3eee88d30b11a5f65955dec6ae331958b2a168e4"
+ integrity sha512-aDP6tH+eM3EuVSp3YyCutOcFS4Y9AhRRH9FAd+cjtR/g63Hx+DCXdKoP1ViRPUJz5wm+BOEXB4FhoffGHxJ7jQ==
+ dependencies:
+ globby "^7.1.1"
+ load-json-file "^4.0.0"
+
get-own-enumerable-property-symbols@^3.0.0:
version "3.0.2"
resolved "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
@@ -9448,6 +9507,18 @@ globby@^6.1.0:
pify "^2.0.0"
pinkie-promise "^2.0.0"
+globby@^7.1.1:
+ version "7.1.1"
+ resolved "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+ integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
+ dependencies:
+ array-union "^1.0.1"
+ dir-glob "^2.0.0"
+ glob "^7.1.2"
+ ignore "^3.3.5"
+ pify "^3.0.0"
+ slash "^1.0.0"
+
globby@^9.2.0:
version "9.2.0"
resolved "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"
@@ -11207,14 +11278,6 @@ jest-environment-node@^25.1.0:
jest-mock "^25.1.0"
jest-util "^25.1.0"
-jest-fetch-mock@^3.0.3:
- version "3.0.3"
- resolved "https://registry.npmjs.org/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz#31749c456ae27b8919d69824f1c2bd85fe0a1f3b"
- integrity sha512-Ux1nWprtLrdrH4XwE7O7InRY6psIi3GOsqNESJgMJ+M5cv4A8Lh7SN9d2V2kKRZ8ebAfcd1LNyZguAOb6JiDqw==
- dependencies:
- cross-fetch "^3.0.4"
- promise-polyfill "^8.1.3"
-
jest-get-type@^24.9.0:
version "24.9.0"
resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
@@ -13520,11 +13583,6 @@ node-fetch-npm@^2.0.2:
json-parse-better-errors "^1.0.0"
safe-buffer "^5.1.1"
-node-fetch@2.6.0, node-fetch@^2.3.0, node-fetch@^2.5.0, node-fetch@^2.6.0:
- version "2.6.0"
- resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
- integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
-
node-fetch@^1.0.1:
version "1.7.3"
resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -13533,6 +13591,11 @@ node-fetch@^1.0.1:
encoding "^0.1.11"
is-stream "^1.0.1"
+node-fetch@^2.3.0, node-fetch@^2.5.0, node-fetch@^2.6.0:
+ version "2.6.0"
+ resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
+ integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+
node-forge@0.9.0:
version "0.9.0"
resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
@@ -14556,6 +14619,11 @@ parse-json@^5.0.0:
json-parse-better-errors "^1.0.1"
lines-and-columns "^1.1.6"
+parse-package-name@^0.1.0:
+ version "0.1.0"
+ resolved "https://registry.npmjs.org/parse-package-name/-/parse-package-name-0.1.0.tgz#3f44dd838feb4c2be4bf318bae4477d7706bade4"
+ integrity sha1-P0Tdg4/rTCvkvzGLrkR313BrreQ=
+
parse-passwd@^1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
@@ -15688,11 +15756,6 @@ promise-inflight@^1.0.1, promise-inflight@~1.0.1:
resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
-promise-polyfill@^8.1.3:
- version "8.1.3"
- resolved "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.1.3.tgz#8c99b3cf53f3a91c68226ffde7bde81d7f904116"
- integrity sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g==
-
promise-retry@^1.1.1:
version "1.1.1"
resolved "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
@@ -16235,7 +16298,7 @@ react-router-dom@^5.1.2:
tiny-invariant "^1.0.2"
tiny-warning "^1.0.0"
-react-router@5.1.2:
+react-router@5.1.2, react-router@^5.1.2:
version "5.1.2"
resolved "https://registry.npmjs.org/react-router/-/react-router-5.1.2.tgz#6ea51d789cb36a6be1ba5f7c0d48dd9e817d3418"
integrity sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A==
@@ -16861,7 +16924,7 @@ request@^2.85.0, request@^2.87.0, request@^2.88.0:
tunnel-agent "^0.6.0"
uuid "^3.3.2"
-"request@github:cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16":
+request@cypress-io/request#b5af0d1fa47eec97ba980cde90a13e69a2afcd16:
version "2.88.1"
resolved "https://codeload.github.com/cypress-io/request/tar.gz/b5af0d1fa47eec97ba980cde90a13e69a2afcd16"
dependencies:
@@ -18929,6 +18992,16 @@ ts-pnp@1.1.6, ts-pnp@^1.1.2, ts-pnp@^1.1.6:
resolved "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.6.tgz#389a24396d425a0d3162e96d2b4638900fdc289a"
integrity sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ==
+tsconfig-paths@^3.9.0:
+ version "3.9.0"
+ resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
+ integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==
+ dependencies:
+ "@types/json5" "^0.0.29"
+ json5 "^1.0.1"
+ minimist "^1.2.0"
+ strip-bom "^3.0.0"
+
tslib@1.10.0:
version "1.10.0"
resolved "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
@@ -19639,7 +19712,7 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3, whatwg-encoding@^1.0.5:
dependencies:
iconv-lite "0.4.24"
-whatwg-fetch@3.0.0, whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0:
+whatwg-fetch@>=0.10.0, whatwg-fetch@^3.0.0:
version "3.0.0"
resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"
integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==
+
+
+