feat: Yarn and Backstage Upgrade

.dockerignore

@@ -10,3 +10,11 @@ charts/
 chart/**/*.dec
 *.enc
 *.dec
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.gitignore

@@ -55,4 +55,12 @@ e2e-test-report/
 
 .kube/config
 .env.secrets
-chart/secrets.prod.yaml.dec
+chart/secrets.prod.yaml.dec
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

.release-it.json

@@ -0,0 +1,15 @@
+{
+    "$schema": "https://unpkg.com/release-it@17/schema/release-it.json",
+    "git": {
+        "commitMessage": "chore: release v${version}"
+    },
+    "github": {
+        "release": true
+    },
+    "plugins": {
+        "@csmith/release-it-calver-plugin": {
+            "format": "yyyy.mm.minor",
+            "increment": "calendar"
+        }
+    }
+}

.tool-versions

@@ -4,5 +4,4 @@ kubectl 1.29.2
 nodejs 18.19.1
 python 3.10.12
 skaffold 2.10.1
-sops 3.8.1
-yarn 1.22.19
+sops 3.8.1

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

Dockerfile

@@ -1,5 +1,5 @@
 ARG NODE_VERSION=18.19.1
-ARG YARN_VERSION=1.22.19
+ARG YARN_VERSION=4.3.1
 ARG PYTHON_VERSION=3.10.12
 
 FROM debian:12-slim AS build
@@ -63,6 +63,8 @@ COPY yarn.lock package.json ./
 COPY packages/backend/package.json ./packages/backend/package.json
 COPY packages/app/package.json ./packages/app/package.json
 COPY plugins/ plugins/
+COPY .yarn ./.yarn
+COPY .yarnrc.yml ./
 RUN yarn install --immutable
 
 COPY tsconfig.json ./
@@ -141,7 +143,7 @@ COPY package.json ./
 COPY --from=build /app/packages/backend/dist/skeleton.tar.gz ./
 RUN tar xzf skeleton.tar.gz && rm skeleton.tar.gz
 
-RUN yarn install --production --immutable
+RUN 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 --from=build /app/packages/backend/dist/bundle.tar.gz app-config*.yaml ./

Makefile

@@ -16,8 +16,11 @@ init:
 install:
 ifneq ($(shell which asdf),)
 	asdf install
+	corepack enable
+	corepack prepare yarn@4.3.1 --activate
+	asdf reshim nodejs
 endif
-	yarn install --immutable
+	yarn install
 
 test: install
 	yarn test

backstage.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.27.0"
+  "version": "1.28.3"
 }

package.json

@@ -22,7 +22,8 @@
     "lint": "backstage-cli repo lint --since origin/main",
     "lint:all": "backstage-cli repo lint",
     "prettier:check": "prettier --check .",
-    "new": "backstage-cli new --scope internal"
+    "new": "backstage-cli new --scope internal",
+    "release": "release-it"
   },
   "workspaces": {
     "packages": [
@@ -31,14 +32,16 @@
     ]
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.5",
+    "@backstage/cli": "^0.26.10",
     "@backstage/e2e-test-utils": "^0.1.1",
+    "@csmith/release-it-calver-plugin": "^2023.12.0",
     "@playwright/test": "^1.32.3",
     "@spotify/prettier-config": "^12.0.0",
     "concurrently": "^8.0.0",
     "lerna": "^7.3.0",
     "node-gyp": "^9.0.0",
     "prettier": "^2.3.2",
+    "release-it": "^17.4.0",
     "typescript": "~5.3.0"
   },
   "resolutions": {
@@ -54,5 +57,6 @@
     "*.{json,md}": [
       "prettier --write"
     ]
-  }
-}
+  },
+  "packageManager": "yarn@4.3.1"
+}

packages/app/package.json

