Skip to content

Commit 2c247df

Browse files
authored
Merge pull request #273 from bcgov/DEVXT2601-upgrade-backstage
Upgrade Backstage to 1.47.3
2 parents 47f712f + 3e32b43 commit 2c247df

9 files changed

Lines changed: 5749 additions & 3572 deletions

File tree

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Node.js
2222
uses: actions/setup-node@v4
2323
with:
24-
node-version: '20'
24+
node-version: '22'
2525

2626
# from https://github.com/actions/cache/blob/main/examples.md#node---yarn-2
2727
- name: Get yarn cache directory path

.github/workflows/version-bump.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup Node
2929
uses: actions/setup-node@v4
3030
with:
31-
node-version: 20.x
31+
node-version: 22.x
3232
registry-url: https://registry.npmjs.org/ # Needed for auth
3333

3434
- name: cache all node_modules

.yarn/plugins/@yarnpkg/plugin-backstage.cjs

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

backstage.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "1.40.1"
2+
"version": "1.47.3"
33
}

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
"eslint-plugin-react": "^7.28.0",
4343
"eslint-plugin-testing-library": "^6.0.0",
4444
"husky": "^9.1.1",
45+
"jest": "29",
46+
"jest-environment-jsdom": "29",
4547
"lerna": "^7.3.0",
4648
"lint-staged": "^15.2.7",
4749
"node-gyp": "^10.0.0",
@@ -50,7 +52,8 @@
5052
},
5153
"resolutions": {
5254
"@types/react": "^18",
53-
"@types/react-dom": "^18"
55+
"@types/react-dom": "^18",
56+
"isolated-vm": "6.0.2"
5457
},
5558
"prettier": "@backstage/cli/config/prettier",
5659
"lint-staged": {

packages/backend/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# From https://github.com/janus-idp/backstage-showcase/
22
# Stage 1 - Build nodejs skeleton
33

4-
FROM registry.access.redhat.com/ubi9/nodejs-20:9.6-1749604222 AS skeleton
4+
FROM registry.access.redhat.com/ubi9/nodejs-22:9.7-1771865410 AS skeleton
55
USER 0
66

77
RUN dnf install -y -q --allowerasing --nobest \
@@ -57,8 +57,8 @@ COPY $EXTERNAL_SOURCE/app-config.yaml \
5757
# Install production dependencies
5858
RUN "$YARN" workspaces focus --all --production && "$YARN" cache clean
5959

60-
# Stage 5 - Build the runner image
61-
FROM registry.access.redhat.com/ubi9/nodejs-20-minimal:9.6-1750862880 AS runner
60+
# Stage 5 - Build the runner image
61+
FROM registry.access.redhat.com/ubi9/nodejs-22-minimal:9.7-1771388883 AS runner
6262
USER 0
6363

6464
# Env vars

packages/backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"@backstage/plugin-search-backend-module-techdocs": "backstage:^",
5050
"@backstage/plugin-search-backend-node": "backstage:^",
5151
"@backstage/plugin-techdocs-backend": "backstage:^",
52-
"@roadiehq/scaffolder-backend-module-http-request": "^4.3.5",
52+
"@roadiehq/scaffolder-backend-module-http-request": "5.5.1",
5353
"@roadiehq/scaffolder-backend-module-utils": "^3.3.0",
5454
"app": "link:../app",
5555
"express": "^4.17.1",

plugins/scaffolder-backend-module-snowplow/src/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
createBackendModule,
33
coreServices,
44
} from '@backstage/backend-plugin-api';
5-
import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node/alpha';
5+
import { scaffolderActionsExtensionPoint } from '@backstage/plugin-scaffolder-node';
66
import { createSnowplowAction } from './actions/snowplow';
77

88
/**

0 commit comments

Comments
 (0)