nx 16.6.0-beta.3 → 16.6.0-beta.5

package/.eslintrc.json

@@ -70,6 +70,36 @@
         ],
         "no-restricted-imports": "off"
       }
+    },
+    {
+      "files": ["./package.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/dependency-checks": [
+          "error",
+          {
+            "buildTargets": ["build-base"],
+            "ignoredDependencies": [
+              "typescript",
+              "@angular-devkit/build-angular",
+              "@angular-devkit/core",
+              "@angular-devkit/architect",
+              "@swc/core", //Optional, used in JS analysis if available
+              "@swc/node-register", //Optional, used in JS analysis if available
+              "rxjs",
+              "@angular-devkit/schematics",
+              "@pnpm/lockfile-types",
+              "@nestjs/cli", // nx init nest makes use of nestjs cli (which should be available in NestJS CLI app) to parse the nest-cli.json file
+              "ts-node", // We *may* fall back on ts-node, but we want to encourage the use of @swc-node instead so we don't explicitly list ts-node as an optional dep
+              "memfs", // used in mock for handling .node files in tests
+              "events", // This is coming from @storybook/builder-manager since it uses the browser polyfill
+              "process", // This is coming from @storybook/builder-manager since it uses the browser polyfill
+              "prettier", // This is coming from @storybook/builder-manager since it uses the browser polyfill
+              "util" // This is coming from @storybook/builder-manager since it uses the browser polyfill
+            ]
+          }
+        ]
+      }
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "16.6.0-beta.3",
+  "version": "16.6.0-beta.5",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -32,7 +32,7 @@
   },
   "homepage": "https://nx.dev",
   "dependencies": {
-    "@nrwl/tao": "16.6.0-beta.3",
+    "@nrwl/tao": "16.6.0-beta.5",
     "@parcel/watcher": "2.0.4",
     "@yarnpkg/lockfile": "^1.1.0",
     "@yarnpkg/parsers": "3.0.0-rc.46",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "16.6.0-beta.3",
-    "@nx/nx-darwin-x64": "16.6.0-beta.3",
-    "@nx/nx-freebsd-x64": "16.6.0-beta.3",
-    "@nx/nx-linux-arm-gnueabihf": "16.6.0-beta.3",
-    "@nx/nx-linux-arm64-gnu": "16.6.0-beta.3",
-    "@nx/nx-linux-arm64-musl": "16.6.0-beta.3",
-    "@nx/nx-linux-x64-gnu": "16.6.0-beta.3",
-    "@nx/nx-linux-x64-musl": "16.6.0-beta.3",
-    "@nx/nx-win32-arm64-msvc": "16.6.0-beta.3",
-    "@nx/nx-win32-x64-msvc": "16.6.0-beta.3"
+    "@nx/nx-darwin-arm64": "16.6.0-beta.5",
+    "@nx/nx-darwin-x64": "16.6.0-beta.5",
+    "@nx/nx-freebsd-x64": "16.6.0-beta.5",
+    "@nx/nx-linux-arm-gnueabihf": "16.6.0-beta.5",
+    "@nx/nx-linux-arm64-gnu": "16.6.0-beta.5",
+    "@nx/nx-linux-arm64-musl": "16.6.0-beta.5",
+    "@nx/nx-linux-x64-gnu": "16.6.0-beta.5",
+    "@nx/nx-linux-x64-musl": "16.6.0-beta.5",
+    "@nx/nx-win32-arm64-msvc": "16.6.0-beta.5",
+    "@nx/nx-win32-x64-msvc": "16.6.0-beta.5"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -177,5 +177,5 @@
   },
   "main": "./bin/nx.js",
   "types": "./bin/nx.d.ts",
-  "gitHead": "cd8c61d7a3b8ab9bc7bab068f5ca49bbf14abbf5"
+  "gitHead": "aab868aa0c30949832fe2c4b9cb109c204442e39"
 }

package/src/adapter/angular-json.js

