@angular-devkit/build-angular 18.0.0-next.5 → 18.0.0-rc.1

package/package.json

@@ -1,27 +1,27 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "18.0.0-next.5",
+  "version": "18.0.0-rc.1",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular/build": "18.0.0-next.5",
-    "@angular-devkit/architect": "0.1800.0-next.5",
-    "@angular-devkit/build-webpack": "0.1800.0-next.5",
-    "@angular-devkit/core": "18.0.0-next.5",
-    "@babel/core": "7.24.4",
-    "@babel/generator": "7.24.4",
+    "@angular/build": "18.0.0-rc.1",
+    "@angular-devkit/architect": "0.1800.0-rc.1",
+    "@angular-devkit/build-webpack": "0.1800.0-rc.1",
+    "@angular-devkit/core": "18.0.0-rc.1",
+    "@babel/core": "7.24.5",
+    "@babel/generator": "7.24.5",
     "@babel/helper-annotate-as-pure": "7.22.5",
-    "@babel/helper-split-export-declaration": "7.22.6",
+    "@babel/helper-split-export-declaration": "7.24.5",
     "@babel/plugin-transform-async-generator-functions": "7.24.3",
     "@babel/plugin-transform-async-to-generator": "7.24.1",
     "@babel/plugin-transform-runtime": "7.24.3",
-    "@babel/preset-env": "7.24.4",
-    "@babel/runtime": "7.24.4",
+    "@babel/preset-env": "7.24.5",
+    "@babel/runtime": "7.24.5",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "18.0.0-next.5",
+    "@ngtools/webpack": "18.0.0-rc.1",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.19",
@@ -35,7 +35,7 @@
     "fast-glob": "3.3.2",
     "https-proxy-agent": "7.0.4",
     "http-proxy-middleware": "3.0.0",
-    "inquirer": "9.2.19",
+    "inquirer": "9.2.20",
     "jsonc-parser": "3.2.1",
     "karma-source-map-support": "1.4.0",
     "less": "4.2.0",
@@ -54,16 +54,16 @@
     "postcss-loader": "8.1.1",
     "resolve-url-loader": "5.0.0",
     "rxjs": "7.8.1",
-    "sass": "1.75.0",
+    "sass": "1.76.0",
     "sass-loader": "14.2.1",
     "semver": "7.6.0",
     "source-map-loader": "5.0.0",
     "source-map-support": "0.5.21",
-    "terser": "5.30.4",
+    "terser": "5.31.0",
     "tree-kill": "1.2.2",
     "tslib": "2.6.2",
-    "undici": "6.14.1",
-    "vite": "5.2.10",
+    "undici": "6.15.0",
+    "vite": "5.2.11",
     "watchpack": "2.4.1",
     "webpack": "5.91.0",
     "webpack-dev-middleware": "7.2.1",

package/src/builders/app-shell/render-worker.js

@@ -75,6 +75,7 @@ async function render({ serverBundlePath, document, url }) {
         });
     }
     // The below should really handled by the framework!!!.
+    // See: https://github.com/angular/angular/issues/51549
     let timer;
     const renderingTimeout = new Promise((_, reject) => (timer = setTimeout(() => reject(new Error(`Page ${new URL(url, 'resolve://').pathname} did not render in 30 seconds.`)), 30_000)));
     return Promise.race([renderAppPromise, renderingTimeout]).finally(() => clearTimeout(timer));

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

@@ -38,6 +38,7 @@ export declare function execute(options: DevServerBuilderOptions, context: Build
     middleware?: ((req: http.IncomingMessage, res: http.ServerResponse, next: (err?: unknown) => void) => void)[];
     builderSelector?: (info: BuilderSelectorInfo, logger: BuilderContext['logger']) => string;
 }): Observable<DevServerBuilderOutput>;
