@angular-devkit/build-angular 13.0.0-rc.2 → 13.0.0-rc.3

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "13.0.0-rc.2",
+  "version": "13.0.0-rc.3",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "1.0.1",
-    "@angular-devkit/architect": "0.1300.0-rc.2",
-    "@angular-devkit/build-webpack": "0.1300.0-rc.2",
-    "@angular-devkit/core": "13.0.0-rc.2",
+    "@angular-devkit/architect": "0.1300.0-rc.3",
+    "@angular-devkit/build-webpack": "0.1300.0-rc.3",
+    "@angular-devkit/core": "13.0.0-rc.3",
     "@babel/core": "7.15.8",
     "@babel/generator": "7.15.8",
     "@babel/helper-annotate-as-pure": "7.15.4",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.15.4",
     "@babel/template": "7.15.4",
     "@discoveryjs/json-ext": "0.5.5",
-    "@ngtools/webpack": "13.0.0-rc.2",
+    "@ngtools/webpack": "13.0.0-rc.3",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.3",
     "babel-plugin-istanbul": "6.1.1",
@@ -32,7 +32,7 @@
     "core-js": "3.19.0",
     "critters": "0.0.14",
     "css-loader": "6.5.0",
-    "esbuild-wasm": "0.13.9",
+    "esbuild-wasm": "0.13.12",
     "glob": "7.2.0",
     "https-proxy-agent": "5.0.0",
     "inquirer": "8.2.0",
@@ -55,7 +55,7 @@
     "resolve-url-loader": "4.0.0",
     "rxjs": "6.6.7",
     "sass": "1.43.4",
-    "sass-loader": "12.2.0",
+    "sass-loader": "12.3.0",
     "semver": "7.3.5",
     "source-map-loader": "3.0.0",
     "source-map-support": "0.5.20",
@@ -67,12 +67,12 @@
     "tslib": "2.3.1",
     "webpack": "5.60.0",
     "webpack-dev-middleware": "5.2.1",
-    "webpack-dev-server": "4.3.1",
+    "webpack-dev-server": "4.4.0",
     "webpack-merge": "5.8.0",
     "webpack-subresource-integrity": "5.0.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.13.9"
+    "esbuild": "0.13.12"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "^13.0.0 || ^13.0.0-next",

package/src/builders/extract-i18n/index.js

@@ -132,6 +132,16 @@ async function execute(options, context, transforms) {
     if (!context.target || !context.target.project) {
         throw new Error('The builder requires a target.');
     }
+    try {
+        require.resolve('@angular/localize');
+    }
+    catch {
+        return {
+            success: false,
+            error: `i18n extraction requires the '@angular/localize' package.`,
+            outputPath: outFile,
+        };
+    }
     const metadata = await context.getProjectMetadata(context.target);
     const i18n = (0, i18n_options_1.createI18nOptions)(metadata);
     let useLegacyIds = true;
@@ -196,16 +206,6 @@ async function execute(options, context, transforms) {
         });
         return partials;
     });
-    try {
-        require.resolve('@angular/localize');
-    }
-    catch {
-        return {
-            success: false,
-            error: `Ivy extraction requires the '@angular/localize' package.`,
-            outputPath: outFile,
-        };
-    }
     // All the localize usages are setup to first try the ESM entry point then fallback to the deep imports.
     // This provides interim compatibility while the framework is transitioned to bundled ESM packages.
     const localizeToolsModule = await (0, load_esm_1.loadEsmModule)('@angular/localize/tools');

package/src/sass/sass-service.js

@@ -48,9 +48,9 @@ class SassWorkerImplementation {
      * @param callback The function to execute when the rendering is complete.
      */
     render(options, callback) {
-        // The `functions` and `importer` options are JavaScript functions that cannot be transferred.
+        // The `functions`, `logger` and `importer` options are JavaScript functions that cannot be transferred.
         // If any additional function options are added in the future, they must be excluded as well.
-        const { functions, importer, ...serializableOptions } = options;
+        const { functions, importer, logger, ...serializableOptions } = options;
         // The CLI's configuration does not use or expose the ability to defined custom Sass functions
         if (functions && Object.keys(functions).length > 0) {
             throw new Error('Sass custom functions are not supported.');

package/src/sass/worker.js

@@ -25,7 +25,6 @@ worker_threads_1.parentPort.on('message', ({ id, hasImporter, options }) => {
             options.importer = function (url, prev) {
                 var _a;
                 Atomics.store(importerSignal, 0, 0);
-                // `this.fromImport` was added in dart-sass in 1.33.0, `@types/sass` doesn't include it yet.
                 const { fromImport } = this;
                 workerImporterPort.postMessage({ id, url, prev, fromImport });
                 Atomics.wait(importerSignal, 0, 0);

package/src/utils/action-executor.js

@@ -40,13 +40,12 @@ class BundleActionExecutor {
         const executions = new Map();
         for (const action of actions) {
             const execution = executor(action);
-            executions.set(execution, execution.then((result) => {
-                executions.delete(execution);
-                return result;
-            }));
+            executions.set(execution, execution.then((result) => [execution, result]));
         }
         while (executions.size > 0) {
-            yield Promise.race(executions.values());
+            const [execution, result] = await Promise.race(executions.values());
+            executions.delete(execution);
+            yield result;
         }
     }
     stop() {

package/src/webpack/configs/server.js

@@ -28,7 +28,8 @@ function getServerConfig(wco) {
     }
     return {
         resolve: {
-            mainFields: ['es2020', 'es2015', 'main', 'module'],
+            mainFields: ['es2015', 'main', 'module'],
+            conditionNames: ['es2015', '...'],
         },
         output: {
             libraryTarget: 'commonjs',