@nrwl/workspace 14.8.7 → 14.9.0-beta.1

package/src/generators/new/generate-preset.js

@@ -0,0 +1,131 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generatePreset = exports.addPresetDependencies = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const presets_1 = require("../utils/presets");
+const versions_1 = require("../../utils/versions");
+const get_npm_package_version_1 = require("../utils/get-npm-package-version");
+const path_1 = require("path");
+const yargsParser = require("yargs-parser");
+const child_process_1 = require("child_process");
+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;
+    }
+    const { dependencies, dev } = getPresetDependencies(options);
+    return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, dev, (0, path_1.join)(options.directory, 'package.json'));
+}
+exports.addPresetDependencies = addPresetDependencies;
+function generatePreset(host, opts) {
+    const parsedArgs = yargsParser(process.argv, {
+        boolean: ['interactive'],
+        default: {
+            interactive: true,
+        },
+    });
+    const spawnOptions = {
+        stdio: 'inherit',
+        shell: true,
+        cwd: (0, path_1.join)(host.root, opts.directory),
+    };
+    const pmc = (0, devkit_1.getPackageManagerCommand)();
+    const executable = `${pmc.exec} nx`;
+    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) {
+        // supported presets
+        return getDefaultArgs(options);
+    }
+    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.bundler ? `--bundler=${opts.bundler}` : null,
+            opts.framework ? `--framework=${opts.framework}` : null,
+            opts.docker ? `--docker=${opts.docker}` : null,
+            opts.packageManager ? `--packageManager=${opts.packageManager}` : null,
+            opts.standaloneApi !== undefined
+                ? `--standaloneApi=${opts.standaloneApi}`
+                : null,
+            parsedArgs.interactive ? '--interactive=true' : '--interactive=false',
+            opts.routing !== undefined ? `--routing=${opts.routing}` : null,
+        ].filter((e) => !!e);
+    }
+}
+exports.generatePreset = generatePreset;
+function getPresetDependencies({ preset, presetVersion, bundler, }) {
+    switch (preset) {
+        case presets_1.Preset.TS:
+            return { dependencies: {}, dev: { '@nrwl/js': versions_1.nxVersion } };
+        case presets_1.Preset.AngularMonorepo:
+        case presets_1.Preset.AngularStandalone:
+            return {
+                dependencies: { '@nrwl/angular': versions_1.nxVersion },
+                dev: {
+                    '@angular-devkit/core': versions_1.angularCliVersion,
+                    '@angular-devkit/schematics': versions_1.angularCliVersion,
+                    '@schematics/angular': versions_1.angularCliVersion,
+                    typescript: versions_1.typescriptVersion,
+                },
+            };
+        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, typescript: versions_1.typescriptVersion },
+            };
+        case presets_1.Preset.NextJs:
+            return { dependencies: { '@nrwl/next': versions_1.nxVersion }, dev: {} };
+        case presets_1.Preset.ReactMonorepo:
+        case presets_1.Preset.ReactStandalone:
+            return {
+                dependencies: {},
+                dev: {
+                    '@nrwl/react': versions_1.nxVersion,
+                    '@nrwl/cypress': versions_1.nxVersion,
+                    '@nrwl/jest': bundler !== 'vite' ? versions_1.nxVersion : undefined,
+                    '@nrwl/vite': bundler === 'vite' ? versions_1.nxVersion : undefined,
+                    '@nrwl/webpack': bundler === 'webpack' ? versions_1.nxVersion : undefined,
+                },
+            };
+        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, typescript: versions_1.typescriptVersion },
+            };
+        case presets_1.Preset.NodeServer:
+            return { dependencies: {}, dev: { '@nrwl/node': versions_1.nxVersion } };
+        default: {
+            return {
+                dev: {},
+                dependencies: {
+                    [preset]: presetVersion !== null && presetVersion !== void 0 ? presetVersion : (0, get_npm_package_version_1.getNpmPackageVersion)(preset),
+                },
+            };
+        }
+    }
+}
+//# sourceMappingURL=generate-preset.js.map

