From bdec811fe1736d119040aa48664dbf09c120ca87 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Thu, 14 May 2020 11:34:21 +0200 Subject: [PATCH 1/3] packages/cli: update templates to use latest @types/jest version --- .../cli/templates/default-app/packages/app/package.json.hbs | 2 +- packages/cli/templates/default-plugin/package.json.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cli/templates/default-app/packages/app/package.json.hbs b/packages/cli/templates/default-app/packages/app/package.json.hbs index 5f4459f556..f8553f915e 100644 --- a/packages/cli/templates/default-app/packages/app/package.json.hbs +++ b/packages/cli/templates/default-app/packages/app/package.json.hbs @@ -19,7 +19,7 @@ "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", - "@types/jest": "^24.0.0", + "@types/jest": "^25.2.1", "@types/node": "^12.0.0", "@types/react-router-dom": "^5.1.3", "@types/testing-library__jest-dom": "^5.0.4", diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs index c4a72c6b06..a1a1929495 100644 --- a/packages/cli/templates/default-plugin/package.json.hbs +++ b/packages/cli/templates/default-plugin/package.json.hbs @@ -29,7 +29,7 @@ "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", - "@types/jest": "^24.0.0", + "@types/jest": "^25.2.1", "@types/node": "^12.0.0", "@types/testing-library__jest-dom": "^5.0.4", "jest-fetch-mock": "^3.0.3" From b4afc0bc9b36bf675d337a5bb010fb979a51b5c7 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Thu, 14 May 2020 11:36:15 +0200 Subject: [PATCH 2/3] package.json: add root lerna diff command --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 4f7eb2c5f5..f98ac41ad2 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "bundle": "yarn build && yarn workspace example-app bundle", "build": "lerna run build", "clean": "lerna run clean", + "diff": "lerna run diff --", "test": "yarn build && lerna run test --since origin/master -- --coverage", "test:all": "yarn build && lerna run test -- --coverage", "lint": "lerna run lint --since origin/master --", From 4fb230e48f1d851c587857b3bf85ea9bb40b06ff Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Thu, 14 May 2020 11:37:33 +0200 Subject: [PATCH 3/3] github/workflows: add check to make sure plugin templates stay in sync --- .github/workflows/frontend.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index f62f439119..c19583b653 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -56,6 +56,9 @@ jobs: - name: yarn install run: yarn install --frozen-lockfile + - name: verify plugin template + run: yarn lerna -- run diff -- --check + - name: lint run: yarn lerna -- run lint --since origin/master