Merge pull request #516 from immobiliare/feat/bump-dependencies-1.29.1

feat: bump dependencies to 1.29.1
immobiliare · Jul 23, 2024 · 6477aeb · 6477aeb
2 parents a25c688 + d7de365
commit 6477aeb
Show file tree

Hide file tree

Showing 15 changed files with 12,748 additions and 12,008 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
 
             - uses: actions/setup-node@v3
               with:
-                  node-version: 18
+                  node-version: 20
                   # setting this should create the npmrc with $NODE_AUTH_TOKEN
                   registry-url: 'https://registry.npmjs.org'
 
@@ -27,7 +27,7 @@ jobs:
             - name: Bootstrap lerna
               run: yarn
 
-            - name: Lerna build
+            - name: Build packages
               run: yarn build
 
             - name: Bump release

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
                   token: ${{ secrets.GITHUB_TOKEN }}
             - uses: actions/setup-node@v3
               with:
-                  node-version: 18.x
+                  node-version: 20.x
 
             - name: Install dependencies
               run: yarn install --immutable
@@ -34,11 +34,24 @@ jobs:
                   token: ${{ secrets.GITHUB_TOKEN }}
             - uses: actions/setup-node@v3
               with:
-                  node-version: 18.x
+                  node-version: 20.x
             - name: Install dependencies
               run: yarn install
             - name: Test
               run: yarn prettier --check .
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  token: ${{ secrets.GITHUB_TOKEN }}
+            - uses: actions/setup-node@v3
+              with:
+                  node-version: 20.x
+            - name: Install dependencies
+              run: yarn install
+            - name: Build packages
+              run: yarn build
     test:
         runs-on: ubuntu-latest
         steps:
@@ -47,7 +60,7 @@ jobs:
                   token: ${{ secrets.GITHUB_TOKEN }}
             - uses: actions/setup-node@v3
               with:
-                  node-version: 18.x
+                  node-version: 20.x
 
             - name: Install dependencies
               run: yarn

diff --git a/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
diff --git a/.yarn/releases/yarn-3.5.1.cjs b/.yarn/releases/yarn-3.5.1.cjs
diff --git a/.yarn/releases/yarn-4.3.1.cjs b/.yarn/releases/yarn-4.3.1.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,9 +1,7 @@
-nodeLinker: node-modules
+compressionLevel: mixed
 
 enableGlobalCache: true
 
-plugins:
-    - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-      spec: '@yarnpkg/plugin-workspace-tools'
+nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.5.1.cjs
+yarnPath: .yarn/releases/yarn-4.3.1.cjs
diff --git a/packages/gitlab/app-config.yaml → app-config.yaml b/packages/gitlab/app-config.yaml → app-config.yaml
diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,5 @@
 {
     "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-    "useNx": true,
-    "useWorkspaces": true,
     "npmClient": "yarn",
     "version": "6.5.1"
 }
diff --git a/package.json b/package.json
@@ -5,6 +5,7 @@
         "packages/*"
     ],
     "devDependencies": {
+        "@backstage/cli": "^0.26.11",
         "@commitlint/cli": "^17.1.2",
         "@commitlint/config-conventional": "^17.1.0",
         "@typescript-eslint/eslint-plugin": "^5.36.0",
@@ -14,7 +15,7 @@
         "eslint-plugin-prettier": "^4.2.1",
         "husky": "^8.0.1",
         "is-ci": "^3.0.1",
-        "lerna": "^6.0.3",
+        "lerna": "^8.1.7",
         "lint-staged": "^13.0.3",
         "markdown-toc": "^1.2.0",
         "prettier": "^2.7.1",
@@ -23,12 +24,15 @@
     "engines": {
         "node": ">=18.0.0"
     },
+    "volta": {
+        "node": "20.15.1"
+    },
     "scripts": {
         "type": "tsc --noEmit",
         "style:lint": "eslint packages --ext .ts",
         "style:lint-fix": "eslint packages --ext .ts --fix",
         "style:prettier": "prettier \"packages/**/*.ts\" --list-different --write",
-        "build": "npx lerna run build",
+        "build": "tsc && backstage-cli repo build --all",
         "bootstrap": "npx lerna bootstrap",
         "publish:ci": "lerna publish from-package --yes --pre-dist-tag alpha",
         "test": "lerna run test:ci",
@@ -38,5 +42,5 @@
         "postinstall": "node prepare.js || echo 'Skipping prepare'",
         "prepare": "node prepare.js || echo 'Skipping prepare'"
     },
-    "packageManager": "yarn@3.5.1"
+    "packageManager": "yarn@4.3.1"
 }
