650aeec build: add missing pkg_deps for @angular/create

Author: Angular Builds

package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "18.3.0-next.0+sha-dcbdb8b",
+  "version": "18.3.0-next.0+sha-650aeec",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#dcbdb8b",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#dcbdb8b",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#dcbdb8b",
-    "@angular/build": "github:angular/angular-build-builds#dcbdb8b",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#650aeec",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#650aeec",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#650aeec",
+    "@angular/build": "github:angular/angular-build-builds#650aeec",
     "@babel/core": "7.25.2",
     "@babel/generator": "7.25.0",
     "@babel/helper-annotate-as-pure": "7.24.7",
@@ -21,7 +21,7 @@
     "@babel/preset-env": "7.25.3",
     "@babel/runtime": "7.25.0",
     "@discoveryjs/json-ext": "0.6.1",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#dcbdb8b",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#650aeec",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",
@@ -77,6 +77,7 @@
     "@angular/localize": "^18.0.0 || ^18.2.0-next.0",
     "@angular/platform-server": "^18.0.0 || ^18.2.0-next.0",
     "@angular/service-worker": "^18.0.0 || ^18.2.0-next.0",
+    "@angular/ssr": "github:angular/angular-ssr-builds#650aeec",
     "@web/test-runner": "^0.18.0",
     "browser-sync": "^3.0.2",
     "jest": "^29.5.0",
@@ -97,6 +98,7 @@
     "@angular/service-worker": {
       "optional": true
     },
+    "@angular/ssr": "github:angular/angular-ssr-builds#650aeec",
     "@web/test-runner": {
       "optional": true
     },

src/builders/prerender/routes-extractor-worker.js

