@angular-devkit/build-angular 16.1.4 → 16.2.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/builders.json +5 -0
- package/package.json +21 -22
- package/src/builders/application/build-action.d.ts +24 -0
- package/src/builders/application/build-action.js +159 -0
- package/src/builders/application/execute-build.d.ts +11 -0
- package/src/builders/application/execute-build.js +126 -0
- package/src/builders/application/index.d.ts +29 -0
- package/src/builders/application/index.js +50 -0
- package/src/builders/{browser-esbuild → application}/options.d.ts +11 -9
- package/src/builders/application/options.js +230 -0
- package/src/builders/application/schema.d.ts +390 -0
- package/src/builders/application/schema.js +59 -0
- package/src/builders/application/schema.json +520 -0
- package/src/builders/browser-esbuild/builder-status-warnings.d.ts +2 -2
- package/src/builders/browser-esbuild/builder-status-warnings.js +2 -1
- package/src/builders/browser-esbuild/index.d.ts +0 -17
- package/src/builders/browser-esbuild/index.js +14 -279
- package/src/builders/dev-server/vite-server.js +2 -2
- package/src/builders/jest/index.js +3 -5
- package/src/tools/esbuild/angular/{angular-compilation.d.ts → compilation/angular-compilation.d.ts} +1 -1
- package/src/tools/esbuild/angular/compilation/angular-compilation.js +52 -0
- package/src/tools/esbuild/angular/{aot-compilation.d.ts → compilation/aot-compilation.d.ts} +1 -1
- package/src/tools/esbuild/angular/compilation/aot-compilation.js +211 -0
- package/src/tools/esbuild/angular/compilation/index.d.ts +11 -0
- package/src/tools/esbuild/angular/compilation/index.js +19 -0
- package/src/tools/esbuild/angular/{jit-compilation.d.ts → compilation/jit-compilation.d.ts} +1 -1
- package/src/tools/esbuild/angular/compilation/jit-compilation.js +106 -0
- package/src/tools/esbuild/angular/compilation/noop-compilation.d.ts +20 -0
- package/src/tools/esbuild/angular/compilation/noop-compilation.js +27 -0
- package/src/tools/esbuild/angular/compiler-plugin.d.ts +2 -0
- package/src/tools/esbuild/angular/compiler-plugin.js +22 -8
- package/src/tools/esbuild/application-code-bundle.d.ts +9 -3
- package/src/tools/esbuild/application-code-bundle.js +131 -69
- package/src/tools/esbuild/compiler-plugin-options.d.ts +15 -0
- package/src/tools/esbuild/compiler-plugin-options.js +45 -0
- package/src/tools/esbuild/global-scripts.d.ts +2 -2
- package/src/tools/esbuild/global-scripts.js +1 -1
- package/src/tools/esbuild/global-styles.d.ts +2 -2
- package/src/tools/esbuild/global-styles.js +2 -3
- package/src/tools/esbuild/index-html-generator.d.ts +2 -2
- package/src/tools/esbuild/index-html-generator.js +4 -2
- package/src/tools/esbuild/javascript-transformer-worker.d.ts +0 -1
- package/src/tools/esbuild/javascript-transformer-worker.js +2 -5
- package/src/tools/esbuild/javascript-transformer.js +5 -13
- package/src/tools/esbuild/rxjs-esm-resolution-plugin.d.ts +18 -0
- package/src/tools/esbuild/rxjs-esm-resolution-plugin.js +45 -0
- package/src/tools/esbuild/stylesheets/bundle-options.d.ts +3 -4
- package/src/tools/esbuild/stylesheets/bundle-options.js +3 -4
- package/src/tools/esbuild/stylesheets/stylesheet-plugin-factory.d.ts +0 -7
- package/src/tools/esbuild/stylesheets/stylesheet-plugin-factory.js +6 -24
- package/src/tools/esbuild/utils.d.ts +5 -0
- package/src/tools/esbuild/utils.js +47 -16
- package/src/tools/webpack/plugins/css-optimizer-plugin.js +3 -3
- package/src/tools/webpack/plugins/javascript-optimizer-plugin.js +3 -3
- package/src/utils/index-file/augment-index-html.d.ts +1 -0
- package/src/utils/index-file/augment-index-html.js +6 -1
- package/src/utils/index-file/index-html-generator.d.ts +1 -0
- package/src/utils/index-file/index-html-generator.js +1 -1
- package/src/utils/index-file/inline-fonts.js +44 -14
- package/src/builders/browser-esbuild/options.js +0 -230
- package/src/tools/esbuild/angular/angular-compilation.js +0 -51
- package/src/tools/esbuild/angular/aot-compilation.js +0 -211
- package/src/tools/esbuild/angular/jit-compilation.js +0 -106
- package/src/utils/esbuild-targets.d.ts +0 -12
- package/src/utils/esbuild-targets.js +0 -55
package/builders.json
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "../architect/src/builders-schema.json",
|
|
3
3
|
"builders": {
|
|
4
|
+
"application": {
|
|
5
|
+
"implementation": "./src/builders/application",
|
|
6
|
+
"schema": "./src/builders/application/schema.json",
|
|
7
|
+
"description": "Build an application."
|
|
8
|
+
},
|
|
4
9
|
"app-shell": {
|
|
5
10
|
"implementation": "./src/builders/app-shell",
|
|
6
11
|
"schema": "./src/builders/app-shell/schema.json",
|
package/package.json
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular-devkit/build-angular",
|
|
3
|
-
"version": "16.1
|
|
3
|
+
"version": "16.2.0-next.1",
|
|
4
4
|
"description": "Angular Webpack Build Facade",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"typings": "src/index.d.ts",
|
|
7
7
|
"builders": "builders.json",
|
|
8
8
|
"dependencies": {
|
|
9
9
|
"@ampproject/remapping": "2.2.1",
|
|
10
|
-
"@angular-devkit/architect": "0.
|
|
11
|
-
"@angular-devkit/build-webpack": "0.
|
|
12
|
-
"@angular-devkit/core": "16.1
|
|
10
|
+
"@angular-devkit/architect": "0.1602.0-next.1",
|
|
11
|
+
"@angular-devkit/build-webpack": "0.1602.0-next.1",
|
|
12
|
+
"@angular-devkit/core": "16.2.0-next.1",
|
|
13
13
|
"@babel/core": "7.22.5",
|
|
14
|
-
"@babel/generator": "7.22.
|
|
14
|
+
"@babel/generator": "7.22.5",
|
|
15
15
|
"@babel/helper-annotate-as-pure": "7.22.5",
|
|
16
16
|
"@babel/helper-split-export-declaration": "7.22.5",
|
|
17
17
|
"@babel/plugin-proposal-async-generator-functions": "7.20.7",
|
|
@@ -21,19 +21,18 @@
|
|
|
21
21
|
"@babel/runtime": "7.22.5",
|
|
22
22
|
"@babel/template": "7.22.5",
|
|
23
23
|
"@discoveryjs/json-ext": "0.5.7",
|
|
24
|
-
"@ngtools/webpack": "16.1
|
|
24
|
+
"@ngtools/webpack": "16.2.0-next.1",
|
|
25
25
|
"@vitejs/plugin-basic-ssl": "1.0.1",
|
|
26
26
|
"ansi-colors": "4.1.3",
|
|
27
27
|
"autoprefixer": "10.4.14",
|
|
28
28
|
"babel-loader": "9.1.2",
|
|
29
29
|
"babel-plugin-istanbul": "6.1.1",
|
|
30
30
|
"browserslist": "^4.21.5",
|
|
31
|
-
"cacache": "17.1.3",
|
|
32
31
|
"chokidar": "3.5.3",
|
|
33
32
|
"copy-webpack-plugin": "11.0.0",
|
|
34
33
|
"critters": "0.0.19",
|
|
35
34
|
"css-loader": "6.8.1",
|
|
36
|
-
"esbuild-wasm": "0.
|
|
35
|
+
"esbuild-wasm": "0.18.10",
|
|
37
36
|
"fast-glob": "3.2.12",
|
|
38
37
|
"https-proxy-agent": "5.0.1",
|
|
39
38
|
"inquirer": "8.2.4",
|
|
@@ -50,39 +49,39 @@
|
|
|
50
49
|
"ora": "5.4.1",
|
|
51
50
|
"parse5-html-rewriting-stream": "7.0.0",
|
|
52
51
|
"picomatch": "2.3.1",
|
|
53
|
-
"piscina": "
|
|
52
|
+
"piscina": "4.0.0",
|
|
54
53
|
"postcss": "8.4.24",
|
|
55
|
-
"postcss-loader": "7.3.
|
|
54
|
+
"postcss-loader": "7.3.3",
|
|
56
55
|
"resolve-url-loader": "5.0.0",
|
|
57
56
|
"rxjs": "7.8.1",
|
|
58
|
-
"sass": "1.63.
|
|
59
|
-
"sass-loader": "13.3.
|
|
57
|
+
"sass": "1.63.6",
|
|
58
|
+
"sass-loader": "13.3.2",
|
|
60
59
|
"semver": "7.5.3",
|
|
61
60
|
"source-map-loader": "4.0.1",
|
|
62
61
|
"source-map-support": "0.5.21",
|
|
63
|
-
"terser": "5.
|
|
62
|
+
"terser": "5.18.2",
|
|
64
63
|
"text-table": "0.2.0",
|
|
65
64
|
"tree-kill": "1.2.2",
|
|
66
|
-
"tslib": "2.
|
|
65
|
+
"tslib": "2.6.0",
|
|
67
66
|
"vite": "4.3.9",
|
|
68
|
-
"webpack": "5.
|
|
67
|
+
"webpack": "5.88.1",
|
|
69
68
|
"webpack-dev-middleware": "6.1.1",
|
|
70
|
-
"webpack-dev-server": "4.15.
|
|
69
|
+
"webpack-dev-server": "4.15.1",
|
|
71
70
|
"webpack-merge": "5.9.0",
|
|
72
71
|
"webpack-subresource-integrity": "5.1.0"
|
|
73
72
|
},
|
|
74
73
|
"optionalDependencies": {
|
|
75
|
-
"esbuild": "0.
|
|
74
|
+
"esbuild": "0.18.10"
|
|
76
75
|
},
|
|
77
76
|
"peerDependencies": {
|
|
78
|
-
"@angular/compiler-cli": "^16.0.0",
|
|
79
|
-
"@angular/localize": "^16.0.0",
|
|
80
|
-
"@angular/platform-server": "^16.0.0",
|
|
81
|
-
"@angular/service-worker": "^16.0.0",
|
|
77
|
+
"@angular/compiler-cli": "^16.0.0 || ^16.2.0-next.0",
|
|
78
|
+
"@angular/localize": "^16.0.0 || ^16.2.0-next.0",
|
|
79
|
+
"@angular/platform-server": "^16.0.0 || ^16.2.0-next.0",
|
|
80
|
+
"@angular/service-worker": "^16.0.0 || ^16.2.0-next.0",
|
|
82
81
|
"jest": "^29.5.0",
|
|
83
82
|
"jest-environment-jsdom": "^29.5.0",
|
|
84
83
|
"karma": "^6.3.0",
|
|
85
|
-
"ng-packagr": "^16.0.0",
|
|
84
|
+
"ng-packagr": "^16.0.0 || ^16.2.0-next.0",
|
|
86
85
|
"protractor": "^7.0.0",
|
|
87
86
|
"tailwindcss": "^2.0.0 || ^3.0.0",
|
|
88
87
|
"typescript": ">=4.9.3 <5.2"
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google LLC All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.io/license
|
|
7
|
+
*/
|
|
8
|
+
import { BuilderOutput } from '@angular-devkit/architect';
|
|
9
|
+
import type { logging } from '@angular-devkit/core';
|
|
10
|
+
import { ExecutionResult, RebuildState } from '../../tools/esbuild/bundler-execution-result';
|
|
11
|
+
import { NormalizedCachedOptions } from '../../utils/normalize-cache';
|
|
12
|
+
export declare function runEsBuildBuildAction(action: (rebuildState?: RebuildState) => ExecutionResult | Promise<ExecutionResult>, options: {
|
|
13
|
+
workspaceRoot: string;
|
|
14
|
+
projectRoot: string;
|
|
15
|
+
outputPath: string;
|
|
16
|
+
logger: logging.LoggerApi;
|
|
17
|
+
cacheOptions: NormalizedCachedOptions;
|
|
18
|
+
writeToFileSystem?: boolean;
|
|
19
|
+
watch?: boolean;
|
|
20
|
+
verbose?: boolean;
|
|
21
|
+
progress?: boolean;
|
|
22
|
+
deleteOutputPath?: boolean;
|
|
23
|
+
poll?: number;
|
|
24
|
+
}): AsyncIterable<(ExecutionResult['outputWithFiles'] | ExecutionResult['output']) & BuilderOutput>;
|
|
@@ -0,0 +1,159 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.io/license
|
|
8
|
+
*/
|
|
9
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
12
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
13
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
14
|
+
}
|
|
15
|
+
Object.defineProperty(o, k2, desc);
|
|
16
|
+
}) : (function(o, m, k, k2) {
|
|
17
|
+
if (k2 === undefined) k2 = k;
|
|
18
|
+
o[k2] = m[k];
|
|
19
|
+
}));
|
|
20
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
21
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
22
|
+
}) : function(o, v) {
|
|
23
|
+
o["default"] = v;
|
|
24
|
+
});
|
|
25
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
26
|
+
if (mod && mod.__esModule) return mod;
|
|
27
|
+
var result = {};
|
|
28
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
29
|
+
__setModuleDefault(result, mod);
|
|
30
|
+
return result;
|
|
31
|
+
};
|
|
32
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
33
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
34
|
+
};
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.runEsBuildBuildAction = void 0;
|
|
37
|
+
const promises_1 = __importDefault(require("node:fs/promises"));
|
|
38
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
39
|
+
const sass_language_1 = require("../../tools/esbuild/stylesheets/sass-language");
|
|
40
|
+
const utils_1 = require("../../tools/esbuild/utils");
|
|
41
|
+
const error_1 = require("../../utils/error");
|
|
42
|
+
async function* runEsBuildBuildAction(action, options) {
|
|
43
|
+
const { writeToFileSystem = true, watch, poll, logger, deleteOutputPath, cacheOptions, outputPath, verbose, projectRoot, workspaceRoot, progress, } = options;
|
|
44
|
+
if (writeToFileSystem) {
|
|
45
|
+
// Clean output path if enabled
|
|
46
|
+
if (deleteOutputPath) {
|
|
47
|
+
if (outputPath === workspaceRoot) {
|
|
48
|
+
logger.error('Output path MUST not be workspace root directory!');
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
await promises_1.default.rm(outputPath, { force: true, recursive: true, maxRetries: 3 });
|
|
52
|
+
}
|
|
53
|
+
// Create output directory if needed
|
|
54
|
+
try {
|
|
55
|
+
await promises_1.default.mkdir(outputPath, { recursive: true });
|
|
56
|
+
}
|
|
57
|
+
catch (e) {
|
|
58
|
+
(0, error_1.assertIsError)(e);
|
|
59
|
+
logger.error('Unable to create output directory: ' + e.message);
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
const withProgress = progress ? utils_1.withSpinner : utils_1.withNoProgress;
|
|
64
|
+
// Initial build
|
|
65
|
+
let result;
|
|
66
|
+
try {
|
|
67
|
+
result = await withProgress('Building...', () => action());
|
|
68
|
+
if (writeToFileSystem) {
|
|
69
|
+
// Write output files
|
|
70
|
+
await (0, utils_1.writeResultFiles)(result.outputFiles, result.assetFiles, outputPath);
|
|
71
|
+
yield result.output;
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
// Requires casting due to unneeded `JsonObject` requirement. Remove once fixed.
|
|
75
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
76
|
+
yield result.outputWithFiles;
|
|
77
|
+
}
|
|
78
|
+
// Finish if watch mode is not enabled
|
|
79
|
+
if (!watch) {
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
finally {
|
|
84
|
+
// Ensure Sass workers are shutdown if not watching
|
|
85
|
+
if (!watch) {
|
|
86
|
+
(0, sass_language_1.shutdownSassWorkerPool)();
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
if (progress) {
|
|
90
|
+
logger.info('Watch mode enabled. Watching for file changes...');
|
|
91
|
+
}
|
|
92
|
+
// Setup a watcher
|
|
93
|
+
const { createWatcher } = await Promise.resolve().then(() => __importStar(require('../../tools/esbuild/watcher')));
|
|
94
|
+
const watcher = createWatcher({
|
|
95
|
+
polling: typeof poll === 'number',
|
|
96
|
+
interval: poll,
|
|
97
|
+
ignored: [
|
|
98
|
+
// Ignore the output and cache paths to avoid infinite rebuild cycles
|
|
99
|
+
outputPath,
|
|
100
|
+
cacheOptions.basePath,
|
|
101
|
+
// Ignore all node modules directories to avoid excessive file watchers.
|
|
102
|
+
// Package changes are handled below by watching manifest and lock files.
|
|
103
|
+
'**/node_modules/**',
|
|
104
|
+
'**/.*/**',
|
|
105
|
+
],
|
|
106
|
+
});
|
|
107
|
+
// Temporarily watch the entire project
|
|
108
|
+
watcher.add(projectRoot);
|
|
109
|
+
// Watch workspace for package manager changes
|
|
110
|
+
const packageWatchFiles = [
|
|
111
|
+
// manifest can affect module resolution
|
|
112
|
+
'package.json',
|
|
113
|
+
// npm lock file
|
|
114
|
+
'package-lock.json',
|
|
115
|
+
// pnpm lock file
|
|
116
|
+
'pnpm-lock.yaml',
|
|
117
|
+
// yarn lock file including Yarn PnP manifest files (https://yarnpkg.com/advanced/pnp-spec/)
|
|
118
|
+
'yarn.lock',
|
|
119
|
+
'.pnp.cjs',
|
|
120
|
+
'.pnp.data.json',
|
|
121
|
+
];
|
|
122
|
+
watcher.add(packageWatchFiles.map((file) => node_path_1.default.join(workspaceRoot, file)));
|
|
123
|
+
// Watch locations provided by the initial build result
|
|
124
|
+
let previousWatchFiles = new Set(result.watchFiles);
|
|
125
|
+
watcher.add(result.watchFiles);
|
|
126
|
+
// Wait for changes and rebuild as needed
|
|
127
|
+
try {
|
|
128
|
+
for await (const changes of watcher) {
|
|
129
|
+
if (verbose) {
|
|
130
|
+
logger.info(changes.toDebugString());
|
|
131
|
+
}
|
|
132
|
+
result = await withProgress('Changes detected. Rebuilding...', () => action(result.createRebuildState(changes)));
|
|
133
|
+
// Update watched locations provided by the new build result.
|
|
134
|
+
// Add any new locations
|
|
135
|
+
watcher.add(result.watchFiles.filter((watchFile) => !previousWatchFiles.has(watchFile)));
|
|
136
|
+
const newWatchFiles = new Set(result.watchFiles);
|
|
137
|
+
// Remove any old locations
|
|
138
|
+
watcher.remove([...previousWatchFiles].filter((watchFile) => !newWatchFiles.has(watchFile)));
|
|
139
|
+
previousWatchFiles = newWatchFiles;
|
|
140
|
+
if (writeToFileSystem) {
|
|
141
|
+
// Write output files
|
|
142
|
+
await (0, utils_1.writeResultFiles)(result.outputFiles, result.assetFiles, outputPath);
|
|
143
|
+
yield result.output;
|
|
144
|
+
}
|
|
145
|
+
else {
|
|
146
|
+
// Requires casting due to unneeded `JsonObject` requirement. Remove once fixed.
|
|
147
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
148
|
+
yield result.outputWithFiles;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
finally {
|
|
153
|
+
// Stop the watcher and cleanup incremental rebuild state
|
|
154
|
+
await Promise.allSettled([watcher.close(), result.dispose()]);
|
|
155
|
+
(0, sass_language_1.shutdownSassWorkerPool)();
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
exports.runEsBuildBuildAction = runEsBuildBuildAction;
|
|
159
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"build-action.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular_devkit/build_angular/src/builders/application/build-action.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 { BuilderOutput } from '@angular-devkit/architect';\nimport type { logging } from '@angular-devkit/core';\nimport fs from 'node:fs/promises';\nimport path from 'node:path';\nimport { ExecutionResult, RebuildState } from '../../tools/esbuild/bundler-execution-result';\nimport { shutdownSassWorkerPool } from '../../tools/esbuild/stylesheets/sass-language';\nimport { withNoProgress, withSpinner, writeResultFiles } from '../../tools/esbuild/utils';\nimport { assertIsError } from '../../utils/error';\nimport { NormalizedCachedOptions } from '../../utils/normalize-cache';\n\nexport async function* runEsBuildBuildAction(\n  action: (rebuildState?: RebuildState) => ExecutionResult | Promise<ExecutionResult>,\n  options: {\n    workspaceRoot: string;\n    projectRoot: string;\n    outputPath: string;\n    logger: logging.LoggerApi;\n    cacheOptions: NormalizedCachedOptions;\n    writeToFileSystem?: boolean;\n    watch?: boolean;\n    verbose?: boolean;\n    progress?: boolean;\n    deleteOutputPath?: boolean;\n    poll?: number;\n  },\n): AsyncIterable<(ExecutionResult['outputWithFiles'] | ExecutionResult['output']) & BuilderOutput> {\n  const {\n    writeToFileSystem = true,\n    watch,\n    poll,\n    logger,\n    deleteOutputPath,\n    cacheOptions,\n    outputPath,\n    verbose,\n    projectRoot,\n    workspaceRoot,\n    progress,\n  } = options;\n\n  if (writeToFileSystem) {\n    // Clean output path if enabled\n    if (deleteOutputPath) {\n      if (outputPath === workspaceRoot) {\n        logger.error('Output path MUST not be workspace root directory!');\n\n        return;\n      }\n\n      await fs.rm(outputPath, { force: true, recursive: true, maxRetries: 3 });\n    }\n\n    // Create output directory if needed\n    try {\n      await fs.mkdir(outputPath, { recursive: true });\n    } catch (e) {\n      assertIsError(e);\n      logger.error('Unable to create output directory: ' + e.message);\n\n      return;\n    }\n  }\n\n  const withProgress: typeof withSpinner = progress ? withSpinner : withNoProgress;\n\n  // Initial build\n  let result: ExecutionResult;\n  try {\n    result = await withProgress('Building...', () => action());\n\n    if (writeToFileSystem) {\n      // Write output files\n      await writeResultFiles(result.outputFiles, result.assetFiles, outputPath);\n\n      yield result.output;\n    } else {\n      // Requires casting due to unneeded `JsonObject` requirement. Remove once fixed.\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n      yield result.outputWithFiles as any;\n    }\n\n    // Finish if watch mode is not enabled\n    if (!watch) {\n      return;\n    }\n  } finally {\n    // Ensure Sass workers are shutdown if not watching\n    if (!watch) {\n      shutdownSassWorkerPool();\n    }\n  }\n\n  if (progress) {\n    logger.info('Watch mode enabled. Watching for file changes...');\n  }\n\n  // Setup a watcher\n  const { createWatcher } = await import('../../tools/esbuild/watcher');\n  const watcher = createWatcher({\n    polling: typeof poll === 'number',\n    interval: poll,\n    ignored: [\n      // Ignore the output and cache paths to avoid infinite rebuild cycles\n      outputPath,\n      cacheOptions.basePath,\n      // Ignore all node modules directories to avoid excessive file watchers.\n      // Package changes are handled below by watching manifest and lock files.\n      '**/node_modules/**',\n      '**/.*/**',\n    ],\n  });\n\n  // Temporarily watch the entire project\n  watcher.add(projectRoot);\n\n  // Watch workspace for package manager changes\n  const packageWatchFiles = [\n    // manifest can affect module resolution\n    'package.json',\n    // npm lock file\n    'package-lock.json',\n    // pnpm lock file\n    'pnpm-lock.yaml',\n    // yarn lock file including Yarn PnP manifest files (https://yarnpkg.com/advanced/pnp-spec/)\n    'yarn.lock',\n    '.pnp.cjs',\n    '.pnp.data.json',\n  ];\n\n  watcher.add(packageWatchFiles.map((file) => path.join(workspaceRoot, file)));\n\n  // Watch locations provided by the initial build result\n  let previousWatchFiles = new Set(result.watchFiles);\n  watcher.add(result.watchFiles);\n\n  // Wait for changes and rebuild as needed\n  try {\n    for await (const changes of watcher) {\n      if (verbose) {\n        logger.info(changes.toDebugString());\n      }\n\n      result = await withProgress('Changes detected. Rebuilding...', () =>\n        action(result.createRebuildState(changes)),\n      );\n\n      // Update watched locations provided by the new build result.\n      // Add any new locations\n      watcher.add(result.watchFiles.filter((watchFile) => !previousWatchFiles.has(watchFile)));\n      const newWatchFiles = new Set(result.watchFiles);\n      // Remove any old locations\n      watcher.remove([...previousWatchFiles].filter((watchFile) => !newWatchFiles.has(watchFile)));\n      previousWatchFiles = newWatchFiles;\n\n      if (writeToFileSystem) {\n        // Write output files\n        await writeResultFiles(result.outputFiles, result.assetFiles, outputPath);\n\n        yield result.output;\n      } else {\n        // Requires casting due to unneeded `JsonObject` requirement. Remove once fixed.\n        // eslint-disable-next-line @typescript-eslint/no-explicit-any\n        yield result.outputWithFiles as any;\n      }\n    }\n  } finally {\n    // Stop the watcher and cleanup incremental rebuild state\n    await Promise.allSettled([watcher.close(), result.dispose()]);\n\n    shutdownSassWorkerPool();\n  }\n}\n"]}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google LLC All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.io/license
|
|
7
|
+
*/
|
|
8
|
+
import { BuilderContext } from '@angular-devkit/architect';
|
|
9
|
+
import { ExecutionResult, RebuildState } from '../../tools/esbuild/bundler-execution-result';
|
|
10
|
+
import { NormalizedApplicationBuildOptions } from './options';
|
|
11
|
+
export declare function executeBuild(options: NormalizedApplicationBuildOptions, context: BuilderContext, rebuildState?: RebuildState): Promise<ExecutionResult>;
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.io/license
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.executeBuild = void 0;
|
|
11
|
+
const compiler_plugin_1 = require("../../tools/esbuild/angular/compiler-plugin");
|
|
12
|
+
const application_code_bundle_1 = require("../../tools/esbuild/application-code-bundle");
|
|
13
|
+
const bundler_context_1 = require("../../tools/esbuild/bundler-context");
|
|
14
|
+
const bundler_execution_result_1 = require("../../tools/esbuild/bundler-execution-result");
|
|
15
|
+
const commonjs_checker_1 = require("../../tools/esbuild/commonjs-checker");
|
|
16
|
+
const global_scripts_1 = require("../../tools/esbuild/global-scripts");
|
|
17
|
+
const global_styles_1 = require("../../tools/esbuild/global-styles");
|
|
18
|
+
const index_html_generator_1 = require("../../tools/esbuild/index-html-generator");
|
|
19
|
+
const license_extractor_1 = require("../../tools/esbuild/license-extractor");
|
|
20
|
+
const utils_1 = require("../../tools/esbuild/utils");
|
|
21
|
+
const copy_assets_1 = require("../../utils/copy-assets");
|
|
22
|
+
const service_worker_1 = require("../../utils/service-worker");
|
|
23
|
+
const supported_browsers_1 = require("../../utils/supported-browsers");
|
|
24
|
+
async function executeBuild(options, context, rebuildState) {
|
|
25
|
+
const startTime = process.hrtime.bigint();
|
|
26
|
+
const { projectRoot, workspaceRoot, serviceWorker, optimizationOptions, serverEntryPoint, assets, indexHtmlOptions, cacheOptions, } = options;
|
|
27
|
+
const browsers = (0, supported_browsers_1.getSupportedBrowsers)(projectRoot, context.logger);
|
|
28
|
+
const target = (0, utils_1.transformSupportedBrowsersToTargets)(browsers);
|
|
29
|
+
// Reuse rebuild state or create new bundle contexts for code and global stylesheets
|
|
30
|
+
let bundlerContexts = rebuildState?.rebuildContexts;
|
|
31
|
+
const codeBundleCache = rebuildState?.codeBundleCache ??
|
|
32
|
+
new compiler_plugin_1.SourceFileCache(cacheOptions.enabled ? cacheOptions.path : undefined);
|
|
33
|
+
if (bundlerContexts === undefined) {
|
|
34
|
+
bundlerContexts = [];
|
|
35
|
+
// Browser application code
|
|
36
|
+
bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, (0, application_code_bundle_1.createBrowserCodeBundleOptions)(options, target, codeBundleCache)));
|
|
37
|
+
// Global Stylesheets
|
|
38
|
+
if (options.globalStyles.length > 0) {
|
|
39
|
+
for (const initial of [true, false]) {
|
|
40
|
+
const bundleOptions = (0, global_styles_1.createGlobalStylesBundleOptions)(options, target, initial, codeBundleCache?.loadResultCache);
|
|
41
|
+
if (bundleOptions) {
|
|
42
|
+
bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, bundleOptions, () => initial));
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
// Global Scripts
|
|
47
|
+
if (options.globalScripts.length > 0) {
|
|
48
|
+
for (const initial of [true, false]) {
|
|
49
|
+
const bundleOptions = (0, global_scripts_1.createGlobalScriptsBundleOptions)(options, initial);
|
|
50
|
+
if (bundleOptions) {
|
|
51
|
+
bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, bundleOptions, () => initial));
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
// Server application code
|
|
56
|
+
if (serverEntryPoint) {
|
|
57
|
+
bundlerContexts.push(new bundler_context_1.BundlerContext(workspaceRoot, !!options.watch, (0, application_code_bundle_1.createServerCodeBundleOptions)(options,
|
|
58
|
+
// NOTE: earlier versions of Node.js are not supported due to unsafe promise patching.
|
|
59
|
+
// See: https://github.com/angular/angular/pull/50552#issue-1737967592
|
|
60
|
+
[...target, 'node18.13'], codeBundleCache), () => false));
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
const bundlingResult = await bundler_context_1.BundlerContext.bundleAll(bundlerContexts);
|
|
64
|
+
// Log all warnings and errors generated during bundling
|
|
65
|
+
await (0, utils_1.logMessages)(context, bundlingResult);
|
|
66
|
+
const executionResult = new bundler_execution_result_1.ExecutionResult(bundlerContexts, codeBundleCache);
|
|
67
|
+
// Return if the bundling has errors
|
|
68
|
+
if (bundlingResult.errors) {
|
|
69
|
+
return executionResult;
|
|
70
|
+
}
|
|
71
|
+
const { metafile, initialFiles, outputFiles } = bundlingResult;
|
|
72
|
+
executionResult.outputFiles.push(...outputFiles);
|
|
73
|
+
// Check metafile for CommonJS module usage if optimizing scripts
|
|
74
|
+
if (optimizationOptions.scripts) {
|
|
75
|
+
const messages = (0, commonjs_checker_1.checkCommonJSModules)(metafile, options.allowedCommonJsDependencies);
|
|
76
|
+
await (0, utils_1.logMessages)(context, { warnings: messages });
|
|
77
|
+
}
|
|
78
|
+
// Generate index HTML file
|
|
79
|
+
if (indexHtmlOptions) {
|
|
80
|
+
const { errors, warnings, content } = await (0, index_html_generator_1.generateIndexHtml)(initialFiles, executionResult, options);
|
|
81
|
+
for (const error of errors) {
|
|
82
|
+
context.logger.error(error);
|
|
83
|
+
}
|
|
84
|
+
for (const warning of warnings) {
|
|
85
|
+
context.logger.warn(warning);
|
|
86
|
+
}
|
|
87
|
+
executionResult.addOutputFile(indexHtmlOptions.output, content);
|
|
88
|
+
}
|
|
89
|
+
// Copy assets
|
|
90
|
+
if (assets) {
|
|
91
|
+
// The webpack copy assets helper is used with no base paths defined. This prevents the helper
|
|
92
|
+
// from directly writing to disk. This should eventually be replaced with a more optimized helper.
|
|
93
|
+
executionResult.assetFiles.push(...(await (0, copy_assets_1.copyAssets)(assets, [], workspaceRoot)));
|
|
94
|
+
}
|
|
95
|
+
// Write metafile if stats option is enabled
|
|
96
|
+
if (options.stats) {
|
|
97
|
+
executionResult.addOutputFile('stats.json', JSON.stringify(metafile, null, 2));
|
|
98
|
+
}
|
|
99
|
+
// Extract and write licenses for used packages
|
|
100
|
+
if (options.extractLicenses) {
|
|
101
|
+
executionResult.addOutputFile('3rdpartylicenses.txt', await (0, license_extractor_1.extractLicenses)(metafile, workspaceRoot));
|
|
102
|
+
}
|
|
103
|
+
// Augment the application with service worker support
|
|
104
|
+
if (serviceWorker) {
|
|
105
|
+
try {
|
|
106
|
+
const serviceWorkerResult = await (0, service_worker_1.augmentAppWithServiceWorkerEsbuild)(workspaceRoot, serviceWorker, options.baseHref || '/', executionResult.outputFiles, executionResult.assetFiles);
|
|
107
|
+
executionResult.addOutputFile('ngsw.json', serviceWorkerResult.manifest);
|
|
108
|
+
executionResult.assetFiles.push(...serviceWorkerResult.assetFiles);
|
|
109
|
+
}
|
|
110
|
+
catch (error) {
|
|
111
|
+
context.logger.error(error instanceof Error ? error.message : `${error}`);
|
|
112
|
+
return executionResult;
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
// Calculate estimated transfer size if scripts are optimized
|
|
116
|
+
let estimatedTransferSizes;
|
|
117
|
+
if (optimizationOptions.scripts || optimizationOptions.styles.minify) {
|
|
118
|
+
estimatedTransferSizes = await (0, utils_1.calculateEstimatedTransferSizes)(executionResult.outputFiles);
|
|
119
|
+
}
|
|
120
|
+
(0, utils_1.logBuildStats)(context, metafile, initialFiles, estimatedTransferSizes);
|
|
121
|
+
const buildTime = Number(process.hrtime.bigint() - startTime) / 10 ** 9;
|
|
122
|
+
context.logger.info(`Application bundle generation complete. [${buildTime.toFixed(3)} seconds]`);
|
|
123
|
+
return executionResult;
|
|
124
|
+
}
|
|
125
|
+
exports.executeBuild = executeBuild;
|
|
126
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"execute-build.js","sourceRoot":"","sources":["../../../../../../../../../packages/angular_devkit/build_angular/src/builders/application/execute-build.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAGH,iFAA8E;AAC9E,yFAGqD;AACrD,yEAAqE;AACrE,2FAA6F;AAC7F,2EAA4E;AAC5E,uEAAsF;AACtF,qEAAoF;AACpF,mFAA6E;AAC7E,6EAAwE;AACxE,qDAKmC;AACnC,yDAAqD;AACrD,+DAAgF;AAChF,uEAAsE;AAG/D,KAAK,UAAU,YAAY,CAChC,OAA0C,EAC1C,OAAuB,EACvB,YAA2B;IAE3B,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAE1C,MAAM,EACJ,WAAW,EACX,aAAa,EACb,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EAChB,MAAM,EACN,gBAAgB,EAChB,YAAY,GACb,GAAG,OAAO,CAAC;IAEZ,MAAM,QAAQ,GAAG,IAAA,yCAAoB,EAAC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,IAAA,2CAAmC,EAAC,QAAQ,CAAC,CAAC;IAE7D,oFAAoF;IACpF,IAAI,eAAe,GAAG,YAAY,EAAE,eAAe,CAAC;IACpD,MAAM,eAAe,GACnB,YAAY,EAAE,eAAe;QAC7B,IAAI,iCAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC5E,IAAI,eAAe,KAAK,SAAS,EAAE;QACjC,eAAe,GAAG,EAAE,CAAC;QAErB,2BAA2B;QAC3B,eAAe,CAAC,IAAI,CAClB,IAAI,gCAAc,CAChB,aAAa,EACb,CAAC,CAAC,OAAO,CAAC,KAAK,EACf,IAAA,wDAA8B,EAAC,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,CACjE,CACF,CAAC;QAEF,qBAAqB;QACrB,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YACnC,KAAK,MAAM,OAAO,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;gBACnC,MAAM,aAAa,GAAG,IAAA,+CAA+B,EACnD,OAAO,EACP,MAAM,EACN,OAAO,EACP,eAAe,EAAE,eAAe,CACjC,CAAC;gBACF,IAAI,aAAa,EAAE;oBACjB,eAAe,CAAC,IAAI,CAClB,IAAI,gCAAc,CAAC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CACjF,CAAC;iBACH;aACF;SACF;QAED,iBAAiB;QACjB,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YACpC,KAAK,MAAM,OAAO,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE;gBACnC,MAAM,aAAa,GAAG,IAAA,iDAAgC,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACzE,IAAI,aAAa,EAAE;oBACjB,eAAe,CAAC,IAAI,CAClB,IAAI,gCAAc,CAAC,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CACjF,CAAC;iBACH;aACF;SACF;QAED,0BAA0B;QAC1B,IAAI,gBAAgB,EAAE;YACpB,eAAe,CAAC,IAAI,CAClB,IAAI,gCAAc,CAChB,aAAa,EACb,CAAC,CAAC,OAAO,CAAC,KAAK,EACf,IAAA,uDAA6B,EAC3B,OAAO;YACP,sFAAsF;YACtF,sEAAsE;YACtE,CAAC,GAAG,MAAM,EAAE,WAAW,CAAC,EACxB,eAAe,CAChB,EACD,GAAG,EAAE,CAAC,KAAK,CACZ,CACF,CAAC;SACH;KACF;IAED,MAAM,cAAc,GAAG,MAAM,gCAAc,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IAEvE,wDAAwD;IACxD,MAAM,IAAA,mBAAW,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAE3C,MAAM,eAAe,GAAG,IAAI,0CAAe,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAE9E,oCAAoC;IACpC,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,OAAO,eAAe,CAAC;KACxB;IAED,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,cAAc,CAAC;IAE/D,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;IAEjD,iEAAiE;IACjE,IAAI,mBAAmB,CAAC,OAAO,EAAE;QAC/B,MAAM,QAAQ,GAAG,IAAA,uCAAoB,EAAC,QAAQ,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACrF,MAAM,IAAA,mBAAW,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;KACpD;IAED,2BAA2B;IAC3B,IAAI,gBAAgB,EAAE;QACpB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,wCAAiB,EAC3D,YAAY,EACZ,eAAe,EACf,OAAO,CACR,CAAC;QACF,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC7B;QACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC9B;QAED,eAAe,CAAC,aAAa,CAAC,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACjE;IAED,cAAc;IACd,IAAI,MAAM,EAAE;QACV,8FAA8F;QAC9F,kGAAkG;QAClG,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAA,wBAAU,EAAC,MAAM,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;KACnF;IAED,4CAA4C;IAC5C,IAAI,OAAO,CAAC,KAAK,EAAE;QACjB,eAAe,CAAC,aAAa,CAAC,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;KAChF;IAED,+CAA+C;IAC/C,IAAI,OAAO,CAAC,eAAe,EAAE;QAC3B,eAAe,CAAC,aAAa,CAC3B,sBAAsB,EACtB,MAAM,IAAA,mCAAe,EAAC,QAAQ,EAAE,aAAa,CAAC,CAC/C,CAAC;KACH;IAED,sDAAsD;IACtD,IAAI,aAAa,EAAE;QACjB,IAAI;YACF,MAAM,mBAAmB,GAAG,MAAM,IAAA,mDAAkC,EAClE,aAAa,EACb,aAAa,EACb,OAAO,CAAC,QAAQ,IAAI,GAAG,EACvB,eAAe,CAAC,WAAW,EAC3B,eAAe,CAAC,UAAU,CAC3B,CAAC;YACF,eAAe,CAAC,aAAa,CAAC,WAAW,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YACzE,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;SACpE;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;YAE1E,OAAO,eAAe,CAAC;SACxB;KACF;IAED,6DAA6D;IAC7D,IAAI,sBAAsB,CAAC;IAC3B,IAAI,mBAAmB,CAAC,OAAO,IAAI,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE;QACpE,sBAAsB,GAAG,MAAM,IAAA,uCAA+B,EAAC,eAAe,CAAC,WAAW,CAAC,CAAC;KAC7F;IACD,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,sBAAsB,CAAC,CAAC;IAEvE,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACxE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAEjG,OAAO,eAAe,CAAC;AACzB,CAAC;AA/KD,oCA+KC","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 } from '@angular-devkit/architect';\nimport { SourceFileCache } from '../../tools/esbuild/angular/compiler-plugin';\nimport {\n  createBrowserCodeBundleOptions,\n  createServerCodeBundleOptions,\n} from '../../tools/esbuild/application-code-bundle';\nimport { BundlerContext } from '../../tools/esbuild/bundler-context';\nimport { ExecutionResult, RebuildState } from '../../tools/esbuild/bundler-execution-result';\nimport { checkCommonJSModules } from '../../tools/esbuild/commonjs-checker';\nimport { createGlobalScriptsBundleOptions } from '../../tools/esbuild/global-scripts';\nimport { createGlobalStylesBundleOptions } from '../../tools/esbuild/global-styles';\nimport { generateIndexHtml } from '../../tools/esbuild/index-html-generator';\nimport { extractLicenses } from '../../tools/esbuild/license-extractor';\nimport {\n  calculateEstimatedTransferSizes,\n  logBuildStats,\n  logMessages,\n  transformSupportedBrowsersToTargets,\n} from '../../tools/esbuild/utils';\nimport { copyAssets } from '../../utils/copy-assets';\nimport { augmentAppWithServiceWorkerEsbuild } from '../../utils/service-worker';\nimport { getSupportedBrowsers } from '../../utils/supported-browsers';\nimport { NormalizedApplicationBuildOptions } from './options';\n\nexport async function executeBuild(\n  options: NormalizedApplicationBuildOptions,\n  context: BuilderContext,\n  rebuildState?: RebuildState,\n): Promise<ExecutionResult> {\n  const startTime = process.hrtime.bigint();\n\n  const {\n    projectRoot,\n    workspaceRoot,\n    serviceWorker,\n    optimizationOptions,\n    serverEntryPoint,\n    assets,\n    indexHtmlOptions,\n    cacheOptions,\n  } = options;\n\n  const browsers = getSupportedBrowsers(projectRoot, context.logger);\n  const target = transformSupportedBrowsersToTargets(browsers);\n\n  // Reuse rebuild state or create new bundle contexts for code and global stylesheets\n  let bundlerContexts = rebuildState?.rebuildContexts;\n  const codeBundleCache =\n    rebuildState?.codeBundleCache ??\n    new SourceFileCache(cacheOptions.enabled ? cacheOptions.path : undefined);\n  if (bundlerContexts === undefined) {\n    bundlerContexts = [];\n\n    // Browser application code\n    bundlerContexts.push(\n      new BundlerContext(\n        workspaceRoot,\n        !!options.watch,\n        createBrowserCodeBundleOptions(options, target, codeBundleCache),\n      ),\n    );\n\n    // Global Stylesheets\n    if (options.globalStyles.length > 0) {\n      for (const initial of [true, false]) {\n        const bundleOptions = createGlobalStylesBundleOptions(\n          options,\n          target,\n          initial,\n          codeBundleCache?.loadResultCache,\n        );\n        if (bundleOptions) {\n          bundlerContexts.push(\n            new BundlerContext(workspaceRoot, !!options.watch, bundleOptions, () => initial),\n          );\n        }\n      }\n    }\n\n    // Global Scripts\n    if (options.globalScripts.length > 0) {\n      for (const initial of [true, false]) {\n        const bundleOptions = createGlobalScriptsBundleOptions(options, initial);\n        if (bundleOptions) {\n          bundlerContexts.push(\n            new BundlerContext(workspaceRoot, !!options.watch, bundleOptions, () => initial),\n          );\n        }\n      }\n    }\n\n    // Server application code\n    if (serverEntryPoint) {\n      bundlerContexts.push(\n        new BundlerContext(\n          workspaceRoot,\n          !!options.watch,\n          createServerCodeBundleOptions(\n            options,\n            // NOTE: earlier versions of Node.js are not supported due to unsafe promise patching.\n            // See: https://github.com/angular/angular/pull/50552#issue-1737967592\n            [...target, 'node18.13'],\n            codeBundleCache,\n          ),\n          () => false,\n        ),\n      );\n    }\n  }\n\n  const bundlingResult = await BundlerContext.bundleAll(bundlerContexts);\n\n  // Log all warnings and errors generated during bundling\n  await logMessages(context, bundlingResult);\n\n  const executionResult = new ExecutionResult(bundlerContexts, codeBundleCache);\n\n  // Return if the bundling has errors\n  if (bundlingResult.errors) {\n    return executionResult;\n  }\n\n  const { metafile, initialFiles, outputFiles } = bundlingResult;\n\n  executionResult.outputFiles.push(...outputFiles);\n\n  // Check metafile for CommonJS module usage if optimizing scripts\n  if (optimizationOptions.scripts) {\n    const messages = checkCommonJSModules(metafile, options.allowedCommonJsDependencies);\n    await logMessages(context, { warnings: messages });\n  }\n\n  // Generate index HTML file\n  if (indexHtmlOptions) {\n    const { errors, warnings, content } = await generateIndexHtml(\n      initialFiles,\n      executionResult,\n      options,\n    );\n    for (const error of errors) {\n      context.logger.error(error);\n    }\n    for (const warning of warnings) {\n      context.logger.warn(warning);\n    }\n\n    executionResult.addOutputFile(indexHtmlOptions.output, content);\n  }\n\n  // Copy assets\n  if (assets) {\n    // The webpack copy assets helper is used with no base paths defined. This prevents the helper\n    // from directly writing to disk. This should eventually be replaced with a more optimized helper.\n    executionResult.assetFiles.push(...(await copyAssets(assets, [], workspaceRoot)));\n  }\n\n  // Write metafile if stats option is enabled\n  if (options.stats) {\n    executionResult.addOutputFile('stats.json', JSON.stringify(metafile, null, 2));\n  }\n\n  // Extract and write licenses for used packages\n  if (options.extractLicenses) {\n    executionResult.addOutputFile(\n      '3rdpartylicenses.txt',\n      await extractLicenses(metafile, workspaceRoot),\n    );\n  }\n\n  // Augment the application with service worker support\n  if (serviceWorker) {\n    try {\n      const serviceWorkerResult = await augmentAppWithServiceWorkerEsbuild(\n        workspaceRoot,\n        serviceWorker,\n        options.baseHref || '/',\n        executionResult.outputFiles,\n        executionResult.assetFiles,\n      );\n      executionResult.addOutputFile('ngsw.json', serviceWorkerResult.manifest);\n      executionResult.assetFiles.push(...serviceWorkerResult.assetFiles);\n    } catch (error) {\n      context.logger.error(error instanceof Error ? error.message : `${error}`);\n\n      return executionResult;\n    }\n  }\n\n  // Calculate estimated transfer size if scripts are optimized\n  let estimatedTransferSizes;\n  if (optimizationOptions.scripts || optimizationOptions.styles.minify) {\n    estimatedTransferSizes = await calculateEstimatedTransferSizes(executionResult.outputFiles);\n  }\n  logBuildStats(context, metafile, initialFiles, estimatedTransferSizes);\n\n  const buildTime = Number(process.hrtime.bigint() - startTime) / 10 ** 9;\n  context.logger.info(`Application bundle generation complete. [${buildTime.toFixed(3)} seconds]`);\n\n  return executionResult;\n}\n"]}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google LLC All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.io/license
|
|
7
|
+
*/
|
|
8
|
+
import { BuilderContext, BuilderOutput } from '@angular-devkit/architect';
|
|
9
|
+
import type { OutputFile } from 'esbuild';
|
|
10
|
+
import { ApplicationBuilderInternalOptions } from './options';
|
|
11
|
+
import { Schema as ApplicationBuilderOptions } from './schema';
|
|
12
|
+
export declare function buildApplicationInternal(options: ApplicationBuilderInternalOptions, context: BuilderContext, infrastructureSettings?: {
|
|
13
|
+
write?: boolean;
|
|
14
|
+
}): AsyncIterable<BuilderOutput & {
|
|
15
|
+
outputFiles?: OutputFile[];
|
|
16
|
+
assetFiles?: {
|
|
17
|
+
source: string;
|
|
18
|
+
destination: string;
|
|
19
|
+
}[];
|
|
20
|
+
}>;
|
|
21
|
+
export declare function buildApplication(options: ApplicationBuilderOptions, context: BuilderContext): AsyncIterable<BuilderOutput & {
|
|
22
|
+
outputFiles?: OutputFile[];
|
|
23
|
+
assetFiles?: {
|
|
24
|
+
source: string;
|
|
25
|
+
destination: string;
|
|
26
|
+
}[];
|
|
27
|
+
}>;
|
|
28
|
+
declare const _default: import("../../../../architect/src/internal").Builder<ApplicationBuilderOptions & import("../../../../core/src").JsonObject>;
|
|
29
|
+
export default _default;
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.io/license
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.buildApplication = exports.buildApplicationInternal = void 0;
|
|
11
|
+
const architect_1 = require("@angular-devkit/architect");
|
|
12
|
+
const purge_cache_1 = require("../../utils/purge-cache");
|
|
13
|
+
const version_1 = require("../../utils/version");
|
|
14
|
+
const build_action_1 = require("./build-action");
|
|
15
|
+
const execute_build_1 = require("./execute-build");
|
|
16
|
+
const options_1 = require("./options");
|
|
17
|
+
async function* buildApplicationInternal(options, context, infrastructureSettings) {
|
|
18
|
+
// Check Angular version.
|
|
19
|
+
(0, version_1.assertCompatibleAngularVersion)(context.workspaceRoot);
|
|
20
|
+
// Purge old build disk cache.
|
|
21
|
+
await (0, purge_cache_1.purgeStaleBuildCache)(context);
|
|
22
|
+
// Determine project name from builder context target
|
|
23
|
+
const projectName = context.target?.project;
|
|
24
|
+
if (!projectName) {
|
|
25
|
+
context.logger.error(`The 'application' builder requires a target to be specified.`);
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
const normalizedOptions = await (0, options_1.normalizeOptions)(context, projectName, options);
|
|
29
|
+
yield* (0, build_action_1.runEsBuildBuildAction)((rebuildState) => (0, execute_build_1.executeBuild)(normalizedOptions, context, rebuildState), {
|
|
30
|
+
watch: normalizedOptions.watch,
|
|
31
|
+
poll: normalizedOptions.poll,
|
|
32
|
+
deleteOutputPath: normalizedOptions.deleteOutputPath,
|
|
33
|
+
cacheOptions: normalizedOptions.cacheOptions,
|
|
34
|
+
outputPath: normalizedOptions.outputPath,
|
|
35
|
+
verbose: normalizedOptions.verbose,
|
|
36
|
+
projectRoot: normalizedOptions.projectRoot,
|
|
37
|
+
workspaceRoot: normalizedOptions.workspaceRoot,
|
|
38
|
+
progress: normalizedOptions.progress,
|
|
39
|
+
writeToFileSystem: infrastructureSettings?.write,
|
|
40
|
+
logger: context.logger,
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
exports.buildApplicationInternal = buildApplicationInternal;
|
|
44
|
+
function buildApplication(options, context) {
|
|
45
|
+
context.logger.warn('The application builder is currently in developer preview and is not yet recommended for production use.');
|
|
46
|
+
return buildApplicationInternal(options, context);
|
|
47
|
+
}
|
|
48
|
+
exports.buildApplication = buildApplication;
|
|
49
|
+
exports.default = (0, architect_1.createBuilder)(buildApplication);
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hbmd1bGFyX2RldmtpdC9idWlsZF9hbmd1bGFyL3NyYy9idWlsZGVycy9hcHBsaWNhdGlvbi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7OztHQU1HOzs7QUFFSCx5REFBeUY7QUFFekYseURBQStEO0FBQy9ELGlEQUFxRTtBQUNyRSxpREFBdUQ7QUFDdkQsbURBQStDO0FBQy9DLHVDQUFnRjtBQUd6RSxLQUFLLFNBQVMsQ0FBQyxDQUFDLHdCQUF3QixDQUM3QyxPQUEwQyxFQUMxQyxPQUF1QixFQUN2QixzQkFFQztJQU9ELHlCQUF5QjtJQUN6QixJQUFBLHdDQUE4QixFQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUV0RCw4QkFBOEI7SUFDOUIsTUFBTSxJQUFBLGtDQUFvQixFQUFDLE9BQU8sQ0FBQyxDQUFDO0lBRXBDLHFEQUFxRDtJQUNyRCxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsTUFBTSxFQUFFLE9BQU8sQ0FBQztJQUM1QyxJQUFJLENBQUMsV0FBVyxFQUFFO1FBQ2hCLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLDhEQUE4RCxDQUFDLENBQUM7UUFFckYsT0FBTztLQUNSO0lBRUQsTUFBTSxpQkFBaUIsR0FBRyxNQUFNLElBQUEsMEJBQWdCLEVBQUMsT0FBTyxFQUFFLFdBQVcsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNoRixLQUFLLENBQUMsQ0FBQyxJQUFBLG9DQUFxQixFQUMxQixDQUFDLFlBQVksRUFBRSxFQUFFLENBQUMsSUFBQSw0QkFBWSxFQUFDLGlCQUFpQixFQUFFLE9BQU8sRUFBRSxZQUFZLENBQUMsRUFDeEU7UUFDRSxLQUFLLEVBQUUsaUJBQWlCLENBQUMsS0FBSztRQUM5QixJQUFJLEVBQUUsaUJBQWlCLENBQUMsSUFBSTtRQUM1QixnQkFBZ0IsRUFBRSxpQkFBaUIsQ0FBQyxnQkFBZ0I7UUFDcEQsWUFBWSxFQUFFLGlCQUFpQixDQUFDLFlBQVk7UUFDNUMsVUFBVSxFQUFFLGlCQUFpQixDQUFDLFVBQVU7UUFDeEMsT0FBTyxFQUFFLGlCQUFpQixDQUFDLE9BQU87UUFDbEMsV0FBVyxFQUFFLGlCQUFpQixDQUFDLFdBQVc7UUFDMUMsYUFBYSxFQUFFLGlCQUFpQixDQUFDLGFBQWE7UUFDOUMsUUFBUSxFQUFFLGlCQUFpQixDQUFDLFFBQVE7UUFDcEMsaUJBQWlCLEVBQUUsc0JBQXNCLEVBQUUsS0FBSztRQUNoRCxNQUFNLEVBQUUsT0FBTyxDQUFDLE1BQU07S0FDdkIsQ0FDRixDQUFDO0FBQ0osQ0FBQztBQTNDRCw0REEyQ0M7QUFFRCxTQUFnQixnQkFBZ0IsQ0FDOUIsT0FBa0MsRUFDbEMsT0FBdUI7SUFPdkIsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQ2pCLDBHQUEwRyxDQUMzRyxDQUFDO0lBRUYsT0FBTyx3QkFBd0IsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7QUFDcEQsQ0FBQztBQWRELDRDQWNDO0FBRUQsa0JBQWUsSUFBQSx5QkFBYSxFQUFDLGdCQUFnQixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIEBsaWNlbnNlXG4gKiBDb3B5cmlnaHQgR29vZ2xlIExMQyBBbGwgUmlnaHRzIFJlc2VydmVkLlxuICpcbiAqIFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGFuIE1JVC1zdHlsZSBsaWNlbnNlIHRoYXQgY2FuIGJlXG4gKiBmb3VuZCBpbiB0aGUgTElDRU5TRSBmaWxlIGF0IGh0dHBzOi8vYW5ndWxhci5pby9saWNlbnNlXG4gKi9cblxuaW1wb3J0IHsgQnVpbGRlckNvbnRleHQsIEJ1aWxkZXJPdXRwdXQsIGNyZWF0ZUJ1aWxkZXIgfSBmcm9tICdAYW5ndWxhci1kZXZraXQvYXJjaGl0ZWN0JztcbmltcG9ydCB0eXBlIHsgT3V0cHV0RmlsZSB9IGZyb20gJ2VzYnVpbGQnO1xuaW1wb3J0IHsgcHVyZ2VTdGFsZUJ1aWxkQ2FjaGUgfSBmcm9tICcuLi8uLi91dGlscy9wdXJnZS1jYWNoZSc7XG5pbXBvcnQgeyBhc3NlcnRDb21wYXRpYmxlQW5ndWxhclZlcnNpb24gfSBmcm9tICcuLi8uLi91dGlscy92ZXJzaW9uJztcbmltcG9ydCB7IHJ1bkVzQnVpbGRCdWlsZEFjdGlvbiB9IGZyb20gJy4vYnVpbGQtYWN0aW9uJztcbmltcG9ydCB7IGV4ZWN1dGVCdWlsZCB9IGZyb20gJy4vZXhlY3V0ZS1idWlsZCc7XG5pbXBvcnQgeyBBcHBsaWNhdGlvbkJ1aWxkZXJJbnRlcm5hbE9wdGlvbnMsIG5vcm1hbGl6ZU9wdGlvbnMgfSBmcm9tICcuL29wdGlvbnMnO1xuaW1wb3J0IHsgU2NoZW1hIGFzIEFwcGxpY2F0aW9uQnVpbGRlck9wdGlvbnMgfSBmcm9tICcuL3NjaGVtYSc7XG5cbmV4cG9ydCBhc3luYyBmdW5jdGlvbiogYnVpbGRBcHBsaWNhdGlvbkludGVybmFsKFxuICBvcHRpb25zOiBBcHBsaWNhdGlvbkJ1aWxkZXJJbnRlcm5hbE9wdGlvbnMsXG4gIGNvbnRleHQ6IEJ1aWxkZXJDb250ZXh0LFxuICBpbmZyYXN0cnVjdHVyZVNldHRpbmdzPzoge1xuICAgIHdyaXRlPzogYm9vbGVhbjtcbiAgfSxcbik6IEFzeW5jSXRlcmFibGU8XG4gIEJ1aWxkZXJPdXRwdXQgJiB7XG4gICAgb3V0cHV0RmlsZXM/OiBPdXRwdXRGaWxlW107XG4gICAgYXNzZXRGaWxlcz86IHsgc291cmNlOiBzdHJpbmc7IGRlc3RpbmF0aW9uOiBzdHJpbmcgfVtdO1xuICB9XG4+IHtcbiAgLy8gQ2hlY2sgQW5ndWxhciB2ZXJzaW9uLlxuICBhc3NlcnRDb21wYXRpYmxlQW5ndWxhclZlcnNpb24oY29udGV4dC53b3Jrc3BhY2VSb290KTtcblxuICAvLyBQdXJnZSBvbGQgYnVpbGQgZGlzayBjYWNoZS5cbiAgYXdhaXQgcHVyZ2VTdGFsZUJ1aWxkQ2FjaGUoY29udGV4dCk7XG5cbiAgLy8gRGV0ZXJtaW5lIHByb2plY3QgbmFtZSBmcm9tIGJ1aWxkZXIgY29udGV4dCB0YXJnZXRcbiAgY29uc3QgcHJvamVjdE5hbWUgPSBjb250ZXh0LnRhcmdldD8ucHJvamVjdDtcbiAgaWYgKCFwcm9qZWN0TmFtZSkge1xuICAgIGNvbnRleHQubG9nZ2VyLmVycm9yKGBUaGUgJ2FwcGxpY2F0aW9uJyBidWlsZGVyIHJlcXVpcmVzIGEgdGFyZ2V0IHRvIGJlIHNwZWNpZmllZC5gKTtcblxuICAgIHJldHVybjtcbiAgfVxuXG4gIGNvbnN0IG5vcm1hbGl6ZWRPcHRpb25zID0gYXdhaXQgbm9ybWFsaXplT3B0aW9ucyhjb250ZXh0LCBwcm9qZWN0TmFtZSwgb3B0aW9ucyk7XG4gIHlpZWxkKiBydW5Fc0J1aWxkQnVpbGRBY3Rpb24oXG4gICAgKHJlYnVpbGRTdGF0ZSkgPT4gZXhlY3V0ZUJ1aWxkKG5vcm1hbGl6ZWRPcHRpb25zLCBjb250ZXh0LCByZWJ1aWxkU3RhdGUpLFxuICAgIHtcbiAgICAgIHdhdGNoOiBub3JtYWxpemVkT3B0aW9ucy53YXRjaCxcbiAgICAgIHBvbGw6IG5vcm1hbGl6ZWRPcHRpb25zLnBvbGwsXG4gICAgICBkZWxldGVPdXRwdXRQYXRoOiBub3JtYWxpemVkT3B0aW9ucy5kZWxldGVPdXRwdXRQYXRoLFxuICAgICAgY2FjaGVPcHRpb25zOiBub3JtYWxpemVkT3B0aW9ucy5jYWNoZU9wdGlvbnMsXG4gICAgICBvdXRwdXRQYXRoOiBub3JtYWxpemVkT3B0aW9ucy5vdXRwdXRQYXRoLFxuICAgICAgdmVyYm9zZTogbm9ybWFsaXplZE9wdGlvbnMudmVyYm9zZSxcbiAgICAgIHByb2plY3RSb290OiBub3JtYWxpemVkT3B0aW9ucy5wcm9qZWN0Um9vdCxcbiAgICAgIHdvcmtzcGFjZVJvb3Q6IG5vcm1hbGl6ZWRPcHRpb25zLndvcmtzcGFjZVJvb3QsXG4gICAgICBwcm9ncmVzczogbm9ybWFsaXplZE9wdGlvbnMucHJvZ3Jlc3MsXG4gICAgICB3cml0ZVRvRmlsZVN5c3RlbTogaW5mcmFzdHJ1Y3R1cmVTZXR0aW5ncz8ud3JpdGUsXG4gICAgICBsb2dnZXI6IGNvbnRleHQubG9nZ2VyLFxuICAgIH0sXG4gICk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBidWlsZEFwcGxpY2F0aW9uKFxuICBvcHRpb25zOiBBcHBsaWNhdGlvbkJ1aWxkZXJPcHRpb25zLFxuICBjb250ZXh0OiBCdWlsZGVyQ29udGV4dCxcbik6IEFzeW5jSXRlcmFibGU8XG4gIEJ1aWxkZXJPdXRwdXQgJiB7XG4gICAgb3V0cHV0RmlsZXM/OiBPdXRwdXRGaWxlW107XG4gICAgYXNzZXRGaWxlcz86IHsgc291cmNlOiBzdHJpbmc7IGRlc3RpbmF0aW9uOiBzdHJpbmcgfVtdO1xuICB9XG4+IHtcbiAgY29udGV4dC5sb2dnZXIud2FybihcbiAgICAnVGhlIGFwcGxpY2F0aW9uIGJ1aWxkZXIgaXMgY3VycmVudGx5IGluIGRldmVsb3BlciBwcmV2aWV3IGFuZCBpcyBub3QgeWV0IHJlY29tbWVuZGVkIGZvciBwcm9kdWN0aW9uIHVzZS4nLFxuICApO1xuXG4gIHJldHVybiBidWlsZEFwcGxpY2F0aW9uSW50ZXJuYWwob3B0aW9ucywgY29udGV4dCk7XG59XG5cbmV4cG9ydCBkZWZhdWx0IGNyZWF0ZUJ1aWxkZXIoYnVpbGRBcHBsaWNhdGlvbik7XG4iXX0=
|