create-nx-workspace 16.6.0-beta.3 → 16.6.0-beta.4

package/bin/create-nx-workspace.d.ts

@@ -6,12 +6,9 @@ interface BaseArguments extends CreateWorkspaceOptions {
 }
 interface NoneArguments extends BaseArguments {
     stack: 'none';
-    workspaceType: 'package-based' | 'integrated';
-}
-interface TsArguments extends BaseArguments {
-    stack: 'ts';
-    workspaceType: 'standalone' | 'integrated';
+    workspaceType: 'package-based' | 'integrated' | 'standalone';
     js: boolean;
+    appName: string | undefined;
 }
 interface ReactArguments extends BaseArguments {
     stack: 'react';
@@ -40,6 +37,6 @@ interface NodeArguments extends BaseArguments {
 interface UnknownStackArguments extends BaseArguments {
     stack: 'unknown';
 }
-type Arguments = NoneArguments | TsArguments | ReactArguments | AngularArguments | NodeArguments | UnknownStackArguments;
+type Arguments = NoneArguments | ReactArguments | AngularArguments | NodeArguments | UnknownStackArguments;
 export declare const commandsObject: yargs.Argv<Arguments>;
 export {};

package/bin/create-nx-workspace.js

@@ -229,10 +229,9 @@ function determineStack(parsedArgs) {
                 case preset_1.Preset.Empty:
                 case preset_1.Preset.Apps:
                 case preset_1.Preset.NPM:
-                    return 'none';
                 case preset_1.Preset.TS:
                 case preset_1.Preset.TsStandalone:
-                    return 'ts';
+                    return 'none';
                 case preset_1.Preset.WebComponents:
                 case preset_1.Preset.ReactNative:
                 case preset_1.Preset.Expo:
@@ -248,23 +247,19 @@ function determineStack(parsedArgs) {
                 choices: [
                     {
                         name: `none`,
-                        message: `None:          Configures a minimal structure without specific frameworks or technologies.`,
-                    },
-                    {
-                        name: `ts`,
-                        message: `TS/JS:         Configures a TypeScript/JavaScript package without specific frameworks or platforms.`,
+                        message: `None:          Configures a TypeScript/JavaScript project with minimal structure.`,
                     },
                     {
                         name: `react`,
-                        message: `React:         Configures a React app with your framework of choice.`,
+                        message: `React:         Configures a React application with your framework of choice.`,
                     },
                     {
                         name: `angular`,
-                        message: `Angular:       Configures a Angular app with modern tooling.`,
+                        message: `Angular:       Configures a Angular application with modern tooling.`,
                     },
                     {
                         name: `node`,
-                        message: `Node:          Configures a Node API with your framework of choice.`,
+                        message: `Node:          Configures a Node API application with your framework of choice.`,
                     },
                 ],
             },
@@ -277,8 +272,6 @@ function determinePresetOptions(parsedArgs) {
         switch (parsedArgs.stack) {
             case 'none':
                 return determineNoneOptions(parsedArgs);
-            case 'ts':
-                return determineTsOptions(parsedArgs);
             case 'react':
                 return determineReactOptions(parsedArgs);
             case 'angular':
@@ -291,51 +284,25 @@ function determinePresetOptions(parsedArgs) {
     });
 }
 function determineNoneOptions(parsedArgs) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (parsedArgs.preset)
-            return parsedArgs;
-        const { workspaceType } = yield enquirer.prompt([
-            {
-                type: 'autocomplete',
-                name: 'workspaceType',
-                message: `Package-based or integrated?`,
-                initial: 'package-based',
-                choices: [
-                    {
-                        name: 'package-based',
-                        message: 'Package-based:           Nx makes it fast, but lets you run things your way.',
-                    },
-                    {
-                        name: 'integrated',
-                        message: 'Integrated:              Nx creates a workspace structure most suitable for building apps.',
-                    },
-                ],
-            },
-        ]);
-        if (workspaceType === 'integrated') {
-            return {
-                preset: preset_1.Preset.Apps,
-            };
-        }
-        else {
-            return {
-                preset: preset_1.Preset.NPM,
-            };
-        }
-    });
-}
-function determineTsOptions(parsedArgs) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         let preset;
         let workspaceType = undefined;
         let appName = undefined;
