@nx/angular 16.7.1 → 16.8.0-beta.0

package/generators.json

@@ -163,7 +163,7 @@
       "hidden": true
     },
     "application": {
-      "factory": "./src/generators/application/application",
+      "factory": "./src/generators/application/application#applicationGeneratorInternal",
       "schema": "./src/generators/application/schema.json",
       "aliases": ["app"],
       "x-type": "application",
@@ -211,7 +211,7 @@
       "hidden": true
     },
     "library": {
-      "factory": "./src/generators/library/library",
+      "factory": "./src/generators/library/library#libraryGeneratorInternal",
       "schema": "./src/generators/library/schema.json",
       "aliases": ["lib"],
       "x-type": "library",
@@ -224,7 +224,7 @@
       "description": "Creates a secondary entry point for an Angular publishable library."
     },
     "remote": {
-      "factory": "./src/generators/remote/remote",
+      "factory": "./src/generators/remote/remote#remoteInternal",
       "schema": "./src/generators/remote/schema.json",
       "x-type": "application",
       "description": "Generate a Remote Angular Module Federation Application."
@@ -241,7 +241,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",
+      "factory": "./src/generators/host/host#hostInternal",
       "schema": "./src/generators/host/schema.json",
       "x-type": "application",
       "description": "Generate a Host Angular Module Federation Application."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.7.1",
+  "version": "16.8.0-beta.0",
   "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, 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- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -66,14 +66,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "16.7.1",
-    "@nx/cypress": "16.7.1",
-    "@nx/devkit": "16.7.1",
-    "@nx/jest": "16.7.1",
-    "@nx/js": "16.7.1",
-    "@nx/linter": "16.7.1",
-    "@nx/webpack": "16.7.1",
-    "@nx/workspace": "16.7.1",
+    "@nrwl/angular": "16.8.0-beta.0",
+    "@nx/cypress": "16.8.0-beta.0",
+    "@nx/devkit": "16.8.0-beta.0",
+    "@nx/jest": "16.8.0-beta.0",
+    "@nx/js": "16.8.0-beta.0",
+    "@nx/linter": "16.8.0-beta.0",
+    "@nx/webpack": "16.8.0-beta.0",
+    "@nx/workspace": "16.8.0-beta.0",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^5.36.1",
     "chalk": "^4.1.0",
@@ -107,5 +107,5 @@
   "module": "fesm2022/nx-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "8b38708d6c18496711695499d07c95f3ecc31cc9"
+  "gitHead": "818352404283c1d34ab303d91b3bd16474f54916"
 }

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

@@ -1,4 +1,5 @@
 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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applicationGenerator = void 0;
+exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
@@ -10,6 +10,12 @@ const lib_1 = require("./lib");
 const semver_1 = require("semver");
 const enquirer_1 = require("enquirer");
 function applicationGenerator(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return yield applicationGeneratorInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, schema));
+    });
+}
+exports.applicationGenerator = applicationGenerator;
+function applicationGeneratorInternal(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
         if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') && schema.standalone) {
@@ -25,7 +31,7 @@ function applicationGenerator(tree, schema) {
                 type: 'confirm',
             }).then((a) => a['standalone-components']);
         }
-        const options = (0, lib_1.normalizeOptions)(tree, schema);
+        const options = yield (0, lib_1.normalizeOptions)(tree, schema);
         const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
         yield (0, init_1.angularInitGenerator)(tree, Object.assign(Object.assign({}, options), { skipFormat: true }));
         (0, lib_1.createProject)(tree, options);
@@ -63,5 +69,5 @@ function applicationGenerator(tree, schema) {
         };
     });
 }
-exports.applicationGenerator = applicationGenerator;
+exports.applicationGeneratorInternal = applicationGeneratorInternal;
 exports.default = applicationGenerator;

package/src/generators/application/lib/add-e2e.js

