@nx/angular 17.0.2 → 17.0.4

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

@@ -0,0 +1,160 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeDevServerBuilder = 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 fs_1 = require("fs");
+const operators_1 = require("nx/src/project-graph/operators");
+const project_graph_1 = require("nx/src/project-graph/project-graph");
+const path_1 = require("path");
+const rxjs_1 = require("rxjs");
+const operators_2 = require("rxjs/operators");
+const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
+const esbuild_extensions_1 = require("../../executors/utilities/esbuild-extensions");
+const patch_builder_context_1 = require("../../executors/utilities/patch-builder-context");
+const buildable_libs_1 = require("../utilities/buildable-libs");
+const webpack_1 = require("../utilities/webpack");
+const lib_1 = require("./lib");
+function executeDevServerBuilder(rawOptions, context) {
+    (0, lib_1.validateOptions)(rawOptions);
+    process.env.NX_TSCONFIG_PATH = (0, js_1.getRootTsConfigPath)();
+    const options = (0, lib_1.normalizeOptions)(rawOptions);
+    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)(parsedBuildTarget.project);
+    const buildTarget = browserTargetProjectConfiguration.targets[parsedBuildTarget.target];
+    const buildTargetOptions = {
+        ...buildTarget.options,
+        ...(parsedBuildTarget.configuration
+            ? buildTarget.configurations[parsedBuildTarget.configuration]
+            : buildTarget.defaultConfiguration
+                ? buildTarget.configurations[buildTarget.defaultConfiguration]
+                : {}),
+    };
+    const buildLibsFromSource = options.buildLibsFromSource ??
+        buildTargetOptions.buildLibsFromSource ??
+        true;
+    process.env.NX_BUILD_LIBS_FROM_SOURCE = `${buildLibsFromSource}`;
+    process.env.NX_BUILD_TARGET = options.buildTarget;
+    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}`);
+        }
+    }
+    const normalizedIndexHtmlTransformer = buildTargetOptions.indexHtmlTransformer ??
+        buildTargetOptions.indexFileTransformer;
+    let pathToIndexFileTransformer;
+    if (normalizedIndexHtmlTransformer) {
+        pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, normalizedIndexHtmlTransformer);
+        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: parsedBuildTarget.target,
+        });
+        dependencies = foundDependencies;
+        const relativeTsConfigPath = (0, devkit_1.normalizePath)((0, path_1.relative)(context.workspaceRoot, tsConfigPath));
+        // 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 = relativeTsConfigPath;
+            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 = relativeTsConfigPath;
+    }
+    const delegateBuilderOptions = getDelegateBuilderOptions(options);
+    const isUsingWebpackBuilder = ![
+        '@angular-devkit/build-angular:application',
+        '@angular-devkit/build-angular:browser-esbuild',
+        '@nx/angular:application',
+        '@nx/angular:browser-esbuild',
+    ].includes(buildTarget.executor);
+    /**
+     * The Angular CLI dev-server builder make some decisions based on the build
+     * target builder but it only considers `@angular-devkit/build-angular:*`
+     * builders. Since we are using a custom builder, we patch the context to
+     * handle `@nx/angular:*` executors.
+     */
+    (0, patch_builder_context_1.patchBuilderContext)(context, !isUsingWebpackBuilder, parsedBuildTarget);
+    return (0, rxjs_1.combineLatest)([
+        (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))),
+        (0, rxjs_1.from)((0, esbuild_extensions_1.loadPlugins)(buildTargetOptions.plugins, buildTargetOptions.tsConfig)),
+        (0, rxjs_1.from)((0, esbuild_extensions_1.loadMiddleware)(options.esbuildMiddleware, buildTargetOptions.tsConfig)),
+        (0, rxjs_1.from)(loadIndexHtmlFileTransformer(pathToIndexFileTransformer, buildTargetOptions.tsConfig, context, isUsingWebpackBuilder)),
+    ]).pipe((0, operators_2.switchMap)(([{ executeDevServerBuilder }, plugins, middleware, indexHtmlTransformer,]) => executeDevServerBuilder(delegateBuilderOptions, context, {
+        webpackConfiguration: isUsingWebpackBuilder
+            ? 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=${parsedBuildTarget.target} --projects=${workspaceDependencies.join(',')}`));
+                    }
+                }
+                if (!pathToWebpackConfig) {
+                    return baseWebpackConfig;
+                }
+                return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, buildTargetOptions, context.target);
+            }
+            : undefined,
+        ...(indexHtmlTransformer
+            ? {
+                indexHtml: indexHtmlTransformer,
+            }
+            : {}),
+    }, {
+        buildPlugins: plugins,
+        middleware,
+    })));
+}
+exports.executeDevServerBuilder = executeDevServerBuilder;
+exports.default = require('@angular-devkit/architect').createBuilder(executeDevServerBuilder);
+function getDelegateBuilderOptions(options) {
+    const delegateBuilderOptions = {
+        ...options,
+    };
+    const { major: angularMajorVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    if (angularMajorVersion <= 17) {
+        delegateBuilderOptions.browserTarget = delegateBuilderOptions.buildTarget;
+        delete delegateBuilderOptions.buildTarget;
+    }
+    // delete extra option not supported by the delegate builder
+    delete delegateBuilderOptions.buildLibsFromSource;
+    return delegateBuilderOptions;
+}
+async function loadIndexHtmlFileTransformer(pathToIndexFileTransformer, tsConfig, context, isUsingWebpackBuilder) {
+    if (!pathToIndexFileTransformer) {
+        return undefined;
+    }
+    return isUsingWebpackBuilder
+        ? (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, tsConfig, context.target)
+        : await (0, esbuild_extensions_1.loadIndexHtmlTransformer)(pathToIndexFileTransformer, tsConfig);
+}

package/src/builders/{webpack-dev-server → dev-server}/lib/index.d.ts

@@ -1 +1,2 @@
 export * from './normalize-options';
+export * from './validate-options';

package/src/builders/{webpack-dev-server → dev-server}/lib/index.js

@@ -2,3 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./normalize-options"), exports);
+tslib_1.__exportStar(require("./validate-options"), exports);

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

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

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

@@ -0,0 +1,20 @@
+"use strict";
+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 {
+        ...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/dev-server/lib/validate-options.d.ts

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

package/src/builders/dev-server/lib/validate-options.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOptions = void 0;
+const devkit_1 = require("@nx/devkit");
+const semver_1 = require("semver");
+const angular_version_utils_1 = require("../../../executors/utilities/angular-version-utils");
+function validateOptions(options) {
+    const { major: angularMajorVersion, version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    if ((0, semver_1.lt)(angularVersion, '16.1.0') && options.forceEsbuild) {
+        throw new Error((0, devkit_1.stripIndents) `The "forceEsbuild" option is only supported in Angular >= 16.1.0. You are currently using "${angularVersion}".
+      You can resolve this error by removing the "forceEsbuild" option or by migrating to Angular 16.1.0.`);
+    }
+    if (angularMajorVersion < 17 && options.esbuildMiddleware?.length > 0) {
+        throw new Error((0, devkit_1.stripIndents) `The "esbuildMiddleware" option is only supported in Angular >= 17.0.0. You are currently using "${angularVersion}".
+      You can resolve this error by removing the "esbuildMiddleware" option or by migrating to Angular 17.0.0.`);
+    }
+    if ((0, semver_1.lt)(angularVersion, '17.2.0') && options.prebundle) {
+        throw new Error((0, devkit_1.stripIndents) `The "prebundle" option is only supported in Angular >= 17.2.0. You are currently using "${angularVersion}".
+      You can resolve this error by removing the "prebundle" option or by migrating to Angular 17.2.0.`);
+    }
+}
+exports.validateOptions = validateOptions;

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

@@ -0,0 +1,39 @@
+interface BaseSchema {
+  port?: number;
+  host?: string;
+  proxyConfig?: string;
+  ssl?: boolean;
+  sslKey?: string;
+  sslCert?: string;
+  headers?: Record<string, string>;
+  open?: boolean;
+  verbose?: boolean;
+  liveReload?: boolean;
+  publicHost?: string;
+  allowedHosts?: string[];
+  servePath?: string;
+  disableHostCheck?: boolean;
+  hmr?: boolean;
+  watch?: boolean;
+  poll?: number;
+  forceEsbuild?: boolean;
+  prebundle?: boolean | { exclude: string[] };
+  buildLibsFromSource?: boolean;
+  esbuildMiddleware?: string[];
+}
+
+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 → dev-server}/schema.json

@@ -3,19 +3,25 @@
   "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Schema for Webpack Dev Server",
-  "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",
+  "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",
   "type": "object",
   "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 v19."
+    },
+    "buildTarget": {
+      "type": "string",
+      "description": "A build builder target to serve in the format of `project:target[:configuration]`.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
     },
     "port": {
@@ -105,12 +111,43 @@
       "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,
-  "required": ["browserTarget"]
+  "anyOf": [{ "required": ["buildTarget"] }, { "required": ["browserTarget"] }]
 }

package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.d.ts

@@ -1,4 +1,4 @@
 import type { Schema } from './schema';
-export declare function executeModuleFederationDevSSRBuilder(schema: Schema, context: import('@angular-devkit/architect').BuilderContext): import("rxjs").Observable<import("@nguniversal/builders").SSRDevServerBuilderOutput>;
+export declare function executeModuleFederationDevSSRBuilder(schema: Schema, context: import('@angular-devkit/architect').BuilderContext): import("rxjs").Observable<unknown>;
 declare const _default: any;
 export default _default;

package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeModuleFederationDevSSRBuilder = void 0;
-const project_graph_1 = require("nx/src/project-graph/project-graph");
-const executor_utils_1 = require("nx/src/command-line/run/executor-utils");
 const devkit_1 = require("@nx/devkit");
-const module_federation_1 = require("../utilities/module-federation");
-const operators_1 = require("rxjs/operators");
-const rxjs_1 = require("rxjs");
-const path_1 = require("path");
 const child_process_1 = require("child_process");
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const fs_1 = require("fs");
+const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
+const executor_utils_1 = require("nx/src/command-line/run/executor-utils");
+const project_graph_1 = require("nx/src/project-graph/project-graph");
+const path_1 = require("path");
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
+const module_federation_1 = require("../utilities/module-federation");
 function executeModuleFederationDevSSRBuilder(schema, context) {
     const { ...options } = schema;
     const projectGraph = (0, devkit_1.readCachedProjectGraph)();
@@ -50,7 +51,7 @@ function executeModuleFederationDevSSRBuilder(schema, context) {
         const runOptions = {};
         if (options.verbose) {
             const [collection, executor] = workspaceProjects[remote].targets[target].executor.split(':');
-            const { schema } = (0, executor_utils_1.getExecutorInformation)(collection, executor, devkit_1.workspaceRoot);
+            const { schema } = (0, executor_utils_1.getExecutorInformation)(collection, executor, devkit_1.workspaceRoot, workspaceProjects);
             if (schema.additionalProperties || 'verbose' in schema.properties) {
                 runOptions.verbose = options.verbose;
             }
@@ -78,6 +79,7 @@ function executeModuleFederationDevSSRBuilder(schema, context) {
                     target,
                     configuration: context.target.configuration,
                     runOptions,
+                    projects: workspaceProjects,
                 }, options.verbose).then((obs) => obs
                     .pipe((0, operators_1.tap)((result) => {
                     result.success && res();
@@ -87,7 +89,11 @@ function executeModuleFederationDevSSRBuilder(schema, context) {
         });
         remoteProcessPromises.push(remotePromise);
     }
-    return (0, rxjs_1.from)(Promise.all(remoteProcessPromises)).pipe((0, operators_1.switchMap)(() => (0, rxjs_1.from)(Promise.resolve().then(() => require('@nguniversal/builders')))), (0, operators_1.switchMap)(({ executeSSRDevServerBuilder }) => executeSSRDevServerBuilder(options, context)));
+    const { major: angularMajorVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    const { executeSSRDevServerBuilder } = angularMajorVersion >= 17
+        ? require('@angular-devkit/build-angular')
+        : require('@nguniversal/builders');
+    return (0, rxjs_1.from)(Promise.all(remoteProcessPromises)).pipe((0, operators_1.switchMap)(() => executeSSRDevServerBuilder(options, context)));
 }
 exports.executeModuleFederationDevSSRBuilder = executeModuleFederationDevSSRBuilder;
 exports.default = require('@angular-devkit/architect').createBuilder(executeModuleFederationDevSSRBuilder);

package/src/builders/utilities/module-federation.js

@@ -85,7 +85,7 @@ function getStaticRemotes(project, context, workspaceProjects, remotesToSkip) {
 }
 exports.getStaticRemotes = getStaticRemotes;
 function validateDevRemotes(options, workspaceProjects) {
-    const invalidDevRemotes = options.devRemotes?.filter((remote) => !workspaceProjects[remote]);
+    const invalidDevRemotes = options.devRemotes?.filter((remote) => !workspaceProjects[remote]) ?? [];
     if (invalidDevRemotes.length) {
         throw new Error(invalidDevRemotes.length === 1
             ? `Invalid dev remote provided: ${invalidDevRemotes[0]}.`

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

@@ -1,9 +1,13 @@
-import { Schema } from '@angular-devkit/build-angular/src/builders/browser/schema';
+import type { Schema } from '@angular-devkit/build-angular/src/builders/browser/schema';
 
 export type BrowserBuilderSchema = Schema & {
   customWebpackConfig?: {
     path: string;
   };
-  indexFileTransformer?: string;
+  indexHtmlTransformer?: string;
   buildLibsFromSource?: boolean;
+  /**
+   * @deprecated Use `indexHtmlTransformer` instead. It will be removed in Nx 19.
+   */
+  indexFileTransformer?: string;
 };

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

@@ -41,7 +41,7 @@
       "oneOf": [
         {
           "type": "array",
-          "description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'. _Note: supported in Angular versions >= 15.0.0_.",
+          "description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
           "items": {
             "type": "string",
             "uniqueItems": true
@@ -106,7 +106,7 @@
               "input": {
                 "type": "string",
                 "description": "The file to include.",
-                "pattern": "\\.(?:css|scss|sass|less|styl)$"
+                "pattern": "\\.(?:css|scss|sass|less)$"
               },
               "bundleName": {
                 "type": "string",
@@ -125,7 +125,7 @@
           {
             "type": "string",
             "description": "The file to include.",
-            "pattern": "\\.(?:css|scss|sass|less|styl)$"
+            "pattern": "\\.(?:css|scss|sass|less)$"
           }
         ]
       },
@@ -228,7 +228,7 @@
     },
     "outputPath": {
       "type": "string",
-      "description": "The full path for the new output directory, relative to the current workspace.\n\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",
@@ -278,12 +278,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": {
@@ -292,8 +292,7 @@
     },
     "deployUrl": {
       "type": "string",
-      "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."
+      "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."
     },
     "verbose": {
       "type": "boolean",
@@ -439,7 +438,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"
@@ -458,9 +457,10 @@
       "x-priority": "important",
       "additionalProperties": false
     },
-    "indexFileTransformer": {
+    "indexHtmlTransformer": {
       "description": "Path to transformer function to transform the index.html",
-      "type": "string"
+      "type": "string",
+      "alias": "indexFileTransformer"
     },
     "buildLibsFromSource": {
       "type": "boolean",
@@ -516,11 +516,11 @@
           "properties": {
             "src": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             },
             "replaceWith": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             }
           },
           "additionalProperties": false,
@@ -531,11 +531,11 @@
           "properties": {
             "replace": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             },
             "with": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             }
           },
           "additionalProperties": false,

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

@@ -7,11 +7,11 @@ const fs_1 = require("fs");
 const configuration_1 = require("nx/src/config/configuration");
 const operators_1 = require("nx/src/project-graph/operators");
 const utils_1 = require("nx/src/tasks-runner/utils");
+const path_1 = require("path");
 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,16 +23,18 @@ 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 { buildLibsFromSource, customWebpackConfig, indexHtmlTransformer, indexFileTransformer, ...delegateBuilderOptions } = options;
+    process.env.NX_BUILD_LIBS_FROM_SOURCE = `${buildLibsFromSource}`;
+    process.env.NX_BUILD_TARGET = (0, devkit_1.targetToTargetString)({ ...context.target });
     const pathToWebpackConfig = customWebpackConfig?.path &&
         (0, devkit_1.joinPathFragments)(context.workspaceRoot, 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}`);
     }
-    const pathToIndexFileTransformer = indexFileTransformer &&
-        (0, devkit_1.joinPathFragments)(context.workspaceRoot, indexFileTransformer);
+    const normalizedIndexHtmlTransformer = indexHtmlTransformer ?? indexFileTransformer;
+    const pathToIndexFileTransformer = normalizedIndexHtmlTransformer &&
+        (0, devkit_1.joinPathFragments)(context.workspaceRoot, normalizedIndexHtmlTransformer);
     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}`);
     }
@@ -42,7 +44,7 @@ function executeWebpackBrowserBuilder(options, context) {
         projectGraph = (0, devkit_1.readCachedProjectGraph)();
         const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(delegateBuilderOptions.tsConfig, context, { projectGraph });
         dependencies = foundDependencies;
-        delegateBuilderOptions.tsConfig = tsConfigPath;
+        delegateBuilderOptions.tsConfig = (0, devkit_1.normalizePath)((0, path_1.relative)(context.workspaceRoot, tsConfigPath));
     }
     return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeBrowserBuilder }) => executeBrowserBuilder(delegateBuilderOptions, context, {
         webpackConfiguration: (baseWebpackConfig) => {

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';
 }