@nrwl/angular 14.8.7 → 14.9.0-beta.1

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

@@ -1,113 +1,328 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "$schema": "http://json-schema.org/draft-07/schema",
   "title": "Schema for Webpack Server",
-  "description": "The webpack-server executor is very similar to the standard dev server builder provided by the Angular Devkit. It is usually used in tandem with `@nrwl/angular:webpack-browser` when your Angular application uses a custom webpack configuration.",
-  "examplesFile": "../../../docs/webpack-server-examples.md",
+  "description": "The webpack-dev-server executor is very similar to the standard server builder provided by the Angular Devkit. It is usually used in tandem with `@nrwl/angular:webpack-browser` when your Angular application uses a custom webpack configuration and NgUniversal for SSR.",
   "type": "object",
-  "presets": [
-    {
-      "name": "Using a Different Port",
-      "keys": ["browserTarget", "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`.",
-      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+    "assets": {
+      "type": "array",
+      "description": "List of static application assets. _Note: only supported in Angular versions >= 15.1.0_",
+      "default": [],
+      "items": {
+        "$ref": "#/definitions/assetPattern"
+      }
     },
-    "port": {
-      "type": "number",
-      "description": "Port to listen on.",
-      "default": 4200
+    "main": {
+      "type": "string",
+      "description": "The full path for the main entry point to the server app, relative to the current workspace."
     },
-    "host": {
+    "tsConfig": {
       "type": "string",
-      "description": "Host to listen on.",
-      "default": "localhost"
+      "default": "tsconfig.app.json",
+      "description": "The full path for the TypeScript configuration file, relative to the current workspace."
     },
-    "proxyConfig": {
+    "inlineStyleLanguage": {
+      "description": "The stylesheet language to use for the application's inline component styles.",
       "type": "string",
-      "description": "Proxy configuration file. For more information, see https://angular.io/guide/build#proxying-to-a-backend-server."
+      "default": "css",
+      "enum": ["css", "less", "sass", "scss"]
     },
-    "ssl": {
-      "type": "boolean",
-      "description": "Serve using HTTPS.",
-      "default": false
+    "stylePreprocessorOptions": {
+      "description": "Options to pass to style preprocessors",
+      "type": "object",
+      "properties": {
+        "includePaths": {
+          "description": "Paths to include. Paths will be resolved to project root.",
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "default": []
+        }
+      },
+      "additionalProperties": false
+    },
+    "optimization": {
+      "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking and dead-code elimination. For more information, see https://angular.io/guide/workspace-config#optimization-configuration.",
+      "default": true,
+      "x-user-analytics": "ep.ng_optimization",
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "scripts": {
+              "type": "boolean",
+              "description": "Enables optimization of the scripts output.",
+              "default": true
+            },
+            "styles": {
+              "type": "boolean",
+              "description": "Enables optimization of the styles output.",
+              "default": true
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "boolean"
+        }
+      ]
+    },
+    "fileReplacements": {
+      "description": "Replace compilation source files with other compilation source files in the build.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/fileReplacement"
+      },
+      "default": []
     },
-    "sslKey": {
+    "outputPath": {
       "type": "string",
-      "description": "SSL key to use for serving HTTPS."
+      "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."
     },
-    "sslCert": {
+    "resourcesOutputPath": {
       "type": "string",
-      "description": "SSL certificate to use for serving HTTPS."
+      "description": "The path where style resources will be placed, relative to outputPath."
     },
-    "headers": {
-      "type": "object",
-      "description": "Custom HTTP headers to be added to all responses.",
-      "propertyNames": {
-        "pattern": "^[-_A-Za-z0-9]+$"
-      },
-      "additionalProperties": {
-        "type": "string"
-      }
+    "sourceMap": {
+      "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
+      "default": false,
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "scripts": {
+              "type": "boolean",
+              "description": "Output source maps for all scripts.",
+              "default": true
+            },
+            "styles": {
+              "type": "boolean",
+              "description": "Output source maps for all styles.",
+              "default": true
+            },
+            "hidden": {
+              "type": "boolean",
+              "description": "Output source maps used for error reporting tools.",
+              "default": false
+            },
+            "vendor": {
+              "type": "boolean",
+              "description": "Resolve vendor packages source maps.",
+              "default": false
+            }
+          },
+          "additionalProperties": false
+        },
+        {
+          "type": "boolean"
+        }
+      ]
+    },
+    "deployUrl": {
+      "type": "string",
+      "description": "URL where files will be deployed.",
+      "x-deprecated": "Use \"baseHref\" browser builder option, \"APP_BASE_HREF\" DI token or a combination of both instead. For more information, see https://angular.io/guide/deployment#the-deploy-url."
     },
-    "open": {
+    "vendorChunk": {
       "type": "boolean",
-      "description": "Opens the url in default browser.",
-      "default": false,
-      "alias": "o"
+      "description": "Generate a seperate bundle containing only vendor libraries. This option should only be used for development to reduce the incremental compilation time. _Note: supported in Angular versions >= 15.1.0_",
+      "default": false
     },
     "verbose": {
       "type": "boolean",
-      "description": "Adds more details to output logging."
+      "description": "Adds more details to output logging.",
+      "default": false
     },
-    "liveReload": {
+    "progress": {
       "type": "boolean",
-      "description": "Whether to reload the page on change, using live-reload.",
+      "description": "Log progress to the console while building.",
       "default": true
     },
-    "publicHost": {
+    "i18nMissingTranslation": {
       "type": "string",
-      "description": "The URL that the browser client (or live-reload client, if enabled) should use to connect to the development server. Use for a complex dev server setup, such as one with reverse proxies."
+      "description": "How to handle missing translations for i18n.",
+      "enum": ["warning", "error", "ignore"],
+      "default": "warning"
     },
-    "allowedHosts": {
-      "type": "array",
-      "description": "List of hosts that are allowed to access the dev server.",
-      "default": [],
-      "items": {
-        "type": "string"
-      }
+    "i18nDuplicateTranslation": {
+      "type": "string",
+      "description": "How to handle duplicate translations for i18n.",
+      "enum": ["warning", "error", "ignore"],
+      "default": "warning"
+    },
+    "localize": {
+      "description": "Translate the bundles in one or more locales.",
+      "oneOf": [
+        {
+          "type": "boolean",
+          "description": "Translate all locales."
+        },
+        {
+          "type": "array",
+          "description": "List of locales ID's to translate.",
+          "minItems": 1,
+          "items": {
+            "type": "string",
+            "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?(-x(-[a-zA-Z0-9]{1,8})+)?$"
+          }
+        }
+      ]
     },
-    "servePath": {
+    "outputHashing": {
       "type": "string",
-      "description": "The pathname where the app will be served."
+      "description": "Define the output filename cache-busting hashing mode.",
+      "default": "none",
+      "enum": ["none", "all", "media", "bundles"]
+    },
+    "deleteOutputPath": {
+      "type": "boolean",
+      "description": "Delete the output path before building.",
+      "default": true
+    },
+    "preserveSymlinks": {
+      "type": "boolean",
+      "description": "Do not use the real path when resolving modules. If unset then will default to `true` if NodeJS option --preserve-symlinks is set."
+    },
+    "extractLicenses": {
+      "type": "boolean",
+      "description": "Extract all licenses in a separate file, in the case of production builds only.",
+      "default": true
     },
-    "disableHostCheck": {
+    "namedChunks": {
       "type": "boolean",
-      "description": "Don't verify connected clients are part of allowed hosts.",
+      "description": "Use file name for lazy loaded chunks.",
       "default": false
     },
-    "hmr": {
+    "externalDependencies": {
+      "description": "Exclude the listed external dependencies from being bundled into the bundle. Instead, the created bundle relies on these dependencies to be available during runtime.",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
+    "bundleDependencies": {
+      "description": "Which external dependencies to bundle into the bundle. By default, all of node_modules will be bundled. _Note: This is only supported in Angular versions >= 14.0.0, < 15.0.0. It was removed in Angular 15._",
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "string",
+          "enum": ["none", "all"]
+        }
+      ]
+    },
+    "statsJson": {
       "type": "boolean",
-      "description": "Enable hot module replacement.",
+      "description": "Generates a 'stats.json' file which can be analyzed using tools such as 'webpack-bundle-analyzer'.",
       "default": false
     },
     "watch": {
       "type": "boolean",
-      "description": "Rebuild on change.",
-      "default": true
+      "description": "Run build when files change.",
+      "default": false
     },
     "poll": {
       "type": "number",
       "description": "Enable and define the file watching poll time period in milliseconds."
     },
+    "customWebpackConfig": {
+      "description": "Options for additional webpack configurations.",
+      "type": "object",
+      "properties": {
+        "path": {
+          "description": "Path to additional webpack configuration, relative to the workspace root.",
+          "type": "string"
+        }
+      },
+      "x-priority": "important",
+      "additionalProperties": false
+    },
     "buildLibsFromSource": {
       "type": "boolean",
-      "description": "Read buildable libraries from source instead of building them separately. If not set, it will take the value specified in the `browserTarget` options, or it will default to `true` if it's also not set in the `browserTarget` options."
+      "description": "Read buildable libraries from source instead of building them separately.",
+      "default": true,
+      "x-priority": "important"
     }
   },
   "additionalProperties": false,
-  "required": ["browserTarget"]
+  "required": ["outputPath", "main", "tsConfig"],
+  "definitions": {
+    "assetPattern": {
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "followSymlinks": {
+              "type": "boolean",
+              "default": false,
+              "description": "Allow glob patterns to follow symlink directories. This allows subdirectories of the symlink to be searched."
+            },
+            "glob": {
+              "type": "string",
+              "description": "The pattern to match."
+            },
+            "input": {
+              "type": "string",
+              "description": "The input directory path in which to apply 'glob'. Defaults to the project root."
+            },
+            "ignore": {
+              "description": "An array of globs to ignore.",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            "output": {
+              "type": "string",
+              "description": "Absolute path within the output."
+            }
+          },
+          "additionalProperties": false,
+          "required": ["glob", "input", "output"]
+        },
+        {
+          "type": "string"
+        }
+      ]
+    },
+    "fileReplacement": {
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "src": {
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+            },
+            "replaceWith": {
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+            }
+          },
+          "additionalProperties": false,
+          "required": ["src", "replaceWith"]
+        },
+        {
+          "type": "object",
+          "properties": {
+            "replace": {
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+            },
+            "with": {
+              "type": "string",
+              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+            }
+          },
+          "additionalProperties": false,
+          "required": ["replace", "with"]
+        }
+      ]
+    }
+  }
 }

package/src/builders/webpack-server/validate-options.d.ts

@@ -0,0 +1,2 @@
+import type { Schema } from './schema';
+export declare function validateOptions(options: Schema): void;

package/src/builders/webpack-server/validate-options.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOptions = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const semver_1 = require("semver");
+const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
+function validateOptions(options) {
+    const angularVersionInfo = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    validateAssets(options, angularVersionInfo);
+    validateBundleDependencies(options, angularVersionInfo);
+    validateVendorChunk(options, angularVersionInfo);
+}
+exports.validateOptions = validateOptions;
+function validateAssets(options, { version }) {
+    if ((0, semver_1.lt)(version, '15.1.0') &&
+        Array.isArray(options.assets) &&
+        options.assets.length > 0) {
+        throw new Error((0, devkit_1.stripIndents) `The "assets" option is supported from Angular >= 15.1.0. You are currently using "${version}".
+    You can resolve this error by removing the "assets" option or by migrating to Angular 15.1.0.`);
+    }
+}
+function validateBundleDependencies(options, { major, version }) {
+    if (major >= 15 && options.bundleDependencies) {
+        throw new Error((0, devkit_1.stripIndents) `The "bundleDependencies" option was removed in Angular version 15. You are currently using "${version}".
+    You can resolve this error by removing the "bundleDependencies" option.`);
+    }
+}
+function validateVendorChunk(options, { version }) {
+    if ((0, semver_1.lt)(version, '15.1.0') && options.vendorChunk) {
+        throw new Error((0, devkit_1.stripIndents) `The "vendorChunk" option is supported from Angular >= 15.1.0. You are currently using "${version}".
+    You can resolve this error by removing the "vendorChunk" option or by migrating to Angular 15.1.0.`);
+    }
+}
+//# sourceMappingURL=validate-options.js.map

package/src/builders/webpack-server/validate-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-options.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/validate-options.ts"],"names":[],"mappings":";;;AAAA,yCAA4C;AAC5C,mCAA4B;AAE5B,2FAAiG;AAGjG,SAAgB,eAAe,CAAC,OAAe;IAC7C,MAAM,kBAAkB,GAAG,IAAA,sDAA8B,GAAE,CAAC;IAC5D,cAAc,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAC5C,0BAA0B,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IACxD,mBAAmB,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;AACnD,CAAC;AALD,0CAKC;AAED,SAAS,cAAc,CAAC,OAAe,EAAE,EAAE,OAAO,EAAe;IAC/D,IACE,IAAA,WAAE,EAAC,OAAO,EAAE,QAAQ,CAAC;QACrB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;QAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EACzB;QACA,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,qFAAqF,OAAO;kGAC1B,CAAC,CAAC;KACjG;AACH,CAAC;AAED,SAAS,0BAA0B,CACjC,OAAe,EACf,EAAE,KAAK,EAAE,OAAO,EAAe;IAE/B,IAAI,KAAK,IAAI,EAAE,IAAI,OAAO,CAAC,kBAAkB,EAAE;QAC7C,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,+FAA+F,OAAO;4EAC1D,CAAC,CAAC;KAC3E;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAe,EAAE,EAAE,OAAO,EAAe;IACpE,IAAI,IAAA,WAAE,EAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,WAAW,EAAE;QAChD,MAAM,IAAI,KAAK,CAAC,IAAA,qBAAY,EAAA,0FAA0F,OAAO;uGAC1B,CAAC,CAAC;KACtG;AACH,CAAC"}

package/src/builders/webpack-server/webpack-server.impl.d.ts

@@ -1,5 +1,5 @@
-import { BuilderContext } from '@angular-devkit/architect';
-import type { Schema } from './schema';
-export declare function executeWebpackServerBuilder(rawOptions: Schema, context: BuilderContext): import("rxjs").Observable<import("@angular-devkit/build-angular").DevServerBuilderOutput>;
+import { Observable } from 'rxjs';
+import { Schema } from './schema';
+export declare function executeWebpackServerBuilder(options: Schema, context: import('@angular-devkit/architect').BuilderContext): Observable<import('@angular-devkit/build-angular').ServerBuilderOutput>;
 declare const _default: any;
 export default _default;

package/src/builders/webpack-server/webpack-server.impl.js

@@ -2,89 +2,68 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeWebpackServerBuilder = void 0;
 const tslib_1 = require("tslib");
-const architect_1 = require("@angular-devkit/architect");
-const build_angular_1 = require("@angular-devkit/build-angular");
 const devkit_1 = require("@nrwl/devkit");
-const webpack_nx_build_coordination_plugin_1 = require("@nrwl/webpack/src/plugins/webpack-nx-build-coordination-plugin");
-const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
-const project_graph_1 = require("nx/src/project-graph/project-graph");
 const fs_1 = require("fs");
-const operators_1 = require("nx/src/project-graph/operators");
-const webpack_merge_1 = require("webpack-merge");
+const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
+const semver_1 = require("semver");
+const angular_version_utils_1 = require("../../executors/utilities/angular-version-utils");
+const buildable_libs_1 = require("../utilities/buildable-libs");
 const webpack_1 = require("../utilities/webpack");
-const lib_1 = require("./lib");
-function executeWebpackServerBuilder(rawOptions, context) {
-    var _a, _b, _c, _d, _e;
-    process.env.NX_TSCONFIG_PATH = (0, devkit_1.joinPathFragments)(context.workspaceRoot, 'tsconfig.base.json');
-    const options = (0, lib_1.normalizeOptions)(rawOptions);
-    const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget);
-    const browserTargetProjectConfiguration = (0, project_graph_1.readCachedProjectConfiguration)(parsedBrowserTarget.project);
-    const buildTarget = browserTargetProjectConfiguration.targets[parsedBrowserTarget.target];
-    const buildTargetConfiguration = parsedBrowserTarget.configuration
-        ? buildTarget.configurations[parsedBrowserTarget.configuration]
-        : buildTarget.defaultConfiguration
-            ? buildTarget.configurations[buildTarget.defaultConfiguration]
-            : undefined;
-    const buildLibsFromSource = (_c = (_b = (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.buildLibsFromSource) !== null && _b !== void 0 ? _b : buildTarget.options.buildLibsFromSource) !== null && _c !== void 0 ? _c : true;
-    const customWebpackConfig = (_d = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.customWebpackConfig) !== null && _d !== void 0 ? _d : buildTarget.options.customWebpackConfig;
-    let pathToWebpackConfig;
+const validate_options_1 = require("./validate-options");
+function buildServerApp(options, context) {
+    const { buildLibsFromSource, customWebpackConfig } = options, delegateOptions = tslib_1.__rest(options, ["buildLibsFromSource", "customWebpackConfig"]);
+    // If there is a path to custom webpack config
+    // Invoke our own support for custom webpack config
     if (customWebpackConfig && customWebpackConfig.path) {
-        pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, customWebpackConfig.path);
-        if (!(0, fs_1.existsSync)(pathToWebpackConfig)) {
+        const pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, customWebpackConfig.path);
+        if ((0, fs_1.existsSync)(pathToWebpackConfig)) {
+            return buildServerAppWithCustomWebpackConfiguration(delegateOptions, context, pathToWebpackConfig);
+        }
+        else {
             throw new Error(`Custom Webpack Config File Not Found!\nTo use a custom webpack config, please ensure the path to the custom webpack file is correct: \n${pathToWebpackConfig}`);
         }
     }
-    let dependencies;
-    if (!buildLibsFromSource) {
-        const buildTargetTsConfigPath = (_e = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.tsConfig) !== null && _e !== void 0 ? _e : buildTarget.options.tsConfig;
-        const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_1.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, parsedBrowserTarget.target, context.target.configuration);
-        dependencies = result.dependencies;
-        const updatedTsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, devkit_1.joinPathFragments)(context.workspaceRoot, buildTargetTsConfigPath), context.workspaceRoot, result.target.data.root, dependencies);
-        process.env.NX_TSCONFIG_PATH = updatedTsConfig;
-        // We can't just pass the tsconfig path in memory to the angular builder
-        // function because we can't pass the build target options to it, the build
-        // targets options will be retrieved by the builder from the project
-        // configuration. Therefore, we patch the method in the context to retrieve
-        // the target options to overwrite the tsconfig path to use the generated
-        // one with the updated path mappings.
-        const originalGetTargetOptions = context.getTargetOptions;
-        context.getTargetOptions = (target) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const options = yield originalGetTargetOptions(target);
-            options.tsConfig = updatedTsConfig;
-            return options;
-        });
-    }
-    return (0, build_angular_1.executeDevServerBuilder)(options, context, {
+    return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_1.switchMap)(({ executeServerBuilder }) => executeServerBuilder(delegateOptions, context)));
+}
+function buildServerAppWithCustomWebpackConfiguration(options, context, pathToWebpackConfig) {
+    return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_1.switchMap)(({ executeServerBuilder }) => executeServerBuilder(options, context, {
         webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!buildLibsFromSource) {
-                const workspaceDependencies = dependencies
-                    .filter((dep) => !(0, operators_1.isNpmProject)(dep.node))
-                    .map((dep) => dep.node.name);
-                // default for `nx run-many` is --all projects
-                // by passing an empty string for --projects, run-many will default to
-                // run the target for all projects.
-                // This will occur when workspaceDependencies = []
-                if (workspaceDependencies.length > 0) {
-                    baseWebpackConfig.plugins.push(new webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin(`nx run-many --target=${parsedBrowserTarget.target} --projects=${workspaceDependencies.join(',')}`));
-                }
-            }
-            if (!pathToWebpackConfig) {
-                return baseWebpackConfig;
+            // Angular 15 auto includes code from @angular/platform-server
+            // This includes the code outside the shared scope created by ModuleFederation
+            // This code will be included in the generated code from our generators,
+            // maintaining it within the shared scope.
+            // Therefore, if the build is an MF Server build, remove the auto-includes from
+            // the base webpack config from Angular
+            let mergedConfig = yield (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, options, context.target);
+            if (mergedConfig.plugins
+                .map((p) => p.constructor.name)
+                .includes('UniversalFederationPlugin')) {
+                mergedConfig.entry.main = mergedConfig.entry.main.filter((m) => !m.startsWith('@angular/platform-server/init'));
+                mergedConfig.module.rules = mergedConfig.module.rules.filter((m) => !m.loader
+                    ? true
+                    : !m.loader.endsWith('@angular-devkit/build-angular/src/builders/server/platform-server-exports-loader.js'));
             }
-            const customWebpackConfiguration = (0, webpack_1.resolveCustomWebpackConfig)(pathToWebpackConfig, buildTarget.options.tsConfig);
-            // The extra Webpack configuration file can also export a Promise, for instance:
-            // `module.exports = new Promise(...)`. If it exports a single object, but not a Promise,
-            // then await will just resolve that object.
-            const config = yield customWebpackConfiguration;
-            // The extra Webpack configuration file can export a synchronous or asynchronous function,
-            // for instance: `module.exports = async config => { ... }`.
-            if (typeof config === 'function') {
-                return config(baseWebpackConfig, buildTargetConfiguration, context.target);
-            }
-            return (0, webpack_merge_1.merge)(baseWebpackConfig, config);
+            return mergedConfig;
         }),
-    });
+    })));
+}
+function executeWebpackServerBuilder(options, context) {
+    var _a;
+    (0, validate_options_1.validateOptions)(options);
+    const installedAngularVersionInfo = (0, angular_version_utils_1.getInstalledAngularVersionInfo)();
+    // default bundleDependencies to true if supported by Angular version
+    if ((0, semver_1.lt)(installedAngularVersionInfo.version, '15.0.0') &&
+        options.bundleDependencies === undefined) {
+        options.bundleDependencies = true;
+    }
+    (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : (options.buildLibsFromSource = true);
+    if (!options.buildLibsFromSource) {
+        const { tsConfigPath } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(options.tsConfig, context);
+        options.tsConfig = tsConfigPath;
+    }
+    return buildServerApp(options, context);
 }
 exports.executeWebpackServerBuilder = executeWebpackServerBuilder;
-exports.default = (0, architect_1.createBuilder)(executeWebpackServerBuilder);
+exports.default = require('@angular-devkit/architect').createBuilder(executeWebpackServerBuilder);
 //# sourceMappingURL=webpack-server.impl.js.map

package/src/builders/webpack-server/webpack-server.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yDAA0E;AAC1E,iEAGuC;AAEvC,yCAIsB;AACtB,yHAAkH;AAClH,6FAI4D;AAC5D,sEAAoF;AACpF,2BAAgC;AAChC,8DAA8D;AAC9D,iDAAsC;AACtC,kDAAkE;AAClE,+BAAyC;AAGzC,SAAgB,2BAA2B,CACzC,UAAkB,EAClB,OAAuB;;IAEvB,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,IAAA,0BAAiB,EAC9C,OAAO,CAAC,aAAa,EACrB,oBAAoB,CACrB,CAAC;IAEF,MAAM,OAAO,GAAG,IAAA,sBAAgB,EAAC,UAAU,CAAC,CAAC;IAE7C,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACrE,MAAM,iCAAiC,GAAG,IAAA,8CAA8B,EACtE,mBAAmB,CAAC,OAAO,CAC5B,CAAC;IAEF,MAAM,WAAW,GACf,iCAAiC,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAExE,MAAM,wBAAwB,GAAG,mBAAmB,CAAC,aAAa;QAChE,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,mBAAmB,CAAC,aAAa,CAAC;QAC/D,CAAC,CAAC,WAAW,CAAC,oBAAoB;YAClC,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC;YAC9D,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,mBAAmB,GACvB,MAAA,MAAA,MAAA,OAAO,CAAC,mBAAmB,mCAC3B,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,mBAAmB,mCAC7C,WAAW,CAAC,OAAO,CAAC,mBAAmB,mCACvC,IAAI,CAAC;IAEP,MAAM,mBAAmB,GACvB,MAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,mBAAmB,mCAC7C,WAAW,CAAC,OAAO,CAAC,mBAAmB,CAAC;IAE1C,IAAI,mBAA2B,CAAC;IAChC,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,mBAAmB,GAAG,IAAA,0BAAiB,EACrC,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,CAAC,IAAA,eAAU,EAAC,mBAAmB,CAAC,EAAE;YACpC,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,IAAI,YAA6C,CAAC;IAClD,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,uBAAuB,GAC3B,MAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,QAAQ,mCAAI,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC;QACrE,MAAM,MAAM,GAAG,IAAA,mDAA4B,EACzC,IAAA,+BAAsB,GAAE,EACxB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,mBAAmB,CAAC,MAAM,EAC1B,OAAO,CAAC,MAAM,CAAC,aAAa,CAC7B,CAAC;QACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACnC,MAAM,eAAe,GAAG,IAAA,wCAAiB,EACvC,IAAA,0BAAiB,EAAC,OAAO,CAAC,aAAa,EAAE,uBAAuB,CAAC,EACjE,OAAO,CAAC,aAAa,EACrB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EACvB,YAAY,CACb,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,eAAe,CAAC;QAE/C,wEAAwE;QACxE,2EAA2E;QAC3E,oEAAoE;QACpE,2EAA2E;QAC3E,yEAAyE;QACzE,sCAAsC;QACtC,MAAM,wBAAwB,GAAG,OAAO,CAAC,gBAAgB,CAAC;QAC1D,OAAO,CAAC,gBAAgB,GAAG,CAAO,MAAM,EAAE,EAAE;YAC1C,MAAM,OAAO,GAAG,MAAM,wBAAwB,CAAC,MAAM,CAAC,CAAC;YACvD,OAAO,CAAC,QAAQ,GAAG,eAAe,CAAC;YACnC,OAAO,OAAO,CAAC;QACjB,CAAC,CAAA,CAAC;KACH;IAED,OAAO,IAAA,uCAAuB,EAAC,OAAkC,EAAE,OAAO,EAAE;QAC1E,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;YAChD,IAAI,CAAC,mBAAmB,EAAE;gBACxB,MAAM,qBAAqB,GAAG,YAAY;qBACvC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAA,wBAAY,EAAC,GAAG,CAAC,IAAI,CAAC,CAAC;qBACxC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC/B,8CAA8C;gBAC9C,sEAAsE;gBACtE,mCAAmC;gBACnC,kDAAkD;gBAClD,IAAI,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE;oBACpC,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAC5B,IAAI,uEAAgC,CAClC,wBACE,mBAAmB,CAAC,MACtB,eAAe,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACjD,CACF,CAAC;iBACH;aACF;YAED,IAAI,CAAC,mBAAmB,EAAE;gBACxB,OAAO,iBAAiB,CAAC;aAC1B;YAED,MAAM,0BAA0B,GAAG,IAAA,oCAA0B,EAC3D,mBAAmB,EACnB,WAAW,CAAC,OAAO,CAAC,QAAQ,CAC7B,CAAC;YACF,gFAAgF;YAChF,yFAAyF;YACzF,4CAA4C;YAC5C,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC;YAEhD,0FAA0F;YAC1F,4DAA4D;YAC5D,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE;gBAChC,OAAO,MAAM,CACX,iBAAiB,EACjB,wBAAwB,EACxB,OAAO,CAAC,MAAM,CACf,CAAC;aACH;YAED,OAAO,IAAA,qBAAK,EAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;QAC1C,CAAC,CAAA;KACF,CAAC,CAAC;AACL,CAAC;AAlID,kEAkIC;AAED,kBAAe,IAAA,yBAAa,EAC1B,2BAA2B,CACrB,CAAC"}
+{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yCAAiD;AACjD,2BAAgC;AAChC,+BAAwC;AACxC,8CAA2C;AAC3C,mCAA4B;AAC5B,2FAAiG;AACjG,gEAAgF;AAChF,kDAAgE;AAEhE,yDAAqD;AAErD,SAAS,cAAc,CACrB,OAAe,EACf,OAA2D;IAE3D,MAAM,EAAE,mBAAmB,EAAE,mBAAmB,KAC9C,OAAO,EAD4C,eAAe,kBAClE,OAAO,EADH,8CAAgE,CAC7D,CAAC;IACV,8CAA8C;IAC9C,mDAAmD;IACnD,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,IAAI,EAAE;QACnD,MAAM,mBAAmB,GAAG,IAAA,0BAAiB,EAC3C,OAAO,CAAC,aAAa,EACrB,mBAAmB,CAAC,IAAI,CACzB,CAAC;QAEF,IAAI,IAAA,eAAU,EAAC,mBAAmB,CAAC,EAAE;YACnC,OAAO,4CAA4C,CACjD,eAAe,EACf,OAAO,EACP,mBAAmB,CACpB,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,OAAO,IAAA,WAAI,uCAAQ,+BAA+B,GAAE,CAAC,IAAI,CACvD,IAAA,qBAAS,EAAC,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CACrC,oBAAoB,CAAC,eAAe,EAAE,OAAO,CAAC,CAC/C,CACF,CAAC;AACJ,CAAC;AAED,SAAS,4CAA4C,CACnD,OAAe,EACf,OAA2D,EAC3D,mBAA2B;IAE3B,OAAO,IAAA,WAAI,uCAAQ,+BAA+B,GAAE,CAAC,IAAI,CACvD,IAAA,qBAAS,EAAC,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CACrC,oBAAoB,CAAC,OAAO,EAAE,OAAc,EAAE;QAC5C,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;YAChD,8DAA8D;YAC9D,8EAA8E;YAC9E,wEAAwE;YACxE,0CAA0C;YAC1C,+EAA+E;YAC/E,uCAAuC;YACvC,IAAI,YAAY,GAAG,MAAM,IAAA,kCAAwB,EAC/C,iBAAiB,EACjB,mBAAmB,EACnB,OAAO,EACP,OAAO,CAAC,MAAM,CACf,CAAC;YAEF,IACE,YAAY,CAAC,OAAO;iBACjB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;iBAC9B,QAAQ,CAAC,2BAA2B,CAAC,EACxC;gBACA,YAAY,CAAC,KAAK,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CACtD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,+BAA+B,CAAC,CACtD,CAAC;gBACF,YAAY,CAAC,MAAM,CAAC,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACjE,CAAC,CAAC,CAAC,MAAM;oBACP,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAChB,qFAAqF,CACtF,CACN,CAAC;aACH;YAED,OAAO,YAAY,CAAC;QACtB,CAAC,CAAA;KACF,CAAC,CACH,CACF,CAAC;AACJ,CAAC;AAED,SAAgB,2BAA2B,CACzC,OAAe,EACf,OAA2D;;IAE3D,IAAA,kCAAe,EAAC,OAAO,CAAC,CAAC;IAEzB,MAAM,2BAA2B,GAAG,IAAA,sDAA8B,GAAE,CAAC;IACrE,qEAAqE;IACrE,IACE,IAAA,WAAE,EAAC,2BAA2B,CAAC,OAAO,EAAE,QAAQ,CAAC;QACjD,OAAO,CAAC,kBAAkB,KAAK,SAAS,EACxC;QACA,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;KACnC;IAED,MAAA,OAAO,CAAC,mBAAmB,oCAA3B,OAAO,CAAC,mBAAmB,GAAK,IAAI,EAAC;IAErC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;QAChC,MAAM,EAAE,YAAY,EAAE,GAAG,IAAA,kDAAiC,EACxD,OAAO,CAAC,QAAQ,EAChB,OAAO,CACR,CAAC;QACF,OAAO,CAAC,QAAQ,GAAG,YAAY,CAAC;KACjC;IAED,OAAO,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC;AA1BD,kEA0BC;AAED,kBAAe,OAAO,CAAC,2BAA2B,CAAC,CAAC,aAAa,CAC/D,2BAA2B,CACrB,CAAC"}