@@ -4,18 +4,18 @@ exports.addE2e = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
-const remove_scaffolded_e2e_1 = require("./remove-scaffolded-e2e");
 const cypress_1 = require("@nx/cypress");
 function addE2e(tree, options) {
     var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        (0, remove_scaffolded_e2e_1.removeScaffoldedE2e)(tree, options, options.ngCliSchematicE2ERoot);
         if (options.e2eTestRunner === 'cypress') {
             // TODO: This can call `@nx/web:static-config` generator when ready
             addFileServerTarget(tree, options, 'serve-static');
             yield (0, cypress_1.cypressProjectGenerator)(tree, {
                 name: options.e2eProjectName,
-                directory: options.directory,
+                directory: options.e2eProjectRoot,
+                // the name and root are already normalized, instruct the generator to use them as is
+                projectNameAndRootFormat: 'as-provided',
                 project: options.name,
                 linter: options.linter,
                 standaloneConfig: options.standaloneConfig,

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

@@ -7,7 +7,5 @@ export * from './create-project';
 export * from './enable-strict-type-checking';
 export * from './normalize-options';
 export * from './normalized-schema';
-export * from './remove-scaffolded-e2e';
 export * from './set-app-strict-default';
-export * from './update-e2e-project';
 export * from './update-editor-tsconfig';

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

@@ -10,7 +10,5 @@ tslib_1.__exportStar(require("./create-project"), exports);
 tslib_1.__exportStar(require("./enable-strict-type-checking"), exports);
 tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./normalized-schema"), exports);
-tslib_1.__exportStar(require("./remove-scaffolded-e2e"), exports);
 tslib_1.__exportStar(require("./set-app-strict-default"), exports);
-tslib_1.__exportStar(require("./update-e2e-project"), exports);
 tslib_1.__exportStar(require("./update-editor-tsconfig"), exports);

package/src/generators/application/lib/normalize-options.d.ts

@@ -1,4 +1,4 @@
 import { Tree } from '@nx/devkit';
 import type { Schema } from '../schema';
 import type { NormalizedSchema } from './normalized-schema';
-export declare function normalizeOptions(host: Tree, options: Partial<Schema>): NormalizedSchema;
+export declare function normalizeOptions(host: Tree, options: Partial<Schema>): Promise<NormalizedSchema>;

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

@@ -1,40 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
-const devkit_1 = require("@nx/devkit");
+const tslib_1 = require("tslib");
+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 test_runners_1 = require("../../../utils/test-runners");
 const linter_1 = require("@nx/linter");
+const test_runners_1 = require("../../../utils/test-runners");
 const project_1 = require("../../utils/project");
 function normalizeOptions(host, options) {
-    var _a, _b;
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const appDirectory = (0, project_1.normalizeDirectory)(options.name, projectDirectory);
-    const appProjectName = (0, project_1.normalizeProjectName)(options.name, projectDirectory);
-    const e2eProjectName = options.rootProject
-        ? 'e2e'
-        : `${(0, devkit_1.names)(options.name).fileName}-e2e`;
-    const { appsDir: defaultAppsDir, standaloneAsDefault } = (0, devkit_1.getWorkspaceLayout)(host);
-    const appsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultAppsDir;
-    const appProjectRoot = options.rootProject
-        ? '.'
-        : (0, devkit_1.joinPathFragments)(appsDir, appDirectory);
-    const e2eProjectRoot = options.rootProject
-        ? 'e2e'
-        : (0, devkit_1.joinPathFragments)(appsDir, `${appDirectory}-e2e`);
-    const parsedTags = options.tags
-        ? options.tags.split(',').map((s) => s.trim())
-        : [];
-    const prefix = (0, project_1.normalizeNewProjectPrefix)(options.prefix, (0, get_npm_scope_1.getNpmScope)(host), 'app');
-    options.standaloneConfig = (_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : standaloneAsDefault;
-    const ngCliSchematicAppRoot = appProjectName;
-    const ngCliSchematicE2ERoot = `${appProjectName}/e2e`;
-    // Set defaults and then overwrite with user options
-    return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests: options.unitTestRunner === test_runners_1.UnitTestRunner.None, skipFormat: false, unitTestRunner: test_runners_1.UnitTestRunner.Jest, e2eTestRunner: test_runners_1.E2eTestRunner.Cypress, linter: linter_1.Linter.EsLint, strict: true, bundler: (_b = options.bundler) !== null && _b !== void 0 ? _b : 'webpack' }, options), { prefix, name: appProjectName, appProjectRoot,
-        e2eProjectRoot,
-        e2eProjectName,
-        parsedTags,
-        ngCliSchematicAppRoot,
-        ngCliSchematicE2ERoot });
+    var _a;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { projectName: appProjectName, projectRoot: appProjectRoot, projectNameAndRootFormat, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+            name: options.name,
+            projectType: 'application',
+            directory: options.directory,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            rootProject: options.rootProject,
+            callingGenerator: '@nx/angular:application',
+        });
+        options.rootProject = appProjectRoot === '.';
+        options.projectNameAndRootFormat = projectNameAndRootFormat;
+        let e2eProjectName = 'e2e';
+        let e2eProjectRoot = 'e2e';
+        if (!options.rootProject) {
+            const projectNameAndRoot = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+                name: `${options.name}-e2e`,
+                projectType: 'application',
+                directory: options.directory,
+                projectNameAndRootFormat: options.projectNameAndRootFormat,
+                rootProject: options.rootProject,
+                callingGenerator: '@nx/angular:application',
+            });
+            e2eProjectName = projectNameAndRoot.projectName;
+            e2eProjectRoot = projectNameAndRoot.projectRoot;
+        }
+        const parsedTags = options.tags
+            ? options.tags.split(',').map((s) => s.trim())
+            : [];
+        const prefix = (0, project_1.normalizeNewProjectPrefix)(options.prefix, (0, get_npm_scope_1.getNpmScope)(host), 'app');
+        // Set defaults and then overwrite with user options
+        return Object.assign(Object.assign({ style: 'css', routing: false, inlineStyle: false, inlineTemplate: false, skipTests: options.unitTestRunner === test_runners_1.UnitTestRunner.None, skipFormat: false, unitTestRunner: test_runners_1.UnitTestRunner.Jest, e2eTestRunner: test_runners_1.E2eTestRunner.Cypress, linter: linter_1.Linter.EsLint, strict: true, bundler: (_a = options.bundler) !== null && _a !== void 0 ? _a : 'webpack' }, options), { prefix, name: appProjectName, appProjectRoot,
+            e2eProjectRoot,
+            e2eProjectName,
+            parsedTags });
+    });
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/application/lib/normalized-schema.d.ts

@@ -10,6 +10,4 @@ export interface NormalizedSchema extends Schema {
     e2eProjectName: string;
     e2eProjectRoot: string;
     parsedTags: string[];
-    ngCliSchematicAppRoot: string;
-    ngCliSchematicE2ERoot: string;
 }

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

