@angular-devkit/build-angular 14.0.0-next.1 → 14.0.0-next.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -10
- package/builders.json +5 -0
- package/package.json +33 -34
- package/src/babel/plugins/pure-toplevel-functions.js +5 -1
- package/src/babel/presets/application.js +5 -1
- package/src/babel/webpack-loader.d.ts +1 -0
- package/src/babel/webpack-loader.js +2 -0
- package/src/builders/app-shell/index.js +8 -4
- package/src/builders/app-shell/schema.d.ts +2 -2
- package/src/builders/app-shell/schema.json +2 -2
- package/src/builders/browser/index.d.ts +2 -3
- package/src/builders/browser/index.js +13 -10
- package/src/builders/browser/schema.d.ts +0 -1
- package/src/builders/browser/schema.json +2 -3
- package/src/builders/browser-esbuild/compiler-plugin.d.ts +14 -0
- package/src/builders/browser-esbuild/compiler-plugin.js +338 -0
- package/src/builders/browser-esbuild/esbuild.d.ts +34 -0
- package/src/builders/browser-esbuild/esbuild.js +59 -0
- package/src/builders/browser-esbuild/experimental-warnings.d.ts +10 -0
- package/src/builders/browser-esbuild/experimental-warnings.js +65 -0
- package/src/builders/browser-esbuild/index.d.ts +19 -0
- package/src/builders/browser-esbuild/index.js +258 -0
- package/src/builders/browser-esbuild/options.d.ts +34 -0
- package/src/builders/browser-esbuild/options.js +87 -0
- package/src/builders/browser-esbuild/stylesheets.d.ts +52 -0
- package/src/builders/browser-esbuild/stylesheets.js +118 -0
- package/src/builders/dev-server/index.d.ts +1 -1
- package/src/builders/dev-server/index.js +5 -1
- package/src/builders/dev-server/schema.d.ts +1 -1
- package/src/builders/dev-server/schema.json +1 -1
- package/src/builders/extract-i18n/index.d.ts +1 -1
- package/src/builders/extract-i18n/index.js +5 -1
- package/src/builders/extract-i18n/ivy-extract-loader.js +5 -1
- package/src/builders/karma/find-tests.js +5 -1
- package/src/builders/karma/index.d.ts +1 -1
- package/src/builders/karma/index.js +10 -6
- package/src/builders/ng-packagr/index.js +5 -1
- package/src/builders/protractor/index.d.ts +2 -1
- package/src/builders/protractor/index.js +5 -1
- package/src/builders/server/index.d.ts +2 -3
- package/src/builders/server/index.js +5 -1
- package/src/builders/server/schema.json +1 -2
- package/src/index.js +5 -1
- package/src/typings.d.ts +0 -4
- package/src/utils/check-port.js +8 -4
- package/src/utils/color.js +5 -1
- package/src/utils/copy-assets.js +5 -1
- package/src/utils/delete-output-dir.js +6 -9
- package/src/utils/environment-options.d.ts +0 -1
- package/src/utils/environment-options.js +1 -13
- package/src/utils/i18n-inlining.js +5 -1
- package/src/utils/i18n-options.js +1 -8
- package/src/utils/index-file/html-rewriting-stream.js +5 -1
- package/src/utils/index-file/index-html-generator.js +5 -1
- package/src/utils/index-file/inline-critical-css.js +5 -1
- package/src/utils/index-file/inline-fonts.js +5 -1
- package/src/utils/index.js +5 -1
- package/src/utils/load-translations.js +5 -1
- package/src/utils/normalize-asset-patterns.d.ts +2 -2
- package/src/utils/normalize-asset-patterns.js +34 -10
- package/src/utils/normalize-builder-schema.d.ts +2 -2
- package/src/utils/normalize-builder-schema.js +5 -6
- package/src/utils/normalize-cache.js +0 -4
- package/src/utils/normalize-file-replacements.d.ts +4 -4
- package/src/utils/normalize-file-replacements.js +38 -18
- package/src/utils/process-bundle.js +6 -2
- package/src/utils/purge-cache.js +3 -8
- package/src/utils/read-tsconfig.js +5 -1
- package/src/utils/service-worker.d.ts +1 -2
- package/src/utils/service-worker.js +14 -12
- package/src/utils/webpack-browser-config.js +14 -12
- package/src/webpack/configs/analytics.js +1 -4
- package/src/webpack/configs/common.js +10 -12
- package/src/webpack/configs/dev-server.js +6 -2
- package/src/webpack/configs/index.js +5 -1
- package/src/webpack/configs/styles.d.ts +6 -0
- package/src/webpack/configs/styles.js +16 -22
- package/src/webpack/plugins/analytics.d.ts +1 -2
- package/src/webpack/plugins/analytics.js +1 -3
- package/src/webpack/plugins/any-component-style-budget-checker.js +5 -1
- package/src/webpack/plugins/common-js-usage-warn-plugin.js +2 -2
- package/src/webpack/plugins/css-optimizer-plugin.js +7 -3
- package/src/webpack/plugins/esbuild-executor.d.ts +2 -2
- package/src/webpack/plugins/esbuild-executor.js +11 -17
- package/src/webpack/plugins/javascript-optimizer-plugin.js +8 -4
- package/src/webpack/plugins/json-stats-plugin.js +5 -1
- package/src/webpack/plugins/karma/karma.js +11 -27
- package/src/webpack/plugins/named-chunks-plugin.js +9 -0
- package/src/webpack/plugins/postcss-cli-resources.js +7 -3
- package/src/webpack/plugins/scripts-webpack-plugin.js +5 -1
- package/src/webpack/plugins/transfer-size-plugin.js +3 -2
- package/src/webpack/plugins/typescript.js +1 -2
- package/src/webpack/utils/helpers.js +5 -1
- package/src/webpack/utils/stats.js +5 -1
- package/esbuild-check.js +0 -16
|
@@ -0,0 +1,258 @@
|
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
33
|
+
exports.execute = void 0;
|
|
34
|
+
const architect_1 = require("@angular-devkit/architect");
|
|
35
|
+
const assert = __importStar(require("assert"));
|
|
36
|
+
const fs_1 = require("fs");
|
|
37
|
+
const path = __importStar(require("path"));
|
|
38
|
+
const utils_1 = require("../../utils");
|
|
39
|
+
const copy_assets_1 = require("../../utils/copy-assets");
|
|
40
|
+
const index_html_generator_1 = require("../../utils/index-file/index-html-generator");
|
|
41
|
+
const package_chunk_sort_1 = require("../../utils/package-chunk-sort");
|
|
42
|
+
const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
|
|
43
|
+
const configs_1 = require("../../webpack/configs");
|
|
44
|
+
const compiler_plugin_1 = require("./compiler-plugin");
|
|
45
|
+
const esbuild_1 = require("./esbuild");
|
|
46
|
+
const experimental_warnings_1 = require("./experimental-warnings");
|
|
47
|
+
const options_1 = require("./options");
|
|
48
|
+
const stylesheets_1 = require("./stylesheets");
|
|
49
|
+
/**
|
|
50
|
+
* Main execution function for the esbuild-based application builder.
|
|
51
|
+
* The options are compatible with the Webpack-based builder.
|
|
52
|
+
* @param options The browser builder options to use when setting up the application build
|
|
53
|
+
* @param context The Architect builder context object
|
|
54
|
+
* @returns A promise with the builder result output
|
|
55
|
+
*/
|
|
56
|
+
// eslint-disable-next-line max-lines-per-function
|
|
57
|
+
async function execute(options, context) {
|
|
58
|
+
var _a, _b, _c, _d, _e, _f;
|
|
59
|
+
const startTime = Date.now();
|
|
60
|
+
// Only AOT is currently supported
|
|
61
|
+
if (options.aot !== true) {
|
|
62
|
+
context.logger.error('JIT mode is currently not supported by this experimental builder. AOT mode must be used.');
|
|
63
|
+
return { success: false };
|
|
64
|
+
}
|
|
65
|
+
// Inform user of experimental status of builder and options
|
|
66
|
+
(0, experimental_warnings_1.logExperimentalWarnings)(options, context);
|
|
67
|
+
// Determine project name from builder context target
|
|
68
|
+
const projectName = (_a = context.target) === null || _a === void 0 ? void 0 : _a.project;
|
|
69
|
+
if (!projectName) {
|
|
70
|
+
context.logger.error(`The 'browser-esbuild' builder requires a target to be specified.`);
|
|
71
|
+
return { success: false };
|
|
72
|
+
}
|
|
73
|
+
const { workspaceRoot, mainEntryPoint, polyfillsEntryPoint, optimizationOptions, outputPath, sourcemapOptions, tsconfig, assets, outputNames, } = await (0, options_1.normalizeOptions)(context, projectName, options);
|
|
74
|
+
// Clean output path if enabled
|
|
75
|
+
if (options.deleteOutputPath) {
|
|
76
|
+
(0, utils_1.deleteOutputDir)(workspaceRoot, options.outputPath);
|
|
77
|
+
}
|
|
78
|
+
// Setup bundler entry points
|
|
79
|
+
const entryPoints = {
|
|
80
|
+
main: mainEntryPoint,
|
|
81
|
+
};
|
|
82
|
+
if (polyfillsEntryPoint) {
|
|
83
|
+
entryPoints['polyfills'] = polyfillsEntryPoint;
|
|
84
|
+
}
|
|
85
|
+
// Create reverse lookup used during index HTML generation
|
|
86
|
+
const entryPointNameLookup = new Map(Object.entries(entryPoints).map(([name, filePath]) => [path.relative(workspaceRoot, filePath), name]));
|
|
87
|
+
// Execute esbuild
|
|
88
|
+
const result = await bundleCode(workspaceRoot, entryPoints, outputNames, options, optimizationOptions, sourcemapOptions, tsconfig);
|
|
89
|
+
// Log all warnings and errors generated during bundling
|
|
90
|
+
await (0, esbuild_1.logMessages)(context, result);
|
|
91
|
+
// Return if the bundling failed to generate output files or there are errors
|
|
92
|
+
if (!result.outputFiles || result.errors.length) {
|
|
93
|
+
return { success: false };
|
|
94
|
+
}
|
|
95
|
+
// Structure the bundling output files
|
|
96
|
+
const initialFiles = [];
|
|
97
|
+
const outputFiles = [];
|
|
98
|
+
for (const outputFile of result.outputFiles) {
|
|
99
|
+
// Entries in the metafile are relative to the `absWorkingDir` option which is set to the workspaceRoot
|
|
100
|
+
const relativeFilePath = path.relative(workspaceRoot, outputFile.path);
|
|
101
|
+
const entryPoint = (_c = (_b = result.metafile) === null || _b === void 0 ? void 0 : _b.outputs[relativeFilePath]) === null || _c === void 0 ? void 0 : _c.entryPoint;
|
|
102
|
+
if (entryPoint) {
|
|
103
|
+
// An entryPoint value indicates an initial file
|
|
104
|
+
initialFiles.push({
|
|
105
|
+
// Remove leading directory separator
|
|
106
|
+
file: outputFile.path.slice(1),
|
|
107
|
+
name: (_d = entryPointNameLookup.get(entryPoint)) !== null && _d !== void 0 ? _d : '',
|
|
108
|
+
extension: path.extname(outputFile.path),
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
outputFiles.push(outputFile);
|
|
112
|
+
}
|
|
113
|
+
// Create output directory if needed
|
|
114
|
+
try {
|
|
115
|
+
await fs_1.promises.mkdir(outputPath, { recursive: true });
|
|
116
|
+
}
|
|
117
|
+
catch (e) {
|
|
118
|
+
const reason = 'message' in e ? e.message : 'Unknown error';
|
|
119
|
+
context.logger.error('Unable to create output directory: ' + reason);
|
|
120
|
+
return { success: false };
|
|
121
|
+
}
|
|
122
|
+
// Process global stylesheets
|
|
123
|
+
if (options.styles) {
|
|
124
|
+
// resolveGlobalStyles is temporarily reused from the Webpack builder code
|
|
125
|
+
const { entryPoints: stylesheetEntrypoints, noInjectNames } = (0, configs_1.resolveGlobalStyles)(options.styles, workspaceRoot, !!options.preserveSymlinks);
|
|
126
|
+
for (const [name, files] of Object.entries(stylesheetEntrypoints)) {
|
|
127
|
+
const virtualEntryData = files.map((file) => `@import '${file}';`).join('\n');
|
|
128
|
+
const sheetResult = await (0, stylesheets_1.bundleStylesheetText)(virtualEntryData, { virtualName: `angular:style/global;${name}`, resolvePath: workspaceRoot }, {
|
|
129
|
+
optimization: !!optimizationOptions.styles.minify,
|
|
130
|
+
sourcemap: !!sourcemapOptions.styles,
|
|
131
|
+
outputNames: noInjectNames.includes(name) ? { media: outputNames.media } : outputNames,
|
|
132
|
+
});
|
|
133
|
+
await (0, esbuild_1.logMessages)(context, sheetResult);
|
|
134
|
+
if (!sheetResult.path) {
|
|
135
|
+
// Failed to process the stylesheet
|
|
136
|
+
assert.ok(sheetResult.errors.length, `Global stylesheet processing for '${name}' failed with no errors.`);
|
|
137
|
+
return { success: false };
|
|
138
|
+
}
|
|
139
|
+
// The virtual stylesheets will be named `stdin` by esbuild. This must be replaced
|
|
140
|
+
// with the actual name of the global style and the leading directory separator must
|
|
141
|
+
// also be removed to make the path relative.
|
|
142
|
+
const sheetPath = sheetResult.path.replace('stdin', name).slice(1);
|
|
143
|
+
outputFiles.push(createOutputFileFromText(sheetPath, sheetResult.contents));
|
|
144
|
+
if (sheetResult.map) {
|
|
145
|
+
outputFiles.push(createOutputFileFromText(sheetPath + '.map', sheetResult.map));
|
|
146
|
+
}
|
|
147
|
+
if (!noInjectNames.includes(name)) {
|
|
148
|
+
initialFiles.push({
|
|
149
|
+
file: sheetPath,
|
|
150
|
+
name,
|
|
151
|
+
extension: '.css',
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
outputFiles.push(...sheetResult.resourceFiles);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
// Generate index HTML file
|
|
158
|
+
if (options.index) {
|
|
159
|
+
const entrypoints = (0, package_chunk_sort_1.generateEntryPoints)({
|
|
160
|
+
scripts: (_e = options.scripts) !== null && _e !== void 0 ? _e : [],
|
|
161
|
+
styles: (_f = options.styles) !== null && _f !== void 0 ? _f : [],
|
|
162
|
+
});
|
|
163
|
+
// Create an index HTML generator that reads from the in-memory output files
|
|
164
|
+
const indexHtmlGenerator = new index_html_generator_1.IndexHtmlGenerator({
|
|
165
|
+
indexPath: path.join(context.workspaceRoot, (0, webpack_browser_config_1.getIndexInputFile)(options.index)),
|
|
166
|
+
entrypoints,
|
|
167
|
+
sri: options.subresourceIntegrity,
|
|
168
|
+
optimization: optimizationOptions,
|
|
169
|
+
crossOrigin: options.crossOrigin,
|
|
170
|
+
});
|
|
171
|
+
indexHtmlGenerator.readAsset = async function (path) {
|
|
172
|
+
// Remove leading directory separator
|
|
173
|
+
path = path.slice(1);
|
|
174
|
+
const file = outputFiles.find((file) => file.path === path);
|
|
175
|
+
if (file) {
|
|
176
|
+
return file.text;
|
|
177
|
+
}
|
|
178
|
+
throw new Error(`Output file does not exist: ${path}`);
|
|
179
|
+
};
|
|
180
|
+
const { content, warnings, errors } = await indexHtmlGenerator.process({
|
|
181
|
+
baseHref: options.baseHref,
|
|
182
|
+
lang: undefined,
|
|
183
|
+
outputPath: '/',
|
|
184
|
+
files: initialFiles,
|
|
185
|
+
});
|
|
186
|
+
for (const error of errors) {
|
|
187
|
+
context.logger.error(error);
|
|
188
|
+
}
|
|
189
|
+
for (const warning of warnings) {
|
|
190
|
+
context.logger.warn(warning);
|
|
191
|
+
}
|
|
192
|
+
outputFiles.push(createOutputFileFromText((0, webpack_browser_config_1.getIndexOutputFile)(options.index), content));
|
|
193
|
+
}
|
|
194
|
+
// Copy assets
|
|
195
|
+
if (assets) {
|
|
196
|
+
await (0, copy_assets_1.copyAssets)(assets, [outputPath], workspaceRoot);
|
|
197
|
+
}
|
|
198
|
+
// Write output files
|
|
199
|
+
await Promise.all(outputFiles.map((file) => fs_1.promises.writeFile(path.join(outputPath, file.path), file.contents)));
|
|
200
|
+
context.logger.info(`Complete. [${(Date.now() - startTime) / 1000} seconds]`);
|
|
201
|
+
return { success: true };
|
|
202
|
+
}
|
|
203
|
+
exports.execute = execute;
|
|
204
|
+
function createOutputFileFromText(path, text) {
|
|
205
|
+
return {
|
|
206
|
+
path,
|
|
207
|
+
text,
|
|
208
|
+
get contents() {
|
|
209
|
+
return Buffer.from(this.text, 'utf-8');
|
|
210
|
+
},
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
async function bundleCode(workspaceRoot, entryPoints, outputNames, options, optimizationOptions, sourcemapOptions, tsconfig) {
|
|
214
|
+
return (0, esbuild_1.bundle)({
|
|
215
|
+
absWorkingDir: workspaceRoot,
|
|
216
|
+
bundle: true,
|
|
217
|
+
format: 'esm',
|
|
218
|
+
entryPoints,
|
|
219
|
+
entryNames: outputNames.bundles,
|
|
220
|
+
assetNames: outputNames.media,
|
|
221
|
+
target: 'es2020',
|
|
222
|
+
mainFields: ['es2020', 'browser', 'module', 'main'],
|
|
223
|
+
conditions: ['es2020', 'module'],
|
|
224
|
+
resolveExtensions: ['.ts', '.tsx', '.mjs', '.js'],
|
|
225
|
+
logLevel: options.verbose ? 'debug' : 'silent',
|
|
226
|
+
metafile: true,
|
|
227
|
+
minify: optimizationOptions.scripts,
|
|
228
|
+
pure: ['forwardRef'],
|
|
229
|
+
outdir: '/',
|
|
230
|
+
sourcemap: sourcemapOptions.scripts && (sourcemapOptions.hidden ? 'external' : true),
|
|
231
|
+
splitting: true,
|
|
232
|
+
tsconfig,
|
|
233
|
+
write: false,
|
|
234
|
+
platform: 'browser',
|
|
235
|
+
preserveSymlinks: options.preserveSymlinks,
|
|
236
|
+
plugins: [
|
|
237
|
+
(0, compiler_plugin_1.createCompilerPlugin)(
|
|
238
|
+
// JS/TS options
|
|
239
|
+
{
|
|
240
|
+
sourcemap: !!sourcemapOptions.scripts,
|
|
241
|
+
tsconfig,
|
|
242
|
+
advancedOptimizations: options.buildOptimizer,
|
|
243
|
+
},
|
|
244
|
+
// Component stylesheet options
|
|
245
|
+
{
|
|
246
|
+
workspaceRoot,
|
|
247
|
+
optimization: !!optimizationOptions.styles.minify,
|
|
248
|
+
sourcemap: !!sourcemapOptions.styles,
|
|
249
|
+
outputNames,
|
|
250
|
+
}),
|
|
251
|
+
],
|
|
252
|
+
define: {
|
|
253
|
+
'ngDevMode': optimizationOptions.scripts ? 'false' : 'true',
|
|
254
|
+
'ngJitMode': 'false',
|
|
255
|
+
},
|
|
256
|
+
});
|
|
257
|
+
}
|
|
258
|
+
exports.default = (0, architect_1.createBuilder)(execute);
|
|
@@ -0,0 +1,34 @@
|
|
|
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 { Schema as BrowserBuilderOptions } from '../browser/schema';
|
|
10
|
+
/**
|
|
11
|
+
* Normalize the user provided options by creating full paths for all path based options
|
|
12
|
+
* and converting multi-form options into a single form that can be directly used
|
|
13
|
+
* by the build process.
|
|
14
|
+
*
|
|
15
|
+
* @param context The context for current builder execution.
|
|
16
|
+
* @param projectName The name of the project for the current execution.
|
|
17
|
+
* @param options An object containing the options to use for the build.
|
|
18
|
+
* @returns An object containing normalized options required to perform the build.
|
|
19
|
+
*/
|
|
20
|
+
export declare function normalizeOptions(context: BuilderContext, projectName: string, options: BrowserBuilderOptions): Promise<{
|
|
21
|
+
workspaceRoot: string;
|
|
22
|
+
mainEntryPoint: string;
|
|
23
|
+
polyfillsEntryPoint: string | undefined;
|
|
24
|
+
optimizationOptions: import("../../utils").NormalizedOptimizationOptions;
|
|
25
|
+
outputPath: string;
|
|
26
|
+
sourcemapOptions: import("../browser/schema").SourceMapClass;
|
|
27
|
+
tsconfig: string;
|
|
28
|
+
projectRoot: string;
|
|
29
|
+
assets: import("../browser/schema").AssetPatternClass[] | undefined;
|
|
30
|
+
outputNames: {
|
|
31
|
+
bundles: string;
|
|
32
|
+
media: string;
|
|
33
|
+
};
|
|
34
|
+
}>;
|
|
@@ -0,0 +1,87 @@
|
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
33
|
+
exports.normalizeOptions = void 0;
|
|
34
|
+
const path = __importStar(require("path"));
|
|
35
|
+
const utils_1 = require("../../utils");
|
|
36
|
+
const schema_1 = require("../browser/schema");
|
|
37
|
+
/**
|
|
38
|
+
* Normalize the user provided options by creating full paths for all path based options
|
|
39
|
+
* and converting multi-form options into a single form that can be directly used
|
|
40
|
+
* by the build process.
|
|
41
|
+
*
|
|
42
|
+
* @param context The context for current builder execution.
|
|
43
|
+
* @param projectName The name of the project for the current execution.
|
|
44
|
+
* @param options An object containing the options to use for the build.
|
|
45
|
+
* @returns An object containing normalized options required to perform the build.
|
|
46
|
+
*/
|
|
47
|
+
async function normalizeOptions(context, projectName, options) {
|
|
48
|
+
var _a, _b, _c, _d;
|
|
49
|
+
const workspaceRoot = context.workspaceRoot;
|
|
50
|
+
const projectMetadata = await context.getProjectMetadata(projectName);
|
|
51
|
+
const projectRoot = path.join(workspaceRoot, (_a = projectMetadata.root) !== null && _a !== void 0 ? _a : '');
|
|
52
|
+
const projectSourceRoot = path.join(workspaceRoot, (_b = projectMetadata.sourceRoot) !== null && _b !== void 0 ? _b : 'src');
|
|
53
|
+
// Normalize options
|
|
54
|
+
const mainEntryPoint = path.join(workspaceRoot, options.main);
|
|
55
|
+
const polyfillsEntryPoint = options.polyfills && path.join(workspaceRoot, options.polyfills);
|
|
56
|
+
const tsconfig = path.join(workspaceRoot, options.tsConfig);
|
|
57
|
+
const outputPath = path.join(workspaceRoot, options.outputPath);
|
|
58
|
+
const optimizationOptions = (0, utils_1.normalizeOptimization)(options.optimization);
|
|
59
|
+
const sourcemapOptions = (0, utils_1.normalizeSourceMaps)((_c = options.sourceMap) !== null && _c !== void 0 ? _c : false);
|
|
60
|
+
const assets = ((_d = options.assets) === null || _d === void 0 ? void 0 : _d.length)
|
|
61
|
+
? (0, utils_1.normalizeAssetPatterns)(options.assets, workspaceRoot, projectRoot, projectSourceRoot)
|
|
62
|
+
: undefined;
|
|
63
|
+
const outputNames = {
|
|
64
|
+
bundles: options.outputHashing === schema_1.OutputHashing.All || options.outputHashing === schema_1.OutputHashing.Bundles
|
|
65
|
+
? '[name].[hash]'
|
|
66
|
+
: '[name]',
|
|
67
|
+
media: options.outputHashing === schema_1.OutputHashing.All || options.outputHashing === schema_1.OutputHashing.Media
|
|
68
|
+
? '[name].[hash]'
|
|
69
|
+
: '[name]',
|
|
70
|
+
};
|
|
71
|
+
if (options.resourcesOutputPath) {
|
|
72
|
+
outputNames.media = path.join(options.resourcesOutputPath, outputNames.media);
|
|
73
|
+
}
|
|
74
|
+
return {
|
|
75
|
+
workspaceRoot,
|
|
76
|
+
mainEntryPoint,
|
|
77
|
+
polyfillsEntryPoint,
|
|
78
|
+
optimizationOptions,
|
|
79
|
+
outputPath,
|
|
80
|
+
sourcemapOptions,
|
|
81
|
+
tsconfig,
|
|
82
|
+
projectRoot,
|
|
83
|
+
assets,
|
|
84
|
+
outputNames,
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
exports.normalizeOptions = normalizeOptions;
|
|
@@ -0,0 +1,52 @@
|
|
|
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 type { OutputFile } from 'esbuild';
|
|
9
|
+
export interface BundleStylesheetOptions {
|
|
10
|
+
workspaceRoot?: string;
|
|
11
|
+
optimization: boolean;
|
|
12
|
+
preserveSymlinks?: boolean;
|
|
13
|
+
sourcemap: boolean | 'external';
|
|
14
|
+
outputNames?: {
|
|
15
|
+
bundles?: string;
|
|
16
|
+
media?: string;
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Bundle a stylesheet that exists as a file on the filesystem.
|
|
21
|
+
*
|
|
22
|
+
* @param filename The path to the file to bundle.
|
|
23
|
+
* @param options The stylesheet bundling options to use.
|
|
24
|
+
* @returns The bundle result object.
|
|
25
|
+
*/
|
|
26
|
+
export declare function bundleStylesheetFile(filename: string, options: BundleStylesheetOptions): Promise<{
|
|
27
|
+
errors: import("esbuild").Message[];
|
|
28
|
+
warnings: import("esbuild").Message[];
|
|
29
|
+
contents: string;
|
|
30
|
+
map: string | undefined;
|
|
31
|
+
path: string | undefined;
|
|
32
|
+
resourceFiles: OutputFile[];
|
|
33
|
+
}>;
|
|
34
|
+
/**
|
|
35
|
+
* Bundle stylesheet text data from a string.
|
|
36
|
+
*
|
|
37
|
+
* @param data The string content of a stylesheet to bundle.
|
|
38
|
+
* @param dataOptions The options to use to resolve references and name output of the stylesheet data.
|
|
39
|
+
* @param bundleOptions The stylesheet bundling options to use.
|
|
40
|
+
* @returns The bundle result object.
|
|
41
|
+
*/
|
|
42
|
+
export declare function bundleStylesheetText(data: string, dataOptions: {
|
|
43
|
+
resolvePath: string;
|
|
44
|
+
virtualName?: string;
|
|
45
|
+
}, bundleOptions: BundleStylesheetOptions): Promise<{
|
|
46
|
+
errors: import("esbuild").Message[];
|
|
47
|
+
warnings: import("esbuild").Message[];
|
|
48
|
+
contents: string;
|
|
49
|
+
map: string | undefined;
|
|
50
|
+
path: string | undefined;
|
|
51
|
+
resourceFiles: OutputFile[];
|
|
52
|
+
}>;
|
|
@@ -0,0 +1,118 @@
|
|
|
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
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
33
|
+
exports.bundleStylesheetText = exports.bundleStylesheetFile = void 0;
|
|
34
|
+
const path = __importStar(require("path"));
|
|
35
|
+
const esbuild_1 = require("./esbuild");
|
|
36
|
+
async function bundleStylesheet(entry, options) {
|
|
37
|
+
var _a, _b;
|
|
38
|
+
// Execute esbuild
|
|
39
|
+
const result = await (0, esbuild_1.bundle)({
|
|
40
|
+
...entry,
|
|
41
|
+
absWorkingDir: options.workspaceRoot,
|
|
42
|
+
bundle: true,
|
|
43
|
+
entryNames: (_a = options.outputNames) === null || _a === void 0 ? void 0 : _a.bundles,
|
|
44
|
+
assetNames: (_b = options.outputNames) === null || _b === void 0 ? void 0 : _b.media,
|
|
45
|
+
logLevel: 'silent',
|
|
46
|
+
minify: options.optimization,
|
|
47
|
+
sourcemap: options.sourcemap,
|
|
48
|
+
outdir: '/',
|
|
49
|
+
write: false,
|
|
50
|
+
platform: 'browser',
|
|
51
|
+
preserveSymlinks: options.preserveSymlinks,
|
|
52
|
+
conditions: ['style'],
|
|
53
|
+
mainFields: ['style'],
|
|
54
|
+
plugins: [
|
|
55
|
+
// TODO: preprocessor plugins
|
|
56
|
+
],
|
|
57
|
+
});
|
|
58
|
+
// Extract the result of the bundling from the output files
|
|
59
|
+
let contents = '';
|
|
60
|
+
let map;
|
|
61
|
+
let outputPath;
|
|
62
|
+
const resourceFiles = [];
|
|
63
|
+
if (result.outputFiles) {
|
|
64
|
+
for (const outputFile of result.outputFiles) {
|
|
65
|
+
const filename = path.basename(outputFile.path);
|
|
66
|
+
if (filename.endsWith('.css')) {
|
|
67
|
+
outputPath = outputFile.path;
|
|
68
|
+
contents = outputFile.text;
|
|
69
|
+
}
|
|
70
|
+
else if (filename.endsWith('.css.map')) {
|
|
71
|
+
map = outputFile.text;
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
// The output files could also contain resources (images/fonts/etc.) that were referenced
|
|
75
|
+
resourceFiles.push(outputFile);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return {
|
|
80
|
+
errors: result.errors,
|
|
81
|
+
warnings: result.warnings,
|
|
82
|
+
contents,
|
|
83
|
+
map,
|
|
84
|
+
path: outputPath,
|
|
85
|
+
resourceFiles,
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
* Bundle a stylesheet that exists as a file on the filesystem.
|
|
90
|
+
*
|
|
91
|
+
* @param filename The path to the file to bundle.
|
|
92
|
+
* @param options The stylesheet bundling options to use.
|
|
93
|
+
* @returns The bundle result object.
|
|
94
|
+
*/
|
|
95
|
+
async function bundleStylesheetFile(filename, options) {
|
|
96
|
+
return bundleStylesheet({ entryPoints: [filename] }, options);
|
|
97
|
+
}
|
|
98
|
+
exports.bundleStylesheetFile = bundleStylesheetFile;
|
|
99
|
+
/**
|
|
100
|
+
* Bundle stylesheet text data from a string.
|
|
101
|
+
*
|
|
102
|
+
* @param data The string content of a stylesheet to bundle.
|
|
103
|
+
* @param dataOptions The options to use to resolve references and name output of the stylesheet data.
|
|
104
|
+
* @param bundleOptions The stylesheet bundling options to use.
|
|
105
|
+
* @returns The bundle result object.
|
|
106
|
+
*/
|
|
107
|
+
async function bundleStylesheetText(data, dataOptions, bundleOptions) {
|
|
108
|
+
const result = bundleStylesheet({
|
|
109
|
+
stdin: {
|
|
110
|
+
contents: data,
|
|
111
|
+
sourcefile: dataOptions.virtualName,
|
|
112
|
+
resolveDir: dataOptions.resolvePath,
|
|
113
|
+
loader: 'css',
|
|
114
|
+
},
|
|
115
|
+
}, bundleOptions);
|
|
116
|
+
return result;
|
|
117
|
+
}
|
|
118
|
+
exports.bundleStylesheetText = bundleStylesheetText;
|
|
@@ -13,7 +13,7 @@ import webpack from 'webpack';
|
|
|
13
13
|
import { ExecutionTransformer } from '../../transforms';
|
|
14
14
|
import { IndexHtmlTransform } from '../../utils/index-file/index-html-generator';
|
|
15
15
|
import { Schema } from './schema';
|
|
16
|
-
export declare type DevServerBuilderOptions = Schema
|
|
16
|
+
export declare type DevServerBuilderOptions = Schema;
|
|
17
17
|
/**
|
|
18
18
|
* @experimental Direct usage of this type is considered experimental.
|
|
19
19
|
*/
|
|
@@ -8,7 +8,11 @@
|
|
|
8
8
|
*/
|
|
9
9
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
10
|
if (k2 === undefined) k2 = k;
|
|
11
|
-
Object.
|
|
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);
|
|
12
16
|
}) : (function(o, m, k, k2) {
|
|
13
17
|
if (k2 === undefined) k2 = k;
|
|
14
18
|
o[k2] = m[k];
|
|
@@ -11,7 +11,7 @@ import { JsonObject } from '@angular-devkit/core';
|
|
|
11
11
|
import webpack from 'webpack';
|
|
12
12
|
import { ExecutionTransformer } from '../../transforms';
|
|
13
13
|
import { Schema } from './schema';
|
|
14
|
-
export declare type ExtractI18nBuilderOptions = Schema
|
|
14
|
+
export declare type ExtractI18nBuilderOptions = Schema;
|
|
15
15
|
/**
|
|
16
16
|
* @experimental Direct usage of this function is considered experimental.
|
|
17
17
|
*/
|
|
@@ -8,7 +8,11 @@
|
|
|
8
8
|
*/
|
|
9
9
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
10
|
if (k2 === undefined) k2 = k;
|
|
11
|
-
Object.
|
|
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);
|
|
12
16
|
}) : (function(o, m, k, k2) {
|
|
13
17
|
if (k2 === undefined) k2 = k;
|
|
14
18
|
o[k2] = m[k];
|
|
@@ -8,7 +8,11 @@
|
|
|
8
8
|
*/
|
|
9
9
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
10
|
if (k2 === undefined) k2 = k;
|
|
11
|
-
Object.
|
|
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);
|
|
12
16
|
}) : (function(o, m, k, k2) {
|
|
13
17
|
if (k2 === undefined) k2 = k;
|
|
14
18
|
o[k2] = m[k];
|
|
@@ -8,7 +8,11 @@
|
|
|
8
8
|
*/
|
|
9
9
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
10
|
if (k2 === undefined) k2 = k;
|
|
11
|
-
Object.
|
|
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);
|
|
12
16
|
}) : (function(o, m, k, k2) {
|
|
13
17
|
if (k2 === undefined) k2 = k;
|
|
14
18
|
o[k2] = m[k];
|
|
@@ -23,5 +23,5 @@ export declare function execute(options: KarmaBuilderOptions, context: BuilderCo
|
|
|
23
23
|
karmaOptions?: (options: KarmaConfigOptions) => KarmaConfigOptions;
|
|
24
24
|
}): Observable<BuilderOutput>;
|
|
25
25
|
export { KarmaBuilderOptions };
|
|
26
|
-
declare const _default: import("@angular-devkit/architect/src/internal").Builder<Record<string, string> & KarmaBuilderOptions & import("
|
|
26
|
+
declare const _default: import("@angular-devkit/architect/src/internal").Builder<Record<string, string> & KarmaBuilderOptions & import("../../../../core/src").JsonObject>;
|
|
27
27
|
export default _default;
|