Merge pull request #711 from awanlin/topic/manual-v1.33.0-next.1

Manual v1.33.0-next.1 version bump

.yarnrc.yml

@@ -4,4 +4,9 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
+plugins:
+  - checksum: 8fa2e3a1cdf5076dde96b177618478419daea000b8038412817583e4d309fd39bf4813a337eb1fad3bfe9036d31732f7416383affbe3d420f48eacb60f6184d5
+    path: .yarn/plugins/@yarnpkg/plugin-backstage.cjs
+    spec: 'https://versions.backstage.io/v1/tags/main/yarn-plugin'
+
 yarnPath: .yarn/releases/yarn-4.5.0.cjs

Dockerfile

@@ -6,7 +6,7 @@ FROM node:20-bookworm-slim@sha256:ec35a66c9a0a275b027debde05247c081f8b2f0c43d739
 ARG ENVIRONMENT_CONFIG
 
 WORKDIR /app
-COPY package.json yarn.lock ./
+COPY backstage.json package.json yarn.lock ./
 COPY .yarn ./.yarn
 COPY .yarnrc.yml ./
 
@@ -36,6 +36,7 @@ WORKDIR /app
 COPY --from=packages --chown=node:node /app .
 COPY --from=packages --chown=node:node /app/.yarn ./.yarn
 COPY --from=packages --chown=node:node /app/.yarnrc.yml  ./
+COPY --from=packages --chown=node:node /app/backstage.json  ./
 
 RUN --mount=type=cache,target=/home/node/.cache/yarn,sharing=locked,uid=1000,gid=1000 \
     yarn install --immutable
@@ -88,6 +89,7 @@ WORKDIR /app
 # Copy the install dependencies from the build stage and context
 COPY --from=build --chown=node:node /app/.yarn ./.yarn
 COPY --from=build --chown=node:node /app/.yarnrc.yml  ./
+COPY --from=build --chown=node:node /app/backstage.json  ./
 COPY --from=build --chown=node:node /app/yarn.lock /app/package.json /app/packages/backend/dist/skeleton/ ./
 
 RUN --mount=type=cache,target=/home/node/.cache/yarn,sharing=locked,uid=1000,gid=1000 \

backstage.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.33.0-next.0"
+  "version": "1.33.0-next.1"
 }

package.json

@@ -41,8 +41,8 @@
     "react-router-dom": "6.27.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.29.0-next.0",
-    "@backstage/e2e-test-utils": "^0.1.1",
+    "@backstage/cli": "backstage:^",
+    "@backstage/e2e-test-utils": "backstage:^",
     "@playwright/test": "^1.32.3",
     "@spotify/prettier-config": "^15.0.0",
     "@types/lodash": "^4.14.202",

packages/app/package.json

@@ -14,29 +14,29 @@
     "@backstage-community/plugin-graphiql": "^0.3.9",
     "@backstage-community/plugin-tech-radar": "^1.0.0",
     "@backstage-community/plugin-todo": "^0.2.40",
