@angular-builders/custom-webpack 13.0.0 → 13.1.0-beta.0
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 +13 -2
- package/dist/browser/index.js +2 -2
- package/dist/browser/index.js.map +1 -1
- package/dist/browser/schema.json +10 -0
- package/dist/custom-webpack-builder.d.ts +1 -1
- package/dist/custom-webpack-builder.js +9 -13
- 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/server/schema.json +10 -0
- package/dist/transform-factories.js +8 -7
- package/dist/transform-factories.js.map +1 -1
- package/dist/utils.d.ts +6 -0
- package/dist/utils.js +78 -1
- package/dist/utils.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
|
@@ -20,6 +20,8 @@ Allow customizing build configuration without ejecting webpack configuration (`n
|
|
|
20
20
|
|
|
21
21
|
</details>
|
|
22
22
|
|
|
23
|
+
## [Quick guide](https://www.justjeb.com/post/customizing-angular-cli-build)
|
|
24
|
+
|
|
23
25
|
## Prerequisites:
|
|
24
26
|
|
|
25
27
|
- [Angular CLI 13](https://www.npmjs.com/package/@angular/cli)
|
|
@@ -285,7 +287,7 @@ The following properties are available:
|
|
|
285
287
|
- `replaceDuplicatePlugins`: Defaults to `false`. If `true`, the plugins in custom webpack config will replace the corresponding plugins in default Angular CLI webpack configuration. If `false`, the [default behavior](#merging-plugins-configuration) will be applied.
|
|
286
288
|
**Note that if `true`, this option will override `mergeRules` for `plugins` field.**
|
|
287
289
|
|
|
288
|
-
Webpack configuration can be also written in TypeScript. In this case, it is the application's `tsConfig` file which will be
|
|
290
|
+
Webpack configuration can be also written in TypeScript. In this case, it is the application's `tsConfig` file which will be used by `tsnode` for `customWebpackConfig.ts` execution. Given the following example:
|
|
289
291
|
|
|
290
292
|
```ts
|
|
291
293
|
// extra-webpack.config.ts
|
|
@@ -490,7 +492,16 @@ export default (targetOptions: TargetOptions, indexHtml: string) => {
|
|
|
490
492
|
|
|
491
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.
|
|
492
494
|
|
|
493
|
-
Full example [here](
|
|
495
|
+
Full example [here](../../examples/custom-webpack/full-cycle-app).
|
|
496
|
+
|
|
497
|
+
# ES Modules (ESM) Support
|
|
498
|
+
|
|
499
|
+
Custom Webpack builder fully supports ESM.
|
|
500
|
+
|
|
501
|
+
- If your app has `"type": "module"` both `custom-webpack.js` and `index-transform.js` will be treated as ES modules, unless you change their file extension to `.cjs`. In that case they'll be treated as CommonJS Modules. [Example](../../examples/custom-webpack/sanity-app-esm).
|
|
502
|
+
- For `"type": "commonjs"` (or unspecified type) both `custom-webpack.js` and `index-transform.js` will be treated as CommonJS modules unless you change their file extension to `.mjs`. In that case they'll be treated as ES Modules. [Example](../../examples/custom-webpack/sanity-app).
|
|
503
|
+
- If you want to use TS config in ESM app, you must set the loader to `ts-node/esm` when running `ng build`. Also, in that case `tsconfig.json` for `ts-node` no longer defaults to `tsConfig` from the `browser` target - you have to specify it manually via environment variable. [Example](../../examples/custom-webpack/sanity-app-esm/package.json#L10).
|
|
504
|
+
_Note that tsconfig paths are not supported in TS configs within ESM apps. That is because [tsconfig-paths](https://github.com/dividab/tsconfig-paths) do not support ESM._
|
|
494
505
|
|
|
495
506
|
# Further Reading
|
|
496
507
|
|
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"}
|
package/dist/browser/schema.json
CHANGED
|
@@ -229,6 +229,16 @@
|
|
|
229
229
|
],
|
|
230
230
|
"default": "warning"
|
|
231
231
|
},
|
|
232
|
+
"i18nDuplicateTranslation": {
|
|
233
|
+
"type": "string",
|
|
234
|
+
"description": "How to handle duplicate translations for i18n.",
|
|
235
|
+
"enum": [
|
|
236
|
+
"warning",
|
|
237
|
+
"error",
|
|
238
|
+
"ignore"
|
|
239
|
+
],
|
|
240
|
+
"default": "warning"
|
|
241
|
+
},
|
|
232
242
|
"localize": {
|
|
233
243
|
"description": "Translate the bundles in one or more locales.",
|
|
234
244
|
"oneOf": [
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { logging, Path } from '@angular-devkit/core';
|
|
2
2
|
import { Configuration } from 'webpack';
|
|
3
3
|
import { CustomWebpackBuilderConfig } from './custom-webpack-builder-config';
|
|
4
4
|
import { TargetOptions } from './type-definition';
|
|
@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.CustomWebpackBuilder = exports.defaultWebpackConfigPath = void 0;
|
|
13
13
|
const core_1 = require("@angular-devkit/core");
|
|
14
|
-
const webpack_config_merger_1 = require("./webpack-config-merger");
|
|
15
14
|
const utils_1 = require("./utils");
|
|
15
|
+
const webpack_config_merger_1 = require("./webpack-config-merger");
|
|
16
16
|
exports.defaultWebpackConfigPath = 'webpack.config.js';
|
|
17
17
|
class CustomWebpackBuilder {
|
|
18
18
|
static buildWebpackConfig(root, config, baseWebpackConfig, buildOptions, targetOptions, logger) {
|
|
@@ -21,9 +21,9 @@ 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}`;
|
|
26
|
-
const configOrFactoryOrPromise = resolveCustomWebpackConfig(path, tsConfig, logger);
|
|
24
|
+
const path = `${(0, core_1.getSystemPath)(root)}/${webpackConfigPath}`;
|
|
25
|
+
const tsConfig = `${(0, core_1.getSystemPath)(root)}/${buildOptions.tsConfig}`;
|
|
26
|
+
const configOrFactoryOrPromise = yield resolveCustomWebpackConfig(path, tsConfig, logger);
|
|
27
27
|
if (typeof configOrFactoryOrPromise === 'function') {
|
|
28
28
|
// That exported function can be synchronous either
|
|
29
29
|
// asynchronous. Given the following example:
|
|
@@ -37,19 +37,15 @@ 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
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
// `module.exports = { ... }`. And the second one is:
|
|
51
|
-
// `export default { ... }`. The ESM format is compiled into:
|
|
52
|
-
// `{ default: { ... } }`
|
|
53
|
-
return customWebpackConfig.default || customWebpackConfig;
|
|
46
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
47
|
+
(0, utils_1.tsNodeRegister)(path, tsConfig, logger);
|
|
48
|
+
return (0, utils_1.loadModule)(path);
|
|
49
|
+
});
|
|
54
50
|
}
|
|
55
51
|
//# sourceMappingURL=custom-webpack-builder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-webpack-builder.js","sourceRoot":"","sources":["../src/custom-webpack-builder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAoE;
|
|
1
|
+
{"version":3,"file":"custom-webpack-builder.js","sourceRoot":"","sources":["../src/custom-webpack-builder.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAoE;AAKpE,mCAAqD;AACrD,mEAAuD;AAE1C,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,MAAM,0BAA0B,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;YAE1F,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,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"}
|
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"}
|
package/dist/server/schema.json
CHANGED
|
@@ -142,6 +142,16 @@
|
|
|
142
142
|
],
|
|
143
143
|
"default": "warning"
|
|
144
144
|
},
|
|
145
|
+
"i18nDuplicateTranslation": {
|
|
146
|
+
"type": "string",
|
|
147
|
+
"description": "How to handle duplicate translations for i18n.",
|
|
148
|
+
"enum": [
|
|
149
|
+
"warning",
|
|
150
|
+
"error",
|
|
151
|
+
"ignore"
|
|
152
|
+
],
|
|
153
|
+
"default": "warning"
|
|
154
|
+
},
|
|
145
155
|
"localize": {
|
|
146
156
|
"description": "Translate the bundles in one or more locales.",
|
|
147
157
|
"oneOf": [
|
|
@@ -14,21 +14,22 @@ 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
|
-
|
|
25
|
-
|
|
26
|
-
|
|
23
|
+
(0, utils_1.tsNodeRegister)(indexTransform, `${(0, core_1.getSystemPath)((0, core_1.normalize)(workspaceRoot))}/${tsConfig}`, logger);
|
|
24
|
+
return (indexHtml) => __awaiter(void 0, void 0, void 0, function* () {
|
|
25
|
+
const transform = yield (0, utils_1.loadModule)(`${(0, core_1.getSystemPath)((0, core_1.normalize)(workspaceRoot))}/${indexTransform}`);
|
|
26
|
+
return transform(target, indexHtml);
|
|
27
|
+
});
|
|
27
28
|
};
|
|
28
29
|
exports.indexHtmlTransformFactory = indexHtmlTransformFactory;
|
|
29
30
|
const getTransforms = (options, context) => ({
|
|
30
|
-
webpackConfiguration: exports.customWebpackConfigTransformFactory(options, context),
|
|
31
|
-
indexHtml: exports.indexHtmlTransformFactory(options, context),
|
|
31
|
+
webpackConfiguration: (0, exports.customWebpackConfigTransformFactory)(options, context),
|
|
32
|
+
indexHtml: (0, exports.indexHtmlTransformFactory)(options, context),
|
|
32
33
|
});
|
|
33
34
|
exports.getTransforms = getTransforms;
|
|
34
35
|
//# 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,
|
|
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"}
|
package/dist/utils.d.ts
CHANGED
|
@@ -5,3 +5,9 @@ import { logging } from '@angular-devkit/core';
|
|
|
5
5
|
* @todo tsNodeRegistration: require ts-node if file extension is TypeScript
|
|
6
6
|
*/
|
|
7
7
|
export declare function tsNodeRegister(file: string, tsConfig: string, logger: logging.LoggerApi): void;
|
|
8
|
+
/**
|
|
9
|
+
* Loads CJS and ESM modules based on extension
|
|
10
|
+
* @param path path to the module
|
|
11
|
+
* @returns
|
|
12
|
+
*/
|
|
13
|
+
export declare function loadModule<T>(path: string): Promise<T>;
|
package/dist/utils.js
CHANGED
|
@@ -1,6 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
2
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.tsNodeRegister = void 0;
|
|
12
|
+
exports.loadModule = exports.tsNodeRegister = void 0;
|
|
13
|
+
const path_1 = require("path");
|
|
14
|
+
const url_1 = require("url");
|
|
4
15
|
const _tsNodeRegister = (() => {
|
|
5
16
|
let lastTsConfig;
|
|
6
17
|
return (tsConfig, logger) => {
|
|
@@ -44,4 +55,70 @@ function tsNodeRegister(file = '', tsConfig, logger) {
|
|
|
44
55
|
}
|
|
45
56
|
}
|
|
46
57
|
exports.tsNodeRegister = tsNodeRegister;
|
|
58
|
+
/**
|
|
59
|
+
* This uses a dynamic import to load a module which may be ESM.
|
|
60
|
+
* CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
|
|
61
|
+
* will currently, unconditionally downlevel dynamic import into a require call.
|
|
62
|
+
* require calls cannot load ESM code and will result in a runtime error. To workaround
|
|
63
|
+
* this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
|
|
64
|
+
* Once TypeScript provides support for keeping the dynamic import this workaround can
|
|
65
|
+
* be dropped.
|
|
66
|
+
*
|
|
67
|
+
* @param modulePath The path of the module to load.
|
|
68
|
+
* @returns A Promise that resolves to the dynamically imported module.
|
|
69
|
+
*/
|
|
70
|
+
function loadEsmModule(modulePath) {
|
|
71
|
+
return new Function('modulePath', `return import(modulePath);`)(modulePath);
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Loads CJS and ESM modules based on extension
|
|
75
|
+
* @param path path to the module
|
|
76
|
+
* @returns
|
|
77
|
+
*/
|
|
78
|
+
function loadModule(path) {
|
|
79
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
80
|
+
switch ((0, path_1.extname)(path)) {
|
|
81
|
+
case '.mjs':
|
|
82
|
+
// Load the ESM configuration file using the TypeScript dynamic import workaround.
|
|
83
|
+
// Once TypeScript provides support for keeping the dynamic import this workaround can be
|
|
84
|
+
// changed to a direct dynamic import.
|
|
85
|
+
return (yield loadEsmModule((0, url_1.pathToFileURL)(path))).default;
|
|
86
|
+
case '.cjs':
|
|
87
|
+
return require(path);
|
|
88
|
+
case '.ts':
|
|
89
|
+
try {
|
|
90
|
+
// If it's a TS file then there are 2 cases for exporing an object.
|
|
91
|
+
// The first one is `export blah`, transpiled into `module.exports = { blah} `.
|
|
92
|
+
// The second is `export default blah`, transpiled into `{ default: { ... } }`.
|
|
93
|
+
return require(path).default || require(path);
|
|
94
|
+
}
|
|
95
|
+
catch (e) {
|
|
96
|
+
if (e.code === 'ERR_REQUIRE_ESM') {
|
|
97
|
+
// Load the ESM configuration file using the TypeScript dynamic import workaround.
|
|
98
|
+
// Once TypeScript provides support for keeping the dynamic import this workaround can be
|
|
99
|
+
// changed to a direct dynamic import.
|
|
100
|
+
return (yield loadEsmModule((0, url_1.pathToFileURL)(path))).default;
|
|
101
|
+
}
|
|
102
|
+
throw e;
|
|
103
|
+
}
|
|
104
|
+
//.js
|
|
105
|
+
default:
|
|
106
|
+
// The file could be either CommonJS or ESM.
|
|
107
|
+
// CommonJS is tried first then ESM if loading fails.
|
|
108
|
+
try {
|
|
109
|
+
return require(path);
|
|
110
|
+
}
|
|
111
|
+
catch (e) {
|
|
112
|
+
if (e.code === 'ERR_REQUIRE_ESM') {
|
|
113
|
+
// Load the ESM configuration file using the TypeScript dynamic import workaround.
|
|
114
|
+
// Once TypeScript provides support for keeping the dynamic import this workaround can be
|
|
115
|
+
// changed to a direct dynamic import.
|
|
116
|
+
return (yield loadEsmModule((0, url_1.pathToFileURL)(path))).default;
|
|
117
|
+
}
|
|
118
|
+
throw e;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
exports.loadModule = loadModule;
|
|
47
124
|
//# sourceMappingURL=utils.js.map
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -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.0",
|
|
3
|
+
"version": "13.1.0-beta.0",
|
|
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": "61474c72a91486bde01af49cd7c2e2047b09070a"
|
|
52
57
|
}
|