@nrwl/angular 15.0.3 → 15.0.5

package/CHANGELOG.md

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [15.0.3](https://github.com/nrwl/nx/compare/15.0.2...15.0.3) (2022-10-26)
+## [15.0.5](https://github.com/nrwl/nx/compare/15.0.4...15.0.5) (2022-11-01)
 
 **Note:** Version bump only for package @nrwl/angular

package/executors.d.ts

@@ -1,6 +1,7 @@
 export * from './src/builders/module-federation-dev-server/module-federation-dev-server.impl';
 export * from './src/builders/webpack-browser/webpack-browser.impl';
 export * from './src/builders/webpack-dev-server/webpack-dev-server.impl';
+export * from './src/builders/webpack-server/webpack-server.impl';
 export * from './src/executors/delegate-build/delegate-build.impl';
 export * from './src/executors/ng-packagr-lite/ng-packagr-lite.impl';
 export * from './src/executors/package/package.impl';

package/executors.js

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./src/builders/module-federation-dev-server/module-federation-dev-server.impl"), exports);
 tslib_1.__exportStar(require("./src/builders/webpack-browser/webpack-browser.impl"), exports);
 tslib_1.__exportStar(require("./src/builders/webpack-dev-server/webpack-dev-server.impl"), exports);
+tslib_1.__exportStar(require("./src/builders/webpack-server/webpack-server.impl"), exports);
 tslib_1.__exportStar(require("./src/executors/delegate-build/delegate-build.impl"), exports);
 tslib_1.__exportStar(require("./src/executors/ng-packagr-lite/ng-packagr-lite.impl"), exports);
 tslib_1.__exportStar(require("./src/executors/package/package.impl"), exports);

package/executors.js.map

@@ -1 +1 @@
-{"version":3,"file":"executors.js","sourceRoot":"","sources":["../../../packages/angular/executors.ts"],"names":[],"mappings":";;;AAAA,wHAA8F;AAC9F,8FAAoE;AACpE,oGAA0E;AAC1E,6FAAmE;AACnE,+FAAqE;AACrE,+EAAqD"}
+{"version":3,"file":"executors.js","sourceRoot":"","sources":["../../../packages/angular/executors.ts"],"names":[],"mappings":";;;AAAA,wHAA8F;AAC9F,8FAAoE;AACpE,oGAA0E;AAC1E,4FAAkE;AAClE,6FAAmE;AACnE,+FAAqE;AACrE,+EAAqD"}

package/executors.json

@@ -25,6 +25,11 @@
       "schema": "./src/builders/webpack-dev-server/schema.json",
       "description": "The `webpack-dev-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."
     },
+    "webpack-server": {
+      "implementation": "./src/builders/webpack-server/webpack-server.impl",
+      "schema": "./src/builders/webpack-server/schema.json",
+      "description": "The `webpack-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."
+    },
     "module-federation-dev-server": {
       "implementation": "./src/builders/module-federation-dev-server/module-federation-dev-server.impl",
       "schema": "./src/builders/module-federation-dev-server/schema.json",
@@ -62,6 +67,11 @@
       "schema": "./src/builders/webpack-dev-server/schema.json",
       "description": "The `webpack-dev-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."
     },
