create-nx-workspace 19.2.0-alpha.2 → 19.2.0-beta.0

package/bin/create-nx-workspace.js

@@ -16,6 +16,7 @@ const yargs_options_1 = require("../src/internal-utils/yargs-options");
 const show_nx_warning_1 = require("../src/utils/nx/show-nx-warning");
 const nx_cloud_1 = require("../src/utils/nx/nx-cloud");
 const ab_testing_1 = require("../src/utils/nx/ab-testing");
+const error_utils_1 = require("../src/utils/error-utils");
 const fs_1 = require("fs");
 exports.commandsObject = yargs
     .wrap(yargs.terminalWidth())
@@ -146,29 +147,29 @@ async function normalizeArgsMiddleware(argv) {
         title: "Let's create a new workspace [https://nx.dev/getting-started/intro]",
     });
     try {
-        let thirdPartyPreset;
-        try {
-            thirdPartyPreset = await (0, get_third_party_preset_1.getThirdPartyPreset)(argv.preset);
-        }
-        catch (e) {
-            output_1.output.error({
-                title: `Could not find preset "${argv.preset}"`,
-            });
-            process.exit(1);
-        }
         argv.name = await determineFolder(argv);
-        if (thirdPartyPreset) {
-            Object.assign(argv, {
-                preset: thirdPartyPreset,
-                appName: '',
-                style: '',
-            });
-        }
-        else {
+        if ((0, preset_1.isKnownPreset)(argv.preset)) {
             argv.stack = await determineStack(argv);
             const presetOptions = await determinePresetOptions(argv);
             Object.assign(argv, presetOptions);
         }
+        else {
+            try {
+                (0, get_third_party_preset_1.getPackageNameFromThirdPartyPreset)(argv.preset);
+            }
+            catch (e) {
+                if (e instanceof Error) {
+                    output_1.output.error({
+                        title: `Could not find preset "${argv.preset}"`,
+                        bodyLines: (0, error_utils_1.mapErrorToBodyLines)(e),
+                    });
+                }
+                else {
+                    console.error(e);
+                }
+                process.exit(1);
+            }
+        }
         const packageManager = await (0, prompts_1.determinePackageManager)(argv);
         const defaultBase = await (0, prompts_1.determineDefaultBase)(argv);
         const nxCloud = await (0, prompts_1.determineNxCloud)(argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nx-workspace",
-  "version": "19.2.0-alpha.2",
+  "version": "19.2.0-beta.0",
   "private": false,
   "description": "Smart Monorepos · Fast CI",
   "repository": {

package/src/create-workspace.js

@@ -21,9 +21,9 @@ async function createWorkspace(preset, options) {
     // If the preset is a third-party preset, we need to call createPreset to install it
     // For first-party presets, it will be created by createEmptyWorkspace instead.
     // In createEmptyWorkspace, it will call `nx new` -> `@nx/workspace newGenerator` -> `@nx/workspace generatePreset`.
-    const thirdPartyPreset = await (0, get_third_party_preset_1.getThirdPartyPreset)(preset);
-    if (thirdPartyPreset) {
-        await (0, create_preset_1.createPreset)(thirdPartyPreset, options, packageManager, directory);
+    const thirdPartyPackageName = (0, get_third_party_preset_1.getPackageNameFromThirdPartyPreset)(preset);
+    if (thirdPartyPackageName) {
+        await (0, create_preset_1.createPreset)(thirdPartyPackageName, options, packageManager, directory);
     }
     let nxCloudInstallRes;
     if (nxCloud !== 'skip') {

package/src/utils/preset/get-third-party-preset.d.ts

@@ -1,6 +1,9 @@
 /**
  * This function is used to check if a preset is a third party preset.
  * @param preset
- * @returns null if the preset is a known Nx preset or preset does not exist, the package name of preset otherwise.
+ * @returns
+ * - undefined if the preset is a known Nx preset or invalid.
+ * - packageName if the preset is a third party preset.
+ * - throws an error if the preset is invalid.
  */
-export declare function getThirdPartyPreset(preset?: string): Promise<string | null>;
+export declare function getPackageNameFromThirdPartyPreset(preset?: string): string | undefined;

package/src/utils/preset/get-third-party-preset.js

@@ -1,39 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getThirdPartyPreset = void 0;
-const output_1 = require("../output");
+exports.getPackageNameFromThirdPartyPreset = void 0;
 const validate_npm_package_1 = require("../validate-npm-package");
 const preset_1 = require("./preset");
 /**
  * This function is used to check if a preset is a third party preset.
  * @param preset
- * @returns null if the preset is a known Nx preset or preset does not exist, the package name of preset otherwise.
+ * @returns
+ * - undefined if the preset is a known Nx preset or invalid.
+ * - packageName if the preset is a third party preset.
+ * - throws an error if the preset is invalid.
  */
-async function getThirdPartyPreset(preset) {
-    if (preset && !(0, preset_1.isKnownPreset)(preset)) {
-        // extract the package name from the preset
-        const packageName = preset.match(/.+@/)
-            ? preset[0] + preset.substring(1).split('@')[0]
-            : preset;
-        const validateResult = (0, validate_npm_package_1.validateNpmPackage)(packageName);
-        if (validateResult.validForNewPackages) {
-            return Promise.resolve(packageName);
-        }
-        else {
-            //! Error here
-            output_1.output.error({
-                title: 'Invalid preset npm package',
-                bodyLines: [
-                    `There was an error with the preset npm package you provided:`,
-                    '',
-                    ...(validateResult.errors ?? []),
-                ],
-            });
-            throw new Error('Invalid preset npm package');
-        }
+function getPackageNameFromThirdPartyPreset(preset) {
+    if (!preset || (0, preset_1.isKnownPreset)(preset)) {
+        return;
     }
-    else {
-        return Promise.resolve(null);
+    // extract the package name from the preset
+    const packageName = preset.match(/.+@/)
+        ? preset[0] + preset.substring(1).split('@')[0]
+        : preset;
+    const validateResult = (0, validate_npm_package_1.validateNpmPackage)(packageName);
+    if (!validateResult.validForNewPackages) {
+        throw new Error(`Invalid preset npm package ${packageName}. There was an error with the preset npm package you provided: ` +
+            (validateResult.errors ?? []).join('\n'));
     }
+    return packageName;
 }
-exports.getThirdPartyPreset = getThirdPartyPreset;
+exports.getPackageNameFromThirdPartyPreset = getPackageNameFromThirdPartyPreset;