@@ -21,6 +21,7 @@ function shouldMergeAngularProjects(root, includeProjectsFromAngularJson) {
 exports.shouldMergeAngularProjects = shouldMergeAngularProjects;
 function isAngularPluginInstalled() {
     try {
+        // nx-ignore-next-line
         require.resolve('@nx/angular');
         return true;
     }

package/src/adapter/ngcli-adapter.d.ts

@@ -4,6 +4,12 @@ import { Observable } from 'rxjs';
 import type { GenerateOptions } from '../command-line/generate/generate';
 import { ProjectConfiguration } from '../config/workspace-json-project-json';
 import { Tree } from '../generators/tree';
+import { ExecutorContext } from '../config/misc-interfaces';
+export declare function createBuilderContext(builderInfo: {
+    builderName: string;
+    description: string;
+    optionSchema: any;
+}, context: ExecutorContext): Promise<import("@angular-devkit/architect").BuilderContext>;
 export declare function scheduleTarget(root: string, opts: {
     project: string;
     target: string;

package/src/adapter/ngcli-adapter.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLogger = exports.wrapAngularDevkitSchematic = exports.mockSchematicsForTesting = exports.overrideCollectionResolutionForTesting = exports.runMigration = exports.generate = exports.NxScopeHostUsedForWrappedSchematics = exports.arrayBufferToString = exports.NxScopedHost = exports.scheduleTarget = void 0;
+exports.getLogger = exports.wrapAngularDevkitSchematic = exports.mockSchematicsForTesting = exports.overrideCollectionResolutionForTesting = exports.runMigration = exports.generate = exports.NxScopeHostUsedForWrappedSchematics = exports.arrayBufferToString = exports.NxScopedHost = exports.scheduleTarget = exports.createBuilderContext = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@angular-devkit/core");
 const node_1 = require("@angular-devkit/core/node");
@@ -20,9 +20,67 @@ const package_json_1 = require("../utils/package-json");
 const package_manager_1 = require("../utils/package-manager");
 const angular_json_1 = require("./angular-json");
 const executor_utils_1 = require("../command-line/run/executor-utils");
-const workspaces_1 = require("../config/workspaces");
 const nx_plugin_1 = require("../utils/nx-plugin");
 const schema_utils_1 = require("../config/schema-utils");
+function createBuilderContext(builderInfo, context) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        require('nx/src/adapter/compat');
+        const fsHost = new NxScopedHost(context.root);
+        const { workspace } = yield core_1.workspaces.readWorkspace('angular.json', core_1.workspaces.createWorkspaceHost(fsHost));
+        const architectHost = yield getWrappedWorkspaceNodeModulesArchitectHost(workspace, context.root);
+        const registry = new core_1.schema.CoreSchemaRegistry();
+        registry.addPostTransform(core_1.schema.transforms.addUndefinedDefaults);
+        registry.addSmartDefaultProvider('unparsed', () => {
+            // This happens when context.scheduleTarget is used to run a target using nx:run-commands
+            return [];
+        });
+        const { Architect } = require('@angular-devkit/architect');
+        const architect = new Architect(architectHost, registry);
+        const { firstValueFrom } = require('rxjs');
+        const toPromise = (obs) => firstValueFrom ? firstValueFrom(obs) : obs.toPromise();
+        const validateOptions = (options, builderName) => toPromise(architect['_scheduler'].schedule('..validateOptions', [
+            builderName,
+            options,
+        ]).output);
+        const getProjectMetadata = (target) => toPromise(architect['_scheduler'].schedule('..getProjectMetadata', target).output);
+        const builderContext = {
+            workspaceRoot: context.root,
+            target: {
+                project: context.projectName,
+                target: context.targetName,
+                configuration: context.configurationName,
+            },
+            builder: Object.assign({}, builderInfo),
+            logger: (0, exports.getLogger)(),
+            id: 1,
+            currentDirectory: process.cwd(),
+            scheduleTarget: architect.scheduleTarget,
+            getBuilderNameForTarget: architectHost.getBuilderNameForTarget,
+            scheduleBuilder: architect.scheduleBuilder,
+            getTargetOptions: architectHost.getOptionsForTarget,
+            addTeardown(teardown) {
+                // No-op as Nx doesn't require an implementation of this function
+                return;
+            },
+            reportProgress(...args) {
+                // No-op as Nx doesn't require an implementation of this function
+                return;
+            },
+            reportRunning(...args) {
+                // No-op as Nx doesn't require an implementation of this function
+                return;
+            },
+            reportStatus(status) {
+                // No-op as Nx doesn't require an implementation of this function
+                return;
+            },
+            getProjectMetadata,
+            validateOptions,
+        };
+        return builderContext;
+    });
+}
+exports.createBuilderContext = createBuilderContext;
 function scheduleTarget(root, opts, verbose) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { Architect } = require('@angular-devkit/architect');
@@ -35,74 +93,7 @@ function scheduleTarget(root, opts, verbose) {
             // This happens when context.scheduleTarget is used to run a target using nx:run-commands
             return [];
         });
