@depup/angular__build 22.2.0-depup.0 → 22.2.1-depup.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +10 -8
- package/changes.json +15 -7
- package/package.json +26 -18
- package/src/builders/karma/schema.d.ts +4 -4
- package/src/builders/karma/schema.json +2 -2
- package/src/builders/unit-test/runners/vitest/build-options.js +5 -0
- package/src/builders/unit-test/runners/vitest/build-options.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/executor.js +6 -1
- package/src/builders/unit-test/runners/vitest/executor.js.map +1 -1
- package/src/builders/unit-test/schema.d.ts +4 -3
- package/src/builders/unit-test/schema.js.map +1 -1
- package/src/builders/unit-test/schema.json +2 -2
- package/src/tools/angular/linker/oxc-linker.js +28 -4
- package/src/tools/angular/linker/oxc-linker.js.map +1 -1
- package/src/tools/i18n/i18n-inliner-worker.js +45 -31
- package/src/tools/i18n/i18n-inliner-worker.js.map +1 -1
- package/src/tools/i18n/i18n-inliner.js +33 -7
- package/src/tools/i18n/i18n-inliner.js.map +1 -1
- package/src/tools/javascript-transformer/javascript-transformer-worker.js +3 -2
- package/src/tools/javascript-transformer/javascript-transformer-worker.js.map +1 -1
- package/src/tools/vite/middlewares/assets-middleware.js +1 -1
- package/src/tools/vite/middlewares/assets-middleware.js.map +1 -1
- package/src/tools/vite/middlewares/ssr-middleware.d.ts +2 -2
- package/src/tools/vite/middlewares/ssr-middleware.js +5 -3
- package/src/tools/vite/middlewares/ssr-middleware.js.map +1 -1
- package/src/tools/vite/plugins/setup-middlewares-plugin.js +2 -2
- package/src/tools/vite/plugins/setup-middlewares-plugin.js.map +1 -1
- package/src/utils/index-file/auto-csp.js +4 -2
- package/src/utils/index-file/auto-csp.js.map +1 -1
- package/src/utils/normalize-cache.js +7 -2
- package/src/utils/normalize-cache.js.map +1 -1
- package/src/utils/resolve-assets.d.ts +4 -0
- package/src/utils/resolve-assets.js +6 -2
- package/src/utils/resolve-assets.js.map +1 -1
- package/src/utils/watcher.d.ts +7 -0
- package/src/utils/watcher.js +162 -15
- package/src/utils/watcher.js.map +1 -1
package/README.md
CHANGED
|
@@ -13,22 +13,24 @@ npm install @depup/angular__build
|
|
|
13
13
|
|
|
14
14
|
| Field | Value |
|
|
15
15
|
|-------|-------|
|
|
16
|
-
| Original | [@angular/build](https://www.npmjs.com/package/@angular/build) @ 22.2.
|
|
17
|
-
| Processed | 2026-
|
|
16
|
+
| Original | [@angular/build](https://www.npmjs.com/package/@angular/build) @ 22.2.1 |
|
|
17
|
+
| Processed | 2026-10-01 |
|
|
18
18
|
| Smoke test | passed |
|
|
19
|
-
| Deps updated |
|
|
19
|
+
| Deps updated | 9 |
|
|
20
20
|
|
|
21
21
|
## Dependency Changes
|
|
22
22
|
|
|
23
23
|
| Dependency | From | To |
|
|
24
24
|
|------------|------|-----|
|
|
25
25
|
| @babel/core | 8.0.5 | ^8.0.6 |
|
|
26
|
-
| browserslist | ^4.26.0 | ^4.29.
|
|
26
|
+
| browserslist | ^4.26.0 | ^4.29.3 |
|
|
27
|
+
| listr2 | 11.1.0 | ^11.1.1 |
|
|
27
28
|
| magic-string | 1.4.1 | ^1.4.2 |
|
|
28
|
-
| oxc-parser | 0.150.0 | ^0.
|
|
29
|
-
| rolldown | 1.2.8 | ^1.2.
|
|
30
|
-
| sass | 1.104.1 | ^1.105.
|
|
31
|
-
| sass-embedded | 1.104.1 | ^1.105.
|
|
29
|
+
| oxc-parser | 0.150.0 | ^0.152.0 |
|
|
30
|
+
| rolldown | 1.2.8 | ^1.2.12 |
|
|
31
|
+
| sass | 1.104.1 | ^1.105.1 |
|
|
32
|
+
| sass-embedded | 1.104.1 | ^1.105.1 |
|
|
33
|
+
| vite | 8.3.0 | ^8.3.2 |
|
|
32
34
|
|
|
33
35
|
---
|
|
34
36
|
|
package/changes.json
CHANGED
|
@@ -6,7 +6,11 @@
|
|
|
6
6
|
},
|
|
7
7
|
"browserslist": {
|
|
8
8
|
"from": "^4.26.0",
|
|
9
|
-
"to": "^4.29.
|
|
9
|
+
"to": "^4.29.3"
|
|
10
|
+
},
|
|
11
|
+
"listr2": {
|
|
12
|
+
"from": "11.1.0",
|
|
13
|
+
"to": "^11.1.1"
|
|
10
14
|
},
|
|
11
15
|
"magic-string": {
|
|
12
16
|
"from": "1.4.1",
|
|
@@ -14,21 +18,25 @@
|
|
|
14
18
|
},
|
|
15
19
|
"oxc-parser": {
|
|
16
20
|
"from": "0.150.0",
|
|
17
|
-
"to": "^0.
|
|
21
|
+
"to": "^0.152.0"
|
|
18
22
|
},
|
|
19
23
|
"rolldown": {
|
|
20
24
|
"from": "1.2.8",
|
|
21
|
-
"to": "^1.2.
|
|
25
|
+
"to": "^1.2.12"
|
|
22
26
|
},
|
|
23
27
|
"sass": {
|
|
24
28
|
"from": "1.104.1",
|
|
25
|
-
"to": "^1.105.
|
|
29
|
+
"to": "^1.105.1"
|
|
26
30
|
},
|
|
27
31
|
"sass-embedded": {
|
|
28
32
|
"from": "1.104.1",
|
|
29
|
-
"to": "^1.105.
|
|
33
|
+
"to": "^1.105.1"
|
|
34
|
+
},
|
|
35
|
+
"vite": {
|
|
36
|
+
"from": "8.3.0",
|
|
37
|
+
"to": "^8.3.2"
|
|
30
38
|
}
|
|
31
39
|
},
|
|
32
|
-
"timestamp": "2026-
|
|
33
|
-
"totalUpdated":
|
|
40
|
+
"timestamp": "2026-10-01T16:09:46.685Z",
|
|
41
|
+
"totalUpdated": 9
|
|
34
42
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@depup/angular__build",
|
|
3
|
-
"version": "22.2.
|
|
3
|
+
"version": "22.2.1-depup.0",
|
|
4
4
|
"description": "Official build system for Angular (with updated dependencies)",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"@angular/build",
|
|
@@ -29,31 +29,31 @@
|
|
|
29
29
|
"builders": "builders.json",
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@ampproject/remapping": "2.3.0",
|
|
32
|
-
"@angular-devkit/architect": "0.2202.
|
|
32
|
+
"@angular-devkit/architect": "0.2202.1",
|
|
33
33
|
"@babel/core": "^8.0.6",
|
|
34
34
|
"@inquirer/confirm": "6.3.2",
|
|
35
35
|
"@parcel/watcher": "2.6.0",
|
|
36
36
|
"@vitejs/plugin-basic-ssl": "2.3.0",
|
|
37
37
|
"beasties": "0.5.4",
|
|
38
|
-
"browserslist": "^4.29.
|
|
38
|
+
"browserslist": "^4.29.3",
|
|
39
39
|
"chokidar": "5.0.0",
|
|
40
40
|
"esbuild": "0.28.2",
|
|
41
41
|
"https-proxy-agent": "9.1.0",
|
|
42
42
|
"jsonc-parser": "3.3.1",
|
|
43
|
-
"listr2": "11.1.
|
|
43
|
+
"listr2": "^11.1.1",
|
|
44
44
|
"magic-string": "^1.4.2",
|
|
45
45
|
"mrmime": "2.0.1",
|
|
46
|
-
"oxc-parser": "^0.
|
|
46
|
+
"oxc-parser": "^0.152.0",
|
|
47
47
|
"parse5-html-rewriting-stream": "8.0.1",
|
|
48
48
|
"picomatch": "4.0.7",
|
|
49
49
|
"piscina": "5.3.2",
|
|
50
|
-
"rolldown": "^1.2.
|
|
51
|
-
"sass": "^1.105.
|
|
52
|
-
"sass-embedded": "^1.105.
|
|
50
|
+
"rolldown": "^1.2.12",
|
|
51
|
+
"sass": "^1.105.1",
|
|
52
|
+
"sass-embedded": "^1.105.1",
|
|
53
53
|
"semver": "7.8.5",
|
|
54
54
|
"source-map-support": "0.5.21",
|
|
55
55
|
"tinyglobby": "0.2.17",
|
|
56
|
-
"vite": "8.3.
|
|
56
|
+
"vite": "^8.3.2",
|
|
57
57
|
"xxhash-wasm": "1.1.0"
|
|
58
58
|
},
|
|
59
59
|
"optionalDependencies": {
|
|
@@ -67,7 +67,7 @@
|
|
|
67
67
|
"@angular/platform-browser": "^22.0.0",
|
|
68
68
|
"@angular/platform-server": "^22.0.0",
|
|
69
69
|
"@angular/service-worker": "^22.0.0",
|
|
70
|
-
"@angular/ssr": "^22.2.
|
|
70
|
+
"@angular/ssr": "^22.2.1",
|
|
71
71
|
"istanbul-lib-instrument": "^6.0.0",
|
|
72
72
|
"karma": "^6.4.0",
|
|
73
73
|
"less": "^4.2.0",
|
|
@@ -146,7 +146,11 @@
|
|
|
146
146
|
},
|
|
147
147
|
"browserslist": {
|
|
148
148
|
"from": "^4.26.0",
|
|
149
|
-
"to": "^4.29.
|
|
149
|
+
"to": "^4.29.3"
|
|
150
|
+
},
|
|
151
|
+
"listr2": {
|
|
152
|
+
"from": "11.1.0",
|
|
153
|
+
"to": "^11.1.1"
|
|
150
154
|
},
|
|
151
155
|
"magic-string": {
|
|
152
156
|
"from": "1.4.1",
|
|
@@ -154,25 +158,29 @@
|
|
|
154
158
|
},
|
|
155
159
|
"oxc-parser": {
|
|
156
160
|
"from": "0.150.0",
|
|
157
|
-
"to": "^0.
|
|
161
|
+
"to": "^0.152.0"
|
|
158
162
|
},
|
|
159
163
|
"rolldown": {
|
|
160
164
|
"from": "1.2.8",
|
|
161
|
-
"to": "^1.2.
|
|
165
|
+
"to": "^1.2.12"
|
|
162
166
|
},
|
|
163
167
|
"sass": {
|
|
164
168
|
"from": "1.104.1",
|
|
165
|
-
"to": "^1.105.
|
|
169
|
+
"to": "^1.105.1"
|
|
166
170
|
},
|
|
167
171
|
"sass-embedded": {
|
|
168
172
|
"from": "1.104.1",
|
|
169
|
-
"to": "^1.105.
|
|
173
|
+
"to": "^1.105.1"
|
|
174
|
+
},
|
|
175
|
+
"vite": {
|
|
176
|
+
"from": "8.3.0",
|
|
177
|
+
"to": "^8.3.2"
|
|
170
178
|
}
|
|
171
179
|
},
|
|
172
|
-
"depsUpdated":
|
|
180
|
+
"depsUpdated": 9,
|
|
173
181
|
"originalPackage": "@angular/build",
|
|
174
|
-
"originalVersion": "22.2.
|
|
175
|
-
"processedAt": "2026-
|
|
182
|
+
"originalVersion": "22.2.1",
|
|
183
|
+
"processedAt": "2026-10-01T16:10:02.812Z",
|
|
176
184
|
"smokeTest": "passed"
|
|
177
185
|
}
|
|
178
186
|
}
|
|
@@ -32,7 +32,7 @@ export type Schema = {
|
|
|
32
32
|
[key: string]: string;
|
|
33
33
|
};
|
|
34
34
|
/**
|
|
35
|
-
* Globs of files to exclude, relative to the project root.
|
|
35
|
+
* Globs of files to exclude, relative to the project source root.
|
|
36
36
|
*/
|
|
37
37
|
exclude?: string[];
|
|
38
38
|
/**
|
|
@@ -45,11 +45,11 @@ export type Schema = {
|
|
|
45
45
|
*/
|
|
46
46
|
fileReplacements?: FileReplacement[];
|
|
47
47
|
/**
|
|
48
|
-
* Globs of files to include, relative to project root.
|
|
48
|
+
* Globs of files to include, relative to the project source root.
|
|
49
49
|
* There are 2 special cases:
|
|
50
|
-
* - when a path to directory is provided, all spec files ending ".spec.@(ts|tsx)" will be
|
|
50
|
+
* - when a path to a directory is provided, all spec files ending ".spec.@(ts|tsx)" will be
|
|
51
51
|
* included
|
|
52
|
-
* - when a path to a file is provided, and a matching spec file exists it will be included
|
|
52
|
+
* - when a path to a file is provided, and a matching spec file exists, it will be included
|
|
53
53
|
* instead.
|
|
54
54
|
*/
|
|
55
55
|
include?: string[];
|
|
@@ -182,7 +182,7 @@
|
|
|
182
182
|
"type": "string"
|
|
183
183
|
},
|
|
184
184
|
"default": ["**/*.spec.ts"],
|
|
185
|
-
"description": "Globs of files to include, relative to project root. \nThere are 2 special cases:\n - when a path to directory is provided, all spec files ending \".spec.@(ts|tsx)\" will be included\n - when a path to a file is provided, and a matching spec file exists it will be included instead."
|
|
185
|
+
"description": "Globs of files to include, relative to the project source root. \nThere are 2 special cases:\n - when a path to a directory is provided, all spec files ending \".spec.@(ts|tsx)\" will be included\n - when a path to a file is provided, and a matching spec file exists, it will be included instead."
|
|
186
186
|
},
|
|
187
187
|
"exclude": {
|
|
188
188
|
"type": "array",
|
|
@@ -190,7 +190,7 @@
|
|
|
190
190
|
"type": "string"
|
|
191
191
|
},
|
|
192
192
|
"default": [],
|
|
193
|
-
"description": "Globs of files to exclude, relative to the project root."
|
|
193
|
+
"description": "Globs of files to exclude, relative to the project source root."
|
|
194
194
|
},
|
|
195
195
|
"sourceMap": {
|
|
196
196
|
"description": "Output source maps for scripts and styles. For more information, see https://angular.dev/reference/configs/workspace-config#source-map-configuration.",
|
|
@@ -210,6 +210,10 @@ async function getVitestBuildOptions(options, baseBuildOptions) {
|
|
|
210
210
|
entryPoints.set(entryPoint, setupFile);
|
|
211
211
|
}
|
|
212
212
|
}
|
|
213
|
+
// The Angular compiler facade must be loaded in a dedicated setup file before TestBed initialization.
|
|
214
|
+
// This ensures the compiler facade is published before 'init-testbed' or any shared code-split chunks
|
|
215
|
+
// (such as those from a configured 'providersFile') are evaluated.
|
|
216
|
+
entryPoints.set('init-compiler', 'angular:compiler-init');
|
|
213
217
|
entryPoints.set('init-testbed', 'angular:test-bed-init');
|
|
214
218
|
entryPoints.set('vitest-mock-patch', 'angular:vitest-mock-patch');
|
|
215
219
|
// The 'vitest' package is always external for testing purposes
|
|
@@ -293,6 +297,7 @@ async function getVitestBuildOptions(options, baseBuildOptions) {
|
|
|
293
297
|
return {
|
|
294
298
|
buildOptions,
|
|
295
299
|
virtualFiles: {
|
|
300
|
+
'angular:compiler-init': "import '@angular/compiler';",
|
|
296
301
|
'angular:test-bed-init': testBedInitContents,
|
|
297
302
|
'angular:vitest-mock-patch': mockPatchContents,
|
|
298
303
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-options.js","sourceRoot":"","sources":["build-options.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AA8LH,
|
|
1
|
+
{"version":3,"file":"build-options.js","sourceRoot":"","sources":["build-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -216,7 +216,12 @@ class VitestExecutor {
|
|
|
216
216
|
prepareSetupFiles() {
|
|
217
217
|
const { setupFiles } = this.options;
|
|
218
218
|
// Add setup file entries for TestBed initialization and project polyfills
|
|
219
|
-
const testSetupFiles = [
|
|
219
|
+
const testSetupFiles = [
|
|
220
|
+
'init-compiler.js',
|
|
221
|
+
'init-testbed.js',
|
|
222
|
+
'vitest-mock-patch.js',
|
|
223
|
+
...setupFiles,
|
|
224
|
+
];
|
|
220
225
|
// TODO: Provide additional result metadata to avoid needing to extract based on filename
|
|
221
226
|
if (this.buildResultFiles.has('polyfills.js')) {
|
|
222
227
|
testSetupFiles.unshift('polyfills.js');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["executor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,7 +60,8 @@ export type Schema = {
|
|
|
60
60
|
*/
|
|
61
61
|
dumpVirtualFiles?: boolean;
|
|
62
62
|
/**
|
|
63
|
-
* Specifies glob patterns of files to exclude from testing, relative to the project
|
|
63
|
+
* Specifies glob patterns of files to exclude from testing, relative to the project source
|
|
64
|
+
* root.
|
|
64
65
|
*/
|
|
65
66
|
exclude?: string[];
|
|
66
67
|
/**
|
|
@@ -76,8 +77,8 @@ export type Schema = {
|
|
|
76
77
|
*/
|
|
77
78
|
headless?: boolean;
|
|
78
79
|
/**
|
|
79
|
-
* Specifies glob patterns of files to include for testing, relative to the project
|
|
80
|
-
* This option also has special handling for directory paths (includes all test files
|
|
80
|
+
* Specifies glob patterns of files to include for testing, relative to the project source
|
|
81
|
+
* root. This option also has special handling for directory paths (includes all test files
|
|
81
82
|
* within) and file paths (includes the corresponding test file if one exists).
|
|
82
83
|
*/
|
|
83
84
|
include?: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["schema.ts"],"names":[],"mappings":";AACA,mFAAmF;AACnF,oFAAoF;;;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["schema.ts"],"names":[],"mappings":";AACA,mFAAmF;AACnF,oFAAoF;;;AA+KpF,IAAY,oBASX;AATD,WAAY,oBAAoB;IAC5B,+CAAuB,CAAA;IACvB,qCAAa,CAAA;IACb,qCAAa,CAAA;IACb,oDAA4B,CAAA;IAC5B,qCAAa,CAAA;IACb,6CAAqB,CAAA;IACrB,qCAAa,CAAA;IACb,oDAA4B,CAAA;AAChC,CAAC,EATW,oBAAoB,oCAApB,oBAAoB,QAS/B;AAwDD;;GAEG;AACH,IAAY,MAGX;AAHD,WAAY,MAAM;IACd,yBAAe,CAAA;IACf,2BAAiB,CAAA;AACrB,CAAC,EAHW,MAAM,sBAAN,MAAM,QAGjB"}
|
|
@@ -43,14 +43,14 @@
|
|
|
43
43
|
"type": "string"
|
|
44
44
|
},
|
|
45
45
|
"default": ["**/*.spec.ts", "**/*.test.ts"],
|
|
46
|
-
"description": "Specifies glob patterns of files to include for testing, relative to the project root. This option also has special handling for directory paths (includes all test files within) and file paths (includes the corresponding test file if one exists)."
|
|
46
|
+
"description": "Specifies glob patterns of files to include for testing, relative to the project source root. This option also has special handling for directory paths (includes all test files within) and file paths (includes the corresponding test file if one exists)."
|
|
47
47
|
},
|
|
48
48
|
"exclude": {
|
|
49
49
|
"type": "array",
|
|
50
50
|
"items": {
|
|
51
51
|
"type": "string"
|
|
52
52
|
},
|
|
53
|
-
"description": "Specifies glob patterns of files to exclude from testing, relative to the project root."
|
|
53
|
+
"description": "Specifies glob patterns of files to exclude from testing, relative to the project source root."
|
|
54
54
|
},
|
|
55
55
|
"filter": {
|
|
56
56
|
"type": "string",
|
|
@@ -8,7 +8,6 @@
|
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.OxcLinker = void 0;
|
|
11
|
-
const compiler_cli_1 = require("@angular/compiler-cli");
|
|
12
11
|
const linker_1 = require("@angular/compiler-cli/linker");
|
|
13
12
|
const oxc_ast_host_1 = require("./oxc-ast-host");
|
|
14
13
|
const string_ast_factory_1 = require("./string-ast-factory");
|
|
@@ -39,7 +38,33 @@ const noopFileSystem = {
|
|
|
39
38
|
dirname: (path) => path.split('/').slice(0, -1).join('/'),
|
|
40
39
|
relative: (_from, to) => to,
|
|
41
40
|
};
|
|
42
|
-
|
|
41
|
+
const defaultLogger = {
|
|
42
|
+
level: 1, // LogLevel.info
|
|
43
|
+
debug(...args) {
|
|
44
|
+
if (this.level <= 0) {
|
|
45
|
+
// eslint-disable-next-line no-console
|
|
46
|
+
console.debug(...args);
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
info(...args) {
|
|
50
|
+
if (this.level <= 1) {
|
|
51
|
+
// eslint-disable-next-line no-console
|
|
52
|
+
console.info(...args);
|
|
53
|
+
}
|
|
54
|
+
},
|
|
55
|
+
warn(...args) {
|
|
56
|
+
if (this.level <= 2) {
|
|
57
|
+
// eslint-disable-next-line no-console
|
|
58
|
+
console.warn(...args);
|
|
59
|
+
}
|
|
60
|
+
},
|
|
61
|
+
error(...args) {
|
|
62
|
+
if (this.level <= 3) {
|
|
63
|
+
// eslint-disable-next-line no-console
|
|
64
|
+
console.error(...args);
|
|
65
|
+
}
|
|
66
|
+
},
|
|
67
|
+
};
|
|
43
68
|
let SHARED_AST_HOST;
|
|
44
69
|
let SHARED_DECLARATION_SCOPE;
|
|
45
70
|
/**
|
|
@@ -48,11 +73,10 @@ let SHARED_DECLARATION_SCOPE;
|
|
|
48
73
|
class OxcLinker {
|
|
49
74
|
#fileLinker;
|
|
50
75
|
constructor(filename, code, jit = false) {
|
|
51
|
-
SHARED_LOGGER ??= new compiler_cli_1.ConsoleLogger(compiler_cli_1.LogLevel.info);
|
|
52
76
|
SHARED_AST_HOST ??= new oxc_ast_host_1.OxcAstHost();
|
|
53
77
|
SHARED_DECLARATION_SCOPE ??= new InlineDeclarationScope();
|
|
54
78
|
const astFactory = new string_ast_factory_1.StringAstFactory(code);
|
|
55
|
-
const linkerEnvironment = linker_1.LinkerEnvironment.create(noopFileSystem,
|
|
79
|
+
const linkerEnvironment = linker_1.LinkerEnvironment.create(noopFileSystem, defaultLogger, SHARED_AST_HOST, astFactory, { linkerJitMode: jit, sourceMapping: false });
|
|
56
80
|
this.#fileLinker = new linker_1.FileLinker(linkerEnvironment, filename, code);
|
|
57
81
|
}
|
|
58
82
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oxc-linker.js","sourceRoot":"","sources":["oxc-linker.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;
|
|
1
|
+
{"version":3,"file":"oxc-linker.js","sourceRoot":"","sources":["oxc-linker.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,13 +39,10 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
39
39
|
return result;
|
|
40
40
|
};
|
|
41
41
|
})();
|
|
42
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
43
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
44
|
-
};
|
|
45
42
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
46
43
|
exports.inlineFileBatch = inlineFileBatch;
|
|
47
44
|
exports.inlineCode = inlineCode;
|
|
48
|
-
const
|
|
45
|
+
const localize_1 = require("@angular/localize");
|
|
49
46
|
const magic_string_1 = require("magic-string");
|
|
50
47
|
const node_v8_1 = require("node:v8");
|
|
51
48
|
const oxc_parser_1 = require("oxc-parser");
|
|
@@ -64,6 +61,7 @@ const deserializedTranslations = new Map();
|
|
|
64
61
|
* The current inlining generation for this worker.
|
|
65
62
|
*/
|
|
66
63
|
let currentGeneration;
|
|
64
|
+
let remapping;
|
|
67
65
|
/**
|
|
68
66
|
* Retrieves the file data for a filename, loading and extracting localization metadata.
|
|
69
67
|
* If `cache` is true, the result is cached in `fileDataCache` across requests in this Worker.
|
|
@@ -164,15 +162,16 @@ async function inlineFileBatch(request) {
|
|
|
164
162
|
const rawMap = await request.map.text();
|
|
165
163
|
map = rawMap ? JSON.parse(rawMap) : undefined;
|
|
166
164
|
}
|
|
167
|
-
const results =
|
|
165
|
+
const results = [];
|
|
166
|
+
for (const [locale, translation] of request.locales) {
|
|
168
167
|
const result = await inlineLocalize(code, map, metadata, locale, await loadTranslation(locale, translation), request.filename, request.missingTranslation);
|
|
169
|
-
|
|
168
|
+
results.push({
|
|
170
169
|
locale,
|
|
171
170
|
code: result.code,
|
|
172
171
|
map: result.map,
|
|
173
|
-
messages: result.diagnostics
|
|
174
|
-
};
|
|
175
|
-
}
|
|
172
|
+
messages: result.diagnostics,
|
|
173
|
+
});
|
|
174
|
+
}
|
|
176
175
|
return {
|
|
177
176
|
file: request.filename,
|
|
178
177
|
results,
|
|
@@ -190,25 +189,40 @@ async function inlineCode(request) {
|
|
|
190
189
|
const result = await inlineLocalize(request.code, undefined, metadata, request.locale, await loadTranslation(request.locale, request.translation), request.filename, request.missingTranslation);
|
|
191
190
|
return {
|
|
192
191
|
output: result.code ?? request.code,
|
|
193
|
-
messages: result.diagnostics
|
|
192
|
+
messages: result.diagnostics,
|
|
194
193
|
};
|
|
195
194
|
}
|
|
196
195
|
/**
|
|
197
|
-
*
|
|
198
|
-
*
|
|
196
|
+
* Translates a $localize message using @angular/localize low-level runtime functions.
|
|
197
|
+
* Handles missing translations and errors without requiring @angular/localize/tools.
|
|
199
198
|
*/
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
199
|
+
function translateMessage(diagnostics, translations, messageParts, substitutions, missingTranslation) {
|
|
200
|
+
// Fast path: untranslated locale (e.g. source locale without a translation dictionary).
|
|
201
|
+
// Directly parse the message parts to strip metadata and placeholder markers without
|
|
202
|
+
// throwing and catching a MissingTranslationError exception.
|
|
203
|
+
if (translations === undefined) {
|
|
204
|
+
const message = (0, localize_1.ɵparseMessage)(messageParts, substitutions);
|
|
205
|
+
return [(0, localize_1.ɵmakeTemplateObject)(message.messageParts, message.messageParts), substitutions];
|
|
206
|
+
}
|
|
207
|
+
try {
|
|
208
|
+
return (0, localize_1.ɵtranslate)(translations, messageParts, substitutions);
|
|
209
|
+
}
|
|
210
|
+
catch (error) {
|
|
211
|
+
if ((0, localize_1.ɵisMissingTranslationError)(error)) {
|
|
212
|
+
if (missingTranslation !== 'ignore') {
|
|
213
|
+
diagnostics.push({ type: missingTranslation, message: error.message });
|
|
214
|
+
}
|
|
215
|
+
return [
|
|
216
|
+
(0, localize_1.ɵmakeTemplateObject)(error.parsedMessage.messageParts, error.parsedMessage.messageParts),
|
|
217
|
+
substitutions,
|
|
218
|
+
];
|
|
219
|
+
}
|
|
220
|
+
else {
|
|
221
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
222
|
+
diagnostics.push({ type: 'error', message });
|
|
223
|
+
return [messageParts, substitutions];
|
|
224
|
+
}
|
|
225
|
+
}
|
|
212
226
|
}
|
|
213
227
|
/**
|
|
214
228
|
* Extracts localization call sites and locale insertion points from JavaScript code using OXC.
|
|
@@ -291,20 +305,19 @@ function escapeTemplatePart(part) {
|
|
|
291
305
|
*/
|
|
292
306
|
async function inlineLocalize(code, map, metadata, locale, translation, filename, missingTranslation = 'warning') {
|
|
293
307
|
const magicString = new magic_string_1.MagicString(code);
|
|
294
|
-
const
|
|
295
|
-
const diagnostics = new Diagnostics();
|
|
308
|
+
const diagnostics = [];
|
|
296
309
|
if (metadata.diagnostics) {
|
|
297
310
|
for (const message of metadata.diagnostics) {
|
|
298
|
-
diagnostics.error
|
|
311
|
+
diagnostics.push({ type: 'error', message });
|
|
299
312
|
}
|
|
300
313
|
}
|
|
301
314
|
if (metadata.localeInsertSites.length > 0) {
|
|
302
315
|
const localeData = await (0, locale_data_1.loadLocaleData)(locale);
|
|
303
316
|
if (localeData.error) {
|
|
304
|
-
diagnostics.error
|
|
317
|
+
diagnostics.push({ type: 'error', message: localeData.error });
|
|
305
318
|
}
|
|
306
319
|
else if (localeData.warning) {
|
|
307
|
-
diagnostics.
|
|
320
|
+
diagnostics.push({ type: 'warning', message: localeData.warning });
|
|
308
321
|
}
|
|
309
322
|
let injected = false;
|
|
310
323
|
for (const site of metadata.localeInsertSites) {
|
|
@@ -313,7 +326,7 @@ async function inlineLocalize(code, map, metadata, locale, translation, filename
|
|
|
313
326
|
}
|
|
314
327
|
}
|
|
315
328
|
for (const callSite of metadata.callSites) {
|
|
316
|
-
const [translatedParts, translatedSubstitutions] =
|
|
329
|
+
const [translatedParts, translatedSubstitutions] = translateMessage(diagnostics, translation, callSite.messageParts, callSite.expressionIndexes, translation === undefined ? 'ignore' : missingTranslation);
|
|
317
330
|
// Reconstruct the new template/string literal replacement
|
|
318
331
|
let replacement;
|
|
319
332
|
if (translatedSubstitutions.length === 0) {
|
|
@@ -352,7 +365,8 @@ async function inlineLocalize(code, map, metadata, locale, translation, filename
|
|
|
352
365
|
includeContent: true,
|
|
353
366
|
hires: 'boundary',
|
|
354
367
|
});
|
|
355
|
-
|
|
368
|
+
remapping ??= (await Promise.resolve().then(() => __importStar(require('@ampproject/remapping')))).default;
|
|
369
|
+
outputMap = remapping([{ ...rawMap, version: 3 }, map], () => null);
|
|
356
370
|
}
|
|
357
371
|
return {
|
|
358
372
|
code: outputCode,
|