@nrwl/angular 15.6.1 → 15.6.3

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.6.1](https://github.com/nrwl/nx/compare/15.6.0...15.6.1) (2023-01-24)
+## [15.6.3](https://github.com/nrwl/nx/compare/15.6.2...15.6.3) (2023-01-27)
 
 **Note:** Version bump only for package @nrwl/angular

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "15.6.1",
+  "version": "15.6.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, 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,12 +67,12 @@
   },
   "dependencies": {
     "@angular-devkit/schematics": "~15.1.0",
-    "@nrwl/cypress": "15.6.1",
-    "@nrwl/devkit": "15.6.1",
-    "@nrwl/jest": "15.6.1",
-    "@nrwl/linter": "15.6.1",
-    "@nrwl/webpack": "15.6.1",
-    "@nrwl/workspace": "15.6.1",
+    "@nrwl/cypress": "15.6.3",
+    "@nrwl/devkit": "15.6.3",
+    "@nrwl/jest": "15.6.3",
+    "@nrwl/linter": "15.6.3",
+    "@nrwl/webpack": "15.6.3",
+    "@nrwl/workspace": "15.6.3",
     "@phenomnomnominal/tsquery": "4.1.1",
     "@schematics/angular": "~15.1.0",
     "chalk": "^4.1.0",
@@ -107,5 +107,5 @@
   "fesm2015": "fesm2015/nrwl-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "1444f585f4aae09c250b81ac5661205a20fe218c"
+  "gitHead": "4a5a231a3eca0d648408941147be509cd827dd78"
 }

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

@@ -109,7 +109,8 @@
       "items": {
         "type": "string"
       },
-      "description": "List of remote applications to run in development mode (i.e. using serve target)."
+      "description": "List of remote applications to run in development mode (i.e. using serve target).",
+      "x-priority": "important"
     },
     "skipRemotes": {
       "type": "array",

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

@@ -65,7 +65,8 @@
       "items": {
         "type": "string"
       },
-      "description": "List of remote applications to run in development mode (i.e. using serve target)."
+      "description": "List of remote applications to run in development mode (i.e. using serve target).",
+      "x-priority": "important"
     },
     "skipRemotes": {
       "type": "array",

package/src/builders/utilities/webpack.d.ts

@@ -3,3 +3,4 @@ export declare function mergeCustomWebpackConfig(baseWebpackConfig: any, pathToW
     [k: string]: any;
 }, target: import('@angular-devkit/architect').Target): Promise<any>;
 export declare function resolveCustomWebpackConfig(path: string, tsConfig: string): any;
+export declare function resolveIndexHtmlTransformer(path: string, tsConfig: string, target: import('@angular-devkit/architect').Target): (indexHtml: any) => any;

