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

package/src/builders/webpack-browser/webpack-browser.impl.js

@@ -11,7 +11,6 @@ const rxjs_1 = require("rxjs");
 const operators_2 = require("rxjs/operators");
 const buildable_libs_1 = require("../utilities/buildable-libs");
 const webpack_1 = require("../utilities/webpack");
-const validate_options_1 = require("./validate-options");
 function shouldSkipInitialTargetRun(projectGraph, project, target) {
     const nxJson = (0, configuration_1.readNxJson)();
     const defaultDependencyConfigs = Object.entries(nxJson.targetDefaults ?? {}).reduce((acc, [targetName, dependencyConfig]) => {
@@ -23,7 +22,6 @@ function shouldSkipInitialTargetRun(projectGraph, project, target) {
     return projectDependencyConfigs.some((d) => d.target === target && d.projects === 'dependencies');
 }
 function executeWebpackBrowserBuilder(options, context) {
-    (0, validate_options_1.validateOptions)(options);
     options.buildLibsFromSource ??= true;
     const { buildLibsFromSource, customWebpackConfig, indexFileTransformer, ...delegateBuilderOptions } = options;
     const pathToWebpackConfig = customWebpackConfig?.path &&

package/src/builders/webpack-dev-server/lib/normalize-options.d.ts

@@ -1,2 +1,2 @@
-import type { Schema } from '../schema';
-export declare function normalizeOptions(schema: Schema): Schema;
+import type { NormalizedSchema, Schema } from '../schema';
+export declare function normalizeOptions(schema: Schema): NormalizedSchema;

package/src/builders/webpack-dev-server/lib/normalize-options.js

@@ -2,13 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
 function normalizeOptions(schema) {
+    let buildTarget = schema.buildTarget;
+    if (schema.browserTarget) {
+        buildTarget ??= schema.browserTarget;
+        delete schema.browserTarget;
+    }
     return {
-        host: 'localhost',
-        port: 4200,
-        liveReload: true,
-        open: false,
-        ssl: false,
         ...schema,
+        buildTarget,
+        host: schema.host ?? 'localhost',
+        port: schema.port ?? 4200,
+        liveReload: schema.liveReload ?? true,
+        open: schema.open ?? false,
+        ssl: schema.ssl ?? false,
     };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/builders/webpack-dev-server/schema.d.ts

@@ -1,15 +1,14 @@
-export interface Schema {
-  browserTarget: string;
-  port: number;
-  host: string;
+interface BaseSchema {
+  port?: number;
+  host?: string;
   proxyConfig?: string;
-  ssl: boolean;
+  ssl?: boolean;
   sslKey?: string;
   sslCert?: string;
   headers?: Record<string, string>;
-  open: boolean;
+  open?: boolean;
   verbose?: boolean;
-  liveReload: boolean;
+  liveReload?: boolean;
   publicHost?: string;
   allowedHosts?: string[];
   servePath?: string;
@@ -19,3 +18,19 @@ export interface Schema {
   poll?: number;
   buildLibsFromSource?: boolean;
 }
+
+export type SchemaWithBrowserTarget = BaseSchema & {
+  browserTarget: string;
+};
+
+export type SchemaWithBuildTarget = BaseSchema & {
+  buildTarget: string;
+};
+
+export type Schema = SchemaWithBrowserTarget | SchemaWithBuildTarget;
+
+export type NormalizedSchema = SchemaWithBuildTarget & {
+  liveReload: boolean;
+  open: boolean;
+  ssl: boolean;
+};

package/src/builders/webpack-dev-server/schema.json

@@ -9,13 +9,19 @@
   "presets": [
     {
       "name": "Using a Different Port",
-      "keys": ["browserTarget", "port"]
+      "keys": ["buildTarget", "port"]
     }
   ],
   "properties": {
     "browserTarget": {
       "type": "string",
-      "description": "A browser builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
+      "description": "A browser builder target to serve in the format of `project:target[:configuration]`. Ignored if `buildTarget` is set.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
+      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v18."
+    },
+    "buildTarget": {
+      "type": "string",
+      "description": "A build builder target to serve in the format of `project:target[:configuration]`.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
     },
     "port": {
@@ -112,5 +118,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["browserTarget"]
+  "anyOf": [{ "required": ["buildTarget"] }, { "required": ["browserTarget"] }]
 }

package/src/builders/webpack-dev-server/webpack-dev-server.impl.js

@@ -2,32 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeWebpackDevServerBuilder = void 0;
 const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
 const webpack_nx_build_coordination_plugin_1 = require("@nx/webpack/src/plugins/webpack-nx-build-coordination-plugin");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
 const fs_1 = require("fs");
 const operators_1 = require("nx/src/project-graph/operators");
-const webpack_1 = require("../utilities/webpack");
-const lib_1 = require("./lib");
-const buildable_libs_1 = require("../utilities/buildable-libs");
+const project_graph_1 = require("nx/src/project-graph/project-graph");
 const rxjs_1 = require("rxjs");
 const operators_2 = require("rxjs/operators");
-const js_1 = require("@nx/js");
+const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
+const buildable_libs_1 = require("../utilities/buildable-libs");
+const webpack_1 = require("../utilities/webpack");
+const lib_1 = require("./lib");
 function executeWebpackDevServerBuilder(rawOptions, context) {
     process.env.NX_TSCONFIG_PATH = (0, js_1.getRootTsConfigPath)();
     const options = (0, lib_1.normalizeOptions)(rawOptions);
-    const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, {
+    const parsedBuildTarget = (0, devkit_1.parseTargetString)(options.buildTarget, {
         cwd: context.currentDirectory,
         projectGraph: (0, devkit_1.readCachedProjectGraph)(),
         projectName: context.target.project,
         root: context.workspaceRoot,
         isVerbose: false,
     });
-    const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBrowserTarget.project);
-    const buildTarget = browserTargetProjectConfiguration.targets[parsedBrowserTarget.target];
+    const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBuildTarget.project);
+    const buildTarget = browserTargetProjectConfiguration.targets[parsedBuildTarget.target];
     const buildTargetOptions = {
         ...buildTarget.options,
-        ...(parsedBrowserTarget.configuration
-            ? buildTarget.configurations[parsedBrowserTarget.configuration]
+        ...(parsedBuildTarget.configuration
+            ? buildTarget.configurations[parsedBuildTarget.configuration]
             : buildTarget.defaultConfiguration
                 ? buildTarget.configurations[buildTarget.defaultConfiguration]
                 : {}),
@@ -52,7 +53,7 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
     let dependencies;
     if (!buildLibsFromSource) {
         const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetOptions.tsConfig, context, {
-            target: parsedBrowserTarget.target,
+            target: parsedBuildTarget.target,
         });
         dependencies = foundDependencies;
         // We can't just pass the tsconfig path in memory to the angular builder
@@ -73,7 +74,8 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
         // webpack-server implementation.
         buildTargetOptions.tsConfig = tsConfigPath;
     }
-    return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeDevServerBuilder }) => executeDevServerBuilder(options, context, {
+    const delegateBuilderOptions = getDelegateBuilderOptions(options);
+    return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeDevServerBuilder }) => executeDevServerBuilder(delegateBuilderOptions, context, {
         webpackConfiguration: async (baseWebpackConfig) => {
             if (!buildLibsFromSource) {
                 const workspaceDependencies = dependencies
@@ -86,7 +88,7 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
                 if (workspaceDependencies.length > 0) {
                     baseWebpackConfig.plugins.push(
                     // @ts-expect-error - difference between angular and webpack plugin definitions bc of webpack versions
-                    new webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${parsedBrowserTarget.target} --projects=${workspaceDependencies.join(',')}`));
+                    new webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${parsedBuildTarget.target} --projects=${workspaceDependencies.join(',')}`));
                 }
             }
             if (!pathToWebpackConfig) {
@@ -103,3 +105,12 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
 }
 exports.executeWebpackDevServerBuilder = executeWebpackDevServerBuilder;
 exports.default = require('@angular-devkit/architect').createBuilder(executeWebpackDevServerBuilder);
+function getDelegateBuilderOptions(options) {
+    const delegatedBuilderOptions = { ...options };
+    const { major } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    if (major <= 17) {
+        delegatedBuilderOptions.browserTarget = delegatedBuilderOptions.buildTarget;
+        delete delegatedBuilderOptions.buildTarget;
+    }
+    return delegatedBuilderOptions;
+}

package/src/builders/webpack-server/schema.d.ts

@@ -5,5 +5,4 @@ export interface Schema extends ServerBuilderOptions {
     path: string;
   };
   buildLibsFromSource?: boolean;
-  bundleDependencies?: boolean | 'none' | 'all';
 }

package/src/builders/webpack-server/schema.json

@@ -128,7 +128,7 @@
     },
     "vendorChunk": {
       "type": "boolean",
-      "description": "Generate a seperate bundle containing only vendor libraries. This option should only be used for development to reduce the incremental compilation time. _Note: supported in Angular versions >= 15.1.0_",
+      "description": "Generate a separate bundle containing only vendor libraries. This option should only be used for development to reduce the incremental compilation time. _Note: supported in Angular versions >= 15.1.0_",
       "default": false
     },
     "verbose": {
@@ -209,18 +209,6 @@
       },
       "default": []
     },
-    "bundleDependencies": {
-      "description": "Which external dependencies to bundle into the bundle. By default, all of node_modules will be bundled. _Note: This is only supported in Angular versions >= 14.0.0, < 15.0.0. It was removed in Angular 15._",
-      "oneOf": [
-        {
-          "type": "boolean"
-        },
-        {
-          "type": "string",
-          "enum": ["none", "all"]
-        }
-      ]
-    },
     "statsJson": {
       "type": "boolean",
       "description": "Generates a 'stats.json' file which can be analyzed using tools such as 'webpack-bundle-analyzer'.",

package/src/builders/webpack-server/validate-options.js

@@ -8,7 +8,6 @@ function validateOptions(options) {
     const angularVersionInfo = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
     validateAssets(options, angularVersionInfo);
     validateBuildOptimizer(options, angularVersionInfo);
-    validateBundleDependencies(options, angularVersionInfo);
     validateVendorChunk(options, angularVersionInfo);
 }
 exports.validateOptions = validateOptions;
@@ -26,12 +25,6 @@ function validateBuildOptimizer(options, { major, version }) {
     You can resolve this error by removing the "buildOptimizer" option.`);
     }
 }
-function validateBundleDependencies(options, { major, version }) {
-    if (major >= 15 && options.bundleDependencies) {
-        throw new Error((0, devkit_1.stripIndents) `The "bundleDependencies" option was removed in Angular version 15. You are currently using "${version}".
-    You can resolve this error by removing the "bundleDependencies" option.`);
-    }
-}
 function validateVendorChunk(options, { version }) {
     if ((0, semver_1.lt)(version, '15.1.0') && options.vendorChunk) {
         throw new Error((0, devkit_1.stripIndents) `The "vendorChunk" option is supported from Angular >= 15.1.0. You are currently using "${version}".

package/src/builders/webpack-server/webpack-server.impl.js

@@ -5,8 +5,6 @@ const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const semver_1 = require("semver");
-const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
 const buildable_libs_1 = require("../utilities/buildable-libs");
 const webpack_1 = require("../utilities/webpack");
 const validate_options_1 = require("./validate-options");
@@ -49,12 +47,6 @@ function buildServerAppWithCustomWebpackConfiguration(options, context, pathToWe
 }
 function executeWebpackServerBuilder(options, context) {
     (0, validate_options_1.validateOptions)(options);
-    const installedAngularVersionInfo = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
-    // default bundleDependencies to true if supported by Angular version
-    if ((0, semver_1.lt)(installedAngularVersionInfo.version, '15.0.0') &&
-        options.bundleDependencies === undefined) {
-        options.bundleDependencies = true;
-    }
     options.buildLibsFromSource ??= true;
     if (!options.buildLibsFromSource) {
         const { tsConfigPath } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(options.tsConfig, context);

package/src/executors/browser-esbuild/browser-esbuild.impl.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const validate_options_1 = require("./lib/validate-options");
 const devkit_1 = require("@nx/devkit");
 const buildable_libs_1 = require("./lib/buildable-libs");
 const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 async function* esbuildExecutor(options, context) {
-    (0, validate_options_1.validateOptions)(options);
     options.buildLibsFromSource ??= true;
     const { buildLibsFromSource, ...delegateExecutorOptions } = options;
     let dependencies;

package/src/executors/browser-esbuild/schema.json

@@ -215,7 +215,7 @@
     },
     "outputPath": {
       "type": "string",
-      "description": "The full path for the new output directory, relative to the current workspace.\nBy default, writes output to a folder named dist/ in the current project."
+      "description": "The full path for the new output directory, relative to the current workspace."
     },
     "resourcesOutputPath": {
       "type": "string",
@@ -264,12 +264,12 @@
     },
     "vendorChunk": {
       "type": "boolean",
-      "description": "Generate a seperate bundle containing only vendor libraries. This option should only be used for development to reduce the incremental compilation time.",
+      "description": "Generate a separate bundle containing only vendor libraries. This option should only be used for development to reduce the incremental compilation time.",
       "default": false
     },
     "commonChunk": {
       "type": "boolean",
-      "description": "Generate a seperate bundle containing code used across multiple bundles.",
+      "description": "Generate a separate bundle containing code used across multiple bundles.",
       "default": true
     },
     "baseHref": {
@@ -401,6 +401,7 @@
         },
         {
           "const": false,
+          "type": "boolean",
           "description": "Does not generate an `index.html` file."
         }
       ]
@@ -429,7 +430,7 @@
       "enum": ["none", "anonymous", "use-credentials"]
     },
     "allowedCommonJsDependencies": {
-      "description": "A list of CommonJS packages that are allowed to be used without a build time warning.",
+      "description": "A list of CommonJS or AMD packages that are allowed to be used without a build time warning. Use `'*'` to allow all.",
       "type": "array",
       "items": {
         "type": "string"

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ng-package/entry-point/write-package.transform.js

@@ -34,11 +34,14 @@ const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromis
         }
     }
     // 6. WRITE PACKAGE.JSON
-    // As of APF 14 only the primary entrypoint has a package.json
+    const relativeUnixFromDestPath = (filePath) => (0, path_1.ensureUnixPath)(path.relative(ngEntryPoint.destinationPath, filePath));
     if (!ngEntryPoint.isSecondaryEntryPoint) {
         try {
             devkit_1.logger.info('Writing package manifest');
-            const relativeUnixFromDestPath = (filePath) => (0, path_1.ensureUnixPath)(path.relative(ngEntryPoint.destinationPath, filePath));
+            if (!options.watch) {
+                const primary = ngPackageNode.data.primary;
+                await (0, fs_1.writeFile)(path.join(primary.destinationPath, '.npmignore'), `# Nested package.json's are only needed for development.\n**/package.json`);
+            }
             await writePackageJson(ngEntryPoint, ngPackage, {
                 // backward compat for Angular < 16
                 ...(angularVersion.major < 16
@@ -60,17 +63,22 @@ const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromis
             throw error;
         }
     }
-    else if (options.watch) {
-        // update the watch version of the primary entry point `package.json` file.
-        // this is needed because of Webpack's 5 `cachemanagedpaths`
-        // https://github.com/ng-packagr/ng-packagr/issues/2069
-        const primary = ngPackageNode.data.primary;
-        const packageJsonPath = path.join(primary.destinationPath, 'package.json');
-        if (await (0, fs_1.exists)(packageJsonPath)) {
-            const packageJson = JSON.parse(await (0, fs_1.readFile)(packageJsonPath, { encoding: 'utf8' }));
-            packageJson.version = generateWatchVersion();
-            await (0, fs_1.writeFile)(path.join(primary.destinationPath, 'package.json'), JSON.stringify(packageJson, undefined, 2));
+    else if (ngEntryPoint.isSecondaryEntryPoint) {
+        if (options.watch) {
+            // Update the watch version of the primary entry point `package.json` file.
+            // this is needed because of Webpack's 5 `cachemanagedpaths`
+            // https://github.com/ng-packagr/ng-packagr/issues/2069
+            const primary = ngPackageNode.data.primary;
+            const packageJsonPath = path.join(primary.destinationPath, 'package.json');
+            if (await (0, fs_1.exists)(packageJsonPath)) {
+                const packageJson = JSON.parse(await (0, fs_1.readFile)(packageJsonPath, { encoding: 'utf8' }));
+                packageJson.version = generateWatchVersion();
+                await (0, fs_1.writeFile)(path.join(primary.destinationPath, 'package.json'), JSON.stringify(packageJson, undefined, 2));
+            }
         }
+        // Write a package.json in each secondary entry-point
+        // This is need for esbuild to secondary entry-points in dist correctly.
+        await (0, fs_1.writeFile)(path.join(ngEntryPoint.destinationPath, 'package.json'), JSON.stringify({ module: relativeUnixFromDestPath(destinationFiles.fesm2022) }, undefined, 2));
     }
     devkit_1.logger.info(`Built ${ngEntryPoint.moduleId}`);
     return graph;

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/ngc/compile-source-files.js

@@ -12,10 +12,10 @@ exports.compileSourceFiles = void 0;
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const cache_compiler_host_1 = require("ng-packagr/lib/ts/cache-compiler-host");
 const log = require("ng-packagr/lib/utils/log");
-const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
 const node_path_1 = require("node:path");
 const ts = require("typescript");
 const angular_version_utils_1 = require("../../../utilities/angular-version-utils");
+const ng_compiler_cli_1 = require("../../../utilities/ng-compiler-cli");
 const cache_compiler_host_2 = require("../ts/cache-compiler-host");
 async function compileSourceFiles(graph, tsConfig, moduleResolutionCache, options, extraOptions, stylesheetProcessor) {
     const { NgtscProgram, formatDiagnostics } = await (0, ng_compiler_cli_1.ngCompilerCli)();
@@ -155,6 +155,15 @@ async function compileSourceFiles(graph, tsConfig, moduleResolutionCache, option
         throw new Error(formatDiagnostics(errorDiagnostics));
     }
     const transformers = angularCompiler.prepareEmit().transformers;
+    if ('getSemanticDiagnosticsOfNextAffectedFile' in builder) {
+        while (builder.emitNextAffectedFile((fileName, data, writeByteOrderMark, onError, sourceFiles) => {
+            if (fileName.endsWith('.tsbuildinfo')) {
+                tsCompilerHost.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles);
+            }
+        })) {
+            // empty
+        }
+    }
     const angularVersion = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
     const incrementalCompilation = angularVersion.major < 16
         ? angularCompiler.incrementalDriver

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/styles/stylesheet-processor.js

@@ -19,7 +19,6 @@ const path_1 = require("path");
 const postcssPresetEnv = require("postcss-preset-env");
 const postcssUrl = require("postcss-url");
 const node_url_1 = require("node:url");
-const angular_version_utils_1 = require("../../../utilities/angular-version-utils");
 const tailwindcss_1 = require("../../../utilities/tailwindcss");
 const postcss = require('postcss');
 var CssUrl;
@@ -167,18 +166,6 @@ class StylesheetProcessor {
         switch (ext) {
             case '.sass':
             case '.scss': {
-                const angularVersion = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
-                if (angularVersion && angularVersion.major < 15) {
-                    return (await Promise.resolve().then(() => require('sass')))
-                        .renderSync({
-                        file: filePath,
-                        data: css,
-                        indentedSyntax: '.sass' === ext,
-                        importer: customSassImporter,
-                        includePaths: this.styleIncludePaths,
-                    })
-                        .css.toString();
-                }
                 return (await Promise.resolve().then(() => require('sass')))
                     .compileString(css, {
                     url: (0, node_url_1.pathToFileURL)(filePath),

package/src/executors/package/ng-packagr-adjustments/ngc/compile-source-files.js

@@ -11,10 +11,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileSourceFiles = void 0;
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const log = require("ng-packagr/lib/utils/log");
-const ng_compiler_cli_1 = require("ng-packagr/lib/utils/ng-compiler-cli");
 const node_path_1 = require("node:path");
 const ts = require("typescript");
 const angular_version_utils_1 = require("../../../utilities/angular-version-utils");
+const ng_compiler_cli_1 = require("../../../utilities/ng-compiler-cli");
 const cache_compiler_host_1 = require("../ts/cache-compiler-host");
 async function compileSourceFiles(graph, tsConfig, moduleResolutionCache, options, extraOptions, stylesheetProcessor, ngccProcessor) {
     const { NgtscProgram, formatDiagnostics } = await (0, ng_compiler_cli_1.ngCompilerCli)();
@@ -158,6 +158,15 @@ async function compileSourceFiles(graph, tsConfig, moduleResolutionCache, option
         throw new Error(formatDiagnostics(errorDiagnostics));
     }
     const transformers = angularCompiler.prepareEmit().transformers;
+    if ('getSemanticDiagnosticsOfNextAffectedFile' in builder) {
+        while (builder.emitNextAffectedFile((fileName, data, writeByteOrderMark, onError, sourceFiles) => {
+            if (fileName.endsWith('.tsbuildinfo')) {
+                tsCompilerHost.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles);
+            }
+        })) {
+            // empty
+        }
+    }
     const angularVersion = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
     const incrementalCompilation = angularVersion.major < 16
         ? angularCompiler.incrementalDriver

package/src/executors/package/ng-packagr-adjustments/styles/stylesheet-processor.js

@@ -19,7 +19,6 @@ const path_1 = require("path");
 const postcssPresetEnv = require("postcss-preset-env");
 const postcssUrl = require("postcss-url");
 const node_url_1 = require("node:url");
-const angular_version_utils_1 = require("../../../utilities/angular-version-utils");
 const tailwindcss_1 = require("../../../utilities/tailwindcss");
 const postcss = require('postcss');
 var CssUrl;
@@ -160,18 +159,6 @@ class StylesheetProcessor {
         switch (ext) {
             case '.sass':
             case '.scss': {
-                const angularVersion = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
-                if (angularVersion && angularVersion.major < 15) {
-                    return (await Promise.resolve().then(() => require('sass')))
-                        .renderSync({
-                        file: filePath,
-                        data: css,
-                        indentedSyntax: '.sass' === ext,
-                        importer: customSassImporter,
-                        includePaths: this.styleIncludePaths,
-                    })
-                        .css.toString();
-                }
                 return (await Promise.resolve().then(() => require('sass')))
                     .compileString(css, {
                     url: (0, node_url_1.pathToFileURL)(filePath),

package/src/executors/utilities/ng-compiler-cli.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="node" />
+export declare function ngCompilerCli(): Promise<typeof import('@angular/compiler-cli')>;
+/**
+ * This uses a dynamic import to load a module which may be ESM.
+ * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
+ * will currently, unconditionally downlevel dynamic import into a require call.
+ * require calls cannot load ESM code and will result in a runtime error. To workaround
+ * this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
+ * Once TypeScript provides support for keeping the dynamic import this workaround can
+ * be dropped.
+ *
+ * @param modulePath The path of the module to load.
+ * @returns A Promise that resolves to the dynamically imported module.
+ */
+export declare function loadEsmModule<T>(modulePath: string | URL): Promise<T>;

package/src/executors/utilities/ng-compiler-cli.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadEsmModule = exports.ngCompilerCli = void 0;
+function ngCompilerCli() {
+    return loadEsmModule('@angular/compiler-cli');
+}
+exports.ngCompilerCli = ngCompilerCli;
+/**
+ * Lazily compiled dynamic import loader function.
+ */
+let load;
+/**
+ * This uses a dynamic import to load a module which may be ESM.
+ * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
+ * will currently, unconditionally downlevel dynamic import into a require call.
+ * require calls cannot load ESM code and will result in a runtime error. To workaround
+ * this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
+ * Once TypeScript provides support for keeping the dynamic import this workaround can
+ * be dropped.
+ *
+ * @param modulePath The path of the module to load.
+ * @returns A Promise that resolves to the dynamically imported module.
+ */
+function loadEsmModule(modulePath) {
+    load ??= new Function('modulePath', `return import(modulePath);`);
+    return load(modulePath);
+}
+exports.loadEsmModule = loadEsmModule;

package/src/generators/application/application.js

@@ -3,11 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGeneratorInternal = exports.applicationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
+const setup_ssr_1 = require("../setup-ssr/setup-ssr");
 const setup_tailwind_1 = require("../setup-tailwind/setup-tailwind");
-const version_utils_1 = require("../utils/version-utils");
 const lib_1 = require("./lib");
-const semver_1 = require("semver");
-const enquirer_1 = require("enquirer");
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
         projectNameAndRootFormat: 'derived',
@@ -16,20 +14,6 @@ async function applicationGenerator(tree, schema) {
 }
 exports.applicationGenerator = applicationGenerator;
 async function applicationGeneratorInternal(tree, schema) {
-    const installedAngularVersionInfo = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    if ((0, semver_1.lt)(installedAngularVersionInfo.version, '14.1.0') && schema.standalone) {
-        throw new Error((0, devkit_1.stripIndents) `The "standalone" option is only supported in Angular >= 14.1.0. You are currently using ${installedAngularVersionInfo.version}.
-    You can resolve this error by removing the "standalone" option or by migrating to Angular 14.1.0.`);
-    }
-    if ((0, semver_1.gte)(installedAngularVersionInfo.version, '14.1.0') &&
-        schema.standalone === undefined &&
-        process.env.NX_INTERACTIVE === 'true') {
-        schema.standalone = await (0, enquirer_1.prompt)({
-            name: 'standalone-components',
-            message: 'Would you like to use Standalone Components?',
-            type: 'confirm',
-        }).then((a) => a['standalone-components']);
-    }
     const options = await (0, lib_1.normalizeOptions)(tree, schema);
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.appProjectRoot);
     await (0, init_1.angularInitGenerator)(tree, {
@@ -63,6 +47,12 @@ async function applicationGeneratorInternal(tree, schema) {
     else {
         (0, lib_1.setApplicationStrictDefault)(tree, false);
     }
+    if (options.ssr) {
+        await (0, setup_ssr_1.setupSsr)(tree, {
+            project: options.name,
+            standalone: options.standalone,
+        });
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/application/files/base/tsconfig.app.json__tpl__

@@ -4,7 +4,7 @@
     "outDir": "<%= rootOffset %>dist/out-tsc",
     "types": []
   },
-  "files": ["src/main.ts"<% if(installedAngularInfo.major === 14) { %>, "src/polyfills.ts"<% } %>],
+  "files": ["src/main.ts"],
   "include": ["src/**/*.d.ts"],
   "exclude": ["jest.config.ts", "src/**/*.test.ts", "src/**/*.spec.ts"]
 }

package/src/generators/application/files/base/tsconfig.json__tpl__

@@ -1,7 +1,8 @@
 {
   "compilerOptions": {
-    "target": <% if(installedAngularInfo.major === 14) { %>"es2020"<% } else { %>"es2022"<% } %><% if(installedAngularInfo.major === 15) { %>,
-    "useDefineForClassFields": false<% } %>
+    "target": "es2022",
+    "useDefineForClassFields": false<% if (isUsingApplicationBuilder) { %>,
+    "esModuleInterop": true<% } %>
   },
   "files": [],
   "include": [],

package/src/generators/application/files/ng-module/src/app/app.module.ts__tpl__

@@ -9,7 +9,7 @@ import { NxWelcomeComponent } from './nx-welcome.component';<% } %>
   declarations: [AppComponent<% if(!minimal) { %>, NxWelcomeComponent<% } %>],
   imports: [
     BrowserModule,<% if(routing) { %>
-    RouterModule.forRoot(appRoutes, { initialNavigation: 'enabledBlocking' }),<% } %>
+    RouterModule.forRoot(appRoutes),<% } %>
   ],
   providers: [],
   bootstrap: [AppComponent],