package/src/generators/new/generate-preset.js.map

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

package/src/generators/new/generate-workspace-files.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nrwl/devkit';
+import { NormalizedSchema } from './new';
+export declare function generateWorkspaceFiles(tree: Tree, options: NormalizedSchema): Promise<void>;

package/src/generators/{workspace/workspace.js → new/generate-workspace-files.js}

@@ -1,20 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.workspaceSchematic = exports.workspaceGenerator = exports.DEFAULT_NRWL_PRETTIER_CONFIG = void 0;
+exports.generateWorkspaceFiles = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const versions_1 = require("../../utils/versions");
-const fs_1 = require("fs");
 const path_1 = require("path");
 const presets_1 = require("../utils/presets");
 const default_base_1 = require("../../utilities/default-base");
-exports.DEFAULT_NRWL_PRETTIER_CONFIG = {
-    singleQuote: true,
-};
-function decorateAngularClI(host, options) {
-    const decorateCli = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '..', 'utils', 'decorate-angular-cli.js__tmpl__')).toString();
-    host.write((0, path_1.join)(options.directory, 'decorate-angular-cli.js'), decorateCli);
+function generateWorkspaceFiles(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        if (!options.name) {
+            throw new Error(`Invalid options, "name" is required.`);
+        }
+        options = normalizeOptions(options);
+        createReadme(tree, options);
+        createFiles(tree, options);
+        createNxJson(tree, options);
+        const [packageMajor] = (0, devkit_1.getPackageManagerVersion)(options.packageManager).split('.');
+        if (options.packageManager === 'pnpm' && +packageMajor >= 7) {
+            createNpmrc(tree, options);
+        }
+        else if (options.packageManager === 'yarn' && +packageMajor >= 2) {
+            createYarnrcYml(tree, options);
+        }
+        setPresetProperty(tree, options);
+        addNpmScripts(tree, options);
+        createAppsAndLibsFolders(tree, options);
+        setUpWorkspacesInPackageJson(tree, options);
+        yield (0, devkit_1.formatFiles)(tree);
+    });
 }
+exports.generateWorkspaceFiles = generateWorkspaceFiles;
 function setPresetProperty(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'nx.json'), (json) => {
         if (options.preset === presets_1.Preset.Core || options.preset === presets_1.Preset.NPM) {
@@ -23,22 +39,29 @@ function setPresetProperty(tree, options) {
             delete json.targetDefaults;
             delete json.targetDependencies;
             delete json.workspaceLayout;
+            delete json.npmScope;
         }
         return json;
     });
 }