-    "@backstage/app-defaults": "^1.5.13-next.0",
-    "@backstage/cli": "^0.29.0-next.0",
-    "@backstage/core-app-api": "^1.15.1",
-    "@backstage/core-components": "^0.16.0-next.0",
-    "@backstage/core-plugin-api": "^1.10.0",
-    "@backstage/integration-react": "^1.2.0",
-    "@backstage/plugin-api-docs": "^0.11.12-next.0",
-    "@backstage/plugin-catalog": "^1.24.1-next.0",
-    "@backstage/plugin-catalog-graph": "^0.4.12-next.0",
-    "@backstage/plugin-catalog-react": "^1.14.1-next.0",
-    "@backstage/plugin-home": "^0.8.1-next.0",
-    "@backstage/plugin-kubernetes": "^0.11.17-next.0",
-    "@backstage/plugin-notifications": "^0.3.3-next.0",
-    "@backstage/plugin-org": "^0.6.32-next.0",
-    "@backstage/plugin-scaffolder": "^1.26.2-next.0",
-    "@backstage/plugin-search": "^1.4.19-next.0",
-    "@backstage/plugin-search-react": "^1.8.2-next.0",
-    "@backstage/plugin-signals": "^0.0.12-next.0",
-    "@backstage/plugin-techdocs": "^1.11.1-next.0",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.17-next.0",
-    "@backstage/plugin-techdocs-react": "^1.2.10-next.0",
-    "@backstage/plugin-user-settings": "^0.8.15-next.0",
-    "@backstage/theme": "^0.6.0",
+    "@backstage/app-defaults": "backstage:^",
+    "@backstage/cli": "backstage:^",
+    "@backstage/core-app-api": "backstage:^",
+    "@backstage/core-components": "backstage:^",
+    "@backstage/core-plugin-api": "backstage:^",
+    "@backstage/integration-react": "backstage:^",
+    "@backstage/plugin-api-docs": "backstage:^",
+    "@backstage/plugin-catalog": "backstage:^",
+    "@backstage/plugin-catalog-graph": "backstage:^",
+    "@backstage/plugin-catalog-react": "backstage:^",
+    "@backstage/plugin-home": "backstage:^",
+    "@backstage/plugin-kubernetes": "backstage:^",
+    "@backstage/plugin-notifications": "backstage:^",
+    "@backstage/plugin-org": "backstage:^",
+    "@backstage/plugin-scaffolder": "backstage:^",
+    "@backstage/plugin-search": "backstage:^",
+    "@backstage/plugin-search-react": "backstage:^",
+    "@backstage/plugin-signals": "backstage:^",
+    "@backstage/plugin-techdocs": "backstage:^",
+    "@backstage/plugin-techdocs-module-addons-contrib": "backstage:^",
+    "@backstage/plugin-techdocs-react": "backstage:^",
+    "@backstage/plugin-user-settings": "backstage:^",
+    "@backstage/theme": "backstage:^",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "backstage-plugin-techdocs-addon-mermaid": "^0.14.0",

packages/backend/package.json

@@ -19,27 +19,27 @@
     "@backstage-community/plugin-badges-backend": "^0.5.1",
     "@backstage-community/plugin-explore-backend": "^0.1.2",
     "@backstage-community/plugin-todo-backend": "^0.3.18",