-        const AngularWorkspaceNodeModulesArchitectHost = require('@angular-devkit/architect/node').WorkspaceNodeModulesArchitectHost;
-        class WrappedWorkspaceNodeModulesArchitectHost extends AngularWorkspaceNodeModulesArchitectHost {
-            constructor(workspace, root) {
-                super(workspace, root);
-                this.workspace = workspace;
-                this.root = root;
-                this.workspaces = new workspaces_1.Workspaces(this.root);
-            }
-            resolveBuilder(builderStr) {
-                return tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    const [packageName, builderName] = builderStr.split(':');
-                    const { executorsFilePath, executorConfig } = this.readExecutorsJson(packageName, builderName);
-                    const builderInfo = this.readExecutor(packageName, builderName);
-                    return {
-                        name: builderStr,
-                        builderName,
-                        description: (0, fileutils_1.readJsonFile)(executorsFilePath).builders[builderName]
-                            .description,
-                        optionSchema: builderInfo.schema,
-                        import: (0, schema_utils_1.resolveImplementation)(executorConfig.implementation, (0, path_1.dirname)(executorsFilePath)),
-                    };
-                });
-            }
-            readExecutorsJson(nodeModule, builder) {
-                var _a, _b;
-                const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(nodeModule, this.workspaces['resolvePaths'].bind(this.workspaces)());
-                const executorsFile = (_a = packageJson.executors) !== null && _a !== void 0 ? _a : packageJson.builders;
-                if (!executorsFile) {
-                    throw new Error(`The "${nodeModule}" package does not support Nx executors or Angular Devkit Builders.`);
-                }
-                const executorsFilePath = require.resolve((0, path_1.join)((0, path_1.dirname)(packageJsonPath), executorsFile));
-                const executorsJson = (0, fileutils_1.readJsonFile)(executorsFilePath);
-                const executorConfig = (_b = executorsJson.builders) === null || _b === void 0 ? void 0 : _b[builder];
-                if (!executorConfig) {
-                    throw new Error(`Cannot find builder '${builder}' in ${executorsFilePath}.`);
-                }
-                return { executorsFilePath, executorConfig, isNgCompat: true };
-            }
-            readExecutor(nodeModule, executor) {
-                try {
-                    const { executorsFilePath, executorConfig, isNgCompat } = this.readExecutorsJson(nodeModule, executor);
-                    const executorsDir = (0, path_1.dirname)(executorsFilePath);
-                    const schemaPath = (0, schema_utils_1.resolveSchema)(executorConfig.schema, executorsDir);
-                    const schema = (0, executor_utils_1.normalizeExecutorSchema)((0, fileutils_1.readJsonFile)(schemaPath));
-                    const implementationFactory = this.getImplementationFactory(executorConfig.implementation, executorsDir);
-                    const batchImplementationFactory = executorConfig.batchImplementation
-                        ? this.getImplementationFactory(executorConfig.batchImplementation, executorsDir)
-                        : null;
-                    const hasherFactory = executorConfig.hasher
-                        ? this.getImplementationFactory(executorConfig.hasher, executorsDir)
-                        : null;
-                    return {
-                        schema,
-                        implementationFactory,
-                        batchImplementationFactory,
-                        hasherFactory,
-                        isNgCompat,
-                    };
-                }
-                catch (e) {
-                    throw new Error(`Unable to resolve ${nodeModule}:${executor}.\n${e.message}`);
-                }
-            }
-            getImplementationFactory(implementation, executorsDir) {
-                return (0, schema_utils_1.getImplementationFactory)(implementation, executorsDir);
-            }
-        }
-        const architectHost = new WrappedWorkspaceNodeModulesArchitectHost(workspace, root);
+        const architectHost = yield getWrappedWorkspaceNodeModulesArchitectHost(workspace, root);
         const architect = new Architect(architectHost, registry);
         const run = yield architect.scheduleTarget({
             project: opts.project,
@@ -726,3 +717,74 @@ function saveProjectsConfigurationsInWrappedSchematic(host, content) {
         host.write('angular.json', JSON.stringify((0, angular_json_1.toOldFormat)(newAngularJson), null, 2));
     }
 }
+function getWrappedWorkspaceNodeModulesArchitectHost(workspace, root) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { WorkspaceNodeModulesArchitectHost: AngularWorkspaceNodeModulesArchitectHost, } = yield Promise.resolve().then(() => require('@angular-devkit/architect/node'));
+        class WrappedWorkspaceNodeModulesArchitectHost extends AngularWorkspaceNodeModulesArchitectHost {
+            constructor(workspace, root) {
+                super(workspace, root);
+                this.workspace = workspace;
+                this.root = root;
+            }
+            resolveBuilder(builderStr) {
+                return tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    const [packageName, builderName] = builderStr.split(':');
+                    const { executorsFilePath, executorConfig } = this.readExecutorsJson(packageName, builderName);
+                    const builderInfo = this.readExecutor(packageName, builderName);
+                    return {
+                        name: builderStr,
+                        builderName,
+                        description: (0, fileutils_1.readJsonFile)(executorsFilePath).builders[builderName]
+                            .description,
+                        optionSchema: builderInfo.schema,
+                        import: (0, schema_utils_1.resolveImplementation)(executorConfig.implementation, (0, path_1.dirname)(executorsFilePath)),
+                    };
+                });
+            }
+            readExecutorsJson(nodeModule, builder) {
+                var _a, _b;
+                const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(nodeModule, this.root ? [this.root, __dirname] : [__dirname]);
+                const executorsFile = (_a = packageJson.executors) !== null && _a !== void 0 ? _a : packageJson.builders;
+                if (!executorsFile) {
+                    throw new Error(`The "${nodeModule}" package does not support Nx executors or Angular Devkit Builders.`);
+                }
+                const executorsFilePath = require.resolve((0, path_1.join)((0, path_1.dirname)(packageJsonPath), executorsFile));
+                const executorsJson = (0, fileutils_1.readJsonFile)(executorsFilePath);
+                const executorConfig = (_b = executorsJson.builders) === null || _b === void 0 ? void 0 : _b[builder];
+                if (!executorConfig) {
+                    throw new Error(`Cannot find builder '${builder}' in ${executorsFilePath}.`);
+                }
+                return { executorsFilePath, executorConfig, isNgCompat: true };
+            }
+            readExecutor(nodeModule, executor) {
+                try {
+                    const { executorsFilePath, executorConfig, isNgCompat } = this.readExecutorsJson(nodeModule, executor);
+                    const executorsDir = (0, path_1.dirname)(executorsFilePath);
+                    const schemaPath = (0, schema_utils_1.resolveSchema)(executorConfig.schema, executorsDir);
+                    const schema = (0, executor_utils_1.normalizeExecutorSchema)((0, fileutils_1.readJsonFile)(schemaPath));
+                    const implementationFactory = this.getImplementationFactory(executorConfig.implementation, executorsDir);
+                    const batchImplementationFactory = executorConfig.batchImplementation
+                        ? this.getImplementationFactory(executorConfig.batchImplementation, executorsDir)
+                        : null;
+                    const hasherFactory = executorConfig.hasher
+                        ? this.getImplementationFactory(executorConfig.hasher, executorsDir)
+                        : null;
+                    return {
+                        schema,
+                        implementationFactory,
+                        batchImplementationFactory,
+                        hasherFactory,
+                        isNgCompat,
+                    };
+                }
+                catch (e) {
+                    throw new Error(`Unable to resolve ${nodeModule}:${executor}.\n${e.message}`);
+                }
+            }
+            getImplementationFactory(implementation, executorsDir) {
+                return (0, schema_utils_1.getImplementationFactory)(implementation, executorsDir);
+            }
+        }
+        return new WrappedWorkspaceNodeModulesArchitectHost(workspace, root);
+    });
+}