-function createAppsAndLibsFolders(host, options) {
+function createAppsAndLibsFolders(tree, options) {
     if (options.preset === presets_1.Preset.Core ||
         options.preset === presets_1.Preset.TS ||
         options.preset === presets_1.Preset.NPM) {
-        host.write((0, path_1.join)(options.directory, 'packages/.gitkeep'), '');
+        tree.write((0, path_1.join)(options.directory, 'packages/.gitkeep'), '');
+    }
+    else if (options.preset === presets_1.Preset.AngularStandalone ||
+        options.preset === presets_1.Preset.ReactStandalone ||
+        options.preset === presets_1.Preset.NodeServer ||
+        options.isCustomPreset) {
+        // don't generate any folders
     }
     else {
-        host.write((0, path_1.join)(options.directory, 'apps/.gitkeep'), '');
-        host.write((0, path_1.join)(options.directory, 'libs/.gitkeep'), '');
+        tree.write((0, path_1.join)(options.directory, 'apps/.gitkeep'), '');
+        tree.write((0, path_1.join)(options.directory, 'libs/.gitkeep'), '');
     }
 }
-function createNxJson(host, { directory, npmScope, cli, packageManager, defaultBase, preset }) {
+function createNxJson(tree, { directory, npmScope, packageManager, defaultBase, preset }) {
     const nxJson = {
         $schema: './node_modules/nx/schemas/nx-schema.json',
         npmScope: npmScope,
@@ -59,6 +82,9 @@ function createNxJson(host, { directory, npmScope, cli, packageManager, defaultB
             dependsOn: ['^build'],
         },
     };
+    if (defaultBase === 'main') {
+        delete nxJson.affected;
+    }
     if (preset !== presets_1.Preset.Core &&
         preset !== presets_1.Preset.NPM &&
         preset !== presets_1.Preset.Empty) {
@@ -69,45 +95,40 @@ function createNxJson(host, { directory, npmScope, cli, packageManager, defaultB
         };
         nxJson.targetDefaults.build.inputs = ['production', '^production'];
     }
-    if (packageManager && cli === 'angular') {
-        nxJson.cli = {
-            packageManager: packageManager,
-        };
-    }
-    (0, devkit_1.writeJson)(host, (0, path_1.join)(directory, 'nx.json'), nxJson);
+    (0, devkit_1.writeJson)(tree, (0, path_1.join)(directory, 'nx.json'), nxJson);
 }
-function createFiles(host, options) {
+function createFiles(tree, options) {
     const formattedNames = (0, devkit_1.names)(options.name);
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), options.directory, Object.assign(Object.assign({ formattedNames, dot: '.', tmpl: '', workspaceFile: options.cli === 'angular' ? 'angular' : 'workspace', cliCommand: options.cli === 'angular' ? 'ng' : 'nx', nxCli: false, typescriptVersion: versions_1.typescriptVersion,
-        prettierVersion: versions_1.prettierVersion,
-        // angular cli is used only when workspace schematics is added to angular cli
-        angularCliVersion: versions_1.angularCliVersion }, options), { nxVersion: versions_1.nxVersion, packageManager: options.packageManager }));
+    const filesDirName = options.preset === presets_1.Preset.AngularStandalone ||
+        options.preset === presets_1.Preset.ReactStandalone ||
+        options.preset === presets_1.Preset.NodeServer
+        ? './files-root-app'
+        : options.preset === presets_1.Preset.NPM || options.preset === presets_1.Preset.Core
+            ? './files-package-based-repo'
+            : './files-integrated-repo';
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, filesDirName), options.directory, Object.assign(Object.assign({ formattedNames, dot: '.', tmpl: '', cliCommand: 'nx', nxCli: false }, options), { nxVersion: versions_1.nxVersion, packageManager: options.packageManager }));
 }
-function createPrettierrc(host, options) {
-    (0, devkit_1.writeJson)(host, (0, path_1.join)(options.directory, '.prettierrc'), exports.DEFAULT_NRWL_PRETTIER_CONFIG);
+function createReadme(tree, { name, appName, directory }) {
+    const formattedNames = (0, devkit_1.names)(name);
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files-readme'), directory, {
+        formattedNames,
+        appName,
+        name,
+    });
 }
 // ensure that pnpm install add all the missing peer deps
