+ {title}
+ {children}
+
+ ) : (
+
-
- {widgets.map(({ size, component: WidgetComponent }, index) => (
-
-
-
-
- ))}
-
-
- );
-};
-
-export default WidgetViewComponent;
diff --git a/packages/core/src/components/Sequence/Sequence.stories.tsx b/packages/core/src/components/Sequence/Sequence.stories.tsx
deleted file mode 100644
index f1fd817487..0000000000
--- a/packages/core/src/components/Sequence/Sequence.stories.tsx
+++ /dev/null
@@ -1,81 +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 React, { useState } from 'react';
-import { TextField } from '@material-ui/core';
-import Sequence, { StepType } from '.';
-
-export default {
- title: 'Sequence',
- component: Sequence,
-};
-
-const steps = [
- {
- title: 'Step 1!',
- content: Slide 1 content
,
- },
- {
- title: 'Step 2!',
- content: Slide 2 content
,
- },
- {
- title: 'Step 3!',
- content: Slide 3 content
,
- },
-];
-
-export const Horizontal = () => (
-
- setRequired(!!e.target.value)}
- />
-
- ),
- };
- return You've completed the sequence
,
- };
- return (
- step0
,
- },
- {
- title: 'Step 1',
- content: step1
,
- actions: { nextStep: () => 3 },
- },
- {
- title: 'Step 2',
- content: step2
,
- },
- {
- title: 'Step 3',
- content: step3
,
- },
- ];
- });
-
- it('Handles nextStep property', () => {
- const rendered = render(
- wrapInTestApp(step0
,
- },
- {
- title: 'Final Step',
- actions: {
- nextText: 'FinalStepNext',
- },
- content: final step
,
- },
- ];
-
- const rendered = render(
- wrapInTestApp(
-
- {completed?.title}
- {completed?.content}
-
- {completed?.actions?.completedButton}
-
-
- )}
- {/* Horizontal steppers have buttons on the bottom of stepper */}
- {!isVertical && (
- <>
-
- {horizontalStep}
-
-
- )}
- This is the content for step 1
+ This is the content for step 2
+ This is the content for step 3
+ This is the content for step 2
+ This is the content for step 3
+ This is the content for step 1
+ This is the content for step 2
+ You've completed the Stepper
+ step0
+ step1
+ step2
+ step3
+ step0
+ step1
+ step2
+ step3
+ step0
+ final step
+
+
{[undefined, true].includes(actions.showBack) && stepIndex !== 0 && (
= ({
text={actions.nextText}
handleClick={handleNext}
disabled={
- (!!length && stepIndex >= length) ||
+ (!!stepperLength && stepIndex >= stepperLength) ||
(!!actions.canNext && !actions.canNext())
}
stepIndex={stepIndex}
@@ -151,4 +146,4 @@ const SequenceFooter: FC = ({
);
};
-export default SequenceFooter;
+export default SimpleStepperFooter;
diff --git a/packages/core/src/components/SimpleStepper/SimpleStepperStep.tsx b/packages/core/src/components/SimpleStepper/SimpleStepperStep.tsx
new file mode 100644
index 0000000000..21fbb11cf2
--- /dev/null
+++ b/packages/core/src/components/SimpleStepper/SimpleStepperStep.tsx
@@ -0,0 +1,86 @@
+/*
+ * 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 React, { FC } from 'react';
+import {
+ Step as MuiStep,
+ StepContent,
+ StepLabel,
+ Typography,
+ makeStyles,
+} from '@material-ui/core';
+import SimpleStepperFooter from './SimpleStepperFooter';
+
+const useStyles = makeStyles((theme) => ({
+ end: {
+ padding: theme.spacing(3),
+ },
+}));
+
+export type StepActions = {
+ showNext?: boolean;
+ canNext?: () => boolean;
+ onNext?: () => void;
+ nextStep?: (current: number, last: number) => number;
+ nextText?: string;
+
+ showBack?: boolean;
+ backText?: string;
+ onBack?: () => void;
+
+ showRestart?: boolean;
+ canRestart?: () => boolean;
+ onRestart?: () => void;
+ restartText?: string;
+};
+
+export type StepProps = {
+ title: string;
+ children: React.ReactElement;
+ end?: boolean;
+ actions?: StepActions;
+};
+
+const Step: FC = ({
+ title,
+ children,
+ end,
+ actions,
+ ...muiProps
+}) => {
+ const classes = useStyles();
+
+ // The end step is not a part of the stepper
+ // It simply is the final screen with an option to have buttons such as reset or back
+ return end ? (
+
+
+ {title}
+
+
+ {children}
+
+
+ );
+};
+
+export default Step;
diff --git a/packages/core/src/components/SimpleStepper/index.ts b/packages/core/src/components/SimpleStepper/index.ts
new file mode 100644
index 0000000000..00eb92a382
--- /dev/null
+++ b/packages/core/src/components/SimpleStepper/index.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 SimpleStepper from './SimpleStepper';
+import SimpleStepperStep from './SimpleStepperStep';
+
+export { SimpleStepper, SimpleStepperStep };
diff --git a/packages/core/src/components/SortableTable/SortableTable.js b/packages/core/src/components/SortableTable/SortableTable.js
deleted file mode 100644
index ab4e1af2de..0000000000
--- a/packages/core/src/components/SortableTable/SortableTable.js
+++ /dev/null
@@ -1,296 +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 React from 'react';
-import { pure } from 'recompose';
-import PropTypes from 'prop-types';
-import {
- Table,
- TableBody,
- TableCell,
- TableFooter,
- TableHead,
- TableRow,
- TableSortLabel,
- Tooltip,
-} from '@material-ui/core';
-
-/**
- * Table header which supports sorting ascending and desc
- */
-const EnhancedTableHead = ({ columns, onRequestSort, order, orderBy }) => {
- const createSortHandler = property => event => {
- onRequestSort(event, property);
- };
-
- return (
-
-
- {columns.map(column => (
-
-
-
- {column.label}
-
-
-
- ))}
-
-
- );
-};
-
-EnhancedTableHead.propTypes = {
- columns: PropTypes.arrayOf(
- PropTypes.shape({
- id: PropTypes.string.isRequired,
- label: PropTypes.string.isRequired,
- numeric: PropTypes.bool,
- disablePadding: PropTypes.bool,
- style: PropTypes.object,
- }),
- ).isRequired,
- onRequestSort: PropTypes.func.isRequired,
- order: PropTypes.string.isRequired,
- orderBy: PropTypes.string.isRequired,
-};
-
-/**
- * CellContent can be an array or a string
- */
-const CellContent = ({ data }) => {
- if (Array.isArray(data)) {
- return data.map((item, index) => (
-
- {item}
-
- - )); - } - return data; -}; - -CellContent.propTypes = { - data: PropTypes.any.isRequired, -}; - -const DataTableCell = ({ column, row }) => { - return ( -
-
- );
-};
-
-const noop = () => {};
-const DataTableRow = pure(({ row, columns, handleRowClick, style }) => {
- const onClick = event => (handleRowClick || noop)(event, row.id);
- return (
-
- {columns.map(column => (
-
- );
-});
-
-/**
- * Table with sorting capabilites automatic rendering of cells
- * Note that the objects in props.data needs have an id property
- * The columns array defines which columns from the data to show.
- *
- * @param {Array[Object]} data A list of data entries, where object properties must
- * be strictly equal to column ids.
- *
- * @param {Array[Object]} columns A list of columns with the following shape:
- * {
- * // The column identifier must be strictly equal the relevant data entry
- * // key:
- * id: String,
- *
- * // The display label for the column:
- * label: String,
- *
- * // If true, the column contents will be right-aligned:
- * numeric: Boolean,
- *
- * // If true, padding will be disabled for table cells:
- * disablePadding: Boolean,
- *
- * // A function taking a data row and returning a suitable primitive for
- * // sorting:
- * sortValue: (Object) => Any
- * }
- *
- * @param {String} orderBy The column ID initially used for sorting
- *
- * @param {String} [dataVersion] A version identifier for the data which *must*
- * be updated when the contents of the data changes. This can be used for
- * components where the same SortableTable element will be used to display
- * variable sets of data.
- *
- * @param {Array[Object]} [footerData] A list of data entries to be placed in
- * the table footer, which will not be sorted.
- *
- * @param {(String, Event) => Void} [onRowClicked] Get notified when a user clicks
- * on the row. The handler will receive the row id as the first argument, and
- * the synthetic click event as the second argument.
- *
- * @example
- * render {
- * const data = [
- * { id: 'buffalos', amount: 1, status: {console.log('Row:' + id + ' clicked');
- * ev.preventDefault();}}/>)
- * }
- *
- * @deprecated use shared/components/DataGrid
- */
-class SortableTable extends React.Component {
- static propTypes = {
- // TODO: figure out how to make id of the object requried while others are dynamic
- data: PropTypes.arrayOf(PropTypes.object).isRequired,
- orderBy: PropTypes.string.isRequired,
- columns: PropTypes.arrayOf(PropTypes.object).isRequired,
- onRowClicked: PropTypes.func,
- dataVersion: PropTypes.string,
- };
-
- constructor(props) {
- super(props);
- this.handleRowClick = this.handleRowClick.bind(this);
-
- this.state = {
- orderBy: props.orderBy,
- order: 'asc',
- data: props.data,
- };
- }
-
- handleRequestSort = (event, property) => {
- event.preventDefault();
- const orderBy = property;
- let order = 'desc';
- if (this.state.orderBy === property && this.state.order === 'desc') {
- order = 'asc';
- }
- this.updateData(this.state.data, orderBy, order);
- };
-
- handleRowClick = (event, id) => {
- if (this.props.onRowClicked) {
- this.props.onRowClicked(id, event);
- }
- };
-
- updateData = (data, orderBy, order) => {
- const sortValueFn = (
- this.props.columns.filter(col => col.id === orderBy)[0] || {}
- ).sortValue;
-
- const sortedData = data.slice().sort((a, b) => {
- const valueA = sortValueFn ? sortValueFn(a) : a[orderBy];
- const valueB = sortValueFn ? sortValueFn(b) : b[orderBy];
- const inc = order === 'desc' ? -1 : 1;
- if (valueA === valueB) return 0;
- if (valueA === '' || valueA === null) return inc;
- if (valueB === '' || valueB === null) return -inc;
- return valueA < valueB ? -inc : inc;
- });
- this.setState({ data: sortedData, order, orderBy });
- };
-
- UNSAFE_componentWillReceiveProps(props) {
- if (props.dataVersion !== this.props.dataVersion) {
- this.updateData(props.data, this.state.orderBy, this.state.order);
- }
- }
-
- render() {
- const { data, order, orderBy } = this.state;
- const { columns, dataVersion, footerData } = this.props;
-
- let tableFoot = null;
- if (footerData && footerData.length > 0) {
- tableFoot = (
-
- {footerData.map(row => (
-
- );
- }
- return (
-
-
- );
- }
-}
-
-export default SortableTable;
diff --git a/packages/core/src/components/SortableTable/SortableTable.stories.tsx b/packages/core/src/components/SortableTable/SortableTable.stories.tsx
deleted file mode 100644
index 2a903e1df7..0000000000
--- a/packages/core/src/components/SortableTable/SortableTable.stories.tsx
+++ /dev/null
@@ -1,61 +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 React from 'react';
-import { StatusError, StatusOK, StatusWarning } from 'components/Status';
-import SortableTable from './SortableTable';
-
-export default {
- title: 'Sortable Table',
- component: SortableTable,
-};
-const containerStyle = { width: 600, padding: 20 };
-
-const data = [
- { id: 'buffalos', amount: 1, status: (theme => ({
+const useStyles = makeStyles((theme) => ({
status: {
width: 12,
height: 12,
@@ -34,6 +34,7 @@ const useStyles = makeStyles(theme => ({
backgroundColor: theme.palette.status.warning,
},
error: {
+ // Use same for Failed status.
width: '0',
height: '0',
borderLeft: '7px solid transparent',
@@ -43,11 +44,8 @@ const useStyles = makeStyles(theme => ({
pending: {
backgroundColor: theme.palette.status.pending,
},
- failed: {
- backgroundColor: 'rgba(245, 155, 35, 0.5)',
- },
running: {
- animation: 'blink 0.8s step-start 0s infinite',
+ animation: '$blink 0.8s step-start 0s infinite',
backgroundColor: theme.palette.status.running,
},
'@keyframes blink': {
@@ -57,7 +55,7 @@ const useStyles = makeStyles(theme => ({
},
}));
-export const StatusOK: FC<{}> = props => {
+export const StatusOK: FC<{}> = (props) => {
const classes = useStyles(props);
return (
= props => {
);
};
-export const StatusWarning: FC<{}> = props => {
+export const StatusWarning: FC<{}> = (props) => {
const classes = useStyles(props);
return (
= props => {
);
};
-export const StatusError: FC<{}> = props => {
+export const StatusError: FC<{}> = (props) => {
const classes = useStyles(props);
return (
= props => {
);
};
-export const StatusNA: FC<{}> = props => (
+export const StatusNA: FC<{}> = (props) => (
N/A
);
-export const StatusPending: FC<{}> = props => {
+export const StatusPending: FC<{}> = (props) => {
const classes = useStyles(props);
return (
= props => {
);
};
-export const StatusRunning: FC<{}> = props => {
+export const StatusRunning: FC<{}> = (props) => {
const classes = useStyles(props);
return (
= props => {
);
};
-export const StatusFailed: FC<{}> = props => {
+export const StatusFailed: FC<{}> = (props) => {
const classes = useStyles(props);
return (
diff --git a/packages/core/src/components/StructuredMetadataTable/MetadataTable.js b/packages/core/src/components/StructuredMetadataTable/MetadataTable.tsx
similarity index 57%
rename from packages/core/src/components/StructuredMetadataTable/MetadataTable.js
rename to packages/core/src/components/StructuredMetadataTable/MetadataTable.tsx
index dce6b63946..9ef9196966 100644
--- a/packages/core/src/components/StructuredMetadataTable/MetadataTable.js
+++ b/packages/core/src/components/StructuredMetadataTable/MetadataTable.tsx
@@ -21,44 +21,55 @@ import {
TableCell,
TableRow,
withStyles,
+ createStyles,
+ WithStyles,
+ Theme,
} from '@material-ui/core';
-
-const tableTitleCellStyles = theme => ({
- root: {
- fontWeight: 'bolder',
- whiteSpace: 'nowrap',
- paddingRight: theme.spacing(4),
- border: '0',
- verticalAlign: 'top',
- },
-});
+const tableTitleCellStyles = (theme: Theme) =>
+ createStyles({
+ root: {
+ fontWeight: 'bolder',
+ whiteSpace: 'nowrap',
+ paddingRight: theme.spacing(4),
+ border: '0',
+ verticalAlign: 'top',
+ },
+ });
const tableContentCellStyles = {
root: {
- color: 'rgba(0, 0, 0, 0.6)',
border: '0',
verticalAlign: 'top',
},
};
-const listStyles = theme => ({
- root: {
- listStyle: 'none',
- margin: theme.spacing(0, 0, -1, 0),
- padding: '0',
- },
-});
+const listStyles = (theme: Theme) =>
+ createStyles({
+ root: {
+ listStyle: 'none',
+ margin: theme.spacing(0, 0, -1, 0),
+ padding: '0',
+ },
+ });
-const listItemStyles = theme => ({
- root: {
- padding: theme.spacing(0, 0, 1, 0),
- },
-});
+const listItemStyles = (theme: Theme) =>
+ createStyles({
+ root: {
+ padding: theme.spacing(0, 0, 1, 0),
+ },
+ random: {},
+ });
const TitleCell = withStyles(tableTitleCellStyles)(TableCell);
const ContentCell = withStyles(tableContentCellStyles)(TableCell);
-export const MetadataTable = ({ dense, children }) => (
+export const MetadataTable = ({
+ dense,
+ children,
+}: {
+ dense?: boolean;
+ children: React.ReactNode;
+}) => (
{!dense && (
);
-export const MetadataTableItem = ({ title, children, ...rest }) => (
+export const MetadataTableItem = ({
+ title,
+ children,
+ ...rest
+}: {
+ title: string;
+ children: React.ReactNode;
+}) => (
{title && {title} }
@@ -79,10 +97,18 @@ export const MetadataTableItem = ({ title, children, ...rest }) => (
);
-export const MetadataList = withStyles(listStyles)(({ classes, children }) => (
+interface StyleProps extends WithStyles {
+ children?: React.ReactNode;
+}
+
+export const MetadataList = withStyles(
+ listStyles,
+)(({ classes, children }: StyleProps) => (
{children} );
+)(({ classes, children }: StyleProps) => (
+ {children}
+));
diff --git a/packages/core/src/components/StructuredMetadataTable/StructuredMetadataTable.js b/packages/core/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
similarity index 63%
rename from packages/core/src/components/StructuredMetadataTable/StructuredMetadataTable.js
rename to packages/core/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
index 60516a56f1..cebf3581d4 100644
--- a/packages/core/src/components/StructuredMetadataTable/StructuredMetadataTable.js
+++ b/packages/core/src/components/StructuredMetadataTable/StructuredMetadataTable.tsx
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-import React, { Component, Fragment } from 'react';
-import { withStyles } from '@material-ui/core';
+import React, { Component, Fragment, ReactElement } from 'react';
+import { withStyles, createStyles, WithStyles, Theme } from '@material-ui/core';
import startCase from 'lodash/startCase';
import {
@@ -25,22 +25,23 @@ import {
MetadataListItem,
} from './MetadataTable';
-const listStyle = {
+const listStyle = createStyles({
root: {
margin: '0 0',
listStyleType: 'none',
},
-};
+});
-const nestedListStyle = {
- root: {
- ...listStyle.root,
- paddingLeft: '8px',
- },
-};
+const nestedListStyle = (theme: Theme) =>
+ createStyles({
+ root: {
+ ...listStyle.root,
+ paddingLeft: theme.spacing(1),
+ },
+ });
-function renderList(list, options, nested) {
- const values = list.map((item, index) => (
+function renderList(list: Array, nested?: boolean) {
+ const values = list.map((item: any, index: number) => (
{toValue(item)}
));
return nested ? (
@@ -50,8 +51,12 @@ function renderList(list, options, nested) {
);
}
-function renderMap(map, options, nested) {
- const values = Object.keys(map).map(key => {
+function renderMap(
+ map: { [key: string]: any },
+ nested?: boolean,
+ options?: any,
+) {
+ const values = Object.keys(map).map((key) => {
const value = toValue(map[key], true);
const fmtKey =
options && options.titleFormat
@@ -72,7 +77,11 @@ function renderMap(map, options, nested) {
);
}
-function toValue(value, options, nested) {
+function toValue(
+ value: ReactElement | object | Array,
+ options?: any,
+ nested?: boolean,
+) {
if (React.isValidElement(value)) {
return {value} ;
}
@@ -82,31 +91,44 @@ function toValue(value, options, nested) {
}
if (Array.isArray(value)) {
- return renderList(value, options, nested);
+ return renderList(value, nested);
}
return {value} ;
}
-function mapToItems(info, options) {
- return Object.keys(info).map(key => (
+function mapToItems(info: { [key: string]: string }, options: any) {
+ return Object.keys(info).map((key) => (
{children}
));
const StyledNestedList = withStyles(
nestedListStyle,
-)(({ classes, children }) => (
+)(({ classes, children }: StyleProps) => (
{children}
));
-const ItemValue = ({ value, options }) => (
+const ItemValue = ({ value, options }: { value: any; options: any }) => (
{toValue(value, options)}
);
-const TableItem = ({ title, value, options }) => {
+const TableItem = ({
+ title,
+ value,
+ options,
+}: {
+ title: string;
+ value: any;
+ options: any;
+}) => {
return (
{
);
};
-export default class StructuredMetadataTable extends Component {
+interface ComponentProps {
+ metadata: { [key: string]: any };
+ dense?: boolean;
+ options?: any;
+}
+export default class StructuredMetadataTable extends Component {
render() {
const { metadata, dense, options } = this.props;
const metadataItems = mapToItems(metadata, options || {});
diff --git a/packages/core/src/components/StructuredMetadataTable/index.js b/packages/core/src/components/StructuredMetadataTable/index.tsx
similarity index 100%
rename from packages/core/src/components/StructuredMetadataTable/index.js
rename to packages/core/src/components/StructuredMetadataTable/index.tsx
diff --git a/packages/core/src/components/Table/SubvalueCell.tsx b/packages/core/src/components/Table/SubvalueCell.tsx
new file mode 100644
index 0000000000..d8465b2a23
--- /dev/null
+++ b/packages/core/src/components/Table/SubvalueCell.tsx
@@ -0,0 +1,47 @@
+/*
+ * 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 React, { FC } from 'react';
+import { BackstageTheme } from '@backstage/theme';
+import { makeStyles } from '@material-ui/core';
+
+const useSubvalueCellStyles = makeStyles(theme => ({
+ value: {
+ marginBottom: '6px',
+ },
+ subvalue: {
+ color: theme.palette.textSubtle,
+ fontWeight: 'normal',
+ },
+}));
+
+type SubvalueCellProps = {
+ value: React.ReactNode;
+ subvalue: React.ReactNode;
+};
+
+const SubvalueCell: FC = ({ value, subvalue }) => {
+ const classes = useSubvalueCellStyles();
+
+ return (
+ <>
+
+ );
+};
+
+export const HiddenSearchTable = () => {
+ const columns: TableColumn[] = [
+ {
+ title: 'Column 1',
+ field: 'col1',
+ highlight: true,
+ },
+ {
+ title: 'Column 2',
+ field: 'col2',
+ },
+ {
+ title: 'Numeric value',
+ field: 'number',
+ type: 'numeric',
+ },
+ {
+ title: 'A Date',
+ field: 'date',
+ type: 'date',
+ },
+ ];
+
+ return (
+
+ );
+};
+
+export const SubvalueTable = () => {
+ const columns: TableColumn[] = [
+ {
+ title: 'Column 1',
+ customFilterAndSearch: (
+ query,
+ row: any, // Only needed if you want subvalue searchable
+ ) =>
+ `${row.col1} ${row.subvalue}`
+ .toUpperCase()
+ .includes(query.toUpperCase()),
+ field: 'col1',
+ highlight: true,
+ render: (row: any): React.ReactNode => (
+
+ );
+};
diff --git a/packages/core/src/components/Table/Table.test.tsx b/packages/core/src/components/Table/Table.test.tsx
new file mode 100644
index 0000000000..f6801359eb
--- /dev/null
+++ b/packages/core/src/components/Table/Table.test.tsx
@@ -0,0 +1,50 @@
+/*
+ * 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 React from 'react';
+import { render } from '@testing-library/react';
+import { wrapInTestApp } from '@backstage/test-utils';
+import Table from './';
+
+const minProps = {
+ columns: [
+ {
+ title: 'Column 1',
+ field: 'col1',
+ },
+ {
+ title: 'Column 2',
+ field: 'col2',
+ },
+ ],
+ data: [
+ {
+ col1: 'first value, first row',
+ col2: 'second value, first row',
+ },
+ {
+ col1: 'first value, second row',
+ col2: 'second value, second row',
+ },
+ ],
+};
+
+describe('
', () => {
+ it('renders without exploding', () => {
+ const rendered = render(wrapInTestApp(
));
+ expect(rendered.getByText('second value, second row')).toBeInTheDocument();
+ });
+});
diff --git a/packages/core/src/components/Table/Table.tsx b/packages/core/src/components/Table/Table.tsx
new file mode 100644
index 0000000000..a9a55ae763
--- /dev/null
+++ b/packages/core/src/components/Table/Table.tsx
@@ -0,0 +1,192 @@
+/*
+ * 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 React, { FC, forwardRef } from 'react';
+import MTable, {
+ MTableCell,
+ MTableHeader,
+ MTableToolbar,
+ MaterialTableProps,
+ Options,
+ Column,
+} from 'material-table';
+import { BackstageTheme } from '@backstage/theme';
+import { makeStyles } from '@material-ui/core';
+
+// Material-table is not using the standard icons available in in material-ui. https://github.com/mbrn/material-table/issues/51
+import {
+ AddBox,
+ ArrowUpward,
+ Check,
+ ChevronLeft,
+ ChevronRight,
+ Clear,
+ DeleteOutline,
+ Edit,
+ FilterList,
+ FirstPage,
+ LastPage,
+ Remove,
+ SaveAlt,
+ Search,
+ ViewColumn,
+} from '@material-ui/icons';
+
+const tableIcons = {
+ Add: forwardRef((props, ref: React.Ref) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+ ) => (
+ (theme => ({
+ root: {
+ color: theme.palette.grey[500],
+ padding: theme.spacing(0, 2, 0, 2.5),
+ height: '56px',
+ },
+}));
+
+const useHeaderStyles = makeStyles(theme => ({
+ header: {
+ padding: theme.spacing(1, 2, 1, 2.5),
+ borderTop: `1px solid ${theme.palette.grey.A100}`,
+ borderBottom: `1px solid ${theme.palette.grey.A100}`,
+ color: theme.palette.textSubtle,
+ fontWeight: 'bold',
+ position: 'static',
+ },
+}));
+
+const useToolbarStyles = makeStyles(theme => ({
+ root: {
+ padding: theme.spacing(3, 0, 2.5, 2.5),
+ },
+ title: {
+ '& > h6': {
+ fontWeight: 'bold',
+ },
+ },
+}));
+
+const convertColumns = (columns: TableColumn[]): TableColumn[] => {
+ return columns.map(column => {
+ const headerStyle: React.CSSProperties = {};
+ const cellStyle: React.CSSProperties = {};
+
+ if (column.highlight) {
+ headerStyle.color = '#000000';
+ cellStyle.fontWeight = 'bold';
+ }
+
+ return {
+ ...column,
+ headerStyle,
+ cellStyle,
+ };
+ });
+};
+
+export interface TableColumn extends Column<{}> {
+ highlight?: boolean;
+}
+
+export interface TableProps extends MaterialTableProps<{}> {
+ columns: TableColumn[];
+}
+
+const Table: FC = ({ columns, options, ...props }) => {
+ const cellClasses = useCellStyles();
+ const headerClasses = useHeaderStyles();
+ const toolbarClasses = useToolbarStyles();
+
+ const MTColumns = convertColumns(columns);
+
+ const defaultOptions: Options = {
+ headerStyle: {
+ textTransform: 'uppercase',
+ },
+ };
+
+ return (
+ (
+
-
+ {} }}
+ />,
+ ),
+ );
+ rendered.getByText(/page not found/i);
+ rendered.getByText(/404/i);
+ rendered.getByText(/Looks like someone dropped the mic!/i);
+ expect(rendered.getByTestId('go-back-link')).toBeDefined();
+ });
+});
diff --git a/packages/core/src/layout/ErrorPage/ErrorPage.tsx b/packages/core/src/layout/ErrorPage/ErrorPage.tsx
new file mode 100644
index 0000000000..49b79ef925
--- /dev/null
+++ b/packages/core/src/layout/ErrorPage/ErrorPage.tsx
@@ -0,0 +1,68 @@
+/*
+ * 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 React from 'react';
+import { Typography, Link, Grid } from '@material-ui/core';
+import { makeStyles } from '@material-ui/core/styles';
+import { BackstageTheme } from '@backstage/theme';
+import MicDrop from './MicDrop';
+
+interface IErrorPageProps {
+ status: string;
+ statusMessage: string;
+ history: {
+ goBack: () => void;
+ };
+}
+
+const useStyles = makeStyles((theme) => ({
+ container: {
+ padding: theme.spacing(8),
+ },
+ title: {
+ paddingBottom: theme.spacing(5),
+ },
+ subtitle: {
+ color: theme.palette.textSubtle,
+ },
+}));
+
+const ErrorPage = ({ status, statusMessage, history }: IErrorPageProps) => {
+ const classes = useStyles();
+
+ return (
+
+
+
+ ERROR {status}: {statusMessage}
+
+
+ Looks like someone dropped the mic!
+
+
+
+ Go back
+
+ ... or if you think this is a bug, please file an{' '}
+ issue.
+
+
+
+ );
+};
+
+export default ErrorPage;
diff --git a/packages/core/src/layout/ErrorPage/MicDrop.js b/packages/core/src/layout/ErrorPage/MicDrop.js
new file mode 100644
index 0000000000..f951830574
--- /dev/null
+++ b/packages/core/src/layout/ErrorPage/MicDrop.js
@@ -0,0 +1,162 @@
+/*
+ * 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 React from 'react';
+import { makeStyles } from '@material-ui/core';
+
+const useStyles = makeStyles({
+ micDrop: {
+ maxWidth: '60%',
+ bottom: 10,
+ right: 10,
+ position: 'absolute',
+ },
+});
+
+const MicDrop = () => {
+ const classes = useStyles();
+ return (
+
+ );
+};
+
+export default MicDrop;
diff --git a/packages/core/src/components/DefaultWidgetView/index.ts b/packages/core/src/layout/ErrorPage/index.ts
similarity index 92%
rename from packages/core/src/components/DefaultWidgetView/index.ts
rename to packages/core/src/layout/ErrorPage/index.ts
index b4aaece4cb..872e5cce2d 100644
--- a/packages/core/src/components/DefaultWidgetView/index.ts
+++ b/packages/core/src/layout/ErrorPage/index.ts
@@ -14,4 +14,4 @@
* limitations under the License.
*/
-export { default } from './DefaultWidgetView';
+export { default } from './ErrorPage';
diff --git a/packages/core/src/layout/InfoCard/InfoCard.tsx b/packages/core/src/layout/InfoCard/InfoCard.tsx
index d645b25aaa..7077167828 100644
--- a/packages/core/src/layout/InfoCard/InfoCard.tsx
+++ b/packages/core/src/layout/InfoCard/InfoCard.tsx
@@ -27,18 +27,18 @@ import {
import ErrorBoundary from 'layout/ErrorBoundary/ErrorBoundary';
import BottomLink, { Props as BottomLinkProps } from '../BottomLink';
-const useStyles = makeStyles(theme => ({
+const useStyles = makeStyles((theme) => ({
header: {
padding: theme.spacing(2, 2, 2, 2.5),
},
}));
-const BoldHeader = withStyles(theme => ({
+const BoldHeader = withStyles((theme) => ({
title: { fontWeight: 700 },
subheader: { paddingTop: theme.spacing(1) },
}))(CardHeader);
-const CardActionsTopRight = withStyles(theme => ({
+const CardActionsTopRight = withStyles((theme) => ({
root: {
display: 'inline-block',
padding: theme.spacing(8, 8, 0, 0),
@@ -52,9 +52,6 @@ const VARIANT_STYLES = {
display: 'flex',
flexDirection: 'column',
},
- widget: {
- height: 430,
- },
fullHeight: {
height: '100%',
},
@@ -79,11 +76,6 @@ const VARIANT_STYLES = {
},
},
cardContent: {
- widget: {
- overflowY: 'auto',
- height: 332,
- width: '100%',
- },
fullHeight: {
height: 'calc(100% - 50px)',
},
@@ -162,7 +154,7 @@ const InfoCard: FC = ({
if (variant) {
const variants = variant.split(/[\s]+/g);
- variants.forEach(name => {
+ variants.forEach((name) => {
calculatedStyle = {
...calculatedStyle,
...VARIANT_STYLES.card[name as keyof typeof VARIANT_STYLES['card']],
diff --git a/packages/core/src/layout/Page/index.ts b/packages/core/src/layout/Page/index.ts
index bb7253bb95..50899fa036 100644
--- a/packages/core/src/layout/Page/index.ts
+++ b/packages/core/src/layout/Page/index.ts
@@ -15,4 +15,5 @@
*/
export { default } from './Page';
-export { gradients, pageTheme, PageTheme } from './PageThemeProvider';
+export { gradients, pageTheme } from './PageThemeProvider';
+export type { PageTheme } from './PageThemeProvider';
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 2a241f6a9a..bafbab2e32 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -16,7 +16,7 @@
"backstage"
],
"license": "Apache-2.0",
- "main": "dist/index.cjs.js",
+ "main": "dist/index.esm.js",
"types": "dist/index.d.ts",
"scripts": {
"build": "backstage-cli plugin:build",
diff --git a/packages/storybook/.storybook/config.js b/packages/storybook/.storybook/config.js
index fab204fd9f..941b02718b 100644
--- a/packages/storybook/.storybook/config.js
+++ b/packages/storybook/.storybook/config.js
@@ -1,14 +1,21 @@
import React from 'react';
-import { addDecorator } from '@storybook/react';
+import { addDecorator, addParameters } from '@storybook/react';
import { lightTheme, darkTheme } from '@backstage/theme';
import { CssBaseline, ThemeProvider } from '@material-ui/core';
import { useDarkMode } from 'storybook-dark-mode';
import { Content } from '@backstage/core';
-addDecorator(story => (
+addDecorator((story) => (
{story()}
));
+
+addParameters({
+ darkMode: {
+ // Set the initial theme
+ current: 'light',
+ },
+});
diff --git a/packages/storybook/.storybook/main.js b/packages/storybook/.storybook/main.js
index 56c00d533f..12b9c34435 100644
--- a/packages/storybook/.storybook/main.js
+++ b/packages/storybook/.storybook/main.js
@@ -1,4 +1,5 @@
const path = require('path');
+const WebpackPluginFailBuildOnWarning = require('./webpack-plugin-fail-build-on-warning');
module.exports = {
stories: [
@@ -11,37 +12,52 @@ module.exports = {
'@storybook/addon-storysource',
'storybook-dark-mode/register',
],
- webpackFinal: async config => {
+ webpackFinal: async (config) => {
+ const coreSrc = path.resolve(__dirname, '../../core/src');
+
config.resolve.alias = {
...config.resolve.alias,
+ // Resolves imports of @backstage/core inside the storybook config, pointing to src
+ '@backstage/core': coreSrc,
+ // Point to dist version of theme and any other packages that might be needed in the future
'@backstage/theme': path.resolve(__dirname, '../../theme'),
};
- config.resolve.modules.push(path.resolve(__dirname, '../../core/src'));
- config.module.rules.push(
- {
- test: /\.(ts|tsx)$/,
- use: [
- {
- loader: require.resolve('ts-loader'),
- options: {
- transpileOnly: true,
- },
- },
- ],
- },
- {
- test: /\.(js|jsx)$/,
- loader: 'babel-loader',
- options: {
- presets: ['@babel/preset-react'],
- plugins: ['@babel/plugin-proposal-class-properties'],
- },
- },
- );
+ config.resolve.modules.push(coreSrc);
+
+ // Remove the default babel-loader for js files, we're using ts-loader instead
+ const [jsLoader] = config.module.rules.splice(0, 1);
+ if (jsLoader.use[0].loader !== 'babel-loader') {
+ throw new Error(
+ `Unexpected loader removed from storybook config, ${jsonLoader.use[0].loader}`,
+ );
+ }
+
config.resolve.extensions.push('.ts', '.tsx');
+ // Use ts-loader for all JS/TS files
+ config.module.rules.push({
+ test: /\.(ts|tsx|mjs|js|jsx)$/,
+ include: [__dirname, coreSrc],
+ exclude: /node_modules/,
+ use: [
+ {
+ loader: require.resolve('ts-loader'),
+ options: {
+ transpileOnly: true,
+ },
+ },
+ ],
+ });
+
// Disable ProgressPlugin which logs verbose webpack build progress. Warnings and Errors are still logged.
- config.plugins = config.plugins.filter(({ constructor }) => constructor.name !== "ProgressPlugin")
+ config.plugins = config.plugins.filter(
+ ({ constructor }) => constructor.name !== 'ProgressPlugin',
+ );
+
+ // Fail storybook build on CI if there are webpack warnings.
+ if (process.env.CI) {
+ config.plugins.push(new WebpackPluginFailBuildOnWarning())
+ }
return config;
},
diff --git a/packages/storybook/.storybook/webpack-plugin-fail-build-on-warning.js b/packages/storybook/.storybook/webpack-plugin-fail-build-on-warning.js
new file mode 100644
index 0000000000..1ccf825839
--- /dev/null
+++ b/packages/storybook/.storybook/webpack-plugin-fail-build-on-warning.js
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+/**
+ * When building storybook, we can have warnings which may cause issues in the future. One of the example case is
+ * https://github.com/spotify/backstage/issues/718. To make sure new warnings are not introduced with new PRs, we
+ * want to fail CI builds if there are warnings when building storybook.
+ *
+ * This webpack plugin makes sure the CI builds fail on Webpack warnings. We also have a whitelist of warnings here
+ * which we think are non-critical.
+ *
+ * Note that this implementation will not detect other warnings emitted by storybook build that are separate from
+ * Webpack. A better solution over this plugin should be preferred, possibly on Storybook level (CLI options etc.)
+ *
+ * The case with #718 is caused because we are using `ts-loader` for `webpack` to load all our JS/TS files, but we
+ * have disabled type checking during build. This is done by setting `transpileOnly` to `true` in storybook/main.js
+ * and it improves the Storybook build speed. Because of this, Webpack emits warnings when we try to re-export types.
+ * Reference: https://github.com/TypeStrong/ts-loader#transpileonly
+ */
+class WebpackPluginFailBuildOnWarning {
+ // Ignore the following warnings in the Webpack build.
+ warningsWhitelist = new Set([
+ 'AssetsOverSizeLimitWarning',
+ 'EntrypointsOverSizeLimitWarning',
+ 'NoAsyncChunksWarning',
+ ]);
+
+ /* Entry point for the Webpack plugin. */
+ apply(compiler) {
+ // Invoke plugin logic when Webpack build is 'done'.
+ compiler.hooks.done.tap('FailBuildOnWarning', this.execute.bind(this));
+ }
+
+ execute(stats) {
+ // All the compilation warnings are stored in stats.compilation.warnings
+ let warnings = stats.compilation.warnings;
+ if (warnings.length > 0) {
+ // Throw error if there are unexpected warnings.
+ for (let warning of warnings) {
+ if (!this.warningsWhitelist.has(warning.name)) {
+ process.on('beforeExit', () => {
+ console.log(
+ `You have some unexpected warning(s) in your webpack build. Exiting process as error.`,
+ );
+ process.exit(1);
+ });
+ // No need to go over the rest of warnings from here.
+ break;
+ }
+ }
+ }
+ }
+}
+
+module.exports = WebpackPluginFailBuildOnWarning;
diff --git a/packages/storybook/tsconfig.json b/packages/storybook/tsconfig.json
new file mode 100644
index 0000000000..87132f9b4f
--- /dev/null
+++ b/packages/storybook/tsconfig.json
@@ -0,0 +1,5 @@
+{
+ "extends": "../../tsconfig.json",
+ "include": [".storybook/**/*"],
+ "compilerOptions": {}
+}
diff --git a/packages/test-utils-core/package.json b/packages/test-utils-core/package.json
index 1b70f4132a..33c27dba62 100644
--- a/packages/test-utils-core/package.json
+++ b/packages/test-utils-core/package.json
@@ -16,12 +16,13 @@
"backstage"
],
"license": "Apache-2.0",
- "main": "dist/index.cjs.js",
+ "main": "dist/index.esm.js",
"types": "dist/index.d.ts",
"scripts": {
"build": "backstage-cli plugin:build",
"lint": "backstage-cli lint",
- "test": "backstage-cli test"
+ "test": "backstage-cli test",
+ "clean": "backstage-cli clean"
},
"dependencies": {
"@testing-library/jest-dom": "^4.2.4",
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 5326cc2e07..e34a750ae0 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -16,7 +16,7 @@
"backstage"
],
"license": "Apache-2.0",
- "main": "dist/index.cjs.js",
+ "main": "dist/index.esm.js",
"types": "dist/index.d.ts",
"scripts": {
"build": "backstage-cli plugin:build",
diff --git a/packages/theme/.eslintrc.js b/packages/theme/.eslintrc.js
new file mode 100644
index 0000000000..13573efa9c
--- /dev/null
+++ b/packages/theme/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+ extends: [require.resolve('@backstage/cli/config/eslint')],
+};
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 0a30f884e0..c3f7f6c57b 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -16,7 +16,7 @@
"backstage"
],
"license": "Apache-2.0",
- "main": "dist/index.cjs.js",
+ "main": "dist/index.esm.js",
"types": "dist/index.d.ts",
"scripts": {
"build": "backstage-cli plugin:build",
diff --git a/packages/theme/src/themes.ts b/packages/theme/src/themes.ts
index 3dad461423..9e9e2945fa 100644
--- a/packages/theme/src/themes.ts
+++ b/packages/theme/src/themes.ts
@@ -28,7 +28,7 @@ export const lightTheme = createTheme({
error: '#CA001B',
running: '#BEBEBE',
pending: '#5BC0DE',
- background: '#FEFEFE',
+ background: '#F8F8F8',
},
bursts: {
fontColor: '#FEFEFE',
@@ -68,7 +68,7 @@ export const darkTheme = createTheme({
error: '#CA001B',
running: '#BEBEBE',
pending: '#5BC0DE',
- background: '#FEFEFE',
+ background: '#282828',
},
bursts: {
fontColor: '#FEFEFE',
diff --git a/plugins/explore/.eslintrc.js b/plugins/explore/.eslintrc.js
new file mode 100644
index 0000000000..13573efa9c
--- /dev/null
+++ b/plugins/explore/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+ extends: [require.resolve('@backstage/cli/config/eslint')],
+};
diff --git a/plugins/explore/README.md b/plugins/explore/README.md
new file mode 100644
index 0000000000..12a4e58380
--- /dev/null
+++ b/plugins/explore/README.md
@@ -0,0 +1,6 @@
+# Title
+Welcome to the explore plugin!
+
+## Sub-section 1
+
+## Sub-section 2
diff --git a/plugins/explore/package.json b/plugins/explore/package.json
new file mode 100644
index 0000000000..fb13381321
--- /dev/null
+++ b/plugins/explore/package.json
@@ -0,0 +1,39 @@
+{
+ "name": "@backstage/plugin-explore",
+ "version": "0.1.1-alpha.4",
+ "main": "dist/index.esm.js",
+ "types": "dist/index.d.ts",
+ "license": "Apache-2.0",
+ "private": true,
+ "scripts": {
+ "build": "backstage-cli plugin:build",
+ "lint": "backstage-cli lint",
+ "test": "backstage-cli test",
+ "clean": "backstage-cli clean"
+ },
+ "devDependencies": {
+ "@backstage/cli": "^0.1.1-alpha.4",
+ "@backstage/test-utils": "^0.1.1-alpha.4",
+ "@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",
+ "@types/testing-library__jest-dom": "5.0.2",
+ "jest-fetch-mock": "^3.0.3"
+ },
+ "dependencies": {
+ "@backstage/core": "^0.1.1-alpha.4",
+ "@backstage/theme": "^0.1.1-alpha.4",
+ "@material-ui/core": "^4.9.1",
+ "@material-ui/icons": "^4.9.1",
+ "@material-ui/lab": "4.0.0-alpha.45",
+ "classnames": "^2.2.6",
+ "react": "16.13.1",
+ "react-dom": "16.13.1",
+ "react-use": "^13.0.0"
+ },
+ "files": [
+ "dist"
+ ]
+}
diff --git a/plugins/explore/src/components/ExploreCard.test.js b/plugins/explore/src/components/ExploreCard.test.js
new file mode 100644
index 0000000000..fde36b529d
--- /dev/null
+++ b/plugins/explore/src/components/ExploreCard.test.js
@@ -0,0 +1,93 @@
+/*
+ * 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 React from 'react';
+import { render } from '@testing-library/react';
+import { wrapInThemedTestApp } from '@backstage/test-utils';
+
+import ExploreCard from './ExploreCard';
+
+const minProps = {
+ card: {
+ title: 'Title',
+ description: 'Something something',
+ url: 'http://spotify.com/',
+ image: 'https://developer.spotify.com/assets/WebAPI_intro.png',
+ tags: ['tag1', 'tag2'],
+ },
+};
+
+describe('((theme) => ({
+ card: {
+ display: 'flex',
+ flexDirection: 'column',
+ },
+ cardActions: {
+ flexGrow: 1,
+ alignItems: 'flex-end',
+ },
+ media: {
+ height: 128,
+ },
+ mediaContain: {
+ backgroundSize: 'contain',
+ },
+ lifecycle: {
+ lineHeight: '0.8em',
+ color: 'white',
+ },
+ ga: {
+ backgroundColor: theme.palette.status.ok,
+ },
+ alpha: {
+ backgroundColor: theme.palette.status.error,
+ },
+ beta: {
+ backgroundColor: theme.palette.status.warning,
+ },
+ domains: {
+ position: 'relative',
+ top: theme.spacing(2),
+ },
+ spaceBetween: {
+ justifyContent: 'space-between',
+ },
+}));
+
+export type CardData = {
+ title: string;
+ description: string;
+ url: string;
+ image: string;
+ tags?: string[];
+ lifecycle?: string;
+ newsTag?: string;
+};
+
+type Props = {
+ card: CardData;
+ objectFit?: 'cover' | 'contain';
+};
+
+const ExploreCard: FC = ({ card, objectFit }) => {
+ const classes = useStyles();
+
+ const { title, description, url, image, lifecycle, newsTag, tags } = card;
+
+ return (
+
+
+
+ {title}{' '}
+ {lifecycle && lifecycle.toLowerCase() !== 'ga' && (
+
+
+ {description || 'Description missing'}
+
+ {tags && (
+
+
+
+
+
+ );
+};
+
+export default ExploreCard;
diff --git a/plugins/explore/src/components/ExplorePluginPage.tsx b/plugins/explore/src/components/ExplorePluginPage.tsx
new file mode 100644
index 0000000000..48a0f90c32
--- /dev/null
+++ b/plugins/explore/src/components/ExplorePluginPage.tsx
@@ -0,0 +1,93 @@
+/*
+ * 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 React, { FC } from 'react';
+import { makeStyles, Typography } from '@material-ui/core';
+import {
+ Content,
+ ContentHeader,
+ Header,
+ Page,
+ pageTheme,
+ SupportButton,
+} from '@backstage/core';
+import ExploreCard, { CardData } from './ExploreCard';
+import { BackstageTheme } from '@backstage/theme';
+
+const useStyles = makeStyles((theme) => ({
+ container: {
+ display: 'grid',
+ gridTemplateColumns: 'repeat(auto-fill, 296px)',
+ gridGap: theme.spacing(3),
+ marginBottom: theme.spacing(6),
+ },
+}));
+
+const toolsCards = [
+ {
+ title: 'Lighthouse',
+ description:
+ "Google's Lighthouse tool is a great resource for benchmarking and improving the accessibility, performance, SEO, and best practices of your website.",
+ url: '/lighthouse',
+ image:
+ 'https://raw.githubusercontent.com/GoogleChrome/lighthouse/8b3d7f052b2e64dd857e741d7395647f487697e7/assets/lighthouse-logo.png',
+ tags: ['web', 'seo', 'accessibility', 'performance'],
+ },
+ {
+ title: 'Tech Radar',
+ description:
+ 'Tech Radar is a list of technologies, complemented by an assessment result, called ring assignment.',
+ url: '/tech-radar',
+ image:
+ 'https://storage.googleapis.com/wf-blogs-engineering-media/2018/09/fe13bb32-wf-tech-radar-hero-1024x597.png',
+ tags: ['standards', 'landscape'],
+ },
+ {
+ title: 'GraphiQL',
+ description:
+ 'Integrates GraphiQL as a tool to browse GraphiQL endpoints inside Backstage.',
+ url: 'graphiql',
+ image:
+ 'https://camo.githubusercontent.com/517398c3fbe0687d3d4dcbe05da82970b882e75a/68747470733a2f2f64337676366c703535716a6171632e636c6f756466726f6e742e6e65742f6974656d732f33413061324e314c3346324f304c3377326e316a2f477261706869514c382e706e673f582d436c6f75644170702d56697369746f722d49643d3433363432',
+ tags: ['graphql', 'dev'],
+ },
+];
+
+const ExplorePluginPage: FC<{}> = () => {
+ const classes = useStyles();
+ return (
+
+
+
+
+ Explore tools available in Backstage
+
+
+
+
+ );
+};
+
+export default ExplorePluginPage;
diff --git a/packages/core/src/components/Sequence/index.ts b/plugins/explore/src/index.ts
similarity index 92%
rename from packages/core/src/components/Sequence/index.ts
rename to plugins/explore/src/index.ts
index 4391c987b5..3a0a0fe2d3 100644
--- a/packages/core/src/components/Sequence/index.ts
+++ b/plugins/explore/src/index.ts
@@ -14,4 +14,4 @@
* limitations under the License.
*/
-export { default, StepType } from './Sequence';
+export { plugin } from './plugin';
diff --git a/packages/backend/src/test/index.ts b/plugins/explore/src/plugin.test.ts
similarity index 80%
rename from packages/backend/src/test/index.ts
rename to plugins/explore/src/plugin.test.ts
index ce3f9f8c39..d6503c038b 100644
--- a/packages/backend/src/test/index.ts
+++ b/plugins/explore/src/plugin.test.ts
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-import { Router } from 'express';
+import { plugin } from './plugin';
-export const testRouter = Router();
-
-testRouter.get('/', async (_, res) => {
- res.status(200).send('hello');
+describe('explore', () => {
+ it('should export plugin', () => {
+ expect(plugin).toBeDefined();
+ });
});
diff --git a/plugins/explore/src/plugin.ts b/plugins/explore/src/plugin.ts
new file mode 100644
index 0000000000..66e48a9b15
--- /dev/null
+++ b/plugins/explore/src/plugin.ts
@@ -0,0 +1,25 @@
+/*
+ * 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 { createPlugin } from '@backstage/core';
+import ExplorePluginPage from './components/ExplorePluginPage';
+
+export const plugin = createPlugin({
+ id: 'explore',
+ register({ router }) {
+ router.registerRoute('/explore', ExplorePluginPage);
+ },
+});
diff --git a/plugins/explore/src/setupTests.ts b/plugins/explore/src/setupTests.ts
new file mode 100644
index 0000000000..1a907ab8e6
--- /dev/null
+++ b/plugins/explore/src/setupTests.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.
+ */
+
+import '@testing-library/jest-dom/extend-expect';
+require('jest-fetch-mock').enableMocks();
diff --git a/plugins/explore/tsconfig.json b/plugins/explore/tsconfig.json
new file mode 100644
index 0000000000..7b73db2f0f
--- /dev/null
+++ b/plugins/explore/tsconfig.json
@@ -0,0 +1,7 @@
+{
+ "extends": "../../tsconfig.json",
+ "include": ["src"],
+ "compilerOptions": {
+ "baseUrl": "src"
+ }
+}
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index 2db84d275a..086c639bc1 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -16,7 +16,7 @@
"backstage"
],
"license": "Apache-2.0",
- "main": "dist/index.cjs.js",
+ "main": "dist/index.esm.js",
"types": "dist/index.d.ts",
"scripts": {
"build": "backstage-cli plugin:build",
diff --git a/plugins/graphiql/src/components/GraphiQLBrowser/GraphiQLBrowser.tsx b/plugins/graphiql/src/components/GraphiQLBrowser/GraphiQLBrowser.tsx
index e914fd9649..5885183b01 100644
--- a/plugins/graphiql/src/components/GraphiQLBrowser/GraphiQLBrowser.tsx
+++ b/plugins/graphiql/src/components/GraphiQLBrowser/GraphiQLBrowser.tsx
@@ -14,15 +14,17 @@
* limitations under the License.
*/
-import React, { FC, useState } from 'react';
+import React, { FC, useState, Suspense } from 'react';
import { Tabs, Tab, makeStyles, Typography, Divider } from '@material-ui/core';
import 'graphiql/graphiql.css';
-import GraphiQL from 'graphiql';
import { StorageBucket } from 'lib/storage';
import { GraphQLEndpoint } from 'lib/api';
+import { Progress } from '@backstage/core';
import { BackstageTheme } from '@backstage/theme';
-const useStyles = makeStyles(theme => ({
+const GraphiQL = React.lazy(() => import('graphiql'));
+
+const useStyles = makeStyles((theme) => ({
root: {
height: '100%',
display: 'flex',
@@ -58,20 +60,22 @@ export const GraphiQLBrowser: FC = ({ endpoints }) => {
return (
{
+ const lists = await Promise.all(this.inventories.map((i) => i.list()));
+ return lists.flat();
+ }
+
+ item(id: string): Promise {
+ return new Promise((resolve, reject) => {
+ const promises = this.inventories.map((i) =>
+ i.item(id).then(resolve, () => {
+ // For now, just swallow errors in individual inventories;
+ // should handle partial errors better
+ }),
+ );
+ Promise.all(promises).then(() =>
+ reject(new NotFoundError(`Found no component with ID ${id}`)),
+ );
+ });
+ }
+
+ enlist(inventory: Inventory) {
+ this.inventories.push(inventory);
+ }
+}
diff --git a/plugins/inventory-backend/src/inventory/StaticInventory.ts b/plugins/inventory-backend/src/inventory/StaticInventory.ts
new file mode 100644
index 0000000000..4569ae8ed2
--- /dev/null
+++ b/plugins/inventory-backend/src/inventory/StaticInventory.ts
@@ -0,0 +1,34 @@
+/*
+ * 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 { NotFoundError } from '@backstage/backend-common';
+import { Component, Inventory } from './types';
+
+export class StaticInventory implements Inventory {
+ constructor(private components: Component[]) {}
+
+ async list(): Promise {
+ return this.components.slice();
+ }
+
+ async item(id: string): Promise {
+ const item = this.components.find((i) => i.id === id);
+ if (!item) {
+ throw new NotFoundError(`Found no component with ID ${id}`);
+ }
+ return item;
+ }
+}
diff --git a/plugins/inventory-backend/src/inventory/index.ts b/plugins/inventory-backend/src/inventory/index.ts
new file mode 100644
index 0000000000..3affa1109a
--- /dev/null
+++ b/plugins/inventory-backend/src/inventory/index.ts
@@ -0,0 +1,19 @@
+/*
+ * 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 * from './AggregatorInventory';
+export * from './StaticInventory';
+export * from './types';
diff --git a/plugins/inventory-backend/src/inventory/types.ts b/plugins/inventory-backend/src/inventory/types.ts
new file mode 100644
index 0000000000..863dccb291
--- /dev/null
+++ b/plugins/inventory-backend/src/inventory/types.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 type Component = {
+ id: string;
+};
+
+export type Inventory = {
+ list(): Promise;
+ item(id: string): Promise;
+};
diff --git a/plugins/inventory-backend/src/run.ts b/plugins/inventory-backend/src/run.ts
new file mode 100644
index 0000000000..0d5c3a5c12
--- /dev/null
+++ b/plugins/inventory-backend/src/run.ts
@@ -0,0 +1,34 @@
+/*
+ * 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 { getRootLogger } from '@backstage/backend-common';
+import { startStandaloneServer } from './service/standaloneServer';
+
+const port = process.env.PLUGIN_PORT ? Number(process.env.PLUGIN_PORT) : 3003;
+const enableCors = process.env.PLUGIN_CORS
+ ? Boolean(process.env.PLUGIN_CORS)
+ : false;
+const logger = getRootLogger();
+
+startStandaloneServer({ port, enableCors, logger }).catch((err) => {
+ logger.error(err);
+ process.exit(1);
+});
+
+process.on('SIGINT', () => {
+ logger.info('CTRL+C pressed; exiting.');
+ process.exit(0);
+});
diff --git a/plugins/inventory-backend/src/service/router.ts b/plugins/inventory-backend/src/service/router.ts
new file mode 100644
index 0000000000..a05fac08be
--- /dev/null
+++ b/plugins/inventory-backend/src/service/router.ts
@@ -0,0 +1,50 @@
+/*
+ * 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 express from 'express';
+import { Logger } from 'winston';
+import Router from 'express-promise-router';
+import { Inventory } from '../inventory';
+
+export interface RouterOptions {
+ inventory: Inventory;
+ logger: Logger;
+}
+
+export async function createRouter(
+ options: RouterOptions,
+): Promise {
+ const inventory = options.inventory;
+ const logger = options.logger.child({ plugin: 'inventory' });
+
+ const router = Router();
+ router
+ .get('/', async (req, res) => {
+ const components = await inventory.list();
+ res.status(200).send(components);
+ })
+ .get('/:id', async (req, res) => {
+ const { id } = req.params;
+ const component = await inventory.item(id);
+ res.status(200).send(component);
+ });
+
+ const app = express();
+ app.set('logger', logger);
+ app.use('/', router);
+
+ return app;
+}
diff --git a/plugins/inventory-backend/src/service/standaloneApplication.ts b/plugins/inventory-backend/src/service/standaloneApplication.ts
new file mode 100644
index 0000000000..8f0518bb8d
--- /dev/null
+++ b/plugins/inventory-backend/src/service/standaloneApplication.ts
@@ -0,0 +1,54 @@
+/*
+ * 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 {
+ errorHandler,
+ notFoundHandler,
+ requestLoggingHandler,
+} from '@backstage/backend-common';
+import compression from 'compression';
+import cors from 'cors';
+import express from 'express';
+import helmet from 'helmet';
+import { Logger } from 'winston';
+import { Inventory } from '../inventory';
+import { createRouter } from './router';
+
+export interface ApplicationOptions {
+ enableCors: boolean;
+ inventory: Inventory;
+ logger: Logger;
+}
+
+export async function createStandaloneApplication(
+ options: ApplicationOptions,
+): Promise {
+ const { enableCors, inventory, logger } = options;
+ const app = express();
+
+ app.use(helmet());
+ if (enableCors) {
+ app.use(cors());
+ }
+ app.use(compression());
+ app.use(express.json());
+ app.use(requestLoggingHandler());
+ app.use('/', await createRouter({ inventory, logger }));
+ app.use(notFoundHandler());
+ app.use(errorHandler());
+
+ return app;
+}
diff --git a/plugins/inventory-backend/src/service/standaloneServer.ts b/plugins/inventory-backend/src/service/standaloneServer.ts
new file mode 100644
index 0000000000..be339c5ecc
--- /dev/null
+++ b/plugins/inventory-backend/src/service/standaloneServer.ts
@@ -0,0 +1,62 @@
+/*
+ * 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 { Server } from 'http';
+import { Logger } from 'winston';
+import { AggregatorInventory, StaticInventory } from '../inventory';
+import { createStandaloneApplication } from './standaloneApplication';
+
+export interface ServerOptions {
+ port: number;
+ enableCors: boolean;
+ logger: Logger;
+}
+
+export async function startStandaloneServer(
+ options: ServerOptions,
+): Promise {
+ const logger = options.logger.child({ service: 'inventory-backend' });
+
+ const inventory = new AggregatorInventory();
+ inventory.enlist(
+ new StaticInventory([
+ { id: 'component1' },
+ { id: 'component2' },
+ { id: 'component3' },
+ { id: 'component4' },
+ ]),
+ );
+
+ logger.debug('Creating application...');
+ const app = await createStandaloneApplication({
+ enableCors: options.enableCors,
+ inventory,
+ logger,
+ });
+
+ logger.debug('Starting application server...');
+ return await new Promise((resolve, reject) => {
+ const server = app.listen(options.port, (err?: Error) => {
+ if (err) {
+ reject(err);
+ return;
+ }
+
+ logger.info(`Listening on port ${options.port}`);
+ resolve(server);
+ });
+ });
+}
diff --git a/plugins/inventory-backend/src/setupTests.ts b/plugins/inventory-backend/src/setupTests.ts
index f3b69cc361..3fa7cb04b4 100644
--- a/plugins/inventory-backend/src/setupTests.ts
+++ b/plugins/inventory-backend/src/setupTests.ts
@@ -13,3 +13,5 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+require('jest-fetch-mock').enableMocks();
diff --git a/plugins/inventory-backend/tsconfig.json b/plugins/inventory-backend/tsconfig.json
index b463ac102f..1a3f7ca819 100644
--- a/plugins/inventory-backend/tsconfig.json
+++ b/plugins/inventory-backend/tsconfig.json
@@ -10,6 +10,7 @@
"target": "es5",
"module": "commonjs",
"esModuleInterop": true,
+ "lib": ["es2019"],
"types": ["node", "jest"]
}
}
diff --git a/plugins/inventory/package.json b/plugins/inventory/package.json
index 8a260d2778..85ebe7fc34 100644
--- a/plugins/inventory/package.json
+++ b/plugins/inventory/package.json
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-inventory",
"version": "0.1.1-alpha.4",
- "main": "dist/index.cjs.js",
+ "main": "dist/index.esm.js",
"types": "dist/index.d.ts",
"license": "Apache-2.0",
"private": true,
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index 01e3e5c81b..852fe0f881 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-lighthouse",
"version": "0.1.1-alpha.4",
- "main": "dist/index.cjs.js",
+ "main": "dist/index.esm.js",
"types": "dist/index.d.ts",
"license": "Apache-2.0",
"private": true,
diff --git a/plugins/lighthouse/src/components/Audit/AuditRow.tsx b/plugins/lighthouse/src/components/Audit/AuditRow.tsx
deleted file mode 100644
index c42e6a8538..0000000000
--- a/plugins/lighthouse/src/components/Audit/AuditRow.tsx
+++ /dev/null
@@ -1,86 +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 React, { FC } from 'react';
-import {
- Link,
- TableCell,
- TableRow,
-} from '@material-ui/core';
-import { makeStyles } from '@material-ui/core/styles';
-import { TrendLine } from '@backstage/core';
-import {
- Website,
-} from '../../api';
-import { formatTime, CATEGORIES, CATEGORY_LABELS, SparklinesDataByCategory } from '../../utils';
-import AuditStatusIcon from '../AuditStatusIcon';
-
-const useStyles = makeStyles(theme => ({
- table: {
- minWidth: 650,
- },
- status: {
- textTransform: 'capitalize',
- },
- link: {
- paddingTop: theme.spacing(2),
- paddingBottom: theme.spacing(2),
- display: 'inline-block',
- },
- statusCell: { whiteSpace: 'nowrap' },
- sparklinesCell: { minWidth: 120 },
-}));
-
-export const AuditRow: FC<{
- website: Website;
- categorySparkline: SparklinesDataByCategory;
-}> = ({ website, categorySparkline }) => {
- const classes = useStyles();
-
- return (
-
-
-
- {website.url}
-
-
- {CATEGORIES.map(category => (
-
-
- ))}
-
-
-
- {formatTime(website.lastAudit.timeCreated)}
-
-
- );
-};
-
-export default AuditRow;
diff --git a/plugins/lighthouse/src/components/Audit/index.tsx b/plugins/lighthouse/src/components/Audit/index.tsx
deleted file mode 100644
index 349bdf5ee9..0000000000
--- a/plugins/lighthouse/src/components/Audit/index.tsx
+++ /dev/null
@@ -1,54 +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 React, { FC, useState } from 'react';
-import { useInterval } from 'react-use';
-import { Website, lighthouseApiRef } from '../../api';
-import { useApi } from '@backstage/core';
-import {
- SparklinesDataByCategory,
- buildSparklinesDataForItem,
-} from '../../utils';
-import { AuditRow } from './AuditRow';
-export const LIMIT = 10;
-
-export const Audit: FC<{
- website: Website;
- categorySparkline: SparklinesDataByCategory;
-}> = ({ website, categorySparkline }) => {
- const lighthouseApi = useApi(lighthouseApiRef);
- const [websiteState, setWebsiteState] = useState(website);
- const [sparklineState, setSparklineState] = useState(categorySparkline);
-
- const runRefresh = async () => {
- const response = await lighthouseApi.getWebsiteForAuditId(
- websiteState.lastAudit.id,
- );
- const auditStatus = response.lastAudit.status;
- if (auditStatus === 'COMPLETED' || auditStatus === 'FAILED') {
- setSparklineState(buildSparklinesDataForItem(response));
- setWebsiteState(response);
- }
- };
-
- useInterval(
- runRefresh,
- websiteState?.lastAudit.status === 'RUNNING' ? 5000 : null,
- );
-
- return = useMemo(
- () =>
- items.reduce(
- (res, item) => ({
- ...res,
- [item.url]: buildSparklinesDataForItem(item),
- }),
- {},
- ),
- [items],
+ const [websiteState, setWebsiteState] = useState(items);
+ const lighthouseApi = useApi(lighthouseApiRef);
+
+ const runRefresh = (websites: Website[]) => {
+ websites.forEach(async (website) => {
+ const response = await lighthouseApi.getWebsiteForAuditId(
+ website.lastAudit.id,
+ );
+ const auditStatus = response.lastAudit.status;
+ if (auditStatus === 'COMPLETED' || auditStatus === 'FAILED') {
+ const newWebsiteData = websiteState.slice(0);
+ newWebsiteData[
+ newWebsiteData.findIndex((w) => w.url === response.url)
+ ] = response;
+ setWebsiteState(newWebsiteData);
+ }
+ });
+ };
+
+ const runningWebsiteAudits = websiteState
+ ? websiteState.filter((website) => website.lastAudit.status === 'RUNNING')
+ : [];
+
+ useInterval(
+ () => runRefresh(runningWebsiteAudits),
+ runningWebsiteAudits.length > 0 ? 5000 : null,
);
+ const data = websiteState.map((website) => {
+ const trendlineData = buildSparklinesDataForItem(website);
+ const trendlines: any = {};
+ CATEGORIES.forEach((category) => {
+ trendlines[category] = (
+
-
-
-
+
);
};
diff --git a/plugins/lighthouse/src/components/CreateAudit/index.tsx b/plugins/lighthouse/src/components/CreateAudit/index.tsx
index 8ff0ce5ea8..19db33791b 100644
--- a/plugins/lighthouse/src/components/CreateAudit/index.tsx
+++ b/plugins/lighthouse/src/components/CreateAudit/index.tsx
@@ -84,7 +84,14 @@ const CreateAudit: FC<{}> = () => {
} finally {
setSubmitting(false);
}
- }, [url, emulatedFormFactor, lighthouseApi, setSubmitting, errorApi, history]);
+ }, [
+ url,
+ emulatedFormFactor,
+ lighthouseApi,
+ setSubmitting,
+ errorApi,
+ history,
+ ]);
return (
diff --git a/plugins/lighthouse/src/utils.ts b/plugins/lighthouse/src/utils.ts
index 1546521083..cc09b52f4f 100644
--- a/plugins/lighthouse/src/utils.ts
+++ b/plugins/lighthouse/src/utils.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
import { useLocation } from 'react-router-dom';
-import {Website, Audit, LighthouseCategoryId, AuditCompleted} from './api'
+import { Website, Audit, LighthouseCategoryId, AuditCompleted } from './api';
export function useQuery(): URLSearchParams {
return new URLSearchParams(useLocation().search);
}
@@ -45,7 +45,9 @@ export const CATEGORY_LABELS: Record = {
};
export type SparklinesDataByCategory = Record;
-export function buildSparklinesDataForItem(item: Website): SparklinesDataByCategory {
+export function buildSparklinesDataForItem(
+ item: Website,
+): SparklinesDataByCategory {
return item.audits
.filter(
(audit: Audit): audit is AuditCompleted => audit.status === 'COMPLETED',
@@ -63,4 +65,4 @@ export function buildSparklinesDataForItem(item: Website): SparklinesDataByCateg
return scores;
}, {} as SparklinesDataByCategory);
-}
\ No newline at end of file
+}
diff --git a/plugins/scaffolder-backend/.eslintrc.js b/plugins/scaffolder-backend/.eslintrc.js
new file mode 100644
index 0000000000..19c9ad7395
--- /dev/null
+++ b/plugins/scaffolder-backend/.eslintrc.js
@@ -0,0 +1,8 @@
+module.exports = {
+ extends: [require.resolve('@backstage/cli/config/eslint.backend')],
+ ignorePatterns: ['sample-templates/'],
+ rules: {
+ 'no-console': 0, // Permitted in console programs
+ 'new-cap': ['error', { capIsNew: false }], // Because Express constructs things e.g. like 'const r = express.Router()'
+ },
+};
diff --git a/plugins/scaffolder-backend/README.md b/plugins/scaffolder-backend/README.md
new file mode 100644
index 0000000000..7ffbeae1d1
--- /dev/null
+++ b/plugins/scaffolder-backend/README.md
@@ -0,0 +1,6 @@
+# Title
+Welcome to the scaffolder plugin!
+
+## Sub-section 1
+
+## Sub-section 2
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
new file mode 100644
index 0000000000..ce1161a208
--- /dev/null
+++ b/plugins/scaffolder-backend/package.json
@@ -0,0 +1,32 @@
+{
+ "name": "@backstage/plugin-scaffolder-backend",
+ "version": "0.1.1-alpha.4",
+ "main": "dist",
+ "license": "Apache-2.0",
+ "private": true,
+ "scripts": {
+ "build": "tsc",
+ "lint": "backstage-cli lint",
+ "test": "backstage-cli test",
+ "clean": "backstage-cli clean"
+ },
+ "devDependencies": {
+ "@backstage/cli": "^0.1.1-alpha.4",
+ "@types/fs-extra": "^8.1.0",
+ "@types/supertest": "^2.0.8",
+ "supertest": "^4.0.2"
+ },
+ "dependencies": {
+ "@backstage/backend-common": "0.1.1-alpha.4",
+ "dockerode": "^3.2.0",
+ "express": "^4.17.1",
+ "fs-extra": "^9.0.0",
+ "globby": "^11.0.0",
+ "compression": "^1.7.4",
+ "cors": "^2.8.5",
+ "express-promise-router": "^3.0.3",
+ "helmet": "^3.22.0",
+ "morgan": "^1.10.0",
+ "winston": "^3.2.1"
+ }
+}
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/hooks/post_gen_project.sh b/plugins/scaffolder-backend/sample-templates/react-ssr-template/hooks/post_gen_project.sh
new file mode 100644
index 0000000000..c6d477d91a
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/hooks/post_gen_project.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# package name is "__component_id__" so that yarn doesn't throw an error
+# about invalid characters when running yarn commands. here we replace it with the actual name
+sed -i -e "s/__component_id__/{{ cookiecutter.component_id }}/g" package.json
+
+# node_modules was moved out of the template folder, during the pre_gen hook,
+# to avoid cookie_cutter from copying all of them. time to move it back
+mv ../../node_modules.tmp ../../\{\{cookiecutter.component_id\}\}/node_modules 2>/dev/null ||:
+
+# move back the build directory that was moved out in the pre_gen hook (if it exists)
+mv ../../build.tmp ../../\{\{cookiecutter.component_id\}\}/build 2>/dev/null ||:
\ No newline at end of file
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/hooks/pre_gen_project.sh b/plugins/scaffolder-backend/sample-templates/react-ssr-template/hooks/pre_gen_project.sh
new file mode 100644
index 0000000000..142fda9ad9
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/hooks/pre_gen_project.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# no way to ignore files in cookiecutter, so move node_modules out while building
+# to avoid cookiecutter from copying all of them
+mv ../../\{\{cookiecutter.component_id\}\}/node_modules ../../node_modules.tmp 2>/dev/null ||:
+
+# cookicutter really doesn't like the next.js build directory, so if the app has
+# been built from inside the template folder, that folders needs to be moved out as well
+mv ../../\{\{cookiecutter.component_id\}\}/build ../../build.tmp 2>/dev/null ||:
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/template-info.json b/plugins/scaffolder-backend/sample-templates/react-ssr-template/template-info.json
new file mode 100644
index 0000000000..0a03fd95d6
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/template-info.json
@@ -0,0 +1,6 @@
+{
+ "id": "react-ssr-template",
+ "name": "SSR React Website",
+ "description": "Next.js application skeleton for creating isomorphic web applications.",
+ "ownerId": "something"
+}
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.editorconfig b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.editorconfig
new file mode 100644
index 0000000000..23c3268a0f
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.editorconfig
@@ -0,0 +1,13 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+insert_final_newline = false
\ No newline at end of file
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.eslintignore b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.eslintignore
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.eslintignore
@@ -0,0 +1 @@
+
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.eslintrc.js b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.eslintrc.js
new file mode 100644
index 0000000000..8623614899
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.eslintrc.js
@@ -0,0 +1 @@
+module.exports = require('@spotify/web-scripts/config/eslintrc.js');
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.github/workflows/build.yml b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.github/workflows/build.yml
new file mode 100644
index 0000000000..9087876ce2
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.github/workflows/build.yml
@@ -0,0 +1,39 @@
+name: Frontend CI
+
+on:
+ push:
+ paths:
+ - '.'
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ strategy:
+ matrix:
+ node-version: [12.x]
+
+ steps:
+ - name: checkout code
+ uses: actions/checkout@v1
+ - name: get yarn cache
+ id: yarn-cache
+ run: echo "::set-output name=dir::$(yarn cache dir)"
+ - uses: actions/cache@v1
+ with:
+ path: ${{ steps.yarn-cache.outputs.dir }}
+ key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+ restore-keys: |
+ ${{ runner.os }}-yarn-
+ - name: use node.js ${{ matrix.node-version }}
+ uses: actions/setup-node@v1
+ with:
+ node-version: ${{ matrix.node-version }}
+ - name: yarn install, build, and test
+ working-directory: .
+ run: |
+ yarn install
+ yarn build --if-present
+ yarn test
+ env:
+ CI: true
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.gitignore b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.gitignore
new file mode 100644
index 0000000000..4d1e0d9635
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.gitignore
@@ -0,0 +1,18 @@
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+
+# testing
+/coverage
+junit.xml
+
+# build
+/build
+
+# misc
+.DS_Store
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.nvmrc b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.nvmrc
new file mode 100644
index 0000000000..b009dfb9d9
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/.nvmrc
@@ -0,0 +1 @@
+lts/*
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/README.md b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/README.md
new file mode 100644
index 0000000000..415065179b
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/README.md
@@ -0,0 +1,14 @@
+# {{ cookiecutter.component_id }}
+
+## Description
+
+{{ cookiecutter.description }}
+
+## Develop
+
+```bash
+# install dependencies
+$ yarn
+# start development server
+$ yarn dev
+```
\ No newline at end of file
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/babel.config.js b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/babel.config.js
new file mode 100644
index 0000000000..db2d280677
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/babel.config.js
@@ -0,0 +1,4 @@
+module.exports = {
+ plugins: ['babel-plugin-styled-components'],
+ presets: ['next/babel', '@zeit/next-typescript/babel'],
+};
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/jest.config.js b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/jest.config.js
new file mode 100644
index 0000000000..0dc2a9c0ca
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/jest.config.js
@@ -0,0 +1,8 @@
+module.exports = {
+ ...require('@spotify/web-scripts/config/jest.config.js'),
+ testEnvironment: 'jsdom',
+ testPathIgnorePatterns: ['/node_modules/', '/build/'],
+ transform: {
+ '^.+\\.tsx?$': 'babel-jest',
+ },
+};
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/next-env.d.ts b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/next-env.d.ts
new file mode 100644
index 0000000000..fd10310f68
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/next-env.d.ts
@@ -0,0 +1,5 @@
+// read more about this file here ---> https://github.com/zeit/next.js/blob/canary/docs/basic-features/typescript.md
+/* eslint spaced-comment: ["error", "always", { "markers": ["/"] }] */
+
+///
+
+
+
+
+
+
+ );
+ }
+}
+
+export default CustomApp;
diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/src/pages/_document.tsx b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/src/pages/_document.tsx
new file mode 100644
index 0000000000..9b01a6a74c
--- /dev/null
+++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/src/pages/_document.tsx
@@ -0,0 +1,41 @@
+/**
+ * This file extends the {
+ const sheet = new ServerStyleSheet();
+ const originalRenderPage = ctx.renderPage;
+
+ try {
+ ctx.renderPage = () =>
+ originalRenderPage({
+ enhanceApp: (App: any) => (props) =>
+ sheet.collectStyles( {
+ if (this.repository.length === 0) {
+ await this.reindex();
+ }
+
+ return this.repository;
+ }
+
+ public async reindex(): Promise {
+ this.localIndex = await this.index();
+ this.repository = this.localIndex.map(({ contents }) => contents);
+ }
+
+ public async prepare(templateId: string): Promise {
+ const template = this.localIndex.find(
+ ({ contents }) => contents.id === templateId,
+ );
+
+ if (!template) {
+ throw new Error('Template no found');
+ }
+
+ const tempDir = await fs.promises.mkdtemp(templateId);
+ await fs.copy(template.location, tempDir);
+ return tempDir;
+ }
+
+ private async index(): Promise {
+ const matches = await globby(`${this.repoDir}/**/template-info.json`);
+
+ const fileContents: Array<{
+ location: string;
+ contents: string;
+ }> = await Promise.all(
+ matches.map(async (location: string) => ({
+ location,
+ contents: await fs.readFile(location, 'utf-8'),
+ })),
+ );
+
+ const validFiles: DiskIndexEntry[] = [];
+
+ for (const file of fileContents) {
+ try {
+ const contents: Template = JSON.parse(file.contents);
+ validFiles.push({ location: file.location, contents });
+ } catch (ex) {
+ this.logger?.error('Failure parsing JSON for template', {
+ path: file.location,
+ });
+ }
+ }
+
+ return validFiles;
+ }
+}
diff --git a/plugins/scaffolder-backend/src/scaffolder/storage/index.test.ts b/plugins/scaffolder-backend/src/scaffolder/storage/index.test.ts
new file mode 100644
index 0000000000..fa3967f30a
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/storage/index.test.ts
@@ -0,0 +1,58 @@
+/*
+ * 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 { StorageBase, createStorage } from '.';
+import winston from 'winston';
+
+describe('Storage Interface Test', () => {
+ const mockStore = new (class MockStorage implements StorageBase {
+ list = jest.fn();
+ prepare = jest.fn();
+ reindex = jest.fn();
+
+ public reset = () => {
+ this.list.mockReset();
+ this.prepare.mockReset();
+ this.reindex.mockReset();
+ };
+ })();
+
+ const logger = winston.createLogger();
+
+ afterEach(() => mockStore.reset());
+
+ it('should call list of the set repo when calling list', async () => {
+ const store = createStorage({ store: mockStore, logger });
+ await store.list();
+
+ expect(mockStore.list).toHaveBeenCalled();
+ });
+
+ it('should reindex on the repo when calling reindex', async () => {
+ const store = createStorage({ store: mockStore, logger });
+
+ await store.reindex();
+
+ expect(mockStore.reindex).toHaveBeenCalled();
+ });
+
+ it('should call prepare with the correct id when calling prepare', async () => {
+ const store = createStorage({ store: mockStore, logger });
+
+ await store.prepare('testid');
+
+ expect(mockStore.prepare).toHaveBeenCalledWith('testid');
+ });
+});
diff --git a/plugins/scaffolder-backend/src/scaffolder/storage/index.ts b/plugins/scaffolder-backend/src/scaffolder/storage/index.ts
new file mode 100644
index 0000000000..4d16224ef7
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/storage/index.ts
@@ -0,0 +1,53 @@
+import { Logger } from 'winston';
+
+/*
+ * 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 interface Template {
+ id: string;
+ name: string;
+ description: string;
+ ownerId: string;
+}
+
+export abstract class StorageBase {
+ // lists all templates available
+ abstract async list(): Promise;
+ // can be used to build an index of the available templates;
+ abstract async reindex(): Promise;
+ // returns a directory to run the templaterin
+ abstract async prepare(id: string): Promise;
+}
+
+export interface StorageConfig {
+ store?: StorageBase;
+ logger?: Logger;
+}
+
+class Storage implements StorageBase {
+ store?: StorageBase;
+
+ constructor({ store }: StorageConfig) {
+ this.store = store;
+ }
+
+ list = () => this.store!.list();
+ prepare = (id: string) => this.store!.prepare(id);
+ reindex = () => this.store!.reindex();
+}
+
+export const createStorage = (storageConfig: StorageConfig): StorageBase => {
+ return new Storage(storageConfig);
+};
diff --git a/plugins/scaffolder-backend/src/scaffolder/templater/cookiecutter.ts b/plugins/scaffolder-backend/src/scaffolder/templater/cookiecutter.ts
new file mode 100644
index 0000000000..c2bf472165
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/templater/cookiecutter.ts
@@ -0,0 +1,32 @@
+import { TemplaterBase, TemplaterRunOptions } from '.';
+
+/*
+ * 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 fs from 'fs-extra';
+
+export class CookieCutter implements TemplaterBase {
+ public async run(options: TemplaterRunOptions): Promise {
+ // first we need to make cookiecutter.json in the directory provided with the input values.
+ const cookieInfo = {
+ _copy_without_render: ['.github/workflows/*'],
+ ...options.values,
+ };
+
+ await fs.writeJSON(options.directory, cookieInfo);
+ return '';
+ // run cookie cutter with new json
+ }
+}
diff --git a/plugins/scaffolder-backend/src/scaffolder/templater/index.ts b/plugins/scaffolder-backend/src/scaffolder/templater/index.ts
new file mode 100644
index 0000000000..6f728d4829
--- /dev/null
+++ b/plugins/scaffolder-backend/src/scaffolder/templater/index.ts
@@ -0,0 +1,51 @@
+/*
+ * 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 interface RequiredTemplateValues {
+ componentId: string;
+}
+
+export interface TemplaterRunOptions {
+ directory: string;
+ values: RequiredTemplateValues & object;
+}
+
+export abstract class TemplaterBase {
+ // runs the templating with the values and returns the directory to push the VCS
+ abstract async run(opts: TemplaterRunOptions): Promise;
+}
+
+export interface TemplaterConfig {
+ templater?: TemplaterBase;
+}
+
+class Templater implements TemplaterBase {
+ templater?: TemplaterBase;
+
+ constructor({ templater }: TemplaterConfig) {
+ this.templater = templater;
+ }
+
+ public async run(opts: TemplaterRunOptions) {
+ return this.templater!.run(opts);
+ }
+}
+
+export const createTemplater = (
+ templaterConfig: TemplaterConfig,
+): TemplaterBase => {
+ return new Templater(templaterConfig);
+};
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
new file mode 100644
index 0000000000..97c177b915
--- /dev/null
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -0,0 +1,54 @@
+/*
+ * 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 { Logger } from 'winston';
+import Router from 'express-promise-router';
+import express from 'express';
+import { StorageBase, TemplaterBase } from '../scaffolder';
+
+export interface RouterOptions {
+ storage: StorageBase;
+ templater: TemplaterBase;
+ logger: Logger;
+}
+
+export async function createRouter(
+ options: RouterOptions,
+): Promise {
+ const router = Router();
+ const { storage, templater, logger: parentLogger } = options;
+ const logger = parentLogger.child({ plugin: 'scaffolder' });
+
+ router
+ .get('/v1/templates', async (_, res) => {
+ const templates = await storage.list();
+ res.status(200).json(templates);
+ })
+ .post('/v1/jobs', async (_, res) => {
+ // TODO(blam): Actually make this function work
+ const mock = 'templateid';
+ res.status(201).json({ accepted: true });
+
+ const path = await storage.prepare(mock);
+ await templater.run({ directory: path, values: { componentId: 'test' } });
+ });
+
+ const app = express();
+ app.set('logger', logger);
+ app.use('/', router);
+
+ return app;
+}
diff --git a/plugins/scaffolder-backend/src/service/standaloneApplication.ts b/plugins/scaffolder-backend/src/service/standaloneApplication.ts
new file mode 100644
index 0000000000..3ff1de01eb
--- /dev/null
+++ b/plugins/scaffolder-backend/src/service/standaloneApplication.ts
@@ -0,0 +1,55 @@
+/*
+ * 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 {
+ errorHandler,
+ notFoundHandler,
+ requestLoggingHandler,
+} from '@backstage/backend-common';
+import compression from 'compression';
+import cors from 'cors';
+import express from 'express';
+import helmet from 'helmet';
+import { Logger } from 'winston';
+import { StorageBase, TemplaterBase } from '../scaffolder';
+import { createRouter } from './router';
+
+export interface ApplicationOptions {
+ enableCors: boolean;
+ storage: StorageBase;
+ templater: TemplaterBase;
+ logger: Logger;
+}
+
+export async function createStandaloneApplication(
+ options: ApplicationOptions,
+): Promise {
+ const { enableCors, storage, templater, logger } = options;
+ const app = express();
+
+ app.use(helmet());
+ if (enableCors) {
+ app.use(cors());
+ }
+ app.use(compression());
+ app.use(express.json());
+ app.use(requestLoggingHandler());
+ app.use('/', await createRouter({ templater, storage, logger }));
+ app.use(notFoundHandler());
+ app.use(errorHandler());
+
+ return app;
+}
diff --git a/plugins/scaffolder-backend/src/service/standaloneServer.ts b/plugins/scaffolder-backend/src/service/standaloneServer.ts
new file mode 100644
index 0000000000..b89e806f72
--- /dev/null
+++ b/plugins/scaffolder-backend/src/service/standaloneServer.ts
@@ -0,0 +1,60 @@
+/*
+ * 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 { Server } from 'http';
+import { Logger } from 'winston';
+import {
+ createStorage,
+ createTemplater,
+ DiskStorage,
+ CookieCutter,
+} from '../scaffolder';
+import { createStandaloneApplication } from './standaloneApplication';
+
+export interface ServerOptions {
+ port: number;
+ enableCors: boolean;
+ logger: Logger;
+}
+
+export async function startStandaloneServer(
+ options: ServerOptions,
+): Promise {
+ const logger = options.logger.child({ service: 'scaffolder-backend' });
+ const store = new DiskStorage({ logger });
+ const templater = new CookieCutter();
+ logger.debug('Creating application...');
+
+ const app = await createStandaloneApplication({
+ enableCors: options.enableCors,
+ storage: createStorage({ store, logger }),
+ templater: createTemplater({ templater }),
+ logger,
+ });
+
+ logger.debug('Starting application server...');
+ return await new Promise((resolve, reject) => {
+ const server = app.listen(options.port, (err?: Error) => {
+ if (err) {
+ reject(err);
+ return;
+ }
+
+ logger.info(`Listening on port ${options.port}`);
+ resolve(server);
+ });
+ });
+}
diff --git a/plugins/scaffolder-backend/test/mock-failing-template-dir/mock-template-2/template-info.json b/plugins/scaffolder-backend/test/mock-failing-template-dir/mock-template-2/template-info.json
new file mode 100644
index 0000000000..47f83f9f5c
--- /dev/null
+++ b/plugins/scaffolder-backend/test/mock-failing-template-dir/mock-template-2/template-info.json
@@ -0,0 +1,6 @@
+{
+ "id": "mock-template-2",
+ "name": "mockmannen",
+ "description": "mock template for building stuff in backstage",
+ "ownerId": "blam"
+}
diff --git a/plugins/scaffolder-backend/test/mock-failing-template-dir/mock-template/template-info.json b/plugins/scaffolder-backend/test/mock-failing-template-dir/mock-template/template-info.json
new file mode 100644
index 0000000000..9a3458fba1
--- /dev/null
+++ b/plugins/scaffolder-backend/test/mock-failing-template-dir/mock-template/template-info.json
@@ -0,0 +1,7 @@
+{
+ "id": "mock-template",
+ "name": "mockmannen",
+ "description": "mock template for building stuff in backstage",
+ "ownerId": "blam",
+
+}
diff --git a/plugins/scaffolder-backend/test/mock-multiple-templates-dir/mock-template-2/template-info.json b/plugins/scaffolder-backend/test/mock-multiple-templates-dir/mock-template-2/template-info.json
new file mode 100644
index 0000000000..47f83f9f5c
--- /dev/null
+++ b/plugins/scaffolder-backend/test/mock-multiple-templates-dir/mock-template-2/template-info.json
@@ -0,0 +1,6 @@
+{
+ "id": "mock-template-2",
+ "name": "mockmannen",
+ "description": "mock template for building stuff in backstage",
+ "ownerId": "blam"
+}
diff --git a/plugins/scaffolder-backend/test/mock-multiple-templates-dir/mock-template/template-info.json b/plugins/scaffolder-backend/test/mock-multiple-templates-dir/mock-template/template-info.json
new file mode 100644
index 0000000000..e0d323c987
--- /dev/null
+++ b/plugins/scaffolder-backend/test/mock-multiple-templates-dir/mock-template/template-info.json
@@ -0,0 +1,6 @@
+{
+ "id": "mock-template",
+ "name": "mockmannen",
+ "description": "mock template for building stuff in backstage",
+ "ownerId": "blam"
+}
diff --git a/plugins/scaffolder-backend/test/mock-simple-template-dir/mock-template/template-info.json b/plugins/scaffolder-backend/test/mock-simple-template-dir/mock-template/template-info.json
new file mode 100644
index 0000000000..e0d323c987
--- /dev/null
+++ b/plugins/scaffolder-backend/test/mock-simple-template-dir/mock-template/template-info.json
@@ -0,0 +1,6 @@
+{
+ "id": "mock-template",
+ "name": "mockmannen",
+ "description": "mock template for building stuff in backstage",
+ "ownerId": "blam"
+}
diff --git a/plugins/scaffolder-backend/tsconfig.json b/plugins/scaffolder-backend/tsconfig.json
new file mode 100644
index 0000000000..7d4ea182e2
--- /dev/null
+++ b/plugins/scaffolder-backend/tsconfig.json
@@ -0,0 +1,11 @@
+{
+ "extends": "../../packages/backend/tsconfig.json",
+ "include": [
+ "./src"
+ ],
+ "compilerOptions": {
+ "baseUrl": "./src",
+ "outDir": "./dist",
+ "skipLibCheck": true
+ }
+}
diff --git a/plugins/scaffolder/.eslintrc.js b/plugins/scaffolder/.eslintrc.js
new file mode 100644
index 0000000000..13573efa9c
--- /dev/null
+++ b/plugins/scaffolder/.eslintrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+ extends: [require.resolve('@backstage/cli/config/eslint')],
+};
diff --git a/plugins/scaffolder/README.md b/plugins/scaffolder/README.md
new file mode 100644
index 0000000000..e77a77148f
--- /dev/null
+++ b/plugins/scaffolder/README.md
@@ -0,0 +1,13 @@
+# Inventory Frontend
+
+WORK IN PROGRESS
+
+This is the frontend part of the default inventory plugin.
+
+It will implement the core API for handling your inventory of software, and
+supply the base views to show and manage them.
+
+## Links
+
+- (Backend part of the plugin)[https://github.com/spotify/backstage/tree/master/plugins/inventory-backend]
+- (The Backstage homepage)[https://backstage.io]
diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json
new file mode 100644
index 0000000000..878b4ddbf2
--- /dev/null
+++ b/plugins/scaffolder/package.json
@@ -0,0 +1,38 @@
+{
+ "name": "@backstage/plugin-scaffolder",
+ "version": "0.1.1-alpha.4",
+ "main": "dist/index.esm.js",
+ "types": "dist/index.d.ts",
+ "license": "Apache-2.0",
+ "private": true,
+ "scripts": {
+ "build": "backstage-cli plugin:build",
+ "start": "backstage-cli plugin:serve",
+ "lint": "backstage-cli lint",
+ "test": "backstage-cli test",
+ "clean": "backstage-cli clean"
+ },
+ "devDependencies": {
+ "@backstage/cli": "^0.1.1-alpha.4",
+ "@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",
+ "@types/testing-library__jest-dom": "5.0.2",
+ "jest-fetch-mock": "^3.0.3"
+ },
+ "dependencies": {
+ "@backstage/core": "^0.1.1-alpha.4",
+ "@backstage/theme": "^0.1.1-alpha.4",
+ "@material-ui/core": "^4.9.1",
+ "@material-ui/icons": "^4.9.1",
+ "@material-ui/lab": "4.0.0-alpha.45",
+ "react": "16.13.1",
+ "react-dom": "16.13.1",
+ "react-use": "^13.0.0"
+ },
+ "files": [
+ "dist"
+ ]
+}
diff --git a/plugins/scaffolder/src/components/ScaffolderPage/index.tsx b/plugins/scaffolder/src/components/ScaffolderPage/index.tsx
new file mode 100644
index 0000000000..9c3801702a
--- /dev/null
+++ b/plugins/scaffolder/src/components/ScaffolderPage/index.tsx
@@ -0,0 +1,77 @@
+/*
+ * 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 React from 'react';
+import {
+ AlphaLabel,
+ Content,
+ ContentHeader,
+ InfoCard,
+ Header,
+ Page,
+ pageTheme,
+} from '@backstage/core';
+import { Typography, Link } from '@material-ui/core';
+
+// TODO(blam): Connect to backend
+const STATIC_DATA = [
+ {
+ id: 'react-ssr-template',
+ name: 'SSR React Website',
+ description:
+ 'Next.js application skeleton for creating isomorphic web applications.',
+ ownerId: 'something',
+ },
+];
+const ScaffolderPage: React.FC<{}> = () => {
+ return (
+
+
+ Create a new component
+
+ NOTE! This feature is WIP. You can follow progress{' '}
+
+ here
+
+ .
+
+
+
+ );
+};
+
+export default ScaffolderPage;
diff --git a/plugins/scaffolder/src/index.ts b/plugins/scaffolder/src/index.ts
new file mode 100644
index 0000000000..3a0a0fe2d3
--- /dev/null
+++ b/plugins/scaffolder/src/index.ts
@@ -0,0 +1,17 @@
+/*
+ * 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 { plugin } from './plugin';
diff --git a/plugins/scaffolder/src/plugin.test.ts b/plugins/scaffolder/src/plugin.test.ts
new file mode 100644
index 0000000000..4fac72593f
--- /dev/null
+++ b/plugins/scaffolder/src/plugin.test.ts
@@ -0,0 +1,23 @@
+/*
+ * 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 { plugin } from './plugin';
+
+describe('inventory', () => {
+ it('should export plugin', () => {
+ expect(plugin).toBeDefined();
+ });
+});
diff --git a/packages/core/src/api/widgetView/types.ts b/plugins/scaffolder/src/plugin.ts
similarity index 70%
rename from packages/core/src/api/widgetView/types.ts
rename to plugins/scaffolder/src/plugin.ts
index 9e066225ab..31bdab2f84 100644
--- a/packages/core/src/api/widgetView/types.ts
+++ b/plugins/scaffolder/src/plugin.ts
@@ -14,13 +14,12 @@
* limitations under the License.
*/
-import { ComponentType } from 'react';
+import { createPlugin } from '@backstage/core';
+import ScaffolderPage from './components/ScaffolderPage';
-export type Widget = {
- size: 4 | 6 | 8 | 12;
- component: ComponentType;
-};
-
-export type WidgetViewProps = {
- widgets: Widget[];
-};
+export const plugin = createPlugin({
+ id: 'scaffolder',
+ register({ router }) {
+ router.registerRoute('/create', ScaffolderPage);
+ },
+});
diff --git a/plugins/scaffolder/src/setupTests.ts b/plugins/scaffolder/src/setupTests.ts
new file mode 100644
index 0000000000..1a907ab8e6
--- /dev/null
+++ b/plugins/scaffolder/src/setupTests.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.
+ */
+
+import '@testing-library/jest-dom/extend-expect';
+require('jest-fetch-mock').enableMocks();
diff --git a/plugins/scaffolder/tsconfig.json b/plugins/scaffolder/tsconfig.json
new file mode 100644
index 0000000000..7b73db2f0f
--- /dev/null
+++ b/plugins/scaffolder/tsconfig.json
@@ -0,0 +1,7 @@
+{
+ "extends": "../../tsconfig.json",
+ "include": ["src"],
+ "compilerOptions": {
+ "baseUrl": "src"
+ }
+}
diff --git a/plugins/tech-radar/.eslintrc.js b/plugins/tech-radar/.eslintrc.js
index dd47f29781..13573efa9c 100644
--- a/plugins/tech-radar/.eslintrc.js
+++ b/plugins/tech-radar/.eslintrc.js
@@ -1,3 +1,3 @@
module.exports = {
- extends: [require.resolve('@backstage/cli/config/eslint.js')],
+ extends: [require.resolve('@backstage/cli/config/eslint')],
};
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index dd1747b02d..3d51d2ef8d 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-tech-radar",
"version": "0.1.1-alpha.4",
- "main": "dist/index.cjs.js",
+ "main": "dist/index.esm.js",
"types": "dist/index.d.ts",
"license": "Apache-2.0",
"private": true,
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index fd093f685b..007151e8dc 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-welcome",
"version": "0.1.1-alpha.4",
- "main": "dist/index.cjs.js",
+ "main": "dist/index.esm.js",
"types": "dist/index.d.ts",
"private": true,
"license": "Apache-2.0",
diff --git a/prettier.config.js b/prettier.config.js
index 93df970dd6..e12d35a880 100644
--- a/prettier.config.js
+++ b/prettier.config.js
@@ -1 +1,16 @@
+/*
+ * 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.
+ */
module.exports = require('@spotify/web-scripts/config/prettier.config.js');
diff --git a/yarn.lock b/yarn.lock
index f17fc840c8..ab56118174 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -25,7 +25,7 @@
invariant "^2.2.4"
semver "^5.5.0"
-"@babel/core@7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.4.5", "@babel/core@^7.7.5":
+"@babel/core@7.9.0":
version "7.9.0"
resolved "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
@@ -47,12 +47,34 @@
semver "^5.4.1"
source-map "^0.5.0"
-"@babel/generator@^7.4.0", "@babel/generator@^7.9.0":
- version "7.9.0"
- resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.9.0.tgz#0f67adea4ec39dad6e63345f70eec33014d78c89"
- integrity sha512-onl4Oy46oGCzymOXtKMQpI7VXtCbTSHK1kqBydZ6AmzuNcacEVqGk9tZtAS+48IA9IstZcDCgIg8hQKnb7suRw==
+"@babel/core@^7.1.0", "@babel/core@^7.4.4", "@babel/core@^7.4.5", "@babel/core@^7.7.5":
+ version "7.9.6"
+ resolved "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
+ integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
dependencies:
- "@babel/types" "^7.9.0"
+ "@babel/code-frame" "^7.8.3"
+ "@babel/generator" "^7.9.6"
+ "@babel/helper-module-transforms" "^7.9.0"
+ "@babel/helpers" "^7.9.6"
+ "@babel/parser" "^7.9.6"
+ "@babel/template" "^7.8.6"
+ "@babel/traverse" "^7.9.6"
+ "@babel/types" "^7.9.6"
+ convert-source-map "^1.7.0"
+ debug "^4.1.0"
+ gensync "^1.0.0-beta.1"
+ json5 "^2.1.2"
+ lodash "^4.17.13"
+ resolve "^1.3.2"
+ semver "^5.4.1"
+ source-map "^0.5.0"
+
+"@babel/generator@^7.4.0", "@babel/generator@^7.9.0", "@babel/generator@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
+ integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
+ dependencies:
+ "@babel/types" "^7.9.6"
jsesc "^2.5.1"
lodash "^4.17.13"
source-map "^0.5.0"
@@ -147,14 +169,14 @@
"@babel/traverse" "^7.8.3"
"@babel/types" "^7.8.3"
-"@babel/helper-function-name@^7.8.3":
- version "7.8.3"
- resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
- integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==
+"@babel/helper-function-name@^7.8.3", "@babel/helper-function-name@^7.9.5":
+ version "7.9.5"
+ resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
+ integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
dependencies:
"@babel/helper-get-function-arity" "^7.8.3"
"@babel/template" "^7.8.3"
- "@babel/types" "^7.8.3"
+ "@babel/types" "^7.9.5"
"@babel/helper-get-function-arity@^7.8.3":
version "7.8.3"
@@ -252,10 +274,10 @@
dependencies:
"@babel/types" "^7.8.3"
-"@babel/helper-validator-identifier@^7.9.0":
- version "7.9.0"
- resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed"
- integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==
+"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5":
+ version "7.9.5"
+ resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
+ integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
"@babel/helper-wrap-function@^7.8.3":
version "7.8.3"
@@ -267,14 +289,14 @@
"@babel/traverse" "^7.8.3"
"@babel/types" "^7.8.3"
-"@babel/helpers@^7.9.0":
- version "7.9.2"
- resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"
- integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==
+"@babel/helpers@^7.9.0", "@babel/helpers@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
+ integrity sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==
dependencies:
"@babel/template" "^7.8.3"
- "@babel/traverse" "^7.9.0"
- "@babel/types" "^7.9.0"
+ "@babel/traverse" "^7.9.6"
+ "@babel/types" "^7.9.6"
"@babel/highlight@^7.0.0", "@babel/highlight@^7.8.3":
version "7.9.0"
@@ -285,10 +307,10 @@
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
- version "7.9.2"
- resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.9.2.tgz#4e767f424b479c514077544484d1f9bdba7f1158"
- integrity sha512-2jyvKdoOS1aWAFL2rjJZmamyDDkPCx/AAz4/Wh1Dfxvw8qqnOvek/ZlHQ2noO/o8JpnXa/WiUUFOv48meBKkpA==
+"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.7.0", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0", "@babel/parser@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
+ integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
"@babel/plugin-proposal-async-generator-functions@^7.8.3":
version "7.8.3"
@@ -606,15 +628,15 @@
"@babel/helper-plugin-utils" "^7.8.3"
babel-plugin-dynamic-import-node "^2.3.0"
-"@babel/plugin-transform-modules-commonjs@^7.9.0":
- version "7.9.0"
- resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz#e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"
- integrity sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==
+"@babel/plugin-transform-modules-commonjs@^7.4.4", "@babel/plugin-transform-modules-commonjs@^7.9.0":
+ version "7.9.6"
+ resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz#64b7474a4279ee588cacd1906695ca721687c277"
+ integrity sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==
dependencies:
"@babel/helper-module-transforms" "^7.9.0"
"@babel/helper-plugin-utils" "^7.8.3"
"@babel/helper-simple-access" "^7.8.3"
- babel-plugin-dynamic-import-node "^2.3.0"
+ babel-plugin-dynamic-import-node "^2.3.3"
"@babel/plugin-transform-modules-systemjs@^7.9.0":
version "7.9.0"
@@ -904,6 +926,14 @@
"@babel/helper-plugin-utils" "^7.8.3"
"@babel/plugin-transform-typescript" "^7.9.0"
+"@babel/runtime-corejs2@^7.4.4":
+ version "7.9.2"
+ resolved "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.9.2.tgz#f11d074ff99b9b4319b5ecf0501f12202bf2bf4d"
+ integrity sha512-ayjSOxuK2GaSDJFCtLgHnYjuMyIpViNujWrZo8GUpN60/n7juzJKK5yOo6RFVb0zdU9ACJFK+MsZrUnj3OmXMw==
+ dependencies:
+ core-js "^2.6.5"
+ regenerator-runtime "^0.13.4"
+
"@babel/runtime-corejs3@^7.7.4", "@babel/runtime-corejs3@^7.8.3":
version "7.9.2"
resolved "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz#26fe4aa77e9f1ecef9b776559bbb8e84d34284b7"
@@ -919,7 +949,7 @@
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.4", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
version "7.9.2"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
@@ -935,27 +965,27 @@
"@babel/parser" "^7.8.6"
"@babel/types" "^7.8.6"
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
- version "7.9.0"
- resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
- integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0", "@babel/traverse@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
+ integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
dependencies:
"@babel/code-frame" "^7.8.3"
- "@babel/generator" "^7.9.0"
- "@babel/helper-function-name" "^7.8.3"
+ "@babel/generator" "^7.9.6"
+ "@babel/helper-function-name" "^7.9.5"
"@babel/helper-split-export-declaration" "^7.8.3"
- "@babel/parser" "^7.9.0"
- "@babel/types" "^7.9.0"
+ "@babel/parser" "^7.9.6"
+ "@babel/types" "^7.9.6"
debug "^4.1.0"
globals "^11.1.0"
lodash "^4.17.13"
-"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7", "@babel/types@^7.9.0":
- version "7.9.0"
- resolved "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz#00b064c3df83ad32b2dbf5ff07312b15c7f1efb5"
- integrity sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==
+"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
+ version "7.9.6"
+ resolved "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
+ integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
dependencies:
- "@babel/helper-validator-identifier" "^7.9.0"
+ "@babel/helper-validator-identifier" "^7.9.5"
lodash "^4.17.13"
to-fast-properties "^2.0.0"
@@ -1156,6 +1186,18 @@
debug "^3.1.0"
lodash.once "^4.1.1"
+"@date-io/core@1.x", "@date-io/core@^1.3.13":
+ version "1.3.13"
+ resolved "https://registry.npmjs.org/@date-io/core/-/core-1.3.13.tgz#90c71da493f20204b7a972929cc5c482d078b3fa"
+ integrity sha512-AlEKV7TxjeK+jxWVKcCFrfYAk8spX9aCyiToFIiLPtfQbsjmRGLIhb5VZgptQcJdHtLXo7+m0DuurwFgUToQuA==
+
+"@date-io/date-fns@^1.1.0":
+ version "1.3.13"
+ resolved "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-1.3.13.tgz#7798844041640ab393f7e21a7769a65d672f4735"
+ integrity sha512-yXxGzcRUPcogiMj58wVgFjc9qUYrCnnU9eLcyNbsQCmae4jPuZCDoIBR21j8ZURsM7GRtU62VOw5yNd4dDHunA==
+ dependencies:
+ "@date-io/core" "^1.3.13"
+
"@emotion/cache@^10.0.27":
version "10.0.29"
resolved "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0"
@@ -2446,6 +2488,18 @@
prop-types "^15.7.2"
react-is "^16.8.0"
+"@material-ui/pickers@^3.2.2":
+ version "3.2.10"
+ resolved "https://registry.npmjs.org/@material-ui/pickers/-/pickers-3.2.10.tgz#19df024895876eb0ec7cd239bbaea595f703f0ae"
+ integrity sha512-B8G6Obn5S3RCl7hwahkQj9sKUapwXWFjiaz/Bsw1fhYFdNMnDUolRiWQSoKPb1/oKe37Dtfszoywi1Ynbo3y8w==
+ dependencies:
+ "@babel/runtime" "^7.6.0"
+ "@date-io/core" "1.x"
+ "@types/styled-jsx" "^2.2.8"
+ clsx "^1.0.2"
+ react-transition-group "^4.0.0"
+ rifm "^0.7.0"
+
"@material-ui/styles@^4.9.6":
version "4.9.6"
resolved "https://registry.npmjs.org/@material-ui/styles/-/styles-4.9.6.tgz#924a30bf7c9b91af9c8f19c12c8573b8a4ecd085"
@@ -2815,11 +2869,11 @@
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==
+ version "1.0.2"
+ resolved "https://registry.npmjs.org/@spotify/eslint-config-oss/-/eslint-config-oss-1.0.2.tgz#b0e56e549c78dcdd79063ce48521f10c3420f701"
+ integrity sha512-3Tn6R98f5BWeb8anOhxYdvZywasp1RaJb+y65W7Db5+xiQVmCnSFvIM3jwysQpu1xRdlUJSCqeDHR7S4Nz3thw==
dependencies:
- eslint-plugin-notice "^0.8.9"
+ eslint-plugin-notice "^0.9.10"
"@spotify/eslint-config-react@^6.0.0":
version "6.0.0"
@@ -3857,6 +3911,11 @@
dependencies:
"@types/node" "*"
+"@types/cookiejar@*":
+ version "2.1.1"
+ resolved "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.1.tgz#90b68446364baf9efd8e8349bb36bd3852b75b80"
+ integrity sha512-aRnpPa7ysx3aNW60hTiCtLHlQaIFsXFCgQlpakNgDNVFzbtusSY8PwjAQgRWfSk0ekNoBjO51eQRB6upA9uuyw==
+
"@types/cors@^2.8.6":
version "2.8.6"
resolved "https://registry.npmjs.org/@types/cors/-/cors-2.8.6.tgz#cfaab33c49c15b1ded32f235111ce9123009bd02"
@@ -3888,6 +3947,11 @@
resolved "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
+"@types/diff@^4.0.2":
+ version "4.0.2"
+ resolved "https://registry.npmjs.org/@types/diff/-/diff-4.0.2.tgz#2e9bb89f9acc3ab0108f0f3dc4dbdcf2fff8a99c"
+ integrity sha512-mIenTfsIe586/yzsyfql69KRnA75S8SVXQbTLpDejRrjH0QSJcpu3AUOi/Vjnt9IOsXKxPhJfGpQUNMueIU1fQ==
+
"@types/eslint-visitor-keys@^1.0.0":
version "1.0.0"
resolved "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
@@ -3994,6 +4058,11 @@
"@types/tapable" "*"
"@types/webpack" "*"
+"@types/http-errors@^1.6.3":
+ version "1.6.3"
+ resolved "https://registry.npmjs.org/@types/http-errors/-/http-errors-1.6.3.tgz#619a55768eab98299e8f76747339f3373f134e69"
+ integrity sha512-4KCE/agIcoQ9bIfa4sBxbZdnORzRjIw8JNQPLfqoNv7wQl/8f8mRbW68Q8wBsQFoJkPUHGlQYZ9sqi5WpfGSEQ==
+
"@types/http-proxy-middleware@*":
version "0.19.3"
resolved "https://registry.npmjs.org/@types/http-proxy-middleware/-/http-proxy-middleware-0.19.3.tgz#b2eb96fbc0f9ac7250b5d9c4c53aade049497d03"
@@ -4121,6 +4190,13 @@
resolved "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz#315d570ccb56c53452ff8638738df60726d5b6ea"
integrity sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==
+"@types/morgan@^1.9.0":
+ version "1.9.0"
+ resolved "https://registry.npmjs.org/@types/morgan/-/morgan-1.9.0.tgz#342119ae57fe67d36b91537143fc5aef16c2479f"
+ integrity sha512-warrzirh5dlTMaETytBTKR886pRXwr+SMZD87ZE13gLMR8Pzz69SiYFkvoDaii78qGP1iyBIUYz5GiXyryO//A==
+ dependencies:
+ "@types/express" "*"
+
"@types/node@*", "@types/node@>= 8", "@types/node@^13.7.2":
version "13.9.2"
resolved "https://registry.npmjs.org/@types/node/-/node-13.9.2.tgz#ace1880c03594cc3e80206d96847157d8e7fa349"
@@ -4348,6 +4424,28 @@
resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+"@types/styled-jsx@^2.2.8":
+ version "2.2.8"
+ resolved "https://registry.npmjs.org/@types/styled-jsx/-/styled-jsx-2.2.8.tgz#b50d13d8a3c34036282d65194554cf186bab7234"
+ integrity sha512-Yjye9VwMdYeXfS71ihueWRSxrruuXTwKCbzue4+5b2rjnQ//AtyM7myZ1BEhNhBQ/nL/RE7bdToUoLln2miKvg==
+ dependencies:
+ "@types/react" "*"
+
+"@types/superagent@*":
+ version "4.1.7"
+ resolved "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.7.tgz#a7d92d98c490ee0f802a127fdf149b9a114f77a5"
+ integrity sha512-JSwNPgRYjIC4pIeOqLwWwfGj6iP1n5NE6kNBEbGx2V8H78xCPwx7QpNp9plaI30+W3cFEzJO7BIIsXE+dbtaGg==
+ dependencies:
+ "@types/cookiejar" "*"
+ "@types/node" "*"
+
+"@types/supertest@^2.0.8":
+ version "2.0.8"
+ resolved "https://registry.npmjs.org/@types/supertest/-/supertest-2.0.8.tgz#23801236e2b85204ed771a8e7c40febba7da2bda"
+ integrity sha512-wcax7/ip4XSSJRLbNzEIUVy2xjcBIZZAuSd2vtltQfRK7kxhx5WMHbLHkYdxN3wuQCrwpYrg86/9byDjPXoGMA==
+ dependencies:
+ "@types/superagent" "*"
+
"@types/tapable@*":
version "1.0.5"
resolved "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.5.tgz#9adbc12950582aa65ead76bffdf39fe0c27a3c02"
@@ -5159,7 +5257,7 @@ arrify@^1.0.1:
resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-asap@^2.0.0, asap@~2.0.3, asap@~2.0.6:
+asap@^2.0.0, asap@~2.0.6:
version "2.0.6"
resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
@@ -5173,7 +5271,7 @@ asn1.js@^4.0.0:
inherits "^2.0.1"
minimalistic-assert "^1.0.0"
-asn1@~0.2.3:
+asn1@~0.2.0, asn1@~0.2.3:
version "0.2.4"
resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
@@ -5235,7 +5333,7 @@ async-limiter@~1.0.0:
resolved "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
-async@^2.6.2:
+async@^2.6.1, async@^2.6.2:
version "2.6.3"
resolved "https://registry.npmjs.org/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -5400,10 +5498,10 @@ babel-plugin-add-react-displayname@^0.0.5:
resolved "https://registry.npmjs.org/babel-plugin-add-react-displayname/-/babel-plugin-add-react-displayname-0.0.5.tgz#339d4cddb7b65fd62d1df9db9fe04de134122bd5"
integrity sha1-M51M3be2X9YtHfnbn+BN4TQSK9U=
-babel-plugin-dynamic-import-node@^2.3.0:
- version "2.3.0"
- resolved "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
- integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==
+babel-plugin-dynamic-import-node@^2.3.0, babel-plugin-dynamic-import-node@^2.3.3:
+ version "2.3.3"
+ resolved "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+ integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
dependencies:
object.assign "^4.1.0"
@@ -5756,6 +5854,13 @@ base@^0.11.1:
mixin-deep "^1.2.0"
pascalcase "^0.1.1"
+basic-auth@~2.0.1:
+ version "2.0.1"
+ resolved "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+ integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
+ dependencies:
+ safe-buffer "5.1.2"
+
batch-processor@1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8"
@@ -5766,7 +5871,7 @@ batch@0.6.1:
resolved "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
-bcrypt-pbkdf@^1.0.0:
+bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
version "1.0.2"
resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
@@ -5817,6 +5922,15 @@ bindings@^1.5.0:
dependencies:
file-uri-to-path "1.0.0"
+bl@^4.0.1:
+ version "4.0.2"
+ resolved "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"
+ integrity sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==
+ dependencies:
+ buffer "^5.5.0"
+ inherits "^2.0.4"
+ readable-stream "^3.4.0"
+
bluebird@3.7.2, bluebird@^3.3.5, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
version "3.7.2"
resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -6076,6 +6190,14 @@ buffer@^4.3.0:
ieee754 "^1.1.4"
isarray "^1.0.0"
+buffer@^5.5.0:
+ version "5.6.0"
+ resolved "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
+ integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
+ dependencies:
+ base64-js "^1.0.2"
+ ieee754 "^1.1.4"
+
builtin-modules@^3.1.0:
version "3.1.0"
resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
@@ -6359,11 +6481,6 @@ chalk@^4.0.0:
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"
- integrity sha1-6LL+PX8at9aaMhma/5HqaTFAlRU=
-
character-entities-legacy@^1.0.0:
version "1.1.4"
resolved "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
@@ -6726,6 +6843,14 @@ color-string@^1.5.2:
color-name "^1.0.0"
simple-swizzle "^0.2.2"
+color@3.0.x:
+ version "3.0.0"
+ resolved "https://registry.npmjs.org/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a"
+ integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==
+ dependencies:
+ color-convert "^1.9.1"
+ color-string "^1.5.2"
+
color@^3.0.0, color@^3.1.2:
version "3.1.2"
resolved "https://registry.npmjs.org/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10"
@@ -6734,16 +6859,29 @@ color@^3.0.0, color@^3.1.2:
color-convert "^1.9.1"
color-string "^1.5.2"
+colornames@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.npmjs.org/colornames/-/colornames-1.1.1.tgz#f8889030685c7c4ff9e2a559f5077eb76a816f96"
+ integrity sha1-+IiQMGhcfE/54qVZ9Qd+t2qBb5Y=
+
colors@1.0.3:
version "1.0.3"
resolved "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
-colors@^1.1.2:
+colors@^1.1.2, colors@^1.2.1:
version "1.4.0"
resolved "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
+colorspace@1.1.x:
+ version "1.1.2"
+ resolved "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz#e0128950d082b86a2168580796a0aa5d6c68d8c5"
+ integrity sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==
+ dependencies:
+ color "3.0.x"
+ text-hex "1.0.x"
+
columnify@^1.5.4, columnify@~1.5.4:
version "1.5.4"
resolved "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
@@ -6833,7 +6971,7 @@ compare-versions@^3.5.1:
resolved "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
-component-emitter@^1.2.1:
+component-emitter@^1.2.0, component-emitter@^1.2.1:
version "1.3.0"
resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
@@ -6880,7 +7018,7 @@ concat-stream@^1.5.0, concat-stream@^1.6.2:
readable-stream "^2.2.2"
typedarray "^0.0.6"
-concat-stream@^2.0.0:
+concat-stream@^2.0.0, concat-stream@~2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
@@ -7096,6 +7234,11 @@ cookie@0.4.0:
resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+cookiejar@^2.1.0:
+ version "2.1.2"
+ resolved "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c"
+ integrity sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==
+
copy-concurrently@^1.0.0:
version "1.0.5"
resolved "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
@@ -7133,12 +7276,7 @@ core-js-pure@^3.0.0, core-js-pure@^3.0.1:
resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.4.tgz#4bf1ba866e25814f149d4e9aaa08c36173506e3a"
integrity sha512-epIhRLkXdgv32xIUFaaAry2wdxZYBi6bgM7cB136dzzXXa+dFyRLTZeLUJxnd8ShrmyVXBub63n2NHo2JAt8Cw==
-core-js@^1.0.0:
- version "1.2.7"
- resolved "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
- integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=
-
-core-js@^2.4.0, core-js@^2.5.0:
+core-js@^2.4.0, core-js@^2.5.0, core-js@^2.6.5:
version "2.6.11"
resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
@@ -7321,6 +7459,13 @@ css-blank-pseudo@^0.1.4:
dependencies:
postcss "^7.0.5"
+css-box-model@^1.1.2:
+ version "1.2.0"
+ resolved "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.0.tgz#3a26377b4162b3200d2ede4b064ec5b6a75186d0"
+ integrity sha512-lri0br+jSNV0kkkiGEp9y9y3Njq2PmpqbeGWRFQJuZteZzY9iC9GZhQ8Y4WpPwM/2YocjHePxy14igJY7YKzkA==
+ dependencies:
+ tiny-invariant "^1.0.6"
+
css-color-names@0.0.4, css-color-names@^0.0.4:
version "0.0.4"
resolved "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
@@ -7757,11 +7902,21 @@ date-fns@^1.27.2:
resolved "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
+date-fns@^2.0.0-alpha.27:
+ version "2.12.0"
+ resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.12.0.tgz#01754c8a2f3368fc1119cf4625c3dad8c1845ee6"
+ integrity sha512-qJgn99xxKnFgB1qL4jpxU7Q2t0LOn1p8KMIveef3UZD7kqjT3tpFNNdXJelEHhE+rUgffriXriw/sOSU+cS1Hw==
+
dateformat@^3.0.0:
version "3.0.3"
resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
+debounce@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.npmjs.org/debounce/-/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131"
+ integrity sha512-mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg==
+
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -7936,7 +8091,7 @@ delegates@^1.0.0:
resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-depd@2.0.0:
+depd@2.0.0, depd@~2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -8018,6 +8173,15 @@ dezalgo@^1.0.0, dezalgo@~1.0.3:
asap "^2.0.0"
wrappy "1"
+diagnostics@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.npmjs.org/diagnostics/-/diagnostics-1.1.1.tgz#cab6ac33df70c9d9a727490ae43ac995a769b22a"
+ integrity sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==
+ dependencies:
+ colorspace "1.1.x"
+ enabled "1.0.x"
+ kuler "1.0.x"
+
diff-sequences@^24.9.0:
version "24.9.0"
resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5"
@@ -8028,7 +8192,7 @@ diff-sequences@^25.1.0:
resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.1.0.tgz#fd29a46f1c913fd66c22645dc75bffbe43051f32"
integrity sha512-nFIfVk5B/NStCsJ+zaPO4vYuLjlzQ6uFvPxzYyHlejNZ/UGa7G/n7peOXVrVNvRuyfstt+mZQYGpjxg9Z6N8Kw==
-diff@^4.0.1:
+diff@^4.0.1, diff@^4.0.2:
version "4.0.2"
resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
@@ -8089,6 +8253,25 @@ dns-txt@^2.0.2:
dependencies:
buffer-indexof "^1.0.0"
+docker-modem@^2.1.0:
+ version "2.1.3"
+ resolved "https://registry.npmjs.org/docker-modem/-/docker-modem-2.1.3.tgz#15432225f63db02eb5de4bb9a621b7293e5f264d"
+ integrity sha512-cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg==
+ dependencies:
+ debug "^4.1.1"
+ readable-stream "^3.5.0"
+ split-ca "^1.0.1"
+ ssh2 "^0.8.7"
+
+dockerode@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.npmjs.org/dockerode/-/dockerode-3.2.0.tgz#80e5bd9c2a988bdde4c995ae4aa2584fa0166c23"
+ integrity sha512-C+y/W4Kks7YLBsfUOTMkk1IVilb4cdj+rE+UZ5hnE+rpcn2frSs7kX+6H8GteTqHcv8sln+GyxuP1qdno3IzIw==
+ dependencies:
+ concat-stream "~2.0.0"
+ docker-modem "^2.1.0"
+ tar-fs "~2.0.1"
+
doctrine@1.5.0:
version "1.5.0"
resolved "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
@@ -8387,6 +8570,13 @@ emotion-theming@^10.0.19:
"@emotion/weak-memoize" "0.2.5"
hoist-non-react-statics "^3.3.0"
+enabled@1.0.x:
+ version "1.0.2"
+ resolved "https://registry.npmjs.org/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93"
+ integrity sha1-ll9lE9LC0cX0ZStkouM5ZGf8L5M=
+ dependencies:
+ env-variable "0.0.x"
+
encodeurl@~1.0.2:
version "1.0.2"
resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -8399,7 +8589,7 @@ encoding@^0.1.11:
dependencies:
iconv-lite "~0.4.13"
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
+end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1:
version "1.4.4"
resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
@@ -8438,6 +8628,11 @@ env-paths@^2.2.0:
resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
+env-variable@0.0.x:
+ version "0.0.6"
+ resolved "https://registry.npmjs.org/env-variable/-/env-variable-0.0.6.tgz#74ab20b3786c545b62b4a4813ab8cf22726c9808"
+ integrity sha512-bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg==
+
envinfo@^7.3.1:
version "7.5.0"
resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.5.0.tgz#91410bb6db262fb4f1409bd506e9ff57e91023f4"
@@ -8722,10 +8917,10 @@ eslint-plugin-monorepo@^0.2.1:
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"
- integrity sha512-Z6xit9Yv7pCG/rS3DohSou1BeDffPOhmuQzE7UWMxV2h/MJmsOq3QZFyXmbi18cExlyWbz4+ztAogi2edeTbjA==
+eslint-plugin-notice@^0.9.10:
+ version "0.9.10"
+ resolved "https://registry.npmjs.org/eslint-plugin-notice/-/eslint-plugin-notice-0.9.10.tgz#89cf6377bf1c004a219c4e541321ea9125b408c8"
+ integrity sha512-rF79EuqdJKu9hhTmwUkNeSvLmmq03m/NXq/NHwUENHbdJ0wtoyOjxZBhW4QCug8v5xYE6cGe3AWkGqSIe9KUbQ==
dependencies:
find-root "^1.1.0"
lodash "^4.17.15"
@@ -9054,6 +9249,15 @@ expect@^25.1.0:
jest-message-util "^25.1.0"
jest-regex-util "^25.1.0"
+express-promise-router@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.npmjs.org/express-promise-router/-/express-promise-router-3.0.3.tgz#5e6d22a5a3f013d71833172fe8d7ab780c3f6b70"
+ integrity sha1-Xm0ipaPwE9cYMxcv6NereAw/a3A=
+ dependencies:
+ is-promise "^2.1.0"
+ lodash.flattendeep "^4.0.0"
+ methods "^1.0.0"
+
express@^4.17.0, express@^4.17.1:
version "4.17.1"
resolved "https://registry.npmjs.org/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
@@ -9160,7 +9364,7 @@ extsprintf@^1.2.0:
resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-fast-deep-equal@^2.0.1:
+fast-deep-equal@2.0.1, fast-deep-equal@^2.0.1:
version "2.0.1"
resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
@@ -9204,6 +9408,11 @@ fast-levenshtein@~2.0.6:
resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+fast-safe-stringify@^2.0.4:
+ version "2.0.7"
+ resolved "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"
+ integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==
+
fast-shallow-equal@^1.0.0:
version "1.0.0"
resolved "https://registry.npmjs.org/fast-shallow-equal/-/fast-shallow-equal-1.0.0.tgz#d4dcaf6472440dcefa6f88b98e3251e27f25628b"
@@ -9254,19 +9463,6 @@ fb-watchman@^2.0.0:
dependencies:
bser "2.1.1"
-fbjs@^0.8.1:
- version "0.8.17"
- resolved "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
- integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
- dependencies:
- core-js "^1.0.0"
- isomorphic-fetch "^2.1.1"
- loose-envify "^1.0.0"
- object-assign "^4.1.0"
- promise "^7.1.1"
- setimmediate "^1.0.5"
- ua-parser-js "^0.7.18"
-
fd-slicer@~1.1.0:
version "1.1.0"
resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
@@ -9279,6 +9475,11 @@ feature-policy@0.3.0:
resolved "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz#7430e8e54a40da01156ca30aaec1a381ce536069"
integrity sha512-ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ==
+fecha@^2.3.3:
+ version "2.3.3"
+ resolved "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
+ integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==
+
figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
version "3.5.1"
resolved "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
@@ -9335,6 +9536,11 @@ file-uri-to-path@1.0.0:
resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
+filefy@0.1.10:
+ version "0.1.10"
+ resolved "https://registry.npmjs.org/filefy/-/filefy-0.1.10.tgz#174677c8e2fa5bc39a3af0ed6fb492f16b8fbf42"
+ integrity sha512-VgoRVOOY1WkTpWH+KBy8zcU1G7uQTVsXqhWEgzryB9A5hg2aqCyZ6aQ/5PSzlqM5+6cnVrX6oYV0XqD3HZSnmQ==
+
filesize@3.6.1:
version "3.6.1"
resolved "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
@@ -9569,6 +9775,15 @@ fork-ts-checker-webpack-plugin@^4.0.5:
tapable "^1.0.0"
worker-rpc "^0.1.0"
+form-data@^2.3.1:
+ version "2.5.1"
+ resolved "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
+ integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.6"
+ mime-types "^2.1.12"
+
form-data@~2.3.2:
version "2.3.3"
resolved "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -9583,6 +9798,11 @@ format@^0.2.0:
resolved "https://registry.npmjs.org/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=
+formidable@^1.2.0:
+ version "1.2.2"
+ resolved "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9"
+ integrity sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==
+
forwarded@~0.1.2:
version "0.1.2"
resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@@ -9626,6 +9846,11 @@ from@~0:
resolved "https://registry.npmjs.org/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
+fs-constants@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+ integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+
fs-extra@8.1.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
version "8.1.0"
resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -9841,6 +10066,11 @@ get-port@^4.2.0:
resolved "https://registry.npmjs.org/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119"
integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==
+get-port@^5.1.1:
+ version "5.1.1"
+ resolved "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
+ integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
+
get-stdin@7.0.0:
version "7.0.0"
resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
@@ -10479,11 +10709,6 @@ hmac-drbg@^1.0.0:
minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.1"
-hoist-non-react-statics@^2.3.1:
- version "2.5.5"
- resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
- integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
-
hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
version "3.3.2"
resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
@@ -10685,17 +10910,7 @@ http-errors@1.7.2:
statuses ">= 1.5.0 < 2"
toidentifier "1.0.0"
-http-errors@~1.6.2:
- version "1.6.3"
- resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
- integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
- dependencies:
- depd "~1.1.2"
- inherits "2.0.3"
- setprototypeof "1.1.0"
- statuses ">= 1.4.0 < 2"
-
-http-errors@~1.7.2:
+http-errors@^1.7.3, http-errors@~1.7.2:
version "1.7.3"
resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
@@ -10706,6 +10921,16 @@ http-errors@~1.7.2:
statuses ">= 1.5.0 < 2"
toidentifier "1.0.0"
+http-errors@~1.6.2:
+ version "1.6.3"
+ resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+ integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+ dependencies:
+ depd "~1.1.2"
+ inherits "2.0.3"
+ setprototypeof "1.1.0"
+ statuses ">= 1.4.0 < 2"
+
"http-parser-js@>=0.4.0 <0.4.11":
version "0.4.10"
resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
@@ -11593,7 +11818,7 @@ is-ssh@^1.3.0:
dependencies:
protocols "^1.1.0"
-is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@^1.0.0, is-stream@^1.1.0:
version "1.1.0"
resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
@@ -11706,14 +11931,6 @@ isobject@^4.0.0:
resolved "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
-isomorphic-fetch@^2.1.1:
- version "2.2.1"
- resolved "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
- integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=
- dependencies:
- node-fetch "^1.0.1"
- whatwg-fetch ">=0.10.0"
-
isstream@~0.1.2:
version "0.1.2"
resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -12060,6 +12277,14 @@ jest-environment-node@^25.1.0:
jest-mock "^25.1.0"
jest-util "^25.1.0"
+jest-esm-transformer@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.npmjs.org/jest-esm-transformer/-/jest-esm-transformer-1.0.0.tgz#b6c58f496aa48194f96361a52f5c578fd2209726"
+ integrity sha512-FoPgeMMwy1/CEsc8tBI41i83CEO3x85RJuZi5iAMmWoARXhfgk6Jd7y+4d+z+HCkTKNVDvSWKGRhwjzU9PUbrw==
+ dependencies:
+ "@babel/core" "^7.4.4"
+ "@babel/plugin-transform-modules-commonjs" "^7.4.4"
+
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"
@@ -12943,6 +13168,13 @@ kleur@^3.0.3:
resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
+kuler@1.0.x:
+ version "1.0.1"
+ resolved "https://registry.npmjs.org/kuler/-/kuler-1.0.1.tgz#ef7c784f36c9fb6e16dd3150d152677b2b0228a6"
+ integrity sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==
+ dependencies:
+ colornames "^1.1.1"
+
last-call-webpack-plugin@^3.0.0:
version "3.0.0"
resolved "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz#9742df0e10e3cf46e5c0381c2de90d3a7a2d7555"
@@ -13450,6 +13682,11 @@ lodash.escaperegexp@^4.1.2:
resolved "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
+lodash.flattendeep@^4.0.0:
+ version "4.4.0"
+ resolved "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
+ integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
+
lodash.get@^4.4.2:
version "4.4.2"
resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
@@ -13568,6 +13805,17 @@ log-update@^2.3.0:
cli-cursor "^2.0.0"
wrap-ansi "^3.0.1"
+logform@^2.1.1:
+ version "2.1.2"
+ resolved "https://registry.npmjs.org/logform/-/logform-2.1.2.tgz#957155ebeb67a13164069825ce67ddb5bb2dd360"
+ integrity sha512-+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==
+ dependencies:
+ colors "^1.2.1"
+ fast-safe-stringify "^2.0.4"
+ fecha "^2.3.3"
+ ms "^2.1.1"
+ triple-beam "^1.3.0"
+
loglevel@^1.6.6:
version "1.6.7"
resolved "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz#b3e034233188c68b889f5b862415306f565e2c56"
@@ -13788,6 +14036,22 @@ marked@^0.8.0:
resolved "https://registry.npmjs.org/marked/-/marked-0.8.1.tgz#a233f39572fab15ede53a3c3be8a139bff86d2dd"
integrity sha512-tZfJS8uE0zpo7xpTffwFwYRfW9AzNcdo04Qcjs+C9+oCy8MSRD2reD5iDVtYx8mtLaqsGughw/YLlcwNxAHA1g==
+material-table@^1.57.2:
+ version "1.57.2"
+ resolved "https://registry.npmjs.org/material-table/-/material-table-1.57.2.tgz#8854cb4d623b294138c83a0c7ff9f2900267c81f"
+ integrity sha512-hiJdRTrqu8pyYwSxzmcG1TnR4KWG2gtXrFB3XL9h4ij3A68EOJmlss6VH/LXh3NLlUce1TteK6W7fGa7YcnKGg==
+ dependencies:
+ "@date-io/date-fns" "^1.1.0"
+ "@material-ui/pickers" "^3.2.2"
+ classnames "^2.2.6"
+ date-fns "^2.0.0-alpha.27"
+ debounce "^1.2.0"
+ fast-deep-equal "2.0.1"
+ filefy "0.1.10"
+ prop-types "^15.6.2"
+ react-beautiful-dnd "11.0.3"
+ react-double-scrollbar "0.0.15"
+
md5.js@^1.3.4:
version "1.3.5"
resolved "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
@@ -13845,6 +14109,11 @@ mem@^4.0.0:
mimic-fn "^2.0.0"
p-is-promise "^2.0.0"
+memoize-one@^5.0.4:
+ version "5.1.1"
+ resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0"
+ integrity sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA==
+
memoizerific@^1.11.3:
version "1.11.3"
resolved "https://registry.npmjs.org/memoizerific/-/memoizerific-1.11.3.tgz#7c87a4646444c32d75438570905f2dbd1b1a805a"
@@ -13943,7 +14212,7 @@ merge@^1.2.1:
resolved "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
-methods@~1.1.2:
+methods@^1.0.0, methods@^1.1.1, methods@^1.1.2, methods@~1.1.2:
version "1.1.2"
resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
@@ -14005,7 +14274,7 @@ mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
dependencies:
mime-db "1.43.0"
-mime@1.6.0:
+mime@1.6.0, mime@^1.4.1:
version "1.6.0"
resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -14189,6 +14458,11 @@ mixin-object@^2.0.1:
for-in "^0.1.3"
is-extendable "^0.1.1"
+mkdirp-classic@^0.5.2:
+ version "0.5.2"
+ resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz#54c441ce4c96cd7790e10b41a87aa51068ecab2b"
+ integrity sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g==
+
mkdirp-promise@^5.0.1:
version "5.0.1"
resolved "https://registry.npmjs.org/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"
@@ -14225,6 +14499,17 @@ moment@2.24.0:
resolved "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
+morgan@^1.10.0:
+ version "1.10.0"
+ resolved "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
+ integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
+ dependencies:
+ basic-auth "~2.0.1"
+ debug "2.6.9"
+ depd "~2.0.0"
+ on-finished "~2.3.0"
+ on-headers "~1.0.2"
+
move-concurrently@^1.0.1:
version "1.0.1"
resolved "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -14413,14 +14698,6 @@ node-fetch@2.6.0, node-fetch@^2.3.0, node-fetch@^2.5.0, node-fetch@^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"
- integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==
- dependencies:
- encoding "^0.1.11"
- is-stream "^1.0.1"
-
node-forge@0.9.0:
version "0.9.0"
resolved "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
@@ -14997,6 +15274,11 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0, once@~1.4.0:
dependencies:
wrappy "1"
+one-time@0.0.4:
+ version "0.0.4"
+ resolved "https://registry.npmjs.org/one-time/-/one-time-0.0.4.tgz#f8cdf77884826fe4dff93e3a9cc37b1e4480742e"
+ integrity sha1-+M33eISCb+Tf+T46nMN7HkSAdC4=
+
onetime@^1.0.0:
version "1.1.0"
resolved "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
@@ -16499,11 +16781,16 @@ prepend-http@^1.0.0, prepend-http@^1.0.1:
resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
-prettier@^1.16.4, prettier@^1.18.2, prettier@^1.19.1:
+prettier@^1.16.4, prettier@^1.18.2:
version "1.19.1"
resolved "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
+prettier@^2.0.5:
+ version "2.0.5"
+ resolved "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
+ integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
+
pretty-bytes@5.3.0, pretty-bytes@^5.1.0:
version "5.3.0"
resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
@@ -16619,13 +16906,6 @@ promise.series@^0.2.0:
resolved "https://registry.npmjs.org/promise.series/-/promise.series-0.2.0.tgz#2cc7ebe959fc3a6619c04ab4dbdc9e452d864bbd"
integrity sha1-LMfr6Vn8OmYZwEq029yeRS2GS70=
-promise@^7.1.1:
- version "7.3.1"
- resolved "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
- integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
- dependencies:
- asap "~2.0.3"
-
promise@^8.0.3:
version "8.1.0"
resolved "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e"
@@ -16783,6 +17063,11 @@ qs@6.7.0:
resolved "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+qs@^6.5.1:
+ version "6.9.3"
+ resolved "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz#bfadcd296c2d549f1dffa560619132c977f5008e"
+ integrity sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==
+
qs@^6.6.0:
version "6.9.1"
resolved "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz#20082c65cb78223635ab1a9eaca8875a29bf8ec9"
@@ -16835,6 +17120,11 @@ qw@~1.0.1:
resolved "https://registry.npmjs.org/qw/-/qw-1.0.1.tgz#efbfdc740f9ad054304426acb183412cc8b996d4"
integrity sha1-77/cdA+a0FQwRCassYNBLMi5ltQ=
+raf-schd@^4.0.0:
+ version "4.0.2"
+ resolved "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.2.tgz#bd44c708188f2e84c810bf55fcea9231bcaed8a0"
+ integrity sha512-VhlMZmGy6A6hrkJWHLNTGl5gtgMUm+xfGza6wbwnE914yeQ5Ybm18vgM734RZhMgfw4tacUrWseGZlpUrrakEQ==
+
raf@^3.4.1:
version "3.4.1"
resolved "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
@@ -16925,6 +17215,20 @@ react-app-polyfill@^1.0.6:
regenerator-runtime "^0.13.3"
whatwg-fetch "^3.0.0"
+react-beautiful-dnd@11.0.3:
+ version "11.0.3"
+ resolved "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-11.0.3.tgz#5678bb3e725d8b56cb7cf57f56e952105fc4f2af"
+ integrity sha512-2FX2SnOlKMmfn90xUHCav7cxRWXwY7FeRa6TzdxWeX7DdP5JTvVQcsWgiOkdbJSj+J+1q1nA9QO4/HQ52D0DAA==
+ dependencies:
+ "@babel/runtime-corejs2" "^7.4.4"
+ css-box-model "^1.1.2"
+ memoize-one "^5.0.4"
+ raf-schd "^4.0.0"
+ react-redux "^7.0.3"
+ redux "^4.0.1"
+ tiny-invariant "^1.0.4"
+ use-memo-one "^1.1.0"
+
react-clientside-effect@^1.2.2:
version "1.2.2"
resolved "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.2.tgz#6212fb0e07b204e714581dd51992603d1accc837"
@@ -17017,6 +17321,11 @@ react-dom@16.13.1, react-dom@^16.12.0, react-dom@^16.13.1, react-dom@^16.8.3:
prop-types "^15.6.2"
scheduler "^0.19.1"
+react-double-scrollbar@0.0.15:
+ version "0.0.15"
+ resolved "https://registry.npmjs.org/react-double-scrollbar/-/react-double-scrollbar-0.0.15.tgz#e915ab8cb3b959877075f49436debfdb04288fe4"
+ integrity sha1-6RWrjLO5WYdwdfSUNt6/2wQoj+Q=
+
react-draggable@^4.0.3:
version "4.2.0"
resolved "https://registry.npmjs.org/react-draggable/-/react-draggable-4.2.0.tgz#40cc5209082ca7d613104bf6daf31372cc0e1114"
@@ -17084,12 +17393,12 @@ react-inspector@^4.0.0:
is-dom "^1.0.9"
prop-types "^15.6.1"
-react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
+react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:
version "16.13.1"
resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
-react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:
+react-lifecycles-compat@^3.0.4:
version "3.0.4"
resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
@@ -17129,6 +17438,17 @@ react-popper@^1.3.6:
typed-styles "^0.0.7"
warning "^4.0.2"
+react-redux@^7.0.3:
+ version "7.2.0"
+ resolved "https://registry.npmjs.org/react-redux/-/react-redux-7.2.0.tgz#f970f62192b3981642fec46fd0db18a074fe879d"
+ integrity sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA==
+ dependencies:
+ "@babel/runtime" "^7.5.5"
+ hoist-non-react-statics "^3.3.0"
+ loose-envify "^1.4.0"
+ prop-types "^15.7.2"
+ react-is "^16.9.0"
+
react-router-dom@5.1.2, react-router-dom@^5.1.2:
version "5.1.2"
resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.1.2.tgz#06701b834352f44d37fbb6311f870f84c76b9c18"
@@ -17261,7 +17581,7 @@ react-textarea-autosize@^7.1.0:
"@babel/runtime" "^7.1.2"
prop-types "^15.6.0"
-react-transition-group@^4.3.0:
+react-transition-group@^4.0.0, react-transition-group@^4.3.0:
version "4.3.0"
resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.3.0.tgz#fea832e386cf8796c58b61874a3319704f5ce683"
integrity sha512-1qRV1ZuVSdxPlPf4O8t7inxUGpdyO5zG9IoNfJxSO0ImU2A1YWkEQvFPuIPZmMLkg5hYs7vv5mMOyfgSkvAwvw==
@@ -17445,7 +17765,7 @@ read@1, read@~1.0.1, read@~1.0.7:
dependencies:
mute-stream "~0.0.4"
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
version "2.3.7"
resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -17458,7 +17778,7 @@ read@1, read@~1.0.1, read@~1.0.7:
string_decoder "~1.1.1"
util-deprecate "~1.0.1"
-"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.6.0:
+"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0:
version "3.6.0"
resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -17527,18 +17847,6 @@ rechoir@^0.6.2:
dependencies:
resolve "^1.1.6"
-recompose@0.30.0:
- version "0.30.0"
- resolved "https://registry.npmjs.org/recompose/-/recompose-0.30.0.tgz#82773641b3927e8c7d24a0d87d65aeeba18aabd0"
- integrity sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==
- dependencies:
- "@babel/runtime" "^7.0.0"
- change-emitter "^0.1.2"
- fbjs "^0.8.1"
- hoist-non-react-statics "^2.3.1"
- react-lifecycles-compat "^3.0.2"
- symbol-observable "^1.0.4"
-
recursive-readdir@2.2.2, recursive-readdir@^2.2.2:
version "2.2.2"
resolved "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz#9946fb3274e1628de6e36b2f6714953b4845094f"
@@ -17577,6 +17885,14 @@ redeyed@~2.1.0:
dependencies:
esprima "~4.0.0"
+redux@^4.0.1:
+ version "4.0.5"
+ resolved "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f"
+ integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==
+ dependencies:
+ loose-envify "^1.4.0"
+ symbol-observable "^1.2.0"
+
referrer-policy@1.2.0:
version "1.2.0"
resolved "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.2.0.tgz#b99cfb8b57090dc454895ef897a4cc35ef67a98e"
@@ -18006,6 +18322,13 @@ rgba-regex@^1.0.0:
resolved "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
+rifm@^0.7.0:
+ version "0.7.0"
+ resolved "https://registry.npmjs.org/rifm/-/rifm-0.7.0.tgz#debe951a9c83549ca6b33e5919f716044c2230be"
+ integrity sha512-DSOJTWHD67860I5ojetXdEQRIBvF6YcpNe53j0vn1vp9EUb9N80EiZTxgP+FkDKorWC8PZw052kTF4C1GOivCQ==
+ dependencies:
+ "@babel/runtime" "^7.3.1"
+
right-pad@^1.0.1:
version "1.0.1"
resolved "https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
@@ -18445,7 +18768,7 @@ set-value@^2.0.0, set-value@^2.0.1:
is-plain-object "^2.0.3"
split-string "^3.0.1"
-setimmediate@^1.0.4, setimmediate@^1.0.5:
+setimmediate@^1.0.4:
version "1.0.5"
resolved "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
@@ -18853,6 +19176,11 @@ spdy@^4.0.1:
select-hose "^2.0.0"
spdy-transport "^3.0.0"
+split-ca@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.npmjs.org/split-ca/-/split-ca-1.0.1.tgz#6c83aff3692fa61256e0cd197e05e9de157691a6"
+ integrity sha1-bIOv82kvphJW4M0ZfgXp3hV2kaY=
+
split-on-first@^1.0.0:
version "1.1.0"
resolved "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz#f610afeee3b12bce1d0c30425e76398b78249a5f"
@@ -18898,6 +19226,22 @@ sprintf-js@~1.0.2:
resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+ssh2-streams@~0.4.10:
+ version "0.4.10"
+ resolved "https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.4.10.tgz#48ef7e8a0e39d8f2921c30521d56dacb31d23a34"
+ integrity sha512-8pnlMjvnIZJvmTzUIIA5nT4jr2ZWNNVHwyXfMGdRJbug9TpI3kd99ffglgfSWqujVv/0gxwMsDn9j9RVst8yhQ==
+ dependencies:
+ asn1 "~0.2.0"
+ bcrypt-pbkdf "^1.0.2"
+ streamsearch "~0.1.2"
+
+ssh2@^0.8.7:
+ version "0.8.9"
+ resolved "https://registry.npmjs.org/ssh2/-/ssh2-0.8.9.tgz#54da3a6c4ba3daf0d8477a538a481326091815f3"
+ integrity sha512-GmoNPxWDMkVpMFa9LVVzQZHF6EW3WKmBwL+4/GeILf2hFmix5Isxm7Amamo8o7bHiU0tC+wXsGcUXOxp8ChPaw==
+ dependencies:
+ ssh2-streams "~0.4.10"
+
sshpk@^1.7.0:
version "1.16.1"
resolved "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
@@ -18940,6 +19284,11 @@ stack-generator@^2.0.5:
dependencies:
stackframe "^1.1.1"
+stack-trace@0.0.x:
+ version "0.0.10"
+ resolved "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+ integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
+
stack-utils@^1.0.1:
version "1.0.2"
resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
@@ -19071,6 +19420,11 @@ stream-shift@^1.0.0:
resolved "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+streamsearch@~0.1.2:
+ version "0.1.2"
+ resolved "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a"
+ integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo=
+
strict-uri-encode@^1.0.0:
version "1.1.0"
resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
@@ -19379,6 +19733,30 @@ stylis@3.5.0:
resolved "https://registry.npmjs.org/stylis/-/stylis-3.5.0.tgz#016fa239663d77f868fef5b67cf201c4b7c701e1"
integrity sha512-pP7yXN6dwMzAR29Q0mBrabPCe0/mNO1MSr93bhay+hcZondvMMTpeGyd8nbhYJdyperNT2DRxONQuUGcJr5iPw==
+superagent@^3.8.3:
+ version "3.8.3"
+ resolved "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128"
+ integrity sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==
+ dependencies:
+ component-emitter "^1.2.0"
+ cookiejar "^2.1.0"
+ debug "^3.1.0"
+ extend "^3.0.0"
+ form-data "^2.3.1"
+ formidable "^1.2.0"
+ methods "^1.1.1"
+ mime "^1.4.1"
+ qs "^6.5.1"
+ readable-stream "^2.3.5"
+
+supertest@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.npmjs.org/supertest/-/supertest-4.0.2.tgz#c2234dbdd6dc79b6f15b99c8d6577b90e4ce3f36"
+ integrity sha512-1BAbvrOZsGA3YTCWqbmh14L0YEq0EGICX/nBnfkfVJn7SrxQV1I3pMYjSzG9y/7ZU2V9dWqyqk2POwxlb09duQ==
+ dependencies:
+ methods "^1.1.2"
+ superagent "^3.8.3"
+
supports-color@7.1.0, supports-color@^7.0.0, supports-color@^7.1.0:
version "7.1.0"
resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
@@ -19444,7 +19822,7 @@ svgo@^1.0.0, svgo@^1.2.2:
unquote "~1.1.1"
util.promisify "~1.0.0"
-symbol-observable@^1.0.4, symbol-observable@^1.1.0:
+symbol-observable@^1.1.0, symbol-observable@^1.2.0:
version "1.2.0"
resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
@@ -19477,6 +19855,27 @@ tapable@^1.0.0, tapable@^1.1.3:
resolved "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+tar-fs@~2.0.1:
+ version "2.0.1"
+ resolved "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz#e44086c1c60d31a4f0cf893b1c4e155dabfae9e2"
+ integrity sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==
+ dependencies:
+ chownr "^1.1.1"
+ mkdirp-classic "^0.5.2"
+ pump "^3.0.0"
+ tar-stream "^2.0.0"
+
+tar-stream@^2.0.0:
+ version "2.1.2"
+ resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.2.tgz#6d5ef1a7e5783a95ff70b69b97455a5968dc1325"
+ integrity sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q==
+ dependencies:
+ bl "^4.0.1"
+ end-of-stream "^1.4.1"
+ fs-constants "^1.0.0"
+ inherits "^2.0.3"
+ readable-stream "^3.1.1"
+
tar@^4.4.10, tar@^4.4.12, tar@^4.4.13, tar@^4.4.8:
version "4.4.13"
resolved "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
@@ -19631,6 +20030,11 @@ text-extensions@^1.0.0:
resolved "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
+text-hex@1.0.x:
+ version "1.0.0"
+ resolved "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5"
+ integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==
+
text-table@0.2.0, text-table@^0.2.0, text-table@~0.2.0:
version "0.2.0"
resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -19729,7 +20133,7 @@ tiny-emitter@^2.0.0:
resolved "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
-tiny-invariant@^1.0.2:
+tiny-invariant@^1.0.2, tiny-invariant@^1.0.4, tiny-invariant@^1.0.6:
version "1.1.0"
resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz#634c5f8efdc27714b7f386c35e6760991d230875"
integrity sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==
@@ -19881,6 +20285,11 @@ trim@0.0.1:
resolved "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
integrity sha1-WFhUf2spB1fulczMZm+1AITEYN0=
+triple-beam@^1.2.0, triple-beam@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
+ integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
+
trough@^1.0.0:
version "1.0.5"
resolved "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
@@ -20071,11 +20480,6 @@ typescript@^3.7.4, typescript@^3.8.3:
resolved "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==
-ua-parser-js@^0.7.18:
- version "0.7.21"
- resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
- integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==
-
uc.micro@^1.0.1, uc.micro@^1.0.5:
version "1.0.6"
resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
@@ -20378,6 +20782,11 @@ use-callback-ref@^1.2.1:
resolved "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.2.1.tgz#898759ccb9e14be6c7a860abafa3ffbd826c89bb"
integrity sha512-C3nvxh0ZpaOxs9RCnWwAJ+7bJPwQI8LHF71LzbQ3BvzH5XkdtlkMadqElGevg5bYBDFip4sAnD4m06zAKebg1w==
+use-memo-one@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.1.tgz#39e6f08fe27e422a7d7b234b5f9056af313bd22c"
+ integrity sha512-oFfsyun+bP7RX8X2AskHNTxu+R3QdE/RC5IefMbqptmACAA/gfol1KDD5KRzPsGMa62sWxGZw+Ui43u6x4ddoQ==
+
use-sidecar@^1.0.1:
version "1.0.2"
resolved "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.0.2.tgz#e72f582a75842f7de4ef8becd6235a4720ad8af6"
@@ -20758,7 +21167,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@3.0.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==
@@ -20838,6 +21247,29 @@ windows-release@^3.1.0:
dependencies:
execa "^1.0.0"
+winston-transport@^4.3.0:
+ version "4.3.0"
+ resolved "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz#df68c0c202482c448d9b47313c07304c2d7c2c66"
+ integrity sha512-B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A==
+ dependencies:
+ readable-stream "^2.3.6"
+ triple-beam "^1.2.0"
+
+winston@^3.2.1:
+ version "3.2.1"
+ resolved "https://registry.npmjs.org/winston/-/winston-3.2.1.tgz#63061377976c73584028be2490a1846055f77f07"
+ integrity sha512-zU6vgnS9dAWCEKg/QYigd6cgMVVNwyTzKs81XZtTFuRwJOcDdBg7AU0mXVyNbs7O5RH2zdv+BdNZUlx7mXPuOw==
+ dependencies:
+ async "^2.6.1"
+ diagnostics "^1.1.1"
+ is-stream "^1.1.0"
+ logform "^2.1.1"
+ one-time "0.0.4"
+ readable-stream "^3.1.1"
+ stack-trace "0.0.x"
+ triple-beam "^1.3.0"
+ winston-transport "^4.3.0"
+
word-wrap@^1.0.3, word-wrap@~1.2.3:
version "1.2.3"
resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+ {title}
+ {children}
+
+ ) : (
+ - - )); - } - return data; -}; - -CellContent.propTypes = { - data: PropTypes.any.isRequired, -}; - -const DataTableCell = ({ column, row }) => { - return ( -
-
-);
-
-export const WithFooter = () => (
-
-
-);
diff --git a/packages/core/src/components/Status/Status.stories.tsx b/packages/core/src/components/Status/Status.stories.tsx
index 91ef53d7fe..33a8e51e65 100644
--- a/packages/core/src/components/Status/Status.stories.tsx
+++ b/packages/core/src/components/Status/Status.stories.tsx
@@ -24,44 +24,80 @@ import {
StatusRunning,
StatusWarning,
} from './Status';
+import Table from 'components/Table';
+import InfoCard from 'layout/InfoCard';
export default {
title: 'Status',
component: StatusOK,
};
-export const statusOK = () => (
- <>
-
+
+
+
+
);
+
+export const statusOK = () => - {children}
{value}
+ {subvalue}
+
+ );
+};
+
+export default SubvalueCell;
diff --git a/packages/core/src/components/Table/Table.stories.tsx b/packages/core/src/components/Table/Table.stories.tsx
new file mode 100644
index 0000000000..b1a886ddc8
--- /dev/null
+++ b/packages/core/src/components/Table/Table.stories.tsx
@@ -0,0 +1,143 @@
+/*
+ * 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 React from 'react';
+import Table, { SubvalueCell, TableColumn } from './';
+
+export default {
+ title: 'Table',
+ component: Table,
+};
+
+const generateTestData: (number: number) => Array<{}> = (rows = 20) => {
+ const data: Array<{}> = [];
+ while (data.length <= rows) {
+ data.push({
+ col1: `Some value ${data.length}`,
+ col2: `More data ${data.length}`,
+ subvalue: `Subvalue ${data.length}`,
+ number: Math.floor(Math.random() * 1000),
+ date: new Date(Math.random() * 10000000000000),
+ });
+ }
+
+ return data;
+};
+
+const testData100 = generateTestData(100);
+
+export const DefaultTable = () => {
+ const columns: TableColumn[] = [
+ {
+ title: 'Column 1',
+ field: 'col1',
+ highlight: true,
+ },
+ {
+ title: 'Column 2',
+ field: 'col2',
+ },
+ {
+ title: 'Numeric value',
+ field: 'number',
+ type: 'numeric',
+ },
+ {
+ title: 'A Date',
+ field: 'date',
+ type: 'date',
+ },
+ ];
+
+ return (
+
+
+
+
+
);
export const TrendingMix = () => (
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 62a89fd337..e817ada9c9 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -16,12 +16,14 @@
export * from './api';
export { default as Page } from './layout/Page';
-export { gradients, pageTheme, PageTheme } from './layout/Page';
+export { gradients, pageTheme } from './layout/Page';
+export type { PageTheme } from './layout/Page';
export { default as Content } from './layout/Content/Content';
export { default as ContentHeader } from './layout/ContentHeader/ContentHeader';
export { default as Header } from './layout/Header/Header';
export { default as HeaderLabel } from './layout/HeaderLabel';
export { default as InfoCard } from './layout/InfoCard';
+export { CardTab, TabbedCard } from './layout/TabbedCard';
export { default as ErrorBoundary } from './layout/ErrorBoundary';
export * from './layout/Sidebar';
export { default as HorizontalScrollGrid } from './components/HorizontalScrollGrid';
@@ -30,10 +32,11 @@ export { default as CircleProgress } from './components/ProgressBars/CircleProgr
export { default as HorizontalProgress } from './components/ProgressBars/HorizontalProgress';
export { default as CopyTextButton } from './components/CopyTextButton';
export { default as Progress } from './components/Progress';
-export { default as Sequence } from './components/Sequence';
+export * from './components/SimpleStepper';
export { AlphaLabel, BetaLabel } from './components/Lifecycle';
export { default as SupportButton } from './components/SupportButton';
-export { default as SortableTable } from './components/SortableTable';
+export { default as Table, SubvalueCell } from './components/Table';
+export type { TableColumn } from './components/Table/Table';
export { default as StructuredMetadataTable } from './components/StructuredMetadataTable';
export { default as TrendLine } from './components/TrendLine';
export { FeatureCalloutCircular } from './components/FeatureDiscovery/FeatureCalloutCircular';
diff --git a/packages/core/src/layout/BottomLink/index.ts b/packages/core/src/layout/BottomLink/index.ts
index 5d4845064b..6f2055f4f7 100644
--- a/packages/core/src/layout/BottomLink/index.ts
+++ b/packages/core/src/layout/BottomLink/index.ts
@@ -14,4 +14,5 @@
* limitations under the License.
*/
-export { default, Props } from './BottomLink';
+export { default } from './BottomLink';
+export type { Props } from './BottomLink';
diff --git a/packages/core/src/layout/ErrorPage/ErrorPage.test.tsx b/packages/core/src/layout/ErrorPage/ErrorPage.test.tsx
new file mode 100644
index 0000000000..1309fdf474
--- /dev/null
+++ b/packages/core/src/layout/ErrorPage/ErrorPage.test.tsx
@@ -0,0 +1,38 @@
+/*
+ * 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 React from 'react';
+import { render } from '@testing-library/react';
+import ErrorPage from './ErrorPage';
+import { wrapInThemedTestApp } from '@backstage/test-utils';
+
+describe('
+ {tags.map((item, idx) => (
+
+ )}
+
+ {toolsCards.map((card: CardData, ix: any) => (
+
+
- setTabIndex(value)}
- indicatorColor="primary"
- >
- {endpoints.map(({ title }, index) => (
-
- setTabIndex(value)}
+ indicatorColor="primary"
+ >
+ {endpoints.map(({ title }, index) => (
+
+
);
};
diff --git a/plugins/home-page/package.json b/plugins/home-page/package.json
index 17c973bd35..6bd38a265a 100644
--- a/plugins/home-page/package.json
+++ b/plugins/home-page/package.json
@@ -1,7 +1,7 @@
{
"name": "@backstage/plugin-home-page",
"version": "0.1.1-alpha.4",
- "main": "dist/index.cjs.js",
+ "main": "dist/index.esm.js",
"types": "dist/index.d.ts",
"license": "Apache-2.0",
"private": true,
diff --git a/plugins/inventory-backend/.eslintrc.js b/plugins/inventory-backend/.eslintrc.js
index f400a039e7..16a033dbc6 100644
--- a/plugins/inventory-backend/.eslintrc.js
+++ b/plugins/inventory-backend/.eslintrc.js
@@ -1,6 +1,3 @@
module.exports = {
- rules: {
- 'no-console': 0, // Permitted in console programs
- 'new-cap': ['error', { capIsNew: false }], // Because Express constructs things e.g. like 'const r = express.Router()'
- },
+ extends: [require.resolve('@backstage/cli/config/eslint.backend')],
};
diff --git a/plugins/inventory-backend/package.json b/plugins/inventory-backend/package.json
index 37f3f27e78..16d510a968 100644
--- a/plugins/inventory-backend/package.json
+++ b/plugins/inventory-backend/package.json
@@ -5,18 +5,31 @@
"license": "Apache-2.0",
"private": true,
"scripts": {
+ "start": "tsc-watch --onFirstSuccess \"cross-env NODE_ENV=development nodemon dist/run.js\"",
"build": "tsc",
"lint": "backstage-cli lint",
"test": "backstage-cli test",
"clean": "backstage-cli clean"
},
"devDependencies": {
- "@backstage/cli": "^0.1.1-alpha.4"
+ "@backstage/cli": "^0.1.1-alpha.4",
+ "jest-fetch-mock": "^3.0.3",
+ "tsc-watch": "^4.2.3"
},
"dependencies": {
- "express": "^4.17.1"
+ "@backstage/backend-common": "0.1.1-alpha.4",
+ "compression": "^1.7.4",
+ "cors": "^2.8.5",
+ "express": "^4.17.1",
+ "express-promise-router": "^3.0.3",
+ "helmet": "^3.22.0",
+ "morgan": "^1.10.0",
+ "winston": "^3.2.1"
},
"files": [
"dist"
- ]
+ ],
+ "nodemonConfig": {
+ "watch": "./dist"
+ }
}
diff --git a/plugins/inventory-backend/src/plugin.test.ts b/plugins/inventory-backend/src/index.test.ts
similarity index 100%
rename from plugins/inventory-backend/src/plugin.test.ts
rename to plugins/inventory-backend/src/index.test.ts
diff --git a/plugins/inventory-backend/src/index.ts b/plugins/inventory-backend/src/index.ts
index 92c9090376..52b4ed9a53 100644
--- a/plugins/inventory-backend/src/index.ts
+++ b/plugins/inventory-backend/src/index.ts
@@ -14,4 +14,5 @@
* limitations under the License.
*/
-export { router } from './plugin';
+export * from './inventory';
+export * from './service/router';
diff --git a/plugins/inventory-backend/src/inventory/AggregatorInventory.ts b/plugins/inventory-backend/src/inventory/AggregatorInventory.ts
new file mode 100644
index 0000000000..b768b8eb23
--- /dev/null
+++ b/plugins/inventory-backend/src/inventory/AggregatorInventory.ts
@@ -0,0 +1,45 @@
+/*
+ * 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 { NotFoundError } from '@backstage/backend-common';
+import { Component, Inventory } from './types';
+
+export class AggregatorInventory implements Inventory {
+ inventories: Inventory[] = [];
+
+ async list(): Promise
-
+
+
+
Header
; diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/src/pages/_app.tsx b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/src/pages/_app.tsx new file mode 100644 index 0000000000..a3853e47c9 --- /dev/null +++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/src/pages/_app.tsx @@ -0,0 +1,37 @@ +import React from 'react'; +import App from 'next/app'; +import Head from 'next/head'; +import styled from 'styled-components'; +import { Header } from '../components/Header'; + +const StyledApp = styled.div` + > * { + padding-left: 16px; + padding-right: 16px; + } +`; + +const Main = styled.div` + margin: 2em auto; + height: 85vh; +`; + +class CustomApp extends App { + render() { + const { Component, pageProps } = this.props; + + return ( +Hello!
; + +export default Index; diff --git a/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/tsconfig.json b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/tsconfig.json new file mode 100644 index 0000000000..03508ff043 --- /dev/null +++ b/plugins/scaffolder-backend/sample-templates/react-ssr-template/{{cookiecutter.componentId}}/tsconfig.json @@ -0,0 +1,20 @@ +{ + "extends": "@spotify/tsconfig", + "compilerOptions": { + "target": "es5", + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": false, + "forceConsistentCasingInFileNames": true, + "noEmit": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve" + }, + "exclude": ["node_modules", "output/node_modules"], + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"] +} diff --git a/plugins/scaffolder-backend/src/index.ts b/plugins/scaffolder-backend/src/index.ts new file mode 100644 index 0000000000..c461bfede6 --- /dev/null +++ b/plugins/scaffolder-backend/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 * from './scaffolder'; +export * from './service/router'; diff --git a/plugins/scaffolder-backend/src/run.ts b/plugins/scaffolder-backend/src/run.ts new file mode 100644 index 0000000000..133aad163e --- /dev/null +++ b/plugins/scaffolder-backend/src/run.ts @@ -0,0 +1,34 @@ +/* + * 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 { getRootLogger } from '@backstage/backend-common'; +import { startStandaloneServer } from './service/standaloneServer'; + +const port = process.env.PLUGIN_PORT ? Number(process.env.PLUGIN_PORT) : 3004; +const enableCors = process.env.PLUGIN_CORS + ? Boolean(process.env.PLUGIN_CORS) + : false; +const logger = getRootLogger(); + +startStandaloneServer({ port, enableCors, logger }).catch((err) => { + logger.error(err); + process.exit(1); +}); + +process.on('SIGINT', () => { + logger.info('CTRL+C pressed; exiting.'); + process.exit(0); +}); diff --git a/plugins/scaffolder-backend/src/scaffolder/index.ts b/plugins/scaffolder-backend/src/scaffolder/index.ts new file mode 100644 index 0000000000..a665b32ead --- /dev/null +++ b/plugins/scaffolder-backend/src/scaffolder/index.ts @@ -0,0 +1,20 @@ +/* + * 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 * from './storage'; +export * from './templater'; + +export * from './storage/disk'; +export * from './templater/cookiecutter'; diff --git a/plugins/scaffolder-backend/src/scaffolder/storage/disk.test.ts b/plugins/scaffolder-backend/src/scaffolder/storage/disk.test.ts new file mode 100644 index 0000000000..9cebb0d380 --- /dev/null +++ b/plugins/scaffolder-backend/src/scaffolder/storage/disk.test.ts @@ -0,0 +1,84 @@ +/* + * 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 { DiskStorage } from './disk'; +import * as path from 'path'; + +describe('Disk Storage', () => { + it('should load a simple template from a simple directory', async () => { + const testTemplateDir = path.resolve( + __dirname, + '../../../test/mock-simple-template-dir', + ); + const templateInfo = require(`${testTemplateDir}/mock-template/template-info.json`); + + const repository = new DiskStorage({ directory: testTemplateDir }); + + await repository.reindex(); + + const templates = await repository.list(); + + expect(templates).toHaveLength(1); + expect(templates[0].id).toBe(templateInfo.id); + expect(templates[0].name).toBe(templateInfo.name); + expect(templates[0].description).toBe(templateInfo.description); + expect(templates[0].ownerId).toBe(templateInfo.ownerId); + }); + + it('should successfully load multiple templates from the same folder', async () => { + const testTemplateDir = path.resolve( + __dirname, + '../../../test/mock-multiple-templates-dir', + ); + + const repository = new DiskStorage({ directory: testTemplateDir }); + + await repository.reindex(); + + const templates = await repository.list(); + + expect(templates).toHaveLength(2); + }); + + it('should return empty array when there are no templates', async () => { + const testTemplateDir = path.resolve( + __dirname, + '/some-folder-that-deffo-does-not-exist', + ); + + const repository = new DiskStorage({ directory: testTemplateDir }); + + await repository.reindex(); + + const templates = await repository.list(); + + expect(templates).toHaveLength(0); + }); + + it('should be able to handle templates with invalid json and ignore them from the returned array', async () => { + const testTemplateDir = path.resolve( + __dirname, + '../../../test/mock-failing-template-dir', + ); + + const repository = new DiskStorage({ directory: testTemplateDir }); + + await repository.reindex(); + + const templates = await repository.list(); + + expect(templates).toHaveLength(1); + }); +}); diff --git a/plugins/scaffolder-backend/src/scaffolder/storage/disk.ts b/plugins/scaffolder-backend/src/scaffolder/storage/disk.ts new file mode 100644 index 0000000000..28236cb86f --- /dev/null +++ b/plugins/scaffolder-backend/src/scaffolder/storage/disk.ts @@ -0,0 +1,99 @@ +/* + * 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 globby from 'globby'; +import fs from 'fs-extra'; +import { Template, StorageBase as Base } from '.'; +import { Logger } from 'winston'; + +interface DiskIndexEntry { + contents: Template; + location: string; +} + +export class DiskStorage implements Base { + private repository: Template[] = []; + private localIndex: DiskIndexEntry[] = []; + + private repoDir: string; + private logger?: Logger; + constructor({ + directory = `${__dirname}/../../../sample-templates`, + logger, + }: { + directory?: string; + logger?: Logger; + }) { + this.repoDir = directory; + this.logger = logger; + } + + public async list(): Promise
+ {STATIC_DATA.map((item, ix) => {
+ return (
+
+ {item.description}
+
+ );
+ })}
+
+