@nx/angular 17.0.3 → 17.0.5

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

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

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

@@ -3,10 +3,9 @@ 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");
@@ -49,16 +48,12 @@ 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 = tsConfigPath;
+        options.tsConfig = (0, devkit_1.normalizePath)((0, path_1.relative)(context.workspaceRoot, tsConfigPath));
     }
     return buildServerApp(options, context);
 }

package/src/executors/application/application.impl.d.ts

@@ -0,0 +1,3 @@
+import type { ExecutorContext } from '@nx/devkit';
+import type { ApplicationExecutorOptions } from './schema';
+export default function applicationExecutor(options: ApplicationExecutorOptions, context: ExecutorContext): AsyncGenerator<import("@angular-devkit/build-angular/src/builders/application").ApplicationBuilderOutput, any, undefined>;

package/src/executors/application/application.impl.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
+const semver_1 = require("semver");
+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");
+const validate_options_1 = require("./utils/validate-options");
+async function* applicationExecutor(options, context) {
+    (0, validate_options_1.validateOptions)(options);
+    const { buildLibsFromSource = true, plugins: pluginPaths, indexHtmlTransformer: indexHtmlTransformerPath, ...delegateExecutorOptions } = options;
+    let dependencies;
+    if (!buildLibsFromSource) {
+        const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(delegateExecutorOptions.tsConfig, context);
+        dependencies = foundDependencies;
+        delegateExecutorOptions.tsConfig = tsConfigPath;
+    }
+    const plugins = await (0, esbuild_extensions_1.loadPlugins)(pluginPaths, options.tsConfig);
+    const indexHtmlTransformer = indexHtmlTransformerPath
+        ? await (0, esbuild_extensions_1.loadIndexHtmlTransformer)(indexHtmlTransformerPath, options.tsConfig)
+        : undefined;
+    const { buildApplication } = await Promise.resolve().then(() => require('@angular-devkit/build-angular'));
+    const builderContext = await (0, ngcli_adapter_1.createBuilderContext)({
+        builderName: 'application',
+        description: 'Build an application.',
+        optionSchema: await Promise.resolve().then(() => require('./schema.json')),
+    }, context);
+    const { version: angularVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    if ((0, semver_1.gte)(angularVersion, '17.1.0')) {
+        return yield* buildApplication(delegateExecutorOptions, builderContext, {
+            codePlugins: plugins,
+            indexHtmlTransformer,
+        });
+    }
+    return yield* buildApplication(delegateExecutorOptions, builderContext, plugins);
+}
+exports.default = applicationExecutor;

package/src/executors/application/schema.d.ts

@@ -0,0 +1,8 @@
+import type { ApplicationBuilderOptions } from '@angular-devkit/build-angular';
+import type { PluginSpec } from '../utilities/esbuild-extensions';
+
+export interface ApplicationExecutorOptions extends ApplicationBuilderOptions {
+  buildLibsFromSource?: boolean;
+  indexHtmlTransformer?: string;
+  plugins?: string[] | PluginSpec[];
+}