@angular-builders/custom-webpack 18.0.0-beta.1 → 18.0.0-beta.2

package/README.md

@@ -33,6 +33,7 @@ Allow customizing build configuration without ejecting webpack configuration (`n
 <details>
   <summary>Click to expand</summary>
 
+- [Version 17](https://github.com/just-jeb/angular-builders/blob/17.x.x/packages/custom-webpack/README.md)
 - [Version 16](https://github.com/just-jeb/angular-builders/blob/16.x.x/packages/custom-webpack/README.md)
 - [Version 15](https://github.com/just-jeb/angular-builders/blob/15.x.x/packages/custom-webpack/README.md)
 - [Version 14](https://github.com/just-jeb/angular-builders/blob/14.x.x/packages/custom-webpack/README.md)
@@ -50,7 +51,7 @@ Allow customizing build configuration without ejecting webpack configuration (`n
 
 ## Prerequisites:
 
-- [Angular CLI 17](https://www.npmjs.com/package/@angular/cli)
+- [Angular CLI 18](https://www.npmjs.com/package/@angular/cli)
 
 # Usage
 

package/dist/browser/schema.json

@@ -279,8 +279,7 @@
     },
     "deployUrl": {
       "type": "string",
-      "description": "URL where files will be deployed.",
-      "x-deprecated": "Use \"baseHref\" option, \"APP_BASE_HREF\" DI token or a combination of both instead. For more information, see https://angular.io/guide/deployment#the-deploy-url."
+      "description": "Customize the base path for the URLs of resources in 'index.html' and component stylesheets. This option is only necessary for specific deployment scenarios, such as with Angular Elements or when utilizing different CDN locations."
     },
     "verbose": {
       "type": "boolean",
@@ -445,7 +444,7 @@
       ]
     },
     "allowedCommonJsDependencies": {
-      "description": "A list of CommonJS packages that are allowed to be used without a build time warning.",
+      "description": "A list of CommonJS or AMD packages that are allowed to be used without a build time warning. Use `'*'` to allow all.",
       "type": "array",
       "items": {
         "type": "string"
@@ -535,14 +534,14 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
           "required": [
             "glob",
-            "input",
-            "output"
+            "input"
           ]
         },
         {
@@ -557,11 +556,11 @@
           "properties": {
             "src": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             },
             "replaceWith": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             }
           },
           "additionalProperties": false,
@@ -575,11 +574,11 @@
           "properties": {
             "replace": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             },
             "with": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             }
           },
           "additionalProperties": false,

package/dist/custom-webpack-builder.js

@@ -10,10 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomWebpackBuilder = exports.defaultWebpackConfigPath = void 0;
+const path = require("node:path");
 const util_1 = require("util");
 const core_1 = require("@angular-devkit/core");
 const lodash_1 = require("lodash");
