@angular/build 22.2.0-next.3 → 22.2.0-next.4
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 +6 -6
- package/src/builders/application/chunk-optimizer.d.ts +2 -2
- package/src/builders/application/chunk-optimizer.js +5 -5
- package/src/builders/application/chunk-optimizer.js.map +1 -1
- package/src/builders/application/execute-build.js +42 -17
- package/src/builders/application/execute-build.js.map +1 -1
- package/src/builders/application/execute-post-bundle.d.ts +2 -2
- package/src/builders/application/execute-post-bundle.js +4 -4
- package/src/builders/application/execute-post-bundle.js.map +1 -1
- package/src/builders/application/i18n.js +22 -1
- package/src/builders/application/i18n.js.map +1 -1
- package/src/builders/application/options.d.ts +14 -0
- package/src/builders/application/options.js +2 -1
- package/src/builders/application/options.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/build-options.js +6 -0
- package/src/builders/unit-test/runners/vitest/build-options.js.map +1 -1
- package/src/tools/angular/angular-host.d.ts +1 -2
- package/src/tools/angular/angular-host.js +3 -3
- package/src/tools/angular/angular-host.js.map +1 -1
- package/src/tools/angular/compilation/angular-compilation.d.ts +23 -10
- package/src/tools/angular/compilation/angular-compilation.js +11 -1
- package/src/tools/angular/compilation/angular-compilation.js.map +1 -1
- package/src/tools/angular/compilation/aot-compilation.d.ts +4 -10
- package/src/tools/angular/compilation/aot-compilation.js +23 -14
- package/src/tools/angular/compilation/aot-compilation.js.map +1 -1
- package/src/tools/angular/compilation/factory.d.ts +5 -3
- package/src/tools/angular/compilation/factory.js +10 -5
- package/src/tools/angular/compilation/factory.js.map +1 -1
- package/src/tools/angular/compilation/index.d.ts +2 -2
- package/src/tools/angular/compilation/index.js.map +1 -1
- package/src/tools/angular/compilation/jit-compilation.d.ts +4 -7
- package/src/tools/angular/compilation/jit-compilation.js +14 -11
- package/src/tools/angular/compilation/jit-compilation.js.map +1 -1
- package/src/tools/angular/compilation/noop-compilation.d.ts +3 -8
- package/src/tools/angular/compilation/noop-compilation.js +1 -1
- package/src/tools/angular/compilation/noop-compilation.js.map +1 -1
- package/src/tools/angular/compilation/parallel-compilation.d.ts +2 -8
- package/src/tools/angular/compilation/parallel-compilation.js.map +1 -1
- package/src/tools/angular/compilation/parallel-worker.d.ts +3 -15
- package/src/tools/angular/compilation/parallel-worker.js +9 -6
- package/src/tools/angular/compilation/parallel-worker.js.map +1 -1
- package/src/tools/esbuild/angular/compiler-plugin.js +51 -21
- package/src/tools/esbuild/angular/compiler-plugin.js.map +1 -1
- package/src/tools/esbuild/angular/component-stylesheets.js +2 -1
- package/src/tools/esbuild/angular/component-stylesheets.js.map +1 -1
- package/src/tools/esbuild/angular/source-file-cache.d.ts +1 -2
- package/src/tools/esbuild/angular/source-file-cache.js +1 -11
- package/src/tools/esbuild/angular/source-file-cache.js.map +1 -1
- package/src/tools/esbuild/application-code-bundle.js +5 -0
- package/src/tools/esbuild/application-code-bundle.js.map +1 -1
- package/src/tools/esbuild/budget-stats.js +3 -3
- package/src/tools/esbuild/budget-stats.js.map +1 -1
- package/src/tools/esbuild/bundler-context.d.ts +20 -4
- package/src/tools/esbuild/bundler-context.js +15 -15
- package/src/tools/esbuild/bundler-context.js.map +1 -1
- package/src/tools/esbuild/i18n-inliner-worker.js +180 -67
- package/src/tools/esbuild/i18n-inliner-worker.js.map +1 -1
- package/src/tools/esbuild/i18n-inliner.d.ts +3 -1
- package/src/tools/esbuild/i18n-inliner.js +9 -2
- package/src/tools/esbuild/i18n-inliner.js.map +1 -1
- package/src/tools/esbuild/license-extractor.d.ts +1 -1
- package/src/tools/esbuild/license-extractor.js +89 -86
- package/src/tools/esbuild/license-extractor.js.map +1 -1
- package/src/tools/esbuild/utils.d.ts +2 -2
- package/src/tools/esbuild/utils.js +9 -6
- package/src/tools/esbuild/utils.js.map +1 -1
- package/src/utils/i18n-options.d.ts +1 -0
- package/src/utils/i18n-options.js.map +1 -1
- package/src/utils/index-file/auto-csp.js +36 -17
- package/src/utils/index-file/auto-csp.js.map +1 -1
- package/src/utils/normalize-cache.js +1 -1
|
@@ -58,106 +58,109 @@ const EXTRACTION_FILE_SEPARATOR = '-'.repeat(80) + '\n';
|
|
|
58
58
|
* @param rootDirectory The root directory of the workspace.
|
|
59
59
|
* @returns A string containing the content of the output licenses file.
|
|
60
60
|
*/
|
|
61
|
-
async function extractLicenses(
|
|
61
|
+
async function extractLicenses(metafiles, rootDirectory) {
|
|
62
62
|
let extractedLicenseContent = `${EXTRACTION_FILE_HEADER}\n${EXTRACTION_FILE_SEPARATOR}`;
|
|
63
63
|
const seenPaths = new Set();
|
|
64
64
|
const seenPackageDirectories = new Set();
|
|
65
65
|
const seenPackages = new Set();
|
|
66
|
-
for (const
|
|
67
|
-
for (const
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
// Skip already processed paths
|
|
73
|
-
if (seenPaths.has(inputPath)) {
|
|
74
|
-
continue;
|
|
75
|
-
}
|
|
76
|
-
seenPaths.add(inputPath);
|
|
77
|
-
// Skip non-package paths
|
|
78
|
-
if (!inputPath.includes(NODE_MODULE_SEGMENT)) {
|
|
79
|
-
continue;
|
|
80
|
-
}
|
|
81
|
-
// Extract the package name from the path
|
|
82
|
-
let baseDirectory = node_path_1.default.join(rootDirectory, inputPath);
|
|
83
|
-
let nameOrScope, nameOrFile;
|
|
84
|
-
let found = false;
|
|
85
|
-
while (baseDirectory !== node_path_1.default.dirname(baseDirectory)) {
|
|
86
|
-
const segment = node_path_1.default.basename(baseDirectory);
|
|
87
|
-
if (segment === NODE_MODULE_SEGMENT) {
|
|
88
|
-
found = true;
|
|
89
|
-
break;
|
|
66
|
+
for (const metafile of metafiles) {
|
|
67
|
+
for (const entry of Object.values(metafile.outputs)) {
|
|
68
|
+
for (const [inputPath, { bytesInOutput }] of Object.entries(entry.inputs)) {
|
|
69
|
+
// Skip if not included in output
|
|
70
|
+
if (bytesInOutput <= 0) {
|
|
71
|
+
continue;
|
|
90
72
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
}
|
|
95
|
-
// Skip non-package path edge cases that are not caught in the includes check above
|
|
96
|
-
if (!found || !nameOrScope) {
|
|
97
|
-
continue;
|
|
98
|
-
}
|
|
99
|
-
const packageName = nameOrScope.startsWith('@')
|
|
100
|
-
? `${nameOrScope}/${nameOrFile}`
|
|
101
|
-
: nameOrScope;
|
|
102
|
-
const packageDirectory = node_path_1.default.join(baseDirectory, packageName);
|
|
103
|
-
if (seenPackageDirectories.has(packageDirectory)) {
|
|
104
|
-
continue;
|
|
105
|
-
}
|
|
106
|
-
seenPackageDirectories.add(packageDirectory);
|
|
107
|
-
// Load the package's metadata to find the package's name, version, and license type
|
|
108
|
-
const packageJsonPath = node_path_1.default.join(packageDirectory, 'package.json');
|
|
109
|
-
let packageJson;
|
|
110
|
-
try {
|
|
111
|
-
packageJson = JSON.parse(await (0, promises_1.readFile)(packageJsonPath, 'utf-8'));
|
|
112
|
-
}
|
|
113
|
-
catch {
|
|
114
|
-
// Invalid package
|
|
115
|
-
continue;
|
|
116
|
-
}
|
|
117
|
-
// Skip already processed packages
|
|
118
|
-
const packageId = `${packageName}@${packageJson.version}`;
|
|
119
|
-
if (seenPackages.has(packageId)) {
|
|
120
|
-
continue;
|
|
121
|
-
}
|
|
122
|
-
seenPackages.add(packageId);
|
|
123
|
-
// Attempt to find license text inside package
|
|
124
|
-
let licenseText = '';
|
|
125
|
-
if (typeof packageJson.license === 'string' &&
|
|
126
|
-
packageJson.license.toUpperCase().startsWith(CUSTOM_LICENSE_TEXT)) {
|
|
127
|
-
// Attempt to load the package's custom license
|
|
128
|
-
let customLicensePath;
|
|
129
|
-
const customLicenseFile = node_path_1.default.normalize(packageJson.license.slice(CUSTOM_LICENSE_TEXT.length).trim());
|
|
130
|
-
if (customLicenseFile.startsWith('..') || node_path_1.default.isAbsolute(customLicenseFile)) {
|
|
131
|
-
// Path is attempting to access files outside of the package
|
|
132
|
-
// TODO: Issue warning?
|
|
73
|
+
// Skip already processed paths
|
|
74
|
+
if (seenPaths.has(inputPath)) {
|
|
75
|
+
continue;
|
|
133
76
|
}
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
77
|
+
seenPaths.add(inputPath);
|
|
78
|
+
// Skip non-package paths
|
|
79
|
+
if (!inputPath.includes(NODE_MODULE_SEGMENT)) {
|
|
80
|
+
continue;
|
|
81
|
+
}
|
|
82
|
+
// Extract the package name from the path
|
|
83
|
+
let baseDirectory = node_path_1.default.join(rootDirectory, inputPath);
|
|
84
|
+
let nameOrScope, nameOrFile;
|
|
85
|
+
let found = false;
|
|
86
|
+
while (baseDirectory !== node_path_1.default.dirname(baseDirectory)) {
|
|
87
|
+
const segment = node_path_1.default.basename(baseDirectory);
|
|
88
|
+
if (segment === NODE_MODULE_SEGMENT) {
|
|
89
|
+
found = true;
|
|
90
|
+
break;
|
|
138
91
|
}
|
|
139
|
-
|
|
92
|
+
nameOrFile = nameOrScope;
|
|
93
|
+
nameOrScope = segment;
|
|
94
|
+
baseDirectory = node_path_1.default.dirname(baseDirectory);
|
|
140
95
|
}
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
96
|
+
// Skip non-package path edge cases that are not caught in the includes check above
|
|
97
|
+
if (!found || !nameOrScope) {
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
const packageName = nameOrScope.startsWith('@')
|
|
101
|
+
? `${nameOrScope}/${nameOrFile}`
|
|
102
|
+
: nameOrScope;
|
|
103
|
+
const packageDirectory = node_path_1.default.join(baseDirectory, packageName);
|
|
104
|
+
if (seenPackageDirectories.has(packageDirectory)) {
|
|
105
|
+
continue;
|
|
106
|
+
}
|
|
107
|
+
seenPackageDirectories.add(packageDirectory);
|
|
108
|
+
// Load the package's metadata to find the package's name, version, and license type
|
|
109
|
+
const packageJsonPath = node_path_1.default.join(packageDirectory, 'package.json');
|
|
110
|
+
let packageJson;
|
|
111
|
+
try {
|
|
112
|
+
packageJson = JSON.parse(await (0, promises_1.readFile)(packageJsonPath, 'utf-8'));
|
|
113
|
+
}
|
|
114
|
+
catch {
|
|
115
|
+
// Invalid package
|
|
116
|
+
continue;
|
|
117
|
+
}
|
|
118
|
+
// Skip already processed packages
|
|
119
|
+
const packageId = `${packageName}@${packageJson.version}`;
|
|
120
|
+
if (seenPackages.has(packageId)) {
|
|
121
|
+
continue;
|
|
122
|
+
}
|
|
123
|
+
seenPackages.add(packageId);
|
|
124
|
+
// Attempt to find license text inside package
|
|
125
|
+
let licenseText = '';
|
|
126
|
+
if (typeof packageJson.license === 'string' &&
|
|
127
|
+
packageJson.license.toUpperCase().startsWith(CUSTOM_LICENSE_TEXT)) {
|
|
128
|
+
// Attempt to load the package's custom license
|
|
129
|
+
let customLicensePath;
|
|
130
|
+
const customLicenseFile = node_path_1.default.normalize(packageJson.license.slice(CUSTOM_LICENSE_TEXT.length).trim());
|
|
131
|
+
if (customLicenseFile.startsWith('..') || node_path_1.default.isAbsolute(customLicenseFile)) {
|
|
132
|
+
// Path is attempting to access files outside of the package
|
|
133
|
+
// TODO: Issue warning?
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
customLicensePath = node_path_1.default.join(packageDirectory, customLicenseFile);
|
|
148
137
|
try {
|
|
149
|
-
licenseText = await (0, promises_1.readFile)(
|
|
150
|
-
break;
|
|
138
|
+
licenseText = await (0, promises_1.readFile)(customLicensePath, 'utf-8');
|
|
151
139
|
}
|
|
152
140
|
catch { }
|
|
153
141
|
}
|
|
154
142
|
}
|
|
143
|
+
else {
|
|
144
|
+
// Search for a license file within the root of the package
|
|
145
|
+
const entries = await (0, promises_1.readdir)(packageDirectory, { withFileTypes: true }).catch(() => []);
|
|
146
|
+
for (const entry of entries) {
|
|
147
|
+
if ((entry.isFile() || entry.isSymbolicLink()) &&
|
|
148
|
+
LICENSE_FILE_REGEXP.test(entry.name)) {
|
|
149
|
+
const packageLicensePath = node_path_1.default.join(packageDirectory, entry.name);
|
|
150
|
+
try {
|
|
151
|
+
licenseText = await (0, promises_1.readFile)(packageLicensePath, 'utf-8');
|
|
152
|
+
break;
|
|
153
|
+
}
|
|
154
|
+
catch { }
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
// Generate the package's license entry in the output content
|
|
159
|
+
extractedLicenseContent += `Package: ${packageJson.name}\n`;
|
|
160
|
+
extractedLicenseContent += `License: ${JSON.stringify(packageJson.license, null, 2)}\n`;
|
|
161
|
+
extractedLicenseContent += `\n${licenseText}\n`;
|
|
162
|
+
extractedLicenseContent += EXTRACTION_FILE_SEPARATOR;
|
|
155
163
|
}
|
|
156
|
-
// Generate the package's license entry in the output content
|
|
157
|
-
extractedLicenseContent += `Package: ${packageJson.name}\n`;
|
|
158
|
-
extractedLicenseContent += `License: ${JSON.stringify(packageJson.license, null, 2)}\n`;
|
|
159
|
-
extractedLicenseContent += `\n${licenseText}\n`;
|
|
160
|
-
extractedLicenseContent += EXTRACTION_FILE_SEPARATOR;
|
|
161
164
|
}
|
|
162
165
|
}
|
|
163
166
|
return extractedLicenseContent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"license-extractor.js","sourceRoot":"","sources":["license-extractor.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAwDH,
|
|
1
|
+
{"version":3,"file":"license-extractor.js","sourceRoot":"","sources":["license-extractor.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,8 @@ import { NormalizedApplicationBuildOptions } from '../../builders/application/op
|
|
|
11
11
|
import { BudgetCalculatorResult } from '../../utils/bundle-calculator';
|
|
12
12
|
import { BuildOutputAsset, ExecutionResult } from './bundler-execution-result';
|
|
13
13
|
import { type BuildOutputFile, type InitialFileRecord } from './bundler-files';
|
|
14
|
-
export declare function logBuildStats(
|
|
15
|
-
export declare function getChunkNameFromMetafile(
|
|
14
|
+
export declare function logBuildStats(metafiles: Metafile[], outputFiles: BuildOutputFile[], initial: Map<string, InitialFileRecord>, budgetFailures: BudgetCalculatorResult[] | undefined, colors: boolean, changedFiles?: Set<string>, estimatedTransferSizes?: Map<string, number>, ssrOutputEnabled?: boolean, verbose?: boolean): string;
|
|
15
|
+
export declare function getChunkNameFromMetafile(metafiles: Metafile[] | Metafile, file: string): string | undefined;
|
|
16
16
|
export declare function calculateEstimatedTransferSizes(outputFiles: OutputFile[]): Promise<Map<string, number>>;
|
|
17
17
|
export declare function withSpinner<T>(text: string, action: () => T | Promise<T>): Promise<T>;
|
|
18
18
|
export declare function withNoProgress<T>(text: string, action: () => T | Promise<T>): Promise<T>;
|
|
@@ -26,7 +26,7 @@ const node_zlib_1 = require("node:zlib");
|
|
|
26
26
|
const schema_1 = require("../../builders/application/schema");
|
|
27
27
|
const stats_table_1 = require("../../utils/stats-table");
|
|
28
28
|
const bundler_files_1 = require("./bundler-files");
|
|
29
|
-
function logBuildStats(
|
|
29
|
+
function logBuildStats(metafiles, outputFiles, initial, budgetFailures, colors, changedFiles, estimatedTransferSizes, ssrOutputEnabled, verbose) {
|
|
30
30
|
// Remove the i18n subpath in case the build is using i18n.
|
|
31
31
|
// en-US/main.js -> main.js
|
|
32
32
|
const normalizedChangedFiles = new Set([...(changedFiles ?? [])].map((f) => (0, node_path_1.basename)(f)));
|
|
@@ -50,11 +50,11 @@ function logBuildStats(metafile, outputFiles, initial, budgetFailures, colors, c
|
|
|
50
50
|
continue;
|
|
51
51
|
}
|
|
52
52
|
// Skip logging external component stylesheets used for HMR
|
|
53
|
-
if (
|
|
53
|
+
if (metafiles.some((mf) => mf.outputs[file] && 'ng-component' in mf.outputs[file])) {
|
|
54
54
|
componentStyleChange = true;
|
|
55
55
|
continue;
|
|
56
56
|
}
|
|
57
|
-
const name = initial.get(file)?.name ?? getChunkNameFromMetafile(
|
|
57
|
+
const name = initial.get(file)?.name ?? getChunkNameFromMetafile(metafiles, file);
|
|
58
58
|
const stat = {
|
|
59
59
|
initial: initial.has(file),
|
|
60
60
|
stats: [file, name ?? '-', size, estimatedTransferSizes?.get(file) ?? '-'],
|
|
@@ -83,9 +83,12 @@ function logBuildStats(metafile, outputFiles, initial, budgetFailures, colors, c
|
|
|
83
83
|
}
|
|
84
84
|
return '';
|
|
85
85
|
}
|
|
86
|
-
function getChunkNameFromMetafile(
|
|
87
|
-
|
|
88
|
-
|
|
86
|
+
function getChunkNameFromMetafile(metafiles, file) {
|
|
87
|
+
const metafileArray = Array.isArray(metafiles) ? metafiles : [metafiles];
|
|
88
|
+
for (const metafile of metafileArray) {
|
|
89
|
+
if (metafile.outputs[file]?.entryPoint) {
|
|
90
|
+
return getEntryPointName(metafile.outputs[file].entryPoint);
|
|
91
|
+
}
|
|
89
92
|
}
|
|
90
93
|
}
|
|
91
94
|
async function calculateEstimatedTransferSizes(outputFiles) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAoBH,sCAkFC;AAED,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n-options.js","sourceRoot":"","sources":["i18n-options.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;
|
|
1
|
+
{"version":3,"file":"i18n-options.js","sourceRoot":"","sources":["i18n-options.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAuEH,8CA8JC;AAED,4CAwDC;AA7RD,0DAA6B;AAyB7B,SAAS,8BAA8B,CACrC,MAAe,EACf,MAAc,EACd,mBAA4B;IAE5B,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,EAAE,CAAC;QACpF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,IAAI,YAAY,GAAG,qDAAqD,MAAM,kBAAkB,CAAC;IACjG,IAAI,mBAAmB,EAAE,CAAC;QACxB,YAAY,IAAI,iDAAiD,CAAC;IACpE,CAAC;SAAM,CAAC;QACN,YAAY,IAAI,wCAAwC,CAAC;IAC3D,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,YAAY,CAAC,KAAc,EAAE,IAAY;IAChD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,qCAAqC,CAAC,CAAC;IAC/E,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,KAAc,EAAE,IAAY;IAChD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,oCAAoC,CAAC,CAAC;IAC9E,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc,EAAE,IAAY;IACtD,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAE1B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CACb,kBAAkB,IAAI,+EAA+E,CACtG,CAAC;IACJ,CAAC;AACH,CAAC;AACD,SAAgB,iBAAiB,CAC/B,eAAmC,EACnC,MAA2B,EAC3B,MAEC,EACD,UAAoB;IAEpB,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,eAAe,CAAC;IAEhD,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE/B,MAAM,IAAI,GAAgB;QACxB,aAAa,EAAE,IAAI,GAAG,EAAU;QAChC,gHAAgH;QAChH,YAAY,EAAE,OAAO;QACrB,OAAO,EAAE,EAAE;QACX,IAAI,YAAY;YACd,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,CAAC;QACrC,CAAC;KACF,CAAC;IAEF,IAAI,eAAmC,CAAC;IACxC,IAAI,uBAA2C,CAAC;IAChD,IAAI,UAA8B,CAAC;IACnC,IAAI,OAAO,QAAQ,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC9C,eAAe,GAAG,QAAQ,CAAC,YAAY,CAAC;IAC1C,CAAC;SAAM,IAAI,QAAQ,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/C,YAAY,CAAC,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAC;QAEzD,IAAI,QAAQ,CAAC,YAAY,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7C,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;YACnE,eAAe,GAAG,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC;QAC/C,CAAC;QAED,IAAI,QAAQ,CAAC,YAAY,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YACjD,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,4BAA4B,CAAC,CAAC;YAC3E,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,EAAE,IAAI,CACV,uFAAuF;oBACrF,uCAAuC;oBACvC,+FAA+F;oBAC/F,2GAA2G,CAC9G,CAAC;YACJ,CAAC;YAED,uBAAuB,GAAG,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC;QAC3D,CAAC;QAED,IAAI,QAAQ,CAAC,YAAY,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAChD,kBAAkB,CAAC,QAAQ,CAAC,YAAY,CAAC,OAAO,EAAE,2BAA2B,CAAC,CAAC;YAC/E,UAAU,GAAG,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC;QAC7C,CAAC;QAED,IAAI,UAAU,KAAK,SAAS,IAAI,uBAAuB,KAAK,SAAS,EAAE,CAAC;YACtE,MAAM,IAAI,KAAK,CACb,uFAAuF,CACxF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClC,IAAI,CAAC,YAAY,GAAG,eAAe,CAAC;QACpC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC;IACrC,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG;QAChC,KAAK,EAAE,EAAE;QACT,QAAQ,EAAE,uBAAuB;QACjC,OAAO,EAAE,UAAU,IAAI,IAAI,CAAC,YAAY;KACzC,CAAC;IAEF,IAAI,QAAQ,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACnC,YAAY,CAAC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAE/C,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACjE,IAAI,gBAAsC,CAAC;YAC3C,IAAI,QAA4B,CAAC;YACjC,IAAI,OAA2B,CAAC;YAEhC,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,aAAa,IAAI,OAAO,EAAE,CAAC;gBACvE,gBAAgB,GAAG,8BAA8B,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;gBAEtF,IAAI,UAAU,IAAI,OAAO,EAAE,CAAC;oBAC1B,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,gBAAgB,MAAM,WAAW,CAAC,CAAC;oBAElE,IAAI,UAAU,EAAE,CAAC;wBACf,MAAM,EAAE,IAAI,CACV,+BAA+B,MAAM,uDAAuD;4BAC1F,uCAAuC;4BACvC,+FAA+F;4BAC/F,2GAA2G,CAC9G,CAAC;oBACJ,CAAC;oBACD,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;gBAC9B,CAAC;gBAED,IAAI,SAAS,IAAI,OAAO,EAAE,CAAC;oBACzB,kBAAkB,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,MAAM,UAAU,CAAC,CAAC;oBACtE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;gBAC5B,CAAC;gBAED,IAAI,OAAO,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;oBACpD,MAAM,IAAI,KAAK,CACb,iBAAiB,MAAM,+BAA+B,MAAM,qCAAqC,CAClG,CAAC;gBACJ,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,gBAAgB,GAAG,8BAA8B,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAC3E,CAAC;YAED,IAAI,MAAM,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CACb,oBAAoB,MAAM,8DAA8D,CACzF,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG;gBACrB,KAAK,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBACvD,QAAQ;gBACR,OAAO,EAAE,OAAO,IAAI,MAAM;aAC3B,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAChF,CAAC;SAAM,IAAI,MAAM,EAAE,CAAC;QAClB,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;gBAC1D,MAAM,IAAI,KAAK,CAAC,qBAAqB,MAAM,mCAAmC,CAAC,CAAC;YAClF,CAAC;YAED,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,wEAAwE;IACxE,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,CACnE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAC/B,CAAC;IAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5C,MAAM,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAExD,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,MAAM,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YAExD,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAC1B,MAAM,IAAI,KAAK,CACb,wCAAwC,OAAO,UAAU,OAAO,oCAAoC,QAAQ,IAAI,CACjH,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,gBAAgB,CAC9B,MAAc,EACd,IAAuB,EACvB,aAAqB,EACrB,MAAyB,EACzB,MAA6E,EAC7E,WAAyB,EACzB,oBAAqD;IAErD,IAAI,YAAY,GAAwC,SAAS,CAAC;IAClE,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAG,MAAM,CAAC,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE/D,KAAK,MAAM,WAAW,IAAI,UAAU,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;YAC1D,IAAI,WAAW,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACjC,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAI,CAAC,IAAI,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;YACxF,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,IAAI,UAAU,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YACpE,MAAM,CAAC,IAAI,CACT,YAAY,IAAI,CAAC,IAAI,2BAA2B,UAAU,CAAC,MAAM,yCAAyC,MAAM,IAAI,CACrH,CAAC;QACJ,CAAC;QAED,WAAW,EAAE,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;QAEtC,IAAI,YAAY,EAAE,CAAC;YACjB,qBAAqB;YACrB,KAAK,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBACpE,IAAI,YAAY,CAAC,EAAE,CAAC,KAAK,SAAS,EAAE,CAAC;oBACnC,MAAM,2BAA2B,GAAG,IAAI,IAAI,CAAC,IAAI,0CAA0C,EAAE,iBAAiB,CAAC;oBAC/G,QAAQ,oBAAoB,EAAE,CAAC;wBAC7B,KAAK,QAAQ;4BACX,MAAM;wBACR,KAAK,OAAO;4BACV,MAAM,CAAC,KAAK,CAAC,SAAS,2BAA2B,EAAE,CAAC,CAAC;4BACrD,MAAM;wBACR,KAAK,SAAS,CAAC;wBACf;4BACE,MAAM,CAAC,IAAI,CAAC,WAAW,2BAA2B,EAAE,CAAC,CAAC;4BACtD,MAAM;oBACV,CAAC;gBACH,CAAC;gBACD,YAAY,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC;YAC7B,CAAC;QACH,CAAC;aAAM,CAAC;YACN,iCAAiC;YACjC,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;QACzC,CAAC;IACH,CAAC;IACD,IAAI,CAAC,WAAW,GAAG,YAAY,CAAC;AAClC,CAAC"}
|
|
@@ -121,11 +121,14 @@ async function autoCsp(html, unsafeEval = false) {
|
|
|
121
121
|
// If there are any interesting attributes, note them down.
|
|
122
122
|
const scriptType = getScriptAttributeValue(tag, 'type');
|
|
123
123
|
if (shouldDynamicallyLoadScriptTagBasedOnType(scriptType)) {
|
|
124
|
+
const crossOrigin = getScriptAttributeValue(tag, 'crossorigin');
|
|
124
125
|
scriptContent.push({
|
|
125
126
|
src: src,
|
|
126
127
|
type: scriptType,
|
|
127
128
|
async: getScriptAttributeValue(tag, 'async') !== undefined,
|
|
128
129
|
defer: getScriptAttributeValue(tag, 'defer') !== undefined,
|
|
130
|
+
integrity: getScriptAttributeValue(tag, 'integrity'),
|
|
131
|
+
crossOrigin: crossOrigin === '' ? 'anonymous' : crossOrigin,
|
|
129
132
|
});
|
|
130
133
|
return; // Skip writing my script tag until we've read it all.
|
|
131
134
|
}
|
|
@@ -261,35 +264,51 @@ function createLoaderScript(srcList, enableTrustedTypes = false) {
|
|
|
261
264
|
const srcAttr = encodeURI(s.src).replaceAll("'", "\\'");
|
|
262
265
|
// Can only be 'module' or a JS MIME type or an empty string.
|
|
263
266
|
const typeAttr = s.type ? "'" + s.type + "'" : "''";
|
|
264
|
-
const asyncAttr = s.async
|
|
265
|
-
const deferAttr = s.defer
|
|
266
|
-
|
|
267
|
+
const asyncAttr = !!s.async;
|
|
268
|
+
const deferAttr = !!s.defer;
|
|
269
|
+
const integrityAttr = JSON.stringify(s.integrity ?? null).replaceAll('<', '\\u003c');
|
|
270
|
+
const crossOriginAttr = JSON.stringify(s.crossOrigin ?? null).replaceAll('<', '\\u003c');
|
|
271
|
+
return `['${srcAttr}', ${typeAttr}, ${asyncAttr}, ${deferAttr}, ${integrityAttr}, ${crossOriginAttr}]`;
|
|
267
272
|
})
|
|
268
273
|
.join();
|
|
269
274
|
return enableTrustedTypes
|
|
270
|
-
? `
|
|
271
|
-
|
|
272
|
-
|
|
275
|
+
? `(() => {
|
|
276
|
+
const scripts = [${srcListFormatted}];
|
|
277
|
+
const policy = self.trustedTypes && self.trustedTypes.createPolicy ?
|
|
273
278
|
self.trustedTypes.createPolicy('angular#auto-csp', {createScriptURL: function(u) {
|
|
274
|
-
return scripts.
|
|
279
|
+
return scripts.some(function(s) { return s[0] === u; }) ? u : null;
|
|
275
280
|
}}) : { createScriptURL: function(u) { return u; } };
|
|
276
281
|
scripts.forEach(function(scriptUrl) {
|
|
277
|
-
|
|
282
|
+
const s = document.createElement('script');
|
|
278
283
|
s.src = policy.createScriptURL(scriptUrl[0]);
|
|
279
284
|
s.type = scriptUrl[1];
|
|
280
|
-
s.async =
|
|
281
|
-
s.defer =
|
|
285
|
+
s.async = scriptUrl[2];
|
|
286
|
+
s.defer = scriptUrl[3];
|
|
287
|
+
if (scriptUrl[4]) {
|
|
288
|
+
s.integrity = scriptUrl[4];
|
|
289
|
+
}
|
|
290
|
+
if (scriptUrl[5]) {
|
|
291
|
+
s.crossOrigin = scriptUrl[5];
|
|
292
|
+
}
|
|
282
293
|
document.lastElementChild.appendChild(s);
|
|
283
|
-
})
|
|
284
|
-
|
|
285
|
-
|
|
294
|
+
});
|
|
295
|
+
})();\n`
|
|
296
|
+
: `(() => {
|
|
297
|
+
const scripts = [${srcListFormatted}];
|
|
286
298
|
scripts.forEach(function(scriptUrl) {
|
|
287
|
-
|
|
299
|
+
const s = document.createElement('script');
|
|
288
300
|
s.src = scriptUrl[0];
|
|
289
301
|
s.type = scriptUrl[1];
|
|
290
|
-
s.async =
|
|
291
|
-
s.defer =
|
|
302
|
+
s.async = scriptUrl[2];
|
|
303
|
+
s.defer = scriptUrl[3];
|
|
304
|
+
if (scriptUrl[4]) {
|
|
305
|
+
s.integrity = scriptUrl[4];
|
|
306
|
+
}
|
|
307
|
+
if (scriptUrl[5]) {
|
|
308
|
+
s.crossOrigin = scriptUrl[5];
|
|
309
|
+
}
|
|
292
310
|
document.lastElementChild.appendChild(s);
|
|
293
|
-
})
|
|
311
|
+
});
|
|
312
|
+
})();\n`;
|
|
294
313
|
}
|
|
295
314
|
//# sourceMappingURL=auto-csp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-csp.js","sourceRoot":"","sources":["auto-csp.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"auto-csp.js","sourceRoot":"","sources":["auto-csp.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ exports.normalizeCacheOptions = normalizeCacheOptions;
|
|
|
11
11
|
const node_fs_1 = require("node:fs");
|
|
12
12
|
const node_path_1 = require("node:path");
|
|
13
13
|
/** Version placeholder is replaced during the build process with actual package version */
|
|
14
|
-
const VERSION = '22.2.0-next.
|
|
14
|
+
const VERSION = '22.2.0-next.4';
|
|
15
15
|
function hasCacheMetadata(value) {
|
|
16
16
|
return (!!value &&
|
|
17
17
|
typeof value === 'object' &&
|