From 6c6eff7fa6453dadd3317dfdea685fe6f971d23f Mon Sep 17 00:00:00 2001 From: Jason Jean Date: Fri, 4 Nov 2022 06:49:08 -0400 Subject: [PATCH] fix(core): update yargs to ^17.6.2 (#12978) --- package.json | 4 +-- packages/add-nx-to-monorepo/package.json | 2 +- packages/cra-to-nx/package.json | 2 +- packages/create-nx-plugin/package.json | 2 +- packages/create-nx-workspace/package.json | 2 +- packages/make-angular-cli-faster/package.json | 4 +-- packages/nx/package.json | 4 +-- .../nx/src/utils/lock-file/lock-file.spec.ts | 25 +++++++++++++++++++ packages/nx/src/utils/lock-file/yarn.ts | 1 + packages/workspace/package.json | 4 +-- yarn.lock | 15 ++++++++++- 11 files changed, 52 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 64f35fd0e9728..86dce82e2a2fa 100644 --- a/package.json +++ b/package.json @@ -246,8 +246,8 @@ "webpack-sources": "^3.2.3", "webpack-subresource-integrity": "^5.1.0", "xstate": "^4.25.0", - "yargs": "^17.4.0", - "yargs-parser": "21.0.1" + "yargs": "^17.6.2", + "yargs-parser": "21.1.1" }, "author": "Victor Savkin", "license": "MIT", diff --git a/packages/add-nx-to-monorepo/package.json b/packages/add-nx-to-monorepo/package.json index 0d958c89cd141..002ad9254572b 100644 --- a/packages/add-nx-to-monorepo/package.json +++ b/packages/add-nx-to-monorepo/package.json @@ -33,7 +33,7 @@ "enquirer": "~2.3.6", "ignore": "^5.0.4", "nx": "file:../nx", - "yargs-parser": "21.0.1" + "yargs-parser": "21.1.1" }, "publishConfig": { "access": "public" diff --git a/packages/cra-to-nx/package.json b/packages/cra-to-nx/package.json index 7f08180f444cc..f816dfe4fea90 100644 --- a/packages/cra-to-nx/package.json +++ b/packages/cra-to-nx/package.json @@ -28,7 +28,7 @@ "fs-extra": "^10.1.0", "nx": "file:../nx", "tslib": "^2.3.0", - "yargs-parser": "21.0.1" + "yargs-parser": "21.1.1" }, "publishConfig": { "access": "public" diff --git a/packages/create-nx-plugin/package.json b/packages/create-nx-plugin/package.json index 66f0638605d06..4ab77101c0e8b 100644 --- a/packages/create-nx-plugin/package.json +++ b/packages/create-nx-plugin/package.json @@ -34,7 +34,7 @@ "fs-extra": "^10.1.0", "nx": "file:../nx", "tmp": "~0.2.1", - "yargs-parser": "21.0.1" + "yargs-parser": "21.1.1" }, "publishConfig": { "access": "public" diff --git a/packages/create-nx-workspace/package.json b/packages/create-nx-workspace/package.json index b87df872a98cf..e6d3cdc5a4bb5 100644 --- a/packages/create-nx-workspace/package.json +++ b/packages/create-nx-workspace/package.json @@ -35,7 +35,7 @@ "ora": "5.3.0", "tmp": "~0.2.1", "tslib": "^2.3.0", - "yargs": "^17.4.0", + "yargs": "^17.6.2", "axios": "^1.0.0" }, "publishConfig": { diff --git a/packages/make-angular-cli-faster/package.json b/packages/make-angular-cli-faster/package.json index 7c182decad0e0..0dbe0daf86a48 100644 --- a/packages/make-angular-cli-faster/package.json +++ b/packages/make-angular-cli-faster/package.json @@ -34,8 +34,8 @@ "nx": "file:../nx", "semver": "7.3.4", "tmp": "~0.2.1", - "yargs": "^17.4.0", - "yargs-parser": "21.0.1" + "yargs": "^17.6.2", + "yargs-parser": "21.1.1" }, "publishConfig": { "access": "public" diff --git a/packages/nx/package.json b/packages/nx/package.json index b01da391e9a98..aaf0bd1ef15a1 100644 --- a/packages/nx/package.json +++ b/packages/nx/package.json @@ -61,8 +61,8 @@ "tsconfig-paths": "^3.9.0", "tslib": "^2.3.0", "v8-compile-cache": "2.3.0", - "yargs": "^17.4.0", - "yargs-parser": "21.0.1", + "yargs": "^17.6.2", + "yargs-parser": "21.1.1", "js-yaml": "4.1.0", "axios": "^1.0.0" }, diff --git a/packages/nx/src/utils/lock-file/lock-file.spec.ts b/packages/nx/src/utils/lock-file/lock-file.spec.ts index 8efdb9b63ba95..e157ff22ada17 100644 --- a/packages/nx/src/utils/lock-file/lock-file.spec.ts +++ b/packages/nx/src/utils/lock-file/lock-file.spec.ts @@ -18,8 +18,33 @@ import { lockFileDevkitAndYargs as yarnLockFileDevkitAndYargs, lockFile as yarnLockFile, } from './__fixtures__/yarn.lock'; +import { vol } from 'memfs'; + +jest.mock('fs', () => require('memfs').fs); + +jest.mock('@nrwl/devkit', () => ({ + ...jest.requireActual('@nrwl/devkit'), + workspaceRoot: '/root', +})); + +jest.mock('nx/src/utils/workspace-root', () => ({ + workspaceRoot: '/root', +})); describe('lock-file', () => { + const fileSys = { + 'node_modules/chalk/package.json': '{"version": "4.1.0"}', + 'node_modules/glob/package.json': '{"version": "7.1.4"}', + 'node_modules/js-yaml/package.json': '{"version": "4.1.0"}', + 'node_modules/minimatch/package.json': '{"version": "3.0.5"}', + 'node_modules/semver/package.json': '{"version": "7.3.4"}', + 'node_modules/tslib/package.json': '{"version": "2.4.0"}', + 'node_modules/yargs-parser/package.json': '{"version": "21.0.1"}', + }; + beforeEach(() => { + vol.fromJSON(fileSys, '/root'); + }); + describe('mapLockFileDataToExternalNodes', () => { describe('yarn', () => { it('should map lock file data to external nodes', () => { diff --git a/packages/nx/src/utils/lock-file/yarn.ts b/packages/nx/src/utils/lock-file/yarn.ts index 3bebe2db4bb57..e25fd0140bb2e 100644 --- a/packages/nx/src/utils/lock-file/yarn.ts +++ b/packages/nx/src/utils/lock-file/yarn.ts @@ -80,6 +80,7 @@ function mapPackages( const rootVersionKey = versionKeys.find((v) => isRootVersion(packageName, versions[v].version) ); + // this should never happen, but just in case if (rootVersionKey) { versions[rootVersionKey].rootVersion = true; diff --git a/packages/workspace/package.json b/packages/workspace/package.json index 55002d3f6b3cd..a287487e6dc70 100644 --- a/packages/workspace/package.json +++ b/packages/workspace/package.json @@ -89,8 +89,8 @@ "semver": "7.3.4", "tmp": "~0.2.1", "tslib": "^2.3.0", - "yargs": "^17.4.0", - "yargs-parser": "21.0.1" + "yargs": "^17.6.2", + "yargs-parser": "21.1.1" }, "publishConfig": { "access": "public" diff --git a/yarn.lock b/yarn.lock index 2f9429062b1de..72da9648c3a46 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23250,7 +23250,7 @@ yargs-parser@21.0.1: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== -yargs-parser@>=21.0.1, yargs-parser@^21.0.0, yargs-parser@^21.0.1: +yargs-parser@21.1.1, yargs-parser@>=21.0.1, yargs-parser@^21.0.0, yargs-parser@^21.0.1, yargs-parser@^21.1.1: version "21.1.1" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== @@ -23299,6 +23299,19 @@ yargs@^17.2.1, yargs@^17.3.1, yargs@^17.4.0: y18n "^5.0.5" yargs-parser "^21.0.0" +yargs@^17.6.2: + version "17.6.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" + integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + yauzl@^2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"