@nx/angular 0.0.0-pr-27957-a99d5ea → 0.0.0-pr-28218-5048fd1

package/generators.d.ts

@@ -1,6 +1,5 @@
 export * from './src/generators/add-linting/add-linting';
 export * from './src/generators/application/application';
-export * from './src/generators/component-cypress-spec/component-cypress-spec';
 export * from './src/generators/component-story/component-story';
 export * from './src/generators/component/component';
 export * from './src/generators/directive/directive';

package/generators.js

@@ -4,7 +4,6 @@ exports.cypressComponentConfiguration = void 0;
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./src/generators/add-linting/add-linting"), exports);
 tslib_1.__exportStar(require("./src/generators/application/application"), exports);
-tslib_1.__exportStar(require("./src/generators/component-cypress-spec/component-cypress-spec"), exports);
 tslib_1.__exportStar(require("./src/generators/component-story/component-story"), exports);
 tslib_1.__exportStar(require("./src/generators/component/component"), exports);
 tslib_1.__exportStar(require("./src/generators/directive/directive"), exports);

package/generators.json

@@ -10,24 +10,18 @@
       "hidden": true
     },
     "application": {
-      "factory": "./src/generators/application/application#applicationGeneratorInternal",
+      "factory": "./src/generators/application/application",
       "schema": "./src/generators/application/schema.json",
       "aliases": ["app"],
       "x-type": "application",
       "description": "Creates an Angular application."
     },
     "component": {
-      "factory": "./src/generators/component/component#componentGeneratorInternal",
+      "factory": "./src/generators/component/component",
       "schema": "./src/generators/component/schema.json",
       "aliases": ["c"],
       "description": "Generate an Angular Component."
     },
-    "component-cypress-spec": {
-      "factory": "./src/generators/component-cypress-spec/component-cypress-spec",
-      "schema": "./src/generators/component-cypress-spec/schema.json",
-      "description": "Creates a Cypress spec for a UI component that has a story.",
-      "hidden": true
-    },
     "component-story": {
       "factory": "./src/generators/component-story/component-story",
       "schema": "./src/generators/component-story/schema.json",
@@ -63,7 +57,7 @@
       "hidden": true
     },
     "library": {
-      "factory": "./src/generators/library/library#libraryGeneratorInternal",
+      "factory": "./src/generators/library/library",
       "schema": "./src/generators/library/schema.json",
       "aliases": ["lib"],
       "x-type": "library",
@@ -76,13 +70,13 @@
       "description": "Creates a secondary entry point for an Angular publishable library."
     },
     "remote": {
-      "factory": "./src/generators/remote/remote#remoteInternal",
+      "factory": "./src/generators/remote/remote",
       "schema": "./src/generators/remote/schema.json",
       "x-type": "application",
       "description": "Generate a Remote Angular Module Federation Application."
     },
     "move": {
-      "factory": "./src/generators/move/move#angularMoveGeneratorInternal",
+      "factory": "./src/generators/move/move#angularMoveGenerator",
       "schema": "./src/generators/move/schema.json",
       "aliases": ["mv"],
       "description": "Moves an Angular application or library to another folder within the workspace and updates the project configuration.",
@@ -94,7 +88,7 @@
       "description": "Converts an old micro frontend configuration to use the new withModuleFederation helper. It will run successfully if the following conditions are met: \n - Is either a host or remote application \n - Shared npm package configurations have not been modified \n - Name used to identify the Micro Frontend application matches the project name \n\n{% callout type=\"warning\" title=\"Overrides\" %}This generator will overwrite your webpack config. If you have additional custom configuration in your config file, it will be lost!{% /callout %}"
     },
     "host": {
-      "factory": "./src/generators/host/host#hostInternal",
+      "factory": "./src/generators/host/host",
       "schema": "./src/generators/host/schema.json",
       "x-type": "application",
       "description": "Generate a Host Angular Module Federation Application."
@@ -173,7 +167,7 @@
       "description": "Adds Storybook configuration to a project."
     },
     "cypress-component-configuration": {
-      "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration#cypressComponentConfigurationInternal",
+      "factory": "./src/generators/cypress-component-configuration/cypress-component-configuration",
       "schema": "./src/generators/cypress-component-configuration/schema.json",
       "description": "Setup Cypress component testing for a project."
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "0.0.0-pr-27957-a99d5ea",
+  "version": "0.0.0-pr-28218-5048fd1",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -22,6 +22,7 @@
     "./executors.json": "./executors.json",
     "./generators": "./generators.js",
     "./executors": "./executors.js",
+    "./plugin": "./plugin.js",
     "./tailwind": "./tailwind.js",
     "./module-federation": "./module-federation/index.js",
     "./src/utils": "./src/utils/index.js",
@@ -78,15 +79,14 @@
     "tslib": "^2.3.0",
     "webpack-merge": "^5.8.0",
     "webpack": "^5.88.0",
-    "@module-federation/enhanced": "~0.6.0",
-    "@nx/devkit": "0.0.0-pr-27957-a99d5ea",
-    "@nx/js": "0.0.0-pr-27957-a99d5ea",
-    "@nx/eslint": "0.0.0-pr-27957-a99d5ea",
-    "@nx/webpack": "0.0.0-pr-27957-a99d5ea",
-    "@nx/web": "0.0.0-pr-27957-a99d5ea",
-    "@nx/workspace": "0.0.0-pr-27957-a99d5ea",
-    "piscina": "^4.4.0",
-    "@nrwl/angular": "0.0.0-pr-27957-a99d5ea"
+    "@module-federation/enhanced": "0.6.6",
+    "@nx/devkit": "0.0.0-pr-28218-5048fd1",
+    "@nx/js": "0.0.0-pr-28218-5048fd1",
+    "@nx/eslint": "0.0.0-pr-28218-5048fd1",
+    "@nx/webpack": "0.0.0-pr-28218-5048fd1",
+    "@nx/web": "0.0.0-pr-28218-5048fd1",
+    "@nx/workspace": "0.0.0-pr-28218-5048fd1",
+    "piscina": "^4.4.0"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 16.0.0 < 19.0.0",
@@ -101,4 +101,4 @@
   "module": "fesm2022/nx-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false
-}
+}

