From e05e0f021bc71b7a09ce67019331b0d3cf708146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Thu, 22 Sep 2022 09:34:59 +0200 Subject: [PATCH] align some versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .changeset/curvy-kiwis-fold.md | 5 +++ .changeset/old-cobras-suffer.md | 6 ++++ .../default-app/packages/app/package.json.hbs | 32 +++++++++---------- packages/e2e-test/package.json | 3 +- packages/test-utils/package.json | 2 +- plugins/cicd-statistics/package.json | 2 +- yarn.lock | 5 +-- 7 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 .changeset/curvy-kiwis-fold.md create mode 100644 .changeset/old-cobras-suffer.md diff --git a/.changeset/curvy-kiwis-fold.md b/.changeset/curvy-kiwis-fold.md new file mode 100644 index 0000000000..8d94f38343 --- /dev/null +++ b/.changeset/curvy-kiwis-fold.md @@ -0,0 +1,5 @@ +--- +'@backstage/create-app': patch +--- + +Update versions of packages used in the create-app template, to match those in the main repo diff --git a/.changeset/old-cobras-suffer.md b/.changeset/old-cobras-suffer.md new file mode 100644 index 0000000000..2891c29133 --- /dev/null +++ b/.changeset/old-cobras-suffer.md @@ -0,0 +1,6 @@ +--- +'@backstage/test-utils': patch +'@backstage/plugin-cicd-statistics': patch +--- + +Align on the version of `@material-ui/icons` used, to `^4.9.1` like other packages in the main repo 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 d6a5086215..c060cb330c 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 @@ -6,6 +6,17 @@ "backstage": { "role": "frontend" }, + "scripts": { + "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", + "cy:dev": "cypress open", + "cy:run": "cypress run --browser chrome" + }, "dependencies": { "@backstage/app-defaults": "^{{version '@backstage/app-defaults'}}", "@backstage/catalog-model": "^{{version '@backstage/catalog-model'}}", @@ -37,33 +48,22 @@ "history": "^5.0.0", "react": "^17.0.2", "react-dom": "^17.0.2", - "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", - "react-use": "^15.3.3" + "react-router": "^6.3.0", + "react-router-dom": "^6.3.0", + "react-use": "^17.2.4" }, "devDependencies": { "@backstage/test-utils": "^{{version '@backstage/test-utils'}}", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^12.1.3", - "@testing-library/user-event": "^12.0.7", - "@types/node": "^14.14.32", + "@testing-library/user-event": "^14.0.0", + "@types/node": "^16.11.26", "@types/react-dom": "*", "cross-env": "^7.0.0", "cypress": "^9.7.0", "eslint-plugin-cypress": "^2.10.3", "start-server-and-test": "^1.10.11" }, - "scripts": { - "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", - "cy:dev": "cypress open", - "cy:run": "cypress run --browser chrome" - }, "browserslist": { "production": [ ">0.2%", diff --git a/packages/e2e-test/package.json b/packages/e2e-test/package.json index 372e2c0f05..374eaa6d18 100644 --- a/packages/e2e-test/package.json +++ b/packages/e2e-test/package.json @@ -18,7 +18,7 @@ "license": "Apache-2.0", "main": "src/index.ts", "scripts": { - "start": "nodemon --", + "start": "yarn nodemon --", "lint": "backstage-cli package lint", "test": "backstage-cli package test", "test:e2e": "yarn start", @@ -38,6 +38,7 @@ "cross-fetch": "^3.1.5", "fs-extra": "10.1.0", "handlebars": "^4.7.3", + "nodemon": "^2.0.2", "pgtools": "^0.3.0", "puppeteer": "^17.0.0", "tree-kill": "^1.2.2", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 4eba4e93fd..90f966ad97 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -40,7 +40,7 @@ "@backstage/theme": "workspace:^", "@backstage/types": "workspace:^", "@material-ui/core": "^4.12.2", - "@material-ui/icons": "^4.11.2", + "@material-ui/icons": "^4.9.1", "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^12.1.3", "@testing-library/user-event": "^14.0.0", diff --git a/plugins/cicd-statistics/package.json b/plugins/cicd-statistics/package.json index b4c1e7bb15..1e1a7f95ad 100644 --- a/plugins/cicd-statistics/package.json +++ b/plugins/cicd-statistics/package.json @@ -42,7 +42,7 @@ "@backstage/plugin-catalog-react": "workspace:^", "@date-io/luxon": "^1.3.13", "@material-ui/core": "^4.9.13", - "@material-ui/icons": "^4.11.2", + "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "@material-ui/pickers": "^3.3.10", "already": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index bc0ca4bb6f..84738367eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4778,7 +4778,7 @@ __metadata: "@backstage/plugin-catalog-react": "workspace:^" "@date-io/luxon": ^1.3.13 "@material-ui/core": ^4.9.13 - "@material-ui/icons": ^4.11.2 + "@material-ui/icons": ^4.9.1 "@material-ui/lab": 4.0.0-alpha.57 "@material-ui/pickers": ^3.3.10 "@types/luxon": ^3.0.0 @@ -7415,7 +7415,7 @@ __metadata: "@backstage/theme": "workspace:^" "@backstage/types": "workspace:^" "@material-ui/core": ^4.12.2 - "@material-ui/icons": ^4.11.2 + "@material-ui/icons": ^4.9.1 "@testing-library/jest-dom": ^5.10.1 "@testing-library/react": ^12.1.3 "@testing-library/user-event": ^14.0.0 @@ -20200,6 +20200,7 @@ __metadata: cross-fetch: ^3.1.5 fs-extra: 10.1.0 handlebars: ^4.7.3 + nodemon: ^2.0.2 pgtools: ^0.3.0 puppeteer: ^17.0.0 tree-kill: ^1.2.2