Merge pull request #706 from immobiliare/next

immobiliare · Jan 30, 2025 · 69d4ed8 · 69d4ed8
2 parents 829e522 + dd1a061
commit 69d4ed8
Show file tree

Hide file tree

Showing 14 changed files with 3,882 additions and 1,430 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.8.0-alpha.1](https://github.com/immobiliare/backstage-plugin-gitlab/compare/v6.8.0-alpha.0...v6.8.0-alpha.1) (2025-01-29)
+
+### Bug Fixes
+
+-   disable cache by default ([dd63bfd](https://github.com/immobiliare/backstage-plugin-gitlab/commit/dd63bfd8a0cbb854d0f2b223947b11b0e39dcaa0))
+
+# [6.8.0-alpha.0](https://github.com/immobiliare/backstage-plugin-gitlab/compare/v6.7.0...v6.8.0-alpha.0) (2025-01-28)
+
+### Bug Fixes
+
+-   Add readme_path to the dependencies of ReadmeCard ([9dc9978](https://github.com/immobiliare/backstage-plugin-gitlab/commit/9dc997887e9f53e1f0845a9faadfc33c3ecb0f48))
+-   added missing ttl ([6b8dd38](https://github.com/immobiliare/backstage-plugin-gitlab/commit/6b8dd381fce860ec961241be323110e945329803))
+-   forget await in case of string ([c17edcf](https://github.com/immobiliare/backstage-plugin-gitlab/commit/c17edcf5c3e32cc47cb3378b59e2417956b86096))
+-   Re-render when the GitlabIds change ([3082892](https://github.com/immobiliare/backstage-plugin-gitlab/commit/308289257ce12b29a93a0f6dfab80fbb104caf8d))
+
+### Features
+
+-   backstage deps and caching ([55c2c44](https://github.com/immobiliare/backstage-plugin-gitlab/commit/55c2c44ae8b2ac11edc311a45125a865a1391ae8))
+
 # [6.7.0](https://github.com/immobiliare/backstage-plugin-gitlab/compare/v6.6.1...v6.7.0) (2024-10-18)
 
 ### Features

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
     "$schema": "node_modules/lerna/schemas/lerna-schema.json",
     "npmClient": "yarn",
-    "version": "6.7.0"
+    "version": "6.8.0-alpha.1"
 }
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
         "packages/*"
     ],
     "devDependencies": {
-        "@backstage/cli": "^0.26.11",
+        "@backstage/cli": "^0.29.5",
         "@commitlint/cli": "^17.1.2",
         "@commitlint/config-conventional": "^17.1.0",
         "@typescript-eslint/eslint-plugin": "^5.36.0",

diff --git a/packages/gitlab-backend/CHANGELOG.md b/packages/gitlab-backend/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.8.0-alpha.1](https://github.com/immobiliare/backstage-plugin-gitlab/compare/v6.8.0-alpha.0...v6.8.0-alpha.1) (2025-01-29)
+
+**Note:** Version bump only for package @immobiliarelabs/backstage-plugin-gitlab-backend
+
+# [6.8.0-alpha.0](https://github.com/immobiliare/backstage-plugin-gitlab/compare/v6.7.0...v6.8.0-alpha.0) (2025-01-28)
+
+### Features
+
+-   backstage deps and caching ([55c2c44](https://github.com/immobiliare/backstage-plugin-gitlab/commit/55c2c44ae8b2ac11edc311a45125a865a1391ae8))
+
 # [6.7.0](https://github.com/immobiliare/backstage-plugin-gitlab/compare/v6.6.1...v6.7.0) (2024-10-18)
 
 ### Features

diff --git a/packages/gitlab-backend/package.json b/packages/gitlab-backend/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@immobiliarelabs/backstage-plugin-gitlab-backend",
-    "version": "6.7.0",
+    "version": "6.8.0-alpha.1",
     "main": "dist/index.cjs.js",
     "types": "dist/index.d.ts",
     "license": "Apache-2.0",
@@ -41,10 +41,10 @@
         "postpack": "backstage-cli package postpack"
     },
     "dependencies": {
-        "@backstage/backend-common": "^0.23.3",
-        "@backstage/backend-plugin-api": "^0.7.0",
-        "@backstage/config": "^1.2.0",
-        "@backstage/integration": "^1.13.0",
+        "@backstage/backend-common": "^0.25.0",
+        "@backstage/backend-plugin-api": "^1.1.1",
+        "@backstage/config": "^1.3.2",
+        "@backstage/integration": "^1.16.1",
         "body-parser": "^1.20.2",
         "express": "^4.17.3",
         "express-promise-router": "^4.1.0",
@@ -53,11 +53,11 @@
         "yn": "^4.0.0"
     },
     "devDependencies": {
-        "@backstage/backend-test-utils": "^0.4.4",
-        "@backstage/catalog-model": "^1.5.0",
-        "@backstage/cli": "^0.26.11",
-        "@backstage/plugin-catalog-common": "^1.0.25",
-        "@backstage/plugin-catalog-node": "^1.12.4",
+        "@backstage/backend-test-utils": "^1.2.1",
+        "@backstage/catalog-model": "^1.7.3",
+        "@backstage/cli": "^0.29.5",
+        "@backstage/plugin-catalog-common": "^1.1.3",
+        "@backstage/plugin-catalog-node": "^1.15.1",
         "@types/express": "^4.17.21",
         "@types/supertest": "^2.0.12",
         "msw": "^1.0.0",

diff --git a/packages/gitlab-backend/src/plugin.test.ts b/packages/gitlab-backend/src/plugin.test.ts
@@ -47,7 +47,7 @@ describe('gitlabPlugin', () => {
 
         const { server } = await startTestBackend({
             features: [
-                gitlabPlugin(),
+                gitlabPlugin,
                 mockServices.rootConfig.factory({ data: fakeConfig }),
             ],
         });

diff --git a/packages/gitlab/CHANGELOG.md b/packages/gitlab/CHANGELOG.md
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.8.0-alpha.1](https://github.com/immobiliare/backstage-plugin-gitlab/compare/v6.8.0-alpha.0...v6.8.0-alpha.1) (2025-01-29)
+
+### Bug Fixes
+
+-   disable cache by default ([dd63bfd](https://github.com/immobiliare/backstage-plugin-gitlab/commit/dd63bfd8a0cbb854d0f2b223947b11b0e39dcaa0))
+
+# [6.8.0-alpha.0](https://github.com/immobiliare/backstage-plugin-gitlab/compare/v6.7.0...v6.8.0-alpha.0) (2025-01-28)
+
+### Bug Fixes
+
+-   Add readme_path to the dependencies of ReadmeCard ([9dc9978](https://github.com/immobiliare/backstage-plugin-gitlab/commit/9dc997887e9f53e1f0845a9faadfc33c3ecb0f48))
+-   added missing ttl ([6b8dd38](https://github.com/immobiliare/backstage-plugin-gitlab/commit/6b8dd381fce860ec961241be323110e945329803))
+-   forget await in case of string ([c17edcf](https://github.com/immobiliare/backstage-plugin-gitlab/commit/c17edcf5c3e32cc47cb3378b59e2417956b86096))
+-   Re-render when the GitlabIds change ([3082892](https://github.com/immobiliare/backstage-plugin-gitlab/commit/308289257ce12b29a93a0f6dfab80fbb104caf8d))
+
+### Features
+
+-   backstage deps and caching ([55c2c44](https://github.com/immobiliare/backstage-plugin-gitlab/commit/55c2c44ae8b2ac11edc311a45125a865a1391ae8))
+
 ## [6.6.1](https://github.com/immobiliare/backstage-plugin-gitlab/compare/v6.6.0...v6.6.1) (2024-10-15)
 
 ### Bug Fixes

diff --git a/packages/gitlab/config.d.ts b/packages/gitlab/config.d.ts
@@ -20,5 +20,25 @@ export interface Config {
          * @visibility frontend
          */
         useOAuth?: boolean;
+
+        /**
+         * Cache configuration
+         * @visibility frontend
+         */
+        cache?: {
+            /**
+             * Enable caching for the Gitlab plugin
+             * @default false
+             * @visibility frontend
+             */
+            enabled?: boolean;
+
+            /**
+             * Cache TTL for the Gitlab plugin in seconds
+             * @default 300
+             * @visibility frontend
+             */
+            ttl?: number;
+        };
     };
 }
diff --git a/packages/gitlab/package.json b/packages/gitlab/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@immobiliarelabs/backstage-plugin-gitlab",
-    "version": "6.6.1",
+    "version": "6.8.0-alpha.1",
     "main": "dist/index.esm.js",
     "types": "dist/index.d.ts",
     "license": "Apache-2.0",
@@ -41,10 +41,10 @@
         "postpack": "backstage-cli package postpack"
     },
     "dependencies": {
-        "@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",
+        "@backstage/core-components": "^0.16.3",
+        "@backstage/core-plugin-api": "^1.10.3",
+        "@backstage/plugin-catalog-react": "^1.15.1",
+        "@backstage/theme": "^0.6.3",
         "@material-ui/core": "^4.12.2",
         "@material-ui/icons": "^4.9.1",
         "@material-ui/lab": "4.0.0-alpha.61",
@@ -65,11 +65,11 @@
         "react-router-dom": "6.0.0-beta.0 || ^6.20.0"
     },
     "devDependencies": {
-        "@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",
+        "@backstage/cli": "^0.29.5",
+        "@backstage/core-app-api": "^1.15.4",
+        "@backstage/dev-utils": "^1.1.6",
+        "@backstage/plugin-catalog-react": "^1.15.1",
+        "@backstage/test-utils": "^1.7.4",
         "@commitlint/cli": "^17.0.0",
         "@commitlint/config-conventional": "^17.0.0",
         "@gitbeaker/rest": "^40.0.2",