package/src/command-line/affected/print-affected.js

@@ -4,10 +4,8 @@ exports.selectPrintAffected = exports.printAffected = void 0;
 const tslib_1 = require("tslib");
 const utils_1 = require("../../tasks-runner/utils");
 const create_task_graph_1 = require("../../tasks-runner/create-task-graph");
-const workspaces_1 = require("../../config/workspaces");
 const task_hasher_1 = require("../../hasher/task-hasher");
 const hash_task_1 = require("../../hasher/hash-task");
-const workspace_root_1 = require("../../utils/workspace-root");
 const package_manager_1 = require("../../utils/package-manager");
 const file_hasher_1 = require("../../hasher/file-hasher");
 const command_object_1 = require("./command-object");
@@ -39,13 +37,12 @@ function printAffected(affectedProjects, projectGraph, { nxJson }, nxArgs, overr
 exports.printAffected = printAffected;
 function createTasks(affectedProjectsWithTargetAndConfig, projectGraph, nxArgs, nxJson, overrides) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const workspaces = new workspaces_1.Workspaces(workspace_root_1.workspaceRoot);
         const defaultDependencyConfigs = (0, create_task_graph_1.mapTargetDefaultsToDependencies)(nxJson.targetDefaults);
         const taskGraph = (0, create_task_graph_1.createTaskGraph)(projectGraph, defaultDependencyConfigs, affectedProjectsWithTargetAndConfig.map((p) => p.name), nxArgs.targets, nxArgs.configuration, overrides);
         const hasher = new task_hasher_1.InProcessTaskHasher({}, [], projectGraph, taskGraph, nxJson, {}, file_hasher_1.fileHasher);
         const execCommand = (0, package_manager_1.getPackageManagerCommand)().exec;
         const tasks = Object.values(taskGraph.tasks);
-        yield Promise.all(tasks.map((t) => (0, hash_task_1.hashTask)(workspaces, hasher, projectGraph, {}, t)));
+        yield Promise.all(tasks.map((t) => (0, hash_task_1.hashTask)(hasher, projectGraph, {}, t)));
         return tasks.map((task) => ({
             id: task.id,
             overrides,

package/src/command-line/exec/exec.js

@@ -13,7 +13,7 @@ const fileutils_1 = require("../../utils/fileutils");
 const output_1 = require("../../utils/output");
 const package_manager_1 = require("../../utils/package-manager");
 const workspace_root_1 = require("../../utils/workspace-root");
-const run_one_1 = require("../run/run-one");
+const calculate_default_project_name_1 = require("../../config/calculate-default-project-name");
 function nxExecCommand(args) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const scriptArgV = readScriptArgV(args);
@@ -87,7 +87,7 @@ function ensureNxTarget(project, targetName) {
     }
 }
 function getProject(projectGraph) {
-    const projectName = (0, run_one_1.calculateDefaultProjectName)(process.cwd(), workspace_root_1.workspaceRoot, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), (0, configuration_1.readNxJson)());
+    const projectName = (0, calculate_default_project_name_1.calculateDefaultProjectName)(process.cwd(), workspace_root_1.workspaceRoot, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph), (0, configuration_1.readNxJson)());
     if (!projectName) {
         output_1.output.error({
             title: 'Unable to determine project name for `nx exec`',

package/src/command-line/generate/generate.js

@@ -13,8 +13,10 @@ const params_1 = require("../../utils/params");
 const local_plugins_1 = require("../../utils/plugins/local-plugins");
 const print_help_1 = require("../../utils/print-help");
 const workspace_root_1 = require("../../utils/workspace-root");
+const calculate_default_project_name_1 = require("../../config/calculate-default-project-name");
 const installed_plugins_1 = require("../../utils/plugins/installed-plugins");
 const output_1 = require("../../utils/output");
+const generator_utils_1 = require("./generator-utils");
 function printChanges(fileChanges) {
     fileChanges.forEach((f) => {
         if (f.type === 'CREATE') {
@@ -37,7 +39,7 @@ function promptForCollection(generatorName, ws, interactive, projectsConfigurati
         const deprecatedChoices = new Set();
         for (const collectionName of installedCollections) {
             try {
-                const { resolvedCollectionName, normalizedGeneratorName, generatorConfiguration: { ['x-deprecated']: deprecated, hidden }, } = ws.readGenerator(collectionName, generatorName);
+                const { resolvedCollectionName, normalizedGeneratorName, generatorConfiguration: { ['x-deprecated']: deprecated, hidden }, } = (0, generator_utils_1.getGeneratorInformation)(collectionName, generatorName, workspace_root_1.workspaceRoot);
                 if (hidden) {
                     continue;
                 }
@@ -53,7 +55,7 @@ function promptForCollection(generatorName, ws, interactive, projectsConfigurati
         const choicesFromLocalPlugins = [];
         for (const [name] of localPlugins) {
             try {
-                const { resolvedCollectionName, normalizedGeneratorName, generatorConfiguration: { ['x-deprecated']: deprecated, hidden }, } = ws.readGenerator(name, generatorName);
+                const { resolvedCollectionName, normalizedGeneratorName, generatorConfiguration: { ['x-deprecated']: deprecated, hidden }, } = (0, generator_utils_1.getGeneratorInformation)(name, generatorName, workspace_root_1.workspaceRoot);
                 if (hidden) {
                     continue;
                 }
@@ -107,7 +109,7 @@ function promptForCollection(generatorName, ws, interactive, projectsConfigurati
                             return true;
                         }
                         try {
-                            ws.readGenerator(value, generatorName);
+                            (0, generator_utils_1.getGeneratorInformation)(value, generatorName, workspace_root_1.workspaceRoot);
                             return true;
                         }
                         catch (_a) {
@@ -224,7 +226,7 @@ function generate(cwd, args) {
         const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
         return (0, params_1.handleErrors)(verbose, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
             const opts = yield convertToGenerateOptions(args, ws, readDefaultCollection(nxJsonConfiguration), 'generate', projectsConfigurations);
-            const { normalizedGeneratorName, schema, implementationFactory, generatorConfiguration: { aliases, hidden, ['x-deprecated']: deprecated, ['x-use-standalone-layout']: isStandalonePreset, }, } = ws.readGenerator(opts.collectionName, opts.generatorName);
+            const { normalizedGeneratorName, schema, implementationFactory, generatorConfiguration: { aliases, hidden, ['x-deprecated']: deprecated, ['x-use-standalone-layout']: isStandalonePreset, }, } = (0, generator_utils_1.getGeneratorInformation)(opts.collectionName, opts.generatorName, workspace_root_1.workspaceRoot);
             if (deprecated) {
                 logger_1.logger.warn([
                     `${logger_1.NX_PREFIX}: ${opts.collectionName}:${normalizedGeneratorName} is deprecated`,
@@ -238,8 +240,8 @@ function generate(cwd, args) {
                 printGenHelp(opts, schema, normalizedGeneratorName, aliases);
                 return 0;
             }
-            const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, projectsConfigurations, nxJsonConfiguration, schema, opts.interactive, ws.calculateDefaultProjectName(cwd, projectsConfigurations, nxJsonConfiguration), ws.relativeCwd(cwd), verbose);
-            if (ws.isNxGenerator(opts.collectionName, normalizedGeneratorName)) {
+            const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, projectsConfigurations, nxJsonConfiguration, schema, opts.interactive, (0, calculate_default_project_name_1.calculateDefaultProjectName)(cwd, workspace_root_1.workspaceRoot, projectsConfigurations, nxJsonConfiguration), ws.relativeCwd(cwd), verbose);
+            if ((0, generator_utils_1.getGeneratorInformation)(opts.collectionName, normalizedGeneratorName, workspace_root_1.workspaceRoot).isNxGenerator) {
                 const host = new tree_1.FsTree(workspace_root_1.workspaceRoot, verbose, `generating (${opts.collectionName}:${normalizedGeneratorName})`);
                 const implementation = implementationFactory();
                 // @todo(v17): Remove this, isStandalonePreset property is defunct.

package/src/command-line/generate/generator-utils.d.ts

@@ -0,0 +1,16 @@
+import { Generator, GeneratorsJson, GeneratorsJsonEntry } from '../../config/misc-interfaces';
+export declare function getGeneratorInformation(collectionName: string, generatorName: string, root: string | null): {
+    resolvedCollectionName: string;
+    normalizedGeneratorName: string;
+    schema: any;
+    implementationFactory: () => Generator<unknown>;
+    isNgCompat: boolean;
+    isNxGenerator: boolean;
+    generatorConfiguration: GeneratorsJsonEntry;
+};
+export declare function readGeneratorsJson(collectionName: string, generator: string, root: string | null): {
+    generatorsFilePath: string;
+    generatorsJson: GeneratorsJson;
+    normalizedGeneratorName: string;
+    resolvedCollectionName: string;
+};

package/src/command-line/generate/generator-utils.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readGeneratorsJson = exports.getGeneratorInformation = void 0;
+const path_1 = require("path");
+const schema_utils_1 = require("../../config/schema-utils");
+const fileutils_1 = require("../../utils/fileutils");
+const nx_plugin_1 = require("../../utils/nx-plugin");
+function getGeneratorInformation(collectionName, generatorName, root) {
+    var _a, _b, _c, _d;
+    try {
+        const { generatorsFilePath, generatorsJson, resolvedCollectionName, normalizedGeneratorName, } = readGeneratorsJson(collectionName, generatorName, root);
+        const generatorsDir = (0, path_1.dirname)(generatorsFilePath);
+        const generatorConfig = ((_a = generatorsJson.generators) === null || _a === void 0 ? void 0 : _a[normalizedGeneratorName]) ||
+            ((_b = generatorsJson.schematics) === null || _b === void 0 ? void 0 : _b[normalizedGeneratorName]);
+        const isNgCompat = !((_c = generatorsJson.generators) === null || _c === void 0 ? void 0 : _c[normalizedGeneratorName]);
+        const schemaPath = (0, schema_utils_1.resolveSchema)(generatorConfig.schema, generatorsDir);
+        const schema = (0, fileutils_1.readJsonFile)(schemaPath);
+        if (!schema.properties || typeof schema.properties !== 'object') {
+            schema.properties = {};
+        }
+        generatorConfig.implementation =
+            generatorConfig.implementation || generatorConfig.factory;
+        const implementationFactory = (0, schema_utils_1.getImplementationFactory)(generatorConfig.implementation, generatorsDir);
+        const normalizedGeneratorConfiguration = Object.assign(Object.assign({}, generatorConfig), { aliases: (_d = generatorConfig.aliases) !== null && _d !== void 0 ? _d : [], hidden: !!generatorConfig.hidden });
+        return {
+            resolvedCollectionName,
+            normalizedGeneratorName,
+            schema,
+            implementationFactory,
+            isNgCompat,
+            isNxGenerator: !isNgCompat,
+            generatorConfiguration: normalizedGeneratorConfiguration,
+        };
+    }
+    catch (e) {
+        throw new Error(`Unable to resolve ${collectionName}:${generatorName}.\n${e.message}`);
+    }
+}
+exports.getGeneratorInformation = getGeneratorInformation;
+function readGeneratorsJson(collectionName, generator, root) {
+    var _a;
+    let generatorsFilePath;
+    if (collectionName.endsWith('.json')) {
+        generatorsFilePath = require.resolve(collectionName, {
+            paths: root ? [root, __dirname] : [__dirname],
+        });
+    }
+    else {
+        const { json: packageJson, path: packageJsonPath } = (0, nx_plugin_1.readPluginPackageJson)(collectionName, root ? [root, __dirname] : [__dirname]);
+        const generatorsFile = (_a = packageJson.generators) !== null && _a !== void 0 ? _a : packageJson.schematics;
+        if (!generatorsFile) {
+            throw new Error(`The "${collectionName}" package does not support Nx generators.`);
+        }
+        generatorsFilePath = require.resolve((0, path_1.join)((0, path_1.dirname)(packageJsonPath), generatorsFile));
+    }
+    const generatorsJson = (0, fileutils_1.readJsonFile)(generatorsFilePath);
+    let normalizedGeneratorName = findFullGeneratorName(generator, generatorsJson.generators) ||
+        findFullGeneratorName(generator, generatorsJson.schematics);
+    if (!normalizedGeneratorName) {
+        for (let parent of generatorsJson.extends || []) {
+            try {
+                return readGeneratorsJson(parent, generator, root);
+            }
+            catch (e) { }
+        }
+        throw new Error(`Cannot find generator '${generator}' in ${generatorsFilePath}.`);
+    }
+    return {
+        generatorsFilePath,
+        generatorsJson,
+        normalizedGeneratorName,
+        resolvedCollectionName: collectionName,
+    };
+}
+exports.readGeneratorsJson = readGeneratorsJson;
+function findFullGeneratorName(name, generators) {
+    if (generators) {
+        for (let [key, data] of Object.entries(generators)) {
+            if (key === name ||
+                (data.aliases && data.aliases.includes(name))) {
+                return key;
+            }
+        }
+    }
+}

package/src/command-line/init/implementation/angular/index.js

@@ -48,7 +48,7 @@ function addNxToAngularCliRepo(options) {
             (0, utils_1.initCloud)(repoRoot, 'nx-init-angular');
         }
         (0, utils_1.printFinalMessage)({
-            learnMoreLink: 'https://nx.dev/recipes/adopting-nx/migration-angular',
+            learnMoreLink: 'https://nx.dev/recipes/angular/migration/angular',
             bodyLines: [
                 '- Execute "npx nx build" twice to see the computation caching in action.',
             ],

package/src/command-line/init/implementation/angular/legacy-angular-versions.js

@@ -84,7 +84,7 @@ function getLegacyMigrationFunctionIfApplicable(repoRoot, options) {
                 (0, utils_1.initCloud)(repoRoot, 'nx-init-angular');
             }
             (0, utils_1.printFinalMessage)({
-                learnMoreLink: 'https://nx.dev/recipes/adopting-nx/migration-angular',
+                learnMoreLink: 'https://nx.dev/recipes/angular/migration/angular',
                 bodyLines: [
                     '- Execute "npx nx build" twice to see the computation caching in action.',
                 ],

package/src/command-line/init/implementation/react/index.js

@@ -100,7 +100,7 @@ function reorgnizeWorkspaceStructure(options) {
             ? `npx nx build ${options.reactAppName}`
             : 'npm run build';
         (0, utils_1.printFinalMessage)({
-            learnMoreLink: 'https://nx.dev/recipes/adopting-nx/migration-cra',
+            learnMoreLink: 'https://nx.dev/recipes/react/migration-cra',
             bodyLines: [
                 `- Execute "${buildCommand}" twice to see the computation caching in action.`,
             ],

package/src/command-line/migrate/migrate.js

@@ -833,7 +833,7 @@ function generateMigrationsJsonAndUpdatePackageJson(root, opts) {
                         ? [
                             `- You opted out of some migrations for now. Write the following command down somewhere to apply these migrations later:`,
                             `  nx migrate ${opts.targetVersion} --from ${opts.targetPackage}@${minVersionWithSkippedUpdates} --exclude-applied-migrations`,
-                            `- To learn more go to https://nx.dev/recipes/other/advanced-update`,
+                            `- To learn more go to https://nx.dev/recipes/tips-n-tricks/advanced-update`,
                         ]
                         : [
                             `- To learn more go to https://nx.dev/core-features/automate-updating-dependencies`,

package/src/command-line/new/new.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.newWorkspace = void 0;
 const tslib_1 = require("tslib");
-const workspaces_1 = require("../../config/workspaces");
 const tree_1 = require("../../generators/tree");
 const params_1 = require("../../utils/params");
+const generator_utils_1 = require("../generate/generator-utils");
 function removeSpecialFlags(generatorOptions) {
     delete generatorOptions.interactive;
     delete generatorOptions.help;
@@ -14,10 +14,9 @@ function removeSpecialFlags(generatorOptions) {
 }
 function newWorkspace(cwd, args) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const ws = new workspaces_1.Workspaces(null);
         return (0, params_1.handleErrors)(process.env.NX_VERBOSE_LOGGING === 'true' || args.verbose, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
             const isInteractive = args.interactive;
-            const { normalizedGeneratorName, schema, implementationFactory } = ws.readGenerator('@nx/workspace/generators.json', 'new');
+            const { normalizedGeneratorName, schema, implementationFactory } = (0, generator_utils_1.getGeneratorInformation)('@nx/workspace/generators.json', 'new', null);
             removeSpecialFlags(args);
             const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(args, '@nx/workspace/generators.json', normalizedGeneratorName, null, null, schema, isInteractive, null, null, false);
             const host = new tree_1.FsTree(cwd, false, 'nx new');

package/src/command-line/run/run-one.d.ts

@@ -1,9 +1,7 @@
-import { NxJsonConfiguration } from '../../config/nx-json';
-import { ProjectsConfigurations, TargetDependencyConfig } from '../../config/workspace-json-project-json';
+import { TargetDependencyConfig } from '../../config/workspace-json-project-json';
 export declare function runOne(cwd: string, args: {
     [k: string]: any;
 }, extraTargetDependencies?: Record<string, (TargetDependencyConfig | string)[]>, extraOptions?: {
     excludeTaskDependencies: boolean;
     loadDotEnvFiles: boolean;
 }): Promise<void>;
-export declare function calculateDefaultProjectName(cwd: string, root: string, projectsConfigurations: ProjectsConfigurations, nxJsonConfiguration: NxJsonConfiguration): string;