Skip to content

Commit 94bf33b

Browse files
committed
feat: bump Backstage version to 1.41.1
Signed-off-by: Shamil Ganiev <[email protected]>
1 parent 1f83bd7 commit 94bf33b

File tree

11 files changed

+1114
-863
lines changed

11 files changed

+1114
-863
lines changed

.changeset/thick-snakes-scream.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
'@platacard/backstage-plugin-scaffolder-backend-module-yaml-merge-actions': minor
3+
'@platacard/backstage-plugin-scaffolder-backend-module-json-merge-action': minor
4+
'backend': minor
5+
'app': minor
6+
---
7+
8+
Upgrade Backsrtage to 1.41.1 version
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* eslint-disable */
2+
//prettier-ignore
3+
module.exports = {
4+
name: "@yarnpkg/plugin-backstage",
5+
factory: function (require) {
6+
"use strict";var plugin=(()=>{var F=Object.create;var v=Object.defineProperty;var _=Object.getOwnPropertyDescriptor;var N=Object.getOwnPropertyNames;var G=Object.getPrototypeOf,I=Object.prototype.hasOwnProperty;var p=(e=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(e,{get:(t,r)=>(typeof require<"u"?require:t)[r]}):e)(function(e){if(typeof require<"u")return require.apply(this,arguments);throw Error('Dynamic require of "'+e+'" is not supported')});var J=(e,t)=>{for(var r in t)v(e,r,{get:t[r],enumerable:!0})},S=(e,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let o of N(t))!I.call(e,o)&&o!==r&&v(e,o,{get:()=>t[o],enumerable:!(n=_(t,o))||n.enumerable});return e};var L=(e,t,r)=>(r=e!=null?F(G(e)):{},S(t||!e||!e.__esModule?v(r,"default",{value:e,enumerable:!0}):r,e)),z=e=>S(v({},"__esModule",{value:!0}),e);var ae={};J(ae,{default:()=>se});var P=p("@yarnpkg/core");var w=p("@yarnpkg/core");var W=L(p("assert")),j=p("semver"),y=p("@yarnpkg/fslib");var u=L(p("fs")),g=p("path");function A(e,t){let r=e;for(let n=0;n<1e3;n++){let o=(0,g.resolve)(r,"package.json");if(u.default.existsSync(o)&&t(o))return r;let i=(0,g.dirname)(r);if(i===r)return;r=i}throw new Error(`Iteration limit reached when searching for root package.json at ${e}`)}function K(e){let t=A(e,()=>!0);if(!t)throw new Error(`No package.json found while searching for package root of ${e}`);return t}function Y(e){if(!u.default.existsSync((0,g.resolve)(e,"src")))throw new Error("Tried to access monorepo package root dir outside of Backstage repository");return(0,g.resolve)(e,"../..")}function b(e){let t=K(e),r=u.default.realpathSync(process.cwd()).replace(/^[a-z]:/,s=>s.toLocaleUpperCase("en-US")),n="",o=()=>(n||(n=Y(t)),n),a="",i=()=>(a||(a=A(r,s=>{try{let m=u.default.readFileSync(s,"utf8");return!!JSON.parse(m).workspaces}catch(m){throw new Error(`Failed to parse package.json file while searching for root, ${m}`)}})??r),a);return{ownDir:t,get ownRoot(){return o()},targetDir:r,get targetRoot(){return i()},resolveOwn:(...s)=>(0,g.resolve)(t,...s),resolveOwnRoot:(...s)=>(0,g.resolve)(o(),...s),resolveTarget:(...s)=>(0,g.resolve)(r,...s),resolveTargetRoot:(...s)=>(0,g.resolve)(i(),...s)}}var x="backstage.json";var V=e=>{let t=!1,r;return()=>(t||(r=e(),t=!0),r)};var h=p("@yarnpkg/fslib");var C=()=>h.npath.toPortablePath(b(h.npath.fromPortablePath(h.ppath.cwd())).targetRoot);var k=V(()=>{let e=y.ppath.join(C(),x),t=null;try{t=(0,j.valid)(y.xfs.readJsonSync(e).version),(0,W.default)(t!==null)}catch{throw new Error("Valid version string not found in backstage.json")}return t});var d=p("@yarnpkg/core");var q="https://versions.backstage.io",Q="https://raw.githubusercontent.com/backstage/versions/main";function X(e,t){return new Promise((r,n)=>{let o=setTimeout(()=>{t.aborted||r()},e);t.addEventListener("abort",()=>{clearTimeout(o),n(new Error("Aborted"))})})}async function Z(e,t,r){let n=new AbortController,o=new AbortController,a=e(n.signal).then(s=>(o.abort(),s)),i=X(r,o.signal).then(()=>t(o.signal)).then(s=>(n.abort(),s));return Promise.any([a,i]).catch(()=>a)}async function D(e){let t=encodeURIComponent(e.version),r=e.fetch??fetch,n=e.versionsBaseUrl??q,o=e.gitHubRawBaseUrl??Q,a=await Z(i=>r(`${n}/v1/releases/${t}/manifest.json`,{signal:i}),i=>r(`${o}/v1/releases/${t}/manifest.json`,{signal:i}),500);if(a.status===404)throw new Error(`No release found for ${e.version} version`);if(a.status!==200)throw new Error(`Unexpected response status ${a.status} when fetching release from ${a.url}.`);return a.json()}var c="backstage:";var f=async(e,t)=>{let r=d.structUtils.stringifyIdent(e),n=d.structUtils.parseRange(e.range);if(n.protocol!==c)throw new Error(`Unsupported version protocol in version range "${e.range}" for package ${r}`);if(n.selector!=="^")throw new Error(`Unexpected version selector "${n.selector}" for package ${r}`);let o=k(),i=(await D({version:o,fetch:async s=>{let m=await d.httpUtils.get(s,{configuration:t,jsonResponse:!0});return{status:200,url:s,json:()=>m}}})).packages.find(s=>s.name===r);if(!i)throw new Error(`Package ${r} not found in manifest for Backstage v${o}. This means the specified package is not included in this Backstage release. This may imply the package has been replaced with an alternative - please review the documentation for the package. If you need to continue using this package, it will be necessary to switch to manually managing its version.`);return i.version};var ee=e=>w.structUtils.parseRange(e).protocol===c,te=(e,t,r)=>e!=="dependencies"?e:r.manifest.ensureDependencyMeta(w.structUtils.makeDescriptor(t,"unknown")).optional?"optionalDependencies":e,B=async(e,t)=>{for(let r of["dependencies","devDependencies"]){let n=Array.from(e.manifest.getForScope(r).values()).filter(o=>o.range.startsWith(c));for(let o of n){let a=w.structUtils.stringifyIdent(o);if(w.structUtils.parseRange(o.range).selector!=="^")throw new Error(`Unexpected version range "${o.range}" for dependency on "${a}"`);let s=te(r,o,e);t[s][a]=`^${await f(o,e.project.configuration)}`}}if(["dependencies","devDependencies","optionalDependencies"].some(r=>Object.values(t[r]??{}).some(ee)))throw new Error(`Failed to replace all "backstage:" ranges in manifest for ${t.name}`)};var O=p("@yarnpkg/core");var $=async(e,t)=>{let r=O.structUtils.parseRange(e.range);if(r.protocol!==c)return e;if(r.selector!=="^")throw new Error(`Invalid backstage: version range found: ${e.range}`);return O.structUtils.bindDescriptor(e,{backstage:k(),npm:await f(e,t.configuration)})};var H=p("@yarnpkg/core");var U=async(e,t,r,n)=>{let o=H.structUtils.parseRange(r.range);if(r.scope==="backstage"&&o.protocol!==c){let a=r.range;try{r.range=`${c}^`,await f(r,e.project.configuration),console.info(`Setting ${r.scope}/${r.name} to ${c}^`)}catch{r.range=a}}};var M=p("@yarnpkg/core");var E=async(e,t,r,n)=>{let o=M.structUtils.parseRange(n.range);n.scope==="backstage"&&o.protocol!==c&&console.warn(`${n.name} should be set to "${c}^" instead of "${n.range}". Make sure this change is intentional and not a mistake.`)};var l=p("@yarnpkg/core"),T=p("@yarnpkg/plugin-npm");var R=class e{static protocol=c;supportsDescriptor=t=>t.range.startsWith(e.protocol);async getCandidates(t,r,n){let o=l.structUtils.parseRange(t.range).params?.npm;if(!o||Array.isArray(o))throw new Error(`Missing npm parameter on backstage: range "${t.range}"`);return new T.NpmSemverResolver().getCandidates(l.structUtils.makeDescriptor(t,`npm:^${o}`),r,n)}getResolutionDependencies(t){let r=l.structUtils.parseRange(t.range).params?.npm;if(!r)throw new Error(`Missing npm parameter on backstage: range "${t.range}".`);return{[l.structUtils.stringifyIdent(t)]:l.structUtils.makeDescriptor(t,`npm:^${r}`)}}async getSatisfying(t,r,n,o){let a=t,i=l.structUtils.parseRange(a.range);if(i.protocol===c){let s=i.params?.npm;a=l.structUtils.makeDescriptor(t,`npm:^${s}`)}return new T.NpmSemverResolver().getSatisfying(a,r,n,o)}bindDescriptor=t=>t;supportsLocator=()=>!1;shouldPersistResolution=()=>{throw new Error("Unreachable: BackstageNpmResolver should never persist resolution as it uses npm: protocol")};resolve=async()=>{throw new Error("Unreachable: BackstageNpmResolver should never resolve as it uses npm: protocol")}};var re="\x1B[31;1m",oe="\x1B[0m";P.semverUtils.satisfiesWithPrereleases(P.YarnVersion,"^4.1.1")||(console.error(),console.error(`${re}Unsupported yarn version${oe}: The Backstage yarn plugin only works with yarn ^4.1.1. Please upgrade yarn, or remove this plugin with "yarn plugin remove @yarnpkg/plugin-backstage".`),console.error());var ne={hooks:{afterWorkspaceDependencyAddition:U,afterWorkspaceDependencyReplacement:E,reduceDependency:$,beforeWorkspacePacking:B},resolvers:[R]},se=ne;return z(ae);})();
7+
return plugin;
8+
}
9+
};

