Skip to content

Commit

Permalink
Merge pull request #1193 from RoadieHQ/update-dependencies-20231124-0…
Browse files Browse the repository at this point in the history
…6-11

Update Dependencies - plugins
  • Loading branch information
Xantier authored Dec 1, 2023
2 parents f0ad646 + 87f9008 commit 7a2f034
Show file tree
Hide file tree
Showing 50 changed files with 1,878 additions and 1,267 deletions.
32 changes: 32 additions & 0 deletions .changeset/strange-ads-complain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
'@roadiehq/backstage-plugin-aws-backend': patch
'@roadiehq/backstage-plugin-argo-cd-backend': patch
'@roadiehq/backstage-plugin-aws-auth': patch
'@roadiehq/catalog-backend-module-aws': patch
'@roadiehq/catalog-backend-module-okta': patch
'@roadiehq/backstage-plugin-argo-cd': patch
'@roadiehq/backstage-plugin-aws': patch
'@roadiehq/backstage-plugin-aws-lambda': patch
'@roadiehq/backstage-plugin-bugsnag': patch
'@roadiehq/backstage-plugin-buildkite': patch
'@roadiehq/backstage-plugin-cloudsmith': patch
'@roadiehq/backstage-plugin-datadog': patch
'@roadiehq/backstage-plugin-github-insights': patch
'@roadiehq/backstage-plugin-github-pull-requests': patch
'@roadiehq/backstage-plugin-iframe': patch
'@roadiehq/backstage-plugin-jira': patch
'@roadiehq/backstage-plugin-prometheus': patch
'@roadiehq/backstage-plugin-security-insights': patch
'@roadiehq/backstage-plugin-shortcut': patch
'@roadiehq/backstage-plugin-travis-ci': patch
'@roadiehq/backstage-plugin-home-markdown': patch
'@roadiehq/backstage-plugin-home-rss': patch
'@roadiehq/scaffolder-backend-argocd': patch
'@roadiehq/scaffolder-backend-module-aws': patch
'@roadiehq/scaffolder-backend-module-http-request': patch
'@roadiehq/scaffolder-backend-module-utils': patch
'@roadiehq/plugin-scaffolder-frontend-module-http-request-field': patch
'@roadiehq/roadie-backstage-entity-validator': patch
---

