Merge pull request #20 from platacard/feature/align-with-upstream-changes

Feature/align with upstream changes

Author: ganievs

.changeset/bump-backstage-1.50.3.md

@@ -0,0 +1,9 @@
+---
+'@platacard/backstage-plugin-scaffolder-backend-module-json-merge-action': patch
+'@platacard/backstage-plugin-scaffolder-backend-module-yaml-merge-actions': patch
+---
+
+Upgrade Backstage to 1.50.3. Migrated the `scaffolderActionsExtensionPoint`
+import from `@backstage/plugin-scaffolder-node/alpha` to
+`@backstage/plugin-scaffolder-node` now that it is stable. No behavior or API
+changes for adopters.

.github/workflows/main.yaml

@@ -13,17 +13,16 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 18
-          - 20
           - 22
+          - 24
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6.0.2
         with:
           # yarn lint (backstage-cli repo lint) uses this
           fetch-depth: 0
 
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6.4.0
         with:
           cache: yarn
           node-version: ${{ matrix.node-version }}

.github/workflows/pr.yaml

@@ -10,19 +10,18 @@ jobs:
     strategy:
       matrix:
         node-version:
-          - 18
-          - 20
           - 22
+          - 24
     env:
       CI: true
       NODE_OPTIONS: --max-old-space-size=4096
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6.0.2
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6.4.0
         with:
           cache: yarn
           node-version: ${{ matrix.node-version}}

.github/workflows/publish.yaml

@@ -26,10 +26,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.2
 
       - name: Set up Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6.4.0
         with:
           node-version: ${{ matrix.node-version }}
       - run: yarn install --frozen-lockfile
@@ -69,10 +69,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6.0.2
 
       - name: Set up Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6.4.0
         with:
           always-auth: true
           node-version: ${{ matrix.node-version }}

.github/workflows/version-packages.yaml

@@ -17,12 +17,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6.0.2
         with:
           fetch-depth: 0
 
       - name: use Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6.4.0
         with:
           cache: 'yarn'
           node-version: 22.x
@@ -39,6 +39,6 @@ jobs:
 
       - name: create release pull request
         id: changesets
-        uses: changesets/action@v1
+        uses: changesets/action@v1.7.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

@@ -1,8 +1,8 @@
 nodeLinker: node-modules
 
 plugins:
-  - checksum: 8af7b3f2d7d19cacc7a3712f871efcb6208ba283a1f532260b0cba80c2cb66ed772b207b5ba41b8c5d64dd8d5e0c0e15bbb445bd14afac491712965211ba027c
+  - checksum: a6895be0b30a75db6fddafedff143f82ccbd74656bad97775c6a0b9eba6e6ea6b7d66a8e9d0c8505755a981e86b7c6c1c9334ead299a857cf8d6e243957b0bab
     path: .yarn/plugins/@yarnpkg/plugin-backstage.cjs
-    spec: 'https://versions.backstage.io/v1/releases/1.41.1/yarn-plugin'
+    spec: 'https://versions.backstage.io/v1/releases/1.50.3/yarn-plugin'
 
 yarnPath: .yarn/releases/yarn-4.4.1.cjs

.yarnrc.yml

@@ -1,3 +1,3 @@
 {
-  "version": "1.41.1"
+  "version": "1.50.3"
 }

backstage.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "engines": {
-    "node": "20 || 22"
+    "node": "22 | 24"
   },
   "scripts": {
     "start": "backstage-cli repo start",
@@ -31,9 +31,14 @@
   },
   "devDependencies": {
     "@backstage/cli": "backstage:^",
+    "@backstage/cli-defaults": "backstage:^",
     "@backstage/e2e-test-utils": "backstage:^",
     "@changesets/cli": "^2.29.5",
+    "@jest/environment-jsdom-abstract": "^30.0.0",
     "@playwright/test": "^1.32.3",
+    "@types/jest": "^30.0.0",
+    "jest": "^30.0.0",
+    "jsdom": "^26.0.0",
     "node-gyp": "^10.0.0",
     "prettier": "^2.3.2",
     "typescript": "~5.8.0"

package.json

@@ -43,8 +43,8 @@
     "@material-ui/icons": "^4.9.1",
     "react": "^18.0.2",
     "react-dom": "^18.0.2",
-    "react-router": "^6.3.0",
-    "react-router-dom": "^6.3.0"
+    "react-router": "^6.30.2",
+    "react-router-dom": "^6.30.2"
   },
   "devDependencies": {
     "@backstage/test-utils": "backstage:^",
@@ -53,8 +53,8 @@
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^16.0.0",
     "@testing-library/user-event": "^14.0.0",
-    "@types/react": "^19.1.8",
-    "@types/react-dom": "^19.1.6",
+    "@types/react": "^18",
+    "@types/react-dom": "^18",
     "cross-env": "^7.0.0"
   },
   "browserslist": {