@nrwl/workspace 14.8.7 → 14.9.0-beta.1

package/src/generators/new/new.js

@@ -1,244 +1,73 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.newSchematic = exports.newGenerator = void 0;
+exports.newGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const path_1 = require("path");
-const yargsParser = require("yargs-parser");
-const child_process_1 = require("child_process");
-const workspace_1 = require("../workspace/workspace");
-const versions_1 = require("../../utils/versions");
 const presets_1 = require("../utils/presets");
-const get_npm_package_version_1 = require("../utils/get-npm-package-version");
-function generatePreset(host, opts) {
-    const cliCommand = opts.cli === 'angular' ? 'ng' : 'nx';
-    const parsedArgs = yargsParser(process.argv, {
-        boolean: ['interactive'],
-    });
-    const spawnOptions = {
-        stdio: [process.stdin, process.stdout, process.stderr],
-        shell: true,
-        cwd: (0, path_1.join)(host.root, opts.directory),
-    };
-    const pmc = (0, devkit_1.getPackageManagerCommand)();
-    const executable = `${pmc.exec} ${cliCommand}`;
-    const args = getPresetArgs(opts);
-    return new Promise((resolve, reject) => {
-        (0, child_process_1.spawn)(executable, args, spawnOptions).on('close', (code) => {
-            if (code === 0) {
-                resolve();
-            }
-            else {
-                const message = 'Workspace creation failed, see above.';
-                reject(new Error(message));
-            }
-        });
-    });
-    function getPresetArgs(options) {
-        if (Object.values(presets_1.Preset).some((val) => val === options.preset)) {
-            // supported presets
-            return getDefaultArgs(options);
-        }
-        return getThirdPartyPresetArgs();
-    }
-    function getDefaultArgs(opts) {
-        return [
-            `g`,
-            `@nrwl/workspace:preset`,
-            `--name=${opts.appName}`,
-            opts.style ? `--style=${opts.style}` : null,
-            opts.linter ? `--linter=${opts.linter}` : null,
-            opts.npmScope ? `--npmScope=${opts.npmScope}` : `--npmScope=${opts.name}`,
-            opts.preset ? `--preset=${opts.preset}` : null,
-            opts.packageManager ? `--packageManager=${opts.packageManager}` : null,
-            `--cli=${cliCommand}`,
-            parsedArgs.interactive ? '--interactive=true' : '--interactive=false',
-        ].filter((e) => !!e);
-    }
-    function getThirdPartyPresetArgs() {
-        const thirdPartyPkgArgs = Object.entries(opts).reduce((acc, [key, value]) => {
-            if (value === true) {
-                acc.push(`--${key}`);
-            }
-            else if (value === false) {
-                acc.push(`--no-${key}`);
-                // nxWorkspaceRoot breaks CLI if incorrectly set, so need to exclude it.
-                // TODO(jack): Should read in the preset schema and only pass the options specified.
-            }
-            else if (key !== 'nxWorkspaceRoot') {
-                // string, number (don't handle arrays or nested objects)
-                acc.push(`--${key}=${value}`);
-            }
-            return acc;
-        }, []);
-        return [`g`, `${opts.preset}:preset`, ...thirdPartyPkgArgs];
-    }
-}
-function newGenerator(host, options) {
+const generate_workspace_files_1 = require("./generate-workspace-files");
+const generate_preset_1 = require("./generate-preset");
+function newGenerator(host, opts) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (options.skipInstall &&
-            options.preset !== presets_1.Preset.Apps &&
-            options.preset !== presets_1.Preset.Core &&
-            options.preset !== presets_1.Preset.TS &&
-            options.preset !== presets_1.Preset.Empty &&
-            options.preset !== presets_1.Preset.NPM) {
-            throw new Error(`Cannot select a preset when skipInstall is set to true.`);
-        }
-        if (options.skipInstall && options.nxCloud) {
-            throw new Error(`Cannot select nxCloud when skipInstall is set to true.`);
-        }
-        if ((0, devkit_1.getWorkspacePath)(host)) {
-            throw new Error('Cannot generate a new workspace within an existing workspace');
-        }
-        options = normalizeOptions(options);
-        if (host.exists(options.name) &&
-            !host.isFile(options.name) &&
-            host.children(options.name).length > 0) {
-            throw new Error(`${(0, path_1.join)(host.root, options.name)} is not an empty directory.`);
-        }
-        yield (0, workspace_1.workspaceGenerator)(host, Object.assign(Object.assign({}, options), { nxCloud: undefined }));
-        setDefaultLinter(host, options);
-        addPresetDependencies(host, options);
+        const options = normalizeOptions(opts);
+        validateOptions(options, host);
+        yield (0, generate_workspace_files_1.generateWorkspaceFiles)(host, Object.assign(Object.assign({}, options), { nxCloud: undefined }));
+        (0, generate_preset_1.addPresetDependencies)(host, options);
         addCloudDependencies(host, options);
-        yield (0, devkit_1.formatFiles)(host);
         return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
             (0, devkit_1.installPackagesTask)(host, false, options.directory, options.packageManager);
-            yield generatePreset(host, options);
+            // TODO: move all of these into create-nx-workspace
+            if (options.preset !== presets_1.Preset.NPM &&
+                options.preset !== presets_1.Preset.Core &&
+                !options.isCustomPreset) {
+                yield (0, generate_preset_1.generatePreset)(host, options);
+            }
         });
     });
 }
 exports.newGenerator = newGenerator;
 exports.default = newGenerator;