+export declare function isEsbuildBased(builderName: string): builderName is '@angular/build:application' | '@angular-devkit/build-angular:application' | '@angular-devkit/build-angular:browser-esbuild';
 interface BuilderSelectorInfo {
     builderName: string;
     forceEsbuild: boolean;

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

@@ -30,7 +30,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.execute = void 0;
+exports.isEsbuildBased = exports.execute = void 0;
 const private_1 = require("@angular/build/private");
 const rxjs_1 = require("rxjs");
 const options_1 = require("./options");
@@ -62,10 +62,6 @@ function execute(options, context, transforms = {}, extensions) {
             if (transforms?.logging || transforms?.webpackConfiguration) {
                 throw new Error(`The "application" and "browser-esbuild" builders do not support Webpack transforms.`);
             }
-            // Warn if the initial options provided by the user enable prebundling but caching is disabled
-            if (options.prebundle && !normalizedOptions.cacheOptions.enabled) {
-                context.logger.warn(`Prebundling has been configured but will not be used because caching has been disabled.`);
-            }
             if (options.allowedHosts?.length) {
                 context.logger.warn(`The "allowedHosts" option will not be used because it is not supported by the "${builderName}" builder.`);
             }
@@ -136,6 +132,7 @@ function isEsbuildBased(builderName) {
     }
     return false;
 }
+exports.isEsbuildBased = isEsbuildBased;
 function defaultBuilderSelector(info, logger) {
     if (isEsbuildBased(info.builderName)) {
         return info.builderName;

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

@@ -14,6 +14,8 @@ exports.normalizeOptions = void 0;
 const architect_1 = require("@angular-devkit/architect");
 const node_path_1 = __importDefault(require("node:path"));
 const normalize_cache_1 = require("../../utils/normalize-cache");
+const normalize_optimization_1 = require("../../utils/normalize-optimization");
+const builder_1 = require("./builder");
 /**
  * Normalize the user provided options by creating full paths for all path based options
  * and converting multi-form options into a single form that can be directly used
@@ -25,13 +27,29 @@ const normalize_cache_1 = require("../../utils/normalize-cache");
  * @returns An object containing normalized options required to perform the build.
  */
 async function normalizeOptions(context, projectName, options) {
-    const workspaceRoot = context.workspaceRoot;
+    const { workspaceRoot, logger } = context;
     const projectMetadata = await context.getProjectMetadata(projectName);
     const projectRoot = node_path_1.default.join(workspaceRoot, projectMetadata.root ?? '');
     const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot);
     // Target specifier defaults to the current project's build target using a development configuration
     const buildTargetSpecifier = options.buildTarget ?? options.browserTarget ?? `::development`;
     const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
+    // Get the application builder options.
+    const browserBuilderName = await context.getBuilderNameForTarget(buildTarget);
+    const rawBuildOptions = await context.getTargetOptions(buildTarget);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const buildOptions = (await context.validateOptions(rawBuildOptions, browserBuilderName));
+    const optimization = (0, normalize_optimization_1.normalizeOptimization)(buildOptions.optimization);
+    if (options.prebundle !== false && (0, builder_1.isEsbuildBased)(browserBuilderName)) {
+        if (!cacheOptions.enabled) {
+            // Warn if the initial options provided by the user enable prebundling but caching is disabled
+            logger.warn('Prebundling has been configured but will not be used because caching has been disabled.');
+        }
+        else if (optimization.scripts) {
+            // Warn if the initial options provided by the user enable prebundling but script optimization is enabled.
+            logger.warn('Prebundling has been configured but will not be used because scripts optimization is enabled.');
+        }
+    }
     // Initial options to keep
     const { host, port, poll, open, verbose, watch, allowedHosts, disableHostCheck, liveReload, hmr, headers, proxyConfig, servePath, publicHost, ssl, sslCert, sslKey, forceEsbuild, prebundle, } = options;
     // Return all the normalized options
@@ -59,7 +77,7 @@ async function normalizeOptions(context, projectName, options) {
         sslKey,
         forceEsbuild,
         // Prebundling defaults to true but requires caching to function
-        prebundle: cacheOptions.enabled && (prebundle ?? true),
+        prebundle: cacheOptions.enabled && !optimization.scripts && (prebundle ?? true),
     };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/builders/extract-i18n/schema.json

@@ -35,6 +35,5 @@
       "description": "Name of the file to output."
     }
   },
-  "additionalProperties": false,
-  "anyOf": [{ "required": ["buildTarget"] }, { "required": ["browserTarget"] }]
+  "additionalProperties": false
 }

package/src/utils/normalize-cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = void 0;
 const node_path_1 = require("node:path");
 /** Version placeholder is replaced during the build process with actual package version */
-const VERSION = '18.0.0-next.5';
+const VERSION = '18.0.0-rc.1';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&