package/plugin.d.ts

@@ -0,0 +1 @@
+export { createNodesV2 } from './src/plugins/plugin';

package/plugin.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNodesV2 = void 0;
+var plugin_1 = require("./src/plugins/plugin");
+Object.defineProperty(exports, "createNodesV2", { enumerable: true, get: function () { return plugin_1.createNodesV2; } });

package/src/builders/utilities/webpack.js

@@ -7,6 +7,7 @@ const webpack_merge_1 = require("webpack-merge");
 const internal_1 = require("@nx/js/src/internal");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const fs_1 = require("fs");
 async function mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig, options, target) {
     const customWebpackConfiguration = resolveCustomWebpackConfig(pathToWebpackConfig, options.tsConfig.startsWith(devkit_1.workspaceRoot)
         ? options.tsConfig
@@ -17,12 +18,37 @@ async function mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig,
     const config = await customWebpackConfiguration;
     // The extra Webpack configuration file can export a synchronous or asynchronous function,
     // for instance: `module.exports = async config => { ... }`.
+    let newConfig;
     if (typeof config === 'function') {
-        return config(baseWebpackConfig, options, target);
+        newConfig = config(baseWebpackConfig, options, target);
     }
     else {
-        return (0, webpack_merge_1.merge)(baseWebpackConfig, config);
+        newConfig = (0, webpack_merge_1.merge)(baseWebpackConfig, config);
     }
+    // license-webpack-plugin will at times try to scan the monorepo's root package.json
+    // This will result in an error being thrown
+    // Ensure root package.json is excluded
+    const licensePlugin = newConfig.plugins.find((p) => p.constructor.name === 'LicenseWebpackPlugin');
+    if (licensePlugin) {
+        let rootPackageJsonName;
+        const pathToRootPackageJson = (0, path_1.join)(newConfig.context.root ?? devkit_1.workspaceRoot, 'package.json');
+        if ((0, fs_1.existsSync)(pathToRootPackageJson)) {
+            try {
+                const rootPackageJson = JSON.parse((0, fs_1.readFileSync)(pathToRootPackageJson, 'utf-8'));
+                rootPackageJsonName = rootPackageJson.name;
+                licensePlugin.pluginOptions.excludedPackageTest = (pkgName) => {
+                    if (!rootPackageJsonName) {
+                        return false;
+                    }
+                    return pkgName === rootPackageJsonName;
+                };
+            }
+            catch {
+                // do nothing
+            }
+        }
+    }
+    return newConfig;
 }
 function resolveCustomWebpackConfig(path, tsConfig) {
     const cleanupTranspiler = (0, internal_1.registerTsProject)(tsConfig);

package/src/generators/application/application.d.ts

@@ -1,5 +1,4 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function applicationGenerator(tree: Tree, schema: Partial<Schema>): Promise<GeneratorCallback>;
-export declare function applicationGeneratorInternal(tree: Tree, schema: Partial<Schema>): Promise<GeneratorCallback>;
 export default applicationGenerator;

package/src/generators/application/application.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
-exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
@@ -11,12 +10,6 @@ const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependenc
 const lib_1 = require("./lib");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function applicationGenerator(tree, schema) {
-    return await applicationGeneratorInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function applicationGeneratorInternal(tree, schema) {
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
     await (0, js_1.initGenerator)(tree, {

package/src/generators/application/lib/normalize-options.js

@@ -13,7 +13,6 @@ async function normalizeOptions(host, options) {
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         rootProject: options.rootProject,
-        callingGenerator: '@nx/angular:application',
     });
     options.rootProject = appProjectRoot === '.';
     options.projectNameAndRootFormat = projectNameAndRootFormat;

package/src/generators/component/component.d.ts

@@ -1,5 +1,4 @@
 import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function componentGenerator(tree: Tree, rawOptions: Schema): Promise<void>;
-export declare function componentGeneratorInternal(tree: Tree, rawOptions: Schema): Promise<void>;
 export default componentGenerator;

package/src/generators/component/component.js

@@ -1,18 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentGenerator = componentGenerator;
-exports.componentGeneratorInternal = componentGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const utils_1 = require("../utils");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 async function componentGenerator(tree, rawOptions) {
-    await componentGeneratorInternal(tree, {
-        nameAndDirectoryFormat: 'derived',
-        ...rawOptions,
-    });
-}
-async function componentGeneratorInternal(tree, rawOptions) {
     const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {

package/src/generators/component/lib/normalize-options.js

@@ -7,13 +7,9 @@ const selector_1 = require("../../utils/selector");
 async function normalizeOptions(tree, options) {
     options.type ??= 'component';
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        artifactType: 'component',
-        callingGenerator: '@nx/angular:component',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
+        directory: options.directory,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         suffix: options.type ?? 'component',
     });
     const { className } = (0, devkit_1.names)(name);

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

@@ -20,19 +20,6 @@ export interface Schema {
   export?: boolean;
   prefix?: string;
   skipFormat?: boolean;
-
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  flat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
-   */
-  path?: string;
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/component/schema.json

@@ -27,15 +27,6 @@
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
-    },
     "prefix": {
       "type": "string",
       "description": "The prefix to apply to the generated component selector.",
@@ -94,12 +85,6 @@
       "description": "Do not create `spec.ts` test files for the new component.",
       "default": false
     },
-    "flat": {
-      "type": "boolean",
-      "description": "Create the new files at the top level of the current project.",
-      "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
     "skipImport": {
       "type": "boolean",
       "description": "Do not import this component into the owning NgModule.",

package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts

@@ -1,9 +1,8 @@
 import { Tree } from '@nx/devkit';
 import { CypressComponentConfigSchema } from './schema';
-export declare function cypressComponentConfiguration(tree: Tree, options: CypressComponentConfigSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 /**
  * This is for cypress built in component testing, if you want to test with
  * storybook + cypress then use the componentCypressGenerator instead.
  */
-export declare function cypressComponentConfigurationInternal(tree: Tree, options: CypressComponentConfigSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function cypressComponentConfiguration(tree: Tree, options: CypressComponentConfigSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default cypressComponentConfiguration;

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfiguration = cypressComponentConfiguration;
-exports.cypressComponentConfigurationInternal = cypressComponentConfigurationInternal;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const versions_1 = require("../../utils/versions");
@@ -10,16 +9,11 @@ const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const module_info_1 = require("../utils/storybook-ast/module-info");
 const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app-editor-tsconfig-excluded-files");
-function cypressComponentConfiguration(tree, options) {
-    return cypressComponentConfigurationInternal(tree, {
-        ...options,
-    });
-}
 /**
  * This is for cypress built in component testing, if you want to test with
  * storybook + cypress then use the componentCypressGenerator instead.
  */
-async function cypressComponentConfigurationInternal(tree, options) {
+async function cypressComponentConfiguration(tree, options) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const { componentConfigurationGenerator: baseCyCTConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     const installTask = await baseCyCTConfig(tree, {

package/src/generators/directive/lib/normalize-options.js

@@ -6,13 +6,9 @@ const selector_1 = require("../../utils/selector");
 const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        artifactType: 'directive',
-        callingGenerator: '@nx/angular:directive',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
+        directory: options.directory,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         suffix: 'directive',
     });
     const { className } = (0, devkit_1.names)(name);

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

@@ -12,18 +12,6 @@ export interface Schema {
   module?: string;
   export?: boolean;
   skipFormat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20.
-   */
-  flat?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead. It will be removed in Nx v20.
-   */
-  path?: string;
-  /**
-   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project?: string;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/directive/schema.json

@@ -27,15 +27,6 @@
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-dropdown": "projects",
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
-    },
     "prefix": {
       "type": "string",
       "description": "A prefix to apply to generated selectors.",
@@ -70,12 +61,6 @@
       "type": "boolean",
       "default": true
     },
-    "flat": {
-      "type": "boolean",
-      "description": "When true (the default), creates the new files at the top level of the current project.",
-      "default": true,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v20."
-    },
     "module": {
       "type": "string",
       "description": "The filename of the declaring NgModule.",

package/src/generators/federate-module/lib/add-remote.js

@@ -16,7 +16,7 @@ async function addRemote(tree, schema) {
             directory: schema.remoteDirectory,
             host: schema.host,
             standalone: schema.standalone,
-            projectNameAndRootFormat: schema.projectNameAndRootFormat ?? 'derived',
+            projectNameAndRootFormat: schema.projectNameAndRootFormat,
             unitTestRunner: schema.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
             e2eTestRunner: schema.e2eTestRunner ?? test_runners_1.E2eTestRunner.Cypress,
             skipFormat: true,
@@ -26,8 +26,7 @@ async function addRemote(tree, schema) {
             name: schema.remote,
             directory: schema.remoteDirectory,
             projectType: 'application',
-            projectNameAndRootFormat: schema.projectNameAndRootFormat ?? 'derived',
-            callingGenerator: '@nx/angular:federate-module',
+            projectNameAndRootFormat: schema.projectNameAndRootFormat,
         });
         projectRoot = remoteRoot;
         remoteName = projectName;

package/src/generators/host/host.d.ts

@@ -1,5 +1,4 @@
 import { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
-export declare function host(tree: Tree, options: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
-export declare function hostInternal(tree: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function host(tree: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default host;

package/src/generators/host/host.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.host = host;
-exports.hostInternal = hostInternal;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
@@ -12,13 +11,7 @@ const setup_mf_1 = require("../setup-mf/setup-mf");
 const lib_1 = require("./lib");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
 const js_1 = require("@nx/js");
-async function host(tree, options) {
-    return await hostInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...options,
-    });
-}
-async function hostInternal(tree, schema) {
+async function host(tree, schema) {
     const { typescriptConfiguration = true, ...options } = schema;
     options.standalone = options.standalone ?? true;
     const projects = (0, devkit_1.getProjects)(tree);
@@ -44,12 +37,11 @@ async function hostInternal(tree, schema) {
             }
         });
     }
-    const { projectName: hostProjectName, projectNameAndRootFormat } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+    const { projectName: hostProjectName, projectNameAndRootFormat, projectRoot: appRoot, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/angular:host',
     });
     options.projectNameAndRootFormat = projectNameAndRootFormat;
     const appInstallTask = await (0, application_1.default)(tree, {
@@ -83,16 +75,11 @@ async function hostInternal(tree, schema) {
         installTasks.push(ssrInstallTask);
     }
     for (const remote of remotesToGenerate) {
-        let remoteDirectory = options.directory;
-        if (options.projectNameAndRootFormat === 'as-provided' &&
-            options.directory) {
-            /**
-             * With the `as-provided` format, the provided directory would be the root
-             * of the host application. Append the remote name to the host parent
-             * directory to get the remote directory.
-             */
-            remoteDirectory = (0, devkit_1.joinPathFragments)(options.directory, '..', remote);
-        }
+        const remoteDirectory = options.directory
+            ? (0, devkit_1.joinPathFragments)(options.directory, '..', remote)
+            : appRoot === '.'
+                ? remote
+                : (0, devkit_1.joinPathFragments)(appRoot, '..', remote);
         await (0, remote_1.default)(tree, {
             ...options,
             name: remote,

package/src/generators/init/init.js

@@ -2,10 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularInitGenerator = angularInitGenerator;
 const devkit_1 = require("@nx/devkit");
+const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const version_utils_1 = require("../utils/version-utils");
+const plugin_1 = require("../../plugins/plugin");
 async function angularInitGenerator(tree, options) {
     ignoreAngularCacheDirectory(tree);
     const installTask = installAngularDevkitCoreIfMissing(tree, options);
+    // For Angular inference plugin, we only want it during import since our
+    // generators do not use `angular.json`, and `nx init` should split
+    // `angular.json` into multiple `project.json` files -- as this is preferred
+    // by most folks we've talked to.
+    options.addPlugin ??= process.env.NX_RUNNING_NX_IMPORT === 'true';
+    if (options.addPlugin) {
+        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/angular/plugin', plugin_1.createNodesV2, {
+            targetNamePrefix: ['', 'angular:', 'angular-'],
+        }, options.updatePackageScripts);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

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

@@ -3,4 +3,7 @@ export interface Schema {
   skipInstall?: boolean;
   skipPackageJson?: boolean;
   keepExistingVersions?: boolean;
+  /* internal */
+  addPlugin?: boolean;
+  updatePackageScripts?: boolean;
 }

package/src/generators/library/lib/normalize-options.js

@@ -28,7 +28,6 @@ async function normalizeOptions(host, schema) {
         directory: options.directory,
         importPath: options.importPath,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/angular:library',
     });
     const fileName = options.simpleName
         ? projectNames.projectSimpleName

package/src/generators/library/library.d.ts

@@ -1,5 +1,4 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function libraryGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
-export declare function libraryGeneratorInternal(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default libraryGenerator;

package/src/generators/library/library.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
-exports.libraryGeneratorInternal = libraryGeneratorInternal;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
@@ -24,14 +23,6 @@ const set_generator_defaults_1 = require("./lib/set-generator-defaults");
 const ensure_angular_dependencies_1 = require("../utils/ensure-angular-dependencies");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function libraryGenerator(tree, schema) {
-    return await libraryGeneratorInternal(tree, {
-        // provide a default projectNameAndRootFormat to avoid breaking changes
-        // to external generators invoking this one
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function libraryGeneratorInternal(tree, schema) {
     // Do some validation checks
     if (!schema.routing && schema.lazy) {
         throw new Error(`To use "--lazy" option, "--routing" must also be set.`);

package/src/generators/move/move.d.ts

@@ -1,4 +1,3 @@
 import type { Tree } from '@nx/devkit';
 import type { Schema } from './schema';
 export declare function angularMoveGenerator(tree: Tree, schema: Schema): Promise<void>;
-export declare function angularMoveGeneratorInternal(tree: Tree, schema: Schema): Promise<void>;

package/src/generators/move/move.js

@@ -1,15 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularMoveGenerator = angularMoveGenerator;
-exports.angularMoveGeneratorInternal = angularMoveGeneratorInternal;
 const move_1 = require("@nx/workspace/src/generators/move/move");
 async function angularMoveGenerator(tree, schema) {
-    await angularMoveGeneratorInternal(tree, {
-        projectNameAndRootFormat: 'derived',
-        ...schema,
-    });
-}
-async function angularMoveGeneratorInternal(tree, schema) {
     process.env.NX_ANGULAR_MOVE_INVOKED = 'true';
-    await (0, move_1.moveGeneratorInternal)(tree, schema);
+    await (0, move_1.moveGenerator)(tree, schema);
 }

package/src/generators/pipe/lib/normalize-options.js

@@ -5,13 +5,9 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 const devkit_1 = require("@nx/devkit");
 async function normalizeOptions(tree, options) {
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(tree, {
-        artifactType: 'pipe',
-        callingGenerator: '@nx/angular:pipe',
         name: options.name,
-        directory: options.directory ?? options.path,
-        flat: options.flat,
+        directory: options.directory,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         suffix: 'pipe',
     });
     const { className } = (0, devkit_1.names)(name);