package/src/builders/utilities/webpack.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveCustomWebpackConfig = exports.mergeCustomWebpackConfig = void 0;
+exports.resolveIndexHtmlTransformer = exports.resolveCustomWebpackConfig = exports.mergeCustomWebpackConfig = void 0;
 const tslib_1 = require("tslib");
 const webpack_merge_1 = require("webpack-merge");
 function mergeCustomWebpackConfig(baseWebpackConfig, pathToWebpackConfig, options, target) {
@@ -33,6 +33,14 @@ function resolveCustomWebpackConfig(path, tsConfig) {
     return (_a = customWebpackConfig.default) !== null && _a !== void 0 ? _a : customWebpackConfig;
 }
 exports.resolveCustomWebpackConfig = resolveCustomWebpackConfig;
+function resolveIndexHtmlTransformer(path, tsConfig, target) {
+    var _a;
+    tsNodeRegister(path, tsConfig);
+    const indexTransformer = require(path);
+    const transform = (_a = indexTransformer.default) !== null && _a !== void 0 ? _a : indexTransformer;
+    return (indexHtml) => transform(target, indexHtml);
+}
+exports.resolveIndexHtmlTransformer = resolveIndexHtmlTransformer;
 function tsNodeRegister(file, tsConfig) {
     if (!(file === null || file === void 0 ? void 0 : file.endsWith('.ts')))
         return;

package/src/builders/utilities/webpack.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/webpack.ts"],"names":[],"mappings":";;;;AAAA,iDAAsC;AAEtC,SAAsB,wBAAwB,CAC5C,iBAAsB,EACtB,mBAA2B,EAC3B,OAA+C,EAC/C,MAAkD;;QAElD,MAAM,0BAA0B,GAAG,0BAA0B,CAC3D,mBAAmB,EACnB,OAAO,CAAC,QAAQ,CACjB,CAAC;QACF,gFAAgF;QAChF,yFAAyF;QACzF,4CAA4C;QAC5C,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC;QAEhD,0FAA0F;QAC1F,4DAA4D;QAC5D,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE;YAChC,OAAO,MAAM,CAAC,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;SACnD;aAAM;YACL,OAAO,IAAA,qBAAK,EAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;SACzC;IACH,CAAC;CAAA;AAtBD,4DAsBC;AAED,SAAgB,0BAA0B,CAAC,IAAY,EAAE,QAAgB;;IACvE,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE/B,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,kDAAkD;IAClD,oEAAoE;IACpE,qDAAqD;IACrD,6DAA6D;IAC7D,yBAAyB;IACzB,OAAO,MAAA,mBAAmB,CAAC,OAAO,mCAAI,mBAAmB,CAAC;AAC5D,CAAC;AAVD,gEAUC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,QAAiB;IACrD,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;QAAE,OAAO;IACnC,8BAA8B;IAC9B,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;QAC1B,OAAO,EAAE,QAAQ;QACjB,eAAe,EAAE;YACf,MAAM,EAAE,UAAU;YAClB,KAAK,EAAE,CAAC,MAAM,CAAC;SAChB;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ;QAAE,OAAO;IAEtB,6BAA6B;IAC7B,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChD,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,GACvC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACrC,IAAI,OAAO,IAAI,KAAK,EAAE;QACpB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;KAC5C;AACH,CAAC"}
+{"version":3,"file":"webpack.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/utilities/webpack.ts"],"names":[],"mappings":";;;;AAAA,iDAAsC;AAEtC,SAAsB,wBAAwB,CAC5C,iBAAsB,EACtB,mBAA2B,EAC3B,OAA+C,EAC/C,MAAkD;;QAElD,MAAM,0BAA0B,GAAG,0BAA0B,CAC3D,mBAAmB,EACnB,OAAO,CAAC,QAAQ,CACjB,CAAC;QACF,gFAAgF;QAChF,yFAAyF;QACzF,4CAA4C;QAC5C,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC;QAEhD,0FAA0F;QAC1F,4DAA4D;QAC5D,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE;YAChC,OAAO,MAAM,CAAC,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;SACnD;aAAM;YACL,OAAO,IAAA,qBAAK,EAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;SACzC;IACH,CAAC;CAAA;AAtBD,4DAsBC;AAED,SAAgB,0BAA0B,CAAC,IAAY,EAAE,QAAgB;;IACvE,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE/B,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,kDAAkD;IAClD,oEAAoE;IACpE,qDAAqD;IACrD,6DAA6D;IAC7D,yBAAyB;IACzB,OAAO,MAAA,mBAAmB,CAAC,OAAO,mCAAI,mBAAmB,CAAC;AAC5D,CAAC;AAVD,gEAUC;AAED,SAAgB,2BAA2B,CACzC,IAAY,EACZ,QAAgB,EAChB,MAAkD;;IAElD,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE/B,MAAM,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,MAAA,gBAAgB,CAAC,OAAO,mCAAI,gBAAgB,CAAC;IAE/D,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AACrD,CAAC;AAXD,kEAWC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,QAAiB;IACrD,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;QAAE,OAAO;IACnC,8BAA8B;IAC9B,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;QAC1B,OAAO,EAAE,QAAQ;QACjB,eAAe,EAAE;YACf,MAAM,EAAE,UAAU;YAClB,KAAK,EAAE,CAAC,MAAM,CAAC;SAChB;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,QAAQ;QAAE,OAAO;IAEtB,6BAA6B;IAC7B,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAChD,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,GACvC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACrC,IAAI,OAAO,IAAI,KAAK,EAAE;QACpB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;KAC5C;AACH,CAAC"}

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

@@ -128,7 +128,8 @@
             "pattern": "\\.(?:css|scss|sass|less|styl)$"
           }
         ]