diff --git a/packages/gitlab-backend/package.json b/packages/gitlab-backend/package.json
@@ -10,7 +10,12 @@
         "types": "dist/index.d.ts"
     },
     "backstage": {
-        "role": "backend-plugin"
+        "role": "backend-plugin",
+        "pluginId": "gitlab",
+        "pluginPackages": [
+            "@immobiliarelabs/backstage-plugin-gitlab",
+            "@immobiliarelabs/backstage-plugin-gitlab-backend"
+        ]
     },
     "repository": {
         "type": "git",
@@ -27,7 +32,7 @@
     "scripts": {
         "start": "backstage-cli package start",
         "types": "tsc",
-        "build": "yarn types && backstage-cli package build",
+        "build": "backstage-cli package build",
         "lint": "backstage-cli package lint",
         "test": "backstage-cli package test",
         "test:ci": "backstage-cli package test --watch false",
@@ -36,10 +41,10 @@
         "postpack": "backstage-cli package postpack"
     },
     "dependencies": {
-        "@backstage/backend-common": "^0.22.0",
-        "@backstage/backend-plugin-api": "^0.6.18",
+        "@backstage/backend-common": "^0.23.3",
+        "@backstage/backend-plugin-api": "^0.7.0",
         "@backstage/config": "^1.2.0",
-        "@backstage/integration": "^1.11.0",
+        "@backstage/integration": "^1.13.0",
         "body-parser": "^1.20.2",
         "express": "^4.17.3",
         "express-promise-router": "^4.1.0",
@@ -48,11 +53,11 @@
         "yn": "^4.0.0"
     },
     "devDependencies": {
-        "@backstage/backend-test-utils": "^0.3.8",
+        "@backstage/backend-test-utils": "^0.4.4",
         "@backstage/catalog-model": "^1.5.0",
-        "@backstage/cli": "^0.26.5",
-        "@backstage/plugin-catalog-common": "^1.0.23",
-        "@backstage/plugin-catalog-node": "^1.12.0",
+        "@backstage/cli": "^0.26.11",
+        "@backstage/plugin-catalog-common": "^1.0.25",
+        "@backstage/plugin-catalog-node": "^1.12.4",
         "@types/express": "^4.17.21",
         "@types/supertest": "^2.0.12",
         "msw": "^1.0.0",

diff --git a/packages/gitlab/index.d.ts b/packages/gitlab/index.d.ts
diff --git a/packages/gitlab/package.json b/packages/gitlab/package.json
@@ -10,7 +10,12 @@
         "types": "dist/index.d.ts"
     },
     "backstage": {
-        "role": "frontend-plugin"
+        "role": "frontend-plugin",
+        "pluginId": "gitlab",
+        "pluginPackages": [
+            "@immobiliarelabs/backstage-plugin-gitlab",
+            "@immobiliarelabs/backstage-plugin-gitlab-backend"
+        ]
     },
     "repository": {
         "type": "git",
@@ -23,10 +28,11 @@
         "immobiliare",
         "immobiliarelabs"
     ],
+    "sideEffects": false,
     "scripts": {
         "start": "backstage-cli package start",
         "types": "tsc",
-        "build": "yarn types && backstage-cli package build",
+        "build": "backstage-cli package build",
         "lint": "backstage-cli package lint",
         "test": "backstage-cli package test",
         "test:ci": "backstage-cli package test --watch false",
@@ -35,10 +41,10 @@
         "postpack": "backstage-cli package postpack"
     },
     "dependencies": {
-        "@backstage/core-components": "^0.14.7",
-        "@backstage/core-plugin-api": "^1.9.2",
-        "@backstage/plugin-catalog-react": "^1.12.0",
-        "@backstage/theme": "^0.5.4",
+        "@backstage/core-components": "^0.14.9",
+        "@backstage/core-plugin-api": "^1.9.3",
+        "@backstage/plugin-catalog-react": "^1.12.2",
+        "@backstage/theme": "^0.5.6",
         "@material-ui/core": "^4.12.2",
         "@material-ui/icons": "^4.9.1",
         "@material-ui/lab": "4.0.0-alpha.61",
@@ -59,11 +65,11 @@
         "react-router-dom": "6.0.0-beta.0 || ^6.20.0"
     },
     "devDependencies": {
-        "@backstage/cli": "^0.26.5",
-        "@backstage/core-app-api": "^1.12.5",
-        "@backstage/dev-utils": "^1.0.32",
-        "@backstage/plugin-catalog-react": "^1.12.0",
-        "@backstage/test-utils": "^1.5.5",
+        "@backstage/cli": "^0.26.11",
+        "@backstage/core-app-api": "^1.14.0",
+        "@backstage/dev-utils": "^1.0.35",
+        "@backstage/plugin-catalog-react": "^1.12.2",
+        "@backstage/test-utils": "^1.5.8",
         "@commitlint/cli": "^17.0.0",
         "@commitlint/config-conventional": "^17.0.0",
         "@gitbeaker/rest": "^40.0.2",

diff --git a/packages/gitlab/src/components/widgets/ReadmeCard/ReadmeCard.tsx b/packages/gitlab/src/components/widgets/ReadmeCard/ReadmeCard.tsx
@@ -18,6 +18,7 @@ import {
 } from '../../gitlabAppData';
 import gfm from 'remark-gfm';
 import toc from 'remark-toc';
+// @ts-ignore
 import removeComments from 'remark-remove-comments';
 
 import gemoji from 'remark-gemoji';

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,5 +1,9 @@
 {
+    "exclude": ["node_modules"],
+    "include": ["packages/*/src", "packages/*/dev"],
     "compilerOptions": {
+        "outDir": "dist-types",
+        "rootDir": ".",
         "allowJs": true,
         "declaration": true,
         "declarationMap": false,