@angular-builders/custom-webpack 12.1.2-beta.0 → 12.1.3

package/dist/custom-webpack-builder.d.ts

@@ -1,8 +1,8 @@
-import { Path } from '@angular-devkit/core';
+import { Path, logging } from '@angular-devkit/core';
 import { Configuration } from 'webpack';
 import { CustomWebpackBuilderConfig } from './custom-webpack-builder-config';
 import { TargetOptions } from './type-definition';
 export declare const defaultWebpackConfigPath = "webpack.config.js";
 export declare class CustomWebpackBuilder {
-    static buildWebpackConfig(root: Path, config: CustomWebpackBuilderConfig, baseWebpackConfig: Configuration, buildOptions: any, targetOptions: TargetOptions): Promise<Configuration>;
+    static buildWebpackConfig(root: Path, config: CustomWebpackBuilderConfig, baseWebpackConfig: Configuration, buildOptions: any, targetOptions: TargetOptions, logger: logging.LoggerApi): Promise<Configuration>;
 }

package/dist/custom-webpack-builder.js

@@ -15,7 +15,7 @@ const webpack_config_merger_1 = require("./webpack-config-merger");
 const utils_1 = require("./utils");
 exports.defaultWebpackConfigPath = 'webpack.config.js';
 class CustomWebpackBuilder {
-    static buildWebpackConfig(root, config, baseWebpackConfig, buildOptions, targetOptions) {
+    static buildWebpackConfig(root, config, baseWebpackConfig, buildOptions, targetOptions, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!config) {
                 return baseWebpackConfig;
@@ -23,7 +23,7 @@ class CustomWebpackBuilder {
             const webpackConfigPath = config.path || exports.defaultWebpackConfigPath;
             const path = `${core_1.getSystemPath(root)}/${webpackConfigPath}`;
             const tsConfig = `${core_1.getSystemPath(root)}/${buildOptions.tsConfig}`;
-            const configOrFactoryOrPromise = resolveCustomWebpackConfig(path, tsConfig);
+            const configOrFactoryOrPromise = resolveCustomWebpackConfig(path, tsConfig, logger);
             if (typeof configOrFactoryOrPromise === 'function') {
                 // That exported function can be synchronous either
                 // asynchronous. Given the following example:
@@ -42,8 +42,8 @@ class CustomWebpackBuilder {
     }
 }
 exports.CustomWebpackBuilder = CustomWebpackBuilder;
-function resolveCustomWebpackConfig(path, tsConfig) {
-    utils_1.tsNodeRegister(path, tsConfig);
+function resolveCustomWebpackConfig(path, tsConfig, logger) {
+    utils_1.tsNodeRegister(path, tsConfig, logger);
     const customWebpackConfig = require(path);
     // If the user provides a configuration in TS file
     // then there are 2 cases for exporing an object. The first one is:

package/dist/custom-webpack-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom-webpack-builder.js","sourceRoot":"","sources":["../src/custom-webpack-builder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA2D;AAG3D,mEAAuD;AAEvD,mCAAyC;AAI5B,QAAA,wBAAwB,GAAG,mBAAmB,CAAC;AAgB5D,MAAa,oBAAoB;IAC/B,MAAM,CAAO,kBAAkB,CAC7B,IAAU,EACV,MAAkC,EAClC,iBAAgC,EAChC,YAAiB,EACjB,aAA4B;;YAE5B,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO,iBAAiB,CAAC;aAC1B;YAED,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,IAAI,gCAAwB,CAAC;YAClE,MAAM,IAAI,GAAG,GAAG,oBAAa,CAAC,IAAI,CAAC,IAAI,iBAAiB,EAAE,CAAC;YAC3D,MAAM,QAAQ,GAAG,GAAG,oBAAa,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;YACnE,MAAM,wBAAwB,GAAG,0BAA0B,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAE5E,IAAI,OAAO,wBAAwB,KAAK,UAAU,EAAE;gBAClD,mDAAmD;gBACnD,6CAA6C;gBAC7C,+CAA+C;gBAC/C,OAAO,wBAAwB,CAAC,iBAAiB,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;aACjF;YAED,qEAAqE;YACrE,uCAAuC;YACvC,8DAA8D;YAC9D,iDAAiD;YACjD,6BAA6B;YAC7B,uCAAuC;YACvC,MAAM,cAAc,GAAG,MAAM,wBAAwB,CAAC;YAEtD,OAAO,oCAAY,CACjB,iBAAiB,EACjB,cAAc,EACd,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,uBAAuB,CAC/B,CAAC;QACJ,CAAC;KAAA;CACF;AAvCD,oDAuCC;AAED,SAAS,0BAA0B,CAAC,IAAY,EAAE,QAAgB;IAChE,sBAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAE/B,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,kDAAkD;IAClD,mEAAmE;IACnE,qDAAqD;IACrD,6DAA6D;IAC7D,yBAAyB;IACzB,OAAO,mBAAmB,CAAC,OAAO,IAAI,mBAAmB,CAAC;AAC5D,CAAC"}
+{"version":3,"file":"custom-webpack-builder.js","sourceRoot":"","sources":["../src/custom-webpack-builder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAoE;AAGpE,mEAAuD;AAEvD,mCAAyC;AAI5B,QAAA,wBAAwB,GAAG,mBAAmB,CAAC;AAgB5D,MAAa,oBAAoB;IAC/B,MAAM,CAAO,kBAAkB,CAC7B,IAAU,EACV,MAAkC,EAClC,iBAAgC,EAChC,YAAiB,EACjB,aAA4B,EAC5B,MAAyB;;YAEzB,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO,iBAAiB,CAAC;aAC1B;YAED,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,IAAI,gCAAwB,CAAC;YAClE,MAAM,IAAI,GAAG,GAAG,oBAAa,CAAC,IAAI,CAAC,IAAI,iBAAiB,EAAE,CAAC;YAC3D,MAAM,QAAQ,GAAG,GAAG,oBAAa,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;YACnE,MAAM,wBAAwB,GAAG,0BAA0B,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YAEpF,IAAI,OAAO,wBAAwB,KAAK,UAAU,EAAE;gBAClD,mDAAmD;gBACnD,6CAA6C;gBAC7C,+CAA+C;gBAC/C,OAAO,wBAAwB,CAAC,iBAAiB,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;aACjF;YAED,qEAAqE;YACrE,uCAAuC;YACvC,8DAA8D;YAC9D,iDAAiD;YACjD,6BAA6B;YAC7B,uCAAuC;YACvC,MAAM,cAAc,GAAG,MAAM,wBAAwB,CAAC;YAEtD,OAAO,oCAAY,CACjB,iBAAiB,EACjB,cAAc,EACd,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,uBAAuB,CAC/B,CAAC;QACJ,CAAC;KAAA;CACF;AAxCD,oDAwCC;AAED,SAAS,0BAA0B,CACjC,IAAY,EACZ,QAAgB,EAChB,MAAyB;IAEzB,sBAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAEvC,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,kDAAkD;IAClD,mEAAmE;IACnE,qDAAqD;IACrD,6DAA6D;IAC7D,yBAAyB;IACzB,OAAO,mBAAmB,CAAC,OAAO,IAAI,mBAAmB,CAAC;AAC5D,CAAC"}

package/dist/transform-factories.js

@@ -13,14 +13,14 @@ exports.getTransforms = exports.indexHtmlTransformFactory = exports.customWebpac
 const core_1 = require("@angular-devkit/core");
 const custom_webpack_builder_1 = require("./custom-webpack-builder");
 const utils_1 = require("./utils");
-const customWebpackConfigTransformFactory = (options, { workspaceRoot, target }) => browserWebpackConfig => {
-    return custom_webpack_builder_1.CustomWebpackBuilder.buildWebpackConfig(core_1.normalize(workspaceRoot), options.customWebpackConfig, browserWebpackConfig, options, target);
+const customWebpackConfigTransformFactory = (options, { workspaceRoot, target, logger }) => browserWebpackConfig => {
+    return custom_webpack_builder_1.CustomWebpackBuilder.buildWebpackConfig(core_1.normalize(workspaceRoot), options.customWebpackConfig, browserWebpackConfig, options, target, logger);
 };
 exports.customWebpackConfigTransformFactory = customWebpackConfigTransformFactory;
-const indexHtmlTransformFactory = ({ indexTransform, tsConfig }, { workspaceRoot, target }) => {
+const indexHtmlTransformFactory = ({ indexTransform, tsConfig }, { workspaceRoot, target, logger }) => {
     if (!indexTransform)
         return null;
-    utils_1.tsNodeRegister(indexTransform, `${core_1.getSystemPath(core_1.normalize(workspaceRoot))}/${tsConfig}`);
+    utils_1.tsNodeRegister(indexTransform, `${core_1.getSystemPath(core_1.normalize(workspaceRoot))}/${tsConfig}`, logger);
     const indexModule = require(`${core_1.getSystemPath(core_1.normalize(workspaceRoot))}/${indexTransform}`);
     const transform = indexModule.default || indexModule;
     return (indexHtml) => __awaiter(void 0, void 0, void 0, function* () { return transform(target, indexHtml); });

package/dist/transform-factories.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform-factories.js","sourceRoot":"","sources":["../src/transform-factories.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,+CAAgE;AAEhE,qEAAgE;AAEhE,mCAAyC;AAElC,MAAM,mCAAmC,GAI9C,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,EAAE,CACvC,oBAAoB,CAAC,EAAE;IACrB,OAAO,6CAAoB,CAAC,kBAAkB,CAC5C,gBAAS,CAAC,aAAa,CAAC,EACxB,OAAO,CAAC,mBAAmB,EAC3B,oBAAoB,EACpB,OAAO,EACP,MAAM,CACP,CAAC;AACJ,CAAC,CAAC;AAbS,QAAA,mCAAmC,uCAa5C;AAEG,MAAM,yBAAyB,GAGZ,CAAC,EAAE,cAAc,EAAE,QAAQ,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,EAAE;IACpF,IAAI,CAAC,cAAc;QAAE,OAAO,IAAI,CAAC;IACjC,sBAAc,CAAC,cAAc,EAAE,GAAG,oBAAa,CAAC,gBAAS,CAAC,aAAa,CAAC,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC;IACzF,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,oBAAa,CAAC,gBAAS,CAAC,aAAa,CAAC,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC;IAC5F,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC;IACrD,OAAO,CAAO,SAAiB,EAAE,EAAE,kDAAC,OAAA,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA,GAAA,CAAC;AACnE,CAAC,CAAC;AATW,QAAA,yBAAyB,6BASpC;AAEK,MAAM,aAAa,GAAG,CAAC,OAA4B,EAAE,OAAuB,EAAE,EAAE,CAAC,CAAC;IACvF,oBAAoB,EAAE,2CAAmC,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3E,SAAS,EAAE,iCAAyB,CAAC,OAAO,EAAE,OAAO,CAAC;CACvD,CAAC,CAAC;AAHU,QAAA,aAAa,iBAGvB"}
+{"version":3,"file":"transform-factories.js","sourceRoot":"","sources":["../src/transform-factories.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,+CAAgE;AAEhE,qEAAgE;AAEhE,mCAAyC;AAElC,MAAM,mCAAmC,GAI9C,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAC/C,oBAAoB,CAAC,EAAE;IACrB,OAAO,6CAAoB,CAAC,kBAAkB,CAC5C,gBAAS,CAAC,aAAa,CAAC,EACxB,OAAO,CAAC,mBAAmB,EAC3B,oBAAoB,EACpB,OAAO,EACP,MAAM,EACN,MAAM,CACP,CAAC;AACJ,CAAC,CAAC;AAdS,QAAA,mCAAmC,uCAc5C;AAEG,MAAM,yBAAyB,GAGZ,CAAC,EAAE,cAAc,EAAE,QAAQ,EAAE,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;IAC5F,IAAI,CAAC,cAAc;QAAE,OAAO,IAAI,CAAC;IACjC,sBAAc,CAAC,cAAc,EAAE,GAAG,oBAAa,CAAC,gBAAS,CAAC,aAAa,CAAC,CAAC,IAAI,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;IACjG,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,oBAAa,CAAC,gBAAS,CAAC,aAAa,CAAC,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC;IAC5F,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC;IACrD,OAAO,CAAO,SAAiB,EAAE,EAAE,kDAAC,OAAA,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA,GAAA,CAAC;AACnE,CAAC,CAAC;AATW,QAAA,yBAAyB,6BASpC;AAEK,MAAM,aAAa,GAAG,CAAC,OAA4B,EAAE,OAAuB,EAAE,EAAE,CAAC,CAAC;IACvF,oBAAoB,EAAE,2CAAmC,CAAC,OAAO,EAAE,OAAO,CAAC;IAC3E,SAAS,EAAE,iCAAyB,CAAC,OAAO,EAAE,OAAO,CAAC;CACvD,CAAC,CAAC;AAHU,QAAA,aAAa,iBAGvB"}

package/dist/utils.d.ts

@@ -1,6 +1,7 @@
+import { logging } from '@angular-devkit/core';
 /**
  * check for TS node registration
  * @param file: file name or file directory are allowed
  * @todo tsNodeRegistration: require ts-node if file extension is TypeScript
  */
-export declare function tsNodeRegister(file?: string, tsConfig?: string): void;
+export declare function tsNodeRegister(file: string, tsConfig: string, logger: logging.LoggerApi): void;

package/dist/utils.js

@@ -3,15 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsNodeRegister = void 0;
 const _tsNodeRegister = (() => {
     let lastTsConfig;
-    return (tsConfig) => {
+    return (tsConfig, logger) => {
         // Check if the function was previously called with the same tsconfig
-        if (typeof lastTsConfig !== 'undefined' && (tsConfig !== null && tsConfig !== void 0 ? tsConfig : null) !== lastTsConfig) {
-            throw new Error('Called with multiple tsconfigs.');
+        if (lastTsConfig && lastTsConfig !== tsConfig) {
+            logger.warn(`Trying to register ts-node again with a different tsconfig - skipping the registration.
+                   tsconfig 1: ${lastTsConfig}
+                   tsconfig 2: ${tsConfig}`);
         }
         if (lastTsConfig) {
             return;
         }
-        lastTsConfig = tsConfig !== null && tsConfig !== void 0 ? tsConfig : null;
+        lastTsConfig = tsConfig;
         // Register ts-node
         require('ts-node').register({
             project: tsConfig,
@@ -35,10 +37,10 @@ const _tsNodeRegister = (() => {
  * @param file: file name or file directory are allowed
  * @todo tsNodeRegistration: require ts-node if file extension is TypeScript
  */
-function tsNodeRegister(file = '', tsConfig) {
+function tsNodeRegister(file = '', tsConfig, logger) {
     if (file && file.endsWith('.ts')) {
         // Register TS compiler lazily
-        _tsNodeRegister(tsConfig);
+        _tsNodeRegister(tsConfig, logger);
     }
 }
 exports.tsNodeRegister = tsNodeRegister;

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE;IAC5B,IAAI,YAAuC,CAAC;IAC5C,OAAO,CAAC,QAAiB,EAAE,EAAE;QAC3B,qEAAqE;QACrE,IAAI,OAAO,YAAY,KAAK,WAAW,IAAI,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,IAAI,CAAC,KAAK,YAAY,EAAE;YAC9E,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;SACpD;QACD,IAAI,YAAY,EAAE;YAChB,OAAO;SACR;QACD,YAAY,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,IAAI,CAAC;QAEhC,mBAAmB;QACnB,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;YAC1B,OAAO,EAAE,QAAQ;YACjB,eAAe,EAAE;gBACf,MAAM,EAAE,UAAU;gBAClB,KAAK,EAAE;oBACL,MAAM,EAAE,qGAAqG;iBAC9G;aACF;SACF,CAAC,CAAC;QAEH,6BAA6B;QAC7B,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAChD,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC/E,IAAI,OAAO,IAAI,KAAK,EAAE;YACpB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;SAC5C;IACH,CAAC,CAAC;AACJ,CAAC,CAAC,EAAE,CAAC;AAEL;;;;GAIG;AACH,SAAgB,cAAc,CAAC,OAAe,EAAE,EAAE,QAAiB;IACjE,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAChC,8BAA8B;QAC9B,eAAe,CAAC,QAAQ,CAAC,CAAC;KAC3B;AACH,CAAC;AALD,wCAKC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAEA,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE;IAC5B,IAAI,YAAgC,CAAC;IACrC,OAAO,CAAC,QAAgB,EAAE,MAAyB,EAAE,EAAE;QACrD,qEAAqE;QACrE,IAAI,YAAY,IAAI,YAAY,KAAK,QAAQ,EAAE;YAC7C,MAAM,CAAC,IAAI,CAAC;iCACe,YAAY;iCACZ,QAAQ,EAAE,CAAC,CAAC;SACxC;QAED,IAAI,YAAY,EAAE;YAChB,OAAO;SACR;QAED,YAAY,GAAG,QAAQ,CAAC;QAExB,mBAAmB;QACnB,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;YAC1B,OAAO,EAAE,QAAQ;YACjB,eAAe,EAAE;gBACf,MAAM,EAAE,UAAU;gBAClB,KAAK,EAAE;oBACL,MAAM,EAAE,qGAAqG;iBAC9G;aACF;SACF,CAAC,CAAC;QAEH,6BAA6B;QAC7B,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAChD,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC/E,IAAI,OAAO,IAAI,KAAK,EAAE;YACpB,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;SAC5C;IACH,CAAC,CAAC;AACJ,CAAC,CAAC,EAAE,CAAC;AAEL;;;;GAIG;AACH,SAAgB,cAAc,CAAC,OAAe,EAAE,EAAE,QAAgB,EAAE,MAAyB;IAC3F,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAChC,8BAA8B;QAC9B,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;KACnC;AACH,CAAC;AALD,wCAKC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-builders/custom-webpack",
-  "version": "12.1.2-beta.0",
+  "version": "12.1.3",
   "description": "Custom webpack builders for Angular build facade. Allow to modify Angular build configuration without ejecting it",
   "main": "dist/index.js",
   "files": [
@@ -45,5 +45,5 @@
     "tsconfig-paths": "^3.9.0",
     "webpack-merge": "^5.7.3"
   },
-  "gitHead": "027407d90966a9a5a2ce79899e85b5354d6849cf"
+  "gitHead": "dea4afba96804b57e2fb25eb242ced985f1d5ea8"
 }