@@ -1,5 +1,6 @@
-import { Linter } from '@nx/linter';
-import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+import type { Linter } from '@nx/linter';
+import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
 export interface Schema {
@@ -14,6 +15,7 @@ export interface Schema {
   style?: Styles;
   skipTests?: boolean;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   linter?: Linter;
   unitTestRunner?: UnitTestRunner;

package/src/generators/application/schema.json

@@ -14,13 +14,18 @@
         "index": 0
       },
       "x-prompt": "What name would you like to use for the application?",
-      "pattern": "^[a-zA-Z].*$"
+      "pattern": "^[a-zA-Z][^:]*$"
     },
     "directory": {
       "description": "The directory of the new application.",
       "type": "string",
       "x-priority": "important"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",

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

@@ -1,4 +1,5 @@
 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, options: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default host;

package/src/generators/host/host.js

@@ -1,17 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.host = void 0;
+exports.hostInternal = exports.host = void 0;
 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");
+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 project_1 = require("../utils/project");
 const setup_mf_1 = require("../setup-mf/setup-mf");
-const test_runners_1 = require("../../utils/test-runners");
-const lib_1 = require("./lib");
 const version_utils_1 = require("../utils/version-utils");
-const semver_1 = require("semver");
+const lib_1 = require("./lib");
 function host(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return yield hostInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, options));
+    });
+}
+exports.host = host;
+function hostInternal(tree, options) {
     var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
@@ -32,12 +38,18 @@ function host(tree, options) {
                 }
             });
         }
-        const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-        const appName = (0, project_1.normalizeProjectName)(options.name, projectDirectory);
+        const { projectName: hostProjectName, projectNameAndRootFormat } = yield (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 = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { standalone: (_a = options.standalone) !== null && _a !== void 0 ? _a : false, routing: true, port: 4200, skipFormat: true }));
         const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;
         yield (0, setup_mf_1.setupMf)(tree, {
-            appName,
+            appName: hostProjectName,
             mfType: 'host',
             routing: true,
             port: 4200,
@@ -46,16 +58,16 @@ function host(tree, options) {
             skipPackageJson: options.skipPackageJson,
             skipFormat: true,
             skipE2E,
-            e2eProjectName: skipE2E ? undefined : `${appName}-e2e`,
+            e2eProjectName: skipE2E ? undefined : `${hostProjectName}-e2e`,
             prefix: options.prefix,
         });
         let installTasks = [appInstallTask];
         if (options.ssr) {
-            let ssrInstallTask = yield (0, lib_1.addSsr)(tree, options, appName);
+            let ssrInstallTask = yield (0, lib_1.addSsr)(tree, options, hostProjectName);
             installTasks.push(ssrInstallTask);
         }
         for (const remote of remotesToGenerate) {
-            yield (0, remote_1.default)(tree, Object.assign(Object.assign({}, options), { name: remote, host: appName, skipFormat: true, standalone: options.standalone }));
+            yield (0, remote_1.default)(tree, Object.assign(Object.assign({}, options), { name: remote, host: hostProjectName, skipFormat: true, standalone: options.standalone }));
         }
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
@@ -63,5 +75,5 @@ function host(tree, options) {
         return (0, devkit_1.runTasksInSerial)(...installTasks);
     });
 }
-exports.host = host;
+exports.hostInternal = hostInternal;
 exports.default = host;

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