@@ -39,14 +39,15 @@ const path = __importStar(require("node:path"));
 const node_worker_threads_1 = require("node:worker_threads");
 const { zonePackage, serverBundlePath, outputPath, indexFile } = node_worker_threads_1.workerData;
 async function extract() {
-    const { AppServerModule, extractRoutes, default: bootstrapAppFn, } = (await Promise.resolve(`${serverBundlePath}`).then(s => __importStar(require(s))));
+    const { AppServerModule, ɵgetRoutesFromAngularRouterConfig: getRoutesFromAngularRouterConfig, default: bootstrapAppFn, } = (await Promise.resolve(`${serverBundlePath}`).then(s => __importStar(require(s))));
     const browserIndexInputPath = path.join(outputPath, indexFile);
     const document = await fs.promises.readFile(browserIndexInputPath, 'utf8');
     const bootstrapAppFnOrModule = bootstrapAppFn || AppServerModule;
     (0, node_assert_1.default)(bootstrapAppFnOrModule, `The file "${serverBundlePath}" does not have a default export for an AppServerModule or a bootstrapping function.`);
     const routes = [];
-    for await (const { route, success } of extractRoutes(bootstrapAppFnOrModule, document)) {
-        if (success) {
+    const { routes: extractRoutes } = await getRoutesFromAngularRouterConfig(bootstrapAppFnOrModule, document, new URL('http://localhost'));
+    for (const { route, redirectTo } of extractRoutes) {
+        if (redirectTo === undefined && !/[:*]/.test(route)) {
             routes.push(route);
         }
     }

src/builders/server/index.js

@@ -183,13 +183,16 @@ function getPlatformServerExportsConfig(wco) {
     // Only add `@angular/platform-server` exports when it is installed.
     // In some cases this builder is used when `@angular/platform-server` is not installed.
     // Example: when using `@nguniversal/common/clover` which does not need `@angular/platform-server`.
-    return (0, helpers_1.isPlatformServerInstalled)(wco.root)
+    return (0, helpers_1.isPackageInstalled)(wco.root, '@angular/platform-server')
         ? {
             module: {
                 rules: [
                     {
                         loader: require.resolve('./platform-server-exports-loader'),
                         include: [path.resolve(wco.root, wco.buildOptions.main)],
+                        options: {
+                            angularSSRInstalled: (0, helpers_1.isPackageInstalled)(wco.root, '@angular/ssr'),
+                        },
                     },
                 ],
             },

src/builders/server/platform-server-exports-loader.d.ts

@@ -10,4 +10,6 @@
  * allow exports from multiple files in the same entry.
  * @see https://github.com/webpack/webpack/issues/15936.
  */
-export default function (this: import('webpack').LoaderContext<{}>, content: string, map: Parameters<import('webpack').LoaderDefinitionFunction>[1]): void;
+export default function (this: import('webpack').LoaderContext<{
+    angularSSRInstalled: boolean;
+}>, content: string, map: Parameters<import('webpack').LoaderDefinitionFunction>[1]): void;

src/builders/server/platform-server-exports-loader.js

@@ -8,23 +8,23 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
 /**
  * This loader is needed to add additional exports and is a workaround for a Webpack bug that doesn't
  * allow exports from multiple files in the same entry.
  * @see https://github.com/webpack/webpack/issues/15936.
  */
 function default_1(content, map) {
-    const extractorPath = (0, node_path_1.join)((0, node_path_1.dirname)(require.resolve('@angular/build/package.json')), 'src/utils/routes-extractor/extractor.js');
-    const source = `${content}
+    const { angularSSRInstalled } = this.getOptions();
+    let source = `${content}
 
   // EXPORTS added by @angular-devkit/build-angular
   export { renderApplication, renderModule, ɵSERVER_CONTEXT } from '@angular/platform-server';
-  ` +
-        // We do not import it directly so that node.js modules are resolved using the correct context.
-        // Remove source map URL comments from the code if a sourcemap is present as this will not match the file.
-        (0, node_fs_1.readFileSync)(extractorPath, 'utf-8').replace(/^\/\/# sourceMappingURL=[^\r\n]*/gm, '');
+  `;
+    if (angularSSRInstalled) {
+        source += `
+      export { ɵgetRoutesFromAngularRouterConfig } from '@angular/ssr';
+    `;
+    }
     this.callback(null, source, map);
     return;
 }

src/tools/webpack/configs/common.js

@@ -85,7 +85,8 @@ async function getCommonConfig(wco) {
     if (isPlatformServer) {
         // Fixes Critical dependency: the request of a dependency is an expression
         extraPlugins.push(new webpack_2.ContextReplacementPlugin(/@?hapi|express[\\/]/));
-        if ((0, helpers_1.isPlatformServerInstalled)(wco.root) && Array.isArray(entryPoints['main'])) {
+        if ((0, helpers_1.isPackageInstalled)(wco.root, '@angular/platform-server') &&
+            Array.isArray(entryPoints['main'])) {
             // This import must come before any imports (direct or transitive) that rely on DOM built-ins being
             // available, such as `@angular/elements`.
             entryPoints['main'].unshift('@angular/platform-server/init');

src/tools/webpack/utils/helpers.d.ts

@@ -34,7 +34,10 @@ export declare function globalScriptsByBundleName(scripts: ScriptElement[]): {
 export declare function assetPatterns(root: string, assets: AssetPatternClass[]): ObjectPattern[];
 export declare function getStatsOptions(verbose?: boolean): WebpackStatsOptions;
 /**
- * @param root the workspace root
- * @returns `true` when `@angular/platform-server` is installed.
+ * Checks if a specified package is installed in the given workspace.
+ *
+ * @param root - The root directory of the workspace.
+ * @param name - The name of the package to check for.
+ * @returns `true` if the package is installed, `false` otherwise.
  */
-export declare function isPlatformServerInstalled(root: string): boolean;
+export declare function isPackageInstalled(root: string, name: string): boolean;

src/tools/webpack/utils/helpers.js

@@ -42,7 +42,7 @@ exports.getCacheSettings = getCacheSettings;
 exports.globalScriptsByBundleName = globalScriptsByBundleName;
 exports.assetPatterns = assetPatterns;
 exports.getStatsOptions = getStatsOptions;
-exports.isPlatformServerInstalled = isPlatformServerInstalled;
+exports.isPackageInstalled = isPackageInstalled;
 const crypto_1 = require("crypto");
 const fast_glob_1 = __importDefault(require("fast-glob"));
 const path = __importStar(require("path"));
@@ -276,12 +276,15 @@ function getStatsOptions(verbose = false) {
         : webpackOutputOptions;
 }
 /**
- * @param root the workspace root
- * @returns `true` when `@angular/platform-server` is installed.
+ * Checks if a specified package is installed in the given workspace.
+ *
+ * @param root - The root directory of the workspace.
+ * @param name - The name of the package to check for.
+ * @returns `true` if the package is installed, `false` otherwise.
  */
-function isPlatformServerInstalled(root) {
+function isPackageInstalled(root, name) {
     try {
-        require.resolve('@angular/platform-server', { paths: [root] });
+        require.resolve(name, { paths: [root] });
         return true;
     }
     catch {

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.3.0-next.0+sha-dcbdb8b';
+const VERSION = '18.3.0-next.0+sha-650aeec';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

uniqueId

@@ -1 +1 @@
-Wed Aug 14 2024 14:26:45 GMT+0000 (Coordinated Universal Time)
+Wed Aug 14 2024 14:47:52 GMT+0000 (Coordinated Universal Time)