@nx/angular 19.1.0-canary.20240522-89fdd42 → 19.1.0-canary.20240524-12c6a73

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

@@ -8,6 +8,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxWritePackageTransform = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const node_1 = require("ng-packagr/lib/graph/node");
 const transform_1 = require("ng-packagr/lib/graph/transform");
@@ -15,7 +16,7 @@ const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const fs_1 = require("ng-packagr/lib/utils/fs");
 const glob_1 = require("ng-packagr/lib/utils/glob");
 const path_1 = require("ng-packagr/lib/utils/path");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 const angular_version_utils_1 = require("../../../../../utilities/angular-version-utils");
 const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromise)(async (graph) => {
     const entryPoint = graph.find((0, nodes_1.isEntryPointInProgress)());

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/pre-v17/ng-package/options.di.js

@@ -7,7 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NX_DEFAULT_OPTIONS_PROVIDER = exports.nxProvideOptions = exports.NX_OPTIONS_TOKEN = void 0;
-const findCacheDirectory = require("find-cache-dir");
+const tslib_1 = require("tslib");
+const findCacheDirectory = tslib_1.__importStar(require("find-cache-dir"));
 const injection_js_1 = require("injection-js");
 const os_1 = require("os");
 const path_1 = require("path");

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/pre-v17/ngc/compile-source-files.d.ts

@@ -5,9 +5,8 @@
  * - Use custom StylesheetProcessor instead of the one provided by ng-packagr.
  * - Support Angular Compiler `incrementalDriver` for Angular < 16.
  */
-import type { CompilerOptions, ParsedConfiguration } from '@angular/compiler-cli';
 import { BuildGraph } from 'ng-packagr/lib/graph/build-graph';
 import * as ts from 'typescript';
 import { NgPackagrOptions } from '../ng-package/options.di';
 import { StylesheetProcessor } from '../styles/stylesheet-processor';
-export declare function compileSourceFiles(graph: BuildGraph, tsConfig: ParsedConfiguration, moduleResolutionCache: ts.ModuleResolutionCache, options: NgPackagrOptions, extraOptions?: Partial<CompilerOptions>, stylesheetProcessor?: StylesheetProcessor): Promise<void>;
+export declare function compileSourceFiles(graph: BuildGraph, tsConfig: any, moduleResolutionCache: ts.ModuleResolutionCache, options: NgPackagrOptions, extraOptions?: Partial<ts.CompilerOptions>, stylesheetProcessor?: StylesheetProcessor): Promise<void>;

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

@@ -8,15 +8,16 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileSourceFiles = void 0;
+const tslib_1 = require("tslib");
 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 log = tslib_1.__importStar(require("ng-packagr/lib/utils/log"));
 const node_path_1 = require("node:path");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 const angular_version_utils_1 = require("../../../../utilities/angular-version-utils");
-const ng_compiler_cli_1 = require("../../../../utilities/ng-compiler-cli");
+const module_loader_1 = require("../../../../utilities/module-loader");
 async function compileSourceFiles(graph, tsConfig, moduleResolutionCache, options, extraOptions, stylesheetProcessor) {
-    const { NgtscProgram, formatDiagnostics } = await (0, ng_compiler_cli_1.ngCompilerCli)();
+    const { NgtscProgram, formatDiagnostics } = await (0, module_loader_1.loadEsmModule)('@angular/compiler-cli');
     const { cacheDirectory, watch, cacheEnabled } = options;
     const tsConfigOptions = {
         ...tsConfig.options,

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

@@ -8,14 +8,14 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StylesheetProcessor = exports.InlineStyleLanguage = exports.CssUrl = void 0;
-const browserslist = require("browserslist");
+const tslib_1 = require("tslib");
+const browserslist_1 = tslib_1.__importDefault(require("browserslist"));
 const fs_1 = require("fs");
-const esbuild_executor_1 = require("ng-packagr/lib/esbuild/esbuild-executor");
 const cache_1 = require("ng-packagr/lib/utils/cache");
-const log = require("ng-packagr/lib/utils/log");
+const log = tslib_1.__importStar(require("ng-packagr/lib/utils/log"));
 const path_1 = require("path");
-const autoprefixer = require("autoprefixer");
-const postcssUrl = require("postcss-url");
+const autoprefixer_1 = tslib_1.__importDefault(require("autoprefixer"));
+const postcssUrl = tslib_1.__importStar(require("postcss-url"));
 const node_url_1 = require("node:url");
 const tailwindcss_1 = require("../../../../utilities/ng-packagr/tailwindcss");
 const postcss = require('postcss');
@@ -39,12 +39,12 @@ class StylesheetProcessor {
         this.includePaths = includePaths;
         this.cacheDirectory = cacheDirectory;
         this.tailwindConfig = tailwindConfig;
-        this.esbuild = new esbuild_executor_1.EsbuildExecutor();
+        this.esbuild = new (require('ng-packagr/lib/esbuild/esbuild-executor').EsbuildExecutor)();
         // By default, browserslist defaults are too inclusive
         // https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
         // We change the default query to browsers that Angular support.
         // https://angular.io/guide/browser-support
-        browserslist.defaults = [
+        browserslist_1.default.defaults = [
             'last 2 Chrome versions',
             'last 1 Firefox version',
             'last 2 Edge major versions',
@@ -63,7 +63,7 @@ class StylesheetProcessor {
             prevDir = currentDir;
             currentDir = (0, path_1.dirname)(prevDir);
         }
-        this.browserslistData = browserslist(undefined, { path: this.basePath });
+        this.browserslistData = (0, browserslist_1.default)(undefined, { path: this.basePath });
         this.targets = transformSupportedBrowsersToTargets(this.browserslistData);
         const tailwindSetup = (0, tailwindcss_1.getTailwindSetup)(this.projectBasePath, this.tailwindConfig);
         if (tailwindSetup) {
@@ -137,7 +137,7 @@ class StylesheetProcessor {
         if (this.cssUrl !== CssUrl.none) {
             postCssPlugins.push(postcssUrl({ url: this.cssUrl }));
         }
-        postCssPlugins.push(autoprefixer({
+        postCssPlugins.push((0, autoprefixer_1.default)({
             ignoreUnknownVersions: true,
             overrideBrowserslist: this.browserslistData,
         }));
@@ -148,14 +148,14 @@ class StylesheetProcessor {
         switch (ext) {
             case '.sass':
             case '.scss': {
-                return (await Promise.resolve().then(() => require('sass'))).compileString(css, {
+                return (await import('sass')).compileString(css, {
                     url: (0, node_url_1.pathToFileURL)(filePath),
                     syntax: '.sass' === ext ? 'indented' : 'scss',
                     loadPaths: this.styleIncludePaths,
                 }).css;
             }
             case '.less': {
-                const { css: content } = await (await Promise.resolve().then(() => require('less'))).render(css, {
+                const { css: content } = await (await import('less')).render(css, {
                     filename: filePath,
                     javascriptEnabled: true,
                     paths: this.styleIncludePaths,

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

@@ -7,6 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxWritePackageTransform = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const node_1 = require("ng-packagr/lib/graph/node");
 const transform_1 = require("ng-packagr/lib/graph/transform");
@@ -14,7 +15,7 @@ const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const fs_1 = require("ng-packagr/lib/utils/fs");
 const glob_1 = require("ng-packagr/lib/utils/glob");
 const path_1 = require("ng-packagr/lib/utils/path");
-const path = require("path");
+const path = tslib_1.__importStar(require("path"));
 const nxWritePackageTransform = (options) => (0, transform_1.transformFromPromise)(async (graph) => {
     const entryPoint = graph.find((0, nodes_1.isEntryPointInProgress)());
     const ngEntryPoint = entryPoint.data.entryPoint;

package/src/executors/ng-packagr-lite/schema.json

@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "$schema": "https://json-schema.org/schema",
   "title": "ng-packagr Target",
-  "description": "Builds an Angular library with support for incremental builds.\n\nThis executor is meant to be used with buildable libraries in an incremental build scenario. It is similar to the `@nx/angular:package` executor but with some key differences:\n- For supported Angular versions lower than v16, it doesn't run `ngcc` automatically (`ngcc` is no longer available from Angular v16 onwards, for lower versions, it needs to be run separately beforehand if needed, this can be done in a `postinstall` hook on `package.json`).\n- It only produces ESM2022 bundles (ESM2020 for supported Angular versions lower than v16).",
+  "description": "Builds an Angular library with support for incremental builds.\n\nThis executor is meant to be used with buildable libraries in an incremental build scenario. It is similar to the `@nx/angular:package` executor but it only produces ESM2022 bundles.",
   "cli": "nx",
   "type": "object",
   "presets": [

package/src/executors/package/ng-packagr-adjustments/ng-package/entry-point/compile-ngc.transform.js

@@ -9,18 +9,19 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileNgcTransformFactory = void 0;
+const tslib_1 = require("tslib");
 const transform_1 = require("ng-packagr/lib/graph/transform");
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const tsconfig_1 = require("ng-packagr/lib/ts/tsconfig");
-const ora = require("ora");
-const path = require("path");
-const ts = require("typescript");
+const ora_1 = tslib_1.__importDefault(require("ora"));
+const path = tslib_1.__importStar(require("path"));
+const ts = tslib_1.__importStar(require("typescript"));
 const angular_version_utils_1 = require("../../../../utilities/angular-version-utils");
 const compile_source_files_1 = require("../../ngc/compile-source-files");
 const ng_compiler_cli_1 = require("../../utils/ng-compiler-cli");
 const compileNgcTransformFactory = (StylesheetProcessor, options) => {
     return (0, transform_1.transformFromPromise)(async (graph) => {
-        const spinner = ora({
+        const spinner = (0, ora_1.default)({
             hideCursor: false,
             discardStdin: false,
         });

package/src/executors/package/ng-packagr-adjustments/ng-package/options.di.js

@@ -7,7 +7,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NX_DEFAULT_OPTIONS_PROVIDER = exports.nxProvideOptions = exports.NX_OPTIONS_TOKEN = void 0;
-const findCacheDirectory = require("find-cache-dir");
+const tslib_1 = require("tslib");
+const findCacheDirectory = tslib_1.__importStar(require("find-cache-dir"));
 const injection_js_1 = require("injection-js");
 const os_1 = require("os");
 const path_1 = require("path");

package/src/executors/package/ng-packagr-adjustments/ng-packagr.js

@@ -6,14 +6,14 @@ const angular_version_utils_1 = require("../../utilities/angular-version-utils")
 async function getNgPackagrInstance(options) {
     const { major: angularMajorVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
     if (angularMajorVersion >= 17) {
-        const { STYLESHEET_PROCESSOR } = await Promise.resolve().then(() => require('../../utilities/ng-packagr/stylesheet-processor.di'));
+        const { STYLESHEET_PROCESSOR } = await import('../../utilities/ng-packagr/stylesheet-processor.di.js');
         const packagr = (0, ng_packagr_1.ngPackagr)();
         packagr.withProviders([STYLESHEET_PROCESSOR]);
         return packagr;
     }
-    const { NX_ENTRY_POINT_PROVIDERS } = await Promise.resolve().then(() => require('./ng-package/entry-point/entry-point.di'));
-    const { nxProvideOptions } = await Promise.resolve().then(() => require('./ng-package/options.di'));
-    const { NX_PACKAGE_PROVIDERS, NX_PACKAGE_TRANSFORM } = await Promise.resolve().then(() => require('./ng-package/package.di'));
+    const { NX_ENTRY_POINT_PROVIDERS } = await import('./ng-package/entry-point/entry-point.di.js');
+    const { nxProvideOptions } = await import('./ng-package/options.di.js');
+    const { NX_PACKAGE_PROVIDERS, NX_PACKAGE_TRANSFORM } = await import('./ng-package/package.di.js');
     const packagr = new ng_packagr_1.NgPackagr([
         ...NX_PACKAGE_PROVIDERS,
         ...NX_ENTRY_POINT_PROVIDERS,

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

@@ -6,9 +6,8 @@
  * - Support ngcc for Angular < 16.
  * - Support Angular Compiler `incrementalDriver` for Angular < 16.
  */
-import type { CompilerOptions, ParsedConfiguration } from '@angular/compiler-cli';
 import { BuildGraph } from 'ng-packagr/lib/graph/build-graph';
 import * as ts from 'typescript';
 import { NgPackagrOptions } from '../ng-package/options.di';
 import { StylesheetProcessor } from '../styles/stylesheet-processor';
-export declare function compileSourceFiles(graph: BuildGraph, tsConfig: ParsedConfiguration, moduleResolutionCache: ts.ModuleResolutionCache, options: NgPackagrOptions, extraOptions?: Partial<CompilerOptions>, stylesheetProcessor?: StylesheetProcessor, ngccProcessor?: any): Promise<void>;
+export declare function compileSourceFiles(graph: BuildGraph, tsConfig: any, moduleResolutionCache: ts.ModuleResolutionCache, options: NgPackagrOptions, extraOptions?: Partial<ts.CompilerOptions>, stylesheetProcessor?: StylesheetProcessor, ngccProcessor?: any): Promise<void>;

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

@@ -9,15 +9,16 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileSourceFiles = void 0;
+const tslib_1 = require("tslib");
 const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
-const log = require("ng-packagr/lib/utils/log");
+const log = tslib_1.__importStar(require("ng-packagr/lib/utils/log"));
 const cache_compiler_host_1 = require("ng-packagr/lib/ts/cache-compiler-host");
 const node_path_1 = require("node:path");
-const ts = require("typescript");
+const ts = tslib_1.__importStar(require("typescript"));
 const angular_version_utils_1 = require("../../../utilities/angular-version-utils");
-const ng_compiler_cli_1 = require("../../../utilities/ng-compiler-cli");
+const module_loader_1 = require("../../../utilities/module-loader");
 async function compileSourceFiles(graph, tsConfig, moduleResolutionCache, options, extraOptions, stylesheetProcessor, ngccProcessor) {
-    const { NgtscProgram, formatDiagnostics } = await (0, ng_compiler_cli_1.ngCompilerCli)();
+    const { NgtscProgram, formatDiagnostics } = await (0, module_loader_1.loadEsmModule)('@angular/compiler-cli');
     const { cacheDirectory, watch, cacheEnabled } = options;
     const tsConfigOptions = {
         ...tsConfig.options,

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

@@ -8,14 +8,14 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StylesheetProcessor = exports.CssUrl = void 0;
-const browserslist = require("browserslist");
+const tslib_1 = require("tslib");
+const browserslist_1 = tslib_1.__importDefault(require("browserslist"));
 const fs_1 = require("fs");
-const esbuild_executor_1 = require("ng-packagr/lib/esbuild/esbuild-executor");
 const cache_1 = require("ng-packagr/lib/utils/cache");
-const log = require("ng-packagr/lib/utils/log");
+const log = tslib_1.__importStar(require("ng-packagr/lib/utils/log"));
 const path_1 = require("path");
-const autoprefixer = require("autoprefixer");
-const postcssUrl = require("postcss-url");
+const autoprefixer_1 = tslib_1.__importDefault(require("autoprefixer"));
+const postcssUrl = tslib_1.__importStar(require("postcss-url"));
 const node_url_1 = require("node:url");
 const tailwindcss_1 = require("../../../utilities/ng-packagr/tailwindcss");
 const postcss = require('postcss');
@@ -32,12 +32,12 @@ class StylesheetProcessor {
         this.includePaths = includePaths;
         this.cacheDirectory = cacheDirectory;
         this.tailwindConfig = tailwindConfig;
-        this.esbuild = new esbuild_executor_1.EsbuildExecutor();
+        this.esbuild = new (require('ng-packagr/lib/esbuild/esbuild-executor').EsbuildExecutor)();
         // By default, browserslist defaults are too inclusive
         // https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
         // We change the default query to browsers that Angular support.
         // https://angular.io/guide/browser-support
-        browserslist.defaults = [
+        browserslist_1.default.defaults = [
             'last 2 Chrome versions',
             'last 1 Firefox version',
             'last 2 Edge major versions',
@@ -56,7 +56,7 @@ class StylesheetProcessor {
             prevDir = currentDir;
             currentDir = (0, path_1.dirname)(prevDir);
         }
-        this.browserslistData = browserslist(undefined, { path: this.basePath });
+        this.browserslistData = (0, browserslist_1.default)(undefined, { path: this.basePath });
         this.targets = transformSupportedBrowsersToTargets(this.browserslistData);
         const tailwindSetup = (0, tailwindcss_1.getTailwindSetup)(this.projectBasePath, this.tailwindConfig);
         if (tailwindSetup) {
@@ -130,7 +130,7 @@ class StylesheetProcessor {
         if (this.cssUrl !== CssUrl.none) {
             postCssPlugins.push(postcssUrl({ url: this.cssUrl }));
         }
-        postCssPlugins.push(autoprefixer({
+        postCssPlugins.push((0, autoprefixer_1.default)({
             ignoreUnknownVersions: true,
             overrideBrowserslist: this.browserslistData,
         }));
@@ -141,14 +141,14 @@ class StylesheetProcessor {
         switch (ext) {
             case '.sass':
             case '.scss': {
-                return (await Promise.resolve().then(() => require('sass'))).compileString(css, {
+                return (await import('sass')).compileString(css, {
                     url: (0, node_url_1.pathToFileURL)(filePath),
                     syntax: '.sass' === ext ? 'indented' : 'scss',
                     loadPaths: this.styleIncludePaths,
                 }).css;
             }
             case '.less': {
-                const { css: content } = await (await Promise.resolve().then(() => require('less'))).render(css, {
+                const { css: content } = await (await import('less')).render(css, {
                     filename: filePath,
                     javascriptEnabled: true,
                     paths: this.styleIncludePaths,

package/src/executors/utilities/esbuild-extensions.d.ts

@@ -1,10 +1,8 @@
-import type { IndexHtmlTransform } from '@angular-devkit/build-angular/src/utils/index-file/index-html-generator';
 import type { Plugin } from 'esbuild';
-import type { Connect } from 'vite';
 export type PluginSpec = {
     path: string;
     options: any;
 };
 export declare function loadPlugins(plugins: string[] | PluginSpec[] | undefined, tsConfig: string): Promise<Plugin[]>;
-export declare function loadMiddleware(middlewareFns: string[] | undefined, tsConfig: string): Promise<Connect.NextHandleFunction[]>;
-export declare function loadIndexHtmlTransformer(indexHtmlTransformerPath: string, tsConfig: string): Promise<IndexHtmlTransform>;
+export declare function loadMiddleware(middlewareFns: string[] | undefined, tsConfig: string): Promise<any[]>;
+export declare function loadIndexHtmlTransformer(indexHtmlTransformerPath: string, tsConfig: string): Promise<any>;

package/src/executors/utilities/module-loader.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare function loadModule<T = any>(path: string): Promise<T>;
 /**
  * This uses a dynamic import to load a module which may be ESM.
@@ -12,4 +11,4 @@ export declare function loadModule<T = any>(path: string): Promise<T>;
  * @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>;
+export declare function loadEsmModule<T = any>(modulePath: string | URL): Promise<T>;

package/src/executors/utilities/ng-packagr/stylesheet-processor.js

@@ -8,7 +8,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AsyncStylesheetProcessor = exports.StylesheetProcessor = exports.CssUrl = void 0;
-const browserslist = require("browserslist");
+const tslib_1 = require("tslib");
+const browserslist_1 = tslib_1.__importDefault(require("browserslist"));
 const fs_1 = require("fs");
 const path_1 = require("path");
 const Piscina = require('piscina');
@@ -38,7 +39,7 @@ class StylesheetProcessor {
         // https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
         // We change the default query to browsers that Angular support.
         // https://angular.io/guide/browser-support
-        browserslist.defaults = [
+        browserslist_1.default.defaults = [
             'last 2 Chrome versions',
             'last 1 Firefox version',
             'last 2 Edge major versions',
@@ -70,12 +71,25 @@ class StylesheetProcessor {
             prevDir = currentDir;
             currentDir = (0, path_1.dirname)(prevDir);
         }
-        const browserslistData = browserslist(undefined, { path: this.basePath });
+        const browserslistData = (0, browserslist_1.default)(undefined, { path: this.basePath });
         const { version: ngPackagrVersion } = (0, angular_version_utils_1.getInstalledPackageVersionInfo)('ng-packagr');
+        let tailwindConfigPath;
         let postcssConfiguration;
-        if ((0, semver_1.gt)(ngPackagrVersion, '17.2.0')) {
+        if ((0, semver_1.gte)(ngPackagrVersion, '18.0.0')) {
+            const { findTailwindConfiguration, generateSearchDirectories, loadPostcssConfiguration, } = require('ng-packagr/lib/styles/postcss-configuration');
+            let searchDirs = generateSearchDirectories([this.projectBasePath]);
+            postcssConfiguration = loadPostcssConfiguration(searchDirs);
+            // (nx-specific): we support loading the TailwindCSS config from the root of the workspace
+            searchDirs = generateSearchDirectories([
+                this.projectBasePath,
+                devkit_1.workspaceRoot,
+            ]);
+            tailwindConfigPath = findTailwindConfiguration(searchDirs);
+        }
+        else if ((0, semver_1.gt)(ngPackagrVersion, '17.2.0')) {
             const { loadPostcssConfiguration, } = require('ng-packagr/lib/styles/postcss-configuration');
             postcssConfiguration = loadPostcssConfiguration(this.projectBasePath);
+            tailwindConfigPath = (0, tailwindcss_1.getTailwindConfigPath)(this.projectBasePath, devkit_1.workspaceRoot);
         }
         this.renderWorker = new Piscina({
             filename: require.resolve('ng-packagr/lib/styles/stylesheet-processor-worker'),
@@ -87,7 +101,7 @@ class StylesheetProcessor {
             },
             workerData: {
                 postcssConfiguration,
-                tailwindConfigPath: (0, tailwindcss_1.getTailwindConfigPath)(this.projectBasePath, devkit_1.workspaceRoot),
+                tailwindConfigPath,
                 projectBasePath: this.projectBasePath,
                 browserslistData,
                 targets: transformSupportedBrowsersToTargets(browserslistData),
@@ -116,7 +130,7 @@ class AsyncStylesheetProcessor {
         // https://github.com/browserslist/browserslist/blob/83764ea81ffaa39111c204b02c371afa44a4ff07/index.js#L516-L522
         // We change the default query to browsers that Angular support.
         // https://angular.io/guide/browser-support
-        browserslist.defaults = [
+        browserslist_1.default.defaults = [
             'last 2 Chrome versions',
             'last 1 Firefox version',
             'last 2 Edge major versions',
@@ -148,11 +162,11 @@ class AsyncStylesheetProcessor {
             prevDir = currentDir;
             currentDir = (0, path_1.dirname)(prevDir);
         }
-        const browserslistData = browserslist(undefined, { path: this.basePath });
+        const browserslistData = (0, browserslist_1.default)(undefined, { path: this.basePath });
         const { version: ngPackagrVersion } = (0, angular_version_utils_1.getInstalledPackageVersionInfo)('ng-packagr');
         let postcssConfiguration;
         if (ngPackagrVersion === '17.2.0') {
-            const { loadPostcssConfiguration } = await Promise.resolve().then(() => require('ng-packagr/lib/styles/postcss-configuration'));
+            const { loadPostcssConfiguration, } = require('ng-packagr/lib/styles/postcss-configuration');
             postcssConfiguration = await loadPostcssConfiguration(this.projectBasePath);
         }
         this.renderWorker = new Piscina({

package/src/executors/utilities/typescript.d.ts

@@ -6,8 +6,7 @@
  * - Added an extra function that updates the configFilePath in the returned parsed options
  * to be the original tsconfig file.
  */
-import type { ParsedConfiguration } from '@angular/compiler-cli';
 /**
  * Proxy function that ensures the configFilePath option points to the original file path.
  */
-export declare function parseRemappedTsConfigAndMergeDefaults(workspaceRoot: string, originalFilePath: string, remappedFilePath: string): Promise<ParsedConfiguration>;
+export declare function parseRemappedTsConfigAndMergeDefaults(workspaceRoot: string, originalFilePath: string, remappedFilePath: string): Promise<any>;

package/src/executors/utilities/typescript.js

@@ -9,9 +9,10 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRemappedTsConfigAndMergeDefaults = void 0;
+const tslib_1 = require("tslib");
 const path_1 = require("path");
-const ts = require("typescript");
-const ng_compiler_cli_1 = require("./ng-compiler-cli");
+const ts = tslib_1.__importStar(require("typescript"));
+const module_loader_1 = require("./module-loader");
 async function readDefaultTsConfig(fileName) {
     // these options are mandatory
     const extraOptions = {
@@ -29,7 +30,7 @@ async function readDefaultTsConfig(fileName) {
         flatModuleId: 'AUTOGENERATED',
         flatModuleOutFile: 'AUTOGENERATED',
     };
-    const { readConfiguration } = await (0, ng_compiler_cli_1.ngCompilerCli)();
+    const { readConfiguration } = await (0, module_loader_1.loadEsmModule)('@angular/compiler-cli');
     return readConfiguration(fileName, extraOptions);
 }
 /**

package/src/generators/add-linting/lib/create-eslint-configuration.d.ts

@@ -29,7 +29,7 @@ export declare const extendAngularEslintJson: (json: Linter.Config, options: Esl
             [name: string]: boolean;
         };
         globals?: {
-            [name: string]: boolean | "readable" | "off" | "readonly" | "writable" | "writeable";
+            [name: string]: boolean | "off" | "readonly" | "readable" | "writable" | "writeable";
         };
         noInlineConfig?: boolean;
         overrides?: Linter.ConfigOverride<Linter.RulesRecord>[];
@@ -61,7 +61,7 @@ export declare const extendAngularEslintJson: (json: Linter.Config, options: Esl
     };
     extends?: string | string[];
     globals?: {
-        [name: string]: boolean | "readable" | "off" | "readonly" | "writable" | "writeable";
+        [name: string]: boolean | "off" | "readonly" | "readable" | "writable" | "writeable";
     };
     noInlineConfig?: boolean;
     parser?: string;

package/src/generators/add-linting/schema.json

@@ -8,7 +8,7 @@
   "examples": [
     {
       "command": "nx g @nx/angular:add-linting --prefix=cool --projectName=cool-lib --projectRoot=libs/cool-lib",
-      "description": "Adds ESLint with Angular-specific rules for an existing project named `cool-lib` with the [prefix](https://angular.io/guide/styleguide#style-02-07) `cool`"
+      "description": "Adds ESLint with Angular-specific rules for an existing project named `cool-lib` with the [prefix](https://angular.dev/style-guide#style-02-07) `cool`"
     }
   ],
   "properties": {

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

@@ -2,5 +2,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { AppModule } from './app/app.module';
 
 platformBrowserDynamic()
-  .bootstrapModule(AppModule)
+  .bootstrapModule(AppModule<% if (useEventCoalescing) { %>, {
+    ngZoneEventCoalescing: true
+  }<% } %>)
   .catch((err) => console.error(err));

package/src/generators/application/files/standalone-components/src/app/app.config.ts__tpl__

@@ -1,7 +1,7 @@
-import { ApplicationConfig } from <% if (angularMajorVersion >= 16) { %>'@angular/core';<% } else { %>'@angular/platform-browser';<% } %><% if (routing) { %>
+import { ApplicationConfig<% if (useEventCoalescing) { %>, provideZoneChangeDetection<% } %> } from '@angular/core';<% if (routing) { %>
 import { provideRouter } from '@angular/router';
 import { appRoutes } from './app.routes';<% } %>
 
 export const appConfig: ApplicationConfig = {
-  providers: [<% if (routing) { %>provideRouter(appRoutes) <% } %>]
+  providers: [<% if (useEventCoalescing) { %>provideZoneChangeDetection({ eventCoalescing: true }), <% } %><% if (routing) { %>provideRouter(appRoutes) <% } %>]
 };

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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addLinting = void 0;
+const tslib_1 = require("tslib");
 const eslint_1 = require("@nx/eslint");
-const add_linting_1 = require("../../add-linting/add-linting");
+const add_linting_1 = tslib_1.__importDefault(require("../../add-linting/add-linting"));
 async function addLinting(host, options) {
     if (options.linter === eslint_1.Linter.None) {
         return;

package/src/generators/application/lib/create-files.js

@@ -29,9 +29,16 @@ async function createFiles(tree, options, rootOffset) {
         angularMajorVersion,
         rootOffset,
         isUsingApplicationBuilder,
+        useEventCoalescing: angularMajorVersion >= 18,
         tpl: '',
     };
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/base'), options.appProjectRoot, substitutions);
+    if (angularMajorVersion >= 18) {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/base-18+'), options.appProjectRoot, substitutions);
+    }
+    else {
+        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/base-pre18'), options.appProjectRoot, substitutions);
+    }
     if (options.standalone) {
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '../files/standalone-components'), options.appProjectRoot, substitutions);
     }

package/src/generators/application/lib/create-project.js

@@ -56,12 +56,19 @@ function createProject(tree, options) {
                     index: `${options.appProjectSourceRoot}/index.html`,
                     [buildMainOptionName]: `${options.appProjectSourceRoot}/main.ts`,
                     polyfills: ['zone.js'],
-                    tsConfig: `${options.appProjectRoot}/tsconfig.app.json`,
+                    tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
                     inlineStyleLanguage,
-                    assets: [
-                        `${options.appProjectSourceRoot}/favicon.ico`,
-                        `${options.appProjectSourceRoot}/assets`,
-                    ],
+                    assets: angularMajorVersion >= 18
+                        ? [
+                            {
+                                glob: '**/*',
+                                input: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'public'),
+                            },
+                        ]
+                        : [
+                            `${options.appProjectSourceRoot}/favicon.ico`,
+                            `${options.appProjectSourceRoot}/assets`,
+                        ],
                     styles: [`${options.appProjectSourceRoot}/styles.${options.style}`],
                     scripts: [],
                 },

package/src/generators/component-test/component-test.js

@@ -6,7 +6,7 @@ const versions_1 = require("../../utils/versions");
 const storybook_inputs_1 = require("../utils/storybook-ast/storybook-inputs");
 async function componentTestGenerator(tree, options) {
     (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
-    const { assertMinimumCypressVersion } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/cypress-version'));
+    const { assertMinimumCypressVersion } = require('@nx/cypress/src/utils/cypress-version');
     assertMinimumCypressVersion(10);
     const { root } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const componentDirPath = (0, devkit_1.joinPathFragments)(root, options.componentDir);

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -41,7 +41,7 @@ async function cypressComponentConfigurationInternal(tree, options) {
 exports.cypressComponentConfigurationInternal = cypressComponentConfigurationInternal;
 async function addFiles(tree, projectConfig, options) {
     const componentFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
-    const { addMountDefinition } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
+    const { addMountDefinition } = require('@nx/cypress/src/utils/config');
     const updatedCmpContents = await addMountDefinition(tree.read(componentFile, 'utf-8'));
     tree.write(componentFile, `import { mount } from 'cypress/angular';\n${updatedCmpContents}`);
     if (options.generateTests) {
@@ -69,7 +69,7 @@ async function addFiles(tree, projectConfig, options) {
 async function configureCypressCT(tree, options) {
     let found = { target: options.buildTarget, config: undefined };
     if (!options.buildTarget) {
-        const { findBuildConfig } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/find-target-options'));
+        const { findBuildConfig } = require('@nx/cypress/src/utils/find-target-options');
         found = await findBuildConfig(tree, {
             project: options.project,
             buildTarget: options.buildTarget,
@@ -95,7 +95,7 @@ async function configureCypressCT(tree, options) {
     else {
         ctConfigOptions.buildTarget = found.target;
     }
-    const { addDefaultCTConfig, getProjectCypressConfigPath } = await Promise.resolve().then(() => require('@nx/cypress/src/utils/config'));
+    const { addDefaultCTConfig, getProjectCypressConfigPath } = require('@nx/cypress/src/utils/config');
     const cypressConfigPath = getProjectCypressConfigPath(tree, projectConfig.root);
     const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions);
     tree.write(cypressConfigPath, `import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';\n${updatedCyConfig}`);