-const utils_1 = require("./utils");
+const common_1 = require("@angular-builders/common");
 const webpack_config_merger_1 = require("./webpack-config-merger");
 exports.defaultWebpackConfigPath = 'webpack.config.js';
 class CustomWebpackBuilder {
@@ -22,10 +23,10 @@ class CustomWebpackBuilder {
             if (!config) {
                 return baseWebpackConfig;
             }
-            const webpackConfigPath = config.path || exports.defaultWebpackConfigPath;
-            const path = `${(0, core_1.getSystemPath)(root)}/${webpackConfigPath}`;
-            const tsConfig = `${(0, core_1.getSystemPath)(root)}/${buildOptions.tsConfig}`;
-            const configOrFactoryOrPromise = yield resolveCustomWebpackConfig(path, tsConfig, logger);
+            const normalizedRootPath = (0, core_1.getSystemPath)(root);
+            const tsConfig = path.join(normalizedRootPath, buildOptions.tsConfig);
+            const webpackConfigPath = path.join(normalizedRootPath, config.path || exports.defaultWebpackConfigPath);
+            const configOrFactoryOrPromise = yield (0, common_1.loadModule)(webpackConfigPath, tsConfig, logger);
             if (typeof configOrFactoryOrPromise === 'function') {
                 // The exported function can return a new configuration synchronously
                 // or return a promise that resolves to a new configuration.
@@ -47,12 +48,6 @@ class CustomWebpackBuilder {
     }
 }
 exports.CustomWebpackBuilder = CustomWebpackBuilder;
-function resolveCustomWebpackConfig(path, tsConfig, logger) {
-    return __awaiter(this, void 0, void 0, function* () {
-        (0, utils_1.tsNodeRegister)(path, tsConfig, logger);
-        return (0, utils_1.loadModule)(path);
-    });
-}
 function logConfigProperties(config, webpackConfig, logger) {
     var _a;
     // There's no reason to log the entire configuration object

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,+BAA+B;AAC/B,+CAAoE;AACpE,mCAA6B;AAK7B,mCAAqD;AACrD,mEAAuD;AAE1C,QAAA,wBAAwB,GAAG,mBAAmB,CAAC;AAgB5D,MAAa,oBAAoB;IAC/B,MAAM,CAAO,kBAAkB,CAC7B,IAAU,EACV,MAAyC,EACzC,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,IAAA,oBAAa,EAAC,IAAI,CAAC,IAAI,iBAAiB,EAAE,CAAC;YAC3D,MAAM,QAAQ,GAAG,GAAG,IAAA,oBAAa,EAAC,IAAI,CAAC,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;YACnE,MAAM,wBAAwB,GAAG,MAAM,0BAA0B,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YAE1F,IAAI,OAAO,wBAAwB,KAAK,UAAU,EAAE;gBAClD,qEAAqE;gBACrE,4DAA4D;gBAC5D,MAAM,kBAAkB,GAAG,MAAM,wBAAwB,CACvD,iBAAiB,EACjB,YAAY,EACZ,aAAa,CACd,CAAC;gBACF,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;gBACxD,OAAO,kBAAkB,CAAC;aAC3B;YAED,gFAAgF;YAChF,iCAAiC;YACjC,8DAA8D;YAC9D,wEAAwE;YACxE,yEAAyE;YACzE,gDAAgD;YAChD,MAAM,cAAc,GAAG,MAAM,wBAAwB,CAAC;YAEtD,MAAM,kBAAkB,GAAG,IAAA,oCAAY,EACrC,iBAAiB,EACjB,cAAc,EACd,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,uBAAuB,CAC/B,CAAC;YACF,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;YACxD,OAAO,kBAAkB,CAAC;QAC5B,CAAC;KAAA;CACF;AA/CD,oDA+CC;AAED,SAAe,0BAA0B,CACvC,IAAY,EACZ,QAAgB,EAChB,MAAyB;;QAEzB,IAAA,sBAAc,EAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEvC,OAAO,IAAA,kBAAU,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAED,SAAS,mBAAmB,CAC1B,MAAkC,EAClC,aAA4B,EAC5B,MAAyB;;IAEzB,2DAA2D;IAC3D,2DAA2D;IAC3D,4DAA4D;IAC5D,2EAA2E;IAC3E,IAAI,MAAA,MAAM,CAAC,OAAO,0CAAE,UAAU,EAAE;QAC9B,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE;YAChD,MAAM,KAAK,GAAG,IAAA,YAAG,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;YAC3C,IAAI,KAAK,EAAE;gBACT,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;gBAC1F,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACtB;SACF;KACF;AACH,CAAC"}
+{"version":3,"file":"custom-webpack-builder.js","sourceRoot":"","sources":["../src/custom-webpack-builder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,kCAAkC;AAClC,+BAA+B;AAC/B,+CAAoE;AACpE,mCAA6B;AAE7B,qDAAsD;AAKtD,mEAAuD;AAE1C,QAAA,wBAAwB,GAAG,mBAAmB,CAAC;AAgB5D,MAAa,oBAAoB;IAC/B,MAAM,CAAO,kBAAkB,CAC7B,IAAU,EACV,MAAyC,EACzC,iBAAgC,EAChC,YAAiB,EACjB,aAA4B,EAC5B,MAAyB;;YAEzB,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,iBAAiB,CAAC;YAC3B,CAAC;YAED,MAAM,kBAAkB,GAAG,IAAA,oBAAa,EAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;YACtE,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CACjC,kBAAkB,EAClB,MAAM,CAAC,IAAI,IAAI,gCAAwB,CACxC,CAAC;YACF,MAAM,wBAAwB,GAAG,MAAM,IAAA,mBAAU,EAC/C,iBAAiB,EACjB,QAAQ,EACR,MAAM,CACP,CAAC;YAEF,IAAI,OAAO,wBAAwB,KAAK,UAAU,EAAE,CAAC;gBACnD,qEAAqE;gBACrE,4DAA4D;gBAC5D,MAAM,kBAAkB,GAAG,MAAM,wBAAwB,CACvD,iBAAiB,EACjB,YAAY,EACZ,aAAa,CACd,CAAC;gBACF,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;gBACxD,OAAO,kBAAkB,CAAC;YAC5B,CAAC;YAED,gFAAgF;YAChF,iCAAiC;YACjC,8DAA8D;YAC9D,wEAAwE;YACxE,yEAAyE;YACzE,gDAAgD;YAChD,MAAM,cAAc,GAAG,MAAM,wBAAwB,CAAC;YAEtD,MAAM,kBAAkB,GAAG,IAAA,oCAAY,EACrC,iBAAiB,EACjB,cAAc,EACd,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,uBAAuB,CAC/B,CAAC;YACF,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,EAAE,MAAM,CAAC,CAAC;YACxD,OAAO,kBAAkB,CAAC;QAC5B,CAAC;KAAA;CACF;AAtDD,oDAsDC;AAED,SAAS,mBAAmB,CAC1B,MAAkC,EAClC,aAA4B,EAC5B,MAAyB;;IAEzB,2DAA2D;IAC3D,2DAA2D;IAC3D,4DAA4D;IAC5D,2EAA2E;IAC3E,IAAI,MAAA,MAAM,CAAC,OAAO,0CAAE,UAAU,EAAE,CAAC;QAC/B,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACjD,MAAM,KAAK,GAAG,IAAA,YAAG,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;YAC3C,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;gBAC1F,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/dev-server/schema.json

@@ -13,7 +13,7 @@
     "buildTarget": {
       "type": "string",
       "description": "A build 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]+)?$"
+      "pattern": "^[^:\\s]*:[^:\\s]*(:[^\\s]+)?$"
     },
     "port": {
       "type": "number",
@@ -69,11 +69,11 @@
     },
     "publicHost": {
       "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": "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. This option has no effect when using the 'application' or other esbuild-based builders."
     },
     "allowedHosts": {
       "type": "array",
-      "description": "List of hosts that are allowed to access the dev server.",
+      "description": "List of hosts that are allowed to access the dev server. This option has no effect when using the 'application' or other esbuild-based builders.",
       "default": [],
       "items": {
         "type": "string"
@@ -85,7 +85,7 @@
     },
     "disableHostCheck": {
       "type": "boolean",
-      "description": "Don't verify connected clients are part of allowed hosts.",
+      "description": "Don't verify connected clients are part of allowed hosts. This option has no effect when using the 'application' or other esbuild-based builders.",
       "default": false
     },
     "hmr": {
@@ -106,6 +106,30 @@
       "type": "boolean",
       "description": "Force the development server to use the 'browser-esbuild' builder when building. This is a developer preview option for the esbuild-based build system.",
       "default": false
+    },
+    "prebundle": {
+      "description": "Enable and control the Vite-based development server's prebundling capabilities. To enable prebundling, the Angular CLI cache must also be enabled. This option has no effect when using the 'browser' or other Webpack-based builders.",
+      "oneOf": [
+        {
+          "type": "boolean"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "exclude": {
+              "description": "List of package imports that should not be prebundled by the development server. The packages will be bundled into the application code itself.",
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "exclude"
+          ]
+        }
+      ]
     }
   },
   "additionalProperties": false,

package/dist/extract-i18n/schema.json

@@ -13,7 +13,7 @@
     "buildTarget": {
       "type": "string",
       "description": "A builder target to extract i18n messages 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]+)?$"
+      "pattern": "^[^:\\s]*:[^:\\s]*(:[^\\s]+)?$"
     },
     "format": {
       "type": "string",
@@ -46,17 +46,5 @@
     }
   },
   "additionalProperties": false,
-  "anyOf": [
-    {
-      "required": [
-        "buildTarget"
-      ]
-    },
-    {
-      "required": [
-        "browserTarget"
-      ]
-    }
-  ],
   "$id": "BuildCustomWebpackExtractI18nSchema"
 }

package/dist/generic-browser-builder.d.ts

@@ -1,6 +1,6 @@
 import { BuilderContext, BuilderHandlerFn } from '@angular-devkit/architect';
 import { ExecutionTransformer } from '@angular-devkit/build-angular';
-import { IndexHtmlTransform } from '@angular-devkit/build-angular/src/utils/index-file/index-html-generator';
+import type { IndexHtmlTransform } from '@angular/build/src/utils/index-file/index-html-generator';
 import { Configuration } from 'webpack';
 import { json } from '@angular-devkit/core';
 export interface BrowserTargetOptions {

package/dist/generic-browser-builder.js

@@ -16,8 +16,8 @@ const operators_1 = require("rxjs/operators");
 const transform_factories_1 = require("./transform-factories");
 const executeBrowserBasedBuilder = (executebBuilder) => (options, context) => {
     function setup() {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const browserTarget = (0, architect_1.targetFromTargetString)(
             // `browserTarget` has been deprecated.
             (_a = options.buildTarget) !== null && _a !== void 0 ? _a : options.browserTarget);

package/dist/generic-browser-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"generic-browser-builder.js","sourceRoot":"","sources":["../src/generic-browser-builder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAImC;AAGnC,+BAA4B;AAC5B,8CAA2C;AAG3C,+DAAsD;AAiB/C,MAAM,0BAA0B,GACrC,CACE,eAAmC,EACd,EAAE,CACzB,CAAC,OAAU,EAAE,OAAuB,EAAsC,EAAE;IAC1E,SAAe,KAAK;;;YAClB,MAAM,aAAa,GAAG,IAAA,kCAAsB;YAC1C,uCAAuC;YACvC,MAAA,OAAO,CAAC,WAAW,mCAAI,OAAO,CAAC,aAAc,CAC9C,CAAC;YACF,OAAO,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAmC,CAAC;;KAClF;IAED,OAAO,IAAA,WAAI,EAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CACvB,IAAA,qBAAS,EAAC,oBAAoB,CAAC,EAAE,CAC/B,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,IAAA,mCAAa,EAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC,CAChF,CACF,CAAC;AACJ,CAAC,CAAC;AAlBS,QAAA,0BAA0B,8BAkBnC"}
+{"version":3,"file":"generic-browser-builder.js","sourceRoot":"","sources":["../src/generic-browser-builder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAImC;AAGnC,+BAA4B;AAC5B,8CAA2C;AAG3C,+DAAsD;AAiB/C,MAAM,0BAA0B,GACrC,CACE,eAAmC,EACd,EAAE,CACzB,CAAC,OAAU,EAAE,OAAuB,EAAsC,EAAE;IAC1E,SAAe,KAAK;;;YAClB,MAAM,aAAa,GAAG,IAAA,kCAAsB;YAC1C,uCAAuC;YACvC,MAAA,OAAO,CAAC,WAAW,mCAAI,OAAO,CAAC,aAAc,CAC9C,CAAC;YACF,OAAO,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAmC,CAAC;QACnF,CAAC;KAAA;IAED,OAAO,IAAA,WAAI,EAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CACvB,IAAA,qBAAS,EAAC,oBAAoB,CAAC,EAAE,CAC/B,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,IAAA,mCAAa,EAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC,CAChF,CACF,CAAC;AACJ,CAAC,CAAC;AAlBS,QAAA,0BAA0B,8BAkBnC"}

package/dist/karma/schema.json

@@ -210,8 +210,18 @@
       "description": "Do not use the real path when resolving modules. If unset then will default to `true` if NodeJS option --preserve-symlinks is set."
     },
     "browsers": {
-      "type": "string",
-      "description": "Override which browsers tests are run against."
+      "description": "Override which browsers tests are run against. Set to `false` to not use any browser.",
+      "oneOf": [
+        {
+          "type": "string",
+          "description": "A comma seperate list of browsers to run tests against."
+        },
+        {
+          "const": false,
+          "type": "boolean",
+          "description": "Does use run tests against a browser."
+        }
+      ]
     },
     "codeCoverage": {
       "type": "boolean",
@@ -346,6 +356,7 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             },
             "ignore": {
@@ -359,8 +370,7 @@
           "additionalProperties": false,
           "required": [
             "glob",
-            "input",
-            "output"
+            "input"
           ]
         },
         {

package/dist/server/schema.json

@@ -126,8 +126,7 @@
     },
     "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."
+      "description": "Customize the base path for the URLs of resources in 'index.html' and component stylesheets. This option is only necessary for specific deployment scenarios, such as with Angular Elements or when utilizing different CDN locations."
     },
     "vendorChunk": {
       "type": "boolean",
@@ -321,14 +320,14 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
           "required": [
             "glob",
-            "input",
-            "output"
+            "input"
           ]
         },
         {
@@ -343,11 +342,11 @@
           "properties": {
             "src": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             },
             "replaceWith": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             }
           },
           "additionalProperties": false,
@@ -361,11 +360,11 @@
           "properties": {
             "replace": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             },
             "with": {
               "type": "string",
-              "pattern": "\\.(([cm]?j|t)sx?|json)$"
+              "pattern": "\\.(([cm]?[jt])sx?|json)$"
             }
           },
           "additionalProperties": false,

package/dist/transform-factories.d.ts

@@ -1,6 +1,6 @@
 import { BuilderContext } from '@angular-devkit/architect';
 import { ExecutionTransformer } from '@angular-devkit/build-angular';
-import { IndexHtmlTransform } from '@angular-devkit/build-angular/src/utils/index-file/index-html-generator';
+import type { IndexHtmlTransform } from '@angular/build/src/utils/index-file/index-html-generator';
 import { Configuration } from 'webpack';
 import { CustomWebpackSchema } from './custom-webpack-schema';
 export declare const customWebpackConfigTransformFactory: (options: CustomWebpackSchema, context: BuilderContext) => ExecutionTransformer<Configuration>;

package/dist/transform-factories.js

@@ -10,19 +10,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTransforms = exports.indexHtmlTransformFactory = exports.customWebpackConfigTransformFactory = void 0;
+const path = require("node:path");
 const core_1 = require("@angular-devkit/core");
+const common_1 = require("@angular-builders/common");
 const custom_webpack_builder_1 = require("./custom-webpack-builder");
-const utils_1 = require("./utils");
 const customWebpackConfigTransformFactory = (options, { workspaceRoot, target, logger }) => browserWebpackConfig => {
     return custom_webpack_builder_1.CustomWebpackBuilder.buildWebpackConfig((0, core_1.normalize)(workspaceRoot), options.customWebpackConfig, browserWebpackConfig, options, target, logger);
 };
 exports.customWebpackConfigTransformFactory = customWebpackConfigTransformFactory;
-const indexHtmlTransformFactory = ({ indexTransform, tsConfig }, { workspaceRoot, target, logger }) => {
-    if (!indexTransform)
+const indexHtmlTransformFactory = (options, { workspaceRoot, target, logger }) => {
+    if (!options.indexTransform)
         return null;
-    (0, utils_1.tsNodeRegister)(indexTransform, `${(0, core_1.getSystemPath)((0, core_1.normalize)(workspaceRoot))}/${tsConfig}`, logger);
+    const transformPath = path.join((0, core_1.getSystemPath)((0, core_1.normalize)(workspaceRoot)), options.indexTransform);
+    const tsConfig = path.join((0, core_1.getSystemPath)((0, core_1.normalize)(workspaceRoot)), options.tsConfig);
     return (indexHtml) => __awaiter(void 0, void 0, void 0, function* () {
-        const transform = yield (0, utils_1.loadModule)(`${(0, core_1.getSystemPath)((0, core_1.normalize)(workspaceRoot))}/${indexTransform}`);
+        const transform = yield (0, common_1.loadModule)(transformPath, tsConfig, logger);
         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,mCAAqD;AAM9C,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,IAAA,gBAAS,EAAC,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,IAAA,sBAAc,EAAC,cAAc,EAAE,GAAG,IAAA,oBAAa,EAAC,IAAA,gBAAS,EAAC,aAAa,CAAC,CAAC,IAAI,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC;IAEjG,OAAO,CAAO,SAAiB,EAAE,EAAE;QACjC,MAAM,SAAS,GAAG,MAAM,IAAA,kBAAU,EAChC,GAAG,IAAA,oBAAa,EAAC,IAAA,gBAAS,EAAC,aAAa,CAAC,CAAC,IAAI,cAAc,EAAE,CAC/D,CAAC;QACF,OAAO,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtC,CAAC,CAAA,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,yBAAyB,6BAapC;AAEK,MAAM,aAAa,GAAG,CAAC,OAA4B,EAAE,OAAuB,EAAE,EAAE,CAAC,CAAC;IACvF,oBAAoB,EAAE,IAAA,2CAAmC,EAAC,OAAO,EAAE,OAAO,CAAC;IAC3E,SAAS,EAAE,IAAA,iCAAyB,EAAC,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":";;;;;;;;;;;;AAAA,kCAAkC;AAIlC,+CAAgE;AAEhE,qDAAsD;AAEtD,qEAAgE;AAOzD,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,IAAA,gBAAS,EAAC,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,OAAO,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;IACvE,IAAI,CAAC,OAAO,CAAC,cAAc;QAAE,OAAO,IAAI,CAAC;IAEzC,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAA,oBAAa,EAAC,IAAA,gBAAS,EAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACjG,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAA,oBAAa,EAAC,IAAA,gBAAS,EAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEtF,OAAO,CAAO,SAAiB,EAAE,EAAE;QACjC,MAAM,SAAS,GAAG,MAAM,IAAA,mBAAU,EAChC,aAAa,EACb,QAAQ,EACR,MAAM,CACP,CAAC;QAEF,OAAO,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtC,CAAC,CAAA,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,yBAAyB,6BAkBpC;AAEK,MAAM,aAAa,GAAG,CAAC,OAA4B,EAAE,OAAuB,EAAE,EAAE,CAAC,CAAC;IACvF,oBAAoB,EAAE,IAAA,2CAAmC,EAAC,OAAO,EAAE,OAAO,CAAC;IAC3E,SAAS,EAAE,IAAA,iCAAyB,EAAC,OAAO,EAAE,OAAO,CAAC;CACvD,CAAC,CAAC;AAHU,QAAA,aAAa,iBAGvB"}

package/dist/webpack-config-merger.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack-config-merger.js","sourceRoot":"","sources":["../src/webpack-config-merger.ts"],"names":[],"mappings":";;;AACA,iDAA8D;AAE9D,mCAAsD;AAEtD,MAAM,mBAAmB,GAAe;IACtC,MAAM,EAAE;QACN,KAAK,EAAE;YACL,IAAI,EAAE,6BAAa,CAAC,KAAK;YACzB,GAAG,EAAE;gBACH,MAAM,EAAE,6BAAa,CAAC,KAAK;gBAC3B,OAAO,EAAE,6BAAa,CAAC,KAAK;aAC7B;SACF;KACF;CACF,CAAC;AAEF,SAAgB,YAAY,CAC1B,cAA6B,EAC7B,cAA6B,EAC7B,aAAyB,mBAAmB,EAC5C,cAAc,GAAG,KAAK;IAEtB,MAAM,YAAY,GAAkB,IAAA,8BAAc,EAAC,UAAU,CAAC,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;IAE/F,IAAI,cAAc,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO,EAAE;QACpD,MAAM,gBAAgB,GAAG,IAAA,uBAAc,EACrC,cAAc,CAAC,OAAO,EACtB,cAAc,CAAC,OAAO,EACtB,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,KAAK,CAAC,WAAW,CAAC,IAAI,CACpE,CAAC;QACF,IAAI,CAAC,cAAc,EAAE;YACnB,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,cAAc,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;YACtE,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACtD,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAChF,CAAC;SACH;QACD,YAAY,CAAC,OAAO,GAAG,CAAC,GAAG,gBAAgB,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;KACzE;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAvBD,oCAuBC"}
+{"version":3,"file":"webpack-config-merger.js","sourceRoot":"","sources":["../src/webpack-config-merger.ts"],"names":[],"mappings":";;;AACA,iDAA8D;AAE9D,mCAAsD;AAEtD,MAAM,mBAAmB,GAAe;IACtC,MAAM,EAAE;QACN,KAAK,EAAE;YACL,IAAI,EAAE,6BAAa,CAAC,KAAK;YACzB,GAAG,EAAE;gBACH,MAAM,EAAE,6BAAa,CAAC,KAAK;gBAC3B,OAAO,EAAE,6BAAa,CAAC,KAAK;aAC7B;SACF;KACF;CACF,CAAC;AAEF,SAAgB,YAAY,CAC1B,cAA6B,EAC7B,cAA6B,EAC7B,aAAyB,mBAAmB,EAC5C,cAAc,GAAG,KAAK;IAEtB,MAAM,YAAY,GAAkB,IAAA,8BAAc,EAAC,UAAU,CAAC,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;IAE/F,IAAI,cAAc,CAAC,OAAO,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;QACrD,MAAM,gBAAgB,GAAG,IAAA,uBAAc,EACrC,cAAc,CAAC,OAAO,EACtB,cAAc,CAAC,OAAO,EACtB,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,KAAK,CAAC,WAAW,CAAC,IAAI,CACpE,CAAC;QACF,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,cAAc,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;YACtE,cAAc,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACtD,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAChF,CAAC;QACJ,CAAC;QACD,YAAY,CAAC,OAAO,GAAG,CAAC,GAAG,gBAAgB,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAvBD,oCAuBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-builders/custom-webpack",
-  "version": "18.0.0-beta.1",
+  "version": "18.0.0-beta.2",
   "description": "Custom webpack builders for Angular build facade. Allow to modify Angular build configuration without ejecting it",
   "main": "dist/index.js",
   "files": [
@@ -40,21 +40,21 @@
   },
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": ">=0.1700.0 < 0.1800.0",
-    "@angular-devkit/build-angular": "^17.0.0",
-    "@angular-devkit/core": "^17.0.0",
+    "@angular-builders/common": "workspace:*",
+    "@angular-devkit/architect": ">=0.1800.0 < 0.1900.0",
+    "@angular-devkit/build-angular": "^18.0.0",
+    "@angular-devkit/core": "^18.0.0",
     "lodash": "^4.17.15",
-    "ts-node": "^10.0.0",
-    "tsconfig-paths": "^4.1.0",
     "webpack-merge": "^5.7.3"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^17.0.0"
+    "@angular/compiler-cli": "^18.0.0"
   },
   "devDependencies": {
+    "@angular/build": "^18.0.0",
     "jest": "29.7.0",
     "rimraf": "^5.0.0",
-    "typescript": "5.2.2"
-  },
-  "gitHead": "d6e889ad444c29581521fc54295a3268d1e422ab"
+    "ts-node": "^10.0.0",
+    "typescript": "5.4.5"
+  }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Evgeny Barabanov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/dist/utils.d.ts

@@ -1,13 +0,0 @@
-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, logger: logging.LoggerApi): void;
-/**
- * Loads CJS and ESM modules based on extension
- * @param path path to the module
- * @returns
- */
-export declare function loadModule<T>(path: string): Promise<T>;

package/dist/utils.js

@@ -1,141 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadModule = exports.tsNodeRegister = void 0;
-const path_1 = require("path");
-const url_1 = require("url");
-const _tsNodeRegister = (() => {
-    let lastTsConfig;
-    return (tsConfig, logger) => {
-        // Check if the function was previously called with the same tsconfig
-        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;
-        loadTsNode().register({
-            project: tsConfig,
-            compilerOptions: {
-                module: 'CommonJS',
-                types: [
-                    'node', // NOTE: `node` is added because users scripts can also use pure node's packages as webpack or others
-                ],
-            },
-        });
-        const tsConfigPaths = loadTsConfigPaths();
-        const result = tsConfigPaths.loadConfig(tsConfig);
-        // The `loadConfig` returns a `ConfigLoaderResult` which must be guarded with
-        // the `resultType` check.
-        if (result.resultType === 'success') {
-            const { absoluteBaseUrl: baseUrl, paths } = result;
-            if (baseUrl && paths) {
-                tsConfigPaths.register({ baseUrl, paths });
-            }
-        }
-    };
-})();
-/**
- * check for TS node registration
- * @param file: file name or file directory are allowed
- * @todo tsNodeRegistration: require ts-node if file extension is TypeScript
- */
-function tsNodeRegister(file = '', tsConfig, logger) {
-    if (file === null || file === void 0 ? void 0 : file.endsWith('.ts')) {
-        // Register TS compiler lazily
-        _tsNodeRegister(tsConfig, logger);
-    }
-}
-exports.tsNodeRegister = tsNodeRegister;
-/**
- * This uses a dynamic import to load a module which may be ESM.
- * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
- * will currently, unconditionally downlevel dynamic import into a require call.
- * require calls cannot load ESM code and will result in a runtime error. To workaround
- * this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
- * Once TypeScript provides support for keeping the dynamic import this workaround can
- * be dropped.
- *
- * @param modulePath The path of the module to load.
- * @returns A Promise that resolves to the dynamically imported module.
- */
-function loadEsmModule(modulePath) {
-    return new Function('modulePath', `return import(modulePath);`)(modulePath);
-}
-/**
- * Loads CJS and ESM modules based on extension
- * @param path path to the module
- * @returns
- */
-function loadModule(path) {
-    return __awaiter(this, void 0, void 0, function* () {
-        switch ((0, path_1.extname)(path)) {
-            case '.mjs':
-                // Load the ESM configuration file using the TypeScript dynamic import workaround.
-                // Once TypeScript provides support for keeping the dynamic import this workaround can be
-                // changed to a direct dynamic import.
-                return (yield loadEsmModule((0, url_1.pathToFileURL)(path))).default;
-            case '.cjs':
-                return require(path);
-            case '.ts':
-                try {
-                    // If it's a TS file then there are 2 cases for exporing an object.
-                    // The first one is `export blah`, transpiled into `module.exports = { blah} `.
-                    // The second is `export default blah`, transpiled into `{ default: { ... } }`.
-                    return require(path).default || require(path);
-                }
-                catch (e) {
-                    if (e.code === 'ERR_REQUIRE_ESM') {
-                        // Load the ESM configuration file using the TypeScript dynamic import workaround.
-                        // Once TypeScript provides support for keeping the dynamic import this workaround can be
-                        // changed to a direct dynamic import.
-                        return (yield loadEsmModule((0, url_1.pathToFileURL)(path))).default;
-                    }
-                    throw e;
-                }
-            //.js
-            default:
-                // The file could be either CommonJS or ESM.
-                // CommonJS is tried first then ESM if loading fails.
-                try {
-                    return require(path);
-                }
-                catch (e) {
-                    if (e.code === 'ERR_REQUIRE_ESM') {
-                        // Load the ESM configuration file using the TypeScript dynamic import workaround.
-                        // Once TypeScript provides support for keeping the dynamic import this workaround can be
-                        // changed to a direct dynamic import.
-                        return (yield loadEsmModule((0, url_1.pathToFileURL)(path))).default;
-                    }
-                    throw e;
-                }
-        }
-    });
-}
-exports.loadModule = loadModule;
-/**
- * Loads `ts-node` lazily. Moved to a separate function to declare
- * a return type, more readable than an inline variant.
- */
-function loadTsNode() {
-    return require('ts-node');
-}
-/**
- * Loads `tsconfig-paths` lazily. Moved to a separate function to declare
- * a return type, more readable than an inline variant.
- */
-function loadTsConfigPaths() {
-    return require('tsconfig-paths');
-}
-//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}