@angular-devkit/build-angular 15.0.0-rc.1 → 15.0.0-rc.2

package/package.json

@@ -1,29 +1,29 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "15.0.0-rc.1",
+  "version": "15.0.0-rc.2",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.0",
-    "@angular-devkit/architect": "0.1500.0-rc.1",
-    "@angular-devkit/build-webpack": "0.1500.0-rc.1",
-    "@angular-devkit/core": "15.0.0-rc.1",
+    "@angular-devkit/architect": "0.1500.0-rc.2",
+    "@angular-devkit/build-webpack": "0.1500.0-rc.2",
+    "@angular-devkit/core": "15.0.0-rc.2",
     "@babel/core": "7.19.6",
-    "@babel/generator": "7.19.6",
+    "@babel/generator": "7.20.1",
     "@babel/helper-annotate-as-pure": "7.18.6",
-    "@babel/plugin-proposal-async-generator-functions": "7.19.1",
+    "@babel/plugin-proposal-async-generator-functions": "7.20.1",
     "@babel/plugin-transform-async-to-generator": "7.18.6",
     "@babel/plugin-transform-runtime": "7.19.6",
     "@babel/preset-env": "7.19.4",
-    "@babel/runtime": "7.19.4",
+    "@babel/runtime": "7.20.1",
     "@babel/template": "7.18.10",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "15.0.0-rc.1",
+    "@ngtools/webpack": "15.0.0-rc.2",
     "ansi-colors": "4.1.3",
-    "autoprefixer": "10.4.12",
-    "babel-loader": "8.2.5",
+    "autoprefixer": "10.4.13",
+    "babel-loader": "9.0.1",
     "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.9.1",
     "cacache": "17.0.1",
@@ -60,7 +60,7 @@
     "terser": "5.15.1",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
-    "tslib": "2.4.0",
+    "tslib": "2.4.1",
     "webpack": "5.74.0",
     "webpack-dev-middleware": "5.3.3",
     "webpack-dev-server": "4.11.1",

package/src/builders/browser-esbuild/compiler-plugin.js

@@ -188,8 +188,8 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                     location: { file: pluginOptions.tsconfig },
                     notes: [
                         {
-                            text: `To control ECMA version and features use the Browerslist configuration. ' +
-              'For more information, see https://angular.io/guide/build#configuring-browser-compatibility'`,
+                            text: 'To control ECMA version and features use the Browerslist configuration. ' +
+                                'For more information, see https://angular.io/guide/build#configuring-browser-compatibility',
                         },
                     ],
                 });

package/src/builders/browser-esbuild/index.js

@@ -46,6 +46,7 @@ const compiler_plugin_1 = require("./compiler-plugin");
 const esbuild_1 = require("./esbuild");
 const experimental_warnings_1 = require("./experimental-warnings");
 const options_1 = require("./options");
