fix(core): update yargs to ^17.6.2 (#12978)

nrwl · Nov 4, 2022 · 6c6eff7 · 6c6eff7 · vercel · Nov 4, 2022
1 parent 377e3bd
commit 6c6eff7
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<any>('@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
@@ -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
@@ -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
@@ -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"