+    "webpack-server": {
+      "implementation": "./src/builders/webpack-server/webpack-server.impl",
+      "schema": "./src/builders/webpack-server/schema.json",
+      "description": "The `webpack-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."
+    },
     "module-federation-dev-server": {
       "implementation": "./src/builders/module-federation-dev-server/module-federation-dev-server.impl",
       "schema": "./src/builders/module-federation-dev-server/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "15.0.3",
+  "version": "15.0.5",
   "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, Cypress, Karma, and Protractor. \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": {
@@ -67,13 +67,13 @@
   },
   "dependencies": {
     "@angular-devkit/schematics": "~14.2.0",
-    "@nrwl/cypress": "15.0.3",
-    "@nrwl/devkit": "15.0.3",
-    "@nrwl/jest": "15.0.3",
-    "@nrwl/linter": "15.0.3",
-    "@nrwl/storybook": "15.0.3",
-    "@nrwl/webpack": "15.0.3",
-    "@nrwl/workspace": "15.0.3",
+    "@nrwl/cypress": "15.0.5",
+    "@nrwl/devkit": "15.0.5",
+    "@nrwl/jest": "15.0.5",
+    "@nrwl/linter": "15.0.5",
+    "@nrwl/storybook": "15.0.5",
+    "@nrwl/webpack": "15.0.5",
+    "@nrwl/workspace": "15.0.5",
     "@phenomnomnominal/tsquery": "4.1.1",
     "@schematics/angular": "~14.2.0",
     "chalk": "4.1.0",
@@ -99,5 +99,5 @@
   "fesm2015": "fesm2015/nrwl-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "26b959fc51605cbc338d965e1d76d26474f05245"
+  "gitHead": "2d84f2565ff4114dee1f476b0087a2707178efe3"
 }

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

@@ -5,12 +5,9 @@ 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 devkit_2 = require("@nrwl/devkit");
 const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const rxjs_1 = require("rxjs");
-const operators_1 = require("rxjs/operators");
 const webpack_merge_1 = require("webpack-merge");
 const webpack_1 = require("../utilities/webpack");
 function buildApp(options, context) {
@@ -52,22 +49,12 @@ function executeWebpackBrowserBuilder(options, context) {
     (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : (options.buildLibsFromSource = true);
     let dependencies;
     if (!options.buildLibsFromSource) {
-        const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_2.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, context.target.target, context.target.configuration);
+        const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_1.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, context.target.target, context.target.configuration);
         dependencies = result.dependencies;
         options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.workspaceRoot, options.tsConfig), context.workspaceRoot, result.target.data.root, dependencies);
         process.env.NX_TSCONFIG_PATH = options.tsConfig;
     }
-    return (0, rxjs_1.of)(!options.buildLibsFromSource
-        ? (0, buildable_libs_utils_1.checkDependentProjectsHaveBeenBuilt)(context.workspaceRoot, context.target.project, context.target.target, dependencies)
-        : true).pipe((0, operators_1.switchMap)((result) => {
-        if (result) {
-            return buildApp(options, context);
-        }
-        else {
-            // just pass on the result
-            return (0, rxjs_1.of)({ success: false });
-        }
-    }));
+    return buildApp(options, context);
 }
 exports.executeWebpackBrowserBuilder = executeWebpackBrowserBuilder;
 exports.default = (0, architect_1.createBuilder)(executeWebpackBrowserBuilder);

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

