From bde30664c40b391c3918b37521e50acc01b3745a Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Tue, 8 Mar 2022 15:22:43 +0100 Subject: [PATCH] create-app: migrated to use package roles Signed-off-by: Patrik Oldsberg --- .changeset/twenty-birds-think.md | 19 +++++++++++++++++++ packages/app/package.json | 2 +- packages/backend/package.json | 4 ++-- .../templates/default-app/package.json.hbs | 6 +++--- .../default-app/packages/app/.eslintrc.js | 4 +--- .../default-app/packages/app/package.json.hbs | 13 ++++++++----- .../default-app/packages/backend/.eslintrc.js | 4 +--- .../packages/backend/package.json.hbs | 13 ++++++++----- 8 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 .changeset/twenty-birds-think.md diff --git a/.changeset/twenty-birds-think.md b/.changeset/twenty-birds-think.md new file mode 100644 index 0000000000..5b1f9481c0 --- /dev/null +++ b/.changeset/twenty-birds-think.md @@ -0,0 +1,19 @@ +--- +'@backstage/create-app': patch +--- + +Updated template to use package roles. To apply this change to an existing app, check out the [migration guide](https://backstage.io/docs/tutorials/package-role-migration). + +Specifically the following scripts in the root `package.json` have also been updated: + +```diff +- "build": "lerna run build", ++ "build": "backstage-cli repo build --all", + +... + +- "lint": "lerna run lint --since origin/master --", +- "lint:all": "lerna run lint --", ++ "lint": "backstage-cli repo lint --since origin/master", ++ "lint:all": "backstage-cli repo lint", +``` diff --git a/packages/app/package.json b/packages/app/package.json index 45cde6df52..5ae2a1dd08 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -96,9 +96,9 @@ "build": "backstage-cli package build", "clean": "backstage-cli package clean", "test": "backstage-cli package test", + "lint": "backstage-cli package lint", "test:e2e": "start-server-and-test start http://localhost:3000 cy:dev", "test:e2e:ci": "start-server-and-test start http://localhost:3000 cy:run", - "lint": "backstage-cli package lint", "cy:dev": "cypress open", "cy:run": "cypress run" }, diff --git a/packages/backend/package.json b/packages/backend/package.json index b49882b837..dc07124910 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -18,12 +18,12 @@ "backstage" ], "scripts": { - "build": "backstage-cli package build", - "build-image": "docker build ../.. -f Dockerfile --tag example-backend", "start": "backstage-cli package start", + "build": "backstage-cli package build", "lint": "backstage-cli package lint", "test": "backstage-cli package test", "clean": "backstage-cli package clean", + "build-image": "docker build ../.. -f Dockerfile --tag example-backend", "migrate:create": "knex migrate:make -x ts" }, "dependencies": { diff --git a/packages/create-app/templates/default-app/package.json.hbs b/packages/create-app/templates/default-app/package.json.hbs index e7c39add25..884eaf23cf 100644 --- a/packages/create-app/templates/default-app/package.json.hbs +++ b/packages/create-app/templates/default-app/package.json.hbs @@ -9,7 +9,7 @@ "dev": "concurrently \"yarn start\" \"yarn start-backend\"", "start": "yarn workspace app start", "start-backend": "yarn workspace backend start", - "build": "lerna run build", + "build": "backstage-cli repo build --all", "build-image": "yarn workspace backend build-image", "tsc": "tsc", "tsc:full": "tsc --skipLibCheck false --incremental false", @@ -17,8 +17,8 @@ "diff": "lerna run diff --", "test": "backstage-cli test", "test:all": "lerna run test -- --coverage", - "lint": "lerna run lint --since origin/master --", - "lint:all": "lerna run lint --", + "lint": "backstage-cli repo lint --since origin/master", + "lint:all": "backstage-cli repo lint", "prettier:check": "prettier --check .", "create-plugin": "backstage-cli create-plugin --scope internal", "remove-plugin": "backstage-cli remove-plugin" diff --git a/packages/create-app/templates/default-app/packages/app/.eslintrc.js b/packages/create-app/templates/default-app/packages/app/.eslintrc.js index 13573efa9c..e2a53a6ad2 100644 --- a/packages/create-app/templates/default-app/packages/app/.eslintrc.js +++ b/packages/create-app/templates/default-app/packages/app/.eslintrc.js @@ -1,3 +1 @@ -module.exports = { - extends: [require.resolve('@backstage/cli/config/eslint')], -}; +module.exports = require('@backstage/cli/config/eslint-factory')(__dirname); diff --git a/packages/create-app/templates/default-app/packages/app/package.json.hbs b/packages/create-app/templates/default-app/packages/app/package.json.hbs index 53e0590db4..71d2ac9b3b 100644 --- a/packages/create-app/templates/default-app/packages/app/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/app/package.json.hbs @@ -3,6 +3,9 @@ "version": "0.0.0", "private": true, "bundled": true, + "backstage": { + "role": "frontend" + }, "dependencies": { "@backstage/app-defaults": "^{{version '@backstage/app-defaults'}}", "@backstage/catalog-model": "^{{version '@backstage/catalog-model'}}", @@ -49,13 +52,13 @@ "start-server-and-test": "^1.10.11" }, "scripts": { - "start": "backstage-cli app:serve", - "build": "backstage-cli app:build", - "clean": "backstage-cli clean", - "test": "backstage-cli test", + "start": "backstage-cli package start", + "build": "backstage-cli package build", + "clean": "backstage-cli package clean", + "test": "backstage-cli package test", + "lint": "backstage-cli package lint", "test:e2e": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:dev", "test:e2e:ci": "cross-env PORT=3001 start-server-and-test start http://localhost:3001 cy:run", - "lint": "backstage-cli lint", "cy:dev": "cypress open", "cy:run": "cypress run" }, diff --git a/packages/create-app/templates/default-app/packages/backend/.eslintrc.js b/packages/create-app/templates/default-app/packages/backend/.eslintrc.js index 16a033dbc6..e2a53a6ad2 100644 --- a/packages/create-app/templates/default-app/packages/backend/.eslintrc.js +++ b/packages/create-app/templates/default-app/packages/backend/.eslintrc.js @@ -1,3 +1 @@ -module.exports = { - extends: [require.resolve('@backstage/cli/config/eslint.backend')], -}; +module.exports = require('@backstage/cli/config/eslint-factory')(__dirname); diff --git a/packages/create-app/templates/default-app/packages/backend/package.json.hbs b/packages/create-app/templates/default-app/packages/backend/package.json.hbs index feba5169ba..79d6772d7e 100644 --- a/packages/create-app/templates/default-app/packages/backend/package.json.hbs +++ b/packages/create-app/templates/default-app/packages/backend/package.json.hbs @@ -4,13 +4,16 @@ "main": "dist/index.cjs.js", "types": "src/index.ts", "private": true, + "backstage": { + "role": "backend" + }, "scripts": { - "build": "backstage-cli backend:bundle", + "start": "backstage-cli package start", + "build": "backstage-cli package build", + "lint": "backstage-cli package lint", + "test": "backstage-cli package test", + "clean": "backstage-cli package clean", "build-image": "docker build ../.. -f Dockerfile --tag backstage", - "start": "backstage-cli backend:dev", - "lint": "backstage-cli lint", - "test": "backstage-cli test", - "clean": "backstage-cli clean", "migrate:create": "knex migrate:make -x ts" }, "dependencies": {