From cc59b3ff0c6523e7b68e93e047ae17d988d164d9 Mon Sep 17 00:00:00 2001 From: Marvin9 Date: Fri, 30 Oct 2020 10:42:05 +0530 Subject: [PATCH 01/29] feat: scaffolder full screen logs --- .../src/components/JobStage/JobStage.tsx | 16 ++++++- .../src/components/JobStage/LogModal.tsx | 48 +++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 plugins/scaffolder/src/components/JobStage/LogModal.tsx diff --git a/plugins/scaffolder/src/components/JobStage/JobStage.tsx b/plugins/scaffolder/src/components/JobStage/JobStage.tsx index 5128a761ec..68a9e8ead8 100644 --- a/plugins/scaffolder/src/components/JobStage/JobStage.tsx +++ b/plugins/scaffolder/src/components/JobStage/JobStage.tsx @@ -1,3 +1,5 @@ +/* eslint-disable jsx-a11y/click-events-have-key-events */ +/* eslint-disable jsx-a11y/no-static-element-interactions */ /* * Copyright 2020 Spotify AB * @@ -31,6 +33,7 @@ import moment from 'moment'; import React, { Suspense, useEffect, useState } from 'react'; import { Job } from '../../types'; +const LogModal = React.lazy(() => import('./LogModal')); const LazyLog = React.lazy(() => import('react-lazylog/build/LazyLog')); moment.relativeTimeThreshold('ss', 0); @@ -99,6 +102,9 @@ export const JobStage = ({ endedAt, startedAt, name, log, status }: Props) => { .humanize() : null; + const [logsFullScreen, setLogsFullScreen] = useState(false); + const toggleLogsFullScreen = () => setLogsFullScreen(!logsFullScreen); + return ( { ) : ( }> -
+ +
diff --git a/plugins/scaffolder/src/components/JobStage/LogModal.tsx b/plugins/scaffolder/src/components/JobStage/LogModal.tsx new file mode 100644 index 0000000000..0eefad9b04 --- /dev/null +++ b/plugins/scaffolder/src/components/JobStage/LogModal.tsx @@ -0,0 +1,48 @@ +/* + * 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 { + Dialog, + DialogTitle, + DialogContent, + IconButton, +} from '@material-ui/core'; +import Close from '@material-ui/icons/Close'; +import LazyLog from 'react-lazylog/build/LazyLog'; + +type Props = { + log: string[]; + open?: boolean; + onClose(): void; +}; + +export const LogModal: React.FC = ({ log, open = false, onClose }) => ( + + + Logs + + + + + +
+ +
+ + +); + +export default LogModal; From 7ce1d4950a6cfeef7ec5300f80bfa18e4c72f113 Mon Sep 17 00:00:00 2001 From: Marvin9 Date: Mon, 2 Nov 2020 22:13:07 +0530 Subject: [PATCH 02/29] chore: update UI --- .../src/components/JobStage/JobStage.tsx | 6 ++- .../src/components/JobStage/LogModal.tsx | 50 +++++++++++++------ 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/plugins/scaffolder/src/components/JobStage/JobStage.tsx b/plugins/scaffolder/src/components/JobStage/JobStage.tsx index 68a9e8ead8..a73b434cd5 100644 --- a/plugins/scaffolder/src/components/JobStage/JobStage.tsx +++ b/plugins/scaffolder/src/components/JobStage/JobStage.tsx @@ -145,7 +145,11 @@ export const JobStage = ({ endedAt, startedAt, name, log, status }: Props) => { style={{ height: '20vh', width: '100%' }} onClick={toggleLogsFullScreen} > - +
)} diff --git a/plugins/scaffolder/src/components/JobStage/LogModal.tsx b/plugins/scaffolder/src/components/JobStage/LogModal.tsx index 0eefad9b04..6c6c5b4ffd 100644 --- a/plugins/scaffolder/src/components/JobStage/LogModal.tsx +++ b/plugins/scaffolder/src/components/JobStage/LogModal.tsx @@ -20,6 +20,7 @@ import { DialogContent, IconButton, } from '@material-ui/core'; +import { makeStyles } from '@material-ui/core/styles'; import Close from '@material-ui/icons/Close'; import LazyLog from 'react-lazylog/build/LazyLog'; @@ -29,20 +30,39 @@ type Props = { onClose(): void; }; -export const LogModal: React.FC = ({ log, open = false, onClose }) => ( - - - Logs - - - - - -
- -
- - -); +const useStyles = makeStyles(theme => ({ + header: { + width: '100%', + padding: theme.spacing(1, 4), + }, + closeIcon: { + float: 'right', + padding: theme.spacing(0.5, 0), + }, + logs: { + boxShadow: '-3px -1px 7px 0px rgba(50, 50, 50, 0.59)', + height: '100%', + width: '100%', + }, +})); +export const LogModal: React.FC = ({ log, open = false, onClose }) => { + const classes = useStyles(); + + return ( + + + Logs + + + + + +
+ +
+ + + ); +}; export default LogModal; From fc6839f135999afb0b619e36e55f5148f907a1a8 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Tue, 29 Dec 2020 16:30:56 +0100 Subject: [PATCH 03/29] create-app: bump sqlite3 to v5 --- .changeset/gold-moons-collect.md | 16 ++++++++++++++++ .../packages/backend/package.json.hbs | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .changeset/gold-moons-collect.md diff --git a/.changeset/gold-moons-collect.md b/.changeset/gold-moons-collect.md new file mode 100644 index 0000000000..32b9c4ce13 --- /dev/null +++ b/.changeset/gold-moons-collect.md @@ -0,0 +1,16 @@ +--- +'@backstage/create-app': patch +--- + +Bump `sqlite3` to v5. + +To apply this change to an existing app, change the version of `sqlite3` in the `dependencies` of `packages/backend/package.json`: + +```diff + "pg": "^8.3.0", +- "sqlite3": "^4.2.0", ++ "sqlite3": "^5.0.0", + "winston": "^3.2.1" +``` + +Note that the `sqlite3` dependency may not be preset if you chose to use PostgreSQL when creating the app. diff --git a/packages/create-app/templates/default-app/packages/backend/package.json.hbs b/packages/create-app/templates/default-app/packages/backend/package.json.hbs index 2c8f460a35..c62d7a5e02 100644 --- a/packages/create-app/templates/default-app/packages/backend/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/backend/package.json.hbs @@ -37,7 +37,7 @@ "pg": "^8.3.0", {{/if}} {{#if dbTypeSqlite}} - "sqlite3": "^4.2.0", + "sqlite3": "^5.0.0", {{/if}} "winston": "^3.2.1" }, From 071711d70f86c1c0900587710a6cdb5b49da60b9 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Tue, 29 Dec 2020 16:34:31 +0100 Subject: [PATCH 04/29] catalog-backend: move sqlite3 to dev deps --- .changeset/old-bananas-drum.md | 5 +++++ plugins/catalog-backend/package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/old-bananas-drum.md diff --git a/.changeset/old-bananas-drum.md b/.changeset/old-bananas-drum.md new file mode 100644 index 0000000000..b09ea84d0c --- /dev/null +++ b/.changeset/old-bananas-drum.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-backend': patch +--- + +Remove `sqlite3` as a dependency. You may need to add `sqlite3` as a dependency of your backend if you were relying on this indirect dependency. diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json index 5ebe1c3e41..f4d5d30656 100644 --- a/plugins/catalog-backend/package.json +++ b/plugins/catalog-backend/package.json @@ -49,7 +49,6 @@ "morgan": "^1.10.0", "p-limit": "^3.0.2", "qs": "^6.9.4", - "sqlite3": "^5.0.0", "uuid": "^8.0.0", "winston": "^3.2.1", "yaml": "^1.9.2", @@ -66,6 +65,7 @@ "@types/uuid": "^8.0.0", "@types/yup": "^0.29.8", "msw": "^0.21.2", + "sqlite3": "^5.0.0", "supertest": "^4.0.2" }, "files": [ From 1773a5182b2a0d6703933a2b633aeb70813d4380 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 30 Dec 2020 17:01:35 +0100 Subject: [PATCH 05/29] create-app: removed lighthouse plugin from default template --- .changeset/twenty-llamas-sin.md | 12 ++++++++++++ .../templates/default-app/app-config.yaml.hbs | 3 --- .../default-app/packages/app/package.json.hbs | 1 - .../default-app/packages/app/src/plugins.ts | 1 - .../default-app/packages/app/src/sidebar.tsx | 2 -- 5 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 .changeset/twenty-llamas-sin.md diff --git a/.changeset/twenty-llamas-sin.md b/.changeset/twenty-llamas-sin.md new file mode 100644 index 0000000000..30690cfdc0 --- /dev/null +++ b/.changeset/twenty-llamas-sin.md @@ -0,0 +1,12 @@ +--- +'@backstage/create-app': patch +--- + +Removed lighthouse plugin from the default set up plugins, as it requires a separate Backend to function. + +To apply this change to an existing app, remove the following: + +1. The `lighthouse` block from `app-config.yaml`. +2. The `@backstage/plugin-lighthouse` dependency from `packages/app/package.json`. +3. The `@backstage/plugin-lighthouse` re-export from `packages/app/src/plugins.ts`. +4. The Lighthouse sidebar item from `packages/app/src/sidebar.tsx`, and the `RuleIcon` import if it is unused. diff --git a/packages/create-app/templates/default-app/app-config.yaml.hbs b/packages/create-app/templates/default-app/app-config.yaml.hbs index 7b70a2192c..90f272270a 100644 --- a/packages/create-app/templates/default-app/app-config.yaml.hbs +++ b/packages/create-app/templates/default-app/app-config.yaml.hbs @@ -65,9 +65,6 @@ techdocs: publisher: type: 'local' -lighthouse: - baseUrl: http://localhost:3003 - auth: # see https://backstage.io/docs/tutorials/quickstart-app-auth to know more about enabling auth providers providers: {} diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs index 48ab600c97..e40ed6f03d 100644 --- a/packages/create-app/templates/default-app/packages/app/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs @@ -15,7 +15,6 @@ "@backstage/plugin-techdocs": "^{{version '@backstage/plugin-techdocs'}}", "@backstage/catalog-model": "^{{version '@backstage/catalog-model'}}", "@backstage/plugin-circleci": "^{{version '@backstage/plugin-circleci'}}", - "@backstage/plugin-lighthouse": "^{{version '@backstage/plugin-lighthouse'}}", "@backstage/plugin-tech-radar": "^{{version '@backstage/plugin-tech-radar'}}", "@backstage/plugin-github-actions": "^{{version '@backstage/plugin-github-actions'}}", "@backstage/plugin-user-settings": "^{{version '@backstage/plugin-user-settings'}}", diff --git a/packages/create-app/templates/default-app/packages/app/src/plugins.ts b/packages/create-app/templates/default-app/packages/app/src/plugins.ts index 182ec3c51c..d3c9d6e2f3 100644 --- a/packages/create-app/templates/default-app/packages/app/src/plugins.ts +++ b/packages/create-app/templates/default-app/packages/app/src/plugins.ts @@ -3,7 +3,6 @@ export { plugin as CatalogPlugin } from '@backstage/plugin-catalog'; export { plugin as CatalogImport } from '@backstage/plugin-catalog-import'; export { plugin as Circleci } from '@backstage/plugin-circleci'; export { plugin as GithubActions } from '@backstage/plugin-github-actions'; -export { plugin as LighthousePlugin } from '@backstage/plugin-lighthouse'; export { plugin as ScaffolderPlugin } from '@backstage/plugin-scaffolder'; export { plugin as TechDocsPlugin } from '@backstage/plugin-techdocs'; export { plugin as TechRadar } from '@backstage/plugin-tech-radar'; diff --git a/packages/create-app/templates/default-app/packages/app/src/sidebar.tsx b/packages/create-app/templates/default-app/packages/app/src/sidebar.tsx index a5595e2c09..d1f07bd132 100644 --- a/packages/create-app/templates/default-app/packages/app/src/sidebar.tsx +++ b/packages/create-app/templates/default-app/packages/app/src/sidebar.tsx @@ -4,7 +4,6 @@ import LibraryBooks from '@material-ui/icons/LibraryBooks'; import ExtensionIcon from '@material-ui/icons/Extension'; import CreateComponentIcon from '@material-ui/icons/AddCircleOutline'; import BuildIcon from '@material-ui/icons/BuildRounded'; -import RuleIcon from '@material-ui/icons/AssignmentTurnedIn'; import MapIcon from '@material-ui/icons/MyLocation'; import { Link, makeStyles } from '@material-ui/core'; import { NavLink } from 'react-router-dom'; @@ -34,7 +33,6 @@ export const AppSidebar = () => ( - {/* End global nav */} From 8d68e4cdc79751b1de927eda9a5e330c80999f5d Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 30 Dec 2020 17:06:15 +0100 Subject: [PATCH 06/29] create-app: removed the CircleCI sidebar item, since the target page doesn't exist --- .changeset/short-ravens-complain.md | 7 +++++++ .../templates/default-app/packages/app/src/sidebar.tsx | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changeset/short-ravens-complain.md diff --git a/.changeset/short-ravens-complain.md b/.changeset/short-ravens-complain.md new file mode 100644 index 0000000000..55e52311ff --- /dev/null +++ b/.changeset/short-ravens-complain.md @@ -0,0 +1,7 @@ +--- +'@backstage/create-app': patch +--- + +Removed the Circle CI sidebar item, since the target page does not exist. + +To apply this change to an existing app, remove `"CircleCI"` sidebar item from `packages/app/src/sidebar.tsx`, and the `BuildIcon` import if it is unused. diff --git a/packages/create-app/templates/default-app/packages/app/src/sidebar.tsx b/packages/create-app/templates/default-app/packages/app/src/sidebar.tsx index d1f07bd132..55fa056e59 100644 --- a/packages/create-app/templates/default-app/packages/app/src/sidebar.tsx +++ b/packages/create-app/templates/default-app/packages/app/src/sidebar.tsx @@ -3,7 +3,6 @@ import HomeIcon from '@material-ui/icons/Home'; import LibraryBooks from '@material-ui/icons/LibraryBooks'; import ExtensionIcon from '@material-ui/icons/Extension'; import CreateComponentIcon from '@material-ui/icons/AddCircleOutline'; -import BuildIcon from '@material-ui/icons/BuildRounded'; import MapIcon from '@material-ui/icons/MyLocation'; import { Link, makeStyles } from '@material-ui/core'; import { NavLink } from 'react-router-dom'; @@ -33,7 +32,6 @@ export const AppSidebar = () => ( - {/* End global nav */} From b8abdda570167d1b23b167d362b234a0431e52b7 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Thu, 10 Dec 2020 18:23:40 +0100 Subject: [PATCH 07/29] cli: some more colors for versions:bump + list breaking changes and changelogs of @backstage packages --- .changeset/purple-queens-film.md | 5 ++ .../cli/src/commands/versions/bump.test.ts | 23 +++++-- packages/cli/src/commands/versions/bump.ts | 66 +++++++++++++++++-- 3 files changed, 84 insertions(+), 10 deletions(-) create mode 100644 .changeset/purple-queens-film.md diff --git a/.changeset/purple-queens-film.md b/.changeset/purple-queens-film.md new file mode 100644 index 0000000000..ff9e28a7ac --- /dev/null +++ b/.changeset/purple-queens-film.md @@ -0,0 +1,5 @@ +--- +'@backstage/cli': patch +--- + +Add color to output from `versions:bump` in order to make it easier to spot changes. Also highlight possible breaking changes and link to changelogs. diff --git a/packages/cli/src/commands/versions/bump.test.ts b/packages/cli/src/commands/versions/bump.test.ts index 1325f0e2fd..ba81b653d5 100644 --- a/packages/cli/src/commands/versions/bump.test.ts +++ b/packages/cli/src/commands/versions/bump.test.ts @@ -23,6 +23,15 @@ import * as runObj from '../../lib/run'; import bump from './bump'; import { withLogCollector } from '@backstage/test-utils'; +// Remove log coloring to simplify log matching +jest.mock('chalk', () => ({ + blue: (str: string) => str, + cyan: (str: string) => str, + green: (str: string) => str, + magenta: (str: string) => str, + yellow: (str: string) => str, +})); + const REGISTRY_VERSIONS: { [name: string]: string } = { '@backstage/core': '1.0.6', '@backstage/core-api': '1.0.7', @@ -121,11 +130,15 @@ describe('bump', () => { 'Checking for updates of @backstage/core', 'Checking for updates of @backstage/core-api', 'Some packages are outdated, updating', - 'Removing lockfile entry for @backstage/core@^1.0.3 to bump to 1.0.6', - 'Removing lockfile entry for @backstage/core-api@^1.0.6 to bump to 1.0.7', - 'Removing lockfile entry for @backstage/core-api@^1.0.3 to bump to 1.0.7', - 'Bumping @backstage/theme in b to ^2.0.0', - "Running 'yarn install' to install new versions", + 'unlocking @backstage/core@^1.0.3 ~> 1.0.6', + 'unlocking @backstage/core-api@^1.0.6 ~> 1.0.7', + 'unlocking @backstage/core-api@^1.0.3 ~> 1.0.7', + 'bumping @backstage/theme in b to ^2.0.0', + 'Running yarn install to install new versions', + 'The following packages may have breaking changes:', + ' @backstage/theme', + ' https://github.com/backstage/backstage/blob/master/packages/theme/CHANGELOG.md', + 'Version bump complete!', ]); expect(runObj.runPlain).toHaveBeenCalledTimes(3); diff --git a/packages/cli/src/commands/versions/bump.ts b/packages/cli/src/commands/versions/bump.ts index 441f65f353..6edfd08c71 100644 --- a/packages/cli/src/commands/versions/bump.ts +++ b/packages/cli/src/commands/versions/bump.ts @@ -15,6 +15,7 @@ */ import fs from 'fs-extra'; +import chalk from 'chalk'; import semver from 'semver'; import { resolve as resolvePath } from 'path'; import { run } from '../../lib/run'; @@ -35,6 +36,7 @@ const DEP_TYPES = [ type PkgVersionInfo = { range: string; + target: string; name: string; location: string; }; @@ -69,6 +71,7 @@ export default async () => { name, location: pkg.location, range: `^${target}`, // TODO(Rugvip): Option to use something else than ^? + target, }), ); } @@ -98,9 +101,9 @@ export default async () => { // Write all discovered version bumps to package.json in this repo if (versionBumps.size === 0 && unlocked.length === 0) { - console.log('All Backstage packages are up to date!'); + console.log(chalk.green('All Backstage packages are up to date!')); } else { - console.log('Some packages are outdated, updating'); + console.log(chalk.yellow('Some packages are outdated, updating')); console.log(); if (unlocked.length > 0) { @@ -115,7 +118,9 @@ export default async () => { if (!removed.has(key)) { removed.add(key); console.log( - `Removing lockfile entry for ${name}@${range} to bump to ${target}`, + `${chalk.magenta('unlocking')} ${name}@${chalk.yellow( + range, + )} ~> ${chalk.yellow(target)}`, ); lockfile.remove(name, range); } @@ -123,16 +128,34 @@ export default async () => { await lockfile.save(); } + const breakingUpdates = new Map(); await workerThreads(16, versionBumps.entries(), async ([name, deps]) => { const pkgPath = resolvePath(deps[0].location, 'package.json'); const pkgJson = await fs.readJson(pkgPath); for (const dep of deps) { - console.log(`Bumping ${dep.name} in ${name} to ${dep.range}`); + console.log( + `${chalk.cyan('bumping')} ${dep.name} in ${chalk.cyan( + name, + )} to ${chalk.yellow(dep.range)}`, + ); for (const depType of DEP_TYPES) { if (depType in pkgJson && dep.name in pkgJson[depType]) { + const oldRange = pkgJson[depType][dep.name]; pkgJson[depType][dep.name] = dep.range; + + // Check if the update was at least a pre-v1 minor or post-v1 major release + const lockfileEntry = lockfile + .get(dep.name) + ?.find(entry => entry.range === oldRange); + if (lockfileEntry) { + const from = lockfileEntry.version; + const to = dep.target; + if (!semver.satisfies(to, `^${from}`)) { + breakingUpdates.set(dep.name, { from, to }); + } + } } } } @@ -141,9 +164,42 @@ export default async () => { }); console.log(); - console.log("Running 'yarn install' to install new versions"); + console.log( + `Running ${chalk.blue('yarn install')} to install new versions`, + ); console.log(); await run('yarn', ['install']); + + if (breakingUpdates.size > 0) { + console.log(); + console.log( + chalk.yellow('The following packages may have breaking changes:'), + ); + console.log(); + + for (const [name] of breakingUpdates) { + console.log(` ${chalk.yellow(name)}`); + + let path; + if (name.startsWith('@backstage/plugin-')) { + path = `plugins/${name.replace('@backstage/plugin-', '')}`; + } else if (name.startsWith('@backstage/')) { + path = `packages/${name.replace('@backstage/', '')}`; + } + if (path) { + // TODO(Rugvip): Grab these URLs and paths from package.json, possibly verify existence + // Possibly invent new "changelog" field in package.json or some sh*t. + console.log( + ` https://github.com/backstage/backstage/blob/master/${path}/CHANGELOG.md`, + ); + } + console.log(); + } + } else { + console.log(); + } + + console.log(chalk.green('Version bump complete!')); } console.log(); From 595698414e2d024061a9710ccac18c0339029adb Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 5 Jan 2021 16:34:09 +0100 Subject: [PATCH 08/29] chore: fixing code review comments. settled for a simpler button instead in an actions wrapper --- .../src/components/JobStage/JobStage.tsx | 20 +++++++++---------- .../src/components/JobStage/LogModal.tsx | 10 +++++++++- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/plugins/scaffolder/src/components/JobStage/JobStage.tsx b/plugins/scaffolder/src/components/JobStage/JobStage.tsx index 398595a274..53ceffc87d 100644 --- a/plugins/scaffolder/src/components/JobStage/JobStage.tsx +++ b/plugins/scaffolder/src/components/JobStage/JobStage.tsx @@ -1,5 +1,3 @@ -/* eslint-disable jsx-a11y/click-events-have-key-events */ -/* eslint-disable jsx-a11y/no-static-element-interactions */ /* * Copyright 2020 Spotify AB * @@ -20,10 +18,12 @@ import { Accordion, AccordionDetails, AccordionSummary, + AccordionActions, Box, CircularProgress, LinearProgress, Typography, + Button, } from '@material-ui/core'; import { makeStyles } from '@material-ui/core/styles'; import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; @@ -153,19 +153,17 @@ export const JobStage = ({ endedAt, startedAt, name, log, status }: Props) => { onClose={toggleLogsFullScreen} log={log} /> -
- +
+
)} + + + ); }; diff --git a/plugins/scaffolder/src/components/JobStage/LogModal.tsx b/plugins/scaffolder/src/components/JobStage/LogModal.tsx index 6c6c5b4ffd..8c2d757ade 100644 --- a/plugins/scaffolder/src/components/JobStage/LogModal.tsx +++ b/plugins/scaffolder/src/components/JobStage/LogModal.tsx @@ -46,7 +46,15 @@ const useStyles = makeStyles(theme => ({ }, })); -export const LogModal: React.FC = ({ log, open = false, onClose }) => { +export const LogModal = ({ + log, + open = false, + onClose, +}: { + log: string[]; + open: boolean; + onClose: () => void; +}) => { const classes = useStyles(); return ( From 947d3c269441cd7cd04db8b06b378b928ad23c09 Mon Sep 17 00:00:00 2001 From: Ben Lambert Date: Tue, 5 Jan 2021 16:36:54 +0100 Subject: [PATCH 09/29] Create twenty-humans-jog.md --- .changeset/twenty-humans-jog.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/twenty-humans-jog.md diff --git a/.changeset/twenty-humans-jog.md b/.changeset/twenty-humans-jog.md new file mode 100644 index 0000000000..8aef0c5fca --- /dev/null +++ b/.changeset/twenty-humans-jog.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder': patch +--- + +You can now maximize the logs into fullscreen by clicking the button under each step of the job From 5b31d0cedcb3b1472aa31edd6fc7e7f1a2b98bfa Mon Sep 17 00:00:00 2001 From: Ben Lambert Date: Tue, 5 Jan 2021 16:39:34 +0100 Subject: [PATCH 10/29] Update twenty-humans-jog.md --- .changeset/twenty-humans-jog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/twenty-humans-jog.md b/.changeset/twenty-humans-jog.md index 8aef0c5fca..16662d48fd 100644 --- a/.changeset/twenty-humans-jog.md +++ b/.changeset/twenty-humans-jog.md @@ -2,4 +2,4 @@ '@backstage/plugin-scaffolder': patch --- -You can now maximize the logs into fullscreen by clicking the button under each step of the job +You can now maximize the logs into full-screen by clicking the button under each step of the job From 4925d4e768b4eb79f9bcb2e39fe81847dd7cb6a1 Mon Sep 17 00:00:00 2001 From: blam Date: Tue, 5 Jan 2021 16:50:54 +0100 Subject: [PATCH 11/29] chore: tidy up some smaller parts of the modal to align with the ADR --- .../scaffolder/src/components/JobStage/JobStage.tsx | 2 +- .../scaffolder/src/components/JobStage/LogModal.tsx | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/plugins/scaffolder/src/components/JobStage/JobStage.tsx b/plugins/scaffolder/src/components/JobStage/JobStage.tsx index 53ceffc87d..86c2982dde 100644 --- a/plugins/scaffolder/src/components/JobStage/JobStage.tsx +++ b/plugins/scaffolder/src/components/JobStage/JobStage.tsx @@ -31,9 +31,9 @@ import ExpandLessIcon from '@material-ui/icons/ExpandLess'; import cn from 'classnames'; import moment from 'moment'; import React, { Suspense, useEffect, useState } from 'react'; +import { LogModal } from './LogModal'; import { Job } from '../../types'; -const LogModal = React.lazy(() => import('./LogModal')); const LazyLog = React.lazy(() => import('react-lazylog/build/LazyLog')); moment.relativeTimeThreshold('ss', 0); diff --git a/plugins/scaffolder/src/components/JobStage/LogModal.tsx b/plugins/scaffolder/src/components/JobStage/LogModal.tsx index 8c2d757ade..73b6253510 100644 --- a/plugins/scaffolder/src/components/JobStage/LogModal.tsx +++ b/plugins/scaffolder/src/components/JobStage/LogModal.tsx @@ -46,15 +46,7 @@ const useStyles = makeStyles(theme => ({ }, })); -export const LogModal = ({ - log, - open = false, - onClose, -}: { - log: string[]; - open: boolean; - onClose: () => void; -}) => { +export const LogModal = ({ log, open = false, onClose }: Props) => { const classes = useStyles(); return ( @@ -73,4 +65,3 @@ export const LogModal = ({ ); }; -export default LogModal; From 0f40f1934f81cb2f9a123af644e6f8d1769bddb7 Mon Sep 17 00:00:00 2001 From: Remi Date: Tue, 5 Jan 2021 18:35:23 +0100 Subject: [PATCH 12/29] fix(techdocs): path delimiters --- .../src/stages/publish/awsS3.test.ts | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/packages/techdocs-common/src/stages/publish/awsS3.test.ts b/packages/techdocs-common/src/stages/publish/awsS3.test.ts index 501c171c2e..907da5148c 100644 --- a/packages/techdocs-common/src/stages/publish/awsS3.test.ts +++ b/packages/techdocs-common/src/stages/publish/awsS3.test.ts @@ -14,6 +14,7 @@ * limitations under the License. */ import mockFs from 'mock-fs'; +import path from 'path'; import * as winston from 'winston'; import { ConfigReader } from '@backstage/config'; import { AwsS3Publish } from './awsS3'; @@ -67,8 +68,9 @@ describe('AwsS3Publish', () => { kind, metadata: { namespace, name }, } = entity; + const directoryPath = path.join(namespace, kind, name); mockFs({ - [`${namespace}/${kind}/${name}`]: { + [directoryPath]: { 'index.html': '', '404.html': '', assets: { @@ -80,23 +82,29 @@ describe('AwsS3Publish', () => { expect( await publisher.publish({ entity, - directory: `${namespace}/${kind}/${name}`, + directory: directoryPath, }), ).toBeUndefined(); mockFs.restore(); }); it('should fail to publish a directory', async () => { - const wrongPathToGeneratedDirectory = '/wrong/path/to/generatedDirectory'; + const wrongPathToGeneratedDirectory = path.join( + 'wrong', + 'path', + 'to', + 'generatedDirectory', + ); const entity = createMockEntity(); const { kind, metadata: { namespace, name }, } = entity; + const directoryPath = path.join(namespace, kind, name); mockFs({ - [`${namespace}/${kind}/${name}`]: { + [directoryPath]: { 'index.html': '', '404.html': '', assets: { @@ -127,11 +135,15 @@ describe('AwsS3Publish', () => { apiVersion: 'apiVersion', kind: 'kind', metadata: { - namespace: '/namespace', + namespace: 'namespace', name: 'name', }, }; - const entityRootDir = `${entityMock.metadata.namespace}/${entityMock.kind}/${entityMock.metadata.name}`; + const entityRootDir = path.join( + entityMock.metadata.namespace, + entityMock.kind, + entityMock.metadata.name, + ); mockFs({ [entityRootDir]: { 'index.html': 'file-content', @@ -160,10 +172,14 @@ describe('AwsS3Publish', () => { it('should return tech docs metadata', async () => { const entityNameMock = { name: 'name', - namespace: '/namespace', + namespace: 'namespace', kind: 'kind', }; - const entityRootDir = `${entityNameMock.namespace}/${entityNameMock.kind}/${entityNameMock.name}`; + const entityRootDir = path.join( + entityNameMock.namespace, + entityNameMock.kind, + entityNameMock.name, + ); mockFs({ [entityRootDir]: { 'techdocs_metadata.json': 'file-content', @@ -182,7 +198,11 @@ describe('AwsS3Publish', () => { namespace: 'namespace', kind: 'kind', }; - const entityRootDir = `${entityNameMock.namespace}/${entityNameMock.kind}/${entityNameMock.name}`; + const entityRootDir = path.join( + entityNameMock.namespace, + entityNameMock.kind, + entityNameMock.name, + ); await publisher .fetchTechDocsMetadata(entityNameMock) .catch(error => From a87fc11aca708766b91c613758657de926969531 Mon Sep 17 00:00:00 2001 From: Remi Date: Tue, 5 Jan 2021 21:31:18 +0100 Subject: [PATCH 13/29] tests(techdocs): refactor --- .../src/stages/publish/awsS3.test.ts | 95 ++++++++----------- 1 file changed, 37 insertions(+), 58 deletions(-) diff --git a/packages/techdocs-common/src/stages/publish/awsS3.test.ts b/packages/techdocs-common/src/stages/publish/awsS3.test.ts index 907da5148c..a1d52be85b 100644 --- a/packages/techdocs-common/src/stages/publish/awsS3.test.ts +++ b/packages/techdocs-common/src/stages/publish/awsS3.test.ts @@ -19,8 +19,9 @@ import * as winston from 'winston'; import { ConfigReader } from '@backstage/config'; import { AwsS3Publish } from './awsS3'; import { PublisherBase } from './types'; +import type { Entity, EntityName } from '@backstage/catalog-model'; -const createMockEntity = (annotations = {}) => { +const createMockEntity = (annotations = {}): Entity => { return { apiVersion: 'version', kind: 'TestKind', @@ -34,6 +35,21 @@ const createMockEntity = (annotations = {}) => { }; }; +const createMockEntityName = (): EntityName => ({ + kind: 'TestKind', + name: 'test-component-name', + namespace: 'test-namespace', +}); + +const getEntityRootDir = (entity: Entity) => { + const { + kind, + metadata: { namespace, name }, + } = entity; + const entityRootDir = path.join(namespace as string, kind, name); + return entityRootDir; +}; + const logger = winston.createLogger(); jest.spyOn(logger, 'info').mockReturnValue(logger); jest.spyOn(logger, 'error').mockReturnValue(logger); @@ -64,13 +80,10 @@ describe('AwsS3Publish', () => { describe('publish', () => { it('should publish a directory', async () => { const entity = createMockEntity(); - const { - kind, - metadata: { namespace, name }, - } = entity; - const directoryPath = path.join(namespace, kind, name); + const entityRootDir = getEntityRootDir(entity); + mockFs({ - [directoryPath]: { + [entityRootDir]: { 'index.html': '', '404.html': '', assets: { @@ -82,7 +95,7 @@ describe('AwsS3Publish', () => { expect( await publisher.publish({ entity, - directory: directoryPath, + directory: entityRootDir, }), ).toBeUndefined(); mockFs.restore(); @@ -96,15 +109,10 @@ describe('AwsS3Publish', () => { 'generatedDirectory', ); const entity = createMockEntity(); - - const { - kind, - metadata: { namespace, name }, - } = entity; - const directoryPath = path.join(namespace, kind, name); + const entityRootDir = getEntityRootDir(entity); mockFs({ - [directoryPath]: { + [entityRootDir]: { 'index.html': '', '404.html': '', assets: { @@ -131,55 +139,32 @@ describe('AwsS3Publish', () => { describe('hasDocsBeenGenerated', () => { it('should return true if docs has been generated', async () => { - const entityMock = { - apiVersion: 'apiVersion', - kind: 'kind', - metadata: { - namespace: 'namespace', - name: 'name', - }, - }; - const entityRootDir = path.join( - entityMock.metadata.namespace, - entityMock.kind, - entityMock.metadata.name, - ); + const entity = createMockEntity(); + const entityRootDir = getEntityRootDir(entity); + mockFs({ [entityRootDir]: { 'index.html': 'file-content', }, }); - expect(await publisher.hasDocsBeenGenerated(entityMock)).toBe(true); + expect(await publisher.hasDocsBeenGenerated(entity)).toBe(true); mockFs.restore(); }); it('should return false if docs has not been generated', async () => { - const entityMock = { - apiVersion: 'apiVersion', - kind: 'kind', - metadata: { - namespace: 'namespace', - name: 'name', - }, - }; + const entity = createMockEntity(); - expect(await publisher.hasDocsBeenGenerated(entityMock)).toBe(false); + expect(await publisher.hasDocsBeenGenerated(entity)).toBe(false); }); }); describe('fetchTechDocsMetadata', () => { it('should return tech docs metadata', async () => { - const entityNameMock = { - name: 'name', - namespace: 'namespace', - kind: 'kind', - }; - const entityRootDir = path.join( - entityNameMock.namespace, - entityNameMock.kind, - entityNameMock.name, - ); + const entityNameMock = createMockEntityName(); + const entity = createMockEntity(); + const entityRootDir = getEntityRootDir(entity); + mockFs({ [entityRootDir]: { 'techdocs_metadata.json': 'file-content', @@ -193,16 +178,10 @@ describe('AwsS3Publish', () => { }); it('should return an error if the techdocs_metadata.json file is not present', async () => { - const entityNameMock = { - name: 'name', - namespace: 'namespace', - kind: 'kind', - }; - const entityRootDir = path.join( - entityNameMock.namespace, - entityNameMock.kind, - entityNameMock.name, - ); + const entityNameMock = createMockEntityName(); + const entity = createMockEntity(); + const entityRootDir = getEntityRootDir(entity); + await publisher .fetchTechDocsMetadata(entityNameMock) .catch(error => From 811761d4ce8a2260b9a0fe77e8da99f03b37430d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Jan 2021 02:57:51 +0000 Subject: [PATCH 14/29] chore(deps): bump axios from 0.20.0 to 0.21.1 Bumps [axios](https://github.com/axios/axios) from 0.20.0 to 0.21.1. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.20.0...v0.21.1) Signed-off-by: dependabot[bot] --- plugins/rollbar-backend/package.json | 2 +- yarn.lock | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/rollbar-backend/package.json b/plugins/rollbar-backend/package.json index 2c88692964..a8cb0105bf 100644 --- a/plugins/rollbar-backend/package.json +++ b/plugins/rollbar-backend/package.json @@ -33,7 +33,7 @@ "@backstage/backend-common": "^0.4.0", "@backstage/config": "^0.1.2", "@types/express": "^4.17.6", - "axios": "^0.20.0", + "axios": "^0.21.1", "camelcase-keys": "^6.2.2", "compression": "^1.7.4", "cors": "^2.8.5", diff --git a/yarn.lock b/yarn.lock index 3af2f2f713..5bf5ea697c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7742,6 +7742,13 @@ axios@^0.20.0: dependencies: follow-redirects "^1.10.0" +axios@^0.21.1: + version "0.21.1" + resolved "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" + integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== + dependencies: + follow-redirects "^1.10.0" + axobject-query@^2.0.2: version "2.1.2" resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-2.1.2.tgz#2bdffc0371e643e5f03ba99065d5179b9ca79799" From 9c12f364a6e71b768d23a455cb22685eaba681df Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 6 Jan 2021 01:04:20 -0500 Subject: [PATCH 15/29] Remove test-utils from prod deps --- packages/app/package.json | 2 +- packages/core-api/package.json | 2 +- plugins/cost-insights/package.json | 1 - plugins/tech-radar/package.json | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index 7541dd59a3..e8a4194c3d 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -33,7 +33,6 @@ "@backstage/plugin-techdocs": "^0.5.1", "@backstage/plugin-user-settings": "^0.2.3", "@backstage/plugin-welcome": "^0.2.3", - "@backstage/test-utils": "^0.1.6", "@backstage/theme": "^0.2.2", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", @@ -53,6 +52,7 @@ "zen-observable": "^0.8.15" }, "devDependencies": { + "@backstage/test-utils": "^0.1.6", "@testing-library/cypress": "^7.0.1", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^10.4.1", diff --git a/packages/core-api/package.json b/packages/core-api/package.json index a818d38143..c0373f99b8 100644 --- a/packages/core-api/package.json +++ b/packages/core-api/package.json @@ -30,7 +30,6 @@ }, "dependencies": { "@backstage/config": "^0.1.2", - "@backstage/test-utils": "^0.1.6", "@backstage/theme": "^0.2.2", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", @@ -44,6 +43,7 @@ }, "devDependencies": { "@backstage/cli": "^0.4.4", + "@backstage/test-utils": "^0.1.6", "@backstage/test-utils-core": "^0.1.1", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^10.4.1", diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json index a38a07a3a0..0cfdf8342a 100644 --- a/plugins/cost-insights/package.json +++ b/plugins/cost-insights/package.json @@ -32,7 +32,6 @@ "dependencies": { "@backstage/config": "^0.1.2", "@backstage/core": "^0.4.3", - "@backstage/test-utils": "^0.1.5", "@backstage/theme": "^0.2.2", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json index ea30f15a67..5c23522efe 100644 --- a/plugins/tech-radar/package.json +++ b/plugins/tech-radar/package.json @@ -31,7 +31,6 @@ }, "dependencies": { "@backstage/core": "^0.4.3", - "@backstage/test-utils": "^0.1.5", "@backstage/theme": "^0.2.2", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", From edb7d07750caf9246d68358fe18818a67708fd60 Mon Sep 17 00:00:00 2001 From: Oliver Sand Date: Wed, 6 Jan 2021 13:50:19 +0100 Subject: [PATCH 16/29] Create "url" type location when registering using the catalog-import plugin --- .changeset/mean-seas-bake.md | 5 +++++ plugins/catalog-import/src/api/CatalogImportClient.ts | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changeset/mean-seas-bake.md diff --git a/.changeset/mean-seas-bake.md b/.changeset/mean-seas-bake.md new file mode 100644 index 0000000000..d675352ebd --- /dev/null +++ b/.changeset/mean-seas-bake.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-import': patch +--- + +Create "url" type location when registering using the catalog-import plugin. diff --git a/plugins/catalog-import/src/api/CatalogImportClient.ts b/plugins/catalog-import/src/api/CatalogImportClient.ts index 0e3ea2e1d6..0e28042db3 100644 --- a/plugins/catalog-import/src/api/CatalogImportClient.ts +++ b/plugins/catalog-import/src/api/CatalogImportClient.ts @@ -49,7 +49,7 @@ export class CatalogImportClient implements CatalogImportApi { }, method: 'POST', body: JSON.stringify({ - location: { type: 'github', target: repo }, + location: { type: 'url', target: repo }, }), }, ).catch(e => { @@ -78,7 +78,7 @@ export class CatalogImportClient implements CatalogImportApi { }, method: 'POST', body: JSON.stringify({ - type: 'github', + type: 'url', target: location, presence: 'optional', }), From 0513536be85e4bdb3f99e4e77fe710ce2704195f Mon Sep 17 00:00:00 2001 From: Himanshu Mishra Date: Wed, 6 Jan 2021 14:10:51 +0100 Subject: [PATCH 17/29] docs(TechDocs): Update publisher milestones about AWS and Azure storage --- docs/features/techdocs/README.md | 12 ++++++------ docs/features/techdocs/configuration.md | 16 ++++------------ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/docs/features/techdocs/README.md b/docs/features/techdocs/README.md index cf94efda5e..82db4e15ff 100644 --- a/docs/features/techdocs/README.md +++ b/docs/features/techdocs/README.md @@ -108,12 +108,12 @@ providers are used. | GitLab | Yes ✅ | | GitLab Enterprise | Yes ✅ | -| File Storage Provider | Support Status | -| --------------------------------- | -------------- | -| Local Filesystem of Backstage app | Yes ✅ | -| Google Cloud Storage (GCS) | Yes ✅ | -| Amazon Web Services (AWS) S3 | Yes ✅ | -| Azure Storage | No ❌ | +| File Storage Provider | Support Status | +| --------------------------------- | ----------------------------------------------------------------- | +| Local Filesystem of Backstage app | Yes ✅ | +| Google Cloud Storage (GCS) | Yes ✅ | +| Amazon Web Services (AWS) S3 | Yes ✅ | +| Azure Storage | No ❌ [#3938](https://github.com/backstage/backstage/issues/3938) | [Reach out to us](#feedback) if you want to request more platforms. diff --git a/docs/features/techdocs/configuration.md b/docs/features/techdocs/configuration.md index 1190c219a8..7a0a4dbbbf 100644 --- a/docs/features/techdocs/configuration.md +++ b/docs/features/techdocs/configuration.md @@ -13,18 +13,15 @@ configuration options for TechDocs. # File: app-config.yaml techdocs: - # TechDocs makes API calls to techdocs-backend using this URL. e.g. get docs of an entity, get metadata, etc. requestUrl: http://localhost:7000/api/techdocs - # Just another route in techdocs-backend where TechDocs requests the static files from. This URL uses an HTTP middleware # to serve files from either a local directory or an External storage provider. storageUrl: http://localhost:7000/api/techdocs/static/docs - # generators.techdocs can have two values: 'docker' or 'local'. This is to determine how to run the generator - whether to # spin up the techdocs-container docker image or to run mkdocs locally (assuming all the dependencies are taken care of). # You want to change this to 'local' if you are running Backstage using your own custom Docker setup and want to avoid running @@ -34,7 +31,6 @@ techdocs: generators: techdocs: 'docker' - # techdocs.builder can be either 'local' or 'external. # If builder is set to 'local' and you open a TechDocs page, techdocs-backend will try to generate the docs, publish to storage # and show the generated docs afterwords. This is the "Basic" setup of the TechDocs Architecture. @@ -44,32 +40,29 @@ techdocs: builder: 'local' - # techdocs.publisher is used to configure the Storage option, whether you want to use the local filesystem to store generated docs # or you want to use External storage providers like Google Cloud Storage, AWS S3, etc. publisher: - - # techdocs.publisher.type can be - 'local' or 'googleGcs' (awsS3, azureStorage, etc. to be available as well). + # techdocs.publisher.type can be - 'local' or 'googleGcs' or 'awsS3' (azureStorage to be available in future). # When set to 'local', techdocs-backend will create a 'static' directory at its root to store generated documentation files. # When set to 'googleGcs', techdocs-backend will use a Google Cloud Storage Bucket to store generated documentation files. # When set to 'awsS3', techdocs-backend will use an Amazon Web Service (AWS) S3 bucket to store generated documentation files. type: 'local' - # Required when techdocs.publisher.type is set to 'googleGcs'. Skip otherwise. googleGcs: # An API key is required to write to a storage bucket. credentials: - $file: '/path/to/google_application_credentials.json', + $file: '/path/to/google_application_credentials.json' # Your GCP Project ID where the Cloud Storage Bucket is hosted. projectId: 'gcp-project-id' # Cloud Storage Bucket Name - bucketName: 'techdocs-storage', + bucketName: 'techdocs-storage' # Required when techdocs.publisher.type is set to 'awsS3'. Skip otherwise. @@ -84,6 +77,5 @@ techdocs: $env: AWSS3_REGION # AWS S3 Bucket Name - bucketName: 'techdocs-storage', - + bucketName: 'techdocs-storage' ``` From 49d3aa1622e94a327a1c2f15a330a4cbc81c151c Mon Sep 17 00:00:00 2001 From: Oliver Sand Date: Wed, 6 Jan 2021 16:13:54 +0100 Subject: [PATCH 18/29] Remove unnecessary dev dependencies --- packages/backend-common/package.json | 1 - packages/cli/package.json | 1 - packages/create-app/package.json | 1 - plugins/auth-backend/package.json | 2 - yarn.lock | 62 ++++++++-------------------- 5 files changed, 17 insertions(+), 50 deletions(-) diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json index a72fb2f52f..2448b14ec1 100644 --- a/packages/backend-common/package.json +++ b/packages/backend-common/package.json @@ -82,7 +82,6 @@ "@types/tar": "^4.0.3", "@types/unzipper": "^0.10.3", "@types/webpack-env": "^1.15.2", - "@types/yaml": "^1.9.7", "get-port": "^5.1.1", "http-errors": "^1.7.3", "jest": "^26.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 6da871e74c..3c201a66f4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -125,7 +125,6 @@ "@types/mini-css-extract-plugin": "^0.9.1", "@types/mock-fs": "^4.13.0", "@types/node": "^13.7.2", - "@types/ora": "^3.2.0", "@types/react-dev-utils": "^9.0.4", "@types/recursive-readdir": "^2.2.0", "@types/rollup-plugin-peer-deps-external": "^2.2.0", diff --git a/packages/create-app/package.json b/packages/create-app/package.json index b9743e2bc0..12dd155d73 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -65,7 +65,6 @@ "@backstage/theme": "^0.2.2", "@types/fs-extra": "^9.0.1", "@types/inquirer": "^7.3.1", - "@types/ora": "^3.2.0", "@types/react-dev-utils": "^9.0.4", "@types/recursive-readdir": "^2.2.0", "ts-node": "^8.6.2" diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json index a91ec04ad9..3071452649 100644 --- a/plugins/auth-backend/package.json +++ b/plugins/auth-backend/package.json @@ -69,8 +69,6 @@ "@types/cookie-parser": "^1.4.2", "@types/express-session": "^1.17.2", "@types/jwt-decode": "^3.1.0", - "@types/nock": "^11.1.0", - "@types/openid-client": "^3.7.0", "@types/passport": "^1.0.3", "@types/passport-github2": "^1.2.4", "@types/passport-google-oauth20": "^2.0.3", diff --git a/yarn.lock b/yarn.lock index 3af2f2f713..d4aa307ca0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5937,13 +5937,6 @@ dependencies: "@types/node" "*" -"@types/nock@^11.1.0": - version "11.1.0" - resolved "https://registry.npmjs.org/@types/nock/-/nock-11.1.0.tgz#0a8c1056a31ba32a959843abccf99626dd90a538" - integrity sha512-jI/ewavBQ7X5178262JQR0ewicPAcJhXS/iFaNJl0VHLfyosZ/kwSrsa6VNQNSO8i9d8SqdRgOtZSOKJ/+iNMw== - dependencies: - nock "*" - "@types/node-fetch@2.5.7", "@types/node-fetch@^2.5.4": version "2.5.7" resolved "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz#20a2afffa882ab04d44ca786449a276f9f6bbf3c" @@ -5989,20 +5982,6 @@ dependencies: "@types/node" "*" -"@types/openid-client@^3.7.0": - version "3.7.0" - resolved "https://registry.npmjs.org/@types/openid-client/-/openid-client-3.7.0.tgz#8406e12798d16083df09cc3625973f5a00dd57fa" - integrity sha512-hW+QbAeUyfUHABwUjUECOcv56Mf5tN29xK3GPN7wy3R3XfIQdkm37XELA4wbe2RNG9GYUpN8l2ytfoW05XmpgQ== - dependencies: - openid-client "*" - -"@types/ora@^3.2.0": - version "3.2.0" - resolved "https://registry.npmjs.org/@types/ora/-/ora-3.2.0.tgz#b2f65d1283a8f36d8b0f9ee767e0732a2f429362" - integrity sha512-jll99xUKpiFbIFZSQcxm4numfsLaOWBzWNaRk3PvTSE7BPqTzzOCFmS0mQ7m8qkTfmYhuYbehTGsxkvRLPC++w== - dependencies: - ora "*" - "@types/overlayscrollbars@^1.9.0": version "1.12.0" resolved "https://registry.npmjs.org/@types/overlayscrollbars/-/overlayscrollbars-1.12.0.tgz#98456caceca8ad73bd5bb572632a585074e70764" @@ -6509,13 +6488,6 @@ dependencies: "@types/node" "*" -"@types/yaml@^1.9.7": - version "1.9.7" - resolved "https://registry.npmjs.org/@types/yaml/-/yaml-1.9.7.tgz#2331f36e0aac91311a63d33eb026c21687729679" - integrity sha512-8WMXRDD1D+wCohjfslHDgICd2JtMATZU8CkhH8LVJqcJs6dyYj5TGptzP8wApbmEullGBSsCEzzap73DQ1HJaA== - dependencies: - yaml "*" - "@types/yargs-parser@*": version "15.0.0" resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" @@ -17905,7 +17877,7 @@ no-case@^3.0.3: lower-case "^2.0.1" tslib "^1.10.0" -nock@*, nock@^13.0.5: +nock@^13.0.5: version "13.0.5" resolved "https://registry.npmjs.org/nock/-/nock-13.0.5.tgz#a618c6f86372cb79fac04ca9a2d1e4baccdb2414" integrity sha512-1ILZl0zfFm2G4TIeJFW0iHknxr2NyA+aGCMTjDVUsBY4CkMRispF1pfIYkTRdAR/3Bg+UzdEuK0B6HczMQZcCg== @@ -18507,20 +18479,6 @@ opencollective-postinstall@^2.0.2: resolved "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== -openid-client@*, openid-client@^4.2.1: - version "4.2.1" - resolved "https://registry.npmjs.org/openid-client/-/openid-client-4.2.1.tgz#8200c0ab6a3b8e954727dfa790847dc5cb8999c2" - integrity sha512-07eOcJeMH3ZHNvx5DVMZQmy3vZSTQqKSSunbtM1pXb+k5LBPi5hMum1vJCFReXlo4wuLEqZ/OgbsZvXPhbGRtA== - dependencies: - base64url "^3.0.1" - got "^11.8.0" - jose "^2.0.2" - lru-cache "^6.0.0" - make-error "^1.3.6" - object-hash "^2.0.1" - oidc-token-hash "^5.0.0" - p-any "^3.0.0" - openid-client@^4.1.1: version "4.1.1" resolved "https://registry.npmjs.org/openid-client/-/openid-client-4.1.1.tgz#3e8a25584c4292e9b9b03e60358f5549fb85197a" @@ -18535,6 +18493,20 @@ openid-client@^4.1.1: oidc-token-hash "^5.0.0" p-any "^3.0.0" +openid-client@^4.2.1: + version "4.2.1" + resolved "https://registry.npmjs.org/openid-client/-/openid-client-4.2.1.tgz#8200c0ab6a3b8e954727dfa790847dc5cb8999c2" + integrity sha512-07eOcJeMH3ZHNvx5DVMZQmy3vZSTQqKSSunbtM1pXb+k5LBPi5hMum1vJCFReXlo4wuLEqZ/OgbsZvXPhbGRtA== + dependencies: + base64url "^3.0.1" + got "^11.8.0" + jose "^2.0.2" + lru-cache "^6.0.0" + make-error "^1.3.6" + object-hash "^2.0.1" + oidc-token-hash "^5.0.0" + p-any "^3.0.0" + opn@^5.5.0: version "5.5.0" resolved "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" @@ -18566,7 +18538,7 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -ora@*, ora@^4.0.3: +ora@^4.0.3: version "4.0.4" resolved "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz#e8da697cc5b6a47266655bf68e0fb588d29a545d" integrity sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww== @@ -25410,7 +25382,7 @@ yaml-ast-parser@0.0.43, yaml-ast-parser@^0.0.43: resolved "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz#e8a23e6fb4c38076ab92995c5dca33f3d3d7c9bb" integrity sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A== -yaml@*, yaml@^1.10.0, yaml@^1.7.2, yaml@^1.9.2: +yaml@^1.10.0, yaml@^1.7.2, yaml@^1.9.2: version "1.10.0" resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e" integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== From ab08923589649432f9b9206425f2c64fec7c7740 Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 6 Jan 2021 10:51:57 -0500 Subject: [PATCH 19/29] Add changeset --- .changeset/angry-avocados-hope.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/angry-avocados-hope.md diff --git a/.changeset/angry-avocados-hope.md b/.changeset/angry-avocados-hope.md new file mode 100644 index 0000000000..081f86e87c --- /dev/null +++ b/.changeset/angry-avocados-hope.md @@ -0,0 +1,7 @@ +--- +'@backstage/core-api': patch +'@backstage/plugin-cost-insights': patch +'@backstage/plugin-tech-radar': patch +--- + +Remove test deps from production package list From 12457ac5bb163c8f632f1ec2d6567c7c86097b2a Mon Sep 17 00:00:00 2001 From: Adam Harvey Date: Wed, 6 Jan 2021 11:01:40 -0500 Subject: [PATCH 20/29] Clarify wording --- .changeset/angry-avocados-hope.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/angry-avocados-hope.md b/.changeset/angry-avocados-hope.md index 081f86e87c..ddcafe5dcc 100644 --- a/.changeset/angry-avocados-hope.md +++ b/.changeset/angry-avocados-hope.md @@ -4,4 +4,4 @@ '@backstage/plugin-tech-radar': patch --- -Remove test deps from production package list +Remove test dependencies from production package list From dde4ab398b51718bf6328b84172d1c2ea562ac47 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 6 Jan 2021 20:32:01 +0100 Subject: [PATCH 21/29] Create poor-papayas-care.md --- .changeset/poor-papayas-care.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/poor-papayas-care.md diff --git a/.changeset/poor-papayas-care.md b/.changeset/poor-papayas-care.md new file mode 100644 index 0000000000..6d915d9d9a --- /dev/null +++ b/.changeset/poor-papayas-care.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-rollbar-backend': patch +--- + +Bump axios from `^0.20.0` to `^0.21.1` From 13edb7bd9c4ab1df4202dc686296f5f075c84e92 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Wed, 6 Jan 2021 20:33:53 +0100 Subject: [PATCH 22/29] Update poor-papayas-care.md --- .changeset/poor-papayas-care.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/poor-papayas-care.md b/.changeset/poor-papayas-care.md index 6d915d9d9a..da30be0d93 100644 --- a/.changeset/poor-papayas-care.md +++ b/.changeset/poor-papayas-care.md @@ -2,4 +2,4 @@ '@backstage/plugin-rollbar-backend': patch --- -Bump axios from `^0.20.0` to `^0.21.1` +Bump `axios` from `^0.20.0` to `^0.21.1`. From 818d45e9422eef85c216ce4c40b0b0905a13768a Mon Sep 17 00:00:00 2001 From: Joel Low Date: Thu, 7 Jan 2021 17:00:41 +0800 Subject: [PATCH 23/29] Fix detection of child directories Using `string.startsWith` is insufficient when two different directories share a prefix, e.g. `./packageA` and `./packageAA`. --- .changeset/modern-worms-promise.md | 5 +++++ .../bundler/LinkedPackageResolvePlugin.test.ts | 17 +++++++++++++++++ .../lib/bundler/LinkedPackageResolvePlugin.ts | 3 ++- packages/cli/src/lib/bundler/config.ts | 10 +++++++--- packages/cli/src/lib/bundler/paths.ts | 17 +++++++++++++++++ 5 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 .changeset/modern-worms-promise.md diff --git a/.changeset/modern-worms-promise.md b/.changeset/modern-worms-promise.md new file mode 100644 index 0000000000..f14ab468fc --- /dev/null +++ b/.changeset/modern-worms-promise.md @@ -0,0 +1,5 @@ +--- +'@backstage/cli': patch +--- + +Fix detection of external package child directories diff --git a/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.test.ts b/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.test.ts index b4580ea281..f3906bfd0d 100644 --- a/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.test.ts +++ b/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.test.ts @@ -84,6 +84,23 @@ describe('LinkedPackageResolvePlugin', () => { expect(callbackFalse).toHaveBeenCalledWith(); expect(doResolve).toHaveBeenCalledTimes(0); + // Internal modules with a path prefix of an external module + const callbackY = jest.fn(); + tap( + { + request: path.resolve(root, 'external-aa/src/module.ts'), + path: path.resolve(root, 'external-aa/src'), + context: { + issuer: path.resolve(root, 'external-aa/src/index.ts'), + }, + }, + 'some-context', + callbackY, + ); + expect(callbackY).toHaveBeenCalledTimes(1); + expect(callbackY).toHaveBeenCalledWith(); + expect(doResolve).toHaveBeenCalledTimes(0); + // External modules have their path and issuer context rewritten, but not the request const callbackA = jest.fn(); tap( diff --git a/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.ts b/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.ts index 86269a5828..0478337c61 100644 --- a/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.ts +++ b/packages/cli/src/lib/bundler/LinkedPackageResolvePlugin.ts @@ -16,6 +16,7 @@ import { resolve as resolvePath } from 'path'; import { ResolvePlugin } from 'webpack'; +import { isChildPath } from './paths'; import { LernaPackage } from './types'; // Enables proper resolution of packages when linking in external packages. @@ -40,7 +41,7 @@ export class LinkedPackageResolvePlugin implements ResolvePlugin { callback: () => void, ) => { const pkg = this.packages.find( - pkg => data.path && data.path.startsWith(pkg.location), + pkg => data.path && isChildPath(pkg.location, data.path), ); if (!pkg) { callback(); diff --git a/packages/cli/src/lib/bundler/config.ts b/packages/cli/src/lib/bundler/config.ts index 3c336401ee..c53a8329f5 100644 --- a/packages/cli/src/lib/bundler/config.ts +++ b/packages/cli/src/lib/bundler/config.ts @@ -24,7 +24,7 @@ import webpack from 'webpack'; import nodeExternals from 'webpack-node-externals'; import { optimization } from './optimization'; import { Config } from '@backstage/config'; -import { BundlingPaths } from './paths'; +import { BundlingPaths, isChildPath } from './paths'; import { transforms } from './transforms'; import { LinkedPackageResolvePlugin } from './LinkedPackageResolvePlugin'; import { BundlingOptions, BackendBundlingOptions, LernaPackage } from './types'; @@ -87,7 +87,9 @@ export async function createConfig( const { plugins, loaders } = transforms(options); // Any package that is part of the monorepo but outside the monorepo root dir need // separate resolution logic. - const externalPkgs = packages.filter(p => !p.location.startsWith(paths.root)); + const externalPkgs = packages.filter( + p => !isChildPath(paths.root, p.location), + ); const baseUrl = frontendConfig.getString('app.baseUrl'); const validBaseUrl = new URL(baseUrl); @@ -199,7 +201,9 @@ export async function createBackendConfig( const moduleDirs = packages.map((p: any) => resolvePath(p.location, 'node_modules'), ); - const externalPkgs = packages.filter(p => !p.location.startsWith(paths.root)); // See frontend config + const externalPkgs = packages.filter( + p => !isChildPath(paths.root, p.location), + ); // See frontend config const { loaders } = transforms(options); diff --git a/packages/cli/src/lib/bundler/paths.ts b/packages/cli/src/lib/bundler/paths.ts index 390e41a345..f38416ca4e 100644 --- a/packages/cli/src/lib/bundler/paths.ts +++ b/packages/cli/src/lib/bundler/paths.ts @@ -15,8 +15,25 @@ */ import fs from 'fs-extra'; +import path from 'path'; import { paths } from '../paths'; +/** + * Checks if dir is the same as or a child of base. + */ +export function isChildPath(base: string, dir: string): boolean { + const relativePath = path.relative(base, dir); + if (relativePath === '') { + // The same directory + return true; + } + + const outsideBase = relativePath.startsWith('..'); // not outside base + const differentDrive = path.isAbsolute(relativePath); // on Windows, this means dir is on a different drive from base. + + return !outsideBase && !differentDrive; +} + export type BundlingPathsOptions = { // bundle entrypoint, e.g. 'src/index' entry: string; From dff58a90ec0922af21033e71db897c6227411575 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Thu, 7 Jan 2021 11:02:01 +0100 Subject: [PATCH 24/29] cli: sort breaking package changes by name and use emojis for maximum attention --- packages/cli/src/commands/versions/bump.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/commands/versions/bump.ts b/packages/cli/src/commands/versions/bump.ts index 6edfd08c71..8b32cd5768 100644 --- a/packages/cli/src/commands/versions/bump.ts +++ b/packages/cli/src/commands/versions/bump.ts @@ -173,11 +173,11 @@ export default async () => { if (breakingUpdates.size > 0) { console.log(); console.log( - chalk.yellow('The following packages may have breaking changes:'), + chalk.yellow('⚠️ The following packages may have breaking changes:'), ); console.log(); - for (const [name] of breakingUpdates) { + for (const name of Array.from(breakingUpdates.keys()).sort()) { console.log(` ${chalk.yellow(name)}`); let path; From 8cd42f3a86bc0ba107c0337508ff01c80bfc5485 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Thu, 7 Jan 2021 11:25:35 +0100 Subject: [PATCH 25/29] cli: fix a fail --- packages/cli/src/commands/versions/bump.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/commands/versions/bump.test.ts b/packages/cli/src/commands/versions/bump.test.ts index ba81b653d5..164a202385 100644 --- a/packages/cli/src/commands/versions/bump.test.ts +++ b/packages/cli/src/commands/versions/bump.test.ts @@ -135,7 +135,7 @@ describe('bump', () => { 'unlocking @backstage/core-api@^1.0.3 ~> 1.0.7', 'bumping @backstage/theme in b to ^2.0.0', 'Running yarn install to install new versions', - 'The following packages may have breaking changes:', + '⚠️ The following packages may have breaking changes:', ' @backstage/theme', ' https://github.com/backstage/backstage/blob/master/packages/theme/CHANGELOG.md', 'Version bump complete!', From 28d7f319f455bd2721a84caa2d81091711c08581 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 7 Jan 2021 10:31:20 +0000 Subject: [PATCH 26/29] Version Packages --- .changeset/angry-avocados-hope.md | 7 ------ .changeset/bitbucket-scaffolder.md | 5 ---- .changeset/chilly-dodos-drop.md | 6 ----- .changeset/cuddly-files-argue.md | 5 ---- .changeset/cyan-lizards-confess.md | 5 ---- .changeset/dry-dolls-run.md | 5 ---- .changeset/early-spies-grow.md | 5 ---- .changeset/famous-shrimps-double.md | 5 ---- .changeset/fifty-yaks-behave.md | 5 ---- .changeset/flat-suns-call.md | 17 -------------- .changeset/friendly-numbers-accept.md | 20 ---------------- .changeset/gold-moons-collect.md | 16 ------------- .changeset/heavy-shirts-nail.md | 5 ---- .changeset/hungry-mice-clap.md | 5 ---- .changeset/kind-buses-change.md | 7 ------ .changeset/large-guests-compete.md | 5 ---- .changeset/loud-vans-pretend.md | 5 ---- .changeset/mean-seas-bake.md | 5 ---- .changeset/mighty-plums-wave.md | 5 ---- .changeset/modern-worms-promise.md | 5 ---- .changeset/nasty-colts-tell.md | 5 ---- .changeset/new-horses-protect.md | 5 ---- .changeset/odd-eyes-beg.md | 6 ----- .changeset/old-bananas-drum.md | 5 ---- .changeset/poor-papayas-care.md | 5 ---- .changeset/purple-queens-film.md | 5 ---- .changeset/short-ravens-complain.md | 7 ------ .changeset/six-experts-destroy.md | 5 ---- .changeset/swift-ears-fetch.md | 5 ---- .changeset/tough-jars-share.md | 5 ---- .changeset/twenty-humans-jog.md | 5 ---- .changeset/twenty-llamas-sin.md | 12 ---------- packages/app/CHANGELOG.md | 27 +++++++++++++++++++++ packages/app/package.json | 20 ++++++++-------- packages/backend-common/CHANGELOG.md | 13 +++++++++++ packages/backend-common/package.json | 8 +++---- packages/cli/CHANGELOG.md | 11 +++++++++ packages/cli/package.json | 6 ++--- packages/config-loader/CHANGELOG.md | 21 +++++++++++++++++ packages/config-loader/package.json | 2 +- packages/core-api/CHANGELOG.md | 6 +++++ packages/core-api/package.json | 4 ++-- packages/create-app/CHANGELOG.md | 31 +++++++++++++++++++++++++ packages/create-app/package.json | 26 ++++++++++----------- packages/integration/CHANGELOG.md | 6 +++++ packages/integration/package.json | 4 ++-- packages/techdocs-common/CHANGELOG.md | 14 +++++++++++ packages/techdocs-common/package.json | 8 +++---- plugins/api-docs/package.json | 2 +- plugins/auth-backend/CHANGELOG.md | 24 +++++++++++++++++++ plugins/auth-backend/package.json | 6 ++--- plugins/catalog-backend/CHANGELOG.md | 14 +++++++++++ plugins/catalog-backend/package.json | 6 ++--- plugins/catalog-import/CHANGELOG.md | 15 ++++++++++++ plugins/catalog-import/package.json | 10 ++++---- plugins/catalog/CHANGELOG.md | 9 +++++++ plugins/catalog/package.json | 6 ++--- plugins/circleci/package.json | 2 +- plugins/cloudbuild/package.json | 2 +- plugins/cost-insights/CHANGELOG.md | 6 +++++ plugins/cost-insights/package.json | 4 ++-- plugins/explore/package.json | 2 +- plugins/fossa/package.json | 2 +- plugins/gcp-projects/package.json | 2 +- plugins/github-actions/package.json | 2 +- plugins/gitops-profiles/package.json | 2 +- plugins/graphiql/package.json | 2 +- plugins/jenkins/package.json | 2 +- plugins/kubernetes/package.json | 2 +- plugins/lighthouse/package.json | 2 +- plugins/newrelic/package.json | 2 +- plugins/org/package.json | 2 +- plugins/pagerduty/CHANGELOG.md | 6 +++++ plugins/pagerduty/package.json | 4 ++-- plugins/register-component/package.json | 2 +- plugins/rollbar-backend/CHANGELOG.md | 11 +++++++++ plugins/rollbar-backend/package.json | 6 ++--- plugins/rollbar/package.json | 2 +- plugins/scaffolder-backend/CHANGELOG.md | 14 +++++++++++ plugins/scaffolder-backend/package.json | 8 +++---- plugins/scaffolder/CHANGELOG.md | 9 +++++++ plugins/scaffolder/package.json | 6 ++--- plugins/search/CHANGELOG.md | 8 +++++++ plugins/search/package.json | 6 ++--- plugins/sentry/CHANGELOG.md | 8 +++++++ plugins/sentry/package.json | 6 ++--- plugins/sonarqube/package.json | 2 +- plugins/tech-radar/CHANGELOG.md | 7 ++++++ plugins/tech-radar/package.json | 4 ++-- plugins/techdocs-backend/CHANGELOG.md | 14 +++++++++++ plugins/techdocs-backend/package.json | 8 +++---- plugins/techdocs/package.json | 2 +- plugins/user-settings/package.json | 2 +- plugins/welcome/package.json | 2 +- 94 files changed, 373 insertions(+), 312 deletions(-) delete mode 100644 .changeset/angry-avocados-hope.md delete mode 100644 .changeset/bitbucket-scaffolder.md delete mode 100644 .changeset/chilly-dodos-drop.md delete mode 100644 .changeset/cuddly-files-argue.md delete mode 100644 .changeset/cyan-lizards-confess.md delete mode 100644 .changeset/dry-dolls-run.md delete mode 100644 .changeset/early-spies-grow.md delete mode 100644 .changeset/famous-shrimps-double.md delete mode 100644 .changeset/fifty-yaks-behave.md delete mode 100644 .changeset/flat-suns-call.md delete mode 100644 .changeset/friendly-numbers-accept.md delete mode 100644 .changeset/gold-moons-collect.md delete mode 100644 .changeset/heavy-shirts-nail.md delete mode 100644 .changeset/hungry-mice-clap.md delete mode 100644 .changeset/kind-buses-change.md delete mode 100644 .changeset/large-guests-compete.md delete mode 100644 .changeset/loud-vans-pretend.md delete mode 100644 .changeset/mean-seas-bake.md delete mode 100644 .changeset/mighty-plums-wave.md delete mode 100644 .changeset/modern-worms-promise.md delete mode 100644 .changeset/nasty-colts-tell.md delete mode 100644 .changeset/new-horses-protect.md delete mode 100644 .changeset/odd-eyes-beg.md delete mode 100644 .changeset/old-bananas-drum.md delete mode 100644 .changeset/poor-papayas-care.md delete mode 100644 .changeset/purple-queens-film.md delete mode 100644 .changeset/short-ravens-complain.md delete mode 100644 .changeset/six-experts-destroy.md delete mode 100644 .changeset/swift-ears-fetch.md delete mode 100644 .changeset/tough-jars-share.md delete mode 100644 .changeset/twenty-humans-jog.md delete mode 100644 .changeset/twenty-llamas-sin.md diff --git a/.changeset/angry-avocados-hope.md b/.changeset/angry-avocados-hope.md deleted file mode 100644 index ddcafe5dcc..0000000000 --- a/.changeset/angry-avocados-hope.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@backstage/core-api': patch -'@backstage/plugin-cost-insights': patch -'@backstage/plugin-tech-radar': patch ---- - -Remove test dependencies from production package list diff --git a/.changeset/bitbucket-scaffolder.md b/.changeset/bitbucket-scaffolder.md deleted file mode 100644 index e1e6f17b29..0000000000 --- a/.changeset/bitbucket-scaffolder.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-scaffolder-backend': patch ---- - -Add scaffolding support for Bitbucket Cloud and Server. diff --git a/.changeset/chilly-dodos-drop.md b/.changeset/chilly-dodos-drop.md deleted file mode 100644 index 4a03bb8ae1..0000000000 --- a/.changeset/chilly-dodos-drop.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@backstage/techdocs-common': patch -'@backstage/plugin-techdocs-backend': patch ---- - -1. Added option to use AWS S3 as a choice to store the static generated files for TechDocs. diff --git a/.changeset/cuddly-files-argue.md b/.changeset/cuddly-files-argue.md deleted file mode 100644 index d495a945f4..0000000000 --- a/.changeset/cuddly-files-argue.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/create-app': patch ---- - -Replace `register-component` plugin with new `catalog-import` plugin diff --git a/.changeset/cyan-lizards-confess.md b/.changeset/cyan-lizards-confess.md deleted file mode 100644 index 17ff8f0cdf..0000000000 --- a/.changeset/cyan-lizards-confess.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/backend-common': patch ---- - -Fix HTTPS certificate generation and add new config switch, enabling it simply by setting `backend.https = true`. Also introduces caching of generated certificates in order to avoid having to add a browser override every time the backend is restarted. diff --git a/.changeset/dry-dolls-run.md b/.changeset/dry-dolls-run.md deleted file mode 100644 index 423d14d044..0000000000 --- a/.changeset/dry-dolls-run.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/cli': patch ---- - -Use consistent file extensions for JS output when building packages. diff --git a/.changeset/early-spies-grow.md b/.changeset/early-spies-grow.md deleted file mode 100644 index 3591b1398a..0000000000 --- a/.changeset/early-spies-grow.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-catalog-backend': patch ---- - -Fixed a bug where the catalog would read back all entities when adding a location that already exists. diff --git a/.changeset/famous-shrimps-double.md b/.changeset/famous-shrimps-double.md deleted file mode 100644 index 198c0dc8f5..0000000000 --- a/.changeset/famous-shrimps-double.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-scaffolder': patch ---- - -Bug fix: User can retry creating a new component if an error occurs, without having to reload the page. diff --git a/.changeset/fifty-yaks-behave.md b/.changeset/fifty-yaks-behave.md deleted file mode 100644 index 8f2fa2ec67..0000000000 --- a/.changeset/fifty-yaks-behave.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/techdocs-common': patch ---- - -Fix for `integration.github.apiBaseUrl` configuration not properly overriding apiBaseUrl used by techdocs diff --git a/.changeset/flat-suns-call.md b/.changeset/flat-suns-call.md deleted file mode 100644 index 096a10ec30..0000000000 --- a/.changeset/flat-suns-call.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -'@backstage/plugin-auth-backend': patch ---- - -Add support for the majority of the Core configurations for Passport-SAML. - -These configuration keys are supported: - -- entryPoint -- issuer -- cert -- privateKey -- decryptionPvk -- signatureAlgorithm -- digestAlgorithm - -As part of this change, there is also a fix to the redirection behaviour when doing load balancing and HTTPS termination - the application's baseUrl is used to generate the callback URL. For properly configured Backstage installations, no changes are necessary, and the baseUrl is respected. diff --git a/.changeset/friendly-numbers-accept.md b/.changeset/friendly-numbers-accept.md deleted file mode 100644 index 7890ec0c4a..0000000000 --- a/.changeset/friendly-numbers-accept.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -'@backstage/config-loader': patch ---- - -Deprecate `$data` and replace it with `$include` which allows for any type of json value to be read from external files. In addition, `$include` can be used without a path, which causes the value at the root of the file to be loaded. - -Most usages of `$data` can be directly replaced with `$include`, except if the referenced value is not a string, in which case the value needs to be changed. For example: - -```yaml -# app-config.yaml -foo: - $data: foo.yaml#myValue # replacing with $include will turn the value into a number - $data: bar.yaml#myValue # replacing with $include is safe - -# foo.yaml -myValue: 0xf00 - -# bar.yaml -myValue: bar -``` diff --git a/.changeset/gold-moons-collect.md b/.changeset/gold-moons-collect.md deleted file mode 100644 index 32b9c4ce13..0000000000 --- a/.changeset/gold-moons-collect.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -'@backstage/create-app': patch ---- - -Bump `sqlite3` to v5. - -To apply this change to an existing app, change the version of `sqlite3` in the `dependencies` of `packages/backend/package.json`: - -```diff - "pg": "^8.3.0", -- "sqlite3": "^4.2.0", -+ "sqlite3": "^5.0.0", - "winston": "^3.2.1" -``` - -Note that the `sqlite3` dependency may not be preset if you chose to use PostgreSQL when creating the app. diff --git a/.changeset/heavy-shirts-nail.md b/.changeset/heavy-shirts-nail.md deleted file mode 100644 index 0abe11afcf..0000000000 --- a/.changeset/heavy-shirts-nail.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-catalog-backend': patch ---- - -Change `location_update_log` columns from `nvarchar(255)` to `text` diff --git a/.changeset/hungry-mice-clap.md b/.changeset/hungry-mice-clap.md deleted file mode 100644 index 6b819620b0..0000000000 --- a/.changeset/hungry-mice-clap.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-sentry': patch ---- - -Port to new composability API by exporting new `EntitySentryContent` and `EntitySentryCard` component extensions. diff --git a/.changeset/kind-buses-change.md b/.changeset/kind-buses-change.md deleted file mode 100644 index 1d93e27dff..0000000000 --- a/.changeset/kind-buses-change.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@backstage/backend-common': patch -'@backstage/techdocs-common': patch -'@backstage/plugin-scaffolder-backend': patch ---- - -Moving the Git actions to isomorphic-git instead of the node binding version of nodegit diff --git a/.changeset/large-guests-compete.md b/.changeset/large-guests-compete.md deleted file mode 100644 index 7f71673033..0000000000 --- a/.changeset/large-guests-compete.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-catalog': patch ---- - -Remove the unused dependency to `@backstage/plugin-techdocs`. diff --git a/.changeset/loud-vans-pretend.md b/.changeset/loud-vans-pretend.md deleted file mode 100644 index 1e2498284b..0000000000 --- a/.changeset/loud-vans-pretend.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-search': patch ---- - -Fix Material-UI warning for search filtering diff --git a/.changeset/mean-seas-bake.md b/.changeset/mean-seas-bake.md deleted file mode 100644 index d675352ebd..0000000000 --- a/.changeset/mean-seas-bake.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-catalog-import': patch ---- - -Create "url" type location when registering using the catalog-import plugin. diff --git a/.changeset/mighty-plums-wave.md b/.changeset/mighty-plums-wave.md deleted file mode 100644 index ac84b68e04..0000000000 --- a/.changeset/mighty-plums-wave.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/backend-common': patch ---- - -Tweaked development log formatter to include extra fields at the end of each log line diff --git a/.changeset/modern-worms-promise.md b/.changeset/modern-worms-promise.md deleted file mode 100644 index f14ab468fc..0000000000 --- a/.changeset/modern-worms-promise.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/cli': patch ---- - -Fix detection of external package child directories diff --git a/.changeset/nasty-colts-tell.md b/.changeset/nasty-colts-tell.md deleted file mode 100644 index eeb7818f4c..0000000000 --- a/.changeset/nasty-colts-tell.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/cli': patch ---- - -Add `backend:bundle` command for bundling a backend package with dependencies into a deployment archive. diff --git a/.changeset/new-horses-protect.md b/.changeset/new-horses-protect.md deleted file mode 100644 index 9d77926b13..0000000000 --- a/.changeset/new-horses-protect.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-catalog-backend': patch ---- - -Add processor for ingesting AWS accounts from AWS Organizations diff --git a/.changeset/odd-eyes-beg.md b/.changeset/odd-eyes-beg.md deleted file mode 100644 index 25a7699516..0000000000 --- a/.changeset/odd-eyes-beg.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -'@backstage/backend-common': patch -'@backstage/integration': patch ---- - -Provide support for on-prem azure devops diff --git a/.changeset/old-bananas-drum.md b/.changeset/old-bananas-drum.md deleted file mode 100644 index b09ea84d0c..0000000000 --- a/.changeset/old-bananas-drum.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-catalog-backend': patch ---- - -Remove `sqlite3` as a dependency. You may need to add `sqlite3` as a dependency of your backend if you were relying on this indirect dependency. diff --git a/.changeset/poor-papayas-care.md b/.changeset/poor-papayas-care.md deleted file mode 100644 index da30be0d93..0000000000 --- a/.changeset/poor-papayas-care.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-rollbar-backend': patch ---- - -Bump `axios` from `^0.20.0` to `^0.21.1`. diff --git a/.changeset/purple-queens-film.md b/.changeset/purple-queens-film.md deleted file mode 100644 index ff9e28a7ac..0000000000 --- a/.changeset/purple-queens-film.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/cli': patch ---- - -Add color to output from `versions:bump` in order to make it easier to spot changes. Also highlight possible breaking changes and link to changelogs. diff --git a/.changeset/short-ravens-complain.md b/.changeset/short-ravens-complain.md deleted file mode 100644 index 55e52311ff..0000000000 --- a/.changeset/short-ravens-complain.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -'@backstage/create-app': patch ---- - -Removed the Circle CI sidebar item, since the target page does not exist. - -To apply this change to an existing app, remove `"CircleCI"` sidebar item from `packages/app/src/sidebar.tsx`, and the `BuildIcon` import if it is unused. diff --git a/.changeset/six-experts-destroy.md b/.changeset/six-experts-destroy.md deleted file mode 100644 index 73347938d9..0000000000 --- a/.changeset/six-experts-destroy.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-scaffolder-backend': patch ---- - -Add config schema for Bitbucket scaffolder diff --git a/.changeset/swift-ears-fetch.md b/.changeset/swift-ears-fetch.md deleted file mode 100644 index 64067cc4f5..0000000000 --- a/.changeset/swift-ears-fetch.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-pagerduty': patch ---- - -Optimize empty state image size. diff --git a/.changeset/tough-jars-share.md b/.changeset/tough-jars-share.md deleted file mode 100644 index f1b551f31e..0000000000 --- a/.changeset/tough-jars-share.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-tech-radar': patch ---- - -Updated example data in `README`. diff --git a/.changeset/twenty-humans-jog.md b/.changeset/twenty-humans-jog.md deleted file mode 100644 index 16662d48fd..0000000000 --- a/.changeset/twenty-humans-jog.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@backstage/plugin-scaffolder': patch ---- - -You can now maximize the logs into full-screen by clicking the button under each step of the job diff --git a/.changeset/twenty-llamas-sin.md b/.changeset/twenty-llamas-sin.md deleted file mode 100644 index 30690cfdc0..0000000000 --- a/.changeset/twenty-llamas-sin.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -'@backstage/create-app': patch ---- - -Removed lighthouse plugin from the default set up plugins, as it requires a separate Backend to function. - -To apply this change to an existing app, remove the following: - -1. The `lighthouse` block from `app-config.yaml`. -2. The `@backstage/plugin-lighthouse` dependency from `packages/app/package.json`. -3. The `@backstage/plugin-lighthouse` re-export from `packages/app/src/plugins.ts`. -4. The Lighthouse sidebar item from `packages/app/src/sidebar.tsx`, and the `RuleIcon` import if it is unused. diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md index 3eaf5ad111..bd159afb9e 100644 --- a/packages/app/CHANGELOG.md +++ b/packages/app/CHANGELOG.md @@ -1,5 +1,32 @@ # example-app +## 0.2.9 + +### Patch Changes + +- Updated dependencies [ab0892358] +- Updated dependencies [37a7d26c4] +- Updated dependencies [8e083f41f] +- Updated dependencies [88da267cc] +- Updated dependencies [9c09a364f] +- Updated dependencies [01707438b] +- Updated dependencies [edb7d0775] +- Updated dependencies [818d45e94] +- Updated dependencies [0588be01f] +- Updated dependencies [b8abdda57] +- Updated dependencies [b7a124883] +- Updated dependencies [bc909178d] +- Updated dependencies [947d3c269] + - @backstage/plugin-cost-insights@0.5.5 + - @backstage/plugin-tech-radar@0.3.2 + - @backstage/cli@0.4.5 + - @backstage/plugin-scaffolder@0.3.6 + - @backstage/plugin-sentry@0.3.2 + - @backstage/plugin-catalog@0.2.10 + - @backstage/plugin-search@0.2.5 + - @backstage/plugin-catalog-import@0.3.3 + - @backstage/plugin-pagerduty@0.2.5 + ## 0.2.8 ### Patch Changes diff --git a/packages/app/package.json b/packages/app/package.json index e8a4194c3d..faa37a2378 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -1,18 +1,18 @@ { "name": "example-app", - "version": "0.2.8", + "version": "0.2.9", "private": true, "bundled": true, "dependencies": { "@backstage/catalog-model": "^0.6.0", - "@backstage/cli": "^0.4.3", + "@backstage/cli": "^0.4.5", "@backstage/core": "^0.4.2", "@backstage/plugin-api-docs": "^0.4.1", - "@backstage/plugin-catalog": "^0.2.8", - "@backstage/plugin-catalog-import": "^0.3.2", + "@backstage/plugin-catalog": "^0.2.10", + "@backstage/plugin-catalog-import": "^0.3.3", "@backstage/plugin-circleci": "^0.2.5", "@backstage/plugin-cloudbuild": "^0.2.5", - "@backstage/plugin-cost-insights": "^0.5.2", + "@backstage/plugin-cost-insights": "^0.5.5", "@backstage/plugin-explore": "^0.2.2", "@backstage/plugin-gcp-projects": "^0.2.2", "@backstage/plugin-github-actions": "^0.2.6", @@ -23,13 +23,13 @@ "@backstage/plugin-kubernetes": "^0.3.3", "@backstage/plugin-lighthouse": "^0.2.6", "@backstage/plugin-newrelic": "^0.2.2", - "@backstage/plugin-pagerduty": "0.2.4", + "@backstage/plugin-pagerduty": "0.2.5", "@backstage/plugin-register-component": "^0.2.5", "@backstage/plugin-rollbar": "^0.2.7", - "@backstage/plugin-scaffolder": "^0.3.5", - "@backstage/plugin-sentry": "^0.3.1", - "@backstage/plugin-search": "^0.2.4", - "@backstage/plugin-tech-radar": "^0.3.1", + "@backstage/plugin-scaffolder": "^0.3.6", + "@backstage/plugin-sentry": "^0.3.2", + "@backstage/plugin-search": "^0.2.5", + "@backstage/plugin-tech-radar": "^0.3.2", "@backstage/plugin-techdocs": "^0.5.1", "@backstage/plugin-user-settings": "^0.2.3", "@backstage/plugin-welcome": "^0.2.3", diff --git a/packages/backend-common/CHANGELOG.md b/packages/backend-common/CHANGELOG.md index 0e0a3074a4..454ec81bfd 100644 --- a/packages/backend-common/CHANGELOG.md +++ b/packages/backend-common/CHANGELOG.md @@ -1,5 +1,18 @@ # @backstage/backend-common +## 0.4.2 + +### Patch Changes + +- 5ecd50f8a: Fix HTTPS certificate generation and add new config switch, enabling it simply by setting `backend.https = true`. Also introduces caching of generated certificates in order to avoid having to add a browser override every time the backend is restarted. +- 00042e73c: Moving the Git actions to isomorphic-git instead of the node binding version of nodegit +- 0829ff126: Tweaked development log formatter to include extra fields at the end of each log line +- 036a84373: Provide support for on-prem azure devops +- Updated dependencies [ad5c56fd9] +- Updated dependencies [036a84373] + - @backstage/config-loader@0.4.1 + - @backstage/integration@0.1.5 + ## 0.4.1 ### Patch Changes diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json index 2448b14ec1..ef91389330 100644 --- a/packages/backend-common/package.json +++ b/packages/backend-common/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/backend-common", "description": "Common functionality library for Backstage backends", - "version": "0.4.1", + "version": "0.4.2", "main": "src/index.ts", "types": "src/index.ts", "private": false, @@ -31,8 +31,8 @@ "dependencies": { "@backstage/cli-common": "^0.1.1", "@backstage/config": "^0.1.2", - "@backstage/config-loader": "^0.4.0", - "@backstage/integration": "^0.1.4", + "@backstage/config-loader": "^0.4.1", + "@backstage/integration": "^0.1.5", "@types/cors": "^2.8.6", "@types/express": "^4.17.6", "archiver": "^5.0.2", @@ -66,7 +66,7 @@ } }, "devDependencies": { - "@backstage/cli": "^0.4.2", + "@backstage/cli": "^0.4.5", "@backstage/test-utils": "^0.1.5", "@types/archiver": "^5.1.0", "@types/compression": "^1.7.0", diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index d88220cc23..8b503c6941 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/cli +## 0.4.5 + +### Patch Changes + +- 37a7d26c4: Use consistent file extensions for JS output when building packages. +- 818d45e94: Fix detection of external package child directories +- 0588be01f: Add `backend:bundle` command for bundling a backend package with dependencies into a deployment archive. +- b8abdda57: Add color to output from `versions:bump` in order to make it easier to spot changes. Also highlight possible breaking changes and link to changelogs. +- Updated dependencies [ad5c56fd9] + - @backstage/config-loader@0.4.1 + ## 0.4.4 ### Patch Changes diff --git a/packages/cli/package.json b/packages/cli/package.json index 3c201a66f4..6ce4ba3715 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/cli", "description": "CLI for developing Backstage plugins and apps", - "version": "0.4.4", + "version": "0.4.5", "private": false, "publishConfig": { "access": "public" @@ -30,7 +30,7 @@ "dependencies": { "@backstage/cli-common": "^0.1.1", "@backstage/config": "^0.1.2", - "@backstage/config-loader": "^0.4.0", + "@backstage/config-loader": "^0.4.1", "@hot-loader/react-dom": "^16.13.0", "@lerna/package-graph": "^3.18.5", "@lerna/project": "^3.18.0", @@ -111,7 +111,7 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/backend-common": "^0.4.1", + "@backstage/backend-common": "^0.4.2", "@backstage/config": "^0.1.2", "@backstage/core": "^0.4.3", "@backstage/dev-utils": "^0.1.7", diff --git a/packages/config-loader/CHANGELOG.md b/packages/config-loader/CHANGELOG.md index 30891c2dd9..a5e34ad91e 100644 --- a/packages/config-loader/CHANGELOG.md +++ b/packages/config-loader/CHANGELOG.md @@ -1,5 +1,26 @@ # @backstage/config-loader +## 0.4.1 + +### Patch Changes + +- ad5c56fd9: Deprecate `$data` and replace it with `$include` which allows for any type of json value to be read from external files. In addition, `$include` can be used without a path, which causes the value at the root of the file to be loaded. + + Most usages of `$data` can be directly replaced with `$include`, except if the referenced value is not a string, in which case the value needs to be changed. For example: + + ```yaml + # app-config.yaml + foo: + $data: foo.yaml#myValue # replacing with $include will turn the value into a number + $data: bar.yaml#myValue # replacing with $include is safe + + # foo.yaml + myValue: 0xf00 + + # bar.yaml + myValue: bar + ``` + ## 0.4.0 ### Minor Changes diff --git a/packages/config-loader/package.json b/packages/config-loader/package.json index 3e2c58c676..44369334e0 100644 --- a/packages/config-loader/package.json +++ b/packages/config-loader/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/config-loader", "description": "Config loading functionality used by Backstage backend, and CLI", - "version": "0.4.0", + "version": "0.4.1", "private": false, "publishConfig": { "access": "public", diff --git a/packages/core-api/CHANGELOG.md b/packages/core-api/CHANGELOG.md index 3f412f3e17..a40e25b2a8 100644 --- a/packages/core-api/CHANGELOG.md +++ b/packages/core-api/CHANGELOG.md @@ -1,5 +1,11 @@ # @backstage/core-api +## 0.2.9 + +### Patch Changes + +- ab0892358: Remove test dependencies from production package list + ## 0.2.8 ### Patch Changes diff --git a/packages/core-api/package.json b/packages/core-api/package.json index c0373f99b8..85f9d3a921 100644 --- a/packages/core-api/package.json +++ b/packages/core-api/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/core-api", "description": "Internal Core API used by Backstage plugins and apps", - "version": "0.2.8", + "version": "0.2.9", "private": false, "publishConfig": { "access": "public", @@ -42,7 +42,7 @@ "zen-observable": "^0.8.15" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/test-utils": "^0.1.6", "@backstage/test-utils-core": "^0.1.1", "@testing-library/jest-dom": "^5.10.1", diff --git a/packages/create-app/CHANGELOG.md b/packages/create-app/CHANGELOG.md index 94260dcec9..235660acc2 100644 --- a/packages/create-app/CHANGELOG.md +++ b/packages/create-app/CHANGELOG.md @@ -1,5 +1,36 @@ # @backstage/create-app +## 0.3.2 + +### Patch Changes + +- c2b52d9c5: Replace `register-component` plugin with new `catalog-import` plugin +- fc6839f13: Bump `sqlite3` to v5. + + To apply this change to an existing app, change the version of `sqlite3` in the `dependencies` of `packages/backend/package.json`: + + ```diff + "pg": "^8.3.0", + - "sqlite3": "^4.2.0", + + "sqlite3": "^5.0.0", + "winston": "^3.2.1" + ``` + + Note that the `sqlite3` dependency may not be preset if you chose to use PostgreSQL when creating the app. + +- 8d68e4cdc: Removed the Circle CI sidebar item, since the target page does not exist. + + To apply this change to an existing app, remove `"CircleCI"` sidebar item from `packages/app/src/sidebar.tsx`, and the `BuildIcon` import if it is unused. + +- 1773a5182: Removed lighthouse plugin from the default set up plugins, as it requires a separate Backend to function. + + To apply this change to an existing app, remove the following: + + 1. The `lighthouse` block from `app-config.yaml`. + 2. The `@backstage/plugin-lighthouse` dependency from `packages/app/package.json`. + 3. The `@backstage/plugin-lighthouse` re-export from `packages/app/src/plugins.ts`. + 4. The Lighthouse sidebar item from `packages/app/src/sidebar.tsx`, and the `RuleIcon` import if it is unused. + ## 0.3.1 ### Patch Changes diff --git a/packages/create-app/package.json b/packages/create-app/package.json index 12dd155d73..9859a20dd8 100644 --- a/packages/create-app/package.json +++ b/packages/create-app/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/create-app", "description": "Create app package for Backstage", - "version": "0.3.1", + "version": "0.3.2", "private": false, "publishConfig": { "access": "public" @@ -37,29 +37,29 @@ "recursive-readdir": "^2.2.2" }, "devDependencies": { - "@backstage/backend-common": "^0.4.1", + "@backstage/backend-common": "^0.4.2", "@backstage/catalog-model": "^0.6.0", - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/config": "^0.1.2", "@backstage/core": "^0.4.3", "@backstage/plugin-api-docs": "^0.4.2", "@backstage/plugin-app-backend": "^0.3.3", - "@backstage/plugin-auth-backend": "^0.2.8", - "@backstage/plugin-catalog": "^0.2.9", - "@backstage/plugin-catalog-backend": "^0.5.1", - "@backstage/plugin-catalog-import": "^0.3.2", + "@backstage/plugin-auth-backend": "^0.2.9", + "@backstage/plugin-catalog": "^0.2.10", + "@backstage/plugin-catalog-backend": "^0.5.2", + "@backstage/plugin-catalog-import": "^0.3.3", "@backstage/plugin-circleci": "^0.2.5", "@backstage/plugin-explore": "^0.2.2", "@backstage/plugin-github-actions": "^0.2.6", "@backstage/plugin-lighthouse": "^0.2.6", "@backstage/plugin-proxy-backend": "^0.2.3", - "@backstage/plugin-rollbar-backend": "^0.1.5", - "@backstage/plugin-scaffolder": "^0.3.5", - "@backstage/plugin-search": "^0.2.4", - "@backstage/plugin-scaffolder-backend": "^0.3.6", - "@backstage/plugin-tech-radar": "^0.3.1", + "@backstage/plugin-rollbar-backend": "^0.1.6", + "@backstage/plugin-scaffolder": "^0.3.6", + "@backstage/plugin-search": "^0.2.5", + "@backstage/plugin-scaffolder-backend": "^0.3.7", + "@backstage/plugin-tech-radar": "^0.3.2", "@backstage/plugin-techdocs": "^0.5.2", - "@backstage/plugin-techdocs-backend": "^0.5.1", + "@backstage/plugin-techdocs-backend": "^0.5.2", "@backstage/plugin-user-settings": "^0.2.3", "@backstage/test-utils": "^0.1.6", "@backstage/theme": "^0.2.2", diff --git a/packages/integration/CHANGELOG.md b/packages/integration/CHANGELOG.md index 5559c5230d..10b30a11ad 100644 --- a/packages/integration/CHANGELOG.md +++ b/packages/integration/CHANGELOG.md @@ -1,5 +1,11 @@ # @backstage/integration +## 0.1.5 + +### Patch Changes + +- 036a84373: Provide support for on-prem azure devops + ## 0.1.4 ### Patch Changes diff --git a/packages/integration/package.json b/packages/integration/package.json index fe5bd60905..258c5c61c6 100644 --- a/packages/integration/package.json +++ b/packages/integration/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/integration", - "version": "0.1.4", + "version": "0.1.5", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -34,7 +34,7 @@ "git-url-parse": "^11.4.3" }, "devDependencies": { - "@backstage/cli": "^0.4.2", + "@backstage/cli": "^0.4.5", "@backstage/test-utils": "^0.1.5", "@types/jest": "^26.0.7", "msw": "^0.21.2" diff --git a/packages/techdocs-common/CHANGELOG.md b/packages/techdocs-common/CHANGELOG.md index 1672e5a61b..6a2ec6cf97 100644 --- a/packages/techdocs-common/CHANGELOG.md +++ b/packages/techdocs-common/CHANGELOG.md @@ -1,5 +1,19 @@ # @backstage/techdocs-common +## 0.3.2 + +### Patch Changes + +- 7ec525481: 1. Added option to use AWS S3 as a choice to store the static generated files for TechDocs. +- f8ba88ded: Fix for `integration.github.apiBaseUrl` configuration not properly overriding apiBaseUrl used by techdocs +- 00042e73c: Moving the Git actions to isomorphic-git instead of the node binding version of nodegit +- Updated dependencies [5ecd50f8a] +- Updated dependencies [00042e73c] +- Updated dependencies [0829ff126] +- Updated dependencies [036a84373] + - @backstage/backend-common@0.4.2 + - @backstage/integration@0.1.5 + ## 0.3.1 ### Patch Changes diff --git a/packages/techdocs-common/package.json b/packages/techdocs-common/package.json index 7ddb0b7dff..ab83f9b262 100644 --- a/packages/techdocs-common/package.json +++ b/packages/techdocs-common/package.json @@ -1,7 +1,7 @@ { "name": "@backstage/techdocs-common", "description": "Common functionalities for TechDocs, to be shared between techdocs-backend plugin and techdocs-cli", - "version": "0.3.1", + "version": "0.3.2", "main": "src/index.ts", "types": "src/index.ts", "private": false, @@ -36,10 +36,10 @@ "url": "https://github.com/backstage/backstage/issues" }, "dependencies": { - "@backstage/backend-common": "^0.4.1", + "@backstage/backend-common": "^0.4.2", "@backstage/catalog-model": "^0.6.0", "@backstage/config": "^0.1.2", - "@backstage/integration": "^0.1.4", + "@backstage/integration": "^0.1.5", "@google-cloud/storage": "^5.6.0", "@types/dockerode": "^3.2.1", "@types/express": "^4.17.6", @@ -56,7 +56,7 @@ "winston": "^3.2.1" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@types/fs-extra": "^9.0.5", "@types/git-url-parse": "^9.0.0", "@types/js-yaml": "^3.12.5", diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index 23dd66a9a9..0bbd96f1a8 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -49,7 +49,7 @@ "swagger-ui-react": "^3.37.2" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/auth-backend/CHANGELOG.md b/plugins/auth-backend/CHANGELOG.md index 7d67ec0273..ce029cded2 100644 --- a/plugins/auth-backend/CHANGELOG.md +++ b/plugins/auth-backend/CHANGELOG.md @@ -1,5 +1,29 @@ # @backstage/plugin-auth-backend +## 0.2.9 + +### Patch Changes + +- 0289a059c: Add support for the majority of the Core configurations for Passport-SAML. + + These configuration keys are supported: + + - entryPoint + - issuer + - cert + - privateKey + - decryptionPvk + - signatureAlgorithm + - digestAlgorithm + + As part of this change, there is also a fix to the redirection behaviour when doing load balancing and HTTPS termination - the application's baseUrl is used to generate the callback URL. For properly configured Backstage installations, no changes are necessary, and the baseUrl is respected. + +- Updated dependencies [5ecd50f8a] +- Updated dependencies [00042e73c] +- Updated dependencies [0829ff126] +- Updated dependencies [036a84373] + - @backstage/backend-common@0.4.2 + ## 0.2.8 ### Patch Changes diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json index 3071452649..713ad07617 100644 --- a/plugins/auth-backend/package.json +++ b/plugins/auth-backend/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-auth-backend", - "version": "0.2.8", + "version": "0.2.9", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -29,7 +29,7 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.4.1", + "@backstage/backend-common": "^0.4.2", "@backstage/catalog-client": "^0.3.4", "@backstage/catalog-model": "^0.6.0", "@backstage/config": "^0.1.2", @@ -64,7 +64,7 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@types/body-parser": "^1.19.0", "@types/cookie-parser": "^1.4.2", "@types/express-session": "^1.17.2", diff --git a/plugins/catalog-backend/CHANGELOG.md b/plugins/catalog-backend/CHANGELOG.md index 8e941457a9..bef186f8c3 100644 --- a/plugins/catalog-backend/CHANGELOG.md +++ b/plugins/catalog-backend/CHANGELOG.md @@ -1,5 +1,19 @@ # @backstage/plugin-catalog-backend +## 0.5.2 + +### Patch Changes + +- 99be3057c: Fixed a bug where the catalog would read back all entities when adding a location that already exists. +- 49d2016a4: Change `location_update_log` columns from `nvarchar(255)` to `text` +- 73e75ea0a: Add processor for ingesting AWS accounts from AWS Organizations +- 071711d70: Remove `sqlite3` as a dependency. You may need to add `sqlite3` as a dependency of your backend if you were relying on this indirect dependency. +- Updated dependencies [5ecd50f8a] +- Updated dependencies [00042e73c] +- Updated dependencies [0829ff126] +- Updated dependencies [036a84373] + - @backstage/backend-common@0.4.2 + ## 0.5.1 ### Patch Changes diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json index de9e1d929b..9fbc16e3d3 100644 --- a/plugins/catalog-backend/package.json +++ b/plugins/catalog-backend/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-catalog-backend", - "version": "0.5.1", + "version": "0.5.2", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -30,7 +30,7 @@ }, "dependencies": { "@azure/msal-node": "^1.0.0-alpha.8", - "@backstage/backend-common": "^0.4.1", + "@backstage/backend-common": "^0.4.2", "@backstage/catalog-model": "^0.6.0", "@backstage/config": "^0.1.2", "@octokit/graphql": "^4.5.6", @@ -57,7 +57,7 @@ "yup": "^0.29.3" }, "devDependencies": { - "@backstage/cli": "^0.4.3", + "@backstage/cli": "^0.4.5", "@backstage/test-utils": "^0.1.6", "@types/core-js": "^2.5.4", "@types/git-url-parse": "^9.0.0", diff --git a/plugins/catalog-import/CHANGELOG.md b/plugins/catalog-import/CHANGELOG.md index a7301e43a3..f494949aab 100644 --- a/plugins/catalog-import/CHANGELOG.md +++ b/plugins/catalog-import/CHANGELOG.md @@ -1,5 +1,20 @@ # @backstage/plugin-catalog-import +## 0.3.3 + +### Patch Changes + +- edb7d0775: Create "url" type location when registering using the catalog-import plugin. +- Updated dependencies [99be3057c] +- Updated dependencies [49d2016a4] +- Updated dependencies [9c09a364f] +- Updated dependencies [73e75ea0a] +- Updated dependencies [036a84373] +- Updated dependencies [071711d70] + - @backstage/plugin-catalog-backend@0.5.2 + - @backstage/plugin-catalog@0.2.10 + - @backstage/integration@0.1.5 + ## 0.3.2 ### Patch Changes diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json index a51001d585..495552983f 100644 --- a/plugins/catalog-import/package.json +++ b/plugins/catalog-import/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-catalog-import", - "version": "0.3.2", + "version": "0.3.3", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -32,9 +32,9 @@ "dependencies": { "@backstage/catalog-model": "^0.6.0", "@backstage/core": "^0.4.3", - "@backstage/plugin-catalog": "^0.2.7", - "@backstage/plugin-catalog-backend": "^0.5.0", - "@backstage/integration": "^0.1.4", + "@backstage/plugin-catalog": "^0.2.10", + "@backstage/plugin-catalog-backend": "^0.5.2", + "@backstage/integration": "^0.1.5", "@backstage/theme": "^0.2.2", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", @@ -50,7 +50,7 @@ "yaml": "^1.10.0" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/catalog/CHANGELOG.md b/plugins/catalog/CHANGELOG.md index ce5b978e7d..57a8a9d205 100644 --- a/plugins/catalog/CHANGELOG.md +++ b/plugins/catalog/CHANGELOG.md @@ -1,5 +1,14 @@ # @backstage/plugin-catalog +## 0.2.10 + +### Patch Changes + +- 9c09a364f: Remove the unused dependency to `@backstage/plugin-techdocs`. +- Updated dependencies [8e083f41f] +- Updated dependencies [947d3c269] + - @backstage/plugin-scaffolder@0.3.6 + ## 0.2.9 ### Patch Changes diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index 033e074fdd..a5fa16ed6f 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-catalog", - "version": "0.2.9", + "version": "0.2.10", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -33,7 +33,7 @@ "@backstage/catalog-client": "^0.3.4", "@backstage/catalog-model": "^0.6.0", "@backstage/core": "^0.4.3", - "@backstage/plugin-scaffolder": "^0.3.5", + "@backstage/plugin-scaffolder": "^0.3.6", "@backstage/theme": "^0.2.2", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", @@ -51,7 +51,7 @@ "swr": "^0.3.0" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@microsoft/microsoft-graph-types": "^1.25.0", diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json index f117c660f0..8e0b4743a0 100644 --- a/plugins/circleci/package.json +++ b/plugins/circleci/package.json @@ -50,7 +50,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json index b559ca6a86..7cac2e6a68 100644 --- a/plugins/cloudbuild/package.json +++ b/plugins/cloudbuild/package.json @@ -49,7 +49,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/cost-insights/CHANGELOG.md b/plugins/cost-insights/CHANGELOG.md index 5e71d54073..7417c12556 100644 --- a/plugins/cost-insights/CHANGELOG.md +++ b/plugins/cost-insights/CHANGELOG.md @@ -1,5 +1,11 @@ # @backstage/plugin-cost-insights +## 0.5.5 + +### Patch Changes + +- ab0892358: Remove test dependencies from production package list + ## 0.5.4 ### Patch Changes diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json index 0cfdf8342a..cec0a393b8 100644 --- a/plugins/cost-insights/package.json +++ b/plugins/cost-insights/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-cost-insights", - "version": "0.5.4", + "version": "0.5.5", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -55,7 +55,7 @@ "yup": "^0.29.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/explore/package.json b/plugins/explore/package.json index 4ec76ad812..5c109d6a9e 100644 --- a/plugins/explore/package.json +++ b/plugins/explore/package.json @@ -42,7 +42,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/fossa/package.json b/plugins/fossa/package.json index b7878b5b29..3036554fad 100644 --- a/plugins/fossa/package.json +++ b/plugins/fossa/package.json @@ -43,7 +43,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json index 823a2fa37c..f2202054db 100644 --- a/plugins/gcp-projects/package.json +++ b/plugins/gcp-projects/package.json @@ -41,7 +41,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json index b9b0e93d6f..94b69935d0 100644 --- a/plugins/github-actions/package.json +++ b/plugins/github-actions/package.json @@ -51,7 +51,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json index e6a1092b47..28fead7796 100644 --- a/plugins/gitops-profiles/package.json +++ b/plugins/gitops-profiles/package.json @@ -42,7 +42,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json index 0c42b824fb..fe5ec55af2 100644 --- a/plugins/graphiql/package.json +++ b/plugins/graphiql/package.json @@ -43,7 +43,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json index 631e394d71..99d69cf50e 100644 --- a/plugins/jenkins/package.json +++ b/plugins/jenkins/package.json @@ -46,7 +46,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json index 4404b5e845..56a61d12a2 100644 --- a/plugins/kubernetes/package.json +++ b/plugins/kubernetes/package.json @@ -46,7 +46,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json index 7bb1427930..f688f9c1db 100644 --- a/plugins/lighthouse/package.json +++ b/plugins/lighthouse/package.json @@ -47,7 +47,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/newrelic/package.json b/plugins/newrelic/package.json index 03b2d83d65..629dec635b 100644 --- a/plugins/newrelic/package.json +++ b/plugins/newrelic/package.json @@ -41,7 +41,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/org/package.json b/plugins/org/package.json index 391311454b..9db6fff348 100644 --- a/plugins/org/package.json +++ b/plugins/org/package.json @@ -33,7 +33,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/pagerduty/CHANGELOG.md b/plugins/pagerduty/CHANGELOG.md index 3e967101a7..ca7b4709b1 100644 --- a/plugins/pagerduty/CHANGELOG.md +++ b/plugins/pagerduty/CHANGELOG.md @@ -1,5 +1,11 @@ # @backstage/plugin-pagerduty +## 0.2.5 + +### Patch Changes + +- b7a124883: Optimize empty state image size. + ## 0.2.4 ### Patch Changes diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json index 5c8890034f..1db99822a2 100644 --- a/plugins/pagerduty/package.json +++ b/plugins/pagerduty/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-pagerduty", - "version": "0.2.4", + "version": "0.2.5", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -44,7 +44,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/register-component/package.json b/plugins/register-component/package.json index 4f161a7398..56451b7958 100644 --- a/plugins/register-component/package.json +++ b/plugins/register-component/package.json @@ -45,7 +45,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/rollbar-backend/CHANGELOG.md b/plugins/rollbar-backend/CHANGELOG.md index 4093e5f3af..d3ef66c84c 100644 --- a/plugins/rollbar-backend/CHANGELOG.md +++ b/plugins/rollbar-backend/CHANGELOG.md @@ -1,5 +1,16 @@ # @backstage/plugin-rollbar-backend +## 0.1.6 + +### Patch Changes + +- dde4ab398: Bump `axios` from `^0.20.0` to `^0.21.1`. +- Updated dependencies [5ecd50f8a] +- Updated dependencies [00042e73c] +- Updated dependencies [0829ff126] +- Updated dependencies [036a84373] + - @backstage/backend-common@0.4.2 + ## 0.1.5 ### Patch Changes diff --git a/plugins/rollbar-backend/package.json b/plugins/rollbar-backend/package.json index a8cb0105bf..9a95e345d2 100644 --- a/plugins/rollbar-backend/package.json +++ b/plugins/rollbar-backend/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-rollbar-backend", - "version": "0.1.5", + "version": "0.1.6", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -30,7 +30,7 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.4.0", + "@backstage/backend-common": "^0.4.2", "@backstage/config": "^0.1.2", "@types/express": "^4.17.6", "axios": "^0.21.1", @@ -47,7 +47,7 @@ "yn": "^4.0.0" }, "devDependencies": { - "@backstage/cli": "^0.4.1", + "@backstage/cli": "^0.4.5", "@types/supertest": "^2.0.8", "supertest": "^4.0.2" }, diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json index 90a2d1b218..37c9cec4c0 100644 --- a/plugins/rollbar/package.json +++ b/plugins/rollbar/package.json @@ -47,7 +47,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md index e63c7e23fe..2b4b4b12d4 100644 --- a/plugins/scaffolder-backend/CHANGELOG.md +++ b/plugins/scaffolder-backend/CHANGELOG.md @@ -1,5 +1,19 @@ # @backstage/plugin-scaffolder-backend +## 0.3.7 + +### Patch Changes + +- 37a5244ef: Add scaffolding support for Bitbucket Cloud and Server. +- 00042e73c: Moving the Git actions to isomorphic-git instead of the node binding version of nodegit +- 9efbc5585: Add config schema for Bitbucket scaffolder +- Updated dependencies [5ecd50f8a] +- Updated dependencies [00042e73c] +- Updated dependencies [0829ff126] +- Updated dependencies [036a84373] + - @backstage/backend-common@0.4.2 + - @backstage/integration@0.1.5 + ## 0.3.6 ### Patch Changes diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json index c290a94b19..0784dcfcb1 100644 --- a/plugins/scaffolder-backend/package.json +++ b/plugins/scaffolder-backend/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-scaffolder-backend", - "version": "0.3.6", + "version": "0.3.7", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -29,10 +29,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.4.1", + "@backstage/backend-common": "^0.4.2", "@backstage/catalog-model": "^0.6.0", "@backstage/config": "^0.1.2", - "@backstage/integration": "^0.1.4", + "@backstage/integration": "^0.1.5", "@gitbeaker/core": "^25.2.0", "@gitbeaker/node": "^25.2.0", "@octokit/rest": "^18.0.0", @@ -58,7 +58,7 @@ "yaml": "^1.10.0" }, "devDependencies": { - "@backstage/cli": "^0.4.3", + "@backstage/cli": "^0.4.5", "@backstage/test-utils": "^0.1.5", "@octokit/types": "^5.4.1", "@types/fs-extra": "^9.0.1", diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md index 734a7157d1..41965cb687 100644 --- a/plugins/scaffolder/CHANGELOG.md +++ b/plugins/scaffolder/CHANGELOG.md @@ -1,5 +1,14 @@ # @backstage/plugin-scaffolder +## 0.3.6 + +### Patch Changes + +- 8e083f41f: Bug fix: User can retry creating a new component if an error occurs, without having to reload the page. +- 947d3c269: You can now maximize the logs into full-screen by clicking the button under each step of the job +- Updated dependencies [9c09a364f] + - @backstage/plugin-catalog@0.2.10 + ## 0.3.5 ### Patch Changes diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index 8cd45779e1..0d6c1bdb37 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-scaffolder", - "version": "0.3.5", + "version": "0.3.6", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -32,7 +32,7 @@ "dependencies": { "@backstage/catalog-model": "^0.6.0", "@backstage/core": "^0.4.3", - "@backstage/plugin-catalog": "^0.2.8", + "@backstage/plugin-catalog": "^0.2.10", "@backstage/theme": "^0.2.2", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", @@ -50,7 +50,7 @@ "swr": "^0.3.0" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/search/CHANGELOG.md b/plugins/search/CHANGELOG.md index f85c13b47c..8a97c926ad 100644 --- a/plugins/search/CHANGELOG.md +++ b/plugins/search/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/plugin-search +## 0.2.5 + +### Patch Changes + +- 01707438b: Fix Material-UI warning for search filtering +- Updated dependencies [9c09a364f] + - @backstage/plugin-catalog@0.2.10 + ## 0.2.4 ### Patch Changes diff --git a/plugins/search/package.json b/plugins/search/package.json index 1111e67abe..aae095dafe 100644 --- a/plugins/search/package.json +++ b/plugins/search/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-search", - "version": "0.2.4", + "version": "0.2.5", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -30,7 +30,7 @@ }, "dependencies": { "@backstage/core": "^0.4.3", - "@backstage/plugin-catalog": "^0.2.7", + "@backstage/plugin-catalog": "^0.2.10", "@backstage/catalog-model": "^0.6.0", "@backstage/theme": "^0.2.2", "@material-ui/core": "^4.11.0", @@ -43,7 +43,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/sentry/CHANGELOG.md b/plugins/sentry/CHANGELOG.md index f5b5f5efd8..4ddcc5ced5 100644 --- a/plugins/sentry/CHANGELOG.md +++ b/plugins/sentry/CHANGELOG.md @@ -1,5 +1,13 @@ # @backstage/plugin-sentry +## 0.3.2 + +### Patch Changes + +- 88da267cc: Port to new composability API by exporting new `EntitySentryContent` and `EntitySentryCard` component extensions. +- Updated dependencies [9c09a364f] + - @backstage/plugin-catalog@0.2.10 + ## 0.3.1 ### Patch Changes diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json index 5dcba49cf0..6a1ef07436 100644 --- a/plugins/sentry/package.json +++ b/plugins/sentry/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-sentry", - "version": "0.3.1", + "version": "0.3.2", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -33,7 +33,7 @@ "dependencies": { "@backstage/catalog-model": "^0.6.0", "@backstage/core": "^0.4.3", - "@backstage/plugin-catalog": "^0.2.9", + "@backstage/plugin-catalog": "^0.2.10", "@backstage/theme": "^0.2.2", "@material-ui/core": "^4.11.0", "@material-ui/icons": "^4.9.1", @@ -46,7 +46,7 @@ "timeago.js": "^4.0.2" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/sonarqube/package.json b/plugins/sonarqube/package.json index 05cc32d681..8ca178f9fe 100644 --- a/plugins/sonarqube/package.json +++ b/plugins/sonarqube/package.json @@ -46,7 +46,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/tech-radar/CHANGELOG.md b/plugins/tech-radar/CHANGELOG.md index 246ea9c8f7..329a78ede7 100644 --- a/plugins/tech-radar/CHANGELOG.md +++ b/plugins/tech-radar/CHANGELOG.md @@ -1,5 +1,12 @@ # @backstage/plugin-tech-radar +## 0.3.2 + +### Patch Changes + +- ab0892358: Remove test dependencies from production package list +- bc909178d: Updated example data in `README`. + ## 0.3.1 ### Patch Changes diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json index 5c23522efe..326b0fe732 100644 --- a/plugins/tech-radar/package.json +++ b/plugins/tech-radar/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-tech-radar", - "version": "0.3.1", + "version": "0.3.2", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -43,7 +43,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/techdocs-backend/CHANGELOG.md b/plugins/techdocs-backend/CHANGELOG.md index a16449d9e3..d83ff92fd4 100644 --- a/plugins/techdocs-backend/CHANGELOG.md +++ b/plugins/techdocs-backend/CHANGELOG.md @@ -1,5 +1,19 @@ # @backstage/plugin-techdocs-backend +## 0.5.2 + +### Patch Changes + +- 7ec525481: 1. Added option to use AWS S3 as a choice to store the static generated files for TechDocs. +- Updated dependencies [7ec525481] +- Updated dependencies [5ecd50f8a] +- Updated dependencies [f8ba88ded] +- Updated dependencies [00042e73c] +- Updated dependencies [0829ff126] +- Updated dependencies [036a84373] + - @backstage/techdocs-common@0.3.2 + - @backstage/backend-common@0.4.2 + ## 0.5.1 ### Patch Changes diff --git a/plugins/techdocs-backend/package.json b/plugins/techdocs-backend/package.json index ed19e4e23a..12f1646517 100644 --- a/plugins/techdocs-backend/package.json +++ b/plugins/techdocs-backend/package.json @@ -1,6 +1,6 @@ { "name": "@backstage/plugin-techdocs-backend", - "version": "0.5.1", + "version": "0.5.2", "main": "src/index.ts", "types": "src/index.ts", "license": "Apache-2.0", @@ -30,10 +30,10 @@ "clean": "backstage-cli clean" }, "dependencies": { - "@backstage/backend-common": "^0.4.1", + "@backstage/backend-common": "^0.4.2", "@backstage/catalog-model": "^0.6.0", "@backstage/config": "^0.1.2", - "@backstage/techdocs-common": "^0.3.1", + "@backstage/techdocs-common": "^0.3.2", "@types/dockerode": "^3.2.1", "@types/express": "^4.17.6", "cross-fetch": "^3.0.6", @@ -44,7 +44,7 @@ "winston": "^3.2.1" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "supertest": "^4.0.2" }, "files": [ diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json index b87c158bc4..955b0f798c 100644 --- a/plugins/techdocs/package.json +++ b/plugins/techdocs/package.json @@ -50,7 +50,7 @@ "sanitize-html": "^1.27.0" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json index d238242a65..38b26dd94c 100644 --- a/plugins/user-settings/package.json +++ b/plugins/user-settings/package.json @@ -41,7 +41,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json index 21ee3787df..d215028960 100644 --- a/plugins/welcome/package.json +++ b/plugins/welcome/package.json @@ -41,7 +41,7 @@ "react-use": "^15.3.3" }, "devDependencies": { - "@backstage/cli": "^0.4.4", + "@backstage/cli": "^0.4.5", "@backstage/dev-utils": "^0.1.7", "@backstage/test-utils": "^0.1.6", "@testing-library/jest-dom": "^5.10.1", From e418783c1ab07b0bdf52af1da162d9d7b0cf4cd7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Jan 2021 13:09:29 +0100 Subject: [PATCH 27/29] chore(deps-dev): bump @types/jquery from 3.5.1 to 3.5.5 (#3932) Bumps [@types/jquery](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jquery) from 3.5.1 to 3.5.5. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jquery) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 37fe388d9d..0e7756febc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5760,9 +5760,9 @@ pretty-format "^26.0.0" "@types/jquery@^3.3.34": - version "3.5.1" - resolved "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.1.tgz#cebb057acf5071c40e439f30e840c57a30d406c3" - integrity sha512-Tyctjh56U7eX2b9udu3wG853ASYP0uagChJcQJXLUXEU6C/JiW5qt5dl8ao01VRj1i5pgXPAf8f1mq4+FDLRQg== + version "3.5.5" + resolved "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.5.tgz#2c63f47c9c8d96693d272f5453602afd8338c903" + integrity sha512-6RXU9Xzpc6vxNrS6FPPapN1SxSHgQ336WC6Jj/N8q30OiaBZ00l1GBgeP7usjVZPivSkGUfL1z/WW6TX989M+w== dependencies: "@types/sizzle" "*" From 317457638fb1d87a8c5c2072b207f9d3cc9eec72 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Thu, 7 Jan 2021 13:38:25 +0100 Subject: [PATCH 28/29] workflows: fix check for Version Packages PR --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index e9f5e602a5..7c28bcefe6 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -82,7 +82,7 @@ jobs: # We can't re-use the output from the above step, but we'll have a guaranteed node_modules cache and # only run the build steps that are necessary for publishing release: - if: ${{ endsWith(github.event.head_commit.message, 'from backstage/changeset-release/master\n\nVersion Packages') }} + if: github.event.commits[0].author.username == 'backstage-service' && contains(github.event.head_commit.message, 'from backstage/changeset-release/master') needs: build runs-on: ubuntu-latest From e78966ab4934ea16cc7f62626c735654b6c96f97 Mon Sep 17 00:00:00 2001 From: Backstage Service Account <74306126+backstage-service@users.noreply.github.com> Date: Thu, 7 Jan 2021 13:52:20 +0100 Subject: [PATCH 29/29] cli: added some spacing before destruction --- packages/cli/src/commands/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cli/src/commands/index.ts b/packages/cli/src/commands/index.ts index ac8e214d26..9dce57813b 100644 --- a/packages/cli/src/commands/index.ts +++ b/packages/cli/src/commands/index.ts @@ -215,6 +215,7 @@ function lazy( try { const actionFunc = await getActionFunc(); await actionFunc(...args); + process.exit(0); } catch (error) { exitWithError(error);