@angular-devkit/build-angular 14.2.8 → 14.2.10

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.2.8",
+  "version": "14.2.10",
   "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.1402.8",
-    "@angular-devkit/build-webpack": "0.1402.8",
-    "@angular-devkit/core": "14.2.8",
+    "@angular-devkit/architect": "0.1402.10",
+    "@angular-devkit/build-webpack": "0.1402.10",
+    "@angular-devkit/core": "14.2.10",
     "@babel/core": "7.18.10",
     "@babel/generator": "7.18.12",
     "@babel/helper-annotate-as-pure": "7.18.6",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.18.9",
     "@babel/template": "7.18.10",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "14.2.8",
+    "@ngtools/webpack": "14.2.10",
     "ansi-colors": "4.1.3",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
@@ -38,7 +38,7 @@
     "less": "4.1.3",
     "less-loader": "11.0.0",
     "license-webpack-plugin": "4.0.2",
-    "loader-utils": "3.2.0",
+    "loader-utils": "3.2.1",
     "mini-css-extract-plugin": "2.6.1",
     "minimatch": "5.1.0",
     "open": "8.4.0",

package/src/builders/app-shell/index.js

@@ -29,10 +29,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const architect_1 = require("@angular-devkit/architect");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const piscina_1 = __importDefault(require("piscina"));
 const utils_1 = require("../../utils");
 const error_1 = require("../../utils/error");
 const inline_critical_css_1 = require("../../utils/index-file/inline-critical-css");