-      }
+      },
+      "x-priority": "important"
     },
     "inlineStyleLanguage": {
       "description": "The stylesheet language to use for the application's inline component styles.",
@@ -454,8 +455,13 @@
           "type": "string"
         }
       },
+      "x-priority": "important",
       "additionalProperties": false
     },
+    "indexFileTransformer": {
+      "description": "Path to transformer function to transform the index.html",
+      "type": "string"
+    },
     "buildLibsFromSource": {
       "type": "boolean",
       "description": "Read buildable libraries from source instead of building them separately.",

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

@@ -3,6 +3,7 @@ export declare type BrowserBuilderSchema = import('@angular-devkit/build-angular
     customWebpackConfig?: {
         path: string;
     };
+    indexFileTransformer?: string;
     buildLibsFromSource?: boolean;
 };
 export declare function executeWebpackBrowserBuilder(options: BrowserBuilderSchema, context: import('@angular-devkit/architect').BuilderContext): Observable<import('@angular-devkit/architect').BuilderOutput>;

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

@@ -9,24 +9,37 @@ const webpack_1 = require("../utilities/webpack");
 const buildable_libs_1 = require("../utilities/buildable-libs");
 const operators_1 = require("rxjs/operators");
 function buildApp(options, context) {
-    const { buildLibsFromSource, customWebpackConfig } = options, delegateOptions = tslib_1.__rest(options, ["buildLibsFromSource", "customWebpackConfig"]);
+    const { buildLibsFromSource, customWebpackConfig, indexFileTransformer } = options, delegateOptions = tslib_1.__rest(options, ["buildLibsFromSource", "customWebpackConfig", "indexFileTransformer"]);
+    // If there is a path to an indexFileTransformer
+    // check it exists and apply it to the build
+    const pathToIndexFileTransformer = indexFileTransformer &&
+        (0, devkit_1.joinPathFragments)(context.workspaceRoot, indexFileTransformer);
+    if (pathToIndexFileTransformer && !(0, fs_1.existsSync)(pathToIndexFileTransformer)) {
+        throw new Error(`File containing Index File Transformer function Not Found!\n Please ensure the path to the file containing the function is correct: \n${pathToIndexFileTransformer}`);
+    }
     // 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 buildAppWithCustomWebpackConfiguration(delegateOptions, context, pathToWebpackConfig);
+            return buildAppWithCustomWebpackConfiguration(delegateOptions, context, pathToWebpackConfig, pathToIndexFileTransformer);
         }
         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, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_1.switchMap)(({ executeBrowserBuilder }) => executeBrowserBuilder(delegateOptions, context)));
+    return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_1.switchMap)(({ executeBrowserBuilder }) => executeBrowserBuilder(delegateOptions, context, Object.assign({}, (pathToIndexFileTransformer
+        ? {
+            indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, options.tsConfig, context.target),
+        }
+        : {})))));
 }
