chore: Update to Backstage 1.31.1

ThomasVitale · ThomasVitale · commit 493602035336 · 2024-09-23T23:28:05.000+02:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,13 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "00:30"
+      timezone: Europe/Copenhagen
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+    commit-message:
+      prefix: "deps:"
diff --git a/.github/workflows/commit-stage.yml b/.github/workflows/commit-stage.yml
@@ -25,7 +25,7 @@ jobs:
       
       - name: Install dependencies
         run: |
-          yarn install --frozen-lockfile
+          yarn install --immutable
       
       - name: Validate configuration
         run: |
@@ -76,7 +76,7 @@ jobs:
       
       - name: Install dependencies
         run: |
-          yarn install --frozen-lockfile
+          yarn install --immutable
       
       - name: Generate type definitions
         run: |
diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,7 @@ coverage
 # Dependencies
 node_modules/
 
-# Yarn 3 files
+# Yarn files
 .pnp.*
 .yarn/*
 !.yarn/patches
diff --git a/.yarn/releases/yarn-4.4.1.cjs b/.yarn/releases/yarn-4.4.1.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.4.1.cjs
diff --git a/backstage.json b/backstage.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.30.4"
+  "version": "1.31.1"
 }
diff --git a/demo-catalog/organizations/organization-guest.yml b/demo-catalog/organizations/organization-guest.yml
diff --git a/lerna.json b/lerna.json
diff --git a/package.json b/package.json
@@ -6,7 +6,8 @@
     "node": "18 || 20"
   },
   "scripts": {
-    "dev": "concurrently \"yarn start\" \"yarn dotenv -e .env yarn start-backend\"",
+    "dev": "yarn run env-cmd -f .env yarn run dev:start",
+    "dev:start": "yarn workspaces foreach -A --include backend --include app --parallel -v -i run start",
     "start": "yarn workspace app start",
     "start-backend": "yarn workspace backend start",
     "build:backend": "yarn workspace backend build",
@@ -31,12 +32,11 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.27.0",
+    "@backstage/cli": "^0.27.1",
     "@backstage/e2e-test-utils": "^0.1.1",
     "@playwright/test": "^1.32.3",
     "@spotify/prettier-config": "^12.0.0",
-    "concurrently": "^8.0.0",
-    "lerna": "^7.3.0",
+    "env-cmd": "^10.1.0",
     "node-gyp": "^10.0.0",
     "prettier": "^2.3.2",
     "typescript": "~5.4.0"
@@ -54,5 +54,6 @@
     "*.{json,md}": [
       "prettier --write"
     ]
-  }
+  },
+  "packageManager": "yarn@4.4.1"
 }
diff --git a/packages/app/package.json b/packages/app/package.json
@@ -15,31 +15,31 @@
   },
   "dependencies": {
     "@backstage-community/plugin-github-actions": "^0.6.22",
-    "@backstage/app-defaults": "^1.5.10",
-    "@backstage/catalog-model": "^1.6.0",
-    "@backstage/cli": "^0.27.0",
-    "@backstage/core-app-api": "^1.14.2",
-    "@backstage/core-components": "^0.14.10",
-    "@backstage/core-plugin-api": "^1.9.3",
-    "@backstage/integration-react": "^1.1.30",
-    "@backstage/plugin-api-docs": "^0.11.8",
-    "@backstage/plugin-catalog": "^1.22.0",
-    "@backstage/plugin-catalog-common": "^1.0.26",
-    "@backstage/plugin-catalog-graph": "^0.4.8",
-    "@backstage/plugin-catalog-import": "^0.12.2",
-    "@backstage/plugin-catalog-react": "^1.12.3",
-    "@backstage/plugin-home": "^0.7.9",
-    "@backstage/plugin-kubernetes": "^0.11.13",
-    "@backstage/plugin-org": "^0.6.28",
-    "@backstage/plugin-permission-react": "^0.4.25",
-    "@backstage/plugin-scaffolder": "^1.24.0",
-    "@backstage/plugin-search": "^1.4.15",
-    "@backstage/plugin-search-react": "^1.7.14",
-    "@backstage/plugin-techdocs": "^1.10.8",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.13",
-    "@backstage/plugin-techdocs-react": "^1.2.7",
-    "@backstage/plugin-user-settings": "^0.8.11",
-    "@backstage/theme": "^0.5.6",
+    "@backstage/app-defaults": "^1.5.11",
+    "@backstage/catalog-model": "^1.7.0",
+    "@backstage/cli": "^0.27.1",
+    "@backstage/core-app-api": "^1.15.0",
+    "@backstage/core-components": "^0.15.0",
+    "@backstage/core-plugin-api": "^1.9.4",
+    "@backstage/integration-react": "^1.1.31",
+    "@backstage/plugin-api-docs": "^0.11.9",
+    "@backstage/plugin-catalog": "^1.23.0",
+    "@backstage/plugin-catalog-common": "^1.1.0",
+    "@backstage/plugin-catalog-graph": "^0.4.9",
+    "@backstage/plugin-catalog-import": "^0.12.3",
+    "@backstage/plugin-catalog-react": "^1.13.0",
+    "@backstage/plugin-home": "^0.7.10",
+    "@backstage/plugin-kubernetes": "^0.11.14",
+    "@backstage/plugin-org": "^0.6.29",
+    "@backstage/plugin-permission-react": "^0.4.26",
+    "@backstage/plugin-scaffolder": "^1.25.0",
+    "@backstage/plugin-search": "^1.4.16",
+    "@backstage/plugin-search-react": "^1.8.0",
+    "@backstage/plugin-techdocs": "^1.10.9",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.14",
+    "@backstage/plugin-techdocs-react": "^1.2.8",
+    "@backstage/plugin-user-settings": "^0.8.12",
+    "@backstage/theme": "^0.5.7",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "history": "^5.0.0",
@@ -50,7 +50,7 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.5.10",
+    "@backstage/test-utils": "^1.6.0",
     "@playwright/test": "^1.32.3",
     "@testing-library/dom": "^9.0.0",
     "@testing-library/jest-dom": "^6.0.0",
diff --git a/packages/backend/Dockerfile b/packages/backend/Dockerfile
@@ -3,20 +3,23 @@
 #
 # Before building this image, be sure to have run the following commands in the repo root:
 #
-# yarn install
+# yarn install --immutable
 # yarn tsc
 # yarn build:backend
 #
 # Once the commands have been run, you can build the image using `yarn build-image`
 
 FROM docker.io/library/node:20-bookworm-slim
 
+# Set Python interpreter for `node-gyp` to use
+ENV PYTHON=/usr/bin/python3
+
 # Install isolate-vm dependencies, these are needed by the @backstage/plugin-scaffolder-backend.
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
     apt-get update && \
     apt-get install -y --no-install-recommends python3 g++ build-essential && \
-    yarn config set python /usr/bin/python3
+    rm -rf /var/lib/apt/lists/*
 
 # From here on we use the least-privileged `node` user to run the backend.
 USER node
@@ -26,17 +29,24 @@ USER node
 # If this occurs, then ensure BuildKit is enabled (`DOCKER_BUILDKIT=1`) so the app dir is correctly created as `node`.
 WORKDIR /app
 
+# Copy files needed by Yarn
+COPY --chown=node:node .yarn ./.yarn
+COPY --chown=node:node .yarnrc.yml ./
+
 # This switches many Node.js dependencies to production mode.
 ENV NODE_ENV=production
 
+# This disables node snapshot for Node 20 to work with the Scaffolder
+ENV NODE_OPTIONS="--no-node-snapshot"
+
 # Copy repo skeleton first, to avoid unnecessary docker cache invalidation.
 # The skeleton contains the package.json of each package in the monorepo,
 # and along with yarn.lock and the root package.json, that's enough to run yarn install.
 COPY --chown=node:node yarn.lock package.json packages/backend/dist/skeleton.tar.gz ./
 RUN tar xzf skeleton.tar.gz && rm skeleton.tar.gz
 
 RUN --mount=type=cache,target=/home/node/.cache/yarn,sharing=locked,uid=1000,gid=1000 \
-    yarn install --frozen-lockfile --production --network-timeout 300000
+    yarn workspaces focus --all --production && rm -rf "$(yarn cache clean)"
 
 # Then copy the rest of the backend bundle, along with any other files we might want.
 COPY --chown=node:node packages/backend/dist/bundle.tar.gz app-config*.yaml ./
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -16,44 +16,41 @@
     "build-image": "docker build ../.. -f Dockerfile --tag backstage"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.24.1",
-    "@backstage/backend-defaults": "^0.4.4",
-    "@backstage/backend-tasks": "^0.6.1",
+    "@backstage/backend-defaults": "^0.5.0",
     "@backstage/config": "^1.2.0",
-    "@backstage/plugin-app-backend": "^0.3.73",
-    "@backstage/plugin-auth-backend": "^0.22.12",
-    "@backstage/plugin-auth-backend-module-github-provider": "^0.1.21",
-    "@backstage/plugin-auth-node": "^0.5.1",
-    "@backstage/plugin-catalog-backend": "^1.25.2",
-    "@backstage/plugin-catalog-backend-module-logs": "^0.0.4",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.22",
-    "@backstage/plugin-events-backend": "^0.3.11",
-    "@backstage/plugin-kubernetes-backend": "^0.18.5",
-    "@backstage/plugin-permission-backend": "^0.5.48",
-    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.1.21",
+    "@backstage/plugin-app-backend": "^0.3.74",
+    "@backstage/plugin-auth-backend": "^0.23.0",
+    "@backstage/plugin-auth-backend-module-github-provider": "^0.2.0",
+    "@backstage/plugin-auth-node": "^0.5.2",
+    "@backstage/plugin-catalog-backend": "^1.26.0",
+    "@backstage/plugin-catalog-backend-module-logs": "^0.1.0",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.0",
+    "@backstage/plugin-events-backend": "^0.3.12",
+    "@backstage/plugin-kubernetes-backend": "^0.18.6",
+    "@backstage/plugin-permission-backend": "^0.5.49",
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.0",
     "@backstage/plugin-permission-common": "^0.8.1",
-    "@backstage/plugin-permission-node": "^0.8.2",
-    "@backstage/plugin-proxy-backend": "^0.5.5",
-    "@backstage/plugin-scaffolder-backend": "^1.24.1",
-    "@backstage/plugin-scaffolder-backend-module-github": "^0.4.2",
-    "@backstage/plugin-search-backend": "^1.5.16",
-    "@backstage/plugin-search-backend-module-catalog": "^0.2.1",
-    "@backstage/plugin-search-backend-module-pg": "^0.5.34",
-    "@backstage/plugin-search-backend-module-techdocs": "^0.2.1",
-    "@backstage/plugin-search-backend-node": "^1.3.1",
-    "@backstage/plugin-techdocs-backend": "^1.10.12",
+    "@backstage/plugin-permission-node": "^0.8.3",
+    "@backstage/plugin-proxy-backend": "^0.5.6",
+    "@backstage/plugin-scaffolder-backend": "^1.25.0",
+    "@backstage/plugin-scaffolder-backend-module-github": "^0.5.0",
+    "@backstage/plugin-search-backend": "^1.5.17",
+    "@backstage/plugin-search-backend-module-catalog": "^0.2.2",
+    "@backstage/plugin-search-backend-module-pg": "^0.5.35",
+    "@backstage/plugin-search-backend-module-techdocs": "^0.2.2",
+    "@backstage/plugin-search-backend-node": "^1.3.2",
+    "@backstage/plugin-techdocs-backend": "^1.10.13",
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",
     "node-gyp": "^10.0.0",
     "pg": "^8.12.0",
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.27.0",
+    "@backstage/cli": "^0.27.1",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",
-    "@types/luxon": "^2.0.4",
-    "dotenv-cli": "^7.4.2"
+    "@types/luxon": "^2.0.4"
   },
   "files": [
     "dist"
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,7 +2,9 @@
   "extends": "@backstage/cli/config/tsconfig.json",
   "include": [
     "packages/*/src",
+    "packages/*/config.d.ts",
     "plugins/*/src",
+    "plugins/*/config.d.ts",
     "plugins/*/dev",
     "plugins/*/migrations"
   ],
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+nodeLinker: node-modules`
	`2`	`+`
	`3`	`+yarnPath: .yarn/releases/yarn-4.4.1.cjs`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "version": "1.30.4"`
	`2`	`+ "version": "1.31.1"`
`3`	`3`	`}`