-    "@backstage/backend-defaults": "^0.5.3-next.0",
-    "@backstage/backend-plugin-api": "^1.0.2-next.0",
-    "@backstage/plugin-app-backend": "^0.3.77-next.0",
-    "@backstage/plugin-auth-backend": "^0.24.0-next.0",
-    "@backstage/plugin-auth-backend-module-github-provider": "^0.2.2-next.0",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.2-next.0",
-    "@backstage/plugin-catalog-backend": "^1.27.2-next.0",
-    "@backstage/plugin-catalog-backend-module-logs": "^0.1.4-next.0",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.2-next.0",
-    "@backstage/plugin-events-backend": "^0.3.15-next.0",
-    "@backstage/plugin-kubernetes-backend": "^0.18.8-next.0",
-    "@backstage/plugin-notifications-backend": "^0.4.3-next.0",
-    "@backstage/plugin-proxy-backend": "^0.5.8-next.0",
-    "@backstage/plugin-scaffolder-backend": "^1.26.3-next.0",
-    "@backstage/plugin-scaffolder-backend-module-github": "^0.5.2-next.0",
-    "@backstage/plugin-search-backend": "^1.6.2-next.0",
-    "@backstage/plugin-search-backend-module-catalog": "^0.2.5-next.0",
-    "@backstage/plugin-search-backend-module-explore": "^0.2.5-next.0",
-    "@backstage/plugin-signals-backend": "^0.2.3-next.0",
-    "@backstage/plugin-techdocs-backend": "^1.11.2-next.0",
-    "@backstage/plugin-techdocs-node": "^1.12.13-next.0",
+    "@backstage/backend-defaults": "backstage:^",
+    "@backstage/backend-plugin-api": "backstage:^",
+    "@backstage/plugin-app-backend": "backstage:^",
+    "@backstage/plugin-auth-backend": "backstage:^",
+    "@backstage/plugin-auth-backend-module-github-provider": "backstage:^",
+    "@backstage/plugin-auth-backend-module-guest-provider": "backstage:^",
+    "@backstage/plugin-catalog-backend": "backstage:^",
+    "@backstage/plugin-catalog-backend-module-logs": "backstage:^",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "backstage:^",
+    "@backstage/plugin-events-backend": "backstage:^",
+    "@backstage/plugin-kubernetes-backend": "backstage:^",
+    "@backstage/plugin-notifications-backend": "backstage:^",
+    "@backstage/plugin-proxy-backend": "backstage:^",
+    "@backstage/plugin-scaffolder-backend": "backstage:^",
+    "@backstage/plugin-scaffolder-backend-module-github": "backstage:^",
+    "@backstage/plugin-search-backend": "backstage:^",
+    "@backstage/plugin-search-backend-module-catalog": "backstage:^",
+    "@backstage/plugin-search-backend-module-explore": "backstage:^",
+    "@backstage/plugin-signals-backend": "backstage:^",
+    "@backstage/plugin-techdocs-backend": "backstage:^",
+    "@backstage/plugin-techdocs-node": "backstage:^",
     "@frontside/backstage-plugin-graphql-backend": "^0.1.2",
     "@frontside/backstage-plugin-graphql-backend-module-catalog": "^0.3.0",
     "@internal/plugin-catalog-backend-module-backstage": "workspace:^",
@@ -48,6 +48,6 @@
     "better-sqlite3": "^11.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.29.0-next.0"
+    "@backstage/cli": "backstage:^"
   }
 }

plugins/catalog-backend-module-backstage/package.json

@@ -24,11 +24,11 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/backend-plugin-api": "^1.0.2-next.0",
-    "@backstage/catalog-model": "^1.7.0",
-    "@backstage/config": "^1.2.0",
-    "@backstage/integration": "^1.15.1",
-    "@backstage/plugin-catalog-node": "^1.14.0-next.0",
+    "@backstage/backend-plugin-api": "backstage:^",
+    "@backstage/catalog-model": "backstage:^",
+    "@backstage/config": "backstage:^",
+    "@backstage/integration": "backstage:^",
+    "@backstage/plugin-catalog-node": "backstage:^",
     "fs-extra": "^11.2.0",
     "glob": "^10.3.10",
     "lodash": "^4.17.21",
@@ -37,7 +37,7 @@
     "yaml": "^2.3.4"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.29.0-next.0",
+    "@backstage/cli": "backstage:^",
     "@types/fs-extra": "^11.0.4",
     "@types/glob": "^8.1.0",
     "@types/uuid": "^10.0.0"

plugins/scaffolder-backend-module-github-pages/package.json

@@ -24,16 +24,16 @@
     "postpack": "backstage-cli package postpack"
   },
   "dependencies": {
-    "@backstage/backend-plugin-api": "^1.0.2-next.0",
-    "@backstage/errors": "^1.2.4",
-    "@backstage/integration": "^1.15.1",
-    "@backstage/plugin-scaffolder-backend-module-github": "^0.5.2-next.0",
-    "@backstage/plugin-scaffolder-node": "^0.5.1-next.0",
+    "@backstage/backend-plugin-api": "backstage:^",
+    "@backstage/errors": "backstage:^",
+    "@backstage/integration": "backstage:^",
+    "@backstage/plugin-scaffolder-backend-module-github": "backstage:^",
+    "@backstage/plugin-scaffolder-node": "backstage:^",
     "octokit": "^3.1.2",
     "yaml": "^2.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.29.0-next.0"
+    "@backstage/cli": "backstage:^"
   },
   "files": [
     "dist"