@@ -1 +1 @@
-{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webpack-browser.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-browser/webpack-browser.impl.ts"],"names":[],"mappings":";;;;AAAA,yDAImC;AACnC,iEAAsE;AAGtE,yCAAyE;AACzE,6FAI4D;AAC5D,2BAAgC;AAChC,+BAA4B;AAE5B,iDAAsC;AACtC,kDAAkE;AASlE,SAAS,QAAQ,CACf,OAA6B,EAC7B,OAAuB;IAEvB,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,sCAAsC,CAC3C,eAAe,EACf,OAAO,EACP,mBAAmB,CACpB,CAAC;SACH;aAAM;YACL,MAAM,IAAI,KAAK,CACb,0IAA0I,mBAAmB,EAAE,CAChK,CAAC;SACH;KACF;IAED,OAAO,IAAA,qCAAqB,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,sCAAsC,CAC7C,OAAe,EACf,OAAuB,EACvB,mBAA2B;IAE3B,OAAO,IAAA,qCAAqB,EAAC,OAAO,EAAE,OAAc,EAAE;QACpD,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;YAChD,MAAM,0BAA0B,GAAG,IAAA,oCAA0B,EAC3D,mBAAmB,EACnB,OAAO,CAAC,QAAQ,CACjB,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,CAAC,iBAAiB,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;aAC3D;iBAAM;gBACL,OAAO,IAAA,qBAAK,EAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;aACzC;QACH,CAAC,CAAA;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,4BAA4B,CAC1C,OAA6B,EAC7B,OAAuB;;IAEvB,MAAA,OAAO,CAAC,mBAAmB,oCAA3B,OAAO,CAAC,mBAAmB,GAAK,IAAI,EAAC;IACrC,IAAI,YAA6C,CAAC;IAElD,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;QAChC,MAAM,MAAM,GAAG,IAAA,mDAA4B,EACzC,IAAA,+BAAsB,GAAE,EACxB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EACrB,OAAO,CAAC,MAAM,CAAC,aAAa,CAC7B,CAAC;QACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QAEnC,OAAO,CAAC,QAAQ,GAAG,IAAA,wCAAiB,EAClC,IAAA,WAAI,EAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,EAC7C,OAAO,CAAC,aAAa,EACrB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EACvB,YAAY,CACb,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;KACjD;IAED,OAAO,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC;AA3BD,oEA2BC;AAED,kBAAe,IAAA,yBAAa,EAC1B,4BAA4B,CACtB,CAAC"}

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

@@ -0,0 +1,8 @@
+import { ServerBuilderOptions } from '@angular-devkit/build-angular';
+
+export interface Schema extends ServerBuilderOptions {
+  customWebpackConfig?: {
+    path: string;
+  };
+  buildLibsFromSource?: boolean;
+}

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

@@ -0,0 +1,276 @@
+{
+  "version": 2,
+  "outputCapture": "direct-nodejs",
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "title": "Schema for Webpack Server",
+  "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",
+  "properties": {
+    "main": {
+      "type": "string",
+      "description": "The full path for the main entry point to the server app, relative to the current workspace."
+    },
+    "tsConfig": {
+      "type": "string",
+      "default": "tsconfig.app.json",
+      "description": "The full path for the TypeScript configuration file, relative to the current workspace."
+    },
+    "inlineStyleLanguage": {
+      "description": "The stylesheet language to use for the application's inline component styles.",
+      "type": "string",
+      "default": "css",
+      "enum": ["css", "less", "sass", "scss"]
+    },
+    "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": []
+    },
+    "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."
+    },
+    "resourcesOutputPath": {
+      "type": "string",
+      "description": "The path where style resources will be placed, relative to outputPath."
+    },
+    "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."
+    },
+    "verbose": {
+      "type": "boolean",
+      "description": "Adds more details to output logging.",
+      "default": false
+    },
+    "progress": {
+      "type": "boolean",
+      "description": "Log progress to the console while building.",
+      "default": true
+    },
+    "i18nMissingTranslation": {
+      "type": "string",
+      "description": "How to handle missing translations for i18n.",
+      "enum": ["warning", "error", "ignore"],
+      "default": "warning"
+    },
+    "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})+)?$"
+          }
+        }
+      ]
+    },
+    "outputHashing": {
+      "type": "string",
+      "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
+    },
+    "namedChunks": {
+      "type": "boolean",
+      "description": "Use file name for lazy loaded chunks.",
+      "default": false
+    },
+    "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.",
+      "default": true,
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "string",
+          "enum": ["none", "all"]
+        }
+      ]
+    },
+    "statsJson": {
+      "type": "boolean",
+      "description": "Generates a 'stats.json' file which can be analyzed using tools such as 'webpack-bundle-analyzer'.",
+      "default": false
+    },
+    "watch": {
+      "type": "boolean",
+      "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"
+        }
+      },
+      "additionalProperties": false
+    },
+    "buildLibsFromSource": {
+      "type": "boolean",
+      "description": "Read buildable libraries from source instead of building them separately.",
+      "default": true
+    }
+  },
+  "additionalProperties": false,
+  "required": ["outputPath", "main", "tsConfig"],
+  "definitions": {
+    "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/webpack-server.impl.d.ts

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

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

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeWebpackServerBuilder = void 0;
+const tslib_1 = require("tslib");
+const architect_1 = require("@angular-devkit/architect");
+const devkit_1 = require("@nrwl/devkit");
+const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const webpack_merge_1 = require("webpack-merge");
+const webpack_1 = require("../utilities/webpack");
+const build_angular_1 = require("@angular-devkit/build-angular");
+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) {
+        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}`);
+        }
+    }
+    return (0, build_angular_1.executeServerBuilder)(delegateOptions, context);
+}
+function buildServerAppWithCustomWebpackConfiguration(options, context, pathToWebpackConfig) {
+    return (0, build_angular_1.executeServerBuilder)(options, context, {
+        webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const customWebpackConfiguration = (0, webpack_1.resolveCustomWebpackConfig)(pathToWebpackConfig, 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, options, context.target);
+            }
+            else {
+                return (0, webpack_merge_1.merge)(baseWebpackConfig, config);
+            }
+        }),
+    });
+}
+function executeWebpackServerBuilder(options, context) {
+    var _a;
+    (_a = options.buildLibsFromSource) !== null && _a !== void 0 ? _a : (options.buildLibsFromSource = true);
+    let dependencies;
+    if (!options.buildLibsFromSource) {
+        const result = (0, buildable_libs_utils_1.calculateProjectDependencies)((0, devkit_1.readCachedProjectGraph)(), context.workspaceRoot, context.target.project, context.target.target, context.target.configuration);
+        dependencies = result.dependencies;
+        options.tsConfig = (0, buildable_libs_utils_1.createTmpTsConfig)((0, path_1.join)(context.workspaceRoot, options.tsConfig), context.workspaceRoot, result.target.data.root, dependencies);
+        process.env.NX_TSCONFIG_PATH = options.tsConfig;
+    }
+    return buildServerApp(options, context);
+}
+exports.executeWebpackServerBuilder = executeWebpackServerBuilder;
+exports.default = (0, architect_1.createBuilder)(executeWebpackServerBuilder);
+//# sourceMappingURL=webpack-server.impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"webpack-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-server/webpack-server.impl.ts"],"names":[],"mappings":";;;;AAAA,yDAA0E;AAE1E,yCAAyE;AACzE,6FAI4D;AAC5D,2BAAgC;AAChC,+BAA4B;AAE5B,iDAAsC;AACtC,kDAAkE;AAClE,iEAGuC;AAGvC,SAAS,cAAc,CACrB,OAAe,EACf,OAAuB;IAEvB,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,oCAAoB,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,4CAA4C,CACnD,OAAe,EACf,OAAuB,EACvB,mBAA2B;IAE3B,OAAO,IAAA,oCAAoB,EAAC,OAAO,EAAE,OAAc,EAAE;QACnD,oBAAoB,EAAE,CAAO,iBAAiB,EAAE,EAAE;YAChD,MAAM,0BAA0B,GAAG,IAAA,oCAA0B,EAC3D,mBAAmB,EACnB,OAAO,CAAC,QAAQ,CACjB,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,CAAC,iBAAiB,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;aAC3D;iBAAM;gBACL,OAAO,IAAA,qBAAK,EAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;aACzC;QACH,CAAC,CAAA;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,2BAA2B,CACzC,OAAe,EACf,OAAuB;;IAEvB,MAAA,OAAO,CAAC,mBAAmB,oCAA3B,OAAO,CAAC,mBAAmB,GAAK,IAAI,EAAC;IACrC,IAAI,YAA6C,CAAC;IAElD,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE;QAChC,MAAM,MAAM,GAAG,IAAA,mDAA4B,EACzC,IAAA,+BAAsB,GAAE,EACxB,OAAO,CAAC,aAAa,EACrB,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,OAAO,CAAC,MAAM,CAAC,MAAM,EACrB,OAAO,CAAC,MAAM,CAAC,aAAa,CAC7B,CAAC;QACF,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QAEnC,OAAO,CAAC,QAAQ,GAAG,IAAA,wCAAiB,EAClC,IAAA,WAAI,EAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,EAC7C,OAAO,CAAC,aAAa,EACrB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EACvB,YAAY,CACb,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;KACjD;IAED,OAAO,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC;AA3BD,kEA2BC;AAED,kBAAe,IAAA,yBAAa,EAC1B,2BAA2B,CACrB,CAAC"}

package/src/utils/nx-devkit/route-utils.js

@@ -16,7 +16,7 @@ function addRoute(tree, routesFile, route, lazy = true, routesConst, importPath)
         routesFileContents = tree.read(routesFile, 'utf-8');
     }
     const ast = tsquery_1.tsquery.ast(routesFileContents);
-    const ROUTES_ARRAY_SELECTOR = 'VariableDeclaration:has(ArrayType > TypeReference > Identifier[name=Route]) > ArrayLiteralExpression';
+    const ROUTES_ARRAY_SELECTOR = 'VariableDeclaration:has(ArrayType > TypeReference > Identifier[name=Route], Identifier[name=Routes]) > ArrayLiteralExpression';
     const routesArrayNodes = (0, tsquery_1.tsquery)(ast, ROUTES_ARRAY_SELECTOR, {
         visitAllChildren: true,
     });

package/src/utils/nx-devkit/route-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/route-utils.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,iCAAiC;AACjC,uEAAuE;AACvE,2CAAiD;AAEjD,SAAgB,QAAQ,CACtB,IAAU,EACV,UAAkB,EAClB,KAAa,EACb,OAAgB,IAAI,EACpB,WAAoB,EACpB,UAAmB;IAEnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,uCAAuC,UAAU,kDAAkD,CACpG,CAAC;KACH;IAED,IAAI,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAExD,IAAI,CAAC,IAAI,EAAE;QACT,IAAI,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CACxC,UAAU,EACV,kBAAkB,EAClB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QAEF,gBAAgB,GAAG,IAAA,wBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,UAAU,CACX,CAAC;QAEF,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;KACrD;IAED,MAAM,GAAG,GAAG,iBAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAE5C,MAAM,qBAAqB,GACzB,sGAAsG,CAAC;IAEzG,MAAM,gBAAgB,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,qBAAqB,EAAE;QAC3D,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;IAElD,IAAI,CAAC,aAAa,EAAE;QAClB,IAAI,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC5C,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,UAAU,EACV,kBAAkB,EAClB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;YAEF,IAAA,8BAAkB,EAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;YACxD,OAAO;SACR;aAAM;YACL,MAAM,IAAI,KAAK,CACb,iBAAiB,UAAU,gGAAgG,CAC5H,CAAC;SACH;KACF;IAED,MAAM,qBAAqB,GAAG,GAAG,kBAAkB,CAAC,KAAK,CACvD,CAAC,EACD,gBAAgB,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CACnC;MACG,KAAK,IAAI,kBAAkB,CAAC,KAAK,CACnC,gBAAgB,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,EAClC,CAAC,CAAC,CACH,EAAE,CAAC;IAEJ,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;AAChD,CAAC;AAzED,4BAyEC"}
+{"version":3,"file":"route-utils.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/utils/nx-devkit/route-utils.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AACpD,iCAAiC;AACjC,uEAAuE;AACvE,2CAAiD;AAEjD,SAAgB,QAAQ,CACtB,IAAU,EACV,UAAkB,EAClB,KAAa,EACb,OAAgB,IAAI,EACpB,WAAoB,EACpB,UAAmB;IAEnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;QAC5B,MAAM,IAAI,KAAK,CACb,uCAAuC,UAAU,kDAAkD,CACpG,CAAC;KACH;IAED,IAAI,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAExD,IAAI,CAAC,IAAI,EAAE;QACT,IAAI,gBAAgB,GAAG,EAAE,CAAC,gBAAgB,CACxC,UAAU,EACV,kBAAkB,EAClB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;QAEF,gBAAgB,GAAG,IAAA,wBAAY,EAC7B,IAAI,EACJ,gBAAgB,EAChB,UAAU,EACV,WAAW,EACX,UAAU,CACX,CAAC;QAEF,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;KACrD;IAED,MAAM,GAAG,GAAG,iBAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAE5C,MAAM,qBAAqB,GACzB,+HAA+H,CAAC;IAElI,MAAM,gBAAgB,GAAG,IAAA,iBAAO,EAAC,GAAG,EAAE,qBAAqB,EAAE;QAC3D,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;IAElD,IAAI,CAAC,aAAa,EAAE;QAClB,IAAI,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC5C,MAAM,UAAU,GAAG,EAAE,CAAC,gBAAgB,CACpC,UAAU,EACV,kBAAkB,EAClB,EAAE,CAAC,YAAY,CAAC,MAAM,EACtB,IAAI,CACL,CAAC;YAEF,IAAA,8BAAkB,EAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;YACxD,OAAO;SACR;aAAM;YACL,MAAM,IAAI,KAAK,CACb,iBAAiB,UAAU,gGAAgG,CAC5H,CAAC;SACH;KACF;IAED,MAAM,qBAAqB,GAAG,GAAG,kBAAkB,CAAC,KAAK,CACvD,CAAC,EACD,gBAAgB,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,CACnC;MACG,KAAK,IAAI,kBAAkB,CAAC,KAAK,CACnC,gBAAgB,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,GAAG,CAAC,EAClC,CAAC,CAAC,CACH,EAAE,CAAC;IAEJ,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,qBAAqB,CAAC,CAAC;AAChD,CAAC;AAzED,4BAyEC"}