@nx/angular 17.0.4 → 17.0.6

package/src/builders/{dev-server → webpack-dev-server}/schema.json

@@ -3,25 +3,19 @@
   "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Schema for Webpack Dev Server",
-  "description": "Serves an Angular application using [Webpack](https://webpack.js.org/) when the build target is using a Webpack-based executor, or [Vite](https://vitejs.dev/) when the build target uses an esbuild-based executor.",
-  "examplesFile": "../../../docs/dev-server-examples.md",
+  "description": "The webpack-dev-server executor is very similar to the standard dev server builder provided by the Angular Devkit. It is usually used in tandem with `@nx/angular:webpack-browser` when your Angular application uses a custom webpack configuration.",
+  "examplesFile": "../../../docs/webpack-dev-server-examples.md",
   "type": "object",
   "presets": [
     {
       "name": "Using a Different Port",
-      "keys": ["buildTarget", "port"]
+      "keys": ["browserTarget", "port"]
     }
   ],
   "properties": {
     "browserTarget": {
       "type": "string",
-      "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 v19."
-    },
-    "buildTarget": {
-      "type": "string",
-      "description": "A build builder target to serve in the format of `project:target[:configuration]`.",
+      "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`.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
     },
     "port": {
@@ -111,43 +105,12 @@
       "type": "number",
       "description": "Enable and define the file watching poll time period in milliseconds."
     },
-    "forceEsbuild": {
-      "type": "boolean",
-      "description": "Force the development server to use the 'browser-esbuild' builder when building. This is a developer preview option for the esbuild-based build system. _Note: this is only supported in Angular versions >= 16.1.0_.",
-      "default": false
-    },
-    "prebundle": {
-      "description": "Enable and control the Vite-based development server's prebundling capabilities. To enable prebundling, the Angular CLI cache must also be enabled. This option has no effect when using the 'browser' or other Webpack-based builders. _Note: this is only supported in Angular versions >= 17.2.0_.",
-      "oneOf": [
-        { "type": "boolean" },
-        {
-          "type": "object",
-          "properties": {
-            "exclude": {
-              "description": "List of package imports that should not be prebundled by the development server. The packages will be bundled into the application code itself.",
-              "type": "array",
-              "items": { "type": "string" }
-            }
-          },
-          "additionalProperties": false,
-          "required": ["exclude"]
-        }
-      ]
-    },
     "buildLibsFromSource": {
       "type": "boolean",
       "description": "Read buildable libraries from source instead of building them separately. If not set, it will take the value specified in the `browserTarget` options, or it will default to `true` if it's also not set in the `browserTarget` options.",
       "x-priority": "important"
-    },
-    "esbuildMiddleware": {
-      "description": "A list of HTTP request middleware functions. _Note: this is only supported in Angular versions >= 17.0.0_.",
-      "type": "array",
-      "items": {
-        "type": "string",
-        "description": "The path to the middleware function. Relative to the workspace root."
-      }
     }
   },
   "additionalProperties": false,
-  "anyOf": [{ "required": ["buildTarget"] }, { "required": ["browserTarget"] }]
+  "required": ["browserTarget"]
 }

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