@@ -45,10 +49,9 @@ async function _renderUniversal(options, context, browserResult, serverResult, s
     const rawBrowserOptions = (await context.getTargetOptions(browserTarget));
     const browserBuilderName = await context.getBuilderNameForTarget(browserTarget);
     const browserOptions = await context.validateOptions(rawBrowserOptions, browserBuilderName);
-    // Initialize zone.js
+    // Locate zone.js to load in the render worker
     const root = context.workspaceRoot;
     const zonePackage = require.resolve('zone.js', { paths: [root] });
-    await Promise.resolve().then(() => __importStar(require(zonePackage)));
     const projectName = context.target && context.target.project;
     if (!projectName) {
         throw new Error('The builder requires a target.');
@@ -62,42 +65,46 @@ async function _renderUniversal(options, context, browserResult, serverResult, s
             deployUrl: browserOptions.deployUrl,
         })
         : undefined;
-    for (const { path: outputPath, baseHref } of browserResult.outputs) {
-        const localeDirectory = path.relative(browserResult.baseOutputPath, outputPath);
-        const browserIndexOutputPath = path.join(outputPath, 'index.html');
-        const indexHtml = await fs.promises.readFile(browserIndexOutputPath, 'utf8');
-        const serverBundlePath = await _getServerModuleBundlePath(options, context, serverResult, localeDirectory);
-        const { AppServerModule, renderModule } = await Promise.resolve().then(() => __importStar(require(serverBundlePath)));
-        const renderModuleFn = renderModule;
-        if (!(renderModuleFn && AppServerModule)) {
-            throw new Error(`renderModule method and/or AppServerModule were not exported from: ${serverBundlePath}.`);
-        }
-        // Load platform server module renderer
-        const renderOpts = {
-            document: indexHtml,
-            url: options.route,
-        };
-        let html = await renderModuleFn(AppServerModule, renderOpts);
-        // Overwrite the client index file.
-        const outputIndexPath = options.outputIndexPath
-            ? path.join(root, options.outputIndexPath)
-            : browserIndexOutputPath;
-        if (inlineCriticalCssProcessor) {
-            const { content, warnings, errors } = await inlineCriticalCssProcessor.process(html, {
-                outputPath,
+    const renderWorker = new piscina_1.default({
+        filename: require.resolve('./render-worker'),
+        maxThreads: 1,
+        workerData: { zonePackage },
+    });
+    try {
+        for (const { path: outputPath, baseHref } of browserResult.outputs) {
+            const localeDirectory = path.relative(browserResult.baseOutputPath, outputPath);
+            const browserIndexOutputPath = path.join(outputPath, 'index.html');
+            const indexHtml = await fs.promises.readFile(browserIndexOutputPath, 'utf8');
+            const serverBundlePath = await _getServerModuleBundlePath(options, context, serverResult, localeDirectory);
+            let html = await renderWorker.run({
+                serverBundlePath,
+                document: indexHtml,
+                url: options.route,
             });
-            html = content;
-            if (warnings.length || errors.length) {
-                spinner.stop();
-                warnings.forEach((m) => context.logger.warn(m));
-                errors.forEach((m) => context.logger.error(m));
-                spinner.start();
+            // Overwrite the client index file.
+            const outputIndexPath = options.outputIndexPath
+                ? path.join(root, options.outputIndexPath)
+                : browserIndexOutputPath;
+            if (inlineCriticalCssProcessor) {
+                const { content, warnings, errors } = await inlineCriticalCssProcessor.process(html, {
+                    outputPath,
+                });
+                html = content;
+                if (warnings.length || errors.length) {
+                    spinner.stop();
+                    warnings.forEach((m) => context.logger.warn(m));
+                    errors.forEach((m) => context.logger.error(m));
+                    spinner.start();
+                }
+            }
+            await fs.promises.writeFile(outputIndexPath, html);
+            if (browserOptions.serviceWorker) {
+                await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, root, outputPath, baseHref !== null && baseHref !== void 0 ? baseHref : '/', browserOptions.ngswConfigPath);
             }
         }
-        await fs.promises.writeFile(outputIndexPath, html);
-        if (browserOptions.serviceWorker) {
-            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, root, outputPath, baseHref !== null && baseHref !== void 0 ? baseHref : '/', browserOptions.ngswConfigPath);
-        }
+    }
+    finally {
+        await renderWorker.destroy();
     }
     return browserResult;
 }

package/src/builders/app-shell/render-worker.d.ts

@@ -0,0 +1,36 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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
+ */
+/**
+ * A request to render a Server bundle generate by the universal server builder.
+ */
+interface RenderRequest {
+    /**
+     * The path to the server bundle that should be loaded and rendered.
+     */
+    serverBundlePath: string;
+    /**
+     * The existing HTML document as a string that will be augmented with the rendered application.
+     */
+    document: string;
+    /**
+     * An optional URL path that represents the Angular route that should be rendered.
+     */
+    url: string | undefined;
+}
+/**
+ * Renders an application based on a provided server bundle path, initial document, and optional URL route.
+ * @param param0 A request to render a server bundle.
+ * @returns A promise that resolves to the render HTML document for the application.
+ */
+declare function render({ serverBundlePath, document, url }: RenderRequest): Promise<string>;
+/**
+ * The default export will be the promise returned by the initialize function.
+ * This is awaited by piscina prior to using the Worker.
+ */
+declare const _default: Promise<typeof render>;
+export default _default;

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

@@ -0,0 +1,75 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert_1 = __importDefault(require("assert"));
+const worker_threads_1 = require("worker_threads");
+/**
+ * The fully resolved path to the zone.js package that will be loaded during worker initialization.
+ * This is passed as workerData when setting up the worker via the `piscina` package.
+ */
+const { zonePackage } = worker_threads_1.workerData;
+/**
+ * Renders an application based on a provided server bundle path, initial document, and optional URL route.
+ * @param param0 A request to render a server bundle.
+ * @returns A promise that resolves to the render HTML document for the application.
+ */
+async function render({ serverBundlePath, document, url }) {
+    const { AppServerModule, renderModule } = (await Promise.resolve().then(() => __importStar(require(serverBundlePath))));
+    (0, assert_1.default)(renderModule, `renderModule was not exported from: ${serverBundlePath}.`);
+    (0, assert_1.default)(AppServerModule, `AppServerModule was not exported from: ${serverBundlePath}.`);
+    // Render platform server module
+    const html = await renderModule(AppServerModule, {
+        document,
+        url,
+    });
+    return html;
+}
+/**
+ * Initializes the worker when it is first created by loading the Zone.js package
+ * into the worker instance.
+ *
+ * @returns A promise resolving to the render function of the worker.
+ */
+async function initialize() {
+    // Setup Zone.js
+    await Promise.resolve().then(() => __importStar(require(zonePackage)));
+    // Return the render function for use
+    return render;
+}
+/**
+ * The default export will be the promise returned by the initialize function.
+ * This is awaited by piscina prior to using the Worker.
+ */
+exports.default = initialize();