@angular-devkit/build-webpack 0.1502.0 → 0.1600.0-next.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/package.json +4 -4
- package/src/utils.js +2 -3
- package/src/webpack/index.js +3 -4
- package/src/webpack-dev-server/index.js +6 -10
package/package.json
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular-devkit/build-webpack",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.1600.0-next.1",
|
|
4
4
|
"description": "Webpack Builder for Architect",
|
|
5
5
|
"experimental": true,
|
|
6
6
|
"main": "src/index.js",
|
|
7
7
|
"typings": "src/index.d.ts",
|
|
8
8
|
"builders": "builders.json",
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@angular-devkit/architect": "0.
|
|
11
|
-
"rxjs": "
|
|
10
|
+
"@angular-devkit/architect": "0.1600.0-next.1",
|
|
11
|
+
"rxjs": "7.8.0"
|
|
12
12
|
},
|
|
13
13
|
"peerDependencies": {
|
|
14
14
|
"webpack": "^5.30.0",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"url": "https://github.com/angular/angular-cli.git"
|
|
27
27
|
},
|
|
28
28
|
"engines": {
|
|
29
|
-
"node": "^
|
|
29
|
+
"node": "^16.13.0 || >=18.10.0",
|
|
30
30
|
"npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
|
|
31
31
|
"yarn": ">= 1.13.0"
|
|
32
32
|
},
|
package/src/utils.js
CHANGED
|
@@ -35,7 +35,6 @@ const fs_1 = require("fs");
|
|
|
35
35
|
const path = __importStar(require("path"));
|
|
36
36
|
const url_1 = require("url");
|
|
37
37
|
function getEmittedFiles(compilation) {
|
|
38
|
-
var _a;
|
|
39
38
|
const files = [];
|
|
40
39
|
const chunkFileNames = new Set();
|
|
41
40
|
// adds all chunks to the list of emitted files such as lazy loaded modules
|
|
@@ -46,7 +45,7 @@ function getEmittedFiles(compilation) {
|
|
|
46
45
|
}
|
|
47
46
|
chunkFileNames.add(file);
|
|
48
47
|
files.push({
|
|
49
|
-
id:
|
|
48
|
+
id: chunk.id?.toString(),
|
|
50
49
|
name: chunk.name,
|
|
51
50
|
file,
|
|
52
51
|
extension: path.extname(file),
|
|
@@ -111,4 +110,4 @@ async function getWebpackConfig(configPath) {
|
|
|
111
110
|
}
|
|
112
111
|
}
|
|
113
112
|
exports.getWebpackConfig = getWebpackConfig;
|
|
114
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hbmd1bGFyX2RldmtpdC9idWlsZF93ZWJwYWNrL3NyYy91dGlscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVILDJCQUFnQztBQUNoQywyQ0FBNkI7QUFDN0IsNkJBQXlDO0FBWXpDLFNBQWdCLGVBQWUsQ0FBQyxXQUF3QjtJQUN0RCxNQUFNLEtBQUssR0FBbUIsRUFBRSxDQUFDO0lBQ2pDLE1BQU0sY0FBYyxHQUFHLElBQUksR0FBRyxFQUFVLENBQUM7SUFFekMsMkVBQTJFO0lBQzNFLEtBQUssTUFBTSxLQUFLLElBQUksV0FBVyxDQUFDLE1BQU0sRUFBRTtRQUN0QyxLQUFLLE1BQU0sSUFBSSxJQUFJLEtBQUssQ0FBQyxLQUFLLEVBQUU7WUFDOUIsSUFBSSxjQUFjLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFO2dCQUM1QixTQUFTO2FBQ1Y7WUFFRCxjQUFjLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3pCLEtBQUssQ0FBQyxJQUFJLENBQUM7Z0JBQ1QsRUFBRSxFQUFFLEtBQUssQ0FBQyxFQUFFLEVBQUUsUUFBUSxFQUFFO2dCQUN4QixJQUFJLEVBQUUsS0FBSyxDQUFDLElBQUk7Z0JBQ2hCLElBQUk7Z0JBQ0osU0FBUyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDO2dCQUM3QixPQUFPLEVBQUUsS0FBSyxDQUFDLGFBQWEsRUFBRTthQUMvQixDQUFDLENBQUM7U0FDSjtLQUNGO0lBRUQsc0JBQXNCO0lBQ3RCLEtBQUssTUFBTSxJQUFJLElBQUksTUFBTSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLEVBQUU7UUFDbEQsOERBQThEO1FBQzlELElBQUksY0FBYyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtZQUM1QixTQUFTO1NBQ1Y7UUFFRCxLQUFLLENBQUMsSUFBSSxDQUFDLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7S0FDbEY7SUFFRCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUM7QUFqQ0QsMENBaUNDO0FBRUQ7Ozs7Ozs7Ozs7O0dBV0c7QUFDSCxTQUFTLGFBQWEsQ0FBSSxVQUF3QjtJQUNoRCxPQUFPLElBQUksUUFBUSxDQUFDLFlBQVksRUFBRSw0QkFBNEIsQ0FBQyxDQUFDLFVBQVUsQ0FBZSxDQUFDO0FBQzVGLENBQUM7QUFFTSxLQUFLLFVBQVUsZ0JBQWdCLENBQUMsVUFBa0I7SUFDdkQsSUFBSSxDQUFDLElBQUEsZUFBVSxFQUFDLFVBQVUsQ0FBQyxFQUFFO1FBQzNCLE1BQU0sSUFBSSxLQUFLLENBQUMsOEJBQThCLFVBQVUsa0JBQWtCLENBQUMsQ0FBQztLQUM3RTtJQUVELFFBQVEsSUFBSSxDQUFDLE9BQU8sQ0FBQyxVQUFVLENBQUMsRUFBRTtRQUNoQyxLQUFLLE1BQU07WUFDVCxrRkFBa0Y7WUFDbEYseUZBQXlGO1lBQ3pGLHNDQUFzQztZQUN0QyxPQUFPLENBQUMsTUFBTSxhQUFhLENBQTZCLElBQUEsbUJBQWEsRUFBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDO1FBQzlGLEtBQUssTUFBTTtZQUNULE9BQU8sT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQzdCO1lBQ0UsNENBQTRDO1lBQzVDLHFEQUFxRDtZQUNyRCxJQUFJO2dCQUNGLE9BQU8sT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO2FBQzVCO1lBQUMsT0FBTyxDQUFDLEVBQUU7Z0JBQ1YsSUFBSyxDQUEyQixDQUFDLElBQUksS0FBSyxpQkFBaUIsRUFBRTtvQkFDM0Qsa0ZBQWtGO29CQUNsRix5RkFBeUY7b0JBQ3pGLHNDQUFzQztvQkFDdEMsT0FBTyxDQUFDLE1BQU0sYUFBYSxDQUE2QixJQUFBLG1CQUFhLEVBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQzt5QkFDaEYsT0FBTyxDQUFDO2lCQUNaO2dCQUVELE1BQU0sQ0FBQyxDQUFDO2FBQ1Q7S0FDSjtBQUNILENBQUM7QUE5QkQsNENBOEJDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbmltcG9ydCB7IGV4aXN0c1N5bmMgfSBmcm9tICdmcyc7XG5pbXBvcnQgKiBhcyBwYXRoIGZyb20gJ3BhdGgnO1xuaW1wb3J0IHsgVVJMLCBwYXRoVG9GaWxlVVJMIH0gZnJvbSAndXJsJztcbmltcG9ydCB7IENvbXBpbGF0aW9uLCBDb25maWd1cmF0aW9uIH0gZnJvbSAnd2VicGFjayc7XG5cbmV4cG9ydCBpbnRlcmZhY2UgRW1pdHRlZEZpbGVzIHtcbiAgaWQ/OiBzdHJpbmc7XG4gIG5hbWU/OiBzdHJpbmc7XG4gIGZpbGU6IHN0cmluZztcbiAgaW5pdGlhbDogYm9vbGVhbjtcbiAgYXNzZXQ/OiBib29sZWFuO1xuICBleHRlbnNpb246IHN0cmluZztcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGdldEVtaXR0ZWRGaWxlcyhjb21waWxhdGlvbjogQ29tcGlsYXRpb24pOiBFbWl0dGVkRmlsZXNbXSB7XG4gIGNvbnN0IGZpbGVzOiBFbWl0dGVkRmlsZXNbXSA9IFtdO1xuICBjb25zdCBjaHVua0ZpbGVOYW1lcyA9IG5ldyBTZXQ8c3RyaW5nPigpO1xuXG4gIC8vIGFkZHMgYWxsIGNodW5rcyB0byB0aGUgbGlzdCBvZiBlbWl0dGVkIGZpbGVzIHN1Y2ggYXMgbGF6eSBsb2FkZWQgbW9kdWxlc1xuICBmb3IgKGNvbnN0IGNodW5rIG9mIGNvbXBpbGF0aW9uLmNodW5rcykge1xuICAgIGZvciAoY29uc3QgZmlsZSBvZiBjaHVuay5maWxlcykge1xuICAgICAgaWYgKGNodW5rRmlsZU5hbWVzLmhhcyhmaWxlKSkge1xuICAgICAgICBjb250aW51ZTtcbiAgICAgIH1cblxuICAgICAgY2h1bmtGaWxlTmFtZXMuYWRkKGZpbGUpO1xuICAgICAgZmlsZXMucHVzaCh7XG4gICAgICAgIGlkOiBjaHVuay5pZD8udG9TdHJpbmcoKSxcbiAgICAgICAgbmFtZTogY2h1bmsubmFtZSxcbiAgICAgICAgZmlsZSxcbiAgICAgICAgZXh0ZW5zaW9uOiBwYXRoLmV4dG5hbWUoZmlsZSksXG4gICAgICAgIGluaXRpYWw6IGNodW5rLmlzT25seUluaXRpYWwoKSxcbiAgICAgIH0pO1xuICAgIH1cbiAgfVxuXG4gIC8vIGFkZCBhbGwgb3RoZXIgZmlsZXNcbiAgZm9yIChjb25zdCBmaWxlIG9mIE9iamVjdC5rZXlzKGNvbXBpbGF0aW9uLmFzc2V0cykpIHtcbiAgICAvLyBDaHVuayBmaWxlcyBoYXZlIGFscmVhZHkgYmVlbiBhZGRlZCB0byB0aGUgZmlsZXMgbGlzdCBhYm92ZVxuICAgIGlmIChjaHVua0ZpbGVOYW1lcy5oYXMoZmlsZSkpIHtcbiAgICAgIGNvbnRpbnVlO1xuICAgIH1cblxuICAgIGZpbGVzLnB1c2goeyBmaWxlLCBleHRlbnNpb246IHBhdGguZXh0bmFtZShmaWxlKSwgaW5pdGlhbDogZmFsc2UsIGFzc2V0OiB0cnVlIH0pO1xuICB9XG5cbiAgcmV0dXJuIGZpbGVzO1xufVxuXG4vKipcbiAqIFRoaXMgdXNlcyBhIGR5bmFtaWMgaW1wb3J0IHRvIGxvYWQgYSBtb2R1bGUgd2hpY2ggbWF5IGJlIEVTTS5cbiAqIENvbW1vbkpTIGNvZGUgY2FuIGxvYWQgRVNNIGNvZGUgdmlhIGEgZHluYW1pYyBpbXBvcnQuIFVuZm9ydHVuYXRlbHksIFR5cGVTY3JpcHRcbiAqIHdpbGwgY3VycmVudGx5LCB1bmNvbmRpdGlvbmFsbHkgZG93bmxldmVsIGR5bmFtaWMgaW1wb3J0IGludG8gYSByZXF1aXJlIGNhbGwuXG4gKiByZXF1aXJlIGNhbGxzIGNhbm5vdCBsb2FkIEVTTSBjb2RlIGFuZCB3aWxsIHJlc3VsdCBpbiBhIHJ1bnRpbWUgZXJyb3IuIFRvIHdvcmthcm91bmRcbiAqIHRoaXMsIGEgRnVuY3Rpb24gY29uc3RydWN0b3IgaXMgdXNlZCB0byBwcmV2ZW50IFR5cGVTY3JpcHQgZnJvbSBjaGFuZ2luZyB0aGUgZHluYW1pYyBpbXBvcnQuXG4gKiBPbmNlIFR5cGVTY3JpcHQgcHJvdmlkZXMgc3VwcG9ydCBmb3Iga2VlcGluZyB0aGUgZHluYW1pYyBpbXBvcnQgdGhpcyB3b3JrYXJvdW5kIGNhblxuICogYmUgZHJvcHBlZC5cbiAqXG4gKiBAcGFyYW0gbW9kdWxlUGF0aCBUaGUgcGF0aCBvZiB0aGUgbW9kdWxlIHRvIGxvYWQuXG4gKiBAcmV0dXJucyBBIFByb21pc2UgdGhhdCByZXNvbHZlcyB0byB0aGUgZHluYW1pY2FsbHkgaW1wb3J0ZWQgbW9kdWxlLlxuICovXG5mdW5jdGlvbiBsb2FkRXNtTW9kdWxlPFQ+KG1vZHVsZVBhdGg6IHN0cmluZyB8IFVSTCk6IFByb21pc2U8VD4ge1xuICByZXR1cm4gbmV3IEZ1bmN0aW9uKCdtb2R1bGVQYXRoJywgYHJldHVybiBpbXBvcnQobW9kdWxlUGF0aCk7YCkobW9kdWxlUGF0aCkgYXMgUHJvbWlzZTxUPjtcbn1cblxuZXhwb3J0IGFzeW5jIGZ1bmN0aW9uIGdldFdlYnBhY2tDb25maWcoY29uZmlnUGF0aDogc3RyaW5nKTogUHJvbWlzZTxDb25maWd1cmF0aW9uPiB7XG4gIGlmICghZXhpc3RzU3luYyhjb25maWdQYXRoKSkge1xuICAgIHRocm93IG5ldyBFcnJvcihgV2VicGFjayBjb25maWd1cmF0aW9uIGZpbGUgJHtjb25maWdQYXRofSBkb2VzIG5vdCBleGlzdC5gKTtcbiAgfVxuXG4gIHN3aXRjaCAocGF0aC5leHRuYW1lKGNvbmZpZ1BhdGgpKSB7XG4gICAgY2FzZSAnLm1qcyc6XG4gICAgICAvLyBMb2FkIHRoZSBFU00gY29uZmlndXJhdGlvbiBmaWxlIHVzaW5nIHRoZSBUeXBlU2NyaXB0IGR5bmFtaWMgaW1wb3J0IHdvcmthcm91bmQuXG4gICAgICAvLyBPbmNlIFR5cGVTY3JpcHQgcHJvdmlkZXMgc3VwcG9ydCBmb3Iga2VlcGluZyB0aGUgZHluYW1pYyBpbXBvcnQgdGhpcyB3b3JrYXJvdW5kIGNhbiBiZVxuICAgICAgLy8gY2hhbmdlZCB0byBhIGRpcmVjdCBkeW5hbWljIGltcG9ydC5cbiAgICAgIHJldHVybiAoYXdhaXQgbG9hZEVzbU1vZHVsZTx7IGRlZmF1bHQ6IENvbmZpZ3VyYXRpb24gfT4ocGF0aFRvRmlsZVVSTChjb25maWdQYXRoKSkpLmRlZmF1bHQ7XG4gICAgY2FzZSAnLmNqcyc6XG4gICAgICByZXR1cm4gcmVxdWlyZShjb25maWdQYXRoKTtcbiAgICBkZWZhdWx0OlxuICAgICAgLy8gVGhlIGZpbGUgY291bGQgYmUgZWl0aGVyIENvbW1vbkpTIG9yIEVTTS5cbiAgICAgIC8vIENvbW1vbkpTIGlzIHRyaWVkIGZpcnN0IHRoZW4gRVNNIGlmIGxvYWRpbmcgZmFpbHMuXG4gICAgICB0cnkge1xuICAgICAgICByZXR1cm4gcmVxdWlyZShjb25maWdQYXRoKTtcbiAgICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgICAgaWYgKChlIGFzIE5vZGVKUy5FcnJub0V4Y2VwdGlvbikuY29kZSA9PT0gJ0VSUl9SRVFVSVJFX0VTTScpIHtcbiAgICAgICAgICAvLyBMb2FkIHRoZSBFU00gY29uZmlndXJhdGlvbiBmaWxlIHVzaW5nIHRoZSBUeXBlU2NyaXB0IGR5bmFtaWMgaW1wb3J0IHdvcmthcm91bmQuXG4gICAgICAgICAgLy8gT25jZSBUeXBlU2NyaXB0IHByb3ZpZGVzIHN1cHBvcnQgZm9yIGtlZXBpbmcgdGhlIGR5bmFtaWMgaW1wb3J0IHRoaXMgd29ya2Fyb3VuZCBjYW4gYmVcbiAgICAgICAgICAvLyBjaGFuZ2VkIHRvIGEgZGlyZWN0IGR5bmFtaWMgaW1wb3J0LlxuICAgICAgICAgIHJldHVybiAoYXdhaXQgbG9hZEVzbU1vZHVsZTx7IGRlZmF1bHQ6IENvbmZpZ3VyYXRpb24gfT4ocGF0aFRvRmlsZVVSTChjb25maWdQYXRoKSkpXG4gICAgICAgICAgICAuZGVmYXVsdDtcbiAgICAgICAgfVxuXG4gICAgICAgIHRocm93IGU7XG4gICAgICB9XG4gIH1cbn1cbiJdfQ==
|
package/src/webpack/index.js
CHANGED
|
@@ -14,7 +14,6 @@ exports.runWebpack = void 0;
|
|
|
14
14
|
const architect_1 = require("@angular-devkit/architect");
|
|
15
15
|
const path_1 = require("path");
|
|
16
16
|
const rxjs_1 = require("rxjs");
|
|
17
|
-
const operators_1 = require("rxjs/operators");
|
|
18
17
|
const webpack_1 = __importDefault(require("webpack"));
|
|
19
18
|
const utils_1 = require("../utils");
|
|
20
19
|
function runWebpack(config, context, options = {}) {
|
|
@@ -33,7 +32,7 @@ function runWebpack(config, context, options = {}) {
|
|
|
33
32
|
return (0, rxjs_1.of)((0, webpack_1.default)(c));
|
|
34
33
|
}
|
|
35
34
|
};
|
|
36
|
-
return createWebpack({ ...config, watch: false }).pipe((0,
|
|
35
|
+
return createWebpack({ ...config, watch: false }).pipe((0, rxjs_1.switchMap)((webpackCompiler) => new rxjs_1.Observable((obs) => {
|
|
37
36
|
const callback = (err, stats) => {
|
|
38
37
|
if (err) {
|
|
39
38
|
return obs.error(err);
|
|
@@ -85,6 +84,6 @@ function runWebpack(config, context, options = {}) {
|
|
|
85
84
|
exports.runWebpack = runWebpack;
|
|
86
85
|
exports.default = (0, architect_1.createBuilder)((options, context) => {
|
|
87
86
|
const configPath = (0, path_1.resolve)(context.workspaceRoot, options.webpackConfig);
|
|
88
|
-
return (0, rxjs_1.from)((0, utils_1.getWebpackConfig)(configPath)).pipe((0,
|
|
87
|
+
return (0, rxjs_1.from)((0, utils_1.getWebpackConfig)(configPath)).pipe((0, rxjs_1.switchMap)((config) => runWebpack(config, context)));
|
|
89
88
|
});
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/angular_devkit/build_webpack/src/webpack/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';\nimport { resolve as pathResolve } from 'path';\nimport { Observable, from, isObservable, of, switchMap } from 'rxjs';\nimport webpack from 'webpack';\nimport { EmittedFiles, getEmittedFiles, getWebpackConfig } from '../utils';\nimport { Schema as RealWebpackBuilderSchema } from './schema';\n\nexport type WebpackBuilderSchema = RealWebpackBuilderSchema;\n\nexport interface WebpackLoggingCallback {\n  (stats: webpack.Stats, config: webpack.Configuration): void;\n}\nexport interface WebpackFactory {\n  (config: webpack.Configuration): Observable<webpack.Compiler> | webpack.Compiler;\n}\n\nexport type BuildResult = BuilderOutput & {\n  emittedFiles?: EmittedFiles[];\n  webpackStats?: webpack.StatsCompilation;\n  outputPath: string;\n};\n\nexport function runWebpack(\n  config: webpack.Configuration,\n  context: BuilderContext,\n  options: {\n    logging?: WebpackLoggingCallback;\n    webpackFactory?: WebpackFactory;\n    shouldProvideStats?: boolean;\n  } = {},\n): Observable<BuildResult> {\n  const {\n    logging: log = (stats, config) => context.logger.info(stats.toString(config.stats)),\n    shouldProvideStats = true,\n  } = options;\n  const createWebpack = (c: webpack.Configuration) => {\n    if (options.webpackFactory) {\n      const result = options.webpackFactory(c);\n      if (isObservable(result)) {\n        return result;\n      } else {\n        return of(result);\n      }\n    } else {\n      return of(webpack(c));\n    }\n  };\n\n  return createWebpack({ ...config, watch: false }).pipe(\n    switchMap(\n      (webpackCompiler) =>\n        new Observable<BuildResult>((obs) => {\n          const callback = (err?: Error | null, stats?: webpack.Stats) => {\n            if (err) {\n              return obs.error(err);\n            }\n\n            if (!stats) {\n              return;\n            }\n\n            // Log stats.\n            log(stats, config);\n\n            const statsOptions = typeof config.stats === 'boolean' ? undefined : config.stats;\n            const result = {\n              success: !stats.hasErrors(),\n              webpackStats: shouldProvideStats ? stats.toJson(statsOptions) : undefined,\n              emittedFiles: getEmittedFiles(stats.compilation),\n              outputPath: stats.compilation.outputOptions.path,\n            } as unknown as BuildResult;\n\n            if (config.watch) {\n              obs.next(result);\n            } else {\n              webpackCompiler.close(() => {\n                obs.next(result);\n                obs.complete();\n              });\n            }\n          };\n\n          try {\n            if (config.watch) {\n              const watchOptions = config.watchOptions || {};\n              const watching = webpackCompiler.watch(watchOptions, callback);\n\n              // Teardown logic. Close the watcher when unsubscribed from.\n              return () => {\n                watching.close(() => {});\n                webpackCompiler.close(() => {});\n              };\n            } else {\n              webpackCompiler.run(callback);\n            }\n          } catch (err) {\n            if (err) {\n              context.logger.error(\n                `\\nAn error occurred during the build:\\n${err instanceof Error ? err.stack : err}`,\n              );\n            }\n            throw err;\n          }\n        }),\n    ),\n  );\n}\n\nexport default createBuilder<WebpackBuilderSchema>((options, context) => {\n  const configPath = pathResolve(context.workspaceRoot, options.webpackConfig);\n\n  return from(getWebpackConfig(configPath)).pipe(\n    switchMap((config) => runWebpack(config, context)),\n  );\n});\n"]}
|
|
@@ -14,12 +14,10 @@ exports.runWebpackDevServer = void 0;
|
|
|
14
14
|
const architect_1 = require("@angular-devkit/architect");
|
|
15
15
|
const path_1 = require("path");
|
|
16
16
|
const rxjs_1 = require("rxjs");
|
|
17
|
-
const operators_1 = require("rxjs/operators");
|
|
18
17
|
const webpack_1 = __importDefault(require("webpack"));
|
|
19
18
|
const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
|
|
20
19
|
const utils_1 = require("../utils");
|
|
21
20
|
function runWebpackDevServer(config, context, options = {}) {
|
|
22
|
-
var _a;
|
|
23
21
|
const createWebpack = (c) => {
|
|
24
22
|
if (options.webpackFactory) {
|
|
25
23
|
const result = options.webpackFactory(c);
|
|
@@ -41,11 +39,10 @@ function runWebpackDevServer(config, context, options = {}) {
|
|
|
41
39
|
return new webpack_dev_server_1.default(config, webpack);
|
|
42
40
|
};
|
|
43
41
|
const log = options.logging || ((stats, config) => context.logger.info(stats.toString(config.stats)));
|
|
44
|
-
const shouldProvideStats =
|
|
45
|
-
return createWebpack({ ...config, watch: false }).pipe((0,
|
|
46
|
-
var _a;
|
|
42
|
+
const shouldProvideStats = options.shouldProvideStats ?? true;
|
|
43
|
+
return createWebpack({ ...config, watch: false }).pipe((0, rxjs_1.switchMap)((webpackCompiler) => new rxjs_1.Observable((obs) => {
|
|
47
44
|
const devServerConfig = options.devServerConfig || config.devServer || {};
|
|
48
|
-
|
|
45
|
+
devServerConfig.host ?? (devServerConfig.host = 'localhost');
|
|
49
46
|
let result;
|
|
50
47
|
const statsOptions = typeof config.stats === 'boolean' ? undefined : config.stats;
|
|
51
48
|
webpackCompiler.hooks.done.tap('build-webpack', (stats) => {
|
|
@@ -61,12 +58,11 @@ function runWebpackDevServer(config, context, options = {}) {
|
|
|
61
58
|
});
|
|
62
59
|
const devServer = createWebpackDevServer(webpackCompiler, devServerConfig);
|
|
63
60
|
devServer.startCallback((err) => {
|
|
64
|
-
var _a;
|
|
65
61
|
if (err) {
|
|
66
62
|
obs.error(err);
|
|
67
63
|
return;
|
|
68
64
|
}
|
|
69
|
-
const address =
|
|
65
|
+
const address = devServer.server?.address();
|
|
70
66
|
if (!address) {
|
|
71
67
|
obs.error(new Error(`Dev-server address info is not defined.`));
|
|
72
68
|
return;
|
|
@@ -88,6 +84,6 @@ function runWebpackDevServer(config, context, options = {}) {
|
|
|
88
84
|
exports.runWebpackDevServer = runWebpackDevServer;
|
|
89
85
|
exports.default = (0, architect_1.createBuilder)((options, context) => {
|
|
90
86
|
const configPath = (0, path_1.resolve)(context.workspaceRoot, options.webpackConfig);
|
|
91
|
-
return (0, rxjs_1.from)((0, utils_1.getWebpackConfig)(configPath)).pipe((0,
|
|
87
|
+
return (0, rxjs_1.from)((0, utils_1.getWebpackConfig)(configPath)).pipe((0, rxjs_1.switchMap)((config) => runWebpackDevServer(config, context)));
|
|
92
88
|
});
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { BuilderContext, createBuilder } from '@angular-devkit/architect';\nimport { resolve as pathResolve } from 'path';\nimport { Observable, from, isObservable, of } from 'rxjs';\nimport { switchMap } from 'rxjs/operators';\nimport webpack from 'webpack';\nimport WebpackDevServer from 'webpack-dev-server';\nimport { getEmittedFiles, getWebpackConfig } from '../utils';\nimport { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack';\nimport { Schema as WebpackDevServerBuilderSchema } from './schema';\n\nexport type WebpackDevServerFactory = typeof WebpackDevServer;\n\nexport type DevServerBuildOutput = BuildResult & {\n  port: number;\n  family: string;\n  address: string;\n};\n\nexport function runWebpackDevServer(\n  config: webpack.Configuration,\n  context: BuilderContext,\n  options: {\n    shouldProvideStats?: boolean;\n    devServerConfig?: WebpackDevServer.Configuration;\n    logging?: WebpackLoggingCallback;\n    webpackFactory?: WebpackFactory;\n    webpackDevServerFactory?: WebpackDevServerFactory;\n  } = {},\n): Observable<DevServerBuildOutput> {\n  const createWebpack = (c: webpack.Configuration) => {\n    if (options.webpackFactory) {\n      const result = options.webpackFactory(c);\n      if (isObservable(result)) {\n        return result;\n      } else {\n        return of(result);\n      }\n    } else {\n      return of(webpack(c));\n    }\n  };\n\n  const createWebpackDevServer = (\n    webpack: webpack.Compiler | webpack.MultiCompiler,\n    config: WebpackDevServer.Configuration,\n  ) => {\n    if (options.webpackDevServerFactory) {\n      return new options.webpackDevServerFactory(config, webpack);\n    }\n\n    return new WebpackDevServer(config, webpack);\n  };\n\n  const log: WebpackLoggingCallback =\n    options.logging || ((stats, config) => context.logger.info(stats.toString(config.stats)));\n\n  const shouldProvideStats = options.shouldProvideStats ?? true;\n\n  return createWebpack({ ...config, watch: false }).pipe(\n    switchMap(\n      (webpackCompiler) =>\n        new Observable<DevServerBuildOutput>((obs) => {\n          const devServerConfig = options.devServerConfig || config.devServer || {};\n          devServerConfig.host ??= 'localhost';\n\n          let result: Partial<DevServerBuildOutput>;\n\n          const statsOptions = typeof config.stats === 'boolean' ? undefined : config.stats;\n\n          webpackCompiler.hooks.done.tap('build-webpack', (stats) => {\n            // Log stats.\n            log(stats, config);\n            obs.next({\n              ...result,\n              webpackStats: shouldProvideStats ? stats.toJson(statsOptions) : undefined,\n              emittedFiles: getEmittedFiles(stats.compilation),\n              success: !stats.hasErrors(),\n              outputPath: stats.compilation.outputOptions.path,\n            } as unknown as DevServerBuildOutput);\n          });\n\n          const devServer = createWebpackDevServer(webpackCompiler, devServerConfig);\n          devServer.startCallback((err) => {\n            if (err) {\n              obs.error(err);\n\n              return;\n            }\n\n            const address = devServer.server?.address();\n            if (!address) {\n              obs.error(new Error(`Dev-server address info is not defined.`));\n\n              return;\n            }\n\n            result = {\n              success: true,\n              port: typeof address === 'string' ? 0 : address.port,\n              family: typeof address === 'string' ? '' : address.family,\n              address: typeof address === 'string' ? address : address.address,\n            };\n          });\n\n          // Teardown logic. Close the server when unsubscribed from.\n          return () => {\n            devServer.stopCallback(() => {});\n            webpackCompiler.close(() => {});\n          };\n        }),\n    ),\n  );\n}\n\nexport default createBuilder<WebpackDevServerBuilderSchema, DevServerBuildOutput>(\n  (options, context) => {\n    const configPath = pathResolve(context.workspaceRoot, options.webpackConfig);\n\n    return from(getWebpackConfig(configPath)).pipe(\n      switchMap((config) => runWebpackDevServer(config, context)),\n    );\n  },\n);\n"]}
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/angular_devkit/build_webpack/src/webpack-dev-server/index.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport { BuilderContext, createBuilder } from '@angular-devkit/architect';\nimport { resolve as pathResolve } from 'path';\nimport { Observable, from, isObservable, of, switchMap } from 'rxjs';\nimport webpack from 'webpack';\nimport WebpackDevServer from 'webpack-dev-server';\nimport { getEmittedFiles, getWebpackConfig } from '../utils';\nimport { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack';\nimport { Schema as WebpackDevServerBuilderSchema } from './schema';\n\nexport type WebpackDevServerFactory = typeof WebpackDevServer;\n\nexport type DevServerBuildOutput = BuildResult & {\n  port: number;\n  family: string;\n  address: string;\n};\n\nexport function runWebpackDevServer(\n  config: webpack.Configuration,\n  context: BuilderContext,\n  options: {\n    shouldProvideStats?: boolean;\n    devServerConfig?: WebpackDevServer.Configuration;\n    logging?: WebpackLoggingCallback;\n    webpackFactory?: WebpackFactory;\n    webpackDevServerFactory?: WebpackDevServerFactory;\n  } = {},\n): Observable<DevServerBuildOutput> {\n  const createWebpack = (c: webpack.Configuration) => {\n    if (options.webpackFactory) {\n      const result = options.webpackFactory(c);\n      if (isObservable(result)) {\n        return result;\n      } else {\n        return of(result);\n      }\n    } else {\n      return of(webpack(c));\n    }\n  };\n\n  const createWebpackDevServer = (\n    webpack: webpack.Compiler | webpack.MultiCompiler,\n    config: WebpackDevServer.Configuration,\n  ) => {\n    if (options.webpackDevServerFactory) {\n      return new options.webpackDevServerFactory(config, webpack);\n    }\n\n    return new WebpackDevServer(config, webpack);\n  };\n\n  const log: WebpackLoggingCallback =\n    options.logging || ((stats, config) => context.logger.info(stats.toString(config.stats)));\n\n  const shouldProvideStats = options.shouldProvideStats ?? true;\n\n  return createWebpack({ ...config, watch: false }).pipe(\n    switchMap(\n      (webpackCompiler) =>\n        new Observable<DevServerBuildOutput>((obs) => {\n          const devServerConfig = options.devServerConfig || config.devServer || {};\n          devServerConfig.host ??= 'localhost';\n\n          let result: Partial<DevServerBuildOutput>;\n\n          const statsOptions = typeof config.stats === 'boolean' ? undefined : config.stats;\n\n          webpackCompiler.hooks.done.tap('build-webpack', (stats) => {\n            // Log stats.\n            log(stats, config);\n            obs.next({\n              ...result,\n              webpackStats: shouldProvideStats ? stats.toJson(statsOptions) : undefined,\n              emittedFiles: getEmittedFiles(stats.compilation),\n              success: !stats.hasErrors(),\n              outputPath: stats.compilation.outputOptions.path,\n            } as unknown as DevServerBuildOutput);\n          });\n\n          const devServer = createWebpackDevServer(webpackCompiler, devServerConfig);\n          devServer.startCallback((err) => {\n            if (err) {\n              obs.error(err);\n\n              return;\n            }\n\n            const address = devServer.server?.address();\n            if (!address) {\n              obs.error(new Error(`Dev-server address info is not defined.`));\n\n              return;\n            }\n\n            result = {\n              success: true,\n              port: typeof address === 'string' ? 0 : address.port,\n              family: typeof address === 'string' ? '' : address.family,\n              address: typeof address === 'string' ? address : address.address,\n            };\n          });\n\n          // Teardown logic. Close the server when unsubscribed from.\n          return () => {\n            devServer.stopCallback(() => {});\n            webpackCompiler.close(() => {});\n          };\n        }),\n    ),\n  );\n}\n\nexport default createBuilder<WebpackDevServerBuilderSchema, DevServerBuildOutput>(\n  (options, context) => {\n    const configPath = pathResolve(context.workspaceRoot, options.webpackConfig);\n\n    return from(getWebpackConfig(configPath)).pipe(\n      switchMap((config) => runWebpackDevServer(config, context)),\n    );\n  },\n);\n"]}
|