@@ -1,5 +1,6 @@
-import { Linter } from '@nx/linter';
-import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+import type { Linter } from '@nx/linter';
+import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
 export interface Schema {
@@ -14,6 +15,7 @@ export interface Schema {
   style?: Styles;
   skipTests?: boolean;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   linter?: Linter;
   unitTestRunner?: UnitTestRunner;

package/src/generators/host/schema.json

@@ -19,7 +19,7 @@
         "$source": "argv",
         "index": 0
       },
-      "pattern": "^[a-zA-Z].*$"
+      "pattern": "^[a-zA-Z][^:]*$"
     },
     "remotes": {
       "type": "array",
@@ -35,6 +35,11 @@
       "description": "The directory of the new application.",
       "type": "string"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",

package/src/generators/library/lib/normalize-options.d.ts

@@ -1,4 +1,4 @@
 import { Tree } from '@nx/devkit';
 import { Schema } from '../schema';
 import { NormalizedSchema } from './normalized-schema';
-export declare function normalizeOptions(host: Tree, schema: Schema): NormalizedSchema;
+export declare function normalizeOptions(host: Tree, schema: Schema): Promise<NormalizedSchema>;

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

@@ -3,63 +3,63 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
+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 linter_1 = require("@nx/linter");
 const test_runners_1 = require("../../../utils/test-runners");
 const project_1 = require("../../utils/project");
 function normalizeOptions(host, schema) {
-    var _a, _b, _c, _d;
-    // Create a schema with populated default values
-    const options = Object.assign({ buildable: false, linter: linter_1.Linter.EsLint, publishable: false, simpleName: false, skipFormat: false, unitTestRunner: test_runners_1.UnitTestRunner.Jest, 
-        // Publishable libs cannot use `full` yet, so if its false then use the passed value or default to `full`
-        compilationMode: schema.publishable
-            ? 'partial'
-            : (_a = schema.compilationMode) !== null && _a !== void 0 ? _a : 'full', skipModule: schema.skipModule || schema.standalone }, schema);
-    const name = (0, devkit_1.names)(options.name).fileName;
-    const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-    const fullProjectDirectory = projectDirectory
-        ? `${(0, devkit_1.names)(projectDirectory).fileName}/${name}`.replace(/\/+/g, '/')
-        : name;
-    const { libsDir: defaultLibsDirectory, standaloneAsDefault } = (0, devkit_1.getWorkspaceLayout)(host);
-    const npmScope = (0, get_npm_scope_1.getNpmScope)(host);
-    const libsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultLibsDirectory;
-    const projectName = fullProjectDirectory
-        .replace(new RegExp('/', 'g'), '-')
-        .replace(/-\d+/g, '');
-    const fileName = options.simpleName ? name : projectName;
-    const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, fullProjectDirectory);
-    const moduleName = `${(0, devkit_1.names)(fileName).className}Module`;
-    const parsedTags = options.tags
-        ? options.tags.split(',').map((s) => s.trim())
-        : [];
-    const modulePath = `${projectRoot}/src/lib/${fileName}.module.ts`;
-    const prefix = (0, project_1.normalizeNewProjectPrefix)(options.prefix, npmScope, 'lib');
-    options.standaloneConfig = (_b = options.standaloneConfig) !== null && _b !== void 0 ? _b : standaloneAsDefault;
-    const importPath = options.importPath || (0, get_import_path_1.getImportPath)(host, fullProjectDirectory);
-    const ngCliSchematicLibRoot = projectName;
-    const allNormalizedOptions = Object.assign(Object.assign({}, options), { linter: (_c = options.linter) !== null && _c !== void 0 ? _c : linter_1.Linter.EsLint, unitTestRunner: (_d = options.unitTestRunner) !== null && _d !== void 0 ? _d : test_runners_1.UnitTestRunner.Jest, prefix, name: projectName, projectRoot, entryFile: 'index', moduleName, projectDirectory: fullProjectDirectory, modulePath,
-        parsedTags,
-        fileName,
-        importPath,
-        ngCliSchematicLibRoot, standaloneComponentName: `${(0, devkit_1.names)(name).className}Component` });
-    const { displayBlock, inlineStyle, inlineTemplate, viewEncapsulation, changeDetection, style, skipTests, selector, skipSelector, flat } = allNormalizedOptions, libraryOptions = tslib_1.__rest(allNormalizedOptions, ["displayBlock", "inlineStyle", "inlineTemplate", "viewEncapsulation", "changeDetection", "style", "skipTests", "selector", "skipSelector", "flat"]);
-    return {
-        libraryOptions,
-        componentOptions: {
-            name: fileName,
-            standalone: libraryOptions.standalone,
-            displayBlock,
-            inlineStyle,
-            inlineTemplate,
-            viewEncapsulation,
-            changeDetection,
-            style,
-            skipTests,
-            selector,
-            skipSelector,
-            flat,
-        },
-    };
+    var _a, _b, _c;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        // Create a schema with populated default values
+        const options = Object.assign({ buildable: false, linter: linter_1.Linter.EsLint, publishable: false, simpleName: false, skipFormat: false, unitTestRunner: test_runners_1.UnitTestRunner.Jest, 
+            // Publishable libs cannot use `full` yet, so if its false then use the passed value or default to `full`
+            compilationMode: schema.publishable
+                ? 'partial'
+                : (_a = schema.compilationMode) !== null && _a !== void 0 ? _a : 'full', skipModule: schema.skipModule || schema.standalone }, schema);
+        const { projectName, names: projectNames, projectRoot, importPath, } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+            name: options.name,
+            projectType: 'library',
+            directory: options.directory,
+            importPath: options.importPath,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            callingGenerator: '@nx/angular:library',
+        });
+        const fileName = options.simpleName
+            ? projectNames.projectSimpleName
+            : projectNames.projectFileName;
+        const moduleName = `${(0, devkit_1.names)(fileName).className}Module`;
+        const parsedTags = options.tags
+            ? 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 = Object.assign(Object.assign({}, options), { linter: (_b = options.linter) !== null && _b !== void 0 ? _b : linter_1.Linter.EsLint, unitTestRunner: (_c = options.unitTestRunner) !== null && _c !== void 0 ? _c : test_runners_1.UnitTestRunner.Jest, prefix, name: projectName, projectRoot, entryFile: 'index', moduleName,
+            modulePath,
+            parsedTags,
+            fileName,
+            importPath,
+            ngCliSchematicLibRoot, standaloneComponentName: `${(0, devkit_1.names)(projectNames.projectSimpleName).className}Component` });
+        const { displayBlock, inlineStyle, inlineTemplate, viewEncapsulation, changeDetection, style, skipTests, selector, skipSelector, flat } = allNormalizedOptions, libraryOptions = tslib_1.__rest(allNormalizedOptions, ["displayBlock", "inlineStyle", "inlineTemplate", "viewEncapsulation", "changeDetection", "style", "skipTests", "selector", "skipSelector", "flat"]);
+        return {
+            libraryOptions,
+            componentOptions: {
+                name: fileName,
+                standalone: libraryOptions.standalone,
+                displayBlock,
+                inlineStyle,
+                inlineTemplate,
+                viewEncapsulation,
+                changeDetection,
+                style,
+                skipTests,
+                selector,
+                skipSelector,
+                flat,
+            },
+        };
+    });
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/library/lib/normalized-schema.d.ts

