@angular/build 18.1.0-next.2 → 18.1.0-next.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "18.1.0-next.2",
+  "version": "18.1.0-next.3",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,11 +23,11 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1801.0-next.2",
+    "@angular-devkit/architect": "0.1801.0-next.3",
     "@babel/core": "7.24.7",
     "@babel/helper-annotate-as-pure": "7.24.7",
     "@babel/helper-split-export-declaration": "7.24.7",
-    "@inquirer/confirm": "3.1.9",
+    "@inquirer/confirm": "3.1.10",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "browserslist": "^4.23.0",
@@ -41,11 +41,11 @@
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "4.0.2",
-    "piscina": "4.5.1",
-    "sass": "1.77.5",
+    "piscina": "4.6.0",
+    "sass": "1.77.6",
     "semver": "7.6.2",
-    "undici": "6.18.2",
-    "vite": "5.2.13",
+    "undici": "6.19.2",
+    "vite": "5.3.1",
     "watchpack": "2.4.1"
   },
   "peerDependencies": {
@@ -78,7 +78,7 @@
       "optional": true
     }
   },
-  "packageManager": "yarn@4.2.2",
+  "packageManager": "yarn@4.3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"

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

@@ -508,6 +508,7 @@ function getDepOptimizationConfig({ disabled, exclude, include, target, zoneless
             supported: (0, internal_1.getFeatureSupport)(target, zoneless),
             plugins,
             loader,
+            resolveExtensions: ['.mjs', '.js', '.cjs'],
         },
     };
 }

package/src/tools/esbuild/application-code-bundle.js

@@ -248,7 +248,7 @@ function getEsBuildCommonOptions(options) {
         format: 'esm',
         assetNames: outputNames.media,
         conditions: ['es2020', 'es2015', 'module'],
-        resolveExtensions: ['.ts', '.tsx', '.mjs', '.js'],
+        resolveExtensions: ['.ts', '.tsx', '.mjs', '.js', '.cjs'],
         metafile: true,
         legalComments: options.extractLicenses ? 'none' : 'eof',
         logLevel: options.verbose && !jsonLogs ? 'debug' : 'silent',

package/src/tools/esbuild/global-scripts.js

@@ -73,7 +73,7 @@ function createGlobalScriptsBundleOptions(options, target, initial) {
             assetNames: outputNames.media,
             mainFields: ['script', 'browser', 'main'],
             conditions: ['script'],
-            resolveExtensions: ['.mjs', '.js'],
+            resolveExtensions: ['.mjs', '.js', '.cjs'],
             logLevel: options.verbose && !jsonLogs ? 'debug' : 'silent',
             metafile: true,
             minify: optimizationOptions.scripts,

package/src/tools/vite/angular-memory-plugin.js

@@ -42,18 +42,14 @@ function createAngularMemoryPlugin(options) {
                 return (0, node_path_1.join)(virtualProjectRoot, source);
             }
         },
-        async load(id) {
+        load(id) {
             const [file] = id.split('?', 1);
             const relativeFile = '/' + normalizePath((0, node_path_1.relative)(virtualProjectRoot, file));
             const codeContents = outputFiles.get(relativeFile)?.contents;
             if (codeContents === undefined) {
-                if (relativeFile.endsWith('/node_modules/vite/dist/client/client.mjs')) {
-                    return {
-                        code: await loadViteClientCode(file),
-                        map: await (0, promises_1.readFile)(file + '.map', 'utf-8'),
-                    };
-                }
-                return;
+                return relativeFile.endsWith('/node_modules/vite/dist/client/client.mjs')
+                    ? loadViteClientCode(file)
+                    : undefined;
             }
             const code = Buffer.from(codeContents).toString('utf-8');
             const mapContents = outputFiles.get(relativeFile + '.map')?.contents;
@@ -231,9 +227,13 @@ function createAngularMemoryPlugin(options) {
  */
 async function loadViteClientCode(file) {
     const originalContents = await (0, promises_1.readFile)(file, 'utf-8');
-    const updatedContents = originalContents.replace(`h('br'), 'You can also disable this overlay by setting ', ` +
-        `h('code', { part: 'config-option-name' }, 'server.hmr.overlay'), '` +
-        ` to ', h('code', { part: 'config-option-value' }, 'false'), ' in ', h('code', { part: 'config-file-name' }, hmrConfigName), '.'`, '');
+    const updatedContents = originalContents.replace(`"You can also disable this overlay by setting ",
+      h("code", { part: "config-option-name" }, "server.hmr.overlay"),
+      " to ",
+      h("code", { part: "config-option-value" }, "false"),
+      " in ",
+      h("code", { part: "config-file-name" }, hmrConfigName),
+      "."`, '');
     (0, node_assert_1.default)(originalContents !== updatedContents, 'Failed to update Vite client error overlay text.');
     return updatedContents;
 }

package/src/utils/environment-options.js

@@ -8,6 +8,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useJSONBuildLogs = exports.useTypeChecking = exports.shouldWatchRoot = exports.debugPerformance = exports.useParallelTs = exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
+const node_os_1 = require("node:os");
 function isDisabled(variable) {
     return variable === '0' || variable.toLowerCase() === 'false';
 }
@@ -66,7 +67,9 @@ exports.allowMinify = debugOptimize.minify;
  *
  */
 const maxWorkersVariable = process.env['NG_BUILD_MAX_WORKERS'];
-exports.maxWorkers = isPresent(maxWorkersVariable) ? +maxWorkersVariable : 4;
+exports.maxWorkers = isPresent(maxWorkersVariable)
+    ? +maxWorkersVariable
+    : Math.min(4, (0, node_os_1.availableParallelism)());
 const parallelTsVariable = process.env['NG_BUILD_PARALLEL_TS'];
 exports.useParallelTs = !isPresent(parallelTsVariable) || !isDisabled(parallelTsVariable);
 const debugPerfVariable = process.env['NG_BUILD_DEBUG_PERF'];

package/src/utils/index-file/nonce.js

@@ -25,8 +25,7 @@ async function addNonce(html) {
     }
     const { rewriter, transformedContent } = await (0, html_rewriting_stream_1.htmlRewritingStream)(html);
     rewriter.on('startTag', (tag) => {
-        if ((tag.tagName === 'style' ||
-            (tag.tagName === 'script' && !tag.attrs.some((attr) => attr.name === 'src'))) &&
+        if ((tag.tagName === 'style' || tag.tagName === 'script') &&
             !tag.attrs.some((attr) => attr.name === 'nonce')) {
             tag.attrs.push({ name: 'nonce', value: nonce });
         }

package/src/utils/normalize-cache.js

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