-function buildAppWithCustomWebpackConfiguration(options, context, pathToWebpackConfig) {
-    return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_1.switchMap)(({ executeBrowserBuilder }) => executeBrowserBuilder(options, context, {
-        webpackConfiguration: (baseWebpackConfig) => (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, options, context.target),
-    })));
+function buildAppWithCustomWebpackConfiguration(options, context, pathToWebpackConfig, pathToIndexFileTransformer) {
+    return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_1.switchMap)(({ executeBrowserBuilder }) => executeBrowserBuilder(options, context, Object.assign({ webpackConfiguration: (baseWebpackConfig) => (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, options, context.target) }, (pathToIndexFileTransformer
+        ? {
+            indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, options.tsConfig, context.target),
+        }
+        : {})))));
 }
 function executeWebpackBrowserBuilder(options, context) {
     var _a;

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":";;;;AAAA,yCAAiD;AACjD,2BAAgC;AAChC,+BAAwC;AACxC,kDAAgE;AAChE,gEAAgF;AAChF,8CAA2C;AAU3C,SAAS,QAAQ,CACf,OAA6B,EAC7B,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,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,WAAI,uCAAQ,+BAA+B,GAAE,CAAC,IAAI,CACvD,IAAA,qBAAS,EAAC,CAAC,EAAE,qBAAqB,EAAE,EAAE,EAAE,CACtC,qBAAqB,CAAC,eAAe,EAAE,OAAO,CAAC,CAChD,CACF,CAAC;AACJ,CAAC;AAED,SAAS,sCAAsC,CAC7C,OAAmF,EACnF,OAA2D,EAC3D,mBAA2B;IAE3B,OAAO,IAAA,WAAI,uCAAQ,+BAA+B,GAAE,CAAC,IAAI,CACvD,IAAA,qBAAS,EAAC,CAAC,EAAE,qBAAqB,EAAE,EAAE,EAAE,CACtC,qBAAqB,CAAC,OAAO,EAAE,OAAc,EAAE;QAC7C,oBAAoB,EAAE,CAAC,iBAAiB,EAAE,EAAE,CAC1C,IAAA,kCAAwB,EACtB,iBAAiB,EACjB,mBAAmB,EACnB,OAAO,EACP,OAAO,CAAC,MAAM,CACf;KACJ,CAAC,CACH,CACF,CAAC;AACJ,CAAC;AAED,SAAgB,4BAA4B,CAC1C,OAA6B,EAC7B,OAA2D;;IAE3D,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,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC;AAfD,oEAeC;AAED,kBAAe,OAAO,CAAC,2BAA2B,CAAC,CAAC,aAAa,CAC/D,4BAA4B,CACtB,CAAC"}
+{"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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"}

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

@@ -107,7 +107,8 @@
     },
     "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. 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.",
+      "x-priority": "important"
     }
   },
   "additionalProperties": false,

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

@@ -14,7 +14,7 @@ const rxjs_1 = require("rxjs");
 const operators_2 = require("rxjs/operators");
 const typescript_1 = require("nx/src/utils/typescript");
 function executeWebpackDevServerBuilder(rawOptions, context) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     process.env.NX_TSCONFIG_PATH = (0, typescript_1.getRootTsConfigPath)();
     const options = (0, lib_1.normalizeOptions)(rawOptions);
     const parsedBrowserTarget = (0, devkit_1.parseTargetString)(options.browserTarget, (0, devkit_1.readCachedProjectGraph)());
