@nrwl/workspace 15.1.1 → 15.2.0-beta.0

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [15.1.1](https://github.com/nrwl/nx/compare/15.1.0...15.1.1) (2022-11-16)
+# [15.2.0-beta.0](https://github.com/nrwl/nx/compare/15.1.0...15.2.0-beta.0) (2022-11-17)
 
 **Note:** Version bump only for package @nrwl/workspace

package/README.md

@@ -55,7 +55,6 @@ The `create-nx-workspace` command will ask you to select a preset, which will co
   express           [a workspace with a single Express application]
   web components    [a workspace with a single app built using web components]
   react-native      [a workspace with a single React Native application]
-  react-express     [a workspace with a full stack application (React + Express)]
 ```
 
 Select the preset that works best for you

package/generators.json

@@ -2,20 +2,6 @@
   "name": "nx/workspace",
   "version": "0.1",
   "schematics": {
-    "workspace": {
-      "factory": "./src/generators/workspace/workspace#workspaceSchematic",
-      "schema": "./src/generators/workspace/schema.json",
-      "description": "Create an empty workspace.",
-      "hidden": true
-    },
-
-    "preset": {
-      "factory": "./src/generators/preset/preset#presetSchematic",
-      "schema": "./src/generators/preset/schema.json",
-      "description": "Create an application in an empty workspace.",
-      "hidden": true
-    },
-
     "move": {
       "factory": "./src/generators/move/move#moveSchematic",
       "schema": "./src/generators/move/schema.json",
@@ -30,13 +16,6 @@
       "description": "Remove an application or library."
     },
 
-    "new": {
-      "factory": "./src/generators/new/new#newSchematic",
-      "schema": "./src/generators/new/schema.json",
-      "description": "Create a workspace.",
-      "hidden": true
-    },
-
     "library": {
       "factory": "./src/generators/library/library#librarySchematic",
       "schema": "./src/generators/library/schema.json",
@@ -73,13 +52,6 @@
     }
   },
   "generators": {
-    "workspace": {
-      "factory": "./src/generators/workspace/workspace#workspaceGenerator",
-      "schema": "./src/generators/workspace/schema.json",
-      "description": "Create an empty workspace.",
-      "hidden": true
-    },
-
     "preset": {
       "factory": "./src/generators/preset/preset#presetGenerator",
       "schema": "./src/generators/preset/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/workspace",
-  "version": "15.1.1",
+  "version": "15.2.0-beta.0",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -33,31 +33,31 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/angular": "15.1.1",
-      "@nrwl/cli": "15.1.1",
-      "@nrwl/cypress": "15.1.1",
-      "@nrwl/detox": "15.1.1",
-      "@nrwl/devkit": "15.1.1",
-      "@nrwl/esbuild": "15.1.1",
-      "@nrwl/eslint-plugin-nx": "15.1.1",
-      "@nrwl/expo": "15.1.1",
-      "@nrwl/express": "15.1.1",
-      "@nrwl/jest": "15.1.1",
-      "@nrwl/js": "15.1.1",
-      "@nrwl/linter": "15.1.1",
-      "@nrwl/nest": "15.1.1",
-      "@nrwl/next": "15.1.1",
-      "@nrwl/node": "15.1.1",
+      "@nrwl/angular": "15.2.0-beta.0",
+      "@nrwl/cli": "15.2.0-beta.0",
+      "@nrwl/cypress": "15.2.0-beta.0",
+      "@nrwl/detox": "15.2.0-beta.0",
+      "@nrwl/devkit": "15.2.0-beta.0",
+      "@nrwl/esbuild": "15.2.0-beta.0",
+      "@nrwl/eslint-plugin-nx": "15.2.0-beta.0",
+      "@nrwl/expo": "15.2.0-beta.0",
+      "@nrwl/express": "15.2.0-beta.0",
+      "@nrwl/jest": "15.2.0-beta.0",
+      "@nrwl/js": "15.2.0-beta.0",
+      "@nrwl/linter": "15.2.0-beta.0",
+      "@nrwl/nest": "15.2.0-beta.0",
+      "@nrwl/next": "15.2.0-beta.0",
+      "@nrwl/node": "15.2.0-beta.0",
       "@nrwl/nx-cloud": "latest",
-      "@nrwl/nx-plugin": "15.1.1",
-      "@nrwl/react": "15.1.1",
-      "@nrwl/react-native": "15.1.1",
-      "@nrwl/rollup": "15.1.1",
-      "@nrwl/storybook": "15.1.1",
-      "@nrwl/tao": "15.1.1",
-      "@nrwl/web": "15.1.1",
-      "@nrwl/webpack": "15.1.1",
-      "nx": "15.1.1"
+      "@nrwl/nx-plugin": "15.2.0-beta.0",
+      "@nrwl/react": "15.2.0-beta.0",
+      "@nrwl/react-native": "15.2.0-beta.0",
+      "@nrwl/rollup": "15.2.0-beta.0",
+      "@nrwl/storybook": "15.2.0-beta.0",
+      "@nrwl/tao": "15.2.0-beta.0",
+      "@nrwl/web": "15.2.0-beta.0",
+      "@nrwl/webpack": "15.2.0-beta.0",
+      "nx": "15.2.0-beta.0"
     }
   },
   "peerDependencies": {
@@ -69,9 +69,9 @@
     }
   },
   "dependencies": {
-    "@nrwl/devkit": "15.1.1",
-    "@nrwl/jest": "15.1.1",
-    "@nrwl/linter": "15.1.1",
+    "@nrwl/devkit": "15.2.0-beta.0",
+    "@nrwl/jest": "15.2.0-beta.0",
+    "@nrwl/linter": "15.2.0-beta.0",
     "@parcel/watcher": "2.0.4",
     "chalk": "4.1.0",
     "chokidar": "^3.5.1",
@@ -86,7 +86,7 @@
     "ignore": "^5.0.4",
     "minimatch": "3.0.5",
     "npm-run-path": "^4.0.1",
-    "nx": "15.1.1",
+    "nx": "15.2.0-beta.0",
     "open": "^8.4.0",
     "rxjs": "^6.5.4",
     "semver": "7.3.4",
@@ -99,5 +99,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "bba79b4997105c100b7b65cbf66c9714ef9b5b0d"
+  "gitHead": "b084dddff06a717f6dea817bb984e49c1eb61f55"
 }

package/src/generators/{workspace/files-root-app → new/files-integrated-repo}/__dot__vscode/extensions.json__tmpl__

@@ -1,6 +1,6 @@
 {
   "recommendations": [
-    <% if(cli === 'angular') { %>
+    <% if(cliCommand === 'ng') { %>
     "angular.ng-template",<% }
     %>
     "nrwl.angular-console",

package/src/generators/{workspace/files → new/files-package-based-repo}/__dot__vscode/extensions.json__tmpl__

@@ -1,6 +1,6 @@
 {
   "recommendations": [
-    <% if(cli === 'angular') { %>
+    <% if(cliCommand === 'ng') { %>
     "angular.ng-template",<% }
     %>
     "nrwl.angular-console",

package/src/generators/{workspace/files-npm → new/files-root-app}/__dot__vscode/extensions.json__tmpl__

@@ -1,6 +1,6 @@
 {
   "recommendations": [
-    <% if(cli === 'angular') { %>
+    <% if(cliCommand === 'ng') { %>
     "angular.ng-template",<% }
     %>
     "nrwl.angular-console",

package/src/generators/{workspace/files → new/files-root-app}/package.json__tmpl__

@@ -8,7 +8,6 @@
   "dependencies": {
   },
   "devDependencies": {
-     <% if(cli === 'angular') { %>"@angular/cli": "<%= angularCliVersion %>",<% } %>
     "nx": "<%= nxVersion %>",
     "@nrwl/cli": "<%= nxVersion %>",
     "@nrwl/workspace": "<%= nxVersion %>",

package/src/generators/new/generate-preset.d.ts

@@ -0,0 +1,4 @@
+import { Tree } from '@nrwl/devkit';
+import { NormalizedSchema } from './new';
+export declare function addPresetDependencies(host: Tree, options: NormalizedSchema): import("@nrwl/devkit").GeneratorCallback;
+export declare function generatePreset(host: Tree, opts: NormalizedSchema): Promise<void>;

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

@@ -0,0 +1,115 @@
+"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.preset, options.presetVersion);
+    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'],
+    });
+    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} 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) {
+        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,
+            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];
+    }
+}
+exports.generatePreset = generatePreset;
+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.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.ReactExperimental:
+            return { dependencies: {}, dev: { '@nrwl/react': 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) },
+            };
+        }
+    }
+}
+//# 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,6 @@
+import { Tree } from '@nrwl/devkit';
+import { NormalizedSchema } from './new';
+export declare const DEFAULT_NRWL_PRETTIER_CONFIG: {
+    singleQuote: boolean;
+};
+export declare function generateWorkspaceFiles(host: Tree, options: NormalizedSchema): Promise<void>;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.workspaceSchematic = exports.workspaceGenerator = exports.DEFAULT_NRWL_PRETTIER_CONFIG = void 0;
+exports.generateWorkspaceFiles = exports.DEFAULT_NRWL_PRETTIER_CONFIG = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const versions_1 = require("../../utils/versions");
@@ -11,6 +11,33 @@ const default_base_1 = require("../../utilities/default-base");
 exports.DEFAULT_NRWL_PRETTIER_CONFIG = {
     singleQuote: true,
 };
+function generateWorkspaceFiles(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.preset === presets_1.Preset.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);
+        setUpWorkspacesInPackageJson(host, options);
+        yield (0, devkit_1.formatFiles)(host);
+    });
+}
+exports.generateWorkspaceFiles = generateWorkspaceFiles;
 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);
@@ -42,7 +69,7 @@ function createAppsAndLibsFolders(host, options) {
         host.write((0, path_1.join)(options.directory, 'libs/.gitkeep'), '');
     }
 }
-function createNxJson(host, { directory, npmScope, cli, packageManager, defaultBase, preset }) {
+function createNxJson(host, { directory, npmScope, packageManager, defaultBase, preset }) {
     const nxJson = {
         $schema: './node_modules/nx/schemas/nx-schema.json',
         npmScope: npmScope,
@@ -76,11 +103,6 @@ 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);
 }
 function createFiles(host, options) {
@@ -88,9 +110,9 @@ function createFiles(host, options) {
     const filesDirName = options.preset === presets_1.Preset.ReactExperimental
         ? './files-root-app'
         : options.preset === presets_1.Preset.NPM || options.preset === presets_1.Preset.Core
-            ? './files-npm'
-            : './files';
-    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, filesDirName), 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,
+            ? './files-package-based-repo'
+            : './files-integrated-repo';
+    (0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, filesDirName), options.directory, Object.assign(Object.assign({ formattedNames, dot: '.', tmpl: '', workspaceFile: options.preset === presets_1.Preset.Angular ? 'angular' : 'workspace', cliCommand: options.preset === presets_1.Preset.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 }));
@@ -107,7 +129,7 @@ function createYarnrcYml(host, options) {
     host.write((0, path_1.join)(options.directory, '.yarnrc.yml'), 'nodeLinker: node-modules\n');
 }
 function addNpmScripts(host, options) {
-    if (options.cli === 'angular') {
+    if (options.preset === presets_1.Preset.Angular) {
         (0, devkit_1.updateJson)(host, (0, path_1.join)(options.directory, 'package.json'), (json) => {
             Object.assign(json.scripts, {
                 ng: 'nx',
@@ -129,34 +151,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);
-        setUpWorkspacesInPackageJson(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) => {
@@ -186,4 +180,4 @@ function setUpWorkspacesInPackageJson(tree, options) {
         }
     }
 }
-//# sourceMappingURL=workspace.js.map
+//# 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,17 +1,16 @@
 import { PackageManager, Tree } from '@nrwl/devkit';
 import { Linter } from '../../utils/lint';
-export interface Schema {
-    cli: 'nx' | 'angular';
+interface Schema {
     directory: string;
     name: string;
-    appName: string;
+    appName?: string;
     npmScope?: string;
     skipInstall?: boolean;
     style?: string;
     nxCloud?: boolean;
     preset: string;
     defaultBase: string;
-    linter: Linter;
+    linter?: Linter;
     packageManager?: PackageManager;
 }
 export interface NormalizedSchema extends Schema {
@@ -19,4 +18,3 @@ export interface NormalizedSchema extends Schema {
 }
 export declare function newGenerator(host: Tree, options: Schema): Promise<() => Promise<void>>;
 export default newGenerator;
-export declare const newSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/new/new.js

@@ -1,173 +1,50 @@
 "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];
-    }
-}
+const generate_workspace_files_1 = require("./generate-workspace-files");
+const generate_preset_1 = require("./generate-preset");
 function newGenerator(host, options) {
     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 }));
-        addPresetDependencies(host, options);
+        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);
             if (options.preset !== presets_1.Preset.NPM && options.preset !== presets_1.Preset.Core) {
-                yield generatePreset(host, options);
+                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.ReactExperimental:
-            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 ((0, devkit_1.getWorkspacePath)(host)) {
+        throw new Error('Cannot generate a new workspace within an existing workspace');
+    }
+    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;
@@ -184,4 +61,9 @@ function normalizeOptions(options) {
     }
     return options;
 }
+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/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 default presetGenerator;

package/src/generators/preset/preset.js

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.presetSchematic = exports.presetGenerator = void 0;
+exports.presetGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const path_1 = require("nx/src/utils/path");
-const library_1 = require("../library/library");
-const insert_import_1 = require("../utils/insert-import");
 const insert_statement_1 = require("../utils/insert-statement");
 const presets_1 = require("../utils/presets");
 function presetGenerator(tree, options) {
@@ -19,7 +16,6 @@ function presetGenerator(tree, options) {
     });
 }
 exports.presetGenerator = presetGenerator;
-exports.presetSchematic = (0, devkit_1.convertNxGenerator)(presetGenerator);
 exports.default = presetGenerator;
 function createPreset(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -79,54 +75,6 @@ function createPreset(tree, options) {
             });
             addPolyfills(tree, `apps/${(0, devkit_1.names)(options.name).fileName}/src/polyfills.ts`, ['@ungap/custom-elements']);
         }
-        else if (options.preset === presets_1.Preset.AngularWithNest) {
-            const { applicationGenerator: angularApplicationGenerator, } = require('@nrwl' + '/angular/generators');
-            const { applicationGenerator: nestApplicationGenerator } = require('@nrwl' +
-                '/nest');
-            yield angularApplicationGenerator(tree, {
-                name: options.name,
-                style: options.style,
-                linter: options.linter,
-                skipFormat: true,
-                standaloneConfig: options.standaloneConfig,
-            });
-            yield nestApplicationGenerator(tree, {
-                name: 'api',
-                frontendProject: options.name,
-                linter: options.linter,
-                standaloneConfig: options.standaloneConfig,
-            });
-            yield (0, library_1.libraryGenerator)(tree, {
-                name: 'api-interfaces',
-                unitTestRunner: 'none',
-                linter: options.linter,
-                standaloneConfig: options.standaloneConfig,
-            });
-            connectAngularAndNest(tree, options);
-        }
-        else if (options.preset === presets_1.Preset.ReactWithExpress) {
-            const { applicationGenerator: expressApplicationGenerator, } = require('@nrwl' + '/express');
-            const { applicationGenerator: reactApplicationGenerator, } = require('@nrwl' + '/react');
-            yield reactApplicationGenerator(tree, {
-                name: options.name,
-                style: options.style,
-                linter: options.linter,
-                standaloneConfig: options.standaloneConfig,
-            });
-            yield expressApplicationGenerator(tree, {
-                name: 'api',
-                frontendProject: options.name,
-                linter: options.linter,
-                standaloneConfig: options.standaloneConfig,
-            });
-            yield (0, library_1.libraryGenerator)(tree, {
-                name: 'api-interfaces',
-                unitTestRunner: 'none',
-                linter: options.linter,
-                standaloneConfig: options.standaloneConfig,
-            });
-            connectReactAndExpress(tree, options);
-        }
         else if (options.preset === presets_1.Preset.Nest) {
             const { applicationGenerator: nestApplicationGenerator } = require('@nrwl' +
                 '/nest');
@@ -175,160 +123,6 @@ function createPreset(tree, options) {
         }
     });
 }
-function connectAngularAndNest(host, options) {
-    var _a;
-    const { insertNgModuleImport } = require('@nrwl' +
-        '/angular/src/generators/utils');
-    host.write('libs/api-interfaces/src/lib/api-interfaces.ts', `export interface Message { message: string }`);
-    const modulePath = `apps/${options.name}/src/app/app.module.ts`;
-    (0, insert_import_1.insertImport)(host, modulePath, 'HttpClientModule', '@angular/common/http');
-    insertNgModuleImport(host, modulePath, 'HttpClientModule');
-    const importScope = (0, path_1.getImportPath)(options.npmScope, '');
-    const scopePrefix = options.npmScope ? `${options.npmScope}-` : '';
-    const style = (_a = options.style) !== null && _a !== void 0 ? _a : 'css';
-    host.write(`apps/${options.name}/src/app/app.component.ts`, `import { Component } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { Message } from '${importScope}api-interfaces';
-
-@Component({
-  selector: '${scopePrefix}root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.${style}']
-})
-export class AppComponent {
-  hello$ = this.http.get<Message>('/api/hello')
-  constructor(private http: HttpClient) {}
-}
-    `);
-    host.write(`apps/${options.name}/src/app/app.component.spec.ts`, `import { Component } from '@angular/core';
-import { TestBed, async } from '@angular/core/testing';
-import { HttpClientModule } from '@angular/common/http';
-import { AppComponent } from './app.component';
-
-describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [AppComponent],
-      imports: [HttpClientModule]
-    }).compileComponents();
-  }));
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  });
-});
-    `);
-    host.write(`apps/${options.name}/src/app/app.component.html`, `<div style="text-align:center">
-  <h1>Welcome to ${options.name}!</h1>
-  <img
-    width="450"
-    src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png"
-    alt="Nx - Smart, Fast and Extensible Build System"
-  />
-</div>
-<div>Message: {{ (hello$|async)|json }}</div>
-    `);
-    host.write(`apps/api/src/app/app.controller.ts`, `import { Controller, Get } from '@nestjs/common';
-
-import { Message } from '${importScope}api-interfaces';
-
-import { AppService } from './app.service';
-
-@Controller()
-export class AppController {
-  constructor(private readonly appService: AppService) {}
-
-  @Get('hello')
-  getData(): Message {
-    return this.appService.getData();
-  }
-}
-    `);
-    host.write(`apps/api/src/app/app.service.ts`, `import { Injectable } from '@nestjs/common';
-import { Message } from '${importScope}api-interfaces';
-
-@Injectable()
-export class AppService {
-  getData(): Message {
-    return { message: 'Welcome to api!' };
-  }
-}
-    `);
-}
-function connectReactAndExpress(host, options) {
-    const importScope = (0, path_1.getImportPath)(options.npmScope, '');
-    host.write('libs/api-interfaces/src/lib/api-interfaces.ts', `export interface Message { message: string }`);
-    host.write(`apps/${options.name}/src/app/app.tsx`, `import React, { useEffect, useState } from 'react';
-import { Message } from '${importScope}api-interfaces';
-
-export const App = () => {
-  const [m, setMessage] = useState<Message>({ message: '' });
-
-  useEffect(() => {
-    fetch('/api')
-      .then(r => r.json())
-      .then(setMessage);
-  }, []);
-
-  return (
-    <>
-      <div style={{ textAlign: 'center' }}>
-        <h1>Welcome to ${options.name}!</h1>
-        <img
-          width="450"
-          src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.png"
-          alt="Nx - Smart, Fast and Extensible Build System"
-        />
-      </div>
-      <div>{m.message}</div>
-    </>
-  );
-};
-
-export default App;
-    `);
-    host.write(`apps/${options.name}/src/app/app.spec.tsx`, `import { cleanup, getByText, render, waitFor } from '@testing-library/react';
-import React from 'react';
-import App from './app';
-
-describe('App', () => {
-  afterEach(() => {
-    delete global['fetch'];
-    cleanup();
-  });
-
-  it('should render successfully', async () => {
-    global['fetch'] = jest.fn().mockResolvedValueOnce({
-      json: () => ({
-        message: 'my message'
-      })
-    });
-
-    const { baseElement } = render(<App />);
-    await waitFor(() => getByText(baseElement, 'my message'));
-  });
-});
-    `);
-    host.write(`apps/api/src/main.ts`, `import * as express from 'express';
-import { Message } from '${importScope}api-interfaces';
-
-const app = express();
-
-const greeting: Message = { message: 'Welcome to api!' };
-
-app.get('/api', (req, res) => {
-  res.send(greeting);
-});
-
-const port = process.env.port || 3333;
-const server = app.listen(port, () => {
-  console.log('Listening at http://localhost:' + port + '/api');
-});
-server.on('error', console.error);
-    `);
-}
 function addPolyfills(host, polyfillsPath, polyfills) {
     for (const polyfill of polyfills) {
         (0, insert_statement_1.insertStatement)(host, polyfillsPath, `import '${polyfill}';\n`);

package/src/generators/preset/preset.js.map

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

package/src/generators/utils/presets.d.ts

@@ -6,10 +6,8 @@ export declare enum Preset {
     TS = "ts",
     WebComponents = "web-components",
     Angular = "angular",
-    AngularWithNest = "angular-nest",
     React = "react",
     ReactExperimental = "react-experimental",
-    ReactWithExpress = "react-express",
     ReactNative = "react-native",
     Expo = "expo",
     NextJs = "next",

package/src/generators/utils/presets.js

@@ -10,10 +10,8 @@ var Preset;
     Preset["TS"] = "ts";
     Preset["WebComponents"] = "web-components";
     Preset["Angular"] = "angular";
-    Preset["AngularWithNest"] = "angular-nest";
     Preset["React"] = "react";
     Preset["ReactExperimental"] = "react-experimental";
-    Preset["ReactWithExpress"] = "react-express";
     Preset["ReactNative"] = "react-native";
     Preset["Expo"] = "expo";
     Preset["NextJs"] = "next";

package/src/generators/utils/presets.js.map

@@ -1 +1 @@
-{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/presets.ts"],"names":[],"mappings":";;;AAAA,IAAY,MAiBX;AAjBD,WAAY,MAAM;IAChB,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,qBAAW,CAAA;IACX,mBAAS,CAAA;IACT,0CAAgC,CAAA;IAChC,6BAAmB,CAAA;IACnB,0CAAgC,CAAA;IAChC,yBAAe,CAAA;IACf,kDAAwC,CAAA;IACxC,4CAAkC,CAAA;IAClC,sCAA4B,CAAA;IAC5B,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,6BAAmB,CAAA;AACrB,CAAC,EAjBW,MAAM,GAAN,cAAM,KAAN,cAAM,QAiBjB"}
+{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/presets.ts"],"names":[],"mappings":";;;AAAA,IAAY,MAeX;AAfD,WAAY,MAAM;IAChB,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,qBAAW,CAAA;IACX,mBAAS,CAAA;IACT,0CAAgC,CAAA;IAChC,6BAAmB,CAAA;IACnB,yBAAe,CAAA;IACf,kDAAwC,CAAA;IACxC,sCAA4B,CAAA;IAC5B,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,6BAAmB,CAAA;AACrB,CAAC,EAfW,MAAM,GAAN,cAAM,KAAN,cAAM,QAejB"}

package/src/generators/workspace/schema.json

@@ -66,12 +66,6 @@
       "description": "The package manager used to install dependencies.",
       "type": "string",
       "enum": ["npm", "yarn", "pnpm"]
-    },
-    "cli": {
-      "description": "CLI used for generating code and running tasks",
-      "type": "string",
-      "enum": ["nx", "angular"],
-      "default": "nx"
     }
   }
 }

package/src/utils/versions.d.ts

@@ -1,5 +1,5 @@
 export declare const nxVersion: any;
-export declare const angularCliVersion = "~14.2.0";
+export declare const angularCliVersion = "~15.0.0";
 export declare const typescriptVersion = "~4.8.2";
 export declare const prettierVersion = "^2.6.2";
 export declare const typescriptESLintVersion = "^5.36.1";

package/src/utils/versions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.typescriptESLintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.angularCliVersion = '~14.2.0';
+exports.angularCliVersion = '~15.0.0';
 exports.typescriptVersion = '~4.8.2';
 exports.prettierVersion = '^2.6.2';
 exports.typescriptESLintVersion = '^5.36.1';

package/src/generators/workspace/schema.d.ts

@@ -1,15 +0,0 @@
-import { PackageManager } from '@nrwl/devkit';
-
-export interface Schema {
-  name: string;
-  directory: string;
-  npmScope?: string;
-  skipInstall?: boolean;
-  skipGit?: boolean;
-  style?: string;
-  commit?: { name: string; email: string; message?: string };
-  cli: 'nx' | 'angular';
-  preset: string;
-  defaultBase: string;
-  packageManager?: PackageManager;
-}

package/src/generators/workspace/workspace.d.ts

@@ -1,7 +0,0 @@
-import { Tree } from '@nrwl/devkit';
-import { Schema } from './schema';
-export declare const DEFAULT_NRWL_PRETTIER_CONFIG: {
-    singleQuote: boolean;
-};
-export declare function workspaceGenerator(host: Tree, options: Schema): Promise<void>;
-export declare const workspaceSchematic: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;

package/src/generators/workspace/workspace.js.map

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