-exports.newSchematic = (0, devkit_1.convertNxGenerator)(newGenerator);
-function addCloudDependencies(host, options) {
-    if (options.nxCloud) {
-        return (0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@nrwl/nx-cloud': 'latest' }, (0, path_1.join)(options.directory, 'package.json'));
+function validateOptions(options, host) {
+    if (options.skipInstall &&
+        options.preset !== presets_1.Preset.Apps &&
+        options.preset !== presets_1.Preset.Core &&
+        options.preset !== presets_1.Preset.TS &&
+        options.preset !== presets_1.Preset.Empty &&
+        options.preset !== presets_1.Preset.NPM) {
+        throw new Error(`Cannot select a preset when skipInstall is set to true.`);
     }
-}
-function getPresetDependencies(preset, version) {
-    switch (preset) {
-        case presets_1.Preset.TS:
-            return { dependencies: {}, dev: { '@nrwl/js': versions_1.nxVersion } };
-        case presets_1.Preset.Angular:
-            return { dependencies: { '@nrwl/angular': versions_1.nxVersion }, dev: {} };
-        case presets_1.Preset.AngularWithNest:
-            return {
-                dependencies: { '@nrwl/angular': versions_1.nxVersion },
-                dev: { '@nrwl/nest': versions_1.nxVersion },
-            };
-        case presets_1.Preset.Express:
-            return { dependencies: {}, dev: { '@nrwl/express': versions_1.nxVersion } };
-        case presets_1.Preset.Nest:
-            return { dependencies: {}, dev: { '@nrwl/nest': versions_1.nxVersion } };
-        case presets_1.Preset.NextJs:
-            return { dependencies: { '@nrwl/next': versions_1.nxVersion }, dev: {} };
-        case presets_1.Preset.React:
-            return { dependencies: {}, dev: { '@nrwl/react': versions_1.nxVersion } };
-        case presets_1.Preset.ReactWithExpress:
-            return {
-                dependencies: {},
-                dev: {
-                    '@nrwl/react': versions_1.nxVersion,
-                    '@nrwl/express': versions_1.nxVersion,
-                },
-            };
-        case presets_1.Preset.ReactNative:
-            return { dependencies: {}, dev: { '@nrwl/react-native': versions_1.nxVersion } };
-        case presets_1.Preset.Expo:
-            return { dependencies: {}, dev: { '@nrwl/expo': versions_1.nxVersion } };
-        case presets_1.Preset.WebComponents:
-            return { dependencies: {}, dev: { '@nrwl/web': versions_1.nxVersion } };
-        default: {
-            return {
-                dev: {},
-                dependencies: { [preset]: version !== null && version !== void 0 ? version : (0, get_npm_package_version_1.getNpmPackageVersion)(preset) },
-            };
-        }
+    if (options.skipInstall && options.nxCloud) {
+        throw new Error(`Cannot select nxCloud when skipInstall is set to true.`);
     }
-}
-function addPresetDependencies(host, options) {
-    if (options.preset === presets_1.Preset.Apps ||
-        options.preset === presets_1.Preset.Core ||
-        options.preset === presets_1.Preset.Empty ||
-        options.preset === presets_1.Preset.NPM) {
-        return;
+    if (options.preset === presets_1.Preset.NodeServer && !options.framework) {
+        throw new Error(`Cannot generate ${options.preset} without selecting a framework`);
+    }
+    if (host.exists(options.name) &&
+        !host.isFile(options.name) &&
+        host.children(options.name).length > 0) {
+        throw new Error(`${(0, path_1.join)(host.root, options.name)} is not an empty directory.`);
     }
-    const { dependencies, dev } = getPresetDependencies(options.preset, options.presetVersion);
-    return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, dev, (0, path_1.join)(options.directory, 'package.json'));
 }
 function normalizeOptions(options) {
-    options.name = (0, devkit_1.names)(options.name).fileName;
+    const normalized = Object.assign({}, options);
+    normalized.name = (0, devkit_1.names)(options.name).fileName;
     if (!options.directory) {
-        options.directory = options.name;
+        normalized.directory = options.name;
     }
     // If the preset already contains a version in the name
     // -- my-package@2.0.1
     // -- @scope/package@version
     const match = options.preset.match(/^(?<package>(@.+\/)?[^@]+)(@(?<version>\d+\.\d+\.\d+))?$/);
     if (match) {
-        options.preset = match.groups.package;
-        options.presetVersion = match.groups.version;
-    }
-    return options;
-}
-function setDefaultLinter(host, options) {
-    const { linter, preset } = options;
-    // Don't do anything if someone doesn't pick angular
-    if (preset !== presets_1.Preset.Angular && preset !== presets_1.Preset.AngularWithNest) {
-        return;
-    }
-    switch (linter) {
-        case 'eslint': {
-            setESLintDefault(host, options);
-            break;
-        }
-        case 'tslint': {
-            setTSLintDefault(host, options);
-            break;
-        }
+        normalized.preset = match.groups.package;
+        normalized.presetVersion = match.groups.version;
     }
+    normalized.isCustomPreset = !Object.values(presets_1.Preset).includes(options.preset);
+    return normalized;
 }
-/**
- * This sets ESLint as the default for any schematics that default to TSLint
- */
-function setESLintDefault(host, options) {
-    (0, devkit_1.updateJson)(host, (0, path_1.join)(options.directory, 'nx.json'), (json) => {
-        setDefault(json, '@nrwl/angular', 'application', 'linter', 'eslint');
-        setDefault(json, '@nrwl/angular', 'library', 'linter', 'eslint');
-        setDefault(json, '@nrwl/angular', 'storybook-configuration', 'linter', 'eslint');
-        return json;
-    });
-}
-/**
- * This sets TSLint as the default for any schematics that default to ESLint
- */
-function setTSLintDefault(host, options) {
-    (0, devkit_1.updateJson)(host, (0, path_1.join)(options.directory, 'nx.json'), (json) => {
-        setDefault(json, '@nrwl/workspace', 'library', 'linter', 'tslint');
-        setDefault(json, '@nrwl/cypress', 'cypress-project', 'linter', 'tslint');
-        setDefault(json, '@nrwl/cypress', 'cypress-project', 'linter', 'tslint');
-        setDefault(json, '@nrwl/node', 'application', 'linter', 'tslint');
-        setDefault(json, '@nrwl/node', 'library', 'linter', 'tslint');
-        setDefault(json, '@nrwl/nest', 'application', 'linter', 'tslint');
-        setDefault(json, '@nrwl/nest', 'library', 'linter', 'tslint');
-        setDefault(json, '@nrwl/express', 'application', 'linter', 'tslint');
-        setDefault(json, '@nrwl/express', 'library', 'linter', 'tslint');
-        return json;
-    });
-}
-function setDefault(json, collectionName, generatorName, key, value) {
-    if (!json.generators)
-        json.generators = {};
-    if (json.generators[collectionName] &&
-        json.generators[collectionName][generatorName]) {
-        json.generators[collectionName][generatorName][key] = value;
-    }
-    else if (json.generators[`${collectionName}:${generatorName}`]) {
-        json.generators[`${collectionName}:${generatorName}`][key] = value;
-    }
-    else {
-        json.generators[collectionName] = json.generators[collectionName] || {};
-        json.generators[collectionName][generatorName] = { [key]: value };
+function addCloudDependencies(host, options) {
+    if (options.nxCloud) {
+        return (0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@nrwl/nx-cloud': 'latest' }, (0, path_1.join)(options.directory, 'package.json'));
     }
 }
 //# sourceMappingURL=new.js.map

package/src/generators/new/new.js.map

@@ -1 +1 @@
-{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}

package/src/generators/new/schema.json

@@ -15,21 +15,25 @@
       },
       "x-prompt": "What name would you like to use for the workspace?"
     },
-    "cli": {
-      "description": "CLI used for generating code and running tasks.",
-      "type": "string",
-      "enum": ["nx", "angular"],
-      "default": "nx"
-    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",
       "default": "css"
     },
+    "routing": {
+      "description": "Add routing to the generated application.",
+      "type": "boolean",
+      "default": true
+    },
     "npmScope": {
       "type": "string",
       "description": "Npm scope for importing libs."
     },
+    "standaloneApi": {
+      "description": "Use Standalone Components if generating an Angular application.",
+      "type": "boolean",
+      "default": false
+    },
     "defaultBase": {
       "type": "string",
       "description": "Default base branch for affected."
@@ -55,13 +59,18 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["tslint", "eslint"],
+      "enum": ["eslint"],
       "default": "eslint"
     },
     "packageManager": {
       "description": "The package manager used to install dependencies.",
       "type": "string",
       "enum": ["npm", "yarn", "pnpm"]
+    },
+    "framework": {
+      "description": "The framework which the application is using",
+      "type": "string",
+      "enum": ["express", "koa", "fastify", "nest", "none"]
     }
   },
   "additionalProperties": true

package/src/generators/npm-package/npm-package.js

@@ -24,13 +24,10 @@ function npmPackageGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         options = normalizeOptions(options);
         const { libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
-        const workspaceFile = (0, devkit_1.getWorkspacePath)(tree);
         const projectRoot = (0, path_1.join)(libsDir, options.name);
-        if (!!workspaceFile) {
-            (0, devkit_1.addProjectConfiguration)(tree, options.name, {
-                root: projectRoot,
-            });
-        }
+        (0, devkit_1.addProjectConfiguration)(tree, options.name, {
+            root: projectRoot,
+        });
         const fileCount = tree.children(projectRoot).length;
         const projectJsonExists = tree.exists((0, path_1.join)(projectRoot, 'project.json'));
         const isEmpty = fileCount === 0 || (fileCount === 1 && projectJsonExists);

package/src/generators/npm-package/npm-package.js.map

@@ -1 +1 @@
-{"version":3,"file":"npm-package.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/npm-package/npm-package.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,+BAA4B;AAC5B,4CAAkD;AAKlD,SAAS,gBAAgB,CAAC,OAAuB;IAC/C,OAAO,CAAC,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC5C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,QAAQ,CACf,WAAmB,EACnB,IAAU,EACV,QAAgB,EAChB,OAAuB;IAEvB,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC1D,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE;QAC/B,IAAI,EAAE,IAAA,oBAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC;QAC3C,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE;YACP,IAAI,EAAE,eAAe;SACtB;KACF,CAAC,CAAC;IAEH,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,SAAsB,mBAAmB,CAAC,IAAU,EAAE,OAAuB;;QAC3E,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAEpC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QACvD,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEhD,IAAI,CAAC,CAAC,aAAa,EAAE;YACnB,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;gBAC1C,IAAI,EAAE,WAAW;aAClB,CAAC,CAAC;SACJ;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;QACpD,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,SAAS,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,iBAAiB,CAAC,CAAC;QAE1E,IAAI,OAAO,EAAE;YACX,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;SAChD;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAtBD,kDAsBC;AAEY,QAAA,mBAAmB,GAAG,IAAA,2BAAkB,EAAC,mBAAmB,CAAC,CAAC"}
+{"version":3,"file":"npm-package.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/npm-package/npm-package.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AACtB,+BAA4B;AAC5B,4CAAkD;AAMlD,SAAS,gBAAgB,CAAC,OAAuB;IAC/C,OAAO,CAAC,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC5C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,QAAQ,CACf,WAAmB,EACnB,IAAU,EACV,QAAgB,EAChB,OAAuB;IAEvB,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC1D,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE;QAC/B,IAAI,EAAE,IAAA,oBAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC;QAC3C,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE;YACP,IAAI,EAAE,eAAe;SACtB;KACF,CAAC,CAAC;IAEH,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,SAAsB,mBAAmB,CAAC,IAAU,EAAE,OAAuB;;QAC3E,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAEpC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEhD,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1C,IAAI,EAAE,WAAW;SAClB,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;QACpD,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,SAAS,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,iBAAiB,CAAC,CAAC;QAE1E,IAAI,OAAO,EAAE;YACX,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;SAChD;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAnBD,kDAmBC;AAEY,QAAA,mBAAmB,GAAG,IAAA,2BAAkB,EAAC,mBAAmB,CAAC,CAAC"}

package/src/generators/preset/preset.d.ts

@@ -1,5 +1,4 @@
 import { Tree } from '@nrwl/devkit';
 import { Schema } from './schema';
-export declare function presetGenerator(tree: Tree, options: Schema): Promise<() => void>;
-export declare const presetSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;
+export declare function presetGenerator(tree: Tree, options: Schema): Promise<() => Promise<void>>;
 export default presetGenerator;