-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
- Loading branch information
There are no files selected for viewing
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
diff --git a/backstage.json b/backstage.json | ||
index 3c355138..df7e7ff5 100644 | ||
--- a/backstage.json | ||
+++ b/backstage.json | ||
@@ -1,3 +1,3 @@ | ||
{ | ||
- "version": "1.31.4" | ||
+ "version": "1.33.5" | ||
} | ||
diff --git a/package.json b/package.json | ||
index 2f01c7c5..00d1ff57 100644 | ||
--- a/package.json | ||
+++ b/package.json | ||
@@ -5,3 +5,3 @@ | ||
"engines": { | ||
- "node": "18 || 20" | ||
+ "node": "20 || 22" | ||
}, | ||
diff --git a/packages/app/package.json b/packages/app/package.json | ||
index 72c2e57c..d36e3be1 100644 | ||
--- a/packages/app/package.json | ||
+++ b/packages/app/package.json | ||
@@ -42,3 +42,2 @@ | ||
"@material-ui/icons": "^4.9.1", | ||
- "history": "^5.0.0", | ||
"react": "^18.0.2", | ||
@@ -46,4 +45,3 @@ | ||
"react-router": "^6.3.0", | ||
- "react-router-dom": "^6.3.0", | ||
- "react-use": "^17.2.4" | ||
+ "react-router-dom": "^6.3.0" | ||
}, | ||
diff --git a/packages/backend/Dockerfile b/packages/backend/Dockerfile | ||
index 09024eb4..6a4c257a 100644 | ||
--- a/packages/backend/Dockerfile | ||
+++ b/packages/backend/Dockerfile | ||
@@ -47,3 +47,3 @@ ENV NODE_ENV=production | ||
# This disables node snapshot for Node 20 to work with the Scaffolder | ||
-ENV NODE_OPTIONS "--no-node-snapshot" | ||
+ENV NODE_OPTIONS="--no-node-snapshot" | ||
|
||
diff --git a/packages/backend/package.json b/packages/backend/package.json | ||
index c124c22c..016daaef 100644 | ||
--- a/packages/backend/package.json | ||
+++ b/packages/backend/package.json | ||
@@ -44,10 +44,6 @@ | ||
"node-gyp": "^10.0.0", | ||
- "pg": "^8.11.3", | ||
- "winston": "^3.2.1" | ||
+ "pg": "^8.11.3" | ||
}, | ||
"devDependencies": { | ||
- "@backstage/cli": "backstage:^", | ||
- "@types/express": "^4.17.6", | ||
- "@types/express-serve-static-core": "^4.17.5", | ||
- "@types/luxon": "^2.0.4" | ||
+ "@backstage/cli": "backstage:^" | ||
}, | ||
diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts | ||
index f57d4c5f..69a73511 100644 | ||
--- a/packages/backend/src/index.ts | ||
+++ b/packages/backend/src/index.ts | ||
@@ -12,6 +12,6 @@ const backend = createBackend(); | ||
|
||
-backend.add(import('@backstage/plugin-app-backend/alpha')); | ||
-backend.add(import('@backstage/plugin-proxy-backend/alpha')); | ||
-backend.add(import('@backstage/plugin-scaffolder-backend/alpha')); | ||
-backend.add(import('@backstage/plugin-techdocs-backend/alpha')); | ||
+backend.add(import('@backstage/plugin-app-backend')); | ||
+backend.add(import('@backstage/plugin-proxy-backend')); | ||
+backend.add(import('@backstage/plugin-scaffolder-backend')); | ||
+backend.add(import('@backstage/plugin-techdocs-backend')); | ||
|
||
@@ -24,3 +24,3 @@ backend.add(import('@backstage/plugin-auth-backend-module-guest-provider')); | ||
// catalog plugin | ||
-backend.add(import('@backstage/plugin-catalog-backend/alpha')); | ||
+backend.add(import('@backstage/plugin-catalog-backend')); | ||
backend.add( | ||
@@ -33,3 +33,3 @@ backend.add(import('@backstage/plugin-catalog-backend-module-logs')); | ||
// permission plugin | ||
-backend.add(import('@backstage/plugin-permission-backend/alpha')); | ||
+backend.add(import('@backstage/plugin-permission-backend')); | ||
// See https://backstage.io/docs/permissions/getting-started for how to create your own permission policy | ||
@@ -40,3 +40,3 @@ backend.add( | ||
// search plugin | ||
-backend.add(import('@backstage/plugin-search-backend/alpha')); | ||
+backend.add(import('@backstage/plugin-search-backend')); | ||
|
||
@@ -44,10 +44,10 @@ backend.add(import('@backstage/plugin-search-backend/alpha')); | ||
// See https://backstage.io/docs/features/search/search-engines | ||
-backend.add(import('@backstage/plugin-search-backend-module-pg/alpha')); | ||
+backend.add(import('@backstage/plugin-search-backend-module-pg')); | ||
|
||
// search collators | ||
-backend.add(import('@backstage/plugin-search-backend-module-catalog/alpha')); | ||
-backend.add(import('@backstage/plugin-search-backend-module-techdocs/alpha')); | ||
+backend.add(import('@backstage/plugin-search-backend-module-catalog')); | ||
+backend.add(import('@backstage/plugin-search-backend-module-techdocs')); | ||
|
||
// kubernetes | ||
-backend.add(import('@backstage/plugin-kubernetes-backend/alpha')); | ||
+backend.add(import('@backstage/plugin-kubernetes-backend')); | ||
|
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
diff --git a/backstage.json b/backstage.json | ||
index 6ee880e5..df7e7ff5 100644 | ||
--- a/backstage.json | ||
+++ b/backstage.json | ||
@@ -1,3 +1,3 @@ | ||
{ | ||
- "version": "1.34.0-next.0" | ||
+ "version": "1.33.5" | ||
} | ||
diff --git a/package.json b/package.json | ||
index b4dafa42..00d1ff57 100644 | ||
--- a/package.json | ||
+++ b/package.json | ||
@@ -36,2 +36,3 @@ | ||
"@playwright/test": "^1.32.3", | ||
+ "@spotify/prettier-config": "^12.0.0", | ||
"node-gyp": "^10.0.0", | ||
@@ -44,3 +45,3 @@ | ||
}, | ||
- "prettier": "@backstage/cli/config/prettier", | ||
+ "prettier": "@spotify/prettier-config", | ||
"lint-staged": { | ||
diff --git a/packages/backend/Dockerfile b/packages/backend/Dockerfile | ||
index 13ff70d9..6a4c257a 100644 | ||
--- a/packages/backend/Dockerfile | ||
+++ b/packages/backend/Dockerfile | ||
@@ -42,3 +42,2 @@ COPY --chown=node:node .yarn ./.yarn | ||
COPY --chown=node:node .yarnrc.yml ./ | ||
-COPY --chown=node:node backstage.json ./ | ||
|
||
diff --git a/yarn.lock b/yarn.lock | ||
deleted file mode 100644 | ||
index c37fc613..00000000 | ||
--- a/yarn.lock | ||
+++ /dev/null | ||
@@ -1,3 +0,0 @@ | ||
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. | ||
-# yarn lockfile v1 | ||
- |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,146 @@ | ||
diff --git a/backstage.json b/backstage.json | ||
index 6ee880e5..a64decd7 100644 | ||
--- a/backstage.json | ||
+++ b/backstage.json | ||
@@ -1,3 +1,3 @@ | ||
{ | ||
- "version": "1.34.0-next.0" | ||
+ "version": "1.33.0" | ||
} | ||
diff --git a/package.json b/package.json | ||
index efa9a26c..6a641160 100644 | ||
--- a/package.json | ||
+++ b/package.json | ||
@@ -33,5 +33,6 @@ | ||
"devDependencies": { | ||
- "@backstage/cli": "^0.29.3-next.0", | ||
+ "@backstage/cli": "^0.29.0", | ||
"@backstage/e2e-test-utils": "^0.1.1", | ||
"@playwright/test": "^1.32.3", | ||
+ "@spotify/prettier-config": "^12.0.0", | ||
"node-gyp": "^10.0.0", | ||
@@ -44,3 +45,3 @@ | ||
}, | ||
- "prettier": "@backstage/cli/config/prettier", | ||
+ "prettier": "@spotify/prettier-config", | ||
"lint-staged": { | ||
diff --git a/packages/app/package.json b/packages/app/package.json | ||
index c9787ea4..8a995e7f 100644 | ||
--- a/packages/app/package.json | ||
+++ b/packages/app/package.json | ||
@@ -16,26 +16,26 @@ | ||
"dependencies": { | ||
- "@backstage/app-defaults": "^1.5.15-next.0", | ||
+ "@backstage/app-defaults": "^1.5.13", | ||
"@backstage/catalog-model": "^1.7.1", | ||
- "@backstage/cli": "^0.29.3-next.0", | ||
- "@backstage/core-app-api": "^1.15.3-next.0", | ||
- "@backstage/core-components": "^0.16.2-next.0", | ||
+ "@backstage/cli": "^0.29.0", | ||
+ "@backstage/core-app-api": "^1.15.2", | ||
+ "@backstage/core-components": "^0.16.0", | ||
"@backstage/core-plugin-api": "^1.10.1", | ||
- "@backstage/integration-react": "^1.2.2-next.0", | ||
- "@backstage/plugin-api-docs": "^0.12.2-next.0", | ||
- "@backstage/plugin-catalog": "^1.25.2-next.0", | ||
+ "@backstage/integration-react": "^1.2.1", | ||
+ "@backstage/plugin-api-docs": "^0.12.0", | ||
+ "@backstage/plugin-catalog": "^1.25.0", | ||
"@backstage/plugin-catalog-common": "^1.1.1", | ||
- "@backstage/plugin-catalog-graph": "^0.4.14-next.0", | ||
- "@backstage/plugin-catalog-import": "^0.12.8-next.0", | ||
- "@backstage/plugin-catalog-react": "^1.14.3-next.0", | ||
- "@backstage/plugin-kubernetes": "^0.12.2-next.0", | ||
- "@backstage/plugin-org": "^0.6.34-next.0", | ||
+ "@backstage/plugin-catalog-graph": "^0.4.12", | ||
+ "@backstage/plugin-catalog-import": "^0.12.6", | ||
+ "@backstage/plugin-catalog-react": "^1.14.1", | ||
+ "@backstage/plugin-kubernetes": "^0.12.0", | ||
+ "@backstage/plugin-org": "^0.6.32", | ||
"@backstage/plugin-permission-react": "^0.4.28", | ||
- "@backstage/plugin-scaffolder": "^1.27.2-next.0", | ||
- "@backstage/plugin-search": "^1.4.21-next.0", | ||
- "@backstage/plugin-search-react": "^1.8.4-next.0", | ||
- "@backstage/plugin-techdocs": "^1.11.3-next.0", | ||
- "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.19-next.0", | ||
- "@backstage/plugin-techdocs-react": "^1.2.12-next.0", | ||
- "@backstage/plugin-user-settings": "^0.8.17-next.0", | ||
- "@backstage/theme": "^0.6.3-next.0", | ||
+ "@backstage/plugin-scaffolder": "^1.27.0", | ||
+ "@backstage/plugin-search": "^1.4.19", | ||
+ "@backstage/plugin-search-react": "^1.8.2", | ||
+ "@backstage/plugin-techdocs": "^1.11.1", | ||
+ "@backstage/plugin-techdocs-module-addons-contrib": "^1.1.17", | ||
+ "@backstage/plugin-techdocs-react": "^1.2.10", | ||
+ "@backstage/plugin-user-settings": "^0.8.15", | ||
+ "@backstage/theme": "^0.6.1", | ||
"@material-ui/core": "^4.12.2", | ||
@@ -48,3 +48,3 @@ | ||
"devDependencies": { | ||
- "@backstage/test-utils": "^1.7.3-next.0", | ||
+ "@backstage/test-utils": "^1.7.1", | ||
"@playwright/test": "^1.32.3", | ||
diff --git a/packages/backend/Dockerfile b/packages/backend/Dockerfile | ||
index 13ff70d9..6a4c257a 100644 | ||
--- a/packages/backend/Dockerfile | ||
+++ b/packages/backend/Dockerfile | ||
@@ -42,3 +42,2 @@ COPY --chown=node:node .yarn ./.yarn | ||
COPY --chown=node:node .yarnrc.yml ./ | ||
-COPY --chown=node:node backstage.json ./ | ||
|
||
diff --git a/packages/backend/package.json b/packages/backend/package.json | ||
index 0f403f1f..7cae7357 100644 | ||
--- a/packages/backend/package.json | ||
+++ b/packages/backend/package.json | ||
@@ -18,25 +18,25 @@ | ||
"dependencies": { | ||
- "@backstage/backend-defaults": "^0.6.0-next.0", | ||
+ "@backstage/backend-defaults": "^0.5.3", | ||
"@backstage/config": "^1.3.0", | ||
- "@backstage/plugin-app-backend": "^0.4.3-next.0", | ||
- "@backstage/plugin-auth-backend": "^0.24.1-next.0", | ||
- "@backstage/plugin-auth-backend-module-github-provider": "^0.2.3-next.0", | ||
- "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.3-next.0", | ||
- "@backstage/plugin-auth-node": "^0.5.5-next.0", | ||
- "@backstage/plugin-catalog-backend": "^1.28.1-next.0", | ||
- "@backstage/plugin-catalog-backend-module-logs": "^0.1.5-next.0", | ||
- "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.3-next.0", | ||
- "@backstage/plugin-kubernetes-backend": "^0.19.1-next.0", | ||
- "@backstage/plugin-permission-backend": "^0.5.52-next.0", | ||
- "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.3-next.0", | ||
+ "@backstage/plugin-app-backend": "^0.4.0", | ||
+ "@backstage/plugin-auth-backend": "^0.24.0", | ||
+ "@backstage/plugin-auth-backend-module-github-provider": "^0.2.2", | ||
+ "@backstage/plugin-auth-backend-module-guest-provider": "^0.2.2", | ||
+ "@backstage/plugin-auth-node": "^0.5.4", | ||
+ "@backstage/plugin-catalog-backend": "^1.28.0", | ||
+ "@backstage/plugin-catalog-backend-module-logs": "^0.1.4", | ||
+ "@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.2", | ||
+ "@backstage/plugin-kubernetes-backend": "^0.19.0", | ||
+ "@backstage/plugin-permission-backend": "^0.5.51", | ||
+ "@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.2", | ||
"@backstage/plugin-permission-common": "^0.8.2", | ||
- "@backstage/plugin-permission-node": "^0.8.6-next.0", | ||
- "@backstage/plugin-proxy-backend": "^0.5.9-next.0", | ||
- "@backstage/plugin-scaffolder-backend": "^1.28.0-next.0", | ||
- "@backstage/plugin-search-backend": "^1.7.1-next.0", | ||
- "@backstage/plugin-search-backend-module-catalog": "^0.2.6-next.0", | ||
- "@backstage/plugin-search-backend-module-pg": "^0.5.39-next.0", | ||
- "@backstage/plugin-search-backend-module-techdocs": "^0.3.4-next.0", | ||
- "@backstage/plugin-search-backend-node": "^1.3.6-next.0", | ||
- "@backstage/plugin-techdocs-backend": "^1.11.4-next.0", | ||
+ "@backstage/plugin-permission-node": "^0.8.5", | ||
+ "@backstage/plugin-proxy-backend": "^0.5.8", | ||
+ "@backstage/plugin-scaffolder-backend": "^1.27.0", | ||
+ "@backstage/plugin-search-backend": "^1.7.0", | ||
+ "@backstage/plugin-search-backend-module-catalog": "^0.2.5", | ||
+ "@backstage/plugin-search-backend-module-pg": "^0.5.38", | ||
+ "@backstage/plugin-search-backend-module-techdocs": "^0.3.2", | ||
+ "@backstage/plugin-search-backend-node": "^1.3.5", | ||
+ "@backstage/plugin-techdocs-backend": "^1.11.2", | ||
"app": "link:../app", | ||
@@ -47,3 +47,3 @@ | ||
"devDependencies": { | ||
- "@backstage/cli": "^0.29.3-next.0" | ||
+ "@backstage/cli": "^0.29.0" | ||
}, |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -64,5 +64,8 @@ | |
}, | ||
"1.31.4": { | ||
"createApp": "0.5.20" | ||
}, | ||
"1.33.5": { | ||
"createApp": "0.5.22" | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -730,5 +730,8 @@ | |
}, | ||
"1.31.4": { | ||
"createApp": "0.5.20" | ||
}, | ||
"1.33.5": { | ||
"createApp": "0.5.22" | ||
} | ||
} |