@nx/angular 19.1.0-beta.1 → 19.1.0-beta.3

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

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRemote = void 0;
+const tslib_1 = require("tslib");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const test_runners_1 = require("../../../utils/test-runners");
-const remote_1 = require("../../remote/remote");
+const remote_1 = tslib_1.__importDefault(require("../../remote/remote"));
 const check_remote_exists_1 = require("./check-remote-exists");
 async function addRemote(tree, schema) {
     const tasks = [];

package/src/generators/host/host.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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 test_runners_1 = require("../../utils/test-runners");
-const application_1 = require("../application/application");
-const remote_1 = require("../remote/remote");
+const application_1 = tslib_1.__importDefault(require("../application/application"));
+const remote_1 = tslib_1.__importDefault(require("../remote/remote"));
 const setup_mf_1 = require("../setup-mf/setup-mf");
 const lib_1 = require("./lib");
 const add_mf_env_to_inputs_1 = require("../utils/add-mf-env-to-inputs");

package/src/generators/library/library.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGeneratorInternal = exports.libraryGenerator = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const js_1 = require("@nx/js");
-const init_1 = require("../../generators/init/init");
-const add_linting_1 = require("../add-linting/add-linting");
-const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
+const init_1 = tslib_1.__importDefault(require("../../generators/init/init"));
+const add_linting_1 = tslib_1.__importDefault(require("../add-linting/add-linting"));
+const setup_tailwind_1 = tslib_1.__importDefault(require("../setup-tailwind/setup-tailwind"));
 const version_utils_1 = require("../utils/version-utils");
 const dependencies_1 = require("../utils/dependencies");
 const add_module_1 = require("./lib/add-module");

package/src/generators/ng-add/migrators/builders/angular-devkit-karma.migrator.js

@@ -41,8 +41,9 @@ class AngularDevkitKarmaMigrator extends builder_migrator_1.BuilderMigrator {
         target.options.main =
             target.options.main && this.convertAsset(target.options.main);
         target.options.polyfills = Array.isArray(target.options.polyfills)
-            ? target.options.polyfills.map((p) => this.convertAsset(p))
-            : target.options.polyfills && this.convertAsset(target.options.polyfills);
+            ? target.options.polyfills.map((p) => this.convertSourceRootPath(p))
+            : target.options.polyfills &&
+                this.convertSourceRootPath(target.options.polyfills);
         target.options.tsConfig =
             target.options.tsConfig &&
                 (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(target.options.tsConfig));

package/src/generators/ng-add/migrators/migrator.d.ts

@@ -12,12 +12,12 @@ export declare abstract class Migrator {
     abstract validate(): ValidationResult;
     protected convertAsset(asset: string | any): string | any;
     protected convertRootPath(originalPath: string): string;
+    protected convertSourceRootPath(originalPath: string): string;
     protected moveFile(from: string, to: string, required?: boolean): void;
     protected moveFilePathsFromTargetToProjectRoot(target: TargetConfiguration, options: string[]): void;
     protected moveProjectRootFile(filePath: string, isRequired?: boolean): void;
     protected updateCacheableOperations(targetNames: string[]): void;
     protected updateTsConfigFile(tsConfigPath: string, rootTsConfigFile: string, projectOffsetFromRoot: string): void;
-    private convertSourceRootPath;
     private getTargetValuesForOption;
     private getValueForOption;
 }

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

@@ -12,10 +12,10 @@ class Migrator {
     }
     convertAsset(asset) {
         if (typeof asset === 'string') {
-            return this.convertSourceRootPath(asset);
+            return this.convertRootPath(asset);
         }
         else {
-            return { ...asset, input: this.convertSourceRootPath(asset.input) };
+            return { ...asset, input: this.convertRootPath(asset.input) };
         }
     }
     convertRootPath(originalPath) {
@@ -23,6 +23,11 @@ class Migrator {
             ? (0, devkit_1.joinPathFragments)(this.project.newRoot, originalPath.replace(this.project.oldRoot, ''))
             : originalPath;
     }
+    convertSourceRootPath(originalPath) {
+        return originalPath?.startsWith(this.project.oldSourceRoot)
+            ? (0, devkit_1.joinPathFragments)(this.project.newSourceRoot, originalPath.replace(this.project.oldSourceRoot, ''))
+            : originalPath;
+    }
     moveFile(from, to, required = true) {
         if (!this.tree.exists(from)) {
             if (required) {
@@ -78,11 +83,6 @@ class Migrator {
             return json;
         });
     }
-    convertSourceRootPath(originalPath) {
-        return originalPath?.startsWith(this.project.oldSourceRoot)
-            ? (0, devkit_1.joinPathFragments)(this.project.newSourceRoot, originalPath.replace(this.project.oldSourceRoot, ''))
-            : originalPath;
-    }
     getTargetValuesForOption(target, optionPath) {
         const values = new Set();
         const value = this.getValueForOption(target.options, optionPath);

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

@@ -160,8 +160,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         buildOptions.polyfills =
             buildOptions.polyfills &&
                 (Array.isArray(buildOptions.polyfills)
-                    ? buildOptions.polyfills.map((asset) => this.convertAsset(asset))
-                    : this.convertAsset(buildOptions.polyfills));
+                    ? buildOptions.polyfills.map((asset) => this.convertSourceRootPath(asset))
+                    : this.convertSourceRootPath(buildOptions.polyfills));
         buildOptions.tsConfig =
             buildOptions.tsConfig &&
                 (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(buildOptions.tsConfig));

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

@@ -237,7 +237,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         const nxJson = (0, devkit_1.readNxJson)(this.tree) ?? {};
         const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false;
-        const { configurationGenerator } = await Promise.resolve().then(() => require('@nx/cypress'));
+        const { configurationGenerator } = (require('@nx/cypress'));
         await configurationGenerator(this.tree, {
             project: this.project.name,
             linter: this.isProjectUsingEsLint ? eslint_1.Linter.EsLint : eslint_1.Linter.None,

package/src/generators/ng-add/utilities/validation-logging.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProjectValidationResultMessage = exports.arrayToString = void 0;
-const chalk = require("chalk");
+const tslib_1 = require("tslib");
+const chalk = tslib_1.__importStar(require("chalk"));
 function arrayToString(array) {
     if (array.length === 0) {
         return '';

package/src/generators/ngrx-root-store/ngrx-root-store.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ngrxRootStoreGenerator = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const lib_1 = require("./lib");
-const ngrx_feature_store_1 = require("../ngrx-feature-store/ngrx-feature-store");
+const ngrx_feature_store_1 = tslib_1.__importDefault(require("../ngrx-feature-store/ngrx-feature-store"));
 async function ngrxRootStoreGenerator(tree, schema) {
     (0, lib_1.validateOptions)(tree, schema);
     const options = (0, lib_1.normalizeOptions)(tree, schema);

package/src/generators/setup-mf/lib/add-remote-to-host.js

@@ -18,8 +18,8 @@ exports.checkIsCommaNeeded = checkIsCommaNeeded;
 function addRemoteToHost(tree, options) {
     if (options.host) {
         const hostProject = (0, devkit_1.readProjectConfiguration)(tree, options.host);
-        const pathToMFManifest = (0, devkit_1.joinPathFragments)(hostProject.sourceRoot, 'assets/module-federation.manifest.json');
-        const hostFederationType = determineHostFederationType(tree, pathToMFManifest);
+        const pathToMFManifest = getDynamicManifestFile(tree, hostProject);
+        const hostFederationType = !!pathToMFManifest ? 'dynamic' : 'static';
         const isHostUsingTypescriptConfig = tree.exists((0, devkit_1.joinPathFragments)(hostProject.root, 'module-federation.config.ts'));
         if (hostFederationType === 'static') {
             addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescriptConfig);
@@ -31,8 +31,17 @@ function addRemoteToHost(tree, options) {
     }
 }
 exports.addRemoteToHost = addRemoteToHost;
-function determineHostFederationType(tree, pathToMfManifest) {
-    return tree.exists(pathToMfManifest) ? 'dynamic' : 'static';
+function getDynamicManifestFile(tree, project) {
+    // {sourceRoot}/assets/module-federation.manifest.json was the generated
+    // path for the manifest file in the past. We now generate the manifest
+    // file at {root}/public/module-federation.manifest.json. This check
+    // ensures that we can still support the old path for backwards
+    // compatibility since old projects may still have the manifest file
+    // at the old path.
+    return [
+        (0, devkit_1.joinPathFragments)(project.root, 'public/module-federation.manifest.json'),
+        (0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets/module-federation.manifest.json'),
+    ].find((path) => tree.exists(path));
 }
 function addRemoteToStaticHost(tree, options, hostProject, isHostUsingTypescript) {
     const hostMFConfigPath = (0, devkit_1.joinPathFragments)(hostProject.root, isHostUsingTypescript

package/src/generators/setup-mf/lib/fix-bootstrap.d.ts

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

package/src/generators/setup-mf/lib/fix-bootstrap.js

@@ -12,15 +12,22 @@ function fixBootstrap(tree, appRoot, options) {
         tree.write((0, devkit_1.joinPathFragments)(appRoot, 'src/bootstrap.ts'), bootstrapCode);
     }
     const bootstrapImportCode = `import('./bootstrap').catch(err => console.error(err))`;
-    const fetchMFManifestCode = `import { setRemoteDefinitions } from '@nx/angular/mf';
+    if (options.mfType === 'remote' || options.federationType === 'static') {
+        tree.write(mainFilePath, `${bootstrapImportCode};`);
+    }
+    else {
+        let manifestPath = '/assets/module-federation.manifest.json';
+        if (tree.exists((0, devkit_1.joinPathFragments)(appRoot, 'public/module-federation.manifest.json'))) {
+            manifestPath = '/module-federation.manifest.json';
+        }
+        const fetchMFManifestCode = `import { setRemoteDefinitions } from '@nx/angular/mf';
 
-fetch('/assets/module-federation.manifest.json')
+fetch('${manifestPath}')
   .then((res) => res.json())
   .then(definitions => setRemoteDefinitions(definitions))
   .then(() => ${bootstrapImportCode});`;
-    tree.write(mainFilePath, options.mfType === 'host' && options.federationType === 'dynamic'
-        ? fetchMFManifestCode
-        : `${bootstrapImportCode};`);
+        tree.write(mainFilePath, fetchMFManifestCode);
+    }
 }
 exports.fixBootstrap = fixBootstrap;
 const standaloneBootstrapCode = () => `import { bootstrapApplication } from '@angular/platform-browser';

package/src/generators/setup-mf/lib/setup-host-if-dynamic.js

@@ -2,12 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupHostIfDynamic = void 0;
 const devkit_1 = require("@nx/devkit");
+const version_utils_1 = require("../../utils/version-utils");
 function setupHostIfDynamic(tree, options) {
     if (options.federationType === 'static') {
         return;
     }
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.appName);
-    const pathToMFManifest = (0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets/module-federation.manifest.json');
+    const pathToMFManifest = angularMajorVersion >= 18
+        ? (0, devkit_1.joinPathFragments)(project.root, 'public/module-federation.manifest.json')
+        : (0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets/module-federation.manifest.json');
     if (!tree.exists(pathToMFManifest)) {
         tree.write(pathToMFManifest, '{}');
     }

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

@@ -27,7 +27,6 @@ async function setupMf(tree, rawOptions) {
     (0, lib_1.changeBuildTarget)(tree, options);
     (0, lib_1.updateTsConfig)(tree, options);
     (0, lib_1.setupServeTarget)(tree, options);
-    (0, lib_1.fixBootstrap)(tree, projectConfig.root, options);
     if (options.mfType === 'host') {
         (0, lib_1.setupHostIfDynamic)(tree, options);
         (0, lib_1.updateHostAppRoutes)(tree, options);
@@ -43,6 +42,7 @@ async function setupMf(tree, rawOptions) {
             installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/webpack': versions_1.nxVersion });
         }
     }
+    (0, lib_1.fixBootstrap)(tree, projectConfig.root, options);
     if (!options.skipE2E) {
         (0, lib_1.addCypressOnErrorWorkaround)(tree, options);
     }

package/src/generators/setup-ssr/files/server/application-builder/__serverFileName__

@@ -20,12 +20,13 @@ export function app(): express.Express {
   // Example Express Rest API endpoints
   // server.get('/api/**', (req, res) => { });
   // Serve static files from /browser
-  server.get('*.*', express.static(browserDistFolder, {
-    maxAge: '1y'
+  server.get('**', express.static(browserDistFolder, {
+    maxAge: '1y',
+    index: 'index.html',
   }));
 
   // All regular routes use the Angular engine
-  server.get('*', (req, res, next) => {
+  server.get('**', (req, res, next) => {
     const { protocol, originalUrl, baseUrl, headers } = req;
 
     commonEngine

package/src/generators/setup-ssr/files/server/server-builder/v17+/__serverFileName__

@@ -23,12 +23,13 @@ export function app(): express.Express {
   // Example Express Rest API endpoints
   // server.get('/api/**', (req, res) => { });
   // Serve static files from /browser
-  server.get('*.*', express.static(distFolder, {
-    maxAge: '1y'
+  server.get('**', express.static(distFolder, {
+    maxAge: '1y',
+    index: 'index.html'
   }));
 
   // All regular routes use the Angular engine
-  server.get('*', (req, res, next) => {
+  server.get('**', (req, res, next) => {
     const { protocol, originalUrl, baseUrl, headers } = req;
 
     commonEngine

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

@@ -26,7 +26,8 @@ function addDependencies(tree, isUsingApplicationBuilder) {
     else {
         dependencies['@nguniversal/express-engine'] =
             (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/express-engine')
-                ?.version ?? pkgVersions.ngUniversalVersion;
+                ?.version ??
+                pkgVersions.ngUniversalVersion;
         devDependencies['@nguniversal/builders'] =
             (0, version_utils_1.getInstalledPackageVersionInfo)(tree, '@nguniversal/builders')?.version ??
                 pkgVersions.ngUniversalVersion;

package/src/generators/setup-ssr/lib/generate-files.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSSRFiles = void 0;
 const devkit_1 = require("@nx/devkit");
-const semver_1 = require("semver");
-const version_utils_1 = require("../../utils/version-utils");
 function generateSSRFiles(tree, schema, isUsingApplicationBuilder) {
     const { root: projectRoot, targets } = (0, devkit_1.readProjectConfiguration)(tree, schema.project);
     if (targets.server ||
@@ -12,15 +10,11 @@ function generateSSRFiles(tree, schema, isUsingApplicationBuilder) {
         return;
     }
     const pathToFiles = (0, devkit_1.joinPathFragments)(__dirname, '..', 'files');
-    const { version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     if (schema.standalone) {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'standalone'), projectRoot, { ...schema, tpl: '' });
     }
     else {
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'base'), projectRoot, { ...schema, tpl: '' });
-        if ((0, semver_1.lt)(angularVersion, '15.2.0')) {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule', 'pre-v15-2'), projectRoot, { ...schema, tpl: '' });
-        }
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(pathToFiles, 'ngmodule'), projectRoot, { ...schema, tpl: '' });
     }
 }
 exports.generateSSRFiles = generateSSRFiles;

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

@@ -3,7 +3,6 @@ export * from './add-server-file';
 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';

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

@@ -6,7 +6,6 @@ tslib_1.__exportStar(require("./add-server-file"), 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);

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

@@ -3,12 +3,9 @@ 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) {
     validateProject(tree, options.project);
     validateBuildTarget(tree, options.project);
-    validateHydrationOption(tree, options.hydration);
 }
 exports.validateOptions = validateOptions;
 function validateProject(tree, project) {
@@ -24,13 +21,3 @@ function validateBuildTarget(tree, project) {
         throw new Error(`The "${project}" project does not have a "build" target. Please add a "build" target.`);
     }
 }
-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.json

@@ -19,8 +19,9 @@
     "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 and not supported since Angular 17._",
-      "default": "serverApp"
+      "description": "The `appId` to use with `withServerTransition`.",
+      "default": "serverApp",
+      "x-deprecated": "This is deprecated and ignored since Angular 16 and not supported since Angular 17."
     },
     "main": {
       "type": "string",
@@ -55,7 +56,7 @@
     },
     "hydration": {
       "type": "boolean",
-      "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_."
+      "description": "Set up Hydration for the SSR application. It defaults to `true` for Angular versions >= 17.0.0. Otherwise, it defaults to `false`."
     },
     "skipFormat": {
       "type": "boolean",

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

@@ -14,9 +14,6 @@ async function setupSsr(tree, schema) {
         (0, lib_1.addDependencies)(tree, isUsingApplicationBuilder);
     }
     (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);
     }

package/src/generators/stories/stories.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularStoriesGenerator = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const component_cypress_spec_1 = require("../component-cypress-spec/component-cypress-spec");
-const component_story_1 = require("../component-story/component-story");
+const component_cypress_spec_1 = tslib_1.__importDefault(require("../component-cypress-spec/component-cypress-spec"));
+const component_story_1 = tslib_1.__importDefault(require("../component-story/component-story"));
 const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const get_e2e_project_1 = require("./lib/get-e2e-project");

package/src/generators/storybook-configuration/lib/generate-stories.js

@@ -7,7 +7,7 @@ const stories_1 = require("../../stories/stories");
 async function generateStories(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-    const { getE2eProjectName } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/project-name'));
+    const { getE2eProjectName } = require('@nx/cypress/src/utils/project-name');
     const e2eProjectName = getE2eProjectName(options.project, project.root, options.cypressDirectory);
     await (0, stories_1.angularStoriesGenerator)(tree, {
         name: options.project,

package/src/generators/utils/storybook-ast/tree-utilities.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllFilesRecursivelyFromDir = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const ignore_1 = require("ignore");
+const ignore_1 = tslib_1.__importDefault(require("ignore"));
 function getAllFilesRecursivelyFromDir(tree, dir) {
     if (isPathIgnored(tree, dir)) {
         return [];

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

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.versions = exports.getInstalledPackageVersionInfo = exports.getInstalledPackageVersion = exports.getInstalledAngularVersionInfo = exports.getInstalledAngularMajorVersion = exports.getInstalledAngularVersion = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("semver");
 const backward_compatible_versions_1 = require("../../utils/backward-compatible-versions");
-const latestVersions = require("../../utils/versions");
+const latestVersions = tslib_1.__importStar(require("../../utils/versions"));
 const versions_1 = require("../../utils/versions");
 function getInstalledAngularVersion(tree) {
     const pkgJson = (0, devkit_1.readJson)(tree, 'package.json');
@@ -43,10 +44,10 @@ exports.getInstalledPackageVersionInfo = getInstalledPackageVersionInfo;
 function versions(tree) {
     const majorAngularVersion = getInstalledAngularMajorVersion(tree);
     switch (majorAngularVersion) {
-        case 15:
-            return backward_compatible_versions_1.backwardCompatibleVersions.angularV15;
         case 16:
             return backward_compatible_versions_1.backwardCompatibleVersions.angularV16;
+        case 17:
+            return backward_compatible_versions_1.backwardCompatibleVersions.angularV17;
         default:
             return latestVersions;
     }

package/src/migrations/update-15-2-0/remove-browserlist-config.js

@@ -19,7 +19,7 @@ exports.DEFAULT_BROWSERS = [
 async function removeBrowserlistConfig(tree) {
     let browserslist;
     try {
-        browserslist = await Promise.resolve().then(() => require('browserslist'));
+        browserslist = await import('browserslist');
     }
     catch {
         devkit_1.logger.warn('Skipping migration because the "browserslist" package could not be loaded.');

package/src/migrations/update-15-2-0/remove-platform-server-exports.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 const file_change_recorder_1 = require("../../utils/file-change-recorder");
 async function default_1(tree) {
     (0, devkit_1.visitNotIgnoredFiles)(tree, '/', (path) => {

package/src/migrations/update-15-2-0/update-karma-main-file.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 const workspace_models_1 = require("@schematics/angular/utility/workspace-models");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const file_change_recorder_1 = require("../../utils/file-change-recorder");

package/src/migrations/update-16-1-0/remove-render-module-platform-server-exports.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 const file_change_recorder_1 = require("../../utils/file-change-recorder");
 async function default_1(tree) {
     (0, devkit_1.visitNotIgnoredFiles)(tree, '/', (path) => {

package/src/migrations/update-19-1-0/update-angular-cli.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export declare const angularCliVersion = "~18.0.0";
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-19-1-0/update-angular-cli.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.angularCliVersion = void 0;
+const devkit_1 = require("@nx/devkit");
+exports.angularCliVersion = '~18.0.0';
+async function default_1(tree) {
+    let shouldFormat = false;
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        if (json.devDependencies?.['@angular/cli']) {
+            json.devDependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        else if (json.dependencies?.['@angular/cli']) {
+            json.dependencies['@angular/cli'] = exports.angularCliVersion;
+            shouldFormat = true;
+        }
+        return json;
+    });
+    if (shouldFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+}
+exports.default = default_1;

package/src/utils/backward-compatible-versions.d.ts

@@ -1,8 +1,13 @@
 import * as latestVersions from './versions';
-type SupportedVersions = 'angularV15' | 'angularV16';
-export type LatestPackageVersionNames = Exclude<keyof typeof latestVersions, 'nxVersion'>;
-export type CompatPackageVersionNames = LatestPackageVersionNames | 'ngUniversalVersion';
+type SupportedVersions = 'angularV16' | 'angularV17';
+type LatestPackageVersionNames = Exclude<keyof typeof latestVersions, 'nxVersion'>;
+type CompatPackageVersionNames = LatestPackageVersionNames | 'ngUniversalVersion';
+export type PackageVersionNames = LatestPackageVersionNames | CompatPackageVersionNames;
+export type VersionMap = {
+    angularV16: Record<CompatPackageVersionNames, string>;
+    angularV17: Record<Exclude<CompatPackageVersionNames, 'ngUniversalVersion'>, string>;
+};
 export type PackageLatestVersions = Record<LatestPackageVersionNames, string>;
-export type PackageCompatVersions = Record<CompatPackageVersionNames, string>;
-export declare const backwardCompatibleVersions: Record<SupportedVersions, PackageCompatVersions>;
+export type PackageCompatVersions = VersionMap[SupportedVersions];
+export declare const backwardCompatibleVersions: VersionMap;
 export {};