@angular-builders/custom-webpack 13.0.0-beta.1 → 13.0.1-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -2
- package/dist/browser/index.js +2 -2
- package/dist/browser/index.js.map +1 -1
- package/dist/custom-webpack-builder.js +4 -4
- package/dist/custom-webpack-builder.js.map +1 -1
- package/dist/dev-server/index.js +1 -1
- package/dist/dev-server/index.js.map +1 -1
- package/dist/extract-i18n/index.js +1 -1
- package/dist/extract-i18n/index.js.map +1 -1
- package/dist/generic-browser-builder.js +2 -2
- package/dist/generic-browser-builder.js.map +1 -1
- package/dist/karma/index.js +3 -3
- package/dist/karma/index.js.map +1 -1
- package/dist/server/index.js +3 -3
- package/dist/server/index.js.map +1 -1
- package/dist/transform-factories.js +5 -5
- package/dist/transform-factories.js.map +1 -1
- package/dist/webpack-config-merger.js +4 -4
- package/dist/webpack-config-merger.js.map +1 -1
- package/package.json +11 -6
package/README.md
CHANGED
|
@@ -8,15 +8,23 @@ Allow customizing build configuration without ejecting webpack configuration (`n
|
|
|
8
8
|
|
|
9
9
|
## Previous versions
|
|
10
10
|
|
|
11
|
+
<details>
|
|
12
|
+
<summary>Click to expand</summary>
|
|
13
|
+
|
|
14
|
+
- [Version 12](https://github.com/just-jeb/angular-builders/blob/12.x.x/packages/custom-webpack/README.md)
|
|
11
15
|
- [Version 11](https://github.com/just-jeb/angular-builders/blob/11.x.x/packages/custom-webpack/README.md)
|
|
12
16
|
- [Version 10](https://github.com/just-jeb/angular-builders/blob/10.x.x/packages/custom-webpack/README.md)
|
|
13
17
|
- [Version 9](https://github.com/just-jeb/angular-builders/blob/9.x.x/packages/custom-webpack/README.md)
|
|
14
18
|
- [Version 8](https://github.com/just-jeb/angular-builders/blob/8.x.x/packages/custom-webpack/README.md)
|
|
15
19
|
- [Version 7](https://github.com/just-jeb/angular-builders/blob/7.x.x/packages/custom-webpack/README.md)
|
|
16
20
|
|
|
21
|
+
</details>
|
|
22
|
+
|
|
23
|
+
## [Quick guide](https://www.justjeb.com/post/customizing-angular-cli-build)
|
|
24
|
+
|
|
17
25
|
## Prerequisites:
|
|
18
26
|
|
|
19
|
-
- [Angular CLI
|
|
27
|
+
- [Angular CLI 13](https://www.npmjs.com/package/@angular/cli)
|
|
20
28
|
|
|
21
29
|
# Usage
|
|
22
30
|
|
|
@@ -484,7 +492,7 @@ export default (targetOptions: TargetOptions, indexHtml: string) => {
|
|
|
484
492
|
|
|
485
493
|
In the example we add a paragraph with build configuration to your `index.html`. It is a very simple example without any asynchronous code but you can also return a `Promise` from this function.
|
|
486
494
|
|
|
487
|
-
Full example [here](
|
|
495
|
+
Full example [here](../../examples/custom-webpack/full-cycle-app).
|
|
488
496
|
|
|
489
497
|
# Further Reading
|
|
490
498
|
|
package/dist/browser/index.js
CHANGED
|
@@ -4,7 +4,7 @@ exports.buildCustomWebpackBrowser = void 0;
|
|
|
4
4
|
const architect_1 = require("@angular-devkit/architect");
|
|
5
5
|
const build_angular_1 = require("@angular-devkit/build-angular");
|
|
6
6
|
const transform_factories_1 = require("../transform-factories");
|
|
7
|
-
const buildCustomWebpackBrowser = (options, context) => build_angular_1.executeBrowserBuilder(options, context, transform_factories_1.getTransforms(options, context));
|
|
7
|
+
const buildCustomWebpackBrowser = (options, context) => (0, build_angular_1.executeBrowserBuilder)(options, context, (0, transform_factories_1.getTransforms)(options, context));
|
|
8
8
|
exports.buildCustomWebpackBrowser = buildCustomWebpackBrowser;
|
|
9
|
-
exports.default = architect_1.createBuilder(exports.buildCustomWebpackBrowser);
|
|
9
|
+
exports.default = (0, architect_1.createBuilder)(exports.buildCustomWebpackBrowser);
|
|
10
10
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";;;AAAA,yDAA0E;AAC1E,iEAA6F;AAE7F,gEAAuD;AAKhD,MAAM,yBAAyB,GAAG,CACvC,OAAmC,EACnC,OAAuB,EACmB,EAAE,CAC5C,qCAAqB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";;;AAAA,yDAA0E;AAC1E,iEAA6F;AAE7F,gEAAuD;AAKhD,MAAM,yBAAyB,GAAG,CACvC,OAAmC,EACnC,OAAuB,EACmB,EAAE,CAC5C,IAAA,qCAAqB,EAAC,OAAO,EAAE,OAAO,EAAE,IAAA,mCAAa,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;AAJ9D,QAAA,yBAAyB,6BAIqC;AAE3E,kBAAe,IAAA,yBAAa,EAC1B,iCAAyB,CAC1B,CAAC"}
|
|
@@ -21,8 +21,8 @@ class CustomWebpackBuilder {
|
|
|
21
21
|
return baseWebpackConfig;
|
|
22
22
|
}
|
|
23
23
|
const webpackConfigPath = config.path || exports.defaultWebpackConfigPath;
|
|
24
|
-
const path = `${core_1.getSystemPath(root)}/${webpackConfigPath}`;
|
|
25
|
-
const tsConfig = `${core_1.getSystemPath(root)}/${buildOptions.tsConfig}`;
|
|
24
|
+
const path = `${(0, core_1.getSystemPath)(root)}/${webpackConfigPath}`;
|
|
25
|
+
const tsConfig = `${(0, core_1.getSystemPath)(root)}/${buildOptions.tsConfig}`;
|
|
26
26
|
const configOrFactoryOrPromise = resolveCustomWebpackConfig(path, tsConfig, logger);
|
|
27
27
|
if (typeof configOrFactoryOrPromise === 'function') {
|
|
28
28
|
// That exported function can be synchronous either
|
|
@@ -37,13 +37,13 @@ class CustomWebpackBuilder {
|
|
|
37
37
|
// `module.exports = { ... }`
|
|
38
38
|
// then it will promisified and awaited
|
|
39
39
|
const resolvedConfig = yield configOrFactoryOrPromise;
|
|
40
|
-
return webpack_config_merger_1.mergeConfigs(baseWebpackConfig, resolvedConfig, config.mergeRules, config.replaceDuplicatePlugins);
|
|
40
|
+
return (0, webpack_config_merger_1.mergeConfigs)(baseWebpackConfig, resolvedConfig, config.mergeRules, config.replaceDuplicatePlugins);
|
|
41
41
|
});
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
exports.CustomWebpackBuilder = CustomWebpackBuilder;
|
|
45
45
|
function resolveCustomWebpackConfig(path, tsConfig, logger) {
|
|
46
|
-
utils_1.tsNodeRegister(path, tsConfig, logger);
|
|
46
|
+
(0, utils_1.tsNodeRegister)(path, tsConfig, logger);
|
|
47
47
|
const customWebpackConfig = require(path);
|
|
48
48
|
// If the user provides a configuration in TS file
|
|
49
49
|
// then there are 2 cases for exporing an object. The first one is:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"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,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,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,IAAA,oCAAY,EACjB,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,IAAA,sBAAc,EAAC,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/dev-server/index.js
CHANGED
|
@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const architect_1 = require("@angular-devkit/architect");
|
|
4
4
|
const build_angular_1 = require("@angular-devkit/build-angular");
|
|
5
5
|
const generic_browser_builder_1 = require("../generic-browser-builder");
|
|
6
|
-
exports.default = architect_1.createBuilder(generic_browser_builder_1.executeBrowserBasedBuilder(build_angular_1.executeDevServerBuilder));
|
|
6
|
+
exports.default = (0, architect_1.createBuilder)((0, generic_browser_builder_1.executeBrowserBasedBuilder)(build_angular_1.executeDevServerBuilder));
|
|
7
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dev-server/index.ts"],"names":[],"mappings":";;AAAA,yDAA0D;AAC1D,iEAAiG;AACjG,wEAAwE;AAExE,kBAAe,yBAAa,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dev-server/index.ts"],"names":[],"mappings":";;AAAA,yDAA0D;AAC1D,iEAAiG;AACjG,wEAAwE;AAExE,kBAAe,IAAA,yBAAa,EAC1B,IAAA,oDAA0B,EAAC,uCAAuB,CAAC,CACpD,CAAC"}
|
|
@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const architect_1 = require("@angular-devkit/architect");
|
|
4
4
|
const build_angular_1 = require("@angular-devkit/build-angular");
|
|
5
5
|
const generic_browser_builder_1 = require("../generic-browser-builder");
|
|
6
|
-
exports.default = architect_1.createBuilder(generic_browser_builder_1.executeBrowserBasedBuilder(build_angular_1.executeExtractI18nBuilder));
|
|
6
|
+
exports.default = (0, architect_1.createBuilder)((0, generic_browser_builder_1.executeBrowserBasedBuilder)(build_angular_1.executeExtractI18nBuilder));
|
|
7
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/extract-i18n/index.ts"],"names":[],"mappings":";;AAAA,yDAA0D;AAC1D,iEAGuC;AACvC,wEAAwE;AAExE,kBAAe,yBAAa,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/extract-i18n/index.ts"],"names":[],"mappings":";;AAAA,yDAA0D;AAC1D,iEAGuC;AACvC,wEAAwE;AAExE,kBAAe,IAAA,yBAAa,EAC1B,IAAA,oDAA0B,EAAC,yCAAyB,CAAC,CACtD,CAAC"}
|
|
@@ -17,11 +17,11 @@ const transform_factories_1 = require("./transform-factories");
|
|
|
17
17
|
const executeBrowserBasedBuilder = (executebBuilder) => (options, context) => {
|
|
18
18
|
function setup() {
|
|
19
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
20
|
-
const browserTarget = architect_1.targetFromTargetString(options.browserTarget);
|
|
20
|
+
const browserTarget = (0, architect_1.targetFromTargetString)(options.browserTarget);
|
|
21
21
|
return context.getTargetOptions(browserTarget);
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
|
-
return rxjs_1.from(setup()).pipe(operators_1.switchMap(customWebpackOptions => executebBuilder(options, context, transform_factories_1.getTransforms(customWebpackOptions, context))));
|
|
24
|
+
return (0, rxjs_1.from)(setup()).pipe((0, operators_1.switchMap)(customWebpackOptions => executebBuilder(options, context, (0, transform_factories_1.getTransforms)(customWebpackOptions, context))));
|
|
25
25
|
};
|
|
26
26
|
exports.executeBrowserBasedBuilder = executeBrowserBasedBuilder;
|
|
27
27
|
//# sourceMappingURL=generic-browser-builder.js.map
|
|
@@ -1 +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;AAgB/C,MAAM,0BAA0B,GACrC,CACE,eAAmC,EACd,EAAE,CACzB,CAAC,OAAU,EAAE,OAAuB,EAAsC,EAAE;IAC1E,SAAe,KAAK;;YAClB,MAAM,aAAa,GAAG,kCAAsB,
|
|
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;AAgB/C,MAAM,0BAA0B,GACrC,CACE,eAAmC,EACd,EAAE,CACzB,CAAC,OAAU,EAAE,OAAuB,EAAsC,EAAE;IAC1E,SAAe,KAAK;;YAClB,MAAM,aAAa,GAAG,IAAA,kCAAsB,EAAC,OAAO,CAAC,aAAa,CAAC,CAAC;YACpE,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;AAfS,QAAA,0BAA0B,8BAenC"}
|
package/dist/karma/index.js
CHANGED
|
@@ -7,9 +7,9 @@ exports.buildCustomWebpackKarma = void 0;
|
|
|
7
7
|
const architect_1 = require("@angular-devkit/architect");
|
|
8
8
|
const build_angular_1 = require("@angular-devkit/build-angular");
|
|
9
9
|
const transform_factories_1 = require("../transform-factories");
|
|
10
|
-
const buildCustomWebpackKarma = (options, context) => build_angular_1.executeKarmaBuilder(options, context, {
|
|
11
|
-
webpackConfiguration: transform_factories_1.customWebpackConfigTransformFactory(options, context),
|
|
10
|
+
const buildCustomWebpackKarma = (options, context) => (0, build_angular_1.executeKarmaBuilder)(options, context, {
|
|
11
|
+
webpackConfiguration: (0, transform_factories_1.customWebpackConfigTransformFactory)(options, context),
|
|
12
12
|
});
|
|
13
13
|
exports.buildCustomWebpackKarma = buildCustomWebpackKarma;
|
|
14
|
-
exports.default = architect_1.createBuilder(exports.buildCustomWebpackKarma);
|
|
14
|
+
exports.default = (0, architect_1.createBuilder)(exports.buildCustomWebpackKarma);
|
|
15
15
|
//# sourceMappingURL=index.js.map
|
package/dist/karma/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/karma/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,yDAA0E;AAC1E,iEAAyF;AAEzF,gEAA6E;AAKtE,MAAM,uBAAuB,GAAG,CACrC,OAAsC,EACtC,OAAuB,EACiB,EAAE,CAC1C,mCAAmB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/karma/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,yDAA0E;AAC1E,iEAAyF;AAEzF,gEAA6E;AAKtE,MAAM,uBAAuB,GAAG,CACrC,OAAsC,EACtC,OAAuB,EACiB,EAAE,CAC1C,IAAA,mCAAmB,EAAC,OAAO,EAAE,OAAO,EAAE;IACpC,oBAAoB,EAAE,IAAA,yDAAmC,EAAC,OAAO,EAAE,OAAO,CAAC;CAC5E,CAAC,CAAC;AANQ,QAAA,uBAAuB,2BAM/B;AAEL,kBAAe,IAAA,yBAAa,EAC1B,+BAAuB,CACxB,CAAC"}
|
package/dist/server/index.js
CHANGED
|
@@ -7,9 +7,9 @@ exports.buildCustomWebpackServer = void 0;
|
|
|
7
7
|
const architect_1 = require("@angular-devkit/architect");
|
|
8
8
|
const build_angular_1 = require("@angular-devkit/build-angular");
|
|
9
9
|
const transform_factories_1 = require("../transform-factories");
|
|
10
|
-
const buildCustomWebpackServer = (options, context) => build_angular_1.executeServerBuilder(options, context, {
|
|
11
|
-
webpackConfiguration: transform_factories_1.customWebpackConfigTransformFactory(options, context),
|
|
10
|
+
const buildCustomWebpackServer = (options, context) => (0, build_angular_1.executeServerBuilder)(options, context, {
|
|
11
|
+
webpackConfiguration: (0, transform_factories_1.customWebpackConfigTransformFactory)(options, context),
|
|
12
12
|
});
|
|
13
13
|
exports.buildCustomWebpackServer = buildCustomWebpackServer;
|
|
14
|
-
exports.default = architect_1.createBuilder(exports.buildCustomWebpackServer);
|
|
14
|
+
exports.default = (0, architect_1.createBuilder)(exports.buildCustomWebpackServer);
|
|
15
15
|
//# sourceMappingURL=index.js.map
|
package/dist/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,yDAAyF;AACzF,iEAA2F;AAG3F,gEAA6E;AAKtE,MAAM,wBAAwB,GAAG,CACtC,OAAkC,EAClC,OAAuB,EACkB,EAAE,CAC3C,oCAAoB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,yDAAyF;AACzF,iEAA2F;AAG3F,gEAA6E;AAKtE,MAAM,wBAAwB,GAAG,CACtC,OAAkC,EAClC,OAAuB,EACkB,EAAE,CAC3C,IAAA,oCAAoB,EAAC,OAAO,EAAE,OAAO,EAAE;IACrC,oBAAoB,EAAE,IAAA,yDAAmC,EAAC,OAAO,EAAE,OAAO,CAAC;CAC5E,CAAC,CAAC;AANQ,QAAA,wBAAwB,4BAMhC;AAEL,kBAAe,IAAA,yBAAa,EAA8C,gCAAwB,CAAC,CAAC"}
|
|
@@ -14,21 +14,21 @@ const core_1 = require("@angular-devkit/core");
|
|
|
14
14
|
const custom_webpack_builder_1 = require("./custom-webpack-builder");
|
|
15
15
|
const utils_1 = require("./utils");
|
|
16
16
|
const customWebpackConfigTransformFactory = (options, { workspaceRoot, target, logger }) => browserWebpackConfig => {
|
|
17
|
-
return custom_webpack_builder_1.CustomWebpackBuilder.buildWebpackConfig(core_1.normalize(workspaceRoot), options.customWebpackConfig, browserWebpackConfig, options, target, logger);
|
|
17
|
+
return custom_webpack_builder_1.CustomWebpackBuilder.buildWebpackConfig((0, core_1.normalize)(workspaceRoot), options.customWebpackConfig, browserWebpackConfig, options, target, logger);
|
|
18
18
|
};
|
|
19
19
|
exports.customWebpackConfigTransformFactory = customWebpackConfigTransformFactory;
|
|
20
20
|
const indexHtmlTransformFactory = ({ indexTransform, tsConfig }, { workspaceRoot, target, logger }) => {
|
|
21
21
|
if (!indexTransform)
|
|
22
22
|
return null;
|
|
23
|
-
utils_1.tsNodeRegister(indexTransform, `${core_1.getSystemPath(core_1.normalize(workspaceRoot))}/${tsConfig}`, logger);
|
|
24
|
-
const indexModule = require(`${core_1.getSystemPath(core_1.normalize(workspaceRoot))}/${indexTransform}`);
|
|
23
|
+
(0, utils_1.tsNodeRegister)(indexTransform, `${(0, core_1.getSystemPath)((0, core_1.normalize)(workspaceRoot))}/${tsConfig}`, logger);
|
|
24
|
+
const indexModule = require(`${(0, core_1.getSystemPath)((0, core_1.normalize)(workspaceRoot))}/${indexTransform}`);
|
|
25
25
|
const transform = indexModule.default || indexModule;
|
|
26
26
|
return (indexHtml) => __awaiter(void 0, void 0, void 0, function* () { return transform(target, indexHtml); });
|
|
27
27
|
};
|
|
28
28
|
exports.indexHtmlTransformFactory = indexHtmlTransformFactory;
|
|
29
29
|
const getTransforms = (options, context) => ({
|
|
30
|
-
webpackConfiguration: exports.customWebpackConfigTransformFactory(options, context),
|
|
31
|
-
indexHtml: exports.indexHtmlTransformFactory(options, context),
|
|
30
|
+
webpackConfiguration: (0, exports.customWebpackConfigTransformFactory)(options, context),
|
|
31
|
+
indexHtml: (0, exports.indexHtmlTransformFactory)(options, context),
|
|
32
32
|
});
|
|
33
33
|
exports.getTransforms = getTransforms;
|
|
34
34
|
//# sourceMappingURL=transform-factories.js.map
|
|
@@ -1 +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,MAAM,EAAE,EAAE,EAAE,CAC/C,oBAAoB,CAAC,EAAE;IACrB,OAAO,6CAAoB,CAAC,kBAAkB,CAC5C,gBAAS,
|
|
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,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;IACjG,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,IAAA,oBAAa,EAAC,IAAA,gBAAS,EAAC,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,IAAA,2CAAmC,EAAC,OAAO,EAAE,OAAO,CAAC;IAC3E,SAAS,EAAE,IAAA,iCAAyB,EAAC,OAAO,EAAE,OAAO,CAAC;CACvD,CAAC,CAAC;AAHU,QAAA,aAAa,iBAGvB"}
|
|
@@ -15,12 +15,12 @@ const DEFAULT_MERGE_RULES = {
|
|
|
15
15
|
},
|
|
16
16
|
};
|
|
17
17
|
function mergeConfigs(webpackConfig1, webpackConfig2, mergeRules = DEFAULT_MERGE_RULES, replacePlugins = false) {
|
|
18
|
-
const mergedConfig = webpack_merge_1.mergeWithRules(mergeRules)(webpackConfig1, webpackConfig2);
|
|
18
|
+
const mergedConfig = (0, webpack_merge_1.mergeWithRules)(mergeRules)(webpackConfig1, webpackConfig2);
|
|
19
19
|
if (webpackConfig1.plugins && webpackConfig2.plugins) {
|
|
20
|
-
const conf1ExceptConf2 = lodash_1.differenceWith(webpackConfig1.plugins, webpackConfig2.plugins, (item1, item2) => item1.constructor.name === item2.constructor.name);
|
|
20
|
+
const conf1ExceptConf2 = (0, lodash_1.differenceWith)(webpackConfig1.plugins, webpackConfig2.plugins, (item1, item2) => item1.constructor.name === item2.constructor.name);
|
|
21
21
|
if (!replacePlugins) {
|
|
22
|
-
const conf1ByName = lodash_1.keyBy(webpackConfig1.plugins, 'constructor.name');
|
|
23
|
-
webpackConfig2.plugins = webpackConfig2.plugins.map(p => conf1ByName[p.constructor.name] ? lodash_1.merge(conf1ByName[p.constructor.name], p) : p);
|
|
22
|
+
const conf1ByName = (0, lodash_1.keyBy)(webpackConfig1.plugins, 'constructor.name');
|
|
23
|
+
webpackConfig2.plugins = webpackConfig2.plugins.map(p => conf1ByName[p.constructor.name] ? (0, lodash_1.merge)(conf1ByName[p.constructor.name], p) : p);
|
|
24
24
|
}
|
|
25
25
|
mergedConfig.plugins = [...conf1ExceptConf2, ...webpackConfig2.plugins];
|
|
26
26
|
}
|
|
@@ -1 +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,8BAAc,
|
|
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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular-builders/custom-webpack",
|
|
3
|
-
"version": "13.0.
|
|
3
|
+
"version": "13.0.1-beta.1",
|
|
4
4
|
"description": "Custom webpack builders for Angular build facade. Allow to modify Angular build configuration without ejecting it",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"files": [
|
|
@@ -31,11 +31,11 @@
|
|
|
31
31
|
],
|
|
32
32
|
"scripts": {
|
|
33
33
|
"prebuild": "yarn clean",
|
|
34
|
-
"build": "
|
|
34
|
+
"build": "tsc && ts-node ../../merge-schemes.ts",
|
|
35
35
|
"postbuild": "yarn test && yarn run e2e",
|
|
36
|
-
"test": "
|
|
37
|
-
"e2e": "
|
|
38
|
-
"clean": "
|
|
36
|
+
"test": "jest --config ../../jest-ut.config.js",
|
|
37
|
+
"e2e": "jest --config ../../jest-e2e.config.js",
|
|
38
|
+
"clean": "rimraf dist",
|
|
39
39
|
"ci": "./scripts/ci.sh"
|
|
40
40
|
},
|
|
41
41
|
"builders": "builders.json",
|
|
@@ -48,5 +48,10 @@
|
|
|
48
48
|
"tsconfig-paths": "^3.9.0",
|
|
49
49
|
"webpack-merge": "^5.7.3"
|
|
50
50
|
},
|
|
51
|
-
"
|
|
51
|
+
"devDependencies": {
|
|
52
|
+
"jest": "^27.4.7",
|
|
53
|
+
"rimraf": "^3.0.2",
|
|
54
|
+
"typescript": "^4.5.4"
|
|
55
|
+
},
|
|
56
|
+
"gitHead": "983d847adeac1bfad3bc6825ea183947a273b98e"
|
|
52
57
|
}
|