Version bump to Backstage 1.20.3
2 changes: 1 addition & 1 deletion backstage.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "1.19.6"
"version": "1.20.3"
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.0.0",
"private": true,
"engines": {
"node": "14 || 16"
"node": "14 || 16 || 18"
},
"scripts": {
"dev": "concurrently \"yarn start\" \"yarn start-backend\"",
Expand Down Expand Up @@ -35,7 +35,7 @@
]
},
"devDependencies": {
"@backstage/cli": "^0.23.1",
"@backstage/cli": "^0.24.0",
"@spotify/prettier-config": "^14.0.0",
"@types/webpack": "^5.28.0",
"concurrently": "^7.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/app/cypress/support/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Cypress.Commands.add('loginAsGuest', () => {
Cypress.Commands.add('saveGithubToken', () => {
cy.intercept(
'GET',
'http://localhost:7007/api/auth/github/refresh?optional&scope=repo&env=development',
'http://localhost:7007/api/auth/github/refresh?optional&scope=read%3Auser%20repo&env=development',
{ fixture: 'githubLogin/login.json' },
);
});
Expand Down
43 changes: 22 additions & 21 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,30 @@
},
"bundled": true,
"dependencies": {
"@backstage/app-defaults": "^1.4.4",
"@backstage/app-defaults": "^1.4.5",
"@backstage/catalog-model": "^1.4.3",
"@roadiehq/backstage-plugin-cloudsmith": "^1.0.10",
"@backstage/cli": "^0.23.1",
"@backstage/core-app-api": "^1.11.0",
"@backstage/core-components": "^0.13.7",
"@backstage/core-plugin-api": "^1.7.0",
"@backstage/integration-react": "^1.1.20",
"@backstage/plugin-api-docs": "^0.9.12",
"@backstage/plugin-catalog": "^1.14.0",
"@backstage/plugin-catalog-graph": "^0.2.37",
"@backstage/plugin-catalog-import": "^0.10.1",
"@backstage/plugin-catalog-react": "^1.8.5",
"@backstage/plugin-github-actions": "^0.6.6",
"@backstage/plugin-home": "^0.5.9",
"@backstage/plugin-org": "^0.6.15",
"@backstage/plugin-scaffolder": "^1.15.1",
"@backstage/plugin-search": "^1.4.1",
"@backstage/plugin-tech-radar": "^0.6.9",
"@backstage/plugin-techdocs": "^1.8.0",
"@backstage/plugin-user-settings": "^0.7.11",
"@backstage/test-utils": "^1.4.4",
"@backstage/theme": "^0.4.3",
"@backstage/cli": "^0.24.0",
"@backstage/core-app-api": "^1.11.1",
"@backstage/core-components": "^0.13.8",
"@backstage/core-plugin-api": "^1.8.0",
"@backstage/integration-react": "^1.1.21",
"@backstage/plugin-api-docs": "^0.10.1",
"@backstage/plugin-catalog": "^1.15.1",
"@backstage/plugin-catalog-graph": "^0.3.1",
"@backstage/plugin-catalog-import": "^0.10.3",
"@backstage/plugin-catalog-react": "^1.9.1",
"@backstage/plugin-github-actions": "^0.6.8",
"@backstage/plugin-home": "^0.5.11",
"@backstage/plugin-org": "^0.6.17",
"@backstage/plugin-scaffolder": "^1.16.1",
"@backstage/plugin-scaffolder-react": "^1.6.1",
"@backstage/plugin-search": "^1.4.3",
"@backstage/plugin-tech-radar": "^0.6.10",
"@backstage/plugin-techdocs": "^1.9.1",
"@backstage/plugin-user-settings": "^0.7.13",
"@backstage/test-utils": "^1.4.5",
"@backstage/theme": "^0.4.4",
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@roadiehq/backstage-plugin-argo-cd": "^2.2.16",
Expand Down
7 changes: 2 additions & 5 deletions packages/app/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ import {
CatalogImportPage,
catalogImportPlugin,
} from '@backstage/plugin-catalog-import';
import {
ScaffolderFieldExtensions,
ScaffolderPage,
scaffolderPlugin,
} from '@backstage/plugin-scaffolder';
import { ScaffolderPage, scaffolderPlugin } from '@backstage/plugin-scaffolder';
import { orgPlugin } from '@backstage/plugin-org';
import { SearchPage } from '@backstage/plugin-search';
import { TechRadarPage } from '@backstage/plugin-tech-radar';
Expand All @@ -47,6 +43,7 @@ import { HomepageCompositionRoot } from '@backstage/plugin-home';
import { HomePage } from './components/home/HomePage';
import { SelectFieldFromApiExtension } from '@roadiehq/plugin-scaffolder-frontend-module-http-request-field';
import { IFramePage } from '@roadiehq/backstage-plugin-iframe';
import { ScaffolderFieldExtensions } from '@backstage/plugin-scaffolder-react';

const app = createApp({
apis,
Expand Down
28 changes: 14 additions & 14 deletions packages/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"role": "backend"
},
"engines": {
"node": "14 || 16"
"node": "14 || 16 || 18"
},
"scripts": {
"build": "backstage-cli package build",
Expand All @@ -20,20 +20,20 @@
"migrate:create": "knex migrate:make -x ts"
},
"dependencies": {
"@backstage/backend-common": "^0.19.8",
"@backstage/backend-tasks": "^0.5.11",
"@backstage/catalog-client": "^1.4.5",
"@backstage/backend-common": "^0.19.9",
"@backstage/backend-tasks": "^0.5.12",
"@backstage/catalog-client": "^1.4.6",
"@backstage/catalog-model": "^1.4.3",
"@backstage/config": "^1.1.1",
"@backstage/integration": "^1.7.1",
"@backstage/plugin-app-backend": "^0.3.54",
"@backstage/plugin-auth-backend": "^0.19.4",
"@backstage/plugin-catalog-backend": "^1.14.0",
"@backstage/plugin-permission-common": "^0.7.9",
"@backstage/plugin-permission-node": "^0.7.17",
"@backstage/plugin-proxy-backend": "^0.4.4",
"@backstage/plugin-scaffolder-backend": "^1.18.1",
"@backstage/plugin-techdocs-backend": "^1.8.0",
"@backstage/integration": "^1.7.2",
"@backstage/plugin-app-backend": "^0.3.55",
"@backstage/plugin-auth-backend": "^0.20.0",
"@backstage/plugin-catalog-backend": "^1.15.0",
"@backstage/plugin-permission-common": "^0.7.10",
"@backstage/plugin-permission-node": "^0.7.18",
"@backstage/plugin-proxy-backend": "^0.4.5",
"@backstage/plugin-scaffolder-backend": "^1.19.1",
"@backstage/plugin-techdocs-backend": "^1.9.0",
"@gitbeaker/node": "^29.2.0",
"@octokit/rest": "^19.0.3",
"@roadiehq/backstage-plugin-argo-cd-backend": "2.12.0",
Expand All @@ -55,7 +55,7 @@
"winston": "^3.2.1"
},
"devDependencies": {
"@backstage/cli": "^0.23.1",
"@backstage/cli": "^0.24.0",
"@types/dockerode": "^3.2.1",
"@types/express": "^4.17.6",
"@types/express-serve-static-core": "^4.17.5"
Expand Down
16 changes: 15 additions & 1 deletion packages/backend/src/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
// eslint-disable-next-line notice/notice
/*
* Copyright 2023 Larder Software Limited
*
* 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 { PluginEnvironment } from './types';

describe('test', () => {
Expand Down
17 changes: 15 additions & 2 deletions packages/backend/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,21 @@
*
* Happy hacking!
*/

// eslint-disable-next-line notice/notice
/*
* Copyright 2023 Larder Software Limited
*
* 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 Router from 'express-promise-router';
import {
CacheManager,
Expand Down
16 changes: 15 additions & 1 deletion packages/backend/src/plugins/app.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
/* eslint-disable notice/notice */
/*
* Copyright 2023 Larder Software Limited
*
* 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 { createRouter } from '@backstage/plugin-app-backend';
import { Router } from 'express';
import { PluginEnvironment } from '../types';
Expand Down
16 changes: 15 additions & 1 deletion packages/backend/src/plugins/argocd.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
/* eslint-disable notice/notice */
/*
* Copyright 2023 Larder Software Limited
*
* 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 { createRouter } from '@roadiehq/backstage-plugin-argo-cd-backend';
import { PluginEnvironment } from '../types';

Expand Down
16 changes: 15 additions & 1 deletion packages/backend/src/plugins/auth.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
// eslint-disable-next-line notice/notice
/*
* Copyright 2023 Larder Software Limited
*
* 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 { createRouter } from '@backstage/plugin-auth-backend';
import { Router } from 'express';
import { PluginEnvironment } from '../types';
Expand Down
16 changes: 15 additions & 1 deletion packages/backend/src/plugins/aws.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
// eslint-disable-next-line notice/notice
/*
* Copyright 2023 Larder Software Limited
*
* 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 { createRouter } from '@roadiehq/backstage-plugin-aws-backend';
import type { PluginEnvironment } from '../types';

Expand Down
16 changes: 15 additions & 1 deletion packages/backend/src/plugins/catalog.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
// eslint-disable-next-line notice/notice
/*
* Copyright 2023 Larder Software Limited
*
* 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 {
CatalogBuilder,
EntityProvider,
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/plugins/proxy.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021 Larder Software Limited
* Copyright 2023 Larder Software Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/plugins/scaffolder.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021 Larder Software Limited
* Copyright 2023 Larder Software Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
16 changes: 15 additions & 1 deletion packages/backend/src/plugins/techdocs.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
// eslint-disable-next-line notice/notice
/*
* Copyright 2023 Larder Software Limited
*
* 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 { DockerContainerRunner } from '@backstage/backend-common';
import {
createRouter,
Expand Down
16 changes: 15 additions & 1 deletion packages/backend/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
// eslint-disable-next-line notice/notice
/*
* Copyright 2023 Larder Software Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Logger } from 'winston';
import { Config } from '@backstage/config';
import {
Expand Down
Loading

0 comments on commit 7a2f034

Please sign in to comment.