@nx/angular 16.10.0 → 17.0.0-beta.2

package/generators.d.ts

@@ -3,7 +3,6 @@ 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/convert-tslint-to-eslint/convert-tslint-to-eslint';
 export * from './src/generators/directive/directive';
 export * from './src/generators/host/host';
 export * from './src/generators/init/init';

package/generators.js

@@ -6,7 +6,6 @@ tslib_1.__exportStar(require("./src/generators/application/application"), export
 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/convert-tslint-to-eslint/convert-tslint-to-eslint"), exports);
 tslib_1.__exportStar(require("./src/generators/directive/directive"), exports);
 tslib_1.__exportStar(require("./src/generators/host/host"), exports);
 tslib_1.__exportStar(require("./src/generators/init/init"), exports);

package/generators.json

@@ -39,12 +39,6 @@
       "schema": "./src/generators/component-test/schema.json",
       "description": "Creates a cypress component test file for a component."
     },
-    "convert-tslint-to-eslint": {
-      "factory": "./src/generators/convert-tslint-to-eslint/compat",
-      "schema": "./src/generators/convert-tslint-to-eslint/schema.json",
-      "description": "Converts a project from TSLint to ESLint.",
-      "x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Migrate to ESLint."
-    },
     "init": {
       "factory": "./src/generators/init/init.compat#initSchematic",
       "schema": "./src/generators/init/schema.json",
@@ -171,7 +165,7 @@
       "description": "Creates an Angular application."
     },
     "component": {
-      "factory": "./src/generators/component/component",
+      "factory": "./src/generators/component/component#componentGeneratorInternal",
       "schema": "./src/generators/component/schema.json",
       "aliases": ["c"],
       "description": "Generate an Angular Component."
@@ -193,12 +187,6 @@
       "schema": "./src/generators/component-test/schema.json",
       "description": "Creates a cypress component test file for a component."
     },