@@ -34,7 +34,6 @@ export interface NormalizedSchema {
         entryFile: string;
         modulePath: string;
         moduleName: string;
-        projectDirectory: string;
         parsedTags: string[];
         ngCliSchematicLibRoot: string;
         standaloneComponentName: string;

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

@@ -1,4 +1,5 @@
 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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.libraryGenerator = void 0;
+exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const jest_1 = require("@nx/jest");
@@ -22,6 +22,15 @@ const update_tsconfig_1 = require("./lib/update-tsconfig");
 const create_files_1 = require("./lib/create-files");
 const add_project_1 = require("./lib/add-project");
 function libraryGenerator(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return yield libraryGeneratorInternal(tree, Object.assign({ 
+            // provide a default projectNameAndRootFormat to avoid breaking changes
+            // to external generators invoking this one
+            projectNameAndRootFormat: 'derived' }, schema));
+    });
+}
+exports.libraryGenerator = libraryGenerator;
+function libraryGeneratorInternal(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         // Do some validation checks
         if (!schema.routing && schema.lazy) {
@@ -37,7 +46,7 @@ function libraryGenerator(tree, schema) {
         if ((0, semver_1.lt)(userInstalledAngularVersion.version, '14.1.0') && schema.standalone) {
             throw new Error(`The "--standalone" option is not supported in Angular versions < 14.1.0.`);
         }
-        const options = (0, normalize_options_1.normalizeOptions)(tree, schema);
+        const options = yield (0, normalize_options_1.normalizeOptions)(tree, schema);
         const { libraryOptions } = options;
         const pkgVersions = (0, version_utils_1.versions)(tree);
         yield (0, init_1.default)(tree, Object.assign(Object.assign({}, libraryOptions), { skipFormat: true, e2eTestRunner: test_runners_1.E2eTestRunner.None }));
@@ -77,7 +86,7 @@ function libraryGenerator(tree, schema) {
         };
     });
 }