-function createNpmrc(host, options) {
-    host.write((0, path_1.join)(options.directory, '.npmrc'), 'strict-peer-dependencies=false\nauto-install-peers=true\n');
+function createNpmrc(tree, options) {
+    tree.write((0, path_1.join)(options.directory, '.npmrc'), 'strict-peer-dependencies=false\nauto-install-peers=true\n');
 }
 // ensure that yarn (berry) install uses classic node linker
-function createYarnrcYml(host, options) {
-    host.write((0, path_1.join)(options.directory, '.yarnrc.yml'), 'nodeLinker: node-modules\n');
+function createYarnrcYml(tree, options) {
+    tree.write((0, path_1.join)(options.directory, '.yarnrc.yml'), 'nodeLinker: node-modules\n');
 }
-function addNpmScripts(host, options) {
-    if (options.cli === 'angular') {
-        (0, devkit_1.updateJson)(host, (0, path_1.join)(options.directory, 'package.json'), (json) => {
-            Object.assign(json.scripts, {
-                ng: 'nx',
-                postinstall: 'node ./decorate-angular-cli.js',
-            });
-            return json;
-        });
-    }
-    if (options.preset !== presets_1.Preset.TS &&
-        options.preset !== presets_1.Preset.Core &&
-        options.preset !== presets_1.Preset.NPM) {
-        (0, devkit_1.updateJson)(host, (0, path_1.join)(options.directory, 'package.json'), (json) => {
+function addNpmScripts(tree, options) {
+    if (options.preset === presets_1.Preset.AngularStandalone ||
+        options.preset === presets_1.Preset.ReactStandalone ||
+        options.preset === presets_1.Preset.NodeServer) {
+        (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
             Object.assign(json.scripts, {
                 start: 'nx serve',
                 build: 'nx build',
@@ -117,33 +138,6 @@ function addNpmScripts(host, options) {
         });
     }
 }
-function workspaceGenerator(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (!options.name) {
-            throw new Error(`Invalid options, "name" is required.`);
-        }
-        options = normalizeOptions(options);
-        createFiles(host, options);
-        createNxJson(host, options);
-        createPrettierrc(host, options);
-        if (options.cli === 'angular') {
-            decorateAngularClI(host, options);
-        }
-        const [packageMajor] = (0, devkit_1.getPackageManagerVersion)(options.packageManager).split('.');
-        if (options.packageManager === 'pnpm' && +packageMajor >= 7) {
-            createNpmrc(host, options);
-        }
-        else if (options.packageManager === 'yarn' && +packageMajor >= 2) {
-            createYarnrcYml(host, options);
-        }
-        setPresetProperty(host, options);
-        addNpmScripts(host, options);
-        createAppsAndLibsFolders(host, options);
-        yield (0, devkit_1.formatFiles)(host);
-    });
-}
-exports.workspaceGenerator = workspaceGenerator;
-exports.workspaceSchematic = (0, devkit_1.convertNxGenerator)(workspaceGenerator);
 function addPropertyWithStableKeys(obj, key, value) {
     const copy = Object.assign({}, obj);
     Object.keys(obj).forEach((k) => {
@@ -158,4 +152,19 @@ function normalizeOptions(options) {
     let defaultBase = options.defaultBase || (0, default_base_1.deduceDefaultBase)();
     return Object.assign(Object.assign({ npmScope: options.name }, options), { defaultBase });
 }
-//# sourceMappingURL=workspace.js.map
+function setUpWorkspacesInPackageJson(tree, options) {
+    if (options.preset === presets_1.Preset.NPM || options.preset === presets_1.Preset.Core) {
+        if (options.packageManager === 'pnpm') {
+            tree.write((0, path_1.join)(options.directory, 'pnpm-workspace.yaml'), `packages:
+  - 'packages/*'
+`);
+        }
+        else {
+            (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'package.json'), (json) => {
+                json.workspaces = ['packages/*'];
+                return json;
+            });
+        }
+    }
+}
+//# sourceMappingURL=generate-workspace-files.js.map

package/src/generators/new/generate-workspace-files.js.map

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

package/src/generators/new/new.d.ts

@@ -1,21 +1,26 @@
 import { PackageManager, Tree } from '@nrwl/devkit';
-export interface Schema {
-    cli: 'nx' | 'angular';
+import { Linter } from '../../utils/lint';
+interface Schema {
     directory: string;
     name: string;
-    appName: string;
+    appName?: string;
     npmScope?: string;
     skipInstall?: boolean;
     style?: string;
     nxCloud?: boolean;
     preset: string;
     defaultBase: string;
-    linter: 'tslint' | 'eslint';
+    framework?: string;
+    docker?: boolean;
+    linter?: Linter;
+    bundler?: 'vite' | 'webpack';
+    standaloneApi?: boolean;
+    routing?: boolean;
     packageManager?: PackageManager;
 }
 export interface NormalizedSchema extends Schema {
     presetVersion?: string;
+    isCustomPreset: boolean;
 }
-export declare function newGenerator(host: Tree, options: Schema): Promise<() => Promise<void>>;
+export declare function newGenerator(host: Tree, opts: Schema): Promise<() => Promise<void>>;
 export default newGenerator;
-export declare const newSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;