-    "convert-tslint-to-eslint": {
-      "factory": "./src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint#conversionGenerator",
-      "schema": "./src/generators/convert-tslint-to-eslint/schema.json",
-      "description": "Converts a project from TSLint to ESLint.",
-      "x-deprecated": "This generator is deprecated and will be removed in a future version of Nx. Migrate to ESLint."
-    },
     "directive": {
       "factory": "./src/generators/directive/directive",
       "schema": "./src/generators/directive/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.10.0",
+  "version": "17.0.0-beta.2",
   "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": {
@@ -79,14 +79,14 @@
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
     "enquirer": "^2.3.6",
-    "@nx/devkit": "16.10.0",
-    "@nx/cypress": "16.10.0",
-    "@nx/jest": "16.10.0",
-    "@nx/js": "16.10.0",
-    "@nx/linter": "16.10.0",
-    "@nx/webpack": "16.10.0",
-    "@nx/workspace": "16.10.0",
-    "@nrwl/angular": "16.10.0"
+    "@nx/devkit": "17.0.0-beta.2",
+    "@nx/cypress": "17.0.0-beta.2",
+    "@nx/jest": "17.0.0-beta.2",
+    "@nx/js": "17.0.0-beta.2",
+    "@nx/linter": "17.0.0-beta.2",
+    "@nx/webpack": "17.0.0-beta.2",
+    "@nx/workspace": "17.0.0-beta.2",
+    "@nrwl/angular": "17.0.0-beta.2"
   },
   "peerDependencies": {
     "@angular-devkit/build-angular": ">= 14.0.0 < 17.0.0",

package/src/builders/utilities/module-federation.js

@@ -47,7 +47,7 @@ function getModuleFederationConfig(tsconfigPath, workspaceRoot, projectRoot) {
     let moduleFederationConfigPath = moduleFederationConfigPathJS;
     let cleanupTranspiler = () => { };
     if ((0, fs_1.existsSync)(moduleFederationConfigPathTS)) {
-        cleanupTranspiler = (0, internal_1.registerTsProject)(moduleFederationConfigPathTS, tsconfigPath);
+        cleanupTranspiler = (0, internal_1.registerTsProject)((0, path_1.join)(workspaceRoot, tsconfigPath));
         moduleFederationConfigPath = moduleFederationConfigPathTS;
     }
     try {

package/src/builders/utilities/webpack.js

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveIndexHtmlTransformer = exports.resolveCustomWebpackConfig = exports.mergeCustomWebpackConfig = void 0;
 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");
 async function mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig, options, target) {
-    const customWebpackConfiguration = resolveCustomWebpackConfig(pathToWebpackConfig, options.tsConfig);
+    const customWebpackConfiguration = resolveCustomWebpackConfig(pathToWebpackConfig, (0, path_1.join)(devkit_1.workspaceRoot, options.tsConfig));
     // The extra Webpack configuration file can also export a Promise, for instance:
     // `module.exports = new Promise(...)`. If it exports a single object, but not a Promise,
     // then await will just resolve that object.
@@ -20,7 +22,7 @@ async function mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig,
 }
 exports.mergeCustomWebpackConfig = mergeCustomWebpackConfig;
 function resolveCustomWebpackConfig(path, tsConfig) {
-    const cleanupTranspiler = (0, internal_1.registerTsProject)(path, tsConfig);
+    const cleanupTranspiler = (0, internal_1.registerTsProject)(tsConfig);
     const customWebpackConfig = require(path);
     cleanupTranspiler();
     // If the user provides a configuration in TS file
@@ -32,7 +34,7 @@ function resolveCustomWebpackConfig(path, tsConfig) {
 }
 exports.resolveCustomWebpackConfig = resolveCustomWebpackConfig;
 function resolveIndexHtmlTransformer(path, tsConfig, target) {
-    const cleanupTranspiler = (0, internal_1.registerTsProject)(path, tsConfig);
+    const cleanupTranspiler = (0, internal_1.registerTsProject)(tsConfig);
     const indexTransformer = require(path);
     cleanupTranspiler();
     const transform = indexTransformer.default ?? indexTransformer;

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

@@ -1,4 +1,5 @@
 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,19 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.componentGenerator = void 0;
+exports.componentGeneratorInternal = exports.componentGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const utils_1 = require("../utils");
 const lib_1 = require("./lib");
 async function componentGenerator(tree, rawOptions) {
+    await componentGeneratorInternal(tree, {
+        nameAndDirectoryFormat: 'derived',
+        ...rawOptions,
+    });
+}
+exports.componentGenerator = componentGenerator;
+async function componentGeneratorInternal(tree, rawOptions) {
     (0, lib_1.validateOptions)(tree, rawOptions);
-    const options = (0, lib_1.normalizeOptions)(tree, rawOptions);
-    const componentNames = (0, devkit_1.names)(options.name);
-    const typeNames = (0, devkit_1.names)(options.type);
+    const options = await (0, lib_1.normalizeOptions)(tree, rawOptions);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), options.directory, {
-        fileName: componentNames.fileName,
-        className: componentNames.className,
-        type: typeNames.fileName,
-        typeClassName: typeNames.className,
+        name: options.name,
+        fileName: options.fileName,
+        symbolName: options.symbolName,
         style: options.style,
         inlineStyle: options.inlineStyle,
         inlineTemplate: options.inlineTemplate,
@@ -26,25 +30,25 @@ async function componentGenerator(tree, rawOptions) {
         tpl: '',
     });
     if (options.skipTests) {
-        const pathToSpecFile = (0, devkit_1.joinPathFragments)(options.directory, `${componentNames.fileName}.${typeNames.fileName}.spec.ts`);
+        const pathToSpecFile = (0, devkit_1.joinPathFragments)(options.directory, `${options.fileName}.spec.ts`);
         tree.delete(pathToSpecFile);
     }
     if (options.inlineTemplate) {
-        const pathToTemplateFile = (0, devkit_1.joinPathFragments)(options.directory, `${componentNames.fileName}.${typeNames.fileName}.html`);
+        const pathToTemplateFile = (0, devkit_1.joinPathFragments)(options.directory, `${options.fileName}.html`);
         tree.delete(pathToTemplateFile);
     }
     if (options.style === 'none' || options.inlineStyle) {
-        const pathToStyleFile = (0, devkit_1.joinPathFragments)(options.directory, `${componentNames.fileName}.${typeNames.fileName}.${options.style}`);
+        const pathToStyleFile = (0, devkit_1.joinPathFragments)(options.directory, `${options.fileName}.${options.style}`);
         tree.delete(pathToStyleFile);
     }
     if (!options.skipImport && !options.standalone) {
         const modulePath = (0, lib_1.findModuleFromOptions)(tree, options, options.projectRoot);
-        (0, utils_1.addToNgModule)(tree, options.path, modulePath, componentNames.fileName, `${componentNames.className}${typeNames.className}`, `${componentNames.fileName}.${typeNames.fileName}`, 'declarations', options.flat, options.export);
+        (0, utils_1.addToNgModule)(tree, options.directory, modulePath, options.name, options.symbolName, options.fileName, 'declarations', true, options.export);
     }
     (0, lib_1.exportComponentInEntryPoint)(tree, options);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }
-exports.componentGenerator = componentGenerator;
+exports.componentGeneratorInternal = componentGeneratorInternal;
 exports.default = componentGenerator;

package/src/generators/component/files/__fileName__.html__tpl__

@@ -0,0 +1 @@
+<p><%= name %> works!</p>

package/src/generators/component/files/__fileName__.spec.ts__tpl__

@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { <%= symbolName %> } from './<%= fileName %>';
+
+describe('<%= symbolName %>', () => {
+  let component: <%= symbolName %>;
+  let fixture: ComponentFixture<<%= symbolName %>>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      <%= standalone ? 'imports' : 'declarations' %>: [ <%= symbolName %> ]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(<%= symbolName %>);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

package/src/generators/component/files/{__fileName__.__type__.ts__tpl__ → __fileName__.ts__tpl__}

@@ -5,8 +5,8 @@ import { CommonModule } from '@angular/common';<% } %>
   selector: '<%= selector %>',<%}%><% if(standalone) {%>
   standalone: true,
   imports: [CommonModule],<%}%><% if(inlineTemplate) { %>
-  template: `<p><%= fileName %> works!</p>`<% } else { %>
-  templateUrl: './<%= fileName %><%= type ? '.' + type : '' %>.html'<% } if(inlineStyle) { %>,
+  template: `<p><%= name %> works!</p>`<% } else { %>
+  templateUrl: './<%= fileName %>.html'<% } if(inlineStyle) { %>,
   styles: [<% if(displayBlock){ %>
     `
       :host {
@@ -14,8 +14,8 @@ import { CommonModule } from '@angular/common';<% } %>
       }
     `<% } %>
   ]<% } else if (style !== 'none') { %>,
-  styleUrls: ['./<%= fileName %><%= type ? '.' + type : '' %>.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
+  styleUrls: ['./<%= fileName %>.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>
 })
-export class <%= className %><%= typeClassName %> {}
+export class <%= symbolName %> {}

package/src/generators/component/lib/module.js

@@ -12,10 +12,10 @@ function findModuleFromOptions(tree, options, projectRoot) {
         return (0, devkit_1.normalizePath)(findModule(tree, options.directory, projectRoot));
     }
     else {
-        const modulePath = (0, devkit_1.joinPathFragments)(options.path, options.module);
+        const modulePath = (0, devkit_1.joinPathFragments)(options.directory, options.module);
         const componentPath = options.directory;
         const moduleBaseName = (0, path_1.basename)(modulePath);
-        const candidateSet = new Set([options.path]);
+        const candidateSet = new Set([options.directory]);
         const projectRootParent = (0, path_1.dirname)(projectRoot);
         for (let dir = modulePath; dir !== projectRootParent; dir = (0, path_1.dirname)(dir)) {
             candidateSet.add(dir);

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

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

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

@@ -2,23 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("../../utils/path");
+const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const selector_1 = require("../../utils/selector");
-function normalizeOptions(tree, options) {
+async function normalizeOptions(tree, options) {
     options.type ??= 'component';
-    const { directory, filePath, name, path, root, sourceRoot } = (0, path_1.normalizeNameAndPaths)(tree, options);
-    const { prefix } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const { artifactName: name, directory, fileName, filePath, project, } = 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,
+        nameAndDirectoryFormat: options.nameAndDirectoryFormat,
+        project: options.project,
+        suffix: options.type ?? 'component',
+    });
+    const { className } = (0, devkit_1.names)(name);
+    const { className: suffixClassName } = (0, devkit_1.names)(options.type);
+    const symbolName = `${className}${suffixClassName}`;
+    const { prefix, root, sourceRoot } = (0, devkit_1.readProjectConfiguration)(tree, project);
     const selector = options.selector ??
         (0, selector_1.buildSelector)(tree, name, options.prefix, prefix, 'fileName');
     return {
         ...options,
         name,
+        project,
         changeDetection: options.changeDetection ?? 'Default',
         style: options.style ?? 'css',
-        flat: options.flat ?? false,
         directory,
+        fileName,
         filePath,
-        path,
+        symbolName,
         projectSourceRoot: sourceRoot,
         projectRoot: root,
         selector,

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

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOptions = void 0;
 const validations_1 = require("../../utils/validations");
 function validateOptions(tree, options) {
-    (0, validations_1.validateProject)(tree, options.project);
-    (0, validations_1.validatePathIsUnderProjectRoot)(tree, options.project, options.path);
     (0, validations_1.validateStandaloneOption)(tree, options.standalone);
 }
 exports.validateOptions = validateOptions;

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

@@ -1,7 +1,9 @@
+import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
+
 export interface Schema {
   name: string;
-  project: string;
-  path?: string;
+  directory?: string;
+  nameAndDirectoryFormat?: NameAndDirectoryFormat;
   displayBlock?: boolean;
   inlineStyle?: boolean;
   inlineTemplate?: boolean;
@@ -11,7 +13,6 @@ export interface Schema {
   style?: 'css' | 'scss' | 'sass' | 'less' | 'none';
   skipTests?: boolean;
   type?: string;
-  flat?: boolean;
   skipImport?: boolean;
   selector?: string;
   module?: string;
@@ -19,12 +20,29 @@ 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 v18.
+   */
+  flat?: boolean;
+  /**
+   * @deprecated Provide the `directory` option instead. It will be removed in Nx v18.
+   */
+  path?: string;
+  /**
+   * @deprecated Provide the `directory` option instead. The project will be determined from the directory provided. It will be removed in Nx v18.
+   */
+  project?: string;
 }
 
 export interface NormalizedSchema extends Schema {
   directory: string;
   filePath: string;
+  project: string;
   projectSourceRoot: string;
   projectRoot: string;
   selector: string;
+
+  fileName: string;
+  symbolName: string;
 }

package/src/generators/component/schema.json

@@ -4,23 +4,9 @@
   "title": "Angular Component Schema",
   "cli": "nx",
   "type": "object",
-  "description": "Creates a new, generic Angular component definition in the given or default project.",
+  "description": "Creates a new Angular component.",
   "additionalProperties": false,
   "properties": {
-    "path": {
-      "type": "string",
-      "format": "path",
-      "description": "The path at which to create the component file, relative to the current workspace. Default is a folder with the same name as the component in the project root.",
-      "visible": false
-    },
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-dropdown": "projects"
-    },
     "name": {
       "type": "string",
       "description": "The name of the component.",
@@ -30,6 +16,26 @@
       },
       "x-prompt": "What name would you like to use for the component?"
     },
+    "directory": {
+      "type": "string",
+      "description": "The directory at which to create the component file. When `--nameAndDirectoryFormat=as-provided`, it will be relative to the current working directory. Otherwise, it will be relative to the workspace root.",
+      "aliases": ["dir", "path"],
+      "x-priority": "important"
+    },
+    "nameAndDirectoryFormat": {
+      "description": "Whether to generate the component in the directory as provided, relative to the current working directory and ignoring the project (`as-provided`) or generate it using the project and directory relative to the workspace root (`derived`).",
+      "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 v18."
+    },
     "prefix": {
       "type": "string",
       "description": "The prefix to apply to the generated component selector.",
@@ -91,7 +97,8 @@
     "flat": {
       "type": "boolean",
       "description": "Create the new files at the top level of the current project.",
-      "default": false
+      "default": false,
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. It will be removed in Nx v18."
     },
     "skipImport": {
       "type": "boolean",
@@ -126,6 +133,6 @@
       "x-priority": "internal"
     }
   },
-  "required": ["name", "project"],
+  "required": ["name"],
   "examplesFile": "../../../docs/component-examples.md"
 }

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

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

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

@@ -1,5 +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 declare function hostInternal(tree: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default host;

package/src/generators/host/host.js

@@ -17,12 +17,13 @@ async function host(tree, options) {
     });
 }
 exports.host = host;
-async function hostInternal(tree, options) {
+async function hostInternal(tree, schema) {
     const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') && options.standalone) {
+    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;
     const projects = (0, devkit_1.getProjects)(tree);
     const remotesToGenerate = [];
     const remotesToIntegrate = [];
@@ -64,10 +65,11 @@ async function hostInternal(tree, options) {
         skipE2E,
         e2eProjectName: skipE2E ? undefined : `${hostProjectName}-e2e`,
         prefix: options.prefix,
+        typescriptConfiguration,
     });
     let installTasks = [appInstallTask];
     if (options.ssr) {
-        let ssrInstallTask = await (0, lib_1.addSsr)(tree, options, hostProjectName);
+        let ssrInstallTask = await (0, lib_1.addSsr)(tree, options, hostProjectName, typescriptConfiguration);
         installTasks.push(ssrInstallTask);
     }
     for (const remote of remotesToGenerate) {
@@ -88,6 +90,7 @@ async function hostInternal(tree, options) {
             host: hostProjectName,
             skipFormat: true,
             standalone: options.standalone,
+            typescriptConfiguration,
         });
     }
     if (!options.skipFormat) {

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

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

package/src/generators/host/lib/add-ssr.js

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const setup_ssr_1 = require("../../setup-ssr/setup-ssr");
 const versions_1 = require("../../../utils/versions");
 const path_1 = require("path");
-async function addSsr(tree, options, appName) {
+async function addSsr(tree, options, appName, typescriptConfiguration) {
     let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
     await (0, setup_ssr_1.default)(tree, {
         project: appName,
@@ -14,17 +14,21 @@ async function addSsr(tree, options, appName) {
     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 browserBundleOutput = (0, devkit_1.joinPathFragments)(project.targets.build.options.outputPath, 'browser');
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files'), project.root, {
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/common'), project.root, {
         appName,
         browserBundleOutput,
         standalone: options.standalone,
         tmpl: '',
     });
+    const pathToTemplateFiles = typescriptConfiguration ? 'ts' : 'js';
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files', pathToTemplateFiles), project.root, {
+        tmpl: '',
+    });
     // update project.json
     project = (0, devkit_1.readProjectConfiguration)(tree, appName);
     project.targets.server.executor = '@nx/angular:webpack-server';
     project.targets.server.options.customWebpackConfig = {
-        path: (0, devkit_1.joinPathFragments)(project.root, 'webpack.server.config.js'),
+        path: (0, devkit_1.joinPathFragments)(project.root, `webpack.server.config.${pathToTemplateFiles}`),
     };
     project.targets['serve-ssr'].executor =
         '@nx/angular:module-federation-dev-ssr';

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

@@ -29,4 +29,5 @@ export interface Schema {
   skipFormat?: boolean;
   standalone?: boolean;
   ssr?: boolean;
+  typescriptConfiguration?: boolean;
 }

package/src/generators/host/schema.json

@@ -173,6 +173,11 @@
       "type": "boolean",
       "default": false,
       "x-priority": "important"
+    },
+    "typescriptConfiguration": {
+      "type": "boolean",
+      "description": "Whether the module federation configuration and webpack configuration files should use TS.",
+      "default": true
     }
   },
   "additionalProperties": false,

package/src/generators/move/lib/update-ng-package.js

@@ -14,12 +14,9 @@ function updateNgPackage(tree, schema) {
     }
     const rootOffset = (0, devkit_1.normalizePath)((0, path_1.relative)((0, path_1.join)(devkit_1.workspaceRoot, project.root), devkit_1.workspaceRoot));
     const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({
-        target: {
-            project: schema.newProjectName,
-            target: 'build',
-        },
-        overrides: {},
-    }, {
+        project: schema.newProjectName,
+        target: 'build',
+    }, {}, {
         name: schema.newProjectName,
         type: 'lib',
         data: {

package/src/generators/ng-add/migrators/migrator.js

@@ -62,13 +62,11 @@ class Migrator {
             return;
         }
         const nxJson = (0, devkit_1.readNxJson)(this.tree);
-        Object.keys(nxJson.tasksRunnerOptions ?? {}).forEach((taskRunnerName) => {
-            const taskRunner = nxJson.tasksRunnerOptions[taskRunnerName];
-            taskRunner.options.cacheableOperations = Array.from(new Set([
-                ...(taskRunner.options.cacheableOperations ?? []),
-                ...targetNames,
-            ]));
-        });
+        nxJson.targetDefaults ??= {};
+        for (const target of targetNames) {
+            nxJson.targetDefaults[target] ??= {};
+            nxJson.targetDefaults[target].cache ??= true;
+        }
         (0, devkit_1.updateNxJson)(this.tree, nxJson);
     }
     // TODO(leo): This should be moved to BuilderMigrator once everything is split into builder migrators.

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

@@ -31,19 +31,6 @@ function createNxJson(tree, options, defaultProject) {
         affected: {
             defaultBase: options.defaultBase ?? (0, default_base_1.deduceDefaultBase)(),
         },
-        tasksRunnerOptions: {
-            default: {
-                runner: 'nx/tasks-runners/default',
-                options: {
-                    cacheableOperations: [
-                        'build',
-                        targets.test ? 'test' : undefined,
-                        targets.lint ? 'lint' : undefined,
-                        targets.e2e ? 'e2e' : undefined,
-                    ].filter(Boolean),
-                },
-            },
-        },
         namedInputs: {
             sharedGlobals: [],
             default: ['{projectRoot}/**/*', 'sharedGlobals'],
@@ -65,10 +52,12 @@ function createNxJson(tree, options, defaultProject) {
             build: {
                 dependsOn: ['^build'],
                 inputs: ['production', '^production'],
+                cache: true,
             },
             test: targets.test
                 ? {
                     inputs: ['default', '^production', '{workspaceRoot}/karma.conf.js'],
+                    cache: true,
                 }
                 : undefined,
             lint: targets.lint
@@ -78,11 +67,13 @@ function createNxJson(tree, options, defaultProject) {
                         '{workspaceRoot}/.eslintrc.json',
                         '{workspaceRoot}/eslint.config.js',
                     ],
+                    cache: true,
                 }
                 : undefined,
             e2e: targets.e2e
                 ? {
                     inputs: ['default', '^production'],
+                    cache: true,
                 }
                 : undefined,
         },