create-nx-workspace 16.5.1 → 16.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nx-workspace",
-  "version": "16.5.1",
+  "version": "16.5.3",
   "private": false,
   "description": "Smart, Fast and Extensible Build System",
   "repository": {
@@ -43,5 +43,5 @@
   },
   "main": "./index.js",
   "types": "./index.d.ts",
-  "gitHead": "7b7f1e7f72a34cb31cff43ea0ebb80d0eab1ac79"
+  "gitHead": "e886dc76e203b05908b1a1b8872dee834cc4d2c8"
 }

package/src/create-empty-workspace.js

@@ -37,7 +37,7 @@ function createEmptyWorkspace(tmpDir, name, packageManager, options) {
         if (process.platform === 'win32' &&
             /\s/.test(nxWorkspaceRoot) &&
             packageManager === 'npm') {
-            const pmVersion = +(0, package_manager_1.getPackageManagerVersion)(packageManager).split('.')[0];
+            const pmVersion = +(0, package_manager_1.getPackageManagerVersion)(packageManager, tmpDir).split('.')[0];
             if (pmVersion < 7) {
                 nxWorkspaceRoot = `\\"${nxWorkspaceRoot.slice(1, -1)}\\"`;
             }

package/src/create-preset.js

@@ -18,7 +18,7 @@ function createPreset(preset, parsedArgs, packageManager, directory) {
         if (process.platform === 'win32' &&
             /\s/.test(nxWorkspaceRoot) &&
             packageManager === 'npm') {
-            const pmVersion = +(0, package_manager_1.getPackageManagerVersion)(packageManager).split('.')[0];
+            const pmVersion = +(0, package_manager_1.getPackageManagerVersion)(packageManager, workingDir).split('.')[0];
             if (pmVersion < 7) {
                 nxWorkspaceRoot = `\\"${nxWorkspaceRoot.slice(1, -1)}\\"`;
             }

package/src/utils/nx/ab-testing.js

@@ -56,7 +56,7 @@ function recordStat(opts) {
             if (process.env.NX_VERBOSE_LOGGING === 'true') {
                 console.log(`Record stat. Major: ${major}`);
             }
-            if (major < 10 || major > 15)
+            if (major < 10 || major > 16)
                 return; // test version, skip it
             const axios = require('axios');
             yield ((_a = axios['default']) !== null && _a !== void 0 ? _a : axios)

package/src/utils/package-manager.d.ts

@@ -19,7 +19,7 @@ export declare function getPackageManagerCommand(packageManager?: PackageManager
     preInstall?: string;
 };
 export declare function generatePackageManagerFiles(root: string, packageManager?: PackageManager): void;
-export declare function getPackageManagerVersion(packageManager: PackageManager): string;
+export declare function getPackageManagerVersion(packageManager: PackageManager, cwd?: string): string;
 /**
  * Detects which package manager was used to invoke create-nx-{plugin|workspace} command
  * based on the main Module process that invokes the command

package/src/utils/package-manager.js

@@ -42,7 +42,8 @@ function getPackageManagerCommand(packageManager = detectPackageManager()) {
                 install: useBerry
                     ? installCommand
                     : `${installCommand} --ignore-scripts`,
-                exec: 'yarn',
+                // using npx is necessary to avoid yarn classic manipulating the version detection when using berry
+                exec: useBerry ? 'npx' : 'yarn',
             };
         case 'pnpm':
             let useExec = false;
@@ -67,13 +68,24 @@ function generatePackageManagerFiles(root, packageManager = detectPackageManager
         case 'yarn':
             if (+pmMajor >= 2) {
                 (0, fs_1.writeFileSync)((0, path_1.join)(root, '.yarnrc.yml'), 'nodeLinker: node-modules\nenableScripts: false');
+                // avoids errors when using nested yarn projects
+                (0, fs_1.writeFileSync)((0, path_1.join)(root, 'yarn.lock'), '');
             }
             break;
     }
 }
 exports.generatePackageManagerFiles = generatePackageManagerFiles;
-function getPackageManagerVersion(packageManager) {
-    return (0, child_process_1.execSync)(`${packageManager} --version`).toString('utf-8').trim();
+const pmVersionCache = new Map();
+function getPackageManagerVersion(packageManager, cwd = process.cwd()) {
+    if (pmVersionCache.has(packageManager)) {
+        return pmVersionCache.get(packageManager);
+    }
+    const version = (0, child_process_1.execSync)(`${packageManager} --version`, {
+        cwd,
+        encoding: 'utf-8',
+    }).trim();
+    pmVersionCache.set(packageManager, version);
+    return version;
 }
 exports.getPackageManagerVersion = getPackageManagerVersion;
 /**