+const sass_plugin_1 = require("./sass-plugin");
 const stylesheets_1 = require("./stylesheets");
 const watcher_1 = require("./watcher");
 /**
@@ -208,6 +209,11 @@ function createCodeBundleOptions(options, target, sourceFileCache) {
             // loader to perform the downlevel transformation.
             // NOTE: If esbuild adds support in the future, the babel support for async generators can be disabled.
             'async-await': false,
+            // V8 currently has a performance defect involving object spread operations that can cause signficant
+            // degradation in runtime performance. By not supporting the language feature here, a downlevel form
+            // will be used instead which provides a workaround for the performance issue.
+            // For more details: https://bugs.chromium.org/p/v8/issues/detail?id=11536
+            'object-rest-spread': false,
         },
         mainFields: ['es2020', 'browser', 'module', 'main'],
         conditions: ['es2020', 'es2015', 'module'],
@@ -345,6 +351,7 @@ async function* buildEsbuildBrowser(initialOptions, context) {
     yield result.output;
     // Finish if watch mode is not enabled
     if (!initialOptions.watch) {
+        (0, sass_plugin_1.shutdownSassWorkerPool)();
         return;
     }
     context.logger.info('Watch mode enabled. Watching for file changes...');
@@ -378,6 +385,7 @@ async function* buildEsbuildBrowser(initialOptions, context) {
         await watcher.close();
         // Cleanup incremental rebuild state
         result.dispose();
+        (0, sass_plugin_1.shutdownSassWorkerPool)();
     }
 }
 exports.buildEsbuildBrowser = buildEsbuildBrowser;

package/src/builders/browser-esbuild/sass-plugin.d.ts

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import type { Plugin } from 'esbuild';
+export declare function shutdownSassWorkerPool(): void;
 export declare function createSassPlugin(options: {
     sourcemap: boolean;
     loadPaths?: string[];

package/src/builders/browser-esbuild/sass-plugin.js

@@ -6,54 +6,49 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSassPlugin = void 0;
+exports.createSassPlugin = exports.shutdownSassWorkerPool = void 0;
+const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
+const sass_service_1 = require("../../sass/sass-service");
+let sassWorkerPool;
+function isSassException(error) {
+    return !!error && typeof error === 'object' && 'sassMessage' in error;
+}
+function shutdownSassWorkerPool() {
+    sassWorkerPool === null || sassWorkerPool === void 0 ? void 0 : sassWorkerPool.close();
+}
+exports.shutdownSassWorkerPool = shutdownSassWorkerPool;
 function createSassPlugin(options) {
     return {
         name: 'angular-sass',
         setup(build) {
-            let sass;
             build.onLoad({ filter: /\.s[ac]ss$/ }, async (args) => {
                 // Lazily load Sass when a Sass file is found
-                sass !== null && sass !== void 0 ? sass : (sass = await Promise.resolve().then(() => __importStar(require('sass'))));
+                sassWorkerPool !== null && sassWorkerPool !== void 0 ? sassWorkerPool : (sassWorkerPool = new sass_service_1.SassWorkerImplementation());
+                const warnings = [];
                 try {
-                    const warnings = [];
-                    // Use sync version as async version is slower.
-                    const { css, sourceMap, loadedUrls } = sass.compile(args.path, {
+                    const data = await (0, promises_1.readFile)(args.path, 'utf-8');
+                    const { css, sourceMap, loadedUrls } = await sassWorkerPool.compileStringAsync(data, {
+                        url: (0, node_url_1.pathToFileURL)(args.path),
                         style: 'expanded',
                         loadPaths: options.loadPaths,
                         sourceMap: options.sourcemap,
                         sourceMapIncludeSources: options.sourcemap,
                         quietDeps: true,
                         logger: {
-                            warn: (text, _options) => {
+                            warn: (text, { deprecation, span }) => {
                                 warnings.push({
-                                    text,
+                                    text: deprecation ? 'Deprecation' : text,
+                                    location: span && {
+                                        file: span.url && (0, node_url_1.fileURLToPath)(span.url),
+                                        lineText: span.context,
+                                        // Sass line numbers are 0-based while esbuild's are 1-based
+                                        line: span.start.line + 1,
+                                        column: span.start.column,
+                                    },
+                                    notes: deprecation ? [{ text }] : undefined,
                                 });
                             },
                         },
@@ -68,15 +63,16 @@ function createSassPlugin(options) {
                     };
                 }
                 catch (error) {
-                    if (error instanceof sass.Exception) {
+                    if (isSassException(error)) {
                         const file = error.span.url ? (0, node_url_1.fileURLToPath)(error.span.url) : undefined;
                         return {
                             loader: 'css',
                             errors: [
                                 {
-                                    text: error.toString(),
+                                    text: error.message,
                                 },
                             ],
+                            warnings,
                             watchFiles: file ? [file] : undefined,
                         };
                     }

package/src/builders/browser-esbuild/watcher.js

@@ -33,6 +33,7 @@ function createWatcher(options) {
     });
     const nextQueue = [];
     let currentChanges;
+    let nextWaitTimeout;
     watcher.on('all', (event, path) => {
         switch (event) {
             case 'add':
@@ -50,11 +51,18 @@ function createWatcher(options) {
             default:
                 return;
         }
-        const next = nextQueue.shift();
-        if (next) {
-            const value = currentChanges;
-            currentChanges = undefined;
-            next(value);
+        // Wait 250ms from next change to better capture groups of file save operations.
+        if (!nextWaitTimeout) {
+            nextWaitTimeout = setTimeout(() => {
+                nextWaitTimeout = undefined;
+                const next = nextQueue.shift();
+                if (next) {
+                    const value = currentChanges;
+                    currentChanges = undefined;
+                    next(value);
+                }
+            }, 250);
+            nextWaitTimeout === null || nextWaitTimeout === void 0 ? void 0 : nextWaitTimeout.unref();
         }
     });
     return {
@@ -80,6 +88,9 @@ function createWatcher(options) {
         async close() {
             try {
                 await watcher.close();
+                if (nextWaitTimeout) {
+                    clearTimeout(nextWaitTimeout);
+                }
             }
             finally {
                 let next;

package/src/sass/sass-service.js

@@ -87,12 +87,13 @@ class SassWorkerImplementation {
                 }
                 resolve(result);
             };
-            const request = this.createRequest(workerIndex, callback, importers);
+            const request = this.createRequest(workerIndex, callback, logger, importers);
             this.requests.set(request.id, request);
             this.workers[workerIndex].postMessage({
                 id: request.id,
                 source,
                 hasImporter: !!(importers === null || importers === void 0 ? void 0 : importers.length),
+                hasLogger: !!logger,
                 options: {
                     ...serializableOptions,
                     // URL is not serializable so to convert to string here and back to URL in the worker.
@@ -122,12 +123,24 @@ class SassWorkerImplementation {
             transferList: [workerImporterPort],
         });
         worker.on('message', (response) => {
+            var _a;
             const request = this.requests.get(response.id);
             if (!request) {
                 return;
             }
             this.requests.delete(response.id);
             this.availableWorkers.push(request.workerIndex);
+            if (response.warnings && ((_a = request.logger) === null || _a === void 0 ? void 0 : _a.warn)) {
+                for (const { message, span, ...options } of response.warnings) {
+                    request.logger.warn(message, {
+                        ...options,
+                        span: span && {
+                            ...span,
+                            url: span.url ? (0, node_url_1.pathToFileURL)(span.url) : undefined,
+                        },
+                    });
+                }
+            }
             if (response.result) {
                 request.callback(undefined, {
                     ...response.result,
@@ -184,11 +197,12 @@ class SassWorkerImplementation {
         }
         return null;
     }
-    createRequest(workerIndex, callback, importers) {
+    createRequest(workerIndex, callback, logger, importers) {
         return {
             id: this.idCounter++,
             workerIndex,
             callback,
+            logger,
             importers,
         };
     }

package/src/sass/worker.js

@@ -15,10 +15,12 @@ if (!worker_threads_1.parentPort || !worker_threads_1.workerData) {
 }
 // The importer variables are used to proxy import requests to the main thread
 const { workerImporterPort, importerSignal } = worker_threads_1.workerData;
-worker_threads_1.parentPort.on('message', ({ id, hasImporter, source, options }) => {
+worker_threads_1.parentPort.on('message', (message) => {
     if (!worker_threads_1.parentPort) {
         throw new Error('"parentPort" is not defined. Sass worker must be executed as a Worker.');
     }
+    const { id, hasImporter, hasLogger, source, options } = message;
+    let warnings;
     try {
         if (hasImporter) {
             // When a custom importer function is present, the importer request must be proxied
@@ -44,9 +46,23 @@ worker_threads_1.parentPort.on('message', ({ id, hasImporter, source, options })
             ...options,
             // URL is not serializable so to convert to string in the parent and back to URL here.
             url: options.url ? (0, url_1.pathToFileURL)(options.url) : undefined,
+            logger: hasLogger
+                ? {
+                    warn(message, { deprecation, span, stack }) {
+                        warnings !== null && warnings !== void 0 ? warnings : (warnings = []);
+                        warnings.push({
+                            message,
+                            deprecation,
+                            stack,
+                            span: span && convertSourceSpan(span),
+                        });
+                    },
+                }
+                : undefined,
         });
         worker_threads_1.parentPort.postMessage({
             id,
+            warnings,
             result: {
                 ...result,
                 // URL is not serializable so to convert to string here and back to URL in the parent.
@@ -60,22 +76,9 @@ worker_threads_1.parentPort.on('message', ({ id, hasImporter, source, options })
             const { span, message, stack, sassMessage, sassStack } = error;
             worker_threads_1.parentPort.postMessage({
                 id,
+                warnings,
                 error: {
-                    span: {
-                        text: span.text,
-                        context: span.context,
-                        end: {
-                            column: span.end.column,
-                            offset: span.end.offset,
-                            line: span.end.line,
-                        },
-                        start: {
-                            column: span.start.column,
-                            offset: span.start.offset,
-                            line: span.start.line,
-                        },
-                        url: span.url ? (0, url_1.fileURLToPath)(span.url) : undefined,
-                    },
+                    span: convertSourceSpan(span),
                     message,
                     stack,
                     sassMessage,
@@ -85,10 +88,40 @@ worker_threads_1.parentPort.on('message', ({ id, hasImporter, source, options })
         }
         else if (error instanceof Error) {
             const { message, stack } = error;
-            worker_threads_1.parentPort.postMessage({ id, error: { message, stack } });
+            worker_threads_1.parentPort.postMessage({ id, warnings, error: { message, stack } });
         }
         else {
-            worker_threads_1.parentPort.postMessage({ id, error: { message: 'An unknown error has occurred.' } });
+            worker_threads_1.parentPort.postMessage({
+                id,
+                warnings,
+                error: { message: 'An unknown error has occurred.' },
+            });
         }
     }
 });
+/**
+ * Converts a Sass SourceSpan object into a serializable form.
+ * The SourceSpan object contains a URL property which must be converted into a string.
+ * Also, most of the interface's properties are get accessors and are not automatically
+ * serialized when sent back from the worker.
+ *
+ * @param span The Sass SourceSpan object to convert.
+ * @returns A serializable form of the SourceSpan object.
+ */
+function convertSourceSpan(span) {
+    return {
+        text: span.text,
+        context: span.context,
+        end: {
+            column: span.end.column,
+            offset: span.end.offset,
+            line: span.end.line,
+        },
+        start: {
+            column: span.start.column,
+            offset: span.start.offset,
+            line: span.start.line,
+        },
+        url: span.url ? (0, url_1.fileURLToPath)(span.url) : undefined,
+    };
+}