@nx/angular 17.1.0-beta.2 → 17.1.0-beta.3

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

@@ -1,6 +1,9 @@
+export * from './add-dependencies';
 export * from './generate-files';
+export * from './generate-server-ts-config';
 export * from './normalize-options';
 export * from './update-app-module';
 export * from './update-project-config';
 export * from './validate-options';
 export * from './add-hydration';
+export * from './set-router-initial-navigation';

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

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./add-dependencies"), exports);
 tslib_1.__exportStar(require("./generate-files"), exports);
+tslib_1.__exportStar(require("./generate-server-ts-config"), exports);
 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);
+tslib_1.__exportStar(require("./set-router-initial-navigation"), exports);

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

@@ -2,8 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 const ast_utils_1 = require("../../../utils/nx-devkit/ast-utils");
+const version_utils_1 = require("../../utils/version-utils");
 function normalizeOptions(tree, options) {
     const isStandaloneApp = (0, ast_utils_1.isNgStandaloneApp)(tree, options.project);
+    let hydration = options.hydration;
+    if (hydration === undefined) {
+        const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+        hydration = angularMajorVersion >= 17;
+    }
     return {
         project: options.project,
         appId: options.appId ?? 'serverApp',
@@ -14,7 +20,7 @@ function normalizeOptions(tree, options) {
         rootModuleClassName: options.rootModuleClassName ?? 'AppServerModule',
         skipFormat: options.skipFormat ?? false,
         standalone: options.standalone ?? isStandaloneApp,
-        hydration: options.hydration ?? false,
+        hydration,
     };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/generators/setup-ssr/lib/set-router-initial-navigation.d.ts

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

package/src/generators/setup-ssr/lib/set-router-initial-navigation.js

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setRouterInitialNavigation = void 0;
+const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const typescript_1 = require("typescript");
+function setRouterInitialNavigation(tree, options) {
+    const printer = (0, typescript_1.createPrinter)();
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    (0, devkit_1.visitNotIgnoredFiles)(tree, project.root, (filePath) => {
+        // we are only interested in .ts files
+        if (!filePath.endsWith('.ts')) {
+            return;
+        }
+        if (options.standalone) {
+            processFileWithStandaloneSetup(tree, filePath, printer);
+        }
+        else {
+            processFileWithNgModuleSetup(tree, filePath, printer);
+        }
+    });
+}
+exports.setRouterInitialNavigation = setRouterInitialNavigation;
+function processFileWithStandaloneSetup(tree, filePath, printer) {
+    let content = tree.read(filePath, 'utf-8');
+    let sourceFile = tsquery_1.tsquery.ast(content);
+    const provideRouterCallExpression = getProvideRouterCallExpression(sourceFile);
+    if (!provideRouterCallExpression) {
+        return;
+    }
+    if (provideRouterCallExpression.arguments.some((arg) => (0, typescript_1.isCallExpression)(arg) &&
+        (0, typescript_1.isIdentifier)(arg.expression) &&
+        arg.expression.text === 'withEnabledBlockingInitialNavigation')) {
+        return;
+    }
+    const updatedProvideRouterCallExpression = printer.printNode(typescript_1.EmitHint.Unspecified, updateProvideRouterCallExpression(provideRouterCallExpression), sourceFile);
+    content = `${content.slice(0, provideRouterCallExpression.getStart())}${updatedProvideRouterCallExpression}${content.slice(provideRouterCallExpression.getEnd())}`;
+    tree.write(filePath, content);
+    sourceFile = tsquery_1.tsquery.ast(content);
+    sourceFile = (0, js_1.insertImport)(tree, sourceFile, filePath, 'withEnabledBlockingInitialNavigation', '@angular/router');
+    const withDisabledInitialNavigationImportNode = (0, tsquery_1.tsquery)(sourceFile, 'ImportDeclaration ImportSpecifier:has(Identifier[name=withDisabledInitialNavigation])')[0];
+    if (!withDisabledInitialNavigationImportNode) {
+        return;
+    }
+    const hasTrailingComma = withDisabledInitialNavigationImportNode.parent.elements.hasTrailingComma;
+    content = tree.read(filePath, 'utf-8');
+    tree.write(filePath, `${content.slice(0, withDisabledInitialNavigationImportNode.getStart())}${content.slice(withDisabledInitialNavigationImportNode.getEnd() +
+        (hasTrailingComma ? 1 : 0))}`);
+}
+function updateProvideRouterCallExpression(node) {
+    const filteredArgs = node.arguments.filter((arg) => !((0, typescript_1.isCallExpression)(arg) &&
+        (0, typescript_1.isIdentifier)(arg.expression) &&
+        arg.expression.text === 'withDisabledInitialNavigation'));
+    const initialNavigationFeatureArg = typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('withEnabledBlockingInitialNavigation'), [], []);
+    return typescript_1.factory.updateCallExpression(node, node.expression, node.typeArguments, [...filteredArgs, initialNavigationFeatureArg]);
+}
+function processFileWithNgModuleSetup(tree, filePath, printer) {
+    const content = tree.read(filePath, 'utf-8');
+    const sourceFile = tsquery_1.tsquery.ast(content);
+    const routerModuleForRootCallExpression = getRouterModuleForRootCallExpression(sourceFile);
+    if (!routerModuleForRootCallExpression) {
+        return;
+    }
+    const updatedRouterModuleForRootCallExpression = printer.printNode(typescript_1.EmitHint.Unspecified, updateRouterModuleForRootCallExpression(routerModuleForRootCallExpression), sourceFile);
+    tree.write(filePath, `${content.slice(0, routerModuleForRootCallExpression.getStart())}${updatedRouterModuleForRootCallExpression}${content.slice(routerModuleForRootCallExpression.getEnd())}`);
+}
+function updateRouterModuleForRootCallExpression(node) {
+    const existingOptions = node.arguments[1];
+    const existingProperties = existingOptions?.properties
+        ? typescript_1.factory.createNodeArray(existingOptions.properties.filter((exp) => !((0, typescript_1.isPropertyAssignment)(exp) &&
+            (0, typescript_1.isIdentifier)(exp.name) &&
+            exp.name.text === 'initialNavigation')))
+        : typescript_1.factory.createNodeArray();
+    const enabledLiteral = typescript_1.factory.createStringLiteral('enabledBlocking');
+    const initialNavigationProperty = typescript_1.factory.createPropertyAssignment('initialNavigation', enabledLiteral);
+    const routerOptions = existingOptions
+        ? typescript_1.factory.updateObjectLiteralExpression(existingOptions, typescript_1.factory.createNodeArray([
+            ...existingProperties,
+            initialNavigationProperty,
+        ]))
+        : typescript_1.factory.createObjectLiteralExpression(typescript_1.factory.createNodeArray([initialNavigationProperty]));
+    const args = [node.arguments[0], routerOptions];
+    return typescript_1.factory.createCallExpression(node.expression, node.typeArguments, args);
+}
+function getProvideRouterCallExpression(sourceFile) {
+    const routerModuleForRootCalls = (0, tsquery_1.tsquery)(sourceFile, 'PropertyAssignment:has(Identifier[name=providers]) > ArrayLiteralExpression CallExpression:has(Identifier[name=provideRouter])', { visitAllChildren: true });
+    return routerModuleForRootCalls.length ? routerModuleForRootCalls[0] : null;
+}
+function getRouterModuleForRootCallExpression(sourceFile) {
+    const routerModuleForRootCalls = (0, tsquery_1.tsquery)(sourceFile, 'Decorator > CallExpression:has(Identifier[name=NgModule]) PropertyAssignment:has(Identifier[name=imports]) > ArrayLiteralExpression CallExpression:has(Identifier[name=forRoot])', { visitAllChildren: true });
+    return routerModuleForRootCalls.length ? routerModuleForRootCalls[0] : null;
+}

package/src/generators/setup-ssr/lib/update-project-config.d.ts

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

package/src/generators/setup-ssr/lib/update-project-config.js

@@ -1,9 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateProjectConfig = void 0;
+exports.updateProjectConfigForBrowserBuilder = exports.updateProjectConfigForApplicationBuilder = void 0;
 const devkit_1 = require("@nx/devkit");
-function updateProjectConfig(tree, schema) {
-    let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
+const version_utils_1 = require("../../utils/version-utils");
+function updateProjectConfigForApplicationBuilder(tree, options) {
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const buildTarget = project.targets.build;
+    buildTarget.options ??= {};
+    buildTarget.options.server = (0, devkit_1.joinPathFragments)(project.sourceRoot ?? (0, devkit_1.joinPathFragments)(project.root, 'src'), options.main);
+    buildTarget.options.prerender = true;
+    buildTarget.options.ssr = {
+        entry: (0, devkit_1.joinPathFragments)(project.root, options.serverFileName),
+    };
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
+}
+exports.updateProjectConfigForApplicationBuilder = updateProjectConfigForApplicationBuilder;
+function updateProjectConfigForBrowserBuilder(tree, schema) {
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
     const buildTarget = projectConfig.targets.build;
     const baseOutputPath = buildTarget.options.outputPath;
     buildTarget.options.outputPath = (0, devkit_1.joinPathFragments)(baseOutputPath, 'browser');
@@ -26,8 +39,11 @@ function updateProjectConfig(tree, schema) {
         configurations,
         defaultConfiguration: 'production',
     };
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     projectConfig.targets['serve-ssr'] = {
-        executor: '@nguniversal/builders:ssr-dev-server',
+        executor: angularMajorVersion >= 17
+            ? '@angular-devkit/build-angular:ssr-dev-server'
+            : '@nguniversal/builders:ssr-dev-server',
         configurations: {
             development: {
                 browserTarget: `${schema.project}:build:development`,
@@ -41,7 +57,9 @@ function updateProjectConfig(tree, schema) {
         defaultConfiguration: 'development',
     };
     projectConfig.targets.prerender = {
-        executor: '@nguniversal/builders:prerender',
+        executor: angularMajorVersion >= 17
+            ? '@angular-devkit/build-angular:prerender'
+            : '@nguniversal/builders:prerender',
         options: {
             routes: ['/'],
         },
@@ -72,7 +90,7 @@ function updateProjectConfig(tree, schema) {
     nxJson.targetDefaults.server.cache ??= true;
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-exports.updateProjectConfig = updateProjectConfig;
+exports.updateProjectConfigForBrowserBuilder = updateProjectConfigForBrowserBuilder;
 function getServerOptions(options = {}) {
     return {
         buildOptimizer: options?.buildOptimizer,

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

@@ -6,11 +6,24 @@ 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);
+    validateProject(tree, options.project);
+    validateBuildTarget(tree, options.project);
     validateHydrationOption(tree, options.hydration);
 }
 exports.validateOptions = validateOptions;
+function validateProject(tree, project) {
+    (0, validations_1.validateProject)(tree, project);
+    const { projectType } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    if (projectType !== 'application') {
+        throw new Error(`The "${project}" project is not an application. Only application projects are supported by the "setup-ssr" generator.`);
+    }
+}
+function validateBuildTarget(tree, project) {
+    const { targets } = (0, devkit_1.readProjectConfiguration)(tree, project);
+    if (!targets?.build) {
+        throw new Error(`The "${project}" project does not have a "build" target. Please add a "build" target.`);
+    }
+}
 function validateHydrationOption(tree, hydration) {
     if (!hydration) {
         return;

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

@@ -19,7 +19,7 @@
     "appId": {
       "type": "string",
       "format": "html-selector",
-      "description": "The `appId` to use with `withServerTransition`. _Note: This is only used in Angular versions <16.0.0. It's deprecated since Angular 16._",
+      "description": "The `appId` to use with `withServerTransition`. _Note: This is only used in Angular versions <16.0.0. It's deprecated since Angular 16 and not supported since Angular 17._",
       "default": "serverApp"
     },
     "main": {
@@ -51,11 +51,11 @@
     },
     "standalone": {
       "type": "boolean",
-      "description": "Use Standalone Components to bootstrap SSR. _Note: This is only supported in Angular versions >= 14.1.0_."
+      "description": "Use Standalone Components to bootstrap SSR."
     },
     "hydration": {
       "type": "boolean",
-      "description": "Set up Hydration for the SSR application. _Note: This is only supported in Angular versions >= 16.0.0_."
+      "description": "Set up Hydration for the SSR application. It defaults to `true` for Angular versions >= 17.0.0. Otherwise, it defaults to `false`. _Note: This is only supported in Angular versions >= 16.0.0_."
     },
     "skipFormat": {
       "type": "boolean",

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

@@ -7,24 +7,28 @@ const lib_1 = require("./lib");
 async function setupSsr(tree, schema) {
     (0, lib_1.validateOptions)(tree, schema);
     const options = (0, lib_1.normalizeOptions)(tree, schema);
-    (0, lib_1.updateProjectConfig)(tree, options);
-    (0, lib_1.generateSSRFiles)(tree, options);
+    const { targets } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const isUsingApplicationBuilder = targets.build.executor === '@angular-devkit/build-angular:application';
+    (0, lib_1.addDependencies)(tree);
+    (0, lib_1.generateSSRFiles)(tree, options, isUsingApplicationBuilder);
     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': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/express-engine')
-            ?.version ?? pkgVersions.ngUniversalVersion,
-        '@angular/platform-server': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@angular/platform-server')
-            ?.version ?? pkgVersions.angularVersion,
-    }, {
-        '@nguniversal/builders': (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/builders')
-            ?.version ?? pkgVersions.ngUniversalVersion,
-    });
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if (angularMajorVersion < 17 || !options.hydration) {
+        (0, lib_1.setRouterInitialNavigation)(tree, options);
+    }
+    if (isUsingApplicationBuilder) {
+        (0, lib_1.updateProjectConfigForApplicationBuilder)(tree, options);
+        (0, lib_1.setServerTsConfigOptionsForApplicationBuilder)(tree, options);
+    }
+    else {
+        (0, lib_1.updateProjectConfigForBrowserBuilder)(tree, options);
+        (0, lib_1.generateTsConfigServerJsonForBrowserBuilder)(tree, options);
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/utils/create-ts-config.d.ts

@@ -5,4 +5,5 @@ export declare function createTsConfig(host: Tree, projectRoot: string, type: 'a
     style?: string;
     bundler?: string;
     rootProject?: boolean;
+    esModuleInterop?: boolean;
 }, relativePathToRootTsConfig: string): void;

package/src/generators/utils/create-ts-config.js

@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTsConfig = exports.extractTsConfigBase = void 0;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const version_utils_1 = require("./version-utils");
 var js_2 = require("@nx/js");
 Object.defineProperty(exports, "extractTsConfigBase", { enumerable: true, get: function () { return js_2.extractTsConfigBase; } });
 function createTsConfig(host, projectRoot, type, options, relativePathToRootTsConfig) {
-    const majorAngularVersion = (0, version_utils_1.getInstalledAngularMajorVersion)(host);
     const json = {
         compilerOptions: {
-            target: majorAngularVersion === 14 ? 'es2020' : 'es2022',
+            target: 'es2022',
             useDefineForClassFields: false,
+            esModuleInterop: options.esModuleInterop ? true : undefined,
         },
         files: [],
         include: [],

package/src/generators/utils/testing.js

@@ -54,10 +54,12 @@ async function createStorybookTestWorkspaceForLib(libName) {
         skipFormat: false,
         unitTestRunner: test_runners_1.UnitTestRunner.Jest,
         projectNameAndRootFormat: 'as-provided',
+        standalone: false,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'test-button',
         project: libName,
+        standalone: false,
     });
     tree.write(`${libName}/src/lib/test-button/test-button.component.ts`, `import { Component, Input } from '@angular/core';
 
@@ -88,6 +90,7 @@ export class TestButtonComponent {
         project: libName,
         path: `${libName}/src/lib/barrel`,
         module: 'barrel',
+        standalone: false,
     });
     tree.write(`${libName}/src/lib/barrel/barrel-button/index.ts`, `export * from './barrel-button.component';`);
     tree.write(`${libName}/src/lib/barrel/barrel.module.ts`, `import { NgModule } from '@angular/core';
@@ -109,12 +112,14 @@ export class BarrelModule {}`);
         project: libName,
         path: `${libName}/src/lib/variable-declare`,
         module: 'variable-declare',
+        standalone: false,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-declare-view',
         project: libName,
         path: `${libName}/src/lib/variable-declare`,
         module: 'variable-declare',
+        standalone: false,
     });
     tree.write(`${libName}/src/lib/variable-declare/variable-declare.module.ts`, `import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
@@ -142,18 +147,21 @@ export class VariableDeclareModule {}`);
         project: libName,
         path: `${libName}/src/lib/variable-spread-declare`,
         module: 'variable-spread-declare',
+        standalone: false,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-view',
         project: libName,
         path: `${libName}/src/lib/variable-spread-declare`,
         module: 'variable-spread-declare',
+        standalone: false,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'variable-spread-declare-anotherview',
         project: libName,
         path: `${libName}/src/lib/variable-spread-declare`,
         module: 'variable-spread-declare',
+        standalone: false,
     });
     tree.write(`${libName}/src/lib/variable-spread-declare/variable-spread-declare.module.ts`, `import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
@@ -181,12 +189,14 @@ export class VariableSpreadDeclareModule {}`);
         project: libName,
         path: `${libName}/src/lib/static-member-declarations`,
         module: 'static-member-declarations',
+        standalone: false,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'cmp2',
         project: libName,
         path: `${libName}/src/lib/static-member-declarations`,
         module: 'static-member-declarations',
+        standalone: false,
     });
     tree.write(`${libName}/src/lib/static-member-declarations/static-member-declarations.module.ts`, `import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
@@ -212,10 +222,12 @@ export class StaticMemberDeclarationsModule {
         project: libName,
         module: 'nested',
         path: `${libName}/src/lib/nested`,
+        standalone: false,
     });
     await (0, component_1.componentGenerator)(tree, {
         name: 'test-other',
         project: libName,
+        standalone: false,
     });
     return tree;
 }

package/src/generators/utils/validations.d.ts

@@ -1,3 +1,2 @@
 import type { Tree } from '@nx/devkit';
 export declare function validateProject(tree: Tree, projectName: string): void;
-export declare function validateStandaloneOption(tree: Tree, standalone: boolean | undefined, angularVersion?: string): void;

package/src/generators/utils/validations.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateStandaloneOption = exports.validateProject = void 0;
+exports.validateProject = void 0;
 const devkit_1 = require("@nx/devkit");
-const semver_1 = require("semver");
-const version_utils_1 = require("./version-utils");
 function validateProject(tree, projectName) {
     const projects = (0, devkit_1.getProjects)(tree);
     if (!projects.has(projectName)) {
@@ -11,14 +9,3 @@ function validateProject(tree, projectName) {
     }
 }
 exports.validateProject = validateProject;
-function validateStandaloneOption(tree, standalone, angularVersion) {
-    if (!standalone) {
-        return;
-    }
-    const installedAngularVersion = angularVersion ?? (0, version_utils_1.getInstalledAngularVersionInfo)(tree).version;
-    if ((0, semver_1.lt)(installedAngularVersion, '14.1.0')) {
-        throw new Error((0, devkit_1.stripIndents) `The "standalone" option is only supported in Angular >= 14.1.0. You are currently using "${installedAngularVersion}".
-    You can resolve this error by removing the "standalone" option or by migrating to Angular 14.1.0.`);
-    }
-}
-exports.validateStandaloneOption = validateStandaloneOption;

package/src/generators/utils/version-utils.js

@@ -55,10 +55,10 @@ exports.addDependenciesToPackageJsonIfDontExist = addDependenciesToPackageJsonIf
 function versions(tree) {
     const majorAngularVersion = getInstalledAngularMajorVersion(tree);
     switch (majorAngularVersion) {
-        case 14:
-            return backward_compatible_versions_1.backwardCompatibleVersions.angularV14;
         case 15:
             return backward_compatible_versions_1.backwardCompatibleVersions.angularV15;
+        case 16:
+            return backward_compatible_versions_1.backwardCompatibleVersions.angularV16;
         default:
             return latestVersions;
     }

package/src/migrations/update-17-1-0/browser-target-to-build-target.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export declare const executors: string[];
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-17-1-0/browser-target-to-build-target.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executors = void 0;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+exports.executors = [
+    '@angular-devkit/build-angular:dev-server',
+    '@angular-devkit/build-angular:extract-i18n',
+    '@nx/angular:module-federation-dev-server',
+    '@nx/angular:webpack-dev-server',
+];
+async function default_1(tree) {
+    // update options from project configs
+    exports.executors.forEach((executor) => {
+        (0, executor_options_utils_1.forEachExecutorOptions)(tree, executor, (_, project, target, configuration) => {
+            const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, project);
+            const config = configuration
+                ? projectConfiguration.targets[target].configurations[configuration]
+                : projectConfiguration.targets[target].options;
+            updateConfig(config);
+            (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfiguration);
+        });
+    });
+    // update options from nx.json target defaults
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson.targetDefaults) {
+        return;
+    }
+    for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+        if (!exports.executors.includes(targetOrExecutor) &&
+            !exports.executors.includes(targetConfig.executor)) {
+            continue;
+        }
+        if (targetConfig.options) {
+            updateConfig(targetConfig.options);
+        }
+        Object.values(targetConfig.configurations ?? {}).forEach((config) => {
+            updateConfig(config);
+        });
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = default_1;
+function updateConfig(config) {
+    if (config.browserTarget) {
+        config.buildTarget ??= config.browserTarget;
+        delete config.browserTarget;
+    }
+}

package/src/migrations/update-17-1-0/replace-nguniversal-builders.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-17-1-0/replace-nguniversal-builders.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+async function default_1(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [, project] of projects) {
+        if (project.projectType !== 'application') {
+            continue;
+        }
+        for (const target of Object.values(project.targets ?? {})) {
+            if (target.executor === '@nguniversal/builders:ssr-dev-server') {
+                target.executor = '@angular-devkit/build-angular:ssr-dev-server';
+            }
+            else if (target.executor === '@nguniversal/builders:prerender') {
+                target.executor = '@angular-devkit/build-angular:prerender';
+                updatePrerenderOptions(target);
+            }
+        }
+        (0, devkit_1.updateProjectConfiguration)(tree, project.name, project);
+    }
+    // update options from nx.json target defaults
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson.targetDefaults) {
+        return;
+    }
+    for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+        if (targetOrExecutor === '@nguniversal/builders:ssr-dev-server') {
+            nxJson.targetDefaults['@angular-devkit/build-angular:ssr-dev-server'] =
+                targetConfig;
+            delete nxJson.targetDefaults['@nguniversal/builders:ssr-dev-server'];
+        }
+        else if (targetOrExecutor === '@nguniversal/builders:prerender') {
+            nxJson.targetDefaults['@angular-devkit/build-angular:prerender'] =
+                targetConfig;
+            delete nxJson.targetDefaults['@nguniversal/builders:prerender'];
+            updatePrerenderOptions(targetConfig);
+        }
+        else if (targetConfig.executor === '@nguniversal/builders:ssr-dev-server') {
+            targetConfig.executor = '@angular-devkit/build-angular:ssr-dev-server';
+        }
+        else if (targetConfig.executor === '@nguniversal/builders:prerender') {
+            targetConfig.executor = '@angular-devkit/build-angular:prerender';
+            updatePrerenderOptions(targetConfig);
+        }
+    }
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    // remove @nguniversal/builders from package.json
+    (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nguniversal/builders'], ['@nguniversal/builders']);
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = default_1;
+function* allTargetOptions(target) {
+    if (target.options) {
+        yield [undefined, target.options];
+    }
+    if (!target.configurations) {
+        return;
+    }
+    for (const [name, options] of Object.entries(target.configurations)) {
+        if (options !== undefined) {
+            yield [name, options];
+        }
+    }
+}
+function updatePrerenderOptions(config) {
+    for (const [, options] of allTargetOptions(config)) {
+        if (options.guessRoutes !== undefined) {
+            options.discoverRoutes = options.guessRoutes;
+            delete options.guessRoutes;
+        }
+        if (options.numProcesses !== undefined) {
+            delete options.numProcesses;
+        }
+    }
+}

package/src/migrations/update-17-1-0/replace-nguniversal-engines.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;