From 9070643627af4ba5bd9bed5413e0c6bdbbf9baf1 Mon Sep 17 00:00:00 2001 From: feng Date: Sat, 23 Apr 2022 13:23:01 +0800 Subject: [PATCH 1/5] yarn dedupe --- .github/workflows/nodejs.yml | 7 ++++--- yarn.lock | 18 +++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index ec67774a5153..6fab04689f0c 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -83,7 +83,7 @@ jobs: run: yarn check-copyright-headers yarn-validate: - name: Validate Yarn constraints + name: Validate Yarn dependencies and constraints runs-on: ubuntu-latest needs: prepare-yarn-cache steps: @@ -93,8 +93,9 @@ jobs: node-version: lts/* cache: yarn - name: 'Check for unmet constraints (fix w/ "yarn constraints --fix")' - run: | - yarn constraints + run: yarn constraints + - name: 'Check for duplicate dependencies (fix w/ "yarn dedupe")' + run: yarn dedupe --check test: name: Node v${{ matrix.node-version }} on ${{ matrix.os }} (${{ matrix.shard }}) diff --git a/yarn.lock b/yarn.lock index b8e834791f83..a4dc5416f2ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5203,10 +5203,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:~12.12.0": - version: 12.12.70 - resolution: "@types/node@npm:12.12.70" - checksum: 69c193e0bce8fa914d478f829bd923ee662b220e069a2e00ffbe109f27d0b38fbf2a9fe78c99eb4d4ccb294248ff8de68019a2c7fadb032d301c6feca25f3d22 +"@types/node@npm:*, @types/node@npm:^17.0.5": + version: 17.0.23 + resolution: "@types/node@npm:17.0.23" + checksum: a3517554737cbb042e76c30d0e5482192ac4d9bea0eeb086e2622d9cabf460a0eb52a696b99fcd18e7fcc93c96db6cc7ae507f6608f256ef0b5c1d8c87a5a470 languageName: node linkType: hard @@ -5217,10 +5217,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^17.0.5": - version: 17.0.23 - resolution: "@types/node@npm:17.0.23" - checksum: a3517554737cbb042e76c30d0e5482192ac4d9bea0eeb086e2622d9cabf460a0eb52a696b99fcd18e7fcc93c96db6cc7ae507f6608f256ef0b5c1d8c87a5a470 +"@types/node@npm:~12.12.0": + version: 12.12.70 + resolution: "@types/node@npm:12.12.70" + checksum: 69c193e0bce8fa914d478f829bd923ee662b220e069a2e00ffbe109f27d0b38fbf2a9fe78c99eb4d4ccb294248ff8de68019a2c7fadb032d301c6feca25f3d22 languageName: node linkType: hard @@ -20304,7 +20304,7 @@ __metadata: languageName: node linkType: hard -"source-map-support@npm:^0.5.16, source-map-support@npm:~0.5.20": +"source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.20": version: 0.5.21 resolution: "source-map-support@npm:0.5.21" dependencies: From 41b76262005c5aa72f080ae9152ad8c27496b054 Mon Sep 17 00:00:00 2001 From: feng Date: Sat, 23 Apr 2022 19:35:54 +0800 Subject: [PATCH 2/5] @types/node resolution --- package.json | 3 ++- yarn.lock | 14 -------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index af4d8269e3d9..e08ac73b5c97 100644 --- a/package.json +++ b/package.json @@ -166,7 +166,8 @@ "babel-jest": "workspace:*", "jest": "workspace:*", "jest-environment-node": "workspace:*", - "react-native@0.68.1": "patch:react-native@npm:0.68.1#.yarn/patches/react-native-npm-0.68.1-8830b7be0d.patch" + "react-native@0.68.1": "patch:react-native@npm:0.68.1#.yarn/patches/react-native-npm-0.68.1-8830b7be0d.patch", + "@types/node": "~12.12.0" }, "packageManager": "yarn@3.2.0" } diff --git a/yarn.lock b/yarn.lock index a4dc5416f2ba..1c0d7a70514e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5203,20 +5203,6 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^17.0.5": - version: 17.0.23 - resolution: "@types/node@npm:17.0.23" - checksum: a3517554737cbb042e76c30d0e5482192ac4d9bea0eeb086e2622d9cabf460a0eb52a696b99fcd18e7fcc93c96db6cc7ae507f6608f256ef0b5c1d8c87a5a470 - languageName: node - linkType: hard - -"@types/node@npm:12.20.24": - version: 12.20.24 - resolution: "@types/node@npm:12.20.24" - checksum: e7a13460e2f5b0b5a32c0f3af7daf1a05201552a66d542d3cc3b1ea8b52d4730250f9eb1961d755e31cfe5d03c78340911a6242657a0a9a17d6f7e341fc9f366 - languageName: node - linkType: hard - "@types/node@npm:~12.12.0": version: 12.12.70 resolution: "@types/node@npm:12.12.70" From df60346863be6f0095ec9fa2ec60e77f94a6d7f1 Mon Sep 17 00:00:00 2001 From: feng Date: Sat, 23 Apr 2022 20:00:50 +0800 Subject: [PATCH 3/5] update lock --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 1c0d7a70514e..f6617c129033 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20290,7 +20290,7 @@ __metadata: languageName: node linkType: hard -"source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.6, source-map-support@npm:~0.5.20": +"source-map-support@npm:^0.5.16, source-map-support@npm:~0.5.20": version: 0.5.21 resolution: "source-map-support@npm:0.5.21" dependencies: From 2a22dfc9db6a3d599bfeda7112d11d3051bd6dda Mon Sep 17 00:00:00 2001 From: feng Date: Sat, 23 Apr 2022 20:13:34 +0800 Subject: [PATCH 4/5] rerun ci From a531b7cf167037a93ad2894d6ede33d06580f594 Mon Sep 17 00:00:00 2001 From: feng Date: Sat, 23 Apr 2022 21:24:03 +0800 Subject: [PATCH 5/5] adjust order --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e08ac73b5c97..83c5cebf727c 100644 --- a/package.json +++ b/package.json @@ -163,11 +163,11 @@ "node": "^12.13.0 || ^14.15.0 || ^16.13.0 || >=17.0.0" }, "resolutions": { + "@types/node": "~12.12.0", "babel-jest": "workspace:*", "jest": "workspace:*", "jest-environment-node": "workspace:*", - "react-native@0.68.1": "patch:react-native@npm:0.68.1#.yarn/patches/react-native-npm-0.68.1-8830b7be0d.patch", - "@types/node": "~12.12.0" + "react-native@0.68.1": "patch:react-native@npm:0.68.1#.yarn/patches/react-native-npm-0.68.1-8830b7be0d.patch" }, "packageManager": "yarn@3.2.0" }