@nx/angular 17.1.0-beta.0 → 17.1.0-beta.3

package/fesm2022/nx-angular.mjs

@@ -1,6 +1,6 @@
 import { ROUTER_NAVIGATION } from '@ngrx/router-store';
 import { isObservable, of } from 'rxjs';
-import { concatMap, groupBy, mergeMap, switchMap, filter, map, catchError } from 'rxjs/operators';
+import { concatMap, groupBy, switchMap, mergeMap, filter, map, catchError } from 'rxjs/operators';
 
 /**
  *

package/migrations.json

@@ -278,6 +278,51 @@
       },
       "description": "Update the @angular/cli package version to ~16.2.0.",
       "factory": "./src/migrations/update-16-7-0/update-angular-cli"
+    },
+    "update-angular-cli-version-17-0-0-rc-4": {
+      "cli": "nx",
+      "version": "17.1.0-beta.3",
+      "requires": {
+        "@angular/core": ">=17.0.0-rc.3"
+      },
+      "description": "Update the @angular/cli package version to ~17.0.0-rc.4.",
+      "factory": "./src/migrations/update-17-1-0/update-angular-cli"
+    },
+    "rename-browser-target-to-build-target": {
+      "cli": "nx",
+      "version": "17.1.0-beta.3",
+      "requires": {
+        "@angular/core": ">=17.0.0-rc.3"
+      },
+      "description": "Rename 'browserTarget' to 'buildTarget'.",
+      "factory": "./src/migrations/update-17-1-0/browser-target-to-build-target"
+    },
+    "stub-performance-mark-in-jest-test-setup": {
+      "cli": "nx",
+      "version": "17.1.0-beta.3",
+      "requires": {
+        "@angular/core": ">=17.0.0-rc.3"
+      },
+      "description": "Stubs out 'performance.mark' in the Jest test setup file.",
+      "factory": "./src/migrations/update-17-1-0/stub-performance-mark-in-jest-test-setup"
+    },
+    "replace-nguniversal-builders": {
+      "cli": "nx",
+      "version": "17.1.0-beta.3",
+      "requires": {
+        "@angular/core": ">=17.0.0-rc.3"
+      },
+      "description": "Replace usages of '@nguniversal/builders' with '@angular-devkit/build-angular'.",
+      "factory": "./src/migrations/update-17-1-0/replace-nguniversal-builders"
+    },
+    "replace-nguniversal-engines": {
+      "cli": "nx",
+      "version": "17.1.0-beta.3",
+      "requires": {
+        "@angular/core": ">=17.0.0-rc.3"
+      },
+      "description": "Replace usages of '@nguniversal/' packages with '@angular/ssr'.",
+      "factory": "./src/migrations/update-17-1-0/replace-nguniversal-engines"
     }
   },
   "packageJsonUpdates": {
@@ -1354,6 +1399,96 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "17.1.0": {
+      "version": "17.1.0-beta.3",
+      "x-prompt": "Do you want to update the Angular version to v17?",
+      "requires": {
+        "@angular/core": ">=16.2.0 <17.0.0-rc.3"
+      },
+      "packages": {
+        "@angular-devkit/architect": {
+          "version": "~0.1700.0-rc.4",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-angular": {
+          "version": "~17.0.0-rc.4",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-webpack": {
+          "version": "~0.1700.0-rc.4",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/core": {
+          "version": "~17.0.0-rc.4",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/schematics": {
+          "version": "~17.0.0-rc.4",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/core": {
+          "version": "~17.0.0-rc.3",
+          "alwaysAddToPackageJson": true
+        },
+        "@angular/material": {
+          "version": "~17.0.0-rc.3",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/cdk": {
+          "version": "~17.0.0-rc.3",
+          "alwaysAddToPackageJson": false
+        },
+        "@schematics/angular": {
+          "version": "~17.0.0-rc.4",
+          "alwaysAddToPackageJson": false
+        },
+        "ng-packagr": {
+          "version": "~17.0.0-rc.1",
+          "alwaysAddToPackageJson": false
+        },
+        "zone.js": {
+          "version": "~0.14.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "17.1.0-jest": {
+      "version": "17.1.0-beta.3",
+      "requires": {
+        "@angular-devkit/build-angular": ">=13.0.0 <18.0.0",
+        "@angular/compiler-cli": ">=13.0.0 <18.0.0",
+        "@angular/core": ">=13.0.0 <18.0.0",
+        "@angular/platform-browser-dynamic": ">=13.0.0 <18.0.0",
+        "jest": "^29.0.0"
+      },
+      "packages": {
+        "jest-preset-angular": {
+          "version": "~13.1.3",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "17.1.0-angular-eslint": {
+      "version": "17.1.0-beta.3",
+      "requires": {
+        "eslint": "^7.20.0 || ^8.0.0",
+        "@angular/core": ">= 17.0.0-rc.3 < 18.0.0"
+      },
+      "packages": {
+        "@angular-eslint/eslint-plugin": {
+          "version": "~17.0.0-alpha.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/eslint-plugin-template": {
+          "version": "~17.0.0-alpha.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-eslint/template-parser": {
+          "version": "~17.0.0-alpha.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/ng-package.json

@@ -9,7 +9,6 @@
     "@nx/",
     "@angular-devkit",
     "@angular-eslint/",
-    "@nguniversal/builders",
     "@schematics",
     "@phenomnomnominal/tsquery",
     "@typescript-eslint/",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "17.1.0-beta.0",
+  "version": "17.1.0-beta.3",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -68,7 +68,7 @@
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "~5.0.1",
-    "@typescript-eslint/type-utils": "^5.36.1",
+    "@typescript-eslint/type-utils": "^6.9.1",
     "chalk": "^4.1.0",
     "find-cache-dir": "^3.3.2",
     "ignore": "^5.0.4",
@@ -78,30 +78,25 @@
     "tslib": "^2.3.0",
     "webpack": "^5.80.0",
     "webpack-merge": "^5.8.0",
-    "enquirer": "^2.3.6",
-    "@nx/devkit": "17.1.0-beta.0",
-    "@nx/cypress": "17.1.0-beta.0",
-    "@nx/jest": "17.1.0-beta.0",
-    "@nx/js": "17.1.0-beta.0",
-    "@nx/eslint": "17.1.0-beta.0",
-    "@nx/webpack": "17.1.0-beta.0",
-    "@nx/web": "17.1.0-beta.0",
-    "@nx/workspace": "17.1.0-beta.0",
-    "@nrwl/angular": "17.1.0-beta.0"
+    "@nx/devkit": "17.1.0-beta.3",
+    "@nx/cypress": "17.1.0-beta.3",
+    "@nx/jest": "17.1.0-beta.3",
+    "@nx/js": "17.1.0-beta.3",
+    "@nx/eslint": "17.1.0-beta.3",
+    "@nx/webpack": "17.1.0-beta.3",
+    "@nx/web": "17.1.0-beta.3",
+    "@nx/workspace": "17.1.0-beta.3",
+    "@nrwl/angular": "17.1.0-beta.3"
   },
   "peerDependencies": {
-    "@angular-devkit/build-angular": ">= 14.0.0 < 17.0.0",
-    "@angular-devkit/schematics": ">= 14.0.0 < 17.0.0",
-    "@schematics/angular": ">= 14.0.0 < 17.0.0",
-    "@angular-devkit/core": ">= 14.0.0 < 17.0.0",
-    "@nguniversal/builders": ">= 14.0.0 < 17.0.0",
+    "@angular-devkit/build-angular": "^17.0.0-rc.4",
+    "@angular-devkit/schematics": "^17.0.0-rc.4",
+    "@schematics/angular": "^17.0.0-rc.4",
+    "@angular-devkit/core": "^17.0.0-rc.4",
     "rxjs": "^6.5.3 || ^7.5.0",
     "esbuild": "^0.19.2"
   },
   "peerDependenciesMeta": {
-    "@nguniversal/builders": {
-      "optional": true
-    },
     "esbuild": {
       "optional": true
     }

package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.d.ts

@@ -1,5 +1,5 @@
-import type { Schema } from './schema';
 import { executeWebpackDevServerBuilder } from '../webpack-dev-server/webpack-dev-server.impl';
+import type { Schema } from './schema';
 export declare function executeModuleFederationDevServerBuilder(schema: Schema, context: import('@angular-devkit/architect').BuilderContext): ReturnType<typeof executeWebpackDevServerBuilder | any>;
 declare const _default: any;
 export default _default;

package/src/builders/module-federation-dev-server/module-federation-dev-server.impl.js

@@ -2,20 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeModuleFederationDevServerBuilder = void 0;
 const devkit_1 = require("@nx/devkit");
+const module_federation_1 = require("@nx/webpack/src/utils/module-federation");
+const child_process_1 = require("child_process");
+const fs_1 = require("fs");
 const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
-const webpack_dev_server_impl_1 = require("../webpack-dev-server/webpack-dev-server.impl");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
 const executor_utils_1 = require("nx/src/command-line/run/executor-utils");
-const module_federation_1 = require("../utilities/module-federation");
-const fs_1 = require("fs");
+const project_graph_1 = require("nx/src/project-graph/project-graph");
 const path_1 = require("path");
-const module_federation_2 = require("@nx/webpack/src/utils/module-federation");
-const child_process_1 = require("child_process");
 const rxjs_1 = require("rxjs");
+const module_federation_2 = require("../utilities/module-federation");
+const webpack_dev_server_impl_1 = require("../webpack-dev-server/webpack-dev-server.impl");
 function executeModuleFederationDevServerBuilder(schema, context) {
     // Force Node to resolve to look for the nx binary that is inside node_modules
     const nxBin = require.resolve('nx/bin/nx');
-    const { ...options } = schema;
+    const options = normalizeOptions(schema);
     const projectGraph = (0, devkit_1.readCachedProjectGraph)();
     const { projects: workspaceProjects } = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
     const project = workspaceProjects[context.target.project];
@@ -23,7 +23,7 @@ function executeModuleFederationDevServerBuilder(schema, context) {
         port: options.port,
         host: options.host,
         ssl: options.ssl,
-        buildTarget: options.browserTarget,
+        buildTarget: options.buildTarget,
         parallel: false,
         spa: false,
         withDeps: false,
@@ -56,81 +56,133 @@ function executeModuleFederationDevServerBuilder(schema, context) {
         }
         pathToManifestFile = userPathToManifestFile;
     }
-    (0, module_federation_1.validateDevRemotes)(options, workspaceProjects);
-    const moduleFederationConfig = (0, module_federation_2.getModuleFederationConfig)(project.targets.build.options.tsConfig, context.workspaceRoot, project.root, 'angular');
-    const remotes = (0, module_federation_2.getRemotes)(options.devRemotes, options.skipRemotes, moduleFederationConfig, {
+    (0, module_federation_2.validateDevRemotes)(options, workspaceProjects);
+    const moduleFederationConfig = (0, module_federation_1.getModuleFederationConfig)(project.targets.build.options.tsConfig, context.workspaceRoot, project.root, 'angular');
+    const remotes = (0, module_federation_1.getRemotes)(options.devRemotes, options.skipRemotes, moduleFederationConfig, {
         projectName: project.name,
         projectGraph,
         root: context.workspaceRoot,
     }, pathToManifestFile);
-    let isCollectingStaticRemoteOutput = true;
-    for (const app of remotes.staticRemotes) {
-        const remoteProjectServeTarget = projectGraph.nodes[app].data.targets['serve-static'];
-        const isUsingModuleFederationDevServerExecutor = remoteProjectServeTarget.executor.includes('module-federation-dev-server');
-        let outWithErr = [];
+    const staticRemoteBuildPromise = new Promise((res) => {
+        devkit_1.logger.info(`NX Building ${remotes.staticRemotes.length} static remotes...`);
         const staticProcess = (0, child_process_1.fork)(nxBin, [
-            'run',
-            `${app}:serve-static${context.target.configuration ? `:${context.target.configuration}` : ''}`,
-            ...(isUsingModuleFederationDevServerExecutor
-                ? [`--isInitialHost=false`]
+            'run-many',
+            `--target=build`,
+            `--projects=${remotes.staticRemotes.join(',')}`,
+            ...(context.target.configuration
+                ? [`--configuration=${context.target.configuration}`]
                 : []),
+            ...(options.parallel ? [`--parallel=${options.parallel}`] : []),
         ], {
             cwd: context.workspaceRoot,
             stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
         });
         staticProcess.stdout.on('data', (data) => {
-            if (isCollectingStaticRemoteOutput) {
-                outWithErr.push(data.toString());
-            }
-            else {
-                outWithErr = null;
+            const ANSII_CODE_REGEX = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
+            const stdoutString = data.toString().replace(ANSII_CODE_REGEX, '');
+            if (stdoutString.includes('Successfully ran target build')) {
                 staticProcess.stdout.removeAllListeners('data');
+                devkit_1.logger.info(`NX Built ${remotes.staticRemotes.length} static remotes`);
+                res();
             }
         });
         staticProcess.stderr.on('data', (data) => devkit_1.logger.info(data.toString()));
         staticProcess.on('exit', (code) => {
             if (code !== 0) {
-                devkit_1.logger.info(outWithErr.join(''));
-                throw new Error(`Remote failed to start. See above for errors.`);
+                throw new Error(`Remotes failed to build. See above for errors.`);
             }
         });
         process.on('SIGTERM', () => staticProcess.kill('SIGTERM'));
         process.on('exit', () => staticProcess.kill('SIGTERM'));
-    }
-    const devRemotes$ = [];
-    for (const app of remotes.devRemotes) {
-        if (!workspaceProjects[app].targets?.['serve']) {
-            throw new Error(`Could not find "serve" target in "${app}" project.`);
-        }
-        else if (!workspaceProjects[app].targets?.['serve'].executor) {
-            throw new Error(`Could not find executor for "serve" target in "${app}" project.`);
-        }
-        const runOptions = {};
-        const [collection, executor] = workspaceProjects[app].targets['serve'].executor.split(':');
-        const isUsingModuleFederationDevServerExecutor = executor.includes('module-federation-dev-server');
-        const { schema } = (0, executor_utils_1.getExecutorInformation)(collection, executor, devkit_1.workspaceRoot);
-        if ((options.verbose && schema.additionalProperties) ||
-            'verbose' in schema.properties) {
-            runOptions.verbose = options.verbose;
-        }
-        if (isUsingModuleFederationDevServerExecutor) {
-            runOptions.isInitialHost = false;
+    });
+    return (0, rxjs_1.from)(staticRemoteBuildPromise).pipe((0, rxjs_1.concatMap)(() => {
+        let isCollectingStaticRemoteOutput = true;
+        for (const app of remotes.staticRemotes) {
+            const remoteProjectServeTarget = projectGraph.nodes[app].data.targets['serve-static'];
+            const isUsingModuleFederationDevServerExecutor = remoteProjectServeTarget.executor.includes('module-federation-dev-server');
+            let outWithErr = [];
+            const staticProcess = (0, child_process_1.fork)(nxBin, [
+                'run',
+                `${app}:serve-static${context.target.configuration
+                    ? `:${context.target.configuration}`
+                    : ''}`,
+                ...(isUsingModuleFederationDevServerExecutor
+                    ? [`--isInitialHost=false`]
+                    : []),
+            ], {
+                cwd: context.workspaceRoot,
+                stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
+            });
+            staticProcess.stdout.on('data', (data) => {
+                if (isCollectingStaticRemoteOutput) {
+                    outWithErr.push(data.toString());
+                }
+                else {
+                    outWithErr = null;
+                    staticProcess.stdout.removeAllListeners('data');
+                }
+            });
+            staticProcess.stderr.on('data', (data) => devkit_1.logger.info(data.toString()));
+            staticProcess.on('exit', (code) => {
+                if (code !== 0) {
+                    devkit_1.logger.info(outWithErr.join(''));
+                    throw new Error(`Remote failed to start. See above for errors.`);
+                }
+            });
+            process.on('SIGTERM', () => staticProcess.kill('SIGTERM'));
+            process.on('exit', () => staticProcess.kill('SIGTERM'));
         }
-        const serve$ = (0, ngcli_adapter_1.scheduleTarget)(context.workspaceRoot, {
-            project: app,
-            target: 'serve',
-            configuration: context.target.configuration,
-            runOptions,
-        }, options.verbose).then((obs) => {
-            obs.toPromise().catch((err) => {
-                throw new Error(`Remote '${app}' failed to serve correctly due to the following: \r\n${err.toString()}`);
+        const devRemotes$ = [];
+        for (const app of remotes.devRemotes) {
+            if (!workspaceProjects[app].targets?.['serve']) {
+                throw new Error(`Could not find "serve" target in "${app}" project.`);
+            }
+            else if (!workspaceProjects[app].targets?.['serve'].executor) {
+                throw new Error(`Could not find executor for "serve" target in "${app}" project.`);
+            }
+            const runOptions = {};
+            const [collection, executor] = workspaceProjects[app].targets['serve'].executor.split(':');
+            const isUsingModuleFederationDevServerExecutor = executor.includes('module-federation-dev-server');
+            const { schema } = (0, executor_utils_1.getExecutorInformation)(collection, executor, devkit_1.workspaceRoot);
+            if ((options.verbose && schema.additionalProperties) ||
+                'verbose' in schema.properties) {
+                runOptions.verbose = options.verbose;
+            }
+            if (isUsingModuleFederationDevServerExecutor) {
+                runOptions.isInitialHost = false;
+            }
+            const serve$ = (0, ngcli_adapter_1.scheduleTarget)(context.workspaceRoot, {
+                project: app,
+                target: 'serve',
+                configuration: context.target.configuration,
+                runOptions,
+            }, options.verbose).then((obs) => {
+                obs.toPromise().catch((err) => {
+                    throw new Error(`Remote '${app}' failed to serve correctly due to the following: \r\n${err.toString()}`);
+                });
             });
-        });
-        devRemotes$.push(serve$);
-    }
-    return devRemotes$.length > 0
-        ? (0, rxjs_1.combineLatest)([...devRemotes$]).pipe((0, rxjs_1.concatMap)(() => currExecutor))
-        : currExecutor;
+            devRemotes$.push(serve$);
+        }
+        return devRemotes$.length > 0
+            ? (0, rxjs_1.combineLatest)([...devRemotes$]).pipe((0, rxjs_1.concatMap)(() => currExecutor))
+            : currExecutor;
+    }));
 }
 exports.executeModuleFederationDevServerBuilder = executeModuleFederationDevServerBuilder;
 exports.default = require('@angular-devkit/architect').createBuilder(executeModuleFederationDevServerBuilder);
+function normalizeOptions(schema) {
+    let buildTarget = schema.buildTarget;
+    if (schema.browserTarget) {
+        buildTarget ??= schema.browserTarget;
+        delete schema.browserTarget;
+    }
+    return {
+        ...schema,
+        buildTarget,
+        host: schema.host ?? 'localhost',
+        port: schema.port ?? 4200,
+        liveReload: schema.liveReload ?? true,
+        open: schema.open ?? false,
+        ssl: schema.ssl ?? false,
+    };
+}

package/src/builders/module-federation-dev-server/schema.d.ts

@@ -1,15 +1,14 @@
-export interface Schema {
-  browserTarget: string;
-  port: number;
-  host: string;
+interface BaseSchema {
+  port?: number;
+  host?: string;
   proxyConfig?: string;
-  ssl: boolean;
+  ssl?: boolean;
   sslKey?: string;
   sslCert?: string;
   headers?: Record<string, string>;
-  open: boolean;
+  open?: boolean;
   verbose?: boolean;
-  liveReload: boolean;
+  liveReload?: boolean;
   publicHost?: string;
   allowedHosts?: string[];
   servePath?: string;
@@ -22,4 +21,21 @@ export interface Schema {
   pathToManifestFile?: string;
   static?: boolean;
   isInitialHost?: boolean;
+  parallel?: number;
 }
+
+export type SchemaWithBrowserTarget = BaseSchema & {
+  browserTarget: string;
+};
+
+export type SchemaWithBuildTarget = BaseSchema & {
+  buildTarget: string;
+};
+
+export type Schema = SchemaWithBrowserTarget | SchemaWithBuildTarget;
+
+export type NormalizedSchema = SchemaWithBuildTarget & {
+  liveReload: boolean;
+  open: boolean;
+  ssl: boolean;
+};

package/src/builders/module-federation-dev-server/schema.json

@@ -8,13 +8,19 @@
   "presets": [
     {
       "name": "Using a Different Port",
-      "keys": ["browserTarget", "port"]
+      "keys": ["buildTarget", "port"]
     }
   ],
   "properties": {
     "browserTarget": {
       "type": "string",
-      "description": "A browser builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
+      "description": "A browser builder target to serve in the format of `project:target[:configuration]`.",
+      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$",
+      "x-deprecated": "Use 'buildTarget' instead. It will be removed in Nx v18."
+    },
+    "buildTarget": {
+      "type": "string",
+      "description": "A build builder target to serve in the format of `project:target[:configuration]`.",
       "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
     },
     "port": {
@@ -132,9 +138,13 @@
       "description": "Whether the host that is running this executor is the first in the project tree to do so.",
       "default": true,
       "x-priority": "internal"
+    },
+    "parallel": {
+      "type": "number",
+      "description": "Max number of parallel processes for building static remotes"
     }
   },
   "additionalProperties": false,
-  "required": ["browserTarget"],
+  "anyOf": [{ "required": ["buildTarget"] }, { "required": ["browserTarget"] }],
   "examplesFile": "../../../docs/module-federation-dev-server-examples.md"
 }

package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.d.ts

@@ -1,4 +1,4 @@
 import type { Schema } from './schema';
-export declare function executeModuleFederationDevSSRBuilder(schema: Schema, context: import('@angular-devkit/architect').BuilderContext): import("rxjs").Observable<import("@nguniversal/builders").SSRDevServerBuilderOutput>;
+export declare function executeModuleFederationDevSSRBuilder(schema: Schema, context: import('@angular-devkit/architect').BuilderContext): import("rxjs").Observable<unknown>;
 declare const _default: any;
 export default _default;

package/src/builders/module-federation-dev-ssr/module-federation-dev-ssr.impl.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeModuleFederationDevSSRBuilder = void 0;
-const project_graph_1 = require("nx/src/project-graph/project-graph");
-const executor_utils_1 = require("nx/src/command-line/run/executor-utils");
 const devkit_1 = require("@nx/devkit");
-const module_federation_1 = require("../utilities/module-federation");
-const operators_1 = require("rxjs/operators");
-const rxjs_1 = require("rxjs");
-const path_1 = require("path");
 const child_process_1 = require("child_process");
-const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
 const fs_1 = require("fs");
+const ngcli_adapter_1 = require("nx/src/adapter/ngcli-adapter");
+const executor_utils_1 = require("nx/src/command-line/run/executor-utils");
+const project_graph_1 = require("nx/src/project-graph/project-graph");
+const path_1 = require("path");
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
+const module_federation_1 = require("../utilities/module-federation");
 function executeModuleFederationDevSSRBuilder(schema, context) {
     const { ...options } = schema;
     const projectGraph = (0, devkit_1.readCachedProjectGraph)();
@@ -87,7 +88,11 @@ function executeModuleFederationDevSSRBuilder(schema, context) {
         });
         remoteProcessPromises.push(remotePromise);
     }
-    return (0, rxjs_1.from)(Promise.all(remoteProcessPromises)).pipe((0, operators_1.switchMap)(() => (0, rxjs_1.from)(Promise.resolve().then(() => require('@nguniversal/builders')))), (0, operators_1.switchMap)(({ executeSSRDevServerBuilder }) => executeSSRDevServerBuilder(options, context)));
+    const { major: angularMajorVersion } = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    const { executeSSRDevServerBuilder } = angularMajorVersion >= 17
+        ? require('@angular-devkit/build-angular')
+        : require('@nguniversal/builders');
+    return (0, rxjs_1.from)(Promise.all(remoteProcessPromises)).pipe((0, operators_1.switchMap)(() => executeSSRDevServerBuilder(options, context)));
 }
 exports.executeModuleFederationDevSSRBuilder = executeModuleFederationDevSSRBuilder;
 exports.default = require('@angular-devkit/architect').createBuilder(executeModuleFederationDevSSRBuilder);

package/src/builders/webpack-browser/schema.json

@@ -41,7 +41,7 @@
       "oneOf": [
         {
           "type": "array",
-          "description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'. _Note: supported in Angular versions >= 15.0.0_.",
+          "description": "A list of polyfills to include in the build. Can be a full path for a file, relative to the current workspace or module specifier. Example: 'zone.js'.",
           "items": {
             "type": "string",
             "uniqueItems": true
@@ -106,7 +106,7 @@
               "input": {
                 "type": "string",
                 "description": "The file to include.",
-                "pattern": "\\.(?:css|scss|sass|less|styl)$"
+                "pattern": "\\.(?:css|scss|sass|less)$"
               },
               "bundleName": {
                 "type": "string",
@@ -125,7 +125,7 @@
           {
             "type": "string",
             "description": "The file to include.",
-            "pattern": "\\.(?:css|scss|sass|less|styl)$"
+            "pattern": "\\.(?:css|scss|sass|less)$"
           }
         ]
       },
@@ -228,7 +228,7 @@
     },
     "outputPath": {
       "type": "string",
-      "description": "The full path for the new output directory, relative to the current workspace.\n\nBy default, writes output to a folder named dist/ in the current project."
+      "description": "The full path for the new output directory, relative to the current workspace."
     },
     "resourcesOutputPath": {
       "type": "string",
@@ -278,12 +278,12 @@
     },
     "vendorChunk": {
       "type": "boolean",
-      "description": "Generate a seperate bundle containing only vendor libraries. This option should only be used for development to reduce the incremental compilation time.",
+      "description": "Generate a separate bundle containing only vendor libraries. This option should only be used for development to reduce the incremental compilation time.",
       "default": false
     },
     "commonChunk": {
       "type": "boolean",
-      "description": "Generate a seperate bundle containing code used across multiple bundles.",
+      "description": "Generate a separate bundle containing code used across multiple bundles.",
       "default": true
     },
     "baseHref": {
@@ -439,7 +439,7 @@
       "enum": ["none", "anonymous", "use-credentials"]
     },
     "allowedCommonJsDependencies": {
-      "description": "A list of CommonJS packages that are allowed to be used without a build time warning.",
+      "description": "A list of CommonJS or AMD packages that are allowed to be used without a build time warning. Use `'*'` to allow all.",
       "type": "array",
       "items": {
         "type": "string"