@nx/angular 17.0.4 → 17.0.6

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

@@ -1,15 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRemote = void 0;
+const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const test_runners_1 = require("../../../utils/test-runners");
-const remote_1 = require("../../remote/remote");
+const semver_1 = require("semver");
 const check_remote_exists_1 = require("./check-remote-exists");
+const version_utils_1 = require("../../utils/version-utils");
+const remote_1 = require("../../remote/remote");
+const test_runners_1 = require("../../../utils/test-runners");
 async function addRemote(tree, schema) {
     const tasks = [];
     const remote = (0, check_remote_exists_1.getRemoteIfExists)(tree, schema.remote);
     let projectRoot, remoteName;
     if (!remote) {
+        const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+        if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') &&
+            schema.standalone) {
+            throw new Error((0, devkit_1.stripIndents) `The "standalone" option is only supported in Angular >= 14.1.0. You are currently using ${installedAngularVersionInfo.version}.
+    You can resolve this error by removing the "standalone" option or by migrating to Angular 14.1.0.`);
+        }
         const remoteGeneratorCallback = await (0, remote_1.default)(tree, {
             name: schema.remote,
             directory: schema.remoteDirectory,

package/src/generators/federate-module/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactFederateModule",
   "title": "Federate Module",
@@ -67,9 +67,9 @@
       "default": "cypress"
     },
     "standalone": {
-      "description": "Whether to generate the remote application with standalone components if it needs to be created.",
+      "description": "Whether to generate the remote application with standalone components if it needs to be created. _Note: This is only supported in Angular versions >= 14.1.0_",
       "type": "boolean",
-      "default": true
+      "default": false
     },
     "host": {
       "type": "string",

package/src/generators/host/files/ts/webpack.server.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import { withModuleFederationForSSR } from '@nx/angular/module-federation';
+import {withModuleFederationForSSR} from '@nx/angular/module-federation';
 import config from './module-federation.config';
 
-export default withModuleFederationForSSR(config);
+export default withModuleFederationForSSR(config)

package/src/generators/host/host.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.hostInternal = exports.host = void 0;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const semver_1 = require("semver");
 const test_runners_1 = require("../../utils/test-runners");
 const application_1 = require("../application/application");
 const remote_1 = require("../remote/remote");
 const setup_mf_1 = require("../setup-mf/setup-mf");
+const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
-const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");
 async function host(tree, options) {
     return await hostInternal(tree, {
         projectNameAndRootFormat: 'derived',
@@ -17,8 +18,12 @@ async function host(tree, options) {
 }
 exports.host = host;
 async function hostInternal(tree, schema) {
+    const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') && schema.standalone) {
+        throw new Error((0, devkit_1.stripIndents) `The "standalone" option is only supported in Angular >= 14.1.0. You are currently using ${installedAngularVersionInfo.version}.
+    You can resolve this error by removing the "standalone" option or by migrating to Angular 14.1.0.`);
+    }
     const { typescriptConfiguration = true, ...options } = schema;
-    options.standalone = options.standalone ?? true;
     const projects = (0, devkit_1.getProjects)(tree);
     const remotesToGenerate = [];
     const remotesToIntegrate = [];
@@ -42,11 +47,10 @@ async function hostInternal(tree, schema) {
     options.projectNameAndRootFormat = projectNameAndRootFormat;
     const appInstallTask = await (0, application_1.default)(tree, {
         ...options,
-        standalone: options.standalone,
+        standalone: options.standalone ?? false,
         routing: true,
         port: 4200,
         skipFormat: true,
-        bundler: 'webpack',
     });
     const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;
     await (0, setup_mf_1.setupMf)(tree, {
@@ -62,12 +66,10 @@ async function hostInternal(tree, schema) {
         e2eProjectName: skipE2E ? undefined : `${hostProjectName}-e2e`,
         prefix: options.prefix,
         typescriptConfiguration,
-        standalone: options.standalone,
-        setParserOptionsProject: options.setParserOptionsProject,
     });
     let installTasks = [appInstallTask];
     if (options.ssr) {
-        let ssrInstallTask = await (0, lib_1.updateSsrSetup)(tree, options, hostProjectName, typescriptConfiguration);
+        let ssrInstallTask = await (0, lib_1.addSsr)(tree, options, hostProjectName, typescriptConfiguration);
         installTasks.push(ssrInstallTask);
     }
     for (const remote of remotesToGenerate) {
@@ -91,7 +93,6 @@ async function hostInternal(tree, schema) {
             typescriptConfiguration,
         });
     }
-    (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(tree);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/host/lib/add-ssr.d.ts

@@ -0,0 +1,3 @@
+import type { Tree } from '@nx/devkit';
+import type { Schema } from '../schema';
+export declare function addSsr(tree: Tree, options: Schema, appName: string, typescriptConfiguration: boolean): Promise<import("@nx/devkit").GeneratorCallback>;

package/src/generators/host/lib/{update-ssr-setup.js → add-ssr.js}

@@ -1,18 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateSsrSetup = void 0;
+exports.addSsr = void 0;
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
+const setup_ssr_1 = require("../../setup-ssr/setup-ssr");
 const versions_1 = require("../../../utils/versions");
-const version_utils_1 = require("../../utils/version-utils");
-async function updateSsrSetup(tree, options, appName, typescriptConfiguration) {
+const path_1 = require("path");
+async function addSsr(tree, options, appName, typescriptConfiguration) {
     let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
+    await (0, setup_ssr_1.default)(tree, {
+        project: appName,
+        standalone: options.standalone,
+    });
     tree.rename((0, devkit_1.joinPathFragments)(project.sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(project.sourceRoot, 'bootstrap.server.ts'));
     tree.write((0, devkit_1.joinPathFragments)(project.root, 'server.ts'), "import('./src/main.server');");
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/common', angularMajorVersion >= 17 ? 'v17+' : 'pre-v17'), project.root, {
+    const browserBundleOutput = (0, devkit_1.joinPathFragments)(project.targets.build.options.outputPath, 'browser');
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/common'), project.root, {
         appName,
-        browserBundleOutput: project.targets.build.options.outputPath,
+        browserBundleOutput,
         standalone: options.standalone,
         tmpl: '',
     });
@@ -31,10 +35,12 @@ async function updateSsrSetup(tree, options, appName, typescriptConfiguration) {
     (0, devkit_1.updateProjectConfiguration)(tree, appName, project);
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
         cors: versions_1.corsVersion,
+        express: versions_1.expressVersion,
         '@module-federation/node': versions_1.moduleFederationNodeVersion,
     }, {
         '@types/cors': versions_1.typesCorsVersion,
+        '@types/express': versions_1.typesExpressVersion,
     });
     return installTask;
 }
-exports.updateSsrSetup = updateSsrSetup;
+exports.addSsr = addSsr;

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

@@ -1 +1 @@
-export * from './update-ssr-setup';
+export * from './add-ssr';

package/src/generators/host/lib/index.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./update-ssr-setup"), exports);
+tslib_1.__exportStar(require("./add-ssr"), exports);

package/src/generators/host/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "NxMFHost",
   "cli": "nx",
   "title": "Nx Module Federation Host Application",
@@ -55,15 +55,15 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)  [ https://sass-lang.com   ]"
+            "label": "SASS(.scss)  [ http://sass-lang.com   ]"
           },
           {
             "value": "sass",
-            "label": "SASS(.sass)  [ https://sass-lang.com   ]"
+            "label": "SASS(.sass)  [ http://sass-lang.com   ]"
           },
           {
             "value": "less",
-            "label": "LESS         [ https://lesscss.org     ]"
+            "label": "LESS         [ http://lesscss.org     ]"
           }
         ]
       }
@@ -165,8 +165,8 @@
     },
     "standalone": {
       "type": "boolean",
-      "description": "Whether to generate a host application that uses standalone components.",
-      "default": true
+      "description": "Whether to generate a host application that uses standalone components. _Note: This is only supported in Angular versions >= 14.1.0_",
+      "default": false
     },
     "ssr": {
       "description": "Whether to configure SSR for the host application",

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

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

package/src/generators/init/init.js

@@ -2,33 +2,151 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const jest_1 = require("@nx/jest");
+const eslint_1 = require("@nx/eslint");
+const js_1 = require("@nx/js");
+const test_runners_1 = require("../../utils/test-runners");
 const version_utils_1 = require("../utils/version-utils");
-async function angularInitGenerator(tree, options) {
+const versions_1 = require("../../utils/versions");
+async function angularInitGenerator(tree, rawOptions) {
+    const tasks = [];
+    const options = normalizeOptions(rawOptions);
+    const pkgVersions = (0, version_utils_1.versions)(tree);
+    const peerDepsToInstall = ['@angular-devkit/core'];
+    let devkitVersion;
+    peerDepsToInstall.forEach((pkg) => {
+        const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, pkg);
+        if (!packageVersion) {
+            devkitVersion ??=
+                (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular') ??
+                    pkgVersions.angularDevkitVersion;
+            try {
+                (0, devkit_1.ensurePackage)(pkg, devkitVersion);
+            }
+            catch {
+                // @schematics/angular cannot be required so this fails but this will still allow wrapping the schematic later on
+            }
+            if (!options.skipPackageJson) {
+                tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { [pkg]: devkitVersion }));
+            }
+        }
+    });
+    setDefaults(tree, options);
+    const jsTask = await (0, js_1.initGenerator)(tree, {
+        ...options,
+        tsConfigName: options.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
+        js: false,
+        skipFormat: true,
+    });
+    tasks.push(jsTask);
+    if (!options.skipPackageJson) {
+        tasks.push(updateDependencies(tree, pkgVersions));
+    }
+    const unitTestTask = await addUnitTestRunner(tree, options, pkgVersions.jestPresetAngularVersion);
+    tasks.push(unitTestTask);
+    const e2eTask = await addE2ETestRunner(tree, options);
+    tasks.push(e2eTask);
     ignoreAngularCacheDirectory(tree);
-    const installTask = installAngularDevkitCoreIfMissing(tree, options);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return installTask;
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.angularInitGenerator = angularInitGenerator;
-function installAngularDevkitCoreIfMissing(tree, options) {
-    const packageVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/core');
-    if (!packageVersion) {
-        const pkgVersions = (0, version_utils_1.versions)(tree);
-        const devkitVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular') ??
-            pkgVersions.angularDevkitVersion;
-        try {
-            (0, devkit_1.ensurePackage)('@angular-devkit/core', devkitVersion);
-        }
-        catch {
-            // @schematics/angular cannot be required so this fails but this will still allow wrapping the schematic later on
-        }
-        if (!options.skipPackageJson) {
-            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { ['@angular-devkit/core']: devkitVersion }, undefined, options.keepExistingVersions);
-        }
+function normalizeOptions(options) {
+    return {
+        e2eTestRunner: options.e2eTestRunner ?? test_runners_1.E2eTestRunner.Cypress,
+        linter: options.linter ?? eslint_1.Linter.EsLint,
+        skipFormat: options.skipFormat ?? false,
+        skipInstall: options.skipInstall ?? false,
+        skipPackageJson: options.skipPackageJson ?? false,
+        style: options.style ?? 'css',
+        unitTestRunner: options.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
+        rootProject: options.rootProject,
+    };
+}
+function setDefaults(host, options) {
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    nxJson.generators = nxJson.generators || {};
+    nxJson.generators['@nx/angular:application'] = {
+        style: options.style,
+        linter: options.linter,
+        unitTestRunner: options.unitTestRunner,
+        e2eTestRunner: options.e2eTestRunner,
+        ...(nxJson.generators['@nx/angular:application'] || {}),
+    };
+    nxJson.generators['@nx/angular:library'] = {
+        linter: options.linter,
+        unitTestRunner: options.unitTestRunner,
+        ...(nxJson.generators['@nx/angular:library'] || {}),
+    };
+    nxJson.generators['@nx/angular:component'] = {
+        style: options.style,
+        ...(nxJson.generators['@nx/angular:component'] || {}),
+    };
+    (0, devkit_1.updateNxJson)(host, nxJson);
+}
+function updateDependencies(tree, versions) {
+    const angularVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular/core') ??
+        versions.angularVersion;
+    const angularDevkitVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, '@angular-devkit/build-angular') ??
+        versions.angularDevkitVersion;
+    const rxjsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'rxjs') ?? versions.rxjsVersion;
+    const tsLibVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'tslib') ?? versions.tsLibVersion;
+    const zoneJsVersion = (0, version_utils_1.getInstalledPackageVersion)(tree, 'zone.js') ?? versions.zoneJsVersion;
+    return (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {
+        '@angular/animations': angularVersion,
+        '@angular/common': angularVersion,
+        '@angular/compiler': angularVersion,
+        '@angular/core': angularVersion,
+        '@angular/forms': angularVersion,
+        '@angular/platform-browser': angularVersion,
+        '@angular/platform-browser-dynamic': angularVersion,
+        '@angular/router': angularVersion,
+        rxjs: rxjsVersion,
+        tslib: tsLibVersion,
+        'zone.js': zoneJsVersion,
+    }, {
+        '@angular/cli': angularDevkitVersion,
+        '@angular/compiler-cli': angularVersion,
+        '@angular/language-service': angularVersion,
+        '@angular-devkit/build-angular': angularDevkitVersion,
+        '@angular-devkit/schematics': angularDevkitVersion,
+        '@schematics/angular': angularDevkitVersion,
+    });
+}
+async function addUnitTestRunner(tree, options, jestPresetAngularVersion) {
+    switch (options.unitTestRunner) {
+        case test_runners_1.UnitTestRunner.Jest:
+            if (!options.skipPackageJson) {
+                process.env.npm_config_legacy_peer_deps ??= 'true';
+                (0, version_utils_1.addDependenciesToPackageJsonIfDontExist)(tree, {}, {
+                    'jest-preset-angular': jestPresetAngularVersion,
+                });
+            }
+            return (0, jest_1.jestInitGenerator)(tree, {
+                skipPackageJson: options.skipPackageJson,
+            });
+        default:
+            return () => { };
+    }
+}
+async function addE2ETestRunner(tree, options) {
+    switch (options.e2eTestRunner) {
+        case test_runners_1.E2eTestRunner.Cypress:
+            const { cypressInitGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+            return cypressInitGenerator(tree, {
+                skipPackageJson: options.skipPackageJson,
+            });
+        case test_runners_1.E2eTestRunner.Playwright:
+            const { initGenerator: playwrightInitGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
+            return playwrightInitGenerator(tree, {
+                skipFormat: true,
+                skipPackageJson: options.skipPackageJson,
+            });
+        default:
+            return () => { };
     }
-    return () => { };
 }
 function ignoreAngularCacheDirectory(tree) {
     const { cli } = (0, devkit_1.readNxJson)(tree);

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

@@ -1,6 +1,14 @@
+import { Linter } from '@nx/eslint';
+import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
+import type { Styles } from '../utils/types';
+
 export interface Schema {
+  unitTestRunner?: UnitTestRunner;
+  e2eTestRunner?: E2eTestRunner;
   skipFormat?: boolean;
   skipInstall?: boolean;
+  style?: Styles;
+  linter?: Linter;
   skipPackageJson?: boolean;
-  keepExistingVersions?: boolean;
+  rootProject?: boolean;
 }

package/src/generators/init/schema.json

@@ -1,11 +1,32 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "SchematicsAngularModuleInit",
   "cli": "nx",
   "title": "Init Angular Plugin",
   "description": "Initializes the `@nx/angular` plugin. NOTE: Does not work in the `--dry-run` mode.",
   "type": "object",
+  "examples": [
+    {
+      "command": "nx g @nx/angular:init --style=scss",
+      "description": "Installs angular dependencies and initializes the `@nx/angular` plugin with the `scss` stylesheet format."
+    }
+  ],
   "properties": {
+    "unitTestRunner": {
+      "type": "string",
+      "enum": ["jest", "none"],
+      "description": "Test runner to use for unit tests.",
+      "default": "jest",
+      "x-priority": "important"
+    },
+    "e2eTestRunner": {
+      "type": "string",
+      "enum": ["cypress", "playwright", "none"],
+      "x-prompt": "Which E2E test runner would you like to use?",
+      "description": "Test runner to use for end to end (e2e) tests.",
+      "default": "cypress",
+      "x-priority": "important"
+    },
     "skipInstall": {
       "type": "boolean",
       "description": "Skip installing after adding `@nx/workspace`.",
@@ -18,17 +39,47 @@
       "default": false,
       "x-priority": "internal"
     },
+    "linter": {
+      "description": "The tool to use for running lint checks.",
+      "type": "string",
+      "enum": ["eslint", "none"],
+      "default": "eslint",
+      "x-priority": "important"
+    },
+    "style": {
+      "description": "The file extension to be used for style files.",
+      "type": "string",
+      "default": "css",
+      "enum": ["css", "scss", "sass", "less"],
+      "x-prompt": {
+        "message": "Which stylesheet format would you like to use?",
+        "type": "list",
+        "items": [
+          {
+            "value": "css",
+            "label": "CSS"
+          },
+          {
+            "value": "scss",
+            "label": "SASS(.scss)  [ http://sass-lang.com   ]"
+          },
+          {
+            "value": "sass",
+            "label": "SASS(.sass)  [ http://sass-lang.com   ]"
+          },
+          {
+            "value": "less",
+            "label": "LESS         [ http://lesscss.org     ]"
+          }
+        ]
+      }
+    },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
       "description": "Do not add dependencies to `package.json`.",
       "x-priority": "internal"
-    },
-    "keepExistingVersions": {
-      "type": "boolean",
-      "x-priority": "internal",
-      "description": "Keep existing dependencies versions",
-      "default": false
     }
-  }
+  },
+  "additionalProperties": false
 }

package/src/generators/library/files/ng-module/src/lib/lib.routes.ts__tpl__

@@ -1,5 +1,5 @@
 import { Route } from '@angular/router';
 
 export const <%= libPropertyName %>Routes: Route[] = [
-  /* { path: '', pathMatch: 'full', component: InsertYourComponentHere } */
+  /* {path: '', pathMatch: 'full', component: InsertYourComponentHere} */
 ];

package/src/generators/library/files/standalone-components/src/lib/lib.routes.ts__tpl__

@@ -2,5 +2,5 @@ import { Route } from '@angular/router';
 import { <%= libClassName %>Component } from './<%= pathToComponent %>.component';
 
 export const <%= libPropertyName %>Routes: Route[] = [
-  { path: '', component: <%= libClassName %>Component }
+  {path: '', component: <%= libClassName %>Component}
 ];

package/src/generators/library/lib/add-load-children.js

@@ -14,9 +14,9 @@ function addLoadChildren(tree, options) {
     }
     const moduleSource = tree.read(options.parent, 'utf-8');
     const sourceFile = tsModule.createSourceFile(options.parent, moduleSource, tsModule.ScriptTarget.Latest, true);
-    const route = `{ path: '${(0, devkit_1.names)(options.fileName).fileName}', loadChildren: () => import('${options.importPath}').then(m => m.${options.standalone
+    const route = `{path: '${(0, devkit_1.names)(options.fileName).fileName}', loadChildren: () => import('${options.importPath}').then(m => m.${options.standalone
         ? `${(0, devkit_1.names)(options.name).propertyName}Routes`
-        : options.moduleName}) }`;
+        : options.moduleName})}`;
     (0, route_utils_1.addRoute)(tree, options.parent, route);
 }
 exports.addLoadChildren = addLoadChildren;

package/src/generators/library/lib/add-project.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = void 0;
 const devkit_1 = require("@nx/devkit");
-const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 function addProject(tree, libraryOptions) {
     const project = {
         name: libraryOptions.name,
@@ -11,30 +10,29 @@ function addProject(tree, libraryOptions) {
         prefix: libraryOptions.prefix,
         tags: libraryOptions.parsedTags,
         projectType: 'library',
-        targets: {},
+        targets: {
+            build: libraryOptions.buildable || libraryOptions.publishable
+                ? {
+                    executor: libraryOptions.publishable
+                        ? '@nx/angular:package'
+                        : '@nx/angular:ng-packagr-lite',
+                    outputs: ['{workspaceRoot}/dist/{projectRoot}'],
+                    options: {
+                        project: `${libraryOptions.projectRoot}/ng-package.json`,
+                    },
+                    configurations: {
+                        production: {
+                            tsConfig: `${libraryOptions.projectRoot}/tsconfig.lib.prod.json`,
+                        },
+                        development: {
+                            tsConfig: `${libraryOptions.projectRoot}/tsconfig.lib.json`,
+                        },
+                    },
+                    defaultConfiguration: 'production',
+                }
+                : undefined,
+        },
     };
-    if (libraryOptions.buildable || libraryOptions.publishable) {
-        const executor = libraryOptions.publishable
-            ? '@nx/angular:package'
-            : '@nx/angular:ng-packagr-lite';
-        (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, executor);
-        project.targets.build = {
-            executor,
-            outputs: ['{workspaceRoot}/dist/{projectRoot}'],
-            options: {
-                project: `${libraryOptions.projectRoot}/ng-package.json`,
-            },
-            configurations: {
-                production: {
-                    tsConfig: `${libraryOptions.projectRoot}/tsconfig.lib.prod.json`,
-                },
-                development: {
-                    tsConfig: `${libraryOptions.projectRoot}/tsconfig.lib.json`,
-                },
-            },
-            defaultConfiguration: 'production',
-        };
-    }
     (0, devkit_1.addProjectConfiguration)(tree, libraryOptions.name, project);
     return project;
 }

package/src/generators/library/lib/add-standalone-component.d.ts

@@ -1,3 +1,3 @@
-import { type Tree } from '@nx/devkit';
-import type { NormalizedSchema } from './normalized-schema';
+import { Tree } from 'nx/src/generators/tree';
+import { NormalizedSchema } from './normalized-schema';
 export declare function addStandaloneComponent(tree: Tree, { libraryOptions, componentOptions }: NormalizedSchema): Promise<void>;

package/src/generators/library/lib/add-standalone-component.js

@@ -1,18 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addStandaloneComponent = void 0;
-const devkit_1 = require("@nx/devkit");
 const component_1 = require("../../component/component");
-const add_children_1 = require("./add-children");
 const add_load_children_1 = require("./add-load-children");
+const add_children_1 = require("./add-children");
 async function addStandaloneComponent(tree, { libraryOptions, componentOptions }) {
-    await (0, component_1.componentGenerator)(tree, {
+    await (0, component_1.default)(tree, {
         ...componentOptions,
         name: componentOptions.name,
-        directory: (0, devkit_1.joinPathFragments)(libraryOptions.projectRoot, 'src', 'lib', componentOptions.flat ? '' : componentOptions.name),
-        nameAndDirectoryFormat: 'as-provided',
         standalone: true,
         export: true,
+        project: libraryOptions.name,
+        flat: componentOptions.flat,
         skipFormat: true,
     });
     if (libraryOptions.routing) {

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

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 const eslint_1 = require("@nx/eslint");
 const test_runners_1 = require("../../../utils/test-runners");
+const project_1 = require("../../utils/project");
 async function normalizeOptions(host, schema) {
-    schema.standalone = schema.standalone ?? true;
     // Create a schema with populated default values
     const options = {
         buildable: false,
@@ -38,12 +39,14 @@ async function normalizeOptions(host, schema) {
         ? options.tags.split(',').map((s) => s.trim())
         : [];
     const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
+    const npmScope = (0, get_npm_scope_1.getNpmScope)(host);
+    const prefix = (0, project_1.normalizeNewProjectPrefix)(options.prefix, npmScope, 'lib');
     const ngCliSchematicLibRoot = projectName;
     const allNormalizedOptions = {
         ...options,
         linter: options.linter ?? eslint_1.Linter.EsLint,
         unitTestRunner: options.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
-        prefix: options.prefix ?? 'lib',
+        prefix,
         name: projectName,
         projectRoot,
         entryFile: 'index',