-        let js = false;
+        let js;
         if (parsedArgs.preset) {
             preset = parsedArgs.preset;
         }
         else {
-            workspaceType = yield determineStandAloneOrMonorepo();
-            preset = workspaceType === 'standalone' ? preset_1.Preset.TsStandalone : preset_1.Preset.TS;
+            workspaceType = yield determinePackageBasedOrIntegratedOrStandalone();
+            if (workspaceType === 'standalone') {
+                preset = preset_1.Preset.TsStandalone;
+            }
+            else if (workspaceType === 'integrated') {
+                preset = preset_1.Preset.Apps;
+            }
+            else {
+                preset = preset_1.Preset.NPM;
+            }
         }
         if (parsedArgs.js !== undefined) {
             js = parsedArgs.js;
@@ -388,7 +355,7 @@ function determineReactOptions(parsedArgs) {
             // TODO(jack): Add standalone support for React Native and Expo.
             const workspaceType = framework === 'react-native' || framework === 'expo'
                 ? 'integrated'
-                : yield determineStandAloneOrMonorepo();
+                : yield determineStandaloneOrMonorepo();
             if (workspaceType === 'standalone') {
                 appName = parsedArgs.name;
             }
@@ -487,7 +454,7 @@ function determineAngularOptions(parsedArgs) {
             }
         }
         else {
-            const workspaceType = yield determineStandAloneOrMonorepo();
+            const workspaceType = yield determineStandaloneOrMonorepo();
             if (workspaceType === 'standalone') {
                 preset = preset_1.Preset.AngularStandalone;
                 appName = parsedArgs.name;
@@ -597,7 +564,7 @@ function determineNodeOptions(parsedArgs) {
         }
         else {
             framework = yield determineNodeFramework(parsedArgs);
-            const workspaceType = yield determineStandAloneOrMonorepo();
+            const workspaceType = yield determineStandaloneOrMonorepo();
             if (workspaceType === 'standalone') {
                 preset = preset_1.Preset.NodeStandalone;
                 appName = parsedArgs.name;
@@ -638,23 +605,56 @@ function determineNodeOptions(parsedArgs) {
         };
     });
 }
-function determineStandAloneOrMonorepo() {
+function determinePackageBasedOrIntegratedOrStandalone() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { workspaceType } = yield enquirer.prompt([
             {
                 type: 'autocomplete',
                 name: 'workspaceType',
-                message: `Standalone project or integrated monorepo?`,
-                initial: 'standalone',
+                message: `Package-based monorepo, integrated monorepo, or standalone project?`,
+                initial: 'package-based',
                 choices: [
+                    {
+                        name: 'package-based',
+                        message: 'Package-based Monorepo:     Nx makes it fast, but lets you run things your way.',
+                    },
+                    {
+                        name: 'integrated',
+                        message: 'Integrated Monorepo:        Nx creates a monorepo that contains multiple projects.',
+                    },
                     {
                         name: 'standalone',
-                        message: 'Standalone:           Nx creates a single project and makes it fast.',
+                        message: 'Standalone:                 Nx creates a single project and makes it fast.',
                     },
+                ],
+            },
+        ]);
+        invariant(workspaceType, {
+            title: 'Invalid workspace type',
+            bodyLines: [
+                `It must be one of the following: standalone, integrated. Got ${workspaceType}`,
+            ],
+        });
+        return workspaceType;
+    });
+}
+function determineStandaloneOrMonorepo() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { workspaceType } = yield enquirer.prompt([
+            {
+                type: 'autocomplete',
+                name: 'workspaceType',
+                message: `Integrated monorepo, or standalone project?`,
+                initial: 'standalone',
+                choices: [
                     {
                         name: 'integrated',
                         message: 'Integrated Monorepo:  Nx creates a monorepo that contains multiple projects.',
                     },
+                    {
+                        name: 'standalone',
+                        message: 'Standalone:           Nx creates a single project and makes it fast.',
+                    },
                 ],
             },
         ]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nx-workspace",
-  "version": "16.6.0-beta.3",
+  "version": "16.6.0-beta.4",
   "private": false,
   "description": "Smart, Fast and Extensible Build System",
   "repository": {
@@ -43,5 +43,5 @@
   },
   "main": "./index.js",
   "types": "./index.d.ts",
-  "gitHead": "cd8c61d7a3b8ab9bc7bab068f5ca49bbf14abbf5"
+  "gitHead": "b1a9ae7ce76697019b26ec9a172005840cca8da6"
 }

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;
 /**