@@ -0,0 +1,4 @@
+import type { Schema } from './schema';
+export declare function executeWebpackDevServerBuilder(rawOptions: Schema, context: import('@angular-devkit/architect').BuilderContext): import("rxjs").Observable<import("@angular-devkit/build-angular").DevServerBuilderOutput>;
+declare const _default: any;
+export default _default;

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

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeWebpackDevServerBuilder = void 0;
+const devkit_1 = require("@nx/devkit");
+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 rxjs_1 = require("rxjs");
+const operators_2 = require("rxjs/operators");
+const js_1 = require("@nx/js");
+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, {
+        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 buildTargetOptions = {
+        ...buildTarget.options,
+        ...(parsedBrowserTarget.configuration
+            ? buildTarget.configurations[parsedBrowserTarget.configuration]
+            : buildTarget.defaultConfiguration
+                ? buildTarget.configurations[buildTarget.defaultConfiguration]
+                : {}),
+    };
+    const buildLibsFromSource = options.buildLibsFromSource ??
+        buildTargetOptions.buildLibsFromSource ??
+        true;
+    let pathToWebpackConfig;
+    if (buildTargetOptions.customWebpackConfig?.path) {
+        pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetOptions.customWebpackConfig.path);
+        if (pathToWebpackConfig && !(0, fs_1.existsSync)(pathToWebpackConfig)) {
+            throw new Error(`Custom Webpack Config File Not Found!\nTo use a custom webpack config, please ensure the path to the custom webpack file is correct: \n${pathToWebpackConfig}`);
+        }
+    }
+    let pathToIndexFileTransformer;
+    if (buildTargetOptions.indexFileTransformer) {
+        pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetOptions.indexFileTransformer);
+        if (pathToIndexFileTransformer && !(0, fs_1.existsSync)(pathToIndexFileTransformer)) {
+            throw new Error(`File containing Index File Transformer function Not Found!\n Please ensure the path to the file containing the function is correct: \n${pathToIndexFileTransformer}`);
+        }
+    }
+    let dependencies;
+    if (!buildLibsFromSource) {
+        const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetOptions.tsConfig, context, {
+            target: parsedBrowserTarget.target,
+        });
+        dependencies = foundDependencies;
+        // We can't just pass the tsconfig path in memory to the angular builder
+        // function because we can't pass the build target options to it, the build
+        // targets options will be retrieved by the builder from the project
+        // configuration. Therefore, we patch the method in the context to retrieve
+        // the target options to overwrite the tsconfig path to use the generated
+        // one with the updated path mappings.
+        const originalGetTargetOptions = context.getTargetOptions;
+        context.getTargetOptions = async (target) => {
+            const options = await originalGetTargetOptions(target);
+            options.tsConfig = tsConfigPath;
+            return options;
+        };
+        // The buildTargetConfiguration also needs to use the generated tsconfig path
+        // otherwise the build will fail if customWebpack function/file is referencing
+        // local libs. This synchronize the behavior with webpack-browser and
+        // 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, {
+        webpackConfiguration: async (baseWebpackConfig) => {
+            if (!buildLibsFromSource) {
+                const workspaceDependencies = dependencies
+                    .filter((dep) => !(0, operators_1.isNpmProject)(dep.node))
+                    .map((dep) => dep.node.name);
+                // default for `nx run-many` is --all projects
+                // by passing an empty string for --projects, run-many will default to
+                // run the target for all projects.
+                // This will occur when workspaceDependencies = []
+                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(',')}`));
+                }
+            }
+            if (!pathToWebpackConfig) {
+                return baseWebpackConfig;
+            }
+            return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, buildTargetOptions, context.target);
+        },
+        ...(pathToIndexFileTransformer
+            ? {
+                indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, buildTargetOptions.tsConfig, context.target),
+            }
+            : {}),
+    })));
+}
+exports.executeWebpackDevServerBuilder = executeWebpackDevServerBuilder;
+exports.default = require('@angular-devkit/architect').createBuilder(executeWebpackDevServerBuilder);

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

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

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

@@ -3,7 +3,7 @@
   "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Schema for Webpack Server",
-  "description": "The webpack-server executor is very similar to the standard server builder provided by the Angular Devkit. It is usually used in tandem with `@nx/angular:webpack-browser` when your Angular application uses a custom webpack configuration and NgUniversal for SSR.",
+  "description": "The webpack-dev-server executor is very similar to the standard server builder provided by the Angular Devkit. It is usually used in tandem with `@nx/angular:webpack-browser` when your Angular application uses a custom webpack configuration and NgUniversal for SSR.",
   "type": "object",
   "properties": {
     "assets": {
@@ -123,11 +123,12 @@
     },
     "deployUrl": {
       "type": "string",
-      "description": "Customize the base path for the URLs of resources in 'index.html' and component stylesheets. This option is only necessary for specific deployment scenarios, such as with Angular Elements or when utilizing different CDN locations."
+      "description": "URL where files will be deployed.",
+      "x-deprecated": "Use \"baseHref\" browser builder option, \"APP_BASE_HREF\" DI token or a combination of both instead. For more information, see https://angular.io/guide/deployment#the-deploy-url."
     },
     "vendorChunk": {
       "type": "boolean",
-      "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_",
+      "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_",
       "default": false
     },
     "verbose": {
@@ -208,6 +209,18 @@
       },
       "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'.",
@@ -289,11 +302,11 @@
           "properties": {
             "src": {
               "type": "string",
-              "pattern": "\\.(([cm]?[jt])sx?|json)$"
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             },
             "replaceWith": {
               "type": "string",
-              "pattern": "\\.(([cm]?[jt])sx?|json)$"
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             }
           },
           "additionalProperties": false,
@@ -304,11 +317,11 @@
           "properties": {
             "replace": {
               "type": "string",
-              "pattern": "\\.(([cm]?[jt])sx?|json)$"
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             },
             "with": {
               "type": "string",
-              "pattern": "\\.(([cm]?[jt])sx?|json)$"
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
             }
           },
           "additionalProperties": false,

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

@@ -8,6 +8,7 @@ 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;
@@ -25,6 +26,12 @@ 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

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeWebpackServerBuilder = void 0;
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
-const path_1 = require("path");
 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");
@@ -48,12 +49,16 @@ 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;
-    process.env.NX_BUILD_LIBS_FROM_SOURCE = `${options.buildLibsFromSource}`;
-    process.env.NX_BUILD_TARGET = (0, devkit_1.targetToTargetString)({ ...context.target });
     if (!options.buildLibsFromSource) {
         const { tsConfigPath } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(options.tsConfig, context);
-        options.tsConfig = (0, devkit_1.normalizePath)((0, path_1.relative)(context.workspaceRoot, tsConfigPath));
+        options.tsConfig = tsConfigPath;
     }
     return buildServerApp(options, context);
 }

package/src/executors/browser-esbuild/browser-esbuild.impl.d.ts

@@ -1,7 +1,8 @@
+import { type EsBuildSchema } from './schema';
 import { type ExecutorContext } from '@nx/devkit';
-import type { EsBuildSchema } from './schema';
+import { type OutputFile } from 'esbuild';
 export default function esbuildExecutor(options: EsBuildSchema, context: ExecutorContext): AsyncGenerator<import("@angular-devkit/core").JsonObject & import("@angular-devkit/architect/src/output-schema").Schema & {
-    outputFiles?: import("@angular-devkit/build-angular/src/tools/esbuild/bundler-context").BuildOutputFile[];
+    outputFiles?: OutputFile[];
     assetFiles?: {
         source: string;
         destination: string;

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

@@ -1,34 +1,27 @@
 "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");
-const angular_version_utils_1 = require("../utilities/angular-version-utils");
-const buildable_libs_1 = require("../utilities/buildable-libs");
-const esbuild_extensions_1 = require("../utilities/esbuild-extensions");
 async function* esbuildExecutor(options, context) {
-    if (options.plugins) {
-        const { major: angularMajorVersion, version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
-        if (angularMajorVersion < 17) {
-            throw new Error((0, devkit_1.stripIndents) `The "plugins" option is only supported in Angular >= 17.0.0. You are currently using "${angularVersion}".
-        You can resolve this error by removing the "plugins" option or by migrating to Angular 17.0.0.`);
-        }
-    }
+    (0, validate_options_1.validateOptions)(options);
     options.buildLibsFromSource ??= true;
-    const { buildLibsFromSource, plugins: pluginPaths, ...delegateExecutorOptions } = options;
+    const { buildLibsFromSource, ...delegateExecutorOptions } = options;
     let dependencies;
+    let projectGraph = context.projectGraph;
     if (!buildLibsFromSource) {
-        const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(delegateExecutorOptions.tsConfig, context);
+        projectGraph = projectGraph ?? (0, devkit_1.readCachedProjectGraph)();
+        const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(delegateExecutorOptions.tsConfig, context, { projectGraph });
         dependencies = foundDependencies;
         delegateExecutorOptions.tsConfig = tsConfigPath;
     }
-    const plugins = await (0, esbuild_extensions_1.loadPlugins)(pluginPaths, options.tsConfig);
     const { buildEsbuildBrowser } = await Promise.resolve().then(() => require('@angular-devkit/build-angular/src/builders/browser-esbuild/index'));
     const builderContext = await (0, ngcli_adapter_1.createBuilderContext)({
         builderName: 'browser-esbuild',
         description: 'Build a browser application',
         optionSchema: await Promise.resolve().then(() => require('@angular-devkit/build-angular/src/builders/browser-esbuild/schema.json')),
     }, context);
-    return yield* buildEsbuildBrowser(delegateExecutorOptions, builderContext, 
-    /* infrastructureSettings */ undefined, plugins);
+    return yield* buildEsbuildBrowser(delegateExecutorOptions, builderContext);
 }
 exports.default = esbuildExecutor;

package/src/executors/browser-esbuild/lib/buildable-libs.d.ts

@@ -0,0 +1,9 @@
+import { DependentBuildableProjectNode } from '@nx/js/src/utils/buildable-libs-utils';
+import { type ExecutorContext, type ProjectGraph } from '@nx/devkit';
+export declare function createTmpTsConfigForBuildableLibs(tsConfigPath: string, context: ExecutorContext, options?: {
+    projectGraph?: ProjectGraph;
+    target?: string;
+}): {
+    tsConfigPath: string;
+    dependencies: DependentBuildableProjectNode[];
+};

package/src/executors/{utilities → browser-esbuild/lib}/buildable-libs.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTmpTsConfigForBuildableLibs = void 0;
-const devkit_1 = require("@nx/devkit");
 const buildable_libs_utils_1 = require("@nx/js/src/utils/buildable-libs-utils");
 const path_1 = require("path");
-function createTmpTsConfigForBuildableLibs(tsConfigPath, context) {
+const devkit_1 = require("@nx/devkit");
+function createTmpTsConfigForBuildableLibs(tsConfigPath, context, options) {
     let dependencies;
-    const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(context.projectGraph ?? (0, devkit_1.readCachedProjectGraph)(), context.root, context.projectName, context.targetName, context.configurationName);
+    const result = (0, buildable_libs_utils_1.calculateProjectDependencies)(options?.projectGraph ?? (0, devkit_1.readCachedProjectGraph)(), context.root, context.projectName, options?.target ?? context.targetName, context.configurationName);
     dependencies = result.dependencies;
     const tmpTsConfigPath = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.root, tsConfigPath), context.root, result.target.data.root, dependencies);
     process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;
+    // Angular EsBuild Builder appends the workspaceRoot to the config path, so remove it.
     const tmpTsConfigPathWithoutWorkspaceRoot = tmpTsConfigPath.replace(context.root, '');
     return { tsConfigPath: tmpTsConfigPathWithoutWorkspaceRoot, dependencies };
 }

package/src/executors/browser-esbuild/lib/validate-options.d.ts

@@ -0,0 +1,2 @@
+import { type EsBuildSchema } from '../schema';
+export declare function validateOptions(options: EsBuildSchema): void;

package/src/executors/browser-esbuild/lib/validate-options.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOptions = void 0;
+const angular_version_utils_1 = require("../../utilities/angular-version-utils");
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+function validateOptions(options) {
+    const angularVersionInfo = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    validatePolyfills(options, angularVersionInfo);
+    validateStyles(options, angularVersionInfo);
+}
+exports.validateOptions = validateOptions;
+function validatePolyfills(options, { major, version }) {
+    if (major < 15 && Array.isArray(options.polyfills)) {
+        throw new Error((0, devkit_1.stripIndents) `The array syntax for the "polyfills" option is supported from Angular >= 15.0.0. You are currently using "${version}".
+      You can resolve this error by removing the "polyfills" option, setting it to a string value or migrating to Angular 15.0.0.`);
+    }
+}
+function validateStyles(options, { major, version }) {
+    if (!options.styles || !options.styles.length) {
+        return;
+    }
+    if (major < 15) {
+        return;
+    }
+    const stylusFiles = [];
+    options.styles.forEach((style) => {
+        const styleFile = typeof style === 'string' ? style : style.input;
+        if ((0, path_1.extname)(styleFile) === '.styl') {
+            stylusFiles.push(styleFile);
+        }
+    });
+    if (stylusFiles.length) {
+        throw new Error((0, devkit_1.stripIndents) `Stylus is not supported since Angular v15. You're currently using "${version}".
+      You have the "styles" option with the following file(s) using the ".styl" extension: ${stylusFiles
+            .map((x) => `"${x}"`)
+            .join(', ')}.
+      Make sure to convert them to a supported extension (".css", ".scss", ".sass", ".less").`);
+    }
+}

package/src/executors/browser-esbuild/schema.d.ts

@@ -1,7 +1,5 @@
-import type { Schema } from '@angular-devkit/build-angular/src/builders/browser-esbuild/schema';
-import type { PluginSpec } from '../utilities/esbuild-extensions';
+import { Schema } from '@angular-devkit/build-angular/src/builders/browser-esbuild/schema';
 
 export interface EsBuildSchema extends Schema {
   buildLibsFromSource?: boolean;
-  plugins?: string[] | PluginSpec[];
 }

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

@@ -2,7 +2,6 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Schema for Nx ESBuild Executor",
   "description": "Nx ESBuild Executor supporting Incremental Builds.",
-  "examplesFile": "../../../docs/browser-esbuild-examples.md",
   "outputCapture": "direct-nodejs",
   "type": "object",
   "properties": {
@@ -216,7 +215,7 @@
     },
     "outputPath": {
       "type": "string",
-      "description": "The full path for the new output directory, relative to the current workspace."
+      "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."
     },
     "resourcesOutputPath": {
       "type": "string",
@@ -265,12 +264,12 @@
     },
     "vendorChunk": {
       "type": "boolean",
-      "description": "Generate a separate bundle containing only vendor libraries. This option should only be used for development to reduce the incremental compilation time.",
+      "description": "Generate a seperate 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 separate bundle containing code used across multiple bundles.",
+      "description": "Generate a seperate bundle containing code used across multiple bundles.",
       "default": true
     },
     "baseHref": {
@@ -279,7 +278,8 @@
     },
     "deployUrl": {
       "type": "string",
-      "description": "Customize the base path for the URLs of resources in 'index.html' and component stylesheets. This option is only necessary for specific deployment scenarios, such as with Angular Elements or when utilizing different CDN locations."
+      "description": "URL where files will be deployed.",
+      "x-deprecated": "Use \"baseHref\" option, \"APP_BASE_HREF\" DI token or a combination of both instead. For more information, see https://angular.io/guide/deployment#the-deploy-url."
     },
     "verbose": {
       "type": "boolean",
@@ -401,7 +401,6 @@
         },
         {
           "const": false,
-          "type": "boolean",
           "description": "Does not generate an `index.html` file."
         }
       ]
@@ -430,7 +429,7 @@
       "enum": ["none", "anonymous", "use-credentials"]
     },
     "allowedCommonJsDependencies": {
-      "description": "A list of CommonJS or AMD packages that are allowed to be used without a build time warning. Use `'*'` to allow all.",
+      "description": "A list of CommonJS packages that are allowed to be used without a build time warning.",
       "type": "array",
       "items": {
         "type": "string"
@@ -441,35 +440,6 @@
       "type": "boolean",
       "description": "Read buildable libraries from source instead of building them separately.",
       "default": true
-    },
-    "plugins": {
-      "description": "A list of ESBuild plugins. _Note: this is only supported in Angular versions >= 17.0.0_.",
-      "type": "array",
-      "items": {
-        "oneOf": [
-          {
-            "type": "object",
-            "properties": {
-              "path": {
-                "type": "string",
-                "description": "The path to the plugin. Relative to the workspace root."
-              },
-              "options": {
-                "type": "object",
-                "description": "The options to provide to the plugin.",
-                "properties": {},
-                "additionalProperties": true
-              }
-            },
-            "additionalProperties": false,
-            "required": ["path"]
-          },
-          {
-            "type": "string",
-            "description": "The path to the plugin. Relative to the workspace root."
-          }
-        ]
-      }
     }
   },
   "additionalProperties": false,
@@ -518,11 +488,11 @@
       "properties": {
         "replace": {
           "type": "string",
-          "pattern": "\\.(([cm]?[jt])sx?|json)$"
+          "pattern": "\\.(([cm]?j|t)sx?|json)$"
         },
         "with": {
           "type": "string",
-          "pattern": "\\.(([cm]?[jt])sx?|json)$"
+          "pattern": "\\.(([cm]?j|t)sx?|json)$"
         }
       },
       "additionalProperties": false,

package/src/executors/ng-packagr-lite/ng-packagr-adjustments/{pre-v17/ng-package → ng-package}/entry-point/compile-ngc.transform.js

@@ -14,15 +14,13 @@ const nodes_1 = require("ng-packagr/lib/ng-package/nodes");
 const tsconfig_1 = require("ng-packagr/lib/ts/tsconfig");
 const path = require("path");
 const ts = require("typescript");
-const angular_version_utils_1 = require("../../../../../utilities/angular-version-utils");
+const angular_version_utils_1 = require("../../../../utilities/angular-version-utils");
 const compile_source_files_1 = require("../../ngc/compile-source-files");
 const nxCompileNgcTransformFactory = (StylesheetProcessor, options) => {
     return (0, transform_1.transformFromPromise)(async (graph) => {
-        const entryPoints = graph.filter(nodes_1.isEntryPoint);
-        const entryPoint = graph.find((0, nodes_1.isEntryPointInProgress)());
-        const ngPackageNode = graph.find(nodes_1.isPackage);
-        const projectBasePath = ngPackageNode.data.primary.basePath;
         try {
+            const entryPoint = graph.find((0, nodes_1.isEntryPointInProgress)());
+            const entryPoints = graph.filter(nodes_1.isEntryPoint);
             // Add paths mappings for dependencies
             const tsConfig = (0, tsconfig_1.setDependenciesTsConfigPaths)(entryPoint.data.tsConfig, entryPoints);
             const angularVersion = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
@@ -33,7 +31,7 @@ const nxCompileNgcTransformFactory = (StylesheetProcessor, options) => {
                 : entryPoint.data.destinationFiles.esm2022;
             const { basePath, cssUrl, styleIncludePaths } = entryPoint.data.entryPoint;
             const { moduleResolutionCache } = entryPoint.cache;
-            entryPoint.cache.stylesheetProcessor ??= new StylesheetProcessor(projectBasePath, basePath, cssUrl, styleIncludePaths, options.cacheEnabled && options.cacheDirectory, options.tailwindConfig);
+            entryPoint.cache.stylesheetProcessor ??= new StylesheetProcessor(basePath, cssUrl, styleIncludePaths, options.cacheEnabled && options.cacheDirectory, options.watch, options.tailwindConfig);
             await (0, compile_source_files_1.compileSourceFiles)(graph, tsConfig, moduleResolutionCache, options, {
                 outDir: path.dirname(esmModulePath),
                 declarationDir: path.dirname(declarations),