-exports.libraryGenerator = libraryGenerator;
+exports.libraryGeneratorInternal = libraryGeneratorInternal;
 function addUnitTestRunner(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         if (options.unitTestRunner === 'jest') {

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

@@ -1,5 +1,6 @@
-import { UnitTestRunner } from '../../utils/test-runners';
-import { Linter } from '@nx/linter';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-directory-utils';
+import type { Linter } from '@nx/linter';
+import type { UnitTestRunner } from '../../utils/test-runners';
 
 export interface Schema {
   name: string;
@@ -8,6 +9,7 @@ export interface Schema {
   simpleName?: boolean;
   addModuleSpec?: boolean;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   sourceDir?: string;
   buildable?: boolean;
   publishable?: boolean;

package/src/generators/library/schema.json

@@ -14,13 +14,18 @@
         "index": 0
       },
       "x-prompt": "What name would you like to use for the library?",
-      "pattern": "^[a-zA-Z].*$"
+      "pattern": "(?:^@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*\\/[a-zA-Z0-9-~][a-zA-Z0-9-._~]*|^[a-zA-Z][^:]*)$"
     },
     "directory": {
       "type": "string",
       "description": "A directory where the library is placed.",
       "x-priority": "important"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "publishable": {
       "type": "boolean",
       "default": false,

package/src/generators/ng-add/utilities/workspace.js

@@ -57,7 +57,9 @@ function createNxJson(tree, options, defaultProject) {
                         '!{projectRoot}/karma.conf.js',
                     ]
                     : []),
-                targets.lint ? '!{projectRoot}/.eslintrc.json' : undefined,
+                ...(targets.lint
+                    ? ['!{projectRoot}/.eslintrc.json', '!{projectRoot}/eslint.config.js']
+                    : []),
             ].filter(Boolean),
         },
         targetDefaults: {
@@ -72,7 +74,11 @@ function createNxJson(tree, options, defaultProject) {
                 : undefined,
             lint: targets.lint
                 ? {
-                    inputs: ['default', '{workspaceRoot}/.eslintrc.json'],
+                    inputs: [
+                        'default',
+                        '{workspaceRoot}/.eslintrc.json',
+                        '{workspaceRoot}/eslint.config.js',
+                    ],
                 }
                 : undefined,
             e2e: targets.e2e

package/src/generators/remote/remote.d.ts

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

package/src/generators/remote/remote.js

@@ -1,16 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remote = void 0;
+exports.remoteInternal = exports.remote = void 0;
 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");
+const semver_1 = require("semver");
+const test_runners_1 = require("../../utils/test-runners");
 const application_1 = require("../application/application");
-const project_1 = require("../utils/project");
 const setup_mf_1 = require("../setup-mf/setup-mf");
-const test_runners_1 = require("../../utils/test-runners");
-const lib_1 = require("./lib");
 const version_utils_1 = require("../utils/version-utils");
-const semver_1 = require("semver");
+const lib_1 = require("./lib");
 function remote(tree, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        return yield remoteInternal(tree, Object.assign({ projectNameAndRootFormat: 'derived' }, options));
+    });
+}
+exports.remote = remote;
+function remoteInternal(tree, options) {
     var _a, _b;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
@@ -22,13 +28,19 @@ function remote(tree, options) {
         if (options.host && !projects.has(options.host)) {
             throw new Error(`The name of the application to be used as the host app does not exist. (${options.host})`);
         }
-        const { projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
-        const appName = (0, project_1.normalizeProjectName)(options.name, projectDirectory);
+        const { projectName: remoteProjectName, projectNameAndRootFormat } = yield (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(tree, {
+            name: options.name,
+            projectType: 'application',
+            directory: options.directory,
+            projectNameAndRootFormat: options.projectNameAndRootFormat,
+            callingGenerator: '@nx/angular:remote',
+        });
+        options.projectNameAndRootFormat = projectNameAndRootFormat;
         const port = (_a = options.port) !== null && _a !== void 0 ? _a : (0, lib_1.findNextAvailablePort)(tree);
-        const appInstallTask = yield (0, application_1.default)(tree, Object.assign(Object.assign({}, options), { standalone: (_b = options.standalone) !== null && _b !== void 0 ? _b : false, routing: true, port, skipFormat: true }));
+        const appInstallTask = yield (0, application_1.applicationGenerator)(tree, Object.assign(Object.assign({}, options), { standalone: (_b = options.standalone) !== null && _b !== void 0 ? _b : false, routing: true, port, skipFormat: true }));
         const skipE2E = !options.e2eTestRunner || options.e2eTestRunner === test_runners_1.E2eTestRunner.None;
         yield (0, setup_mf_1.setupMf)(tree, {
-            appName,
+            appName: remoteProjectName,
             mfType: 'remote',
             routing: true,
             host: options.host,
@@ -36,14 +48,14 @@ function remote(tree, options) {
             skipPackageJson: options.skipPackageJson,
             skipFormat: true,
             skipE2E,
-            e2eProjectName: skipE2E ? undefined : `${appName}-e2e`,
+            e2eProjectName: skipE2E ? undefined : `${remoteProjectName}-e2e`,
             standalone: options.standalone,
             prefix: options.prefix,
         });
         let installTasks = [appInstallTask];
         if (options.ssr) {
             let ssrInstallTask = yield (0, lib_1.addSsr)(tree, {
-                appName,
+                appName: remoteProjectName,
                 port,
                 standalone: options.standalone,
             });
@@ -55,5 +67,5 @@ function remote(tree, options) {
         return (0, devkit_1.runTasksInSerial)(...installTasks);
     });
 }
-exports.remote = remote;
+exports.remoteInternal = remoteInternal;
 exports.default = remote;

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

@@ -1,5 +1,6 @@
-import { Linter } from '@nx/linter';
-import { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
+import type { ProjectNameAndRootFormat } from '@nx/devkit/src/generators/project-name-and-root-utils';
+import type { Linter } from '@nx/linter';
+import type { E2eTestRunner, UnitTestRunner } from '../../utils/test-runners';
 import type { Styles } from '../utils/types';
 
 export interface Schema {
@@ -13,6 +14,7 @@ export interface Schema {
   style?: Styles;
   skipTests?: boolean;
   directory?: string;
+  projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   linter?: Linter;
   unitTestRunner?: UnitTestRunner;

package/src/generators/remote/schema.json

@@ -19,7 +19,7 @@
         "$source": "argv",
         "index": 0
       },
-      "pattern": "^[a-zA-Z].*$"
+      "pattern": "^[a-zA-Z][^:]*$"
     },
     "host": {
       "type": "string",
@@ -35,6 +35,11 @@
       "description": "The directory of the new application.",
       "type": "string"
     },
+    "projectNameAndRootFormat": {
+      "description": "Whether to generate the project name and root directory as provided (`as-provided`) or generate them composing their values and taking the configured layout into account (`derived`).",
+      "type": "string",
+      "enum": ["as-provided", "derived"]
+    },
     "style": {
       "description": "The file extension to be used for style files.",
       "type": "string",

package/src/generators/setup-ssr/lib/add-hydration.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+import { type Schema } from '../schema';
+export declare function addHydration(tree: Tree, options: Schema): void;

package/src/generators/setup-ssr/lib/add-hydration.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addHydration = void 0;
+const devkit_1 = require("@nx/devkit");
+const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const js_1 = require("@nx/js");
+let tsModule;
+function addHydration(tree, options) {
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    if (!tsModule) {
+        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    }
+    const addImport = (source, symbolName, packageName, filePath, isDefault = false) => {
+        return (0, js_1.insertImport)(tree, source, filePath, symbolName, packageName, isDefault);
+    };
+    const pathToClientConfigFile = options.standalone
+        ? (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.config.ts')
+        : (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'app/app.module.ts');
+    const sourceText = tree.read(pathToClientConfigFile, 'utf-8');
+    let sourceFile = tsModule.createSourceFile(pathToClientConfigFile, sourceText, tsModule.ScriptTarget.Latest, true);
+    sourceFile = addImport(sourceFile, 'provideClientHydration', '@angular/platform-browser', pathToClientConfigFile);
+    if (options.standalone) {
+        (0, ast_utils_1.addProviderToAppConfig)(tree, pathToClientConfigFile, 'provideClientHydration()');
+    }
+    else {
+        (0, ast_utils_1.addProviderToModule)(tree, sourceFile, pathToClientConfigFile, 'provideClientHydration()');
+    }
+}
+exports.addHydration = addHydration;

package/src/generators/setup-ssr/lib/index.d.ts

@@ -3,3 +3,4 @@ export * from './normalize-options';
 export * from './update-app-module';
 export * from './update-project-config';
 export * from './validate-options';
+export * from './add-hydration';

package/src/generators/setup-ssr/lib/index.js

@@ -6,3 +6,4 @@ tslib_1.__exportStar(require("./normalize-options"), exports);
 tslib_1.__exportStar(require("./update-app-module"), exports);
 tslib_1.__exportStar(require("./update-project-config"), exports);
 tslib_1.__exportStar(require("./validate-options"), exports);
+tslib_1.__exportStar(require("./add-hydration"), exports);

package/src/generators/setup-ssr/lib/normalize-options.d.ts

@@ -10,4 +10,5 @@ export declare function normalizeOptions(tree: Tree, options: Schema): {
     rootModuleClassName: string;
     skipFormat: boolean;
     standalone: boolean;
+    hydration: boolean;
 };

package/src/generators/setup-ssr/lib/normalize-options.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
 function normalizeOptions(tree, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const isStandaloneApp = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
     return {
         project: options.project,
@@ -15,6 +15,7 @@ function normalizeOptions(tree, options) {
         rootModuleClassName: (_f = options.rootModuleClassName) !== null && _f !== void 0 ? _f : 'AppServerModule',
         skipFormat: (_g = options.skipFormat) !== null && _g !== void 0 ? _g : false,
         standalone: (_h = options.standalone) !== null && _h !== void 0 ? _h : isStandaloneApp,
+        hydration: (_j = options.hydration) !== null && _j !== void 0 ? _j : false,
     };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/setup-ssr/lib/validate-options.js

@@ -1,9 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
+const devkit_1 = require("@nx/devkit");
 const validations_1 = require("../../utils/validations");
+const version_utils_1 = require("../../utils/version-utils");
+const semver_1 = require("semver");
 function validateOptions(tree, options) {
     (0, validations_1.validateProject)(tree, options.project);
     (0, validations_1.validateStandaloneOption)(tree, options.standalone);
+    validateHydrationOption(tree, options.hydration);
 }
 exports.validateOptions = validateOptions;
+function validateHydrationOption(tree, hydration) {
+    if (!hydration) {
+        return;
+    }
+    const installedAngularVersion = (0, version_utils_1.getInstalledAngularVersionInfo)(tree).version;
+    if ((0, semver_1.lt)(installedAngularVersion, '16.0.0')) {
+        throw new Error((0, devkit_1.stripIndents) `The "hydration" option is only supported in Angular >= 16.0.0. You are currently using "${installedAngularVersion}".
+    You can resolve this error by removing the "hydration" option or by migrating to Angular 16.0.0.`);
+    }
+}

package/src/generators/setup-ssr/schema.d.ts

@@ -7,5 +7,6 @@ export interface Schema {
   rootModuleFileName?: string;
   rootModuleClassName?: string;
   standalone?: boolean;
+  hydration?: boolean;
   skipFormat?: boolean;
 }

package/src/generators/setup-ssr/schema.json

@@ -53,6 +53,10 @@
       "type": "boolean",
       "description": "Use Standalone Components to bootstrap SSR. _Note: This is only supported in Angular versions >= 14.1.0_."
     },
+    "hydration": {
+      "type": "boolean",
+      "description": "Set up Hydration for the SSR application. _Note: This is only supported in Angular versions >= 16.0.0_."
+    },
     "skipFormat": {
       "type": "boolean",
       "description": "Skip formatting the workspace after the generator completes.",

package/src/generators/setup-ssr/setup-ssr.js

@@ -6,6 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
 function setupSsr(tree, schema) {
+    var _a, _b, _c, _d, _e, _f;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         (0, lib_1.validateOptions)(tree, schema);
         const options = (0, lib_1.normalizeOptions)(tree, schema);
@@ -14,12 +15,15 @@ function setupSsr(tree, schema) {
         if (!options.standalone) {
             (0, lib_1.updateAppModule)(tree, options);
         }
+        if (options.hydration) {
+            (0, lib_1.addHydration)(tree, options);
+        }
         const pkgVersions = (0, version_utils_1.versions)(tree);
         (0, devkit_1.addDependenciesToPackageJson)(tree, {
-            '@nguniversal/express-engine': pkgVersions.ngUniversalVersion,
-            '@angular/platform-server': pkgVersions.angularVersion,
+            '@nguniversal/express-engine': (_b = (_a = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/express-engine')) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : pkgVersions.ngUniversalVersion,
+            '@angular/platform-server': (_d = (_c = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@angular/platform-server')) === null || _c === void 0 ? void 0 : _c.version) !== null && _d !== void 0 ? _d : pkgVersions.angularVersion,
         }, {
-            '@nguniversal/builders': pkgVersions.ngUniversalVersion,
+            '@nguniversal/builders': (_f = (_e = (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/builders')) === null || _e === void 0 ? void 0 : _e.version) !== null && _f !== void 0 ? _f : pkgVersions.ngUniversalVersion,
         });
         if (!options.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);

package/src/utils/backward-compatible-versions.js

@@ -16,7 +16,7 @@ exports.backwardCompatibleVersions = {
         typesCorsVersion: '~2.8.5',
         expressVersion: '~4.18.2',
         typesExpressVersion: '4.17.14',
-        moduleFederationNodeVersion: '^0.10.1',
+        moduleFederationNodeVersion: '~1.0.5',
         angularEslintVersion: '~14.0.4',
         tailwindVersion: '^3.0.2',
         postcssVersion: '^8.4.5',
@@ -43,7 +43,7 @@ exports.backwardCompatibleVersions = {
         typesCorsVersion: '~2.8.5',
         expressVersion: '~4.18.2',
         typesExpressVersion: '4.17.14',
-        moduleFederationNodeVersion: '~0.10.1',
+        moduleFederationNodeVersion: '~1.0.5',
         angularEslintVersion: '~15.0.0',
         tailwindVersion: '^3.0.2',
         postcssVersion: '^8.4.5',

package/src/utils/versions.d.ts

@@ -12,7 +12,7 @@ export declare const corsVersion = "~2.8.5";
 export declare const typesCorsVersion = "~2.8.5";
 export declare const expressVersion = "~4.18.2";
 export declare const typesExpressVersion = "4.17.14";
-export declare const moduleFederationNodeVersion = "~0.10.1";
+export declare const moduleFederationNodeVersion = "~1.0.5";
 export declare const angularEslintVersion = "~16.0.0";
 export declare const tailwindVersion = "^3.0.2";
 export declare const postcssVersion = "^8.4.5";

package/src/utils/versions.js

@@ -15,7 +15,7 @@ exports.corsVersion = '~2.8.5';
 exports.typesCorsVersion = '~2.8.5';
 exports.expressVersion = '~4.18.2';
 exports.typesExpressVersion = '4.17.14';
-exports.moduleFederationNodeVersion = '~0.10.1';
+exports.moduleFederationNodeVersion = '~1.0.5';
 exports.angularEslintVersion = '~16.0.0';
 exports.tailwindVersion = '^3.0.2';
 exports.postcssVersion = '^8.4.5';

package/src/generators/application/lib/remove-scaffolded-e2e.d.ts

@@ -1,3 +0,0 @@
-import type { Tree } from '@nx/devkit';
-import type { NormalizedSchema } from './normalized-schema';
-export declare function removeScaffoldedE2e(host: Tree, { name }: NormalizedSchema, e2eProjectRoot: string): void;

package/src/generators/application/lib/remove-scaffolded-e2e.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeScaffoldedE2e = void 0;
-const devkit_1 = require("@nx/devkit");
-function removeScaffoldedE2e(host, { name }, e2eProjectRoot) {
-    if (host.exists(`${e2eProjectRoot}/src/app.e2e-spec.ts`)) {
-        host.delete(`${e2eProjectRoot}/src/app.e2e-spec.ts`);
-    }
-    if (host.exists(`${e2eProjectRoot}/src/app.po.ts`)) {
-        host.delete(`${e2eProjectRoot}/src/app.po.ts`);
-    }
-    if (host.exists(`${e2eProjectRoot}/protractor.conf.js`)) {
-        host.delete(`${e2eProjectRoot}/protractor.conf.js`);
-    }
-    if (host.exists(`${e2eProjectRoot}/tsconfig.json`)) {
-        host.delete(`${e2eProjectRoot}/tsconfig.json`);
-    }
-    const project = (0, devkit_1.readProjectConfiguration)(host, name);
-    delete project.targets['e2e'];
-    (0, devkit_1.updateProjectConfiguration)(host, name, project);
-}
-exports.removeScaffoldedE2e = removeScaffoldedE2e;

package/src/generators/application/lib/update-e2e-project.d.ts

@@ -1,3 +0,0 @@
-import type { Tree } from '@nx/devkit';
-import type { NormalizedSchema } from './normalized-schema';
-export declare function updateE2eProject(tree: Tree, options: NormalizedSchema): void;

package/src/generators/application/lib/update-e2e-project.js

@@ -1,39 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateE2eProject = void 0;
-const devkit_1 = require("@nx/devkit");
-const js_1 = require("@nx/js");
-function updateE2eProject(tree, options) {
-    const spec = `${options.e2eProjectRoot}/src/app.e2e-spec.ts`;
-    const content = tree.read(spec, 'utf-8');
-    tree.write(spec, content.replace(`${options.name} app is running!`, `Welcome ${options.name}`));
-    const page = `${options.e2eProjectRoot}/src/app.po.ts`;
-    const pageContent = tree.read(page, 'utf-8');
-    tree.write(page, pageContent.replace(`.content span`, `header h1`));
-    const proj = (0, devkit_1.readProjectConfiguration)(tree, options.name);
-    const project = {
-        root: options.e2eProjectRoot,
-        projectType: 'application',
-        targets: {
-            e2e: proj.targets.e2e,
-        },
-        implicitDependencies: [options.name],
-        tags: [],
-    };
-    project.targets.e2e.options.protractorConfig = `${options.e2eProjectRoot}/protractor.conf.js`;
-    (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, project);
-    delete proj.targets.e2e;
-    (0, devkit_1.updateProjectConfiguration)(tree, options.name, proj);
-    // update tsconfig e2e
-    if (!tree.exists(`${options.e2eProjectRoot}/tsconfig.e2e.json`)) {
-        tree.write(`${options.e2eProjectRoot}/tsconfig.e2e.json`, '{}');
-    }
-    (0, devkit_1.updateJson)(tree, `${options.e2eProjectRoot}/tsconfig.e2e.json`, (json) => {
-        return Object.assign(Object.assign({}, json), { extends: `./tsconfig.json`, compilerOptions: Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${(0, devkit_1.offsetFromRoot)(options.e2eProjectRoot)}dist/out-tsc` }) });
-    });
-    // update tsconfig
-    (0, devkit_1.updateJson)(tree, `${options.e2eProjectRoot}/tsconfig.json`, (json) => {
-        return Object.assign(Object.assign({}, json), { extends: (0, js_1.getRelativePathToRootTsConfig)(tree, options.e2eProjectRoot) });
-    });
-}
-exports.updateE2eProject = updateE2eProject;