@@ -30,13 +30,21 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
     let pathToWebpackConfig;
     if (customWebpackConfig && customWebpackConfig.path) {
         pathToWebpackConfig = (0, devkit_1.joinPathFragments)(context.workspaceRoot, customWebpackConfig.path);
-        if (!(0, fs_1.existsSync)(pathToWebpackConfig)) {
+        if (pathToWebpackConfig && !(0, fs_1.existsSync)(pathToWebpackConfig)) {
             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}`);
         }
     }
+    const indexFileTransformer = (_e = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.indexFileTransformer) !== null && _e !== void 0 ? _e : buildTarget.options.indexFileTransformer;
+    let pathToIndexFileTransformer;
+    if (indexFileTransformer) {
+        pathToIndexFileTransformer = (0, devkit_1.joinPathFragments)(context.workspaceRoot, indexFileTransformer);
+        if (pathToIndexFileTransformer && !(0, fs_1.existsSync)(pathToIndexFileTransformer)) {
+            throw new Error(`File containing Index File Transformer function Not Found!\n Please ensure the path to the file containing the function is correct: \n${pathToIndexFileTransformer}`);
+        }
+    }
     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 buildTargetTsConfigPath = (_f = buildTargetConfiguration === null || buildTargetConfiguration === void 0 ? void 0 : buildTargetConfiguration.tsConfig) !== null && _f !== void 0 ? _f : buildTarget.options.tsConfig;
         const { tsConfigPath, dependencies: foundDependencies } = (0, buildable_libs_1.createTmpTsConfigForBuildableLibs)(buildTargetTsConfigPath, context, parsedBrowserTarget.target);
         dependencies = foundDependencies;
         // We can't just pass the tsconfig path in memory to the angular builder
@@ -57,8 +65,7 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
         // webpack-server implementation.
         buildTargetConfiguration.tsConfig = tsConfigPath;
     }
-    return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeDevServerBuilder }) => executeDevServerBuilder(options, context, {
-        webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+    return (0, rxjs_1.from)(Promise.resolve().then(() => require('@angular-devkit/build-angular'))).pipe((0, operators_2.switchMap)(({ executeDevServerBuilder }) => executeDevServerBuilder(options, context, Object.assign({ webpackConfiguration: (baseWebpackConfig) => tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!buildLibsFromSource) {
                 const workspaceDependencies = dependencies
                     .filter((dep) => !(0, operators_1.isNpmProject)(dep.node))
@@ -75,8 +82,11 @@ function executeWebpackDevServerBuilder(rawOptions, context) {
                 return baseWebpackConfig;
             }
             return (0, webpack_1.mergeCustomWebpackConfig)(baseWebpackConfig, pathToWebpackConfig, buildTargetConfiguration, context.target);
-        }),
-    })));
+        }) }, (pathToIndexFileTransformer
+        ? {
+            indexHtml: (0, webpack_1.resolveIndexHtmlTransformer)(pathToIndexFileTransformer, buildTargetConfiguration.tsConfig, context.target),
+        }
+        : {})))));
 }
 exports.executeWebpackDevServerBuilder = executeWebpackDevServerBuilder;
 exports.default = require('@angular-devkit/architect').createBuilder(executeWebpackDevServerBuilder);

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

@@ -1 +1 @@
-{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webpack-dev-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/builders/webpack-dev-server/webpack-dev-server.impl.ts"],"names":[],"mappings":"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"}

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

@@ -235,12 +235,14 @@
           "type": "string"
         }
       },
+      "x-priority": "important",
       "additionalProperties": false
     },
     "buildLibsFromSource": {
       "type": "boolean",
       "description": "Read buildable libraries from source instead of building them separately.",
-      "default": true
+      "default": true,
+      "x-priority": "important"
     }
   },
   "additionalProperties": false,

package/src/executors/ng-packagr-lite/schema.json

@@ -29,7 +29,8 @@
       "type": "string",
       "description": "The full path for the TypeScript configuration file, relative to the workspace root.",
       "x-completion-type": "file",
-      "x-completion-glob": "tsconfig.*.json"
+      "x-completion-glob": "tsconfig.*.json",
+      "x-priority": "important"
     },
     "watch": {
       "type": "boolean",

package/src/executors/package/schema.json

@@ -29,7 +29,8 @@
       "type": "string",
       "description": "The full path for the TypeScript configuration file, relative to the workspace root.",
       "x-completion-type": "file",
-      "x-completion-glob": "tsconfig.*.json"
+      "x-completion-glob": "tsconfig.*.json",
+      "x-priority": "important"
     },
     "watch": {
       "type": "boolean",