.yarnrc.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
nodeLinker: node-modules
22

3+
plugins:
4+
- checksum: 8af7b3f2d7d19cacc7a3712f871efcb6208ba283a1f532260b0cba80c2cb66ed772b207b5ba41b8c5d64dd8d5e0c0e15bbb445bd14afac491712965211ba027c
5+
path: .yarn/plugins/@yarnpkg/plugin-backstage.cjs
6+
spec: "https://versions.backstage.io/v1/releases/1.41.1/yarn-plugin"
7+
38
yarnPath: .yarn/releases/yarn-4.4.1.cjs

backstage.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "1.40.2"
2+
"version": "1.41.1"
33
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
]
3131
},
3232
"devDependencies": {
33-
"@backstage/cli": "^0.33.0",
34-
"@backstage/e2e-test-utils": "^0.1.1",
33+
"@backstage/cli": "backstage:^",
34+
"@backstage/e2e-test-utils": "backstage:^",
3535
"@changesets/cli": "^2.29.5",
3636
"@playwright/test": "^1.32.3",
3737
"node-gyp": "^10.0.0",

packages/app/package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@
1414
"lint": "backstage-cli package lint"
1515
},
1616
"dependencies": {
17-
"@backstage/app-defaults": "^1.6.3",
18-
"@backstage/canon": "^0.5.0",
19-
"@backstage/catalog-model": "^1.7.4",
20-
"@backstage/cli": "^0.33.0",
21-
"@backstage/core-app-api": "^1.17.1",
22-
"@backstage/core-components": "^0.17.3",
23-
"@backstage/core-plugin-api": "^1.10.8",
24-
"@backstage/integration-react": "^1.2.8",
25-
"@backstage/plugin-api-docs": "^0.12.8",
26-
"@backstage/plugin-catalog": "^1.31.0",
27-
"@backstage/plugin-catalog-common": "^1.1.4",
28-
"@backstage/plugin-catalog-graph": "^0.4.20",
29-
"@backstage/plugin-catalog-import": "^0.13.2",
30-
"@backstage/plugin-catalog-react": "^1.19.0",
31-
"@backstage/plugin-kubernetes": "^0.12.8",
32-
"@backstage/plugin-org": "^0.6.40",
33-
"@backstage/plugin-permission-react": "^0.4.35",
34-
"@backstage/plugin-scaffolder": "^1.32.0",
35-
"@backstage/plugin-search": "^1.4.27",
36-
"@backstage/plugin-search-react": "^1.9.1",
37-
"@backstage/plugin-techdocs": "^1.13.1",
38-
"@backstage/plugin-techdocs-module-addons-contrib": "^1.1.25",
39-
"@backstage/plugin-techdocs-react": "^1.3.0",
40-
"@backstage/plugin-user-settings": "^0.8.23",
41-
"@backstage/theme": "^0.6.6",
17+
"@backstage/app-defaults": "backstage:^",
18+
"@backstage/catalog-model": "backstage:^",
19+
"@backstage/cli": "backstage:^",
20+
"@backstage/core-app-api": "backstage:^",
21+
"@backstage/core-components": "backstage:^",
22+
"@backstage/core-plugin-api": "backstage:^",
23+
"@backstage/integration-react": "backstage:^",
24+
"@backstage/plugin-api-docs": "backstage:^",
25+
"@backstage/plugin-catalog": "backstage:^",
26+
"@backstage/plugin-catalog-common": "backstage:^",
27+
"@backstage/plugin-catalog-graph": "backstage:^",
28+
"@backstage/plugin-catalog-import": "backstage:^",
29+
"@backstage/plugin-catalog-react": "backstage:^",
30+
"@backstage/plugin-kubernetes": "backstage:^",
31+
"@backstage/plugin-org": "backstage:^",
32+
"@backstage/plugin-permission-react": "backstage:^",
33+
"@backstage/plugin-scaffolder": "backstage:^",
34+
"@backstage/plugin-search": "backstage:^",
35+
"@backstage/plugin-search-react": "backstage:^",
36+
"@backstage/plugin-techdocs": "backstage:^",
37+
"@backstage/plugin-techdocs-module-addons-contrib": "backstage:^",
38+
"@backstage/plugin-techdocs-react": "backstage:^",
39+
"@backstage/plugin-user-settings": "backstage:^",
40+
"@backstage/theme": "backstage:^",
41+
"@backstage/ui": "backstage:^",
4242
"@material-ui/core": "^4.12.2",
4343
"@material-ui/icons": "^4.9.1",
4444
"react": "^18.0.2",
@@ -47,7 +47,7 @@
4747
"react-router-dom": "^6.3.0"
4848
},
4949
"devDependencies": {
50-
"@backstage/test-utils": "^1.7.9",
50+
"@backstage/test-utils": "backstage:^",
5151
"@playwright/test": "^1.32.3",
5252
"@testing-library/dom": "^10.0.0",
5353
"@testing-library/jest-dom": "^6.0.0",

packages/app/src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import '@backstage/cli/asset-types';
22
import ReactDOM from 'react-dom/client';
33
import App from './App';
4-
import '@backstage/canon/css/styles.css';
4+
import '@backstage/ui/css/styles.css';
55

66
ReactDOM.createRoot(document.getElementById('root')!).render(<App />);

packages/backend/package.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,37 @@
1616
"build-image": "docker build ../.. -f Dockerfile --tag backstage"
1717
},
1818
"dependencies": {
19-
"@backstage/backend-defaults": "^0.11.0",
20-
"@backstage/config": "^1.3.2",
21-
"@backstage/plugin-app-backend": "^0.5.3",
22-
"@backstage/plugin-auth-backend": "^0.25.1",
23-
"@backstage/plugin-auth-backend-module-github-provider": "^0.3.4",
24-
"@backstage/plugin-auth-backend-module-guest-provider": "^0.2.9",
25-
"@backstage/plugin-auth-node": "^0.6.4",
26-
"@backstage/plugin-catalog-backend": "^2.1.0",
27-
"@backstage/plugin-catalog-backend-module-logs": "^0.1.11",
28-
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "^0.2.9",
29-
"@backstage/plugin-kubernetes-backend": "^0.19.7",
30-
"@backstage/plugin-permission-backend": "^0.7.1",
31-
"@backstage/plugin-permission-backend-module-allow-all-policy": "^0.2.9",
32-
"@backstage/plugin-permission-common": "^0.9.0",
33-
"@backstage/plugin-permission-node": "^0.10.1",
34-
"@backstage/plugin-proxy-backend": "^0.6.3",
35-
"@backstage/plugin-scaffolder-backend": "^2.0.0",
36-
"@backstage/plugin-scaffolder-backend-module-github": "^0.8.0",
37-
"@backstage/plugin-search-backend": "^2.0.3",
38-
"@backstage/plugin-search-backend-module-catalog": "^0.3.5",
39-
"@backstage/plugin-search-backend-module-pg": "^0.5.45",
40-
"@backstage/plugin-search-backend-module-techdocs": "^0.4.3",
41-
"@backstage/plugin-search-backend-node": "^1.3.12",
42-
"@backstage/plugin-techdocs-backend": "^2.0.3",
19+
"@backstage/backend-defaults": "backstage:^",
20+
"@backstage/config": "backstage:^",
21+
"@backstage/plugin-app-backend": "backstage:^",
22+
"@backstage/plugin-auth-backend": "backstage:^",
23+
"@backstage/plugin-auth-backend-module-github-provider": "backstage:^",
24+
"@backstage/plugin-auth-backend-module-guest-provider": "backstage:^",
25+
"@backstage/plugin-auth-node": "backstage:^",
26+
"@backstage/plugin-catalog-backend": "backstage:^",
27+
"@backstage/plugin-catalog-backend-module-logs": "backstage:^",
28+
"@backstage/plugin-catalog-backend-module-scaffolder-entity-model": "backstage:^",
29+
"@backstage/plugin-kubernetes-backend": "backstage:^",
30+
"@backstage/plugin-permission-backend": "backstage:^",
31+
"@backstage/plugin-permission-backend-module-allow-all-policy": "backstage:^",
32+
"@backstage/plugin-permission-common": "backstage:^",
33+
"@backstage/plugin-permission-node": "backstage:^",
34+
"@backstage/plugin-proxy-backend": "backstage:^",
35+
"@backstage/plugin-scaffolder-backend": "backstage:^",
36+
"@backstage/plugin-scaffolder-backend-module-github": "backstage:^",
37+
"@backstage/plugin-search-backend": "backstage:^",
38+
"@backstage/plugin-search-backend-module-catalog": "backstage:^",
39+
"@backstage/plugin-search-backend-module-pg": "backstage:^",
40+
"@backstage/plugin-search-backend-module-techdocs": "backstage:^",
41+
"@backstage/plugin-search-backend-node": "backstage:^",
42+
"@backstage/plugin-techdocs-backend": "backstage:^",
4343
"app": "link:../app",
4444
"better-sqlite3": "^9.0.0",
4545
"node-gyp": "^10.0.0",
4646
"pg": "^8.11.3"
4747
},
4848
"devDependencies": {
49-
"@backstage/cli": "^0.33.0"
49+
"@backstage/cli": "backstage:^"
5050
},
5151
"files": [
5252
"dist"

plugins/scaffolder-backend-module-json-merge-action/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
"postpack": "backstage-cli package postpack"
2626
},
2727
"dependencies": {
28-
"@backstage/backend-plugin-api": "^1.4.0",
29-
"@backstage/plugin-scaffolder-node": "^0.9.0",
28+
"@backstage/backend-plugin-api": "backstage:^",
29+
"@backstage/plugin-scaffolder-node": "backstage:^",
3030
"json-merger": "^1.1.10"
3131
},
3232
"devDependencies": {
33-
"@backstage/backend-test-utils": "^1.6.0",
34-
"@backstage/cli": "^0.33.0"
33+
"@backstage/backend-test-utils": "backstage:^",
34+
"@backstage/cli": "backstage:^"
3535
},
3636
"files": [
3737
"dist"

plugins/scaffolder-backend-module-yaml-merge-actions/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
"postpack": "backstage-cli package postpack"
2626
},
2727
"dependencies": {
28-
"@backstage/backend-plugin-api": "^1.4.0",
29-
"@backstage/plugin-scaffolder-node": "^0.9.0",
28+
"@backstage/backend-plugin-api": "backstage:^",
29+
"@backstage/plugin-scaffolder-node": "backstage:^",
3030
"fs-extra": "^11.2.0",
3131
"yaml": "^2.5.1"
3232
},
3333
"devDependencies": {
34-
"@backstage/backend-test-utils": "^1.6.0",
35-
"@backstage/cli": "^0.33.0",
34+
"@backstage/backend-test-utils": "backstage:^",
35+
"@backstage/cli": "backstage:^",
3636
"@types/fs-extra": "^11.0.4"
3737
},
3838
"files": [

0 commit comments

Comments
 (0)