@@ -14,30 +14,30 @@
     "lint": "backstage-cli package lint"
   },
   "dependencies": {
-    "@backstage/app-defaults": "^1.5.5",
+    "@backstage/app-defaults": "^1.5.7",
     "@backstage/catalog-model": "^1.5.0",
-    "@backstage/cli": "^0.26.5",
-    "@backstage/core-app-api": "^1.12.5",
-    "@backstage/core-components": "^0.14.7",
-    "@backstage/core-plugin-api": "^1.9.2",
-    "@backstage/integration-react": "^1.1.27",
-    "@backstage/plugin-api-docs": "^0.11.5",
-    "@backstage/plugin-catalog": "^1.20.0",
-    "@backstage/plugin-catalog-common": "^1.0.23",
-    "@backstage/plugin-catalog-graph": "^0.4.5",
-    "@backstage/plugin-catalog-import": "^0.11.0",
-    "@backstage/plugin-catalog-react": "^1.12.0",
-    "@backstage/plugin-home": "^0.7.4",
-    "@backstage/plugin-org": "^0.6.25",
-    "@backstage/plugin-permission-react": "^0.4.22",
-    "@backstage/plugin-scaffolder": "^1.20.0",
-    "@backstage/plugin-search": "^1.4.11",
-    "@backstage/plugin-search-react": "^1.7.11",
-    "@backstage/plugin-techdocs": "^1.10.5",
-    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.10",
-    "@backstage/plugin-techdocs-react": "^1.2.4",
-    "@backstage/plugin-user-settings": "^0.8.6",
-    "@backstage/theme": "^0.5.4",
+    "@backstage/cli": "^0.26.10",
+    "@backstage/core-app-api": "^1.13.0",
+    "@backstage/core-components": "^0.14.8",
+    "@backstage/core-plugin-api": "^1.9.3",
+    "@backstage/integration-react": "^1.1.28",
+    "@backstage/plugin-api-docs": "^0.11.6",
+    "@backstage/plugin-catalog": "^1.21.0",
+    "@backstage/plugin-catalog-common": "^1.0.24",
+    "@backstage/plugin-catalog-graph": "^0.4.6",
+    "@backstage/plugin-catalog-import": "^0.12.0",
+    "@backstage/plugin-catalog-react": "^1.12.1",
+    "@backstage/plugin-home": "^0.7.6",
+    "@backstage/plugin-org": "^0.6.26",
+    "@backstage/plugin-permission-react": "^0.4.23",
+    "@backstage/plugin-scaffolder": "^1.22.0",
+    "@backstage/plugin-search": "^1.4.12",
+    "@backstage/plugin-search-react": "^1.7.12",
+    "@backstage/plugin-techdocs": "^1.10.6",
+    "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.11",
+    "@backstage/plugin-techdocs-react": "^1.2.5",
+    "@backstage/plugin-user-settings": "^0.8.8",
+    "@backstage/theme": "^0.5.6",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
     "@fontsource/inter": "^5.0.18",
@@ -55,14 +55,17 @@
     "react-use": "^17.2.4"
   },
   "devDependencies": {
-    "@backstage/test-utils": "^1.5.5",
+    "@backstage/test-utils": "^1.5.7",
     "@playwright/test": "^1.32.3",
     "@swc/types": "^0.1.7",
     "@testing-library/dom": "^9.0.0",
     "@testing-library/jest-dom": "^6.0.0",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.0.0",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^20.14.9",
     "@types/react-dom": "*",
+    "@types/webpack-env": "^1.18.5",
     "cross-env": "^7.0.0"
   },
   "browserslist": {

packages/app/src/theme/index.ts

@@ -11,7 +11,6 @@ import {
   SupportedVersions,
   UnifiedTheme,
 } from '@backstage/theme';
-import { extendTheme } from '@mui/joy/styles';
 import '@fontsource/inter/400.css';
 import '@fontsource/inter/700.css';
 import {
@@ -96,24 +95,6 @@ export function createBackstageTheme(options: ThemeOptions): UnifiedTheme {
   return new UnifiedThemeHolder(theme);
 }
 
-export const joyTheme = extendTheme({
-  colorSchemes: {
-    light: {
-      palette: {
-        primary: {
-          50: '#fffbeb',
-          100: '#fef3c7',
-          200: '#fde68a',
-        },
-      },
-    },
-  },
-  fontFamily: {
-    display: DEFAULT_FONT_FAMILY,
-    body: DEFAULT_FONT_FAMILY,
-  },
-});
-
 export const backstageTheme = createBackstageTheme({
   shape: {
     borderRadius: 10,
@@ -188,6 +169,9 @@ export const backstageTheme = createBackstageTheme({
     },
     MuiGrid: {
       styleOverrides: {
+        item: {
+          padding: '.5rem',
+        },
         root: {
           '&.v5-MuiGrid-container': {
             margin: 0,

packages/backend/package.json

@@ -16,28 +16,28 @@
     "build-image": "docker build ../.. -f Dockerfile --tag backstage"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.22.0",
-    "@backstage/backend-defaults": "^0.2.18",
-    "@backstage/backend-tasks": "^0.5.23",
+    "@backstage/backend-common": "^0.23.2",
+    "@backstage/backend-defaults": "^0.3.3",
+    "@backstage/backend-tasks": "^0.5.26",
     "@backstage/config": "^1.2.0",
-    "@backstage/plugin-app-backend": "^0.3.66",
-    "@backstage/plugin-auth-backend": "^0.22.5",
-    "@backstage/plugin-auth-backend-module-github-provider": "^0.1.15",
-    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.4",
-    "@backstage/plugin-auth-node": "^0.4.13",
-    "@backstage/plugin-catalog-backend": "^1.22.0",
-    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.16",
-    "@backstage/plugin-permission-backend": "^0.5.42",
-    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.1.15",
-    "@backstage/plugin-permission-common": "^0.7.13",
-    "@backstage/plugin-permission-node": "^0.7.29",
-    "@backstage/plugin-proxy-backend": "^0.4.16",
-    "@backstage/plugin-scaffolder-backend": "^1.22.6",
-    "@backstage/plugin-search-backend": "^1.5.8",
-    "@backstage/plugin-search-backend-module-catalog": "^0.1.24",
-    "@backstage/plugin-search-backend-module-techdocs": "^0.1.23",
-    "@backstage/plugin-search-backend-node": "^1.2.22",
-    "@backstage/plugin-techdocs-backend": "^1.10.5",
+    "@backstage/plugin-app-backend": "^0.3.70",
+    "@backstage/plugin-auth-backend": "^0.22.8",
+    "@backstage/plugin-auth-backend-module-github-provider": "^0.1.18",
+    "@backstage/plugin-auth-backend-module-guest-provider": "^0.1.7",
+    "@backstage/plugin-auth-node": "^0.4.16",
+    "@backstage/plugin-catalog-backend": "^1.23.2",
+    "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.1.19",
+    "@backstage/plugin-permission-backend": "^0.5.45",
+    "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.1.18",
+    "@backstage/plugin-permission-common": "^0.7.14",
+    "@backstage/plugin-permission-node": "^0.7.32",
+    "@backstage/plugin-proxy-backend": "^0.5.2",
+    "@backstage/plugin-scaffolder-backend": "^1.22.11",
+    "@backstage/plugin-search-backend": "^1.5.13",
+    "@backstage/plugin-search-backend-module-catalog": "^0.1.27",
+    "@backstage/plugin-search-backend-module-techdocs": "^0.1.26",
+    "@backstage/plugin-search-backend-node": "^1.2.26",
+    "@backstage/plugin-techdocs-backend": "^1.10.8",
     "app": "link:../app",
     "better-sqlite3": "^9.0.0",
     "dockerode": "^3.3.1",
@@ -46,7 +46,7 @@
     "winston": "^3.2.1"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.26.5",
+    "@backstage/cli": "^0.26.10",
     "@types/dockerode": "^3.3.0",
     "@types/express": "^4.17.6",
     "@types/express-serve-static-core": "^4.17.5",