@angular/build 21.0.0-next.8 → 21.0.0-rc.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/package.json +9 -9
- package/src/builders/application/index.js +39 -0
- package/src/builders/application/index.js.map +1 -1
- package/src/builders/dev-server/options.d.ts +3 -0
- package/src/builders/dev-server/options.js +2 -1
- package/src/builders/dev-server/options.js.map +1 -1
- package/src/builders/dev-server/schema.d.ts +9 -0
- package/src/builders/dev-server/schema.json +7 -0
- package/src/builders/dev-server/vite/index.js +12 -5
- package/src/builders/dev-server/vite/index.js.map +1 -1
- package/src/builders/dev-server/vite/server.js +1 -4
- package/src/builders/dev-server/vite/server.js.map +1 -1
- package/src/builders/extract-i18n/builder.js +1 -3
- package/src/builders/extract-i18n/builder.js.map +1 -1
- package/src/builders/karma/progress-reporter.js +2 -0
- package/src/builders/karma/progress-reporter.js.map +1 -1
- package/src/builders/unit-test/builder.js +0 -1
- package/src/builders/unit-test/builder.js.map +1 -1
- package/src/builders/unit-test/options.d.ts +5 -3
- package/src/builders/unit-test/options.js +23 -15
- package/src/builders/unit-test/options.js.map +1 -1
- package/src/builders/unit-test/runners/karma/executor.js +25 -6
- package/src/builders/unit-test/runners/karma/executor.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/browser-provider.d.ts +3 -2
- package/src/builders/unit-test/runners/vitest/browser-provider.js +65 -16
- package/src/builders/unit-test/runners/vitest/browser-provider.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/build-options.js +24 -1
- package/src/builders/unit-test/runners/vitest/build-options.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/configuration.d.ts +15 -0
- package/src/builders/unit-test/runners/vitest/configuration.js +57 -0
- package/src/builders/unit-test/runners/vitest/configuration.js.map +1 -0
- package/src/builders/unit-test/runners/vitest/executor.js +35 -18
- package/src/builders/unit-test/runners/vitest/executor.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/index.js +7 -2
- package/src/builders/unit-test/runners/vitest/index.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/plugins.js +15 -6
- package/src/builders/unit-test/runners/vitest/plugins.js.map +1 -1
- package/src/builders/unit-test/schema.d.ts +26 -6
- package/src/builders/unit-test/schema.js.map +1 -1
- package/src/builders/unit-test/schema.json +12 -6
- package/src/builders/unit-test/test-discovery.js +6 -3
- package/src/builders/unit-test/test-discovery.js.map +1 -1
- package/src/tools/angular/compilation/angular-compilation.js +1 -5
- package/src/tools/angular/compilation/angular-compilation.js.map +1 -1
- package/src/tools/angular/compilation/jit-compilation.js +34 -2
- package/src/tools/angular/compilation/jit-compilation.js.map +1 -1
- package/src/tools/esbuild/application-code-bundle.js +1 -1
- package/src/tools/esbuild/application-code-bundle.js.map +1 -1
- package/src/tools/esbuild/i18n-inliner-worker.js +34 -2
- package/src/tools/esbuild/i18n-inliner-worker.js.map +1 -1
- package/src/tools/esbuild/i18n-locale-plugin.js +33 -15
- package/src/tools/esbuild/i18n-locale-plugin.js.map +1 -1
- package/src/tools/esbuild/javascript-transformer-worker.js +2 -2
- package/src/tools/esbuild/javascript-transformer-worker.js.map +1 -1
- package/src/tools/esbuild/javascript-transformer.js.map +1 -1
- package/src/tools/vite/middlewares/ssr-middleware.js +41 -5
- package/src/tools/vite/middlewares/ssr-middleware.js.map +1 -1
- package/src/tools/vite/plugins/angular-memory-plugin.js +34 -2
- package/src/tools/vite/plugins/angular-memory-plugin.js.map +1 -1
- package/src/tools/vite/plugins/index.d.ts +0 -1
- package/src/tools/vite/plugins/index.js +1 -3
- package/src/tools/vite/plugins/index.js.map +1 -1
- package/src/tools/vite/plugins/setup-middlewares-plugin.js +34 -2
- package/src/tools/vite/plugins/setup-middlewares-plugin.js.map +1 -1
- package/src/tools/vite/plugins/ssr-transform-plugin.js +34 -2
- package/src/tools/vite/plugins/ssr-transform-plugin.js.map +1 -1
- package/src/utils/environment-options.d.ts +1 -0
- package/src/utils/environment-options.js +6 -1
- package/src/utils/environment-options.js.map +1 -1
- package/src/utils/index-file/augment-index-html.js +34 -2
- package/src/utils/index-file/augment-index-html.js.map +1 -1
- package/src/utils/index-file/html-rewriting-stream.js +34 -2
- package/src/utils/index-file/html-rewriting-stream.js.map +1 -1
- package/src/utils/load-proxy-config.js +7 -21
- package/src/utils/load-proxy-config.js.map +1 -1
- package/src/utils/load-translations.js +1 -2
- package/src/utils/load-translations.js.map +1 -1
- package/src/utils/normalize-cache.js +1 -1
- package/src/utils/server-rendering/esm-in-memory-loader/loader-hooks.js +2 -13
- package/src/utils/server-rendering/esm-in-memory-loader/loader-hooks.js.map +1 -1
- package/src/utils/server-rendering/launch-server.js +36 -2
- package/src/utils/server-rendering/launch-server.js.map +1 -1
- package/src/utils/server-rendering/prerender.js +2 -25
- package/src/utils/server-rendering/prerender.js.map +1 -1
- package/src/utils/server-rendering/render-worker.js +42 -1
- package/src/utils/server-rendering/render-worker.js.map +1 -1
- package/src/utils/server-rendering/routes-extractor-worker.js +36 -0
- package/src/utils/server-rendering/routes-extractor-worker.js.map +1 -1
- package/src/utils/server-rendering/utils.d.ts +10 -0
- package/src/utils/server-rendering/utils.js +25 -0
- package/src/utils/server-rendering/utils.js.map +1 -1
- package/src/utils/service-worker.js +3 -6
- package/src/utils/service-worker.js.map +1 -1
- package/src/utils/supported-browsers.js +1 -1
- package/src/tools/vite/plugins/i18n-locale-plugin.d.ts +0 -14
- package/src/tools/vite/plugins/i18n-locale-plugin.js +0 -55
- package/src/tools/vite/plugins/i18n-locale-plugin.js.map +0 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular/build",
|
|
3
|
-
"version": "21.0.0-
|
|
3
|
+
"version": "21.0.0-rc.0",
|
|
4
4
|
"description": "Official build system for Angular",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Angular CLI",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"builders": "builders.json",
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@ampproject/remapping": "2.3.0",
|
|
26
|
-
"@angular-devkit/architect": "0.2100.0-
|
|
26
|
+
"@angular-devkit/architect": "0.2100.0-rc.0",
|
|
27
27
|
"@babel/core": "7.28.4",
|
|
28
28
|
"@babel/helper-annotate-as-pure": "7.27.3",
|
|
29
29
|
"@babel/helper-split-export-declaration": "7.24.7",
|
|
@@ -31,22 +31,22 @@
|
|
|
31
31
|
"@vitejs/plugin-basic-ssl": "2.1.0",
|
|
32
32
|
"beasties": "0.3.5",
|
|
33
33
|
"browserslist": "^4.26.0",
|
|
34
|
-
"esbuild": "0.25.
|
|
34
|
+
"esbuild": "0.25.11",
|
|
35
35
|
"https-proxy-agent": "7.0.6",
|
|
36
36
|
"istanbul-lib-instrument": "6.0.3",
|
|
37
37
|
"jsonc-parser": "3.3.1",
|
|
38
|
-
"listr2": "9.0.
|
|
38
|
+
"listr2": "9.0.5",
|
|
39
39
|
"magic-string": "0.30.19",
|
|
40
40
|
"mrmime": "2.0.1",
|
|
41
41
|
"parse5-html-rewriting-stream": "8.0.0",
|
|
42
42
|
"picomatch": "4.0.3",
|
|
43
43
|
"piscina": "5.1.3",
|
|
44
|
-
"rolldown": "1.0.0-beta.
|
|
44
|
+
"rolldown": "1.0.0-beta.44",
|
|
45
45
|
"sass": "1.93.2",
|
|
46
46
|
"semver": "7.7.3",
|
|
47
47
|
"source-map-support": "0.5.21",
|
|
48
48
|
"tinyglobby": "0.2.15",
|
|
49
|
-
"vite": "7.1.
|
|
49
|
+
"vite": "7.1.11",
|
|
50
50
|
"watchpack": "2.4.4"
|
|
51
51
|
},
|
|
52
52
|
"optionalDependencies": {
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"@angular/platform-browser": "^21.0.0-next.0",
|
|
61
61
|
"@angular/platform-server": "^21.0.0-next.0",
|
|
62
62
|
"@angular/service-worker": "^21.0.0-next.0",
|
|
63
|
-
"@angular/ssr": "^21.0.0-
|
|
63
|
+
"@angular/ssr": "^21.0.0-rc.0",
|
|
64
64
|
"karma": "^6.4.0",
|
|
65
65
|
"less": "^4.2.0",
|
|
66
66
|
"ng-packagr": "^21.0.0-next.0",
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0",
|
|
69
69
|
"tslib": "^2.3.0",
|
|
70
70
|
"typescript": ">=5.9 <6.0",
|
|
71
|
-
"vitest": "^
|
|
71
|
+
"vitest": "^4.0.0"
|
|
72
72
|
},
|
|
73
73
|
"peerDependenciesMeta": {
|
|
74
74
|
"@angular/core": {
|
|
@@ -112,7 +112,7 @@
|
|
|
112
112
|
"type": "git",
|
|
113
113
|
"url": "https://github.com/angular/angular-cli.git"
|
|
114
114
|
},
|
|
115
|
-
"packageManager": "pnpm@10.
|
|
115
|
+
"packageManager": "pnpm@10.19.0",
|
|
116
116
|
"engines": {
|
|
117
117
|
"node": "^20.19.0 || ^22.12.0 || >=24.0.0",
|
|
118
118
|
"npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
|
|
@@ -6,6 +6,39 @@
|
|
|
6
6
|
* Use of this source code is governed by an MIT-style license that can be
|
|
7
7
|
* found in the LICENSE file at https://angular.dev/license
|
|
8
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 () {
|
|
26
|
+
var ownKeys = function(o) {
|
|
27
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
28
|
+
var ar = [];
|
|
29
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
30
|
+
return ar;
|
|
31
|
+
};
|
|
32
|
+
return ownKeys(o);
|
|
33
|
+
};
|
|
34
|
+
return function (mod) {
|
|
35
|
+
if (mod && mod.__esModule) return mod;
|
|
36
|
+
var result = {};
|
|
37
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
38
|
+
__setModuleDefault(result, mod);
|
|
39
|
+
return result;
|
|
40
|
+
};
|
|
41
|
+
})();
|
|
9
42
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
10
43
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
11
44
|
};
|
|
@@ -44,6 +77,12 @@ context, extensions) {
|
|
|
44
77
|
yield { kind: results_1.ResultKind.Failure, errors: [] };
|
|
45
78
|
return;
|
|
46
79
|
}
|
|
80
|
+
if (environment_options_1.bazelEsbuildPluginPath) {
|
|
81
|
+
extensions ??= {};
|
|
82
|
+
extensions.codePlugins ??= [];
|
|
83
|
+
const { default: bazelEsbuildPlugin } = await Promise.resolve(`${environment_options_1.bazelEsbuildPluginPath}`).then(s => __importStar(require(s)));
|
|
84
|
+
extensions.codePlugins.push(bazelEsbuildPlugin);
|
|
85
|
+
}
|
|
47
86
|
const normalizedOptions = await (0, options_1.normalizeOptions)(context, projectName, options, extensions);
|
|
48
87
|
if (!normalizedOptions.outputOptions.ignoreServer) {
|
|
49
88
|
const { browser, server } = normalizedOptions.outputOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,9 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
|
|
|
25
25
|
poll: number | undefined;
|
|
26
26
|
open: boolean | undefined;
|
|
27
27
|
verbose: boolean | undefined;
|
|
28
|
+
define: {
|
|
29
|
+
[key: string]: string;
|
|
30
|
+
} | undefined;
|
|
28
31
|
watch: boolean | undefined;
|
|
29
32
|
liveReload: boolean;
|
|
30
33
|
hmr: boolean;
|
|
@@ -73,7 +73,7 @@ async function normalizeOptions(context, projectName, options) {
|
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
// Initial options to keep
|
|
76
|
-
const { host, port, poll, open, verbose, watch, liveReload, hmr, headers, proxyConfig, servePath, ssl, sslCert, sslKey, prebundle, allowedHosts, } = options;
|
|
76
|
+
const { host, port, poll, open, verbose, define, watch, liveReload, hmr, headers, proxyConfig, servePath, ssl, sslCert, sslKey, prebundle, allowedHosts, } = options;
|
|
77
77
|
// Return all the normalized options
|
|
78
78
|
return {
|
|
79
79
|
buildTarget,
|
|
@@ -82,6 +82,7 @@ async function normalizeOptions(context, projectName, options) {
|
|
|
82
82
|
poll,
|
|
83
83
|
open,
|
|
84
84
|
verbose,
|
|
85
|
+
define,
|
|
85
86
|
watch,
|
|
86
87
|
liveReload: !!liveReload,
|
|
87
88
|
hmr: hmr ?? !!liveReload,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAqBH,
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,15 @@ export type Schema = {
|
|
|
14
14
|
* `project:target:production,staging`.
|
|
15
15
|
*/
|
|
16
16
|
buildTarget: string;
|
|
17
|
+
/**
|
|
18
|
+
* Defines global identifiers that will be replaced with a specified constant value when
|
|
19
|
+
* found in any JavaScript or TypeScript code including libraries. The value will be used
|
|
20
|
+
* directly. String values must be put in quotes. Identifiers within Angular metadata such
|
|
21
|
+
* as Component Decorators will not be replaced.
|
|
22
|
+
*/
|
|
23
|
+
define?: {
|
|
24
|
+
[key: string]: string;
|
|
25
|
+
};
|
|
17
26
|
/**
|
|
18
27
|
* Custom HTTP headers to be added to all responses.
|
|
19
28
|
*/
|
|
@@ -53,6 +53,13 @@
|
|
|
53
53
|
}
|
|
54
54
|
]
|
|
55
55
|
},
|
|
56
|
+
"define": {
|
|
57
|
+
"description": "Defines global identifiers that will be replaced with a specified constant value when found in any JavaScript or TypeScript code including libraries. The value will be used directly. String values must be put in quotes. Identifiers within Angular metadata such as Component Decorators will not be replaced.",
|
|
58
|
+
"type": "object",
|
|
59
|
+
"additionalProperties": {
|
|
60
|
+
"type": "string"
|
|
61
|
+
}
|
|
62
|
+
},
|
|
56
63
|
"headers": {
|
|
57
64
|
"type": "object",
|
|
58
65
|
"description": "Custom HTTP headers to be added to all responses.",
|
|
@@ -50,7 +50,6 @@ const node_path_1 = require("node:path");
|
|
|
50
50
|
const plugins_1 = require("../../../tools/vite/plugins");
|
|
51
51
|
const utils_1 = require("../../../utils");
|
|
52
52
|
const environment_options_1 = require("../../../utils/environment-options");
|
|
53
|
-
const load_esm_1 = require("../../../utils/load-esm");
|
|
54
53
|
const results_1 = require("../../application/results");
|
|
55
54
|
const schema_1 = require("../../application/schema");
|
|
56
55
|
const internal_1 = require("../internal");
|
|
@@ -61,7 +60,7 @@ const utils_2 = require("./utils");
|
|
|
61
60
|
* Build options that are also present on the dev server but are only passed
|
|
62
61
|
* to the build.
|
|
63
62
|
*/
|
|
64
|
-
const CONVENIENCE_BUILD_OPTIONS = ['watch', 'poll', 'verbose'];
|
|
63
|
+
const CONVENIENCE_BUILD_OPTIONS = ['watch', 'poll', 'verbose', 'define'];
|
|
65
64
|
// eslint-disable-next-line max-lines-per-function
|
|
66
65
|
async function* serveWithVite(serverOptions, builderName, builderAction, context, transformers, extensions) {
|
|
67
66
|
// Get the browser configuration from the target name.
|
|
@@ -72,7 +71,16 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
|
|
|
72
71
|
for (const optionName of CONVENIENCE_BUILD_OPTIONS) {
|
|
73
72
|
const optionValue = serverOptions[optionName];
|
|
74
73
|
if (optionValue !== undefined) {
|
|
75
|
-
rawBrowserOptions[optionName]
|
|
74
|
+
if (optionName === 'define' && rawBrowserOptions[optionName]) {
|
|
75
|
+
// Define has merging behavior within the application
|
|
76
|
+
for (const [key, value] of Object.entries(optionValue)) {
|
|
77
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
78
|
+
rawBrowserOptions[optionName][key] = value;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
rawBrowserOptions[optionName] = optionValue;
|
|
83
|
+
}
|
|
76
84
|
}
|
|
77
85
|
}
|
|
78
86
|
// TODO: Adjust architect to not force a JsonObject derived return type
|
|
@@ -137,8 +145,7 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
|
|
|
137
145
|
{ sourcemap: true, jit: true, thirdPartySourcemaps }, 1);
|
|
138
146
|
// The index HTML path will be updated from the build results if provided by the builder
|
|
139
147
|
let htmlIndexPath = 'index.html';
|
|
140
|
-
|
|
141
|
-
const { createServer, normalizePath } = await (0, load_esm_1.loadEsmModule)('vite');
|
|
148
|
+
const { createServer, normalizePath } = await Promise.resolve().then(() => __importStar(require('vite')));
|
|
142
149
|
let server;
|
|
143
150
|
let serverUrl;
|
|
144
151
|
let hadError = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,6 @@ const node_path_1 = require("node:path");
|
|
|
46
46
|
const plugins_1 = require("../../../tools/vite/plugins");
|
|
47
47
|
const utils_1 = require("../../../tools/vite/utils");
|
|
48
48
|
const utils_2 = require("../../../utils");
|
|
49
|
-
const load_esm_1 = require("../../../utils/load-esm");
|
|
50
49
|
async function createServerConfig(serverOptions, assets, ssrMode, preTransformRequests, cacheDir) {
|
|
51
50
|
const proxy = await (0, utils_2.loadProxyConfiguration)(serverOptions.workspaceRoot, serverOptions.proxyConfig);
|
|
52
51
|
// Files used for SSR warmup.
|
|
@@ -133,8 +132,7 @@ function createSsrConfig(externalMetadata, serverOptions, prebundleTransformer,
|
|
|
133
132
|
};
|
|
134
133
|
}
|
|
135
134
|
async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks, externalMetadata, ssrMode, prebundleTransformer, target, zoneless, componentStyles, templateUpdates, prebundleLoaderExtensions, define, extensionMiddleware, indexHtmlTransformer, thirdPartySourcemaps = false) {
|
|
136
|
-
|
|
137
|
-
const { normalizePath } = await (0, load_esm_1.loadEsmModule)('vite');
|
|
135
|
+
const { normalizePath } = await Promise.resolve().then(() => __importStar(require('vite')));
|
|
138
136
|
// Path will not exist on disk and only used to provide separate path for Vite requests
|
|
139
137
|
const virtualProjectRoot = normalizePath((0, node_path_1.join)(serverOptions.workspaceRoot, `.angular/vite-root`, serverOptions.buildTarget.project));
|
|
140
138
|
/**
|
|
@@ -179,7 +177,6 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
|
|
|
179
177
|
server: await createServerConfig(serverOptions, assets, ssrMode, preTransformRequests, cacheDir),
|
|
180
178
|
ssr: createSsrConfig(externalMetadata, serverOptions, prebundleTransformer, zoneless, target, prebundleLoaderExtensions, thirdPartySourcemaps, define),
|
|
181
179
|
plugins: [
|
|
182
|
-
(0, plugins_1.createAngularLocaleDataPlugin)(),
|
|
183
180
|
(0, plugins_1.createAngularSetupMiddlewaresPlugin)({
|
|
184
181
|
outputFiles,
|
|
185
182
|
assets,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
46
46
|
exports.execute = execute;
|
|
47
47
|
const node_fs_1 = __importDefault(require("node:fs"));
|
|
48
48
|
const node_path_1 = __importDefault(require("node:path"));
|
|
49
|
-
const load_esm_1 = require("../../utils/load-esm");
|
|
50
49
|
const version_1 = require("../../utils/version");
|
|
51
50
|
const options_1 = require("./options");
|
|
52
51
|
const schema_1 = require("./schema");
|
|
@@ -72,8 +71,7 @@ async function execute(options, context, extensions) {
|
|
|
72
71
|
// The package is a peer dependency and might not be present
|
|
73
72
|
let localizeToolsModule;
|
|
74
73
|
try {
|
|
75
|
-
localizeToolsModule =
|
|
76
|
-
await (0, load_esm_1.loadEsmModule)('@angular/localize/tools');
|
|
74
|
+
localizeToolsModule = await Promise.resolve().then(() => __importStar(require('@angular/localize/tools')));
|
|
77
75
|
}
|
|
78
76
|
catch {
|
|
79
77
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,8 @@ function injectKarmaReporter(buildOptions, buildIterator, karmaConfig, controlle
|
|
|
17
17
|
emitter;
|
|
18
18
|
latestBuildFiles;
|
|
19
19
|
static $inject = ['emitter', LATEST_BUILD_FILES_TOKEN];
|
|
20
|
+
// Needed for the karma reporter interface, see https://github.com/angular/angular-cli/issues/31629
|
|
21
|
+
adapters = [];
|
|
20
22
|
constructor(emitter, latestBuildFiles) {
|
|
21
23
|
this.emitter = emitter;
|
|
22
24
|
this.latestBuildFiles = latestBuildFiles;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress-reporter.js","sourceRoot":"","sources":["progress-reporter.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAkBH,
|
|
1
|
+
{"version":3,"file":"progress-reporter.js","sourceRoot":"","sources":["progress-reporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -207,7 +207,6 @@ async function* execute(options, context, extensions) {
|
|
|
207
207
|
context.logger.error(`The builder requires a target to be specified.`);
|
|
208
208
|
return;
|
|
209
209
|
}
|
|
210
|
-
context.logger.warn(`NOTE: The "unit-test" builder is currently EXPERIMENTAL and not ready for production use.`);
|
|
211
210
|
// Initialize the test runner and normalize options
|
|
212
211
|
let runner;
|
|
213
212
|
let normalizedOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+JH,
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+JH,0BAoKC;AAjUD,yDAImC;AACnC,8DAAiC;AACjC,+CAAsC;AACtC,0DAA6B;AAC7B,qFAAsF;AACtF,6CAAkD;AAClD,uDAAwD;AACxD,gDAA0D;AAK1D,oDAAoD;AACpD,uCAA6C;AAE7C,qEAAwE;AAExE,qDAA6C;AAI7C,KAAK,UAAU,cAAc,CAAC,UAAkB;IAC9C,qCAAqC;IACrC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,wBAAwB,UAAU,uEAAuE,CAC1G,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,CAAC;IACjB,IAAI,CAAC;QACH,YAAY,GAAG,yBAAa,aAAa,UAAU,QAAQ,uCAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC;QACjB,IAAI,CAAC,CAAC,IAAI,KAAK,sBAAsB,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,wBAAwB,UAAU,IAAI,CAAC,CAAC;QAC1D,CAAC;QACD,MAAM,IAAI,KAAK,CACb,uBAAuB,UAAU,wEAAwE;YACvG,UAAU,CAAC,CAAC,OAAO,EAAE,CACxB,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC;IACpC,IACE,CAAC,MAAM;QACP,OAAO,MAAM,CAAC,eAAe,KAAK,UAAU;QAC5C,OAAO,MAAM,CAAC,cAAc,KAAK,UAAU,EAC3C,CAAC;QACD,MAAM,IAAI,KAAK,CACb,2BAA2B,UAAU,4DAA4D,CAClG,CAAC;IACJ,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,sBAAsB,CAC7B,YAAgD,EAChD,iBAAyB,EACzB,UAAyC;IAEzC,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,UAAU,KAAK,EAAE,CAAC;IAClB,UAAU,CAAC,WAAW,KAAK,EAAE,CAAC;IAC9B,KAAK,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QACjE,UAAU,CAAC,WAAW,CAAC,IAAI,CACzB,IAAA,iDAAyB,EAAC;YACxB,SAAS;YACT,WAAW,EAAE,GAAG,EAAE;gBAChB,OAAO;oBACL,QAAQ;oBACR,MAAM,EAAE,IAAI;oBACZ,UAAU,EAAE,iBAAiB;iBAC9B,CAAC;YACJ,CAAC;SACF,CAAC,CACH,CAAC;IACJ,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,KAAK,SAAS,CAAC,CAAC,eAAe,CAC7B,QAA8C,EAC9C,uBAA0D,EAC1D,OAAuB,EACvB,aAAiC,EACjC,UAAoD;IAEpD,IAAI,qBAAqB,GAAG,CAAC,CAAC;IAC9B,IAAI,KAAK,EAAE,MAAM,WAAW,IAAI,IAAA,sCAAwB,EACtD,uBAAuB,EACvB,OAAO,EACP,UAAU,CACX,EAAE,CAAC;QACF,IAAI,WAAW,CAAC,IAAI,KAAK,oBAAU,CAAC,OAAO,EAAE,CAAC;YAC5C,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;YACzB,SAAS;QACX,CAAC;aAAM,IACL,WAAW,CAAC,IAAI,KAAK,oBAAU,CAAC,IAAI;YACpC,WAAW,CAAC,IAAI,KAAK,oBAAU,CAAC,WAAW,EAC3C,CAAC;YACD,qBAAM,CAAC,IAAI,CACT,kFAAkF,CACnF,CAAC;QACJ,CAAC;QAED,IAAA,qBAAM,EAAC,WAAW,CAAC,KAAK,EAAE,uCAAuC,CAAC,CAAC;QAEnE,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,WAAW,CAAC,IAAI,KAAK,oBAAU,CAAC,IAAI,EAAE,CAAC;gBACzC,qCAAqC;gBACrC,MAAM,IAAA,aAAE,EAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACN,6CAA6C;gBAC7C,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,OAAO,EAAE,CAAC;oBACvC,MAAM,IAAA,aAAE,EAAC,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;YACD,MAAM,IAAA,2BAAc,EAAC,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;YACvD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,8CAA8C,aAAa,IAAI,CAAC,CAAC;QACvF,CAAC;QAED,2CAA2C;QAC3C,IAAI,CAAC;YACH,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAErC,kDAAkD;YAClD,qBAAqB,GAAG,CAAC,CAAC;QAC5B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC;YACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iDAAiD,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAC9F,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;YACzB,qBAAqB,EAAE,CAAC;QAC1B,CAAC;QAED,IAAI,qBAAqB,IAAI,CAAC,EAAE,CAAC;YAC/B,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,+GAA+G,CAChH,CAAC;YAEF,OAAO;QACT,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACI,KAAK,SAAS,CAAC,CAAC,OAAO,CAC5B,OAA+B,EAC/B,OAAuB,EACvB,UAAyC;IAEzC,qDAAqD;IACrD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;IAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QAEvE,OAAO;IACT,CAAC;IAED,mDAAmD;IACnD,IAAI,MAAM,CAAC;IACX,IAAI,iBAAiB,CAAC;IACtB,IAAI,CAAC;QACH,iBAAiB,GAAG,MAAM,IAAA,0BAAgB,EAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAC1E,MAAM,GAAG,MAAM,cAAc,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAC5D,MAAM,MAAM,CAAC,oBAAoB,EAAE,CAAC,iBAAiB,CAAC,CAAC;IACzD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC;QACjB,IAAI,CAAC,YAAY,6CAAwB,EAAE,CAAC;YAC1C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,oEAAoE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,EAAE,CAC3F,CAAC;QACJ,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAEzB,OAAO;IACT,CAAC;IAED,IAAI,iBAAiB,CAAC,SAAS,EAAE,CAAC;QAChC,MAAM,SAAS,GAAG,MAAM,IAAA,0BAAS,EAC/B,iBAAiB,CAAC,OAAO,EACzB,iBAAiB,CAAC,OAAO,IAAI,EAAE,EAC/B,iBAAiB,CAAC,aAAa,EAC/B,iBAAiB,CAAC,iBAAiB,CACpC,CAAC;QAEF,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAC9C,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;YAC7B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,mBAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACnF,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAExB,OAAO;IACT,CAAC;IAED,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,IAAI,CAAC;;;gBACH,MAAY,QAAQ,kCAAG,MAAM,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,iBAAiB,EAAE,SAAS,CAAC,OAAA,CAAC;gBAC1F,KAAK,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;oBACtB,IAAI,EAAE,oBAAU,CAAC,IAAI;oBACrB,KAAK,EAAE,EAAE;iBACV,CAAC,CAAC;;;;;;;;;;;SACJ;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC;YACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,4DAA4D,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,EAAE,CACnF,CAAC;YACF,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAC3B,CAAC;QAED,OAAO;IACT,CAAC;IAED,8CAA8C;IAC9C,IAAI,kBAAqD,CAAC;IAC1D,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACzF,IACE,WAAW,KAAK,4BAA4B;YAC5C,kDAAkD;YAClD,WAAW,KAAK,2BAA2B,EAC3C,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,2CAA2C,WAAW,6BAA6B;gBACjF,iFAAiF;gBACjF,kDAAkD,CACrD,CAAC;QACJ,CAAC;QAED,kBAAkB,GAAG,CAAC,MAAM,OAAO,CAAC,eAAe,CACjD,MAAM,OAAO,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,CAAC,EAC7D,WAAW,CACZ,CAAiD,CAAC;IACrD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,4CAA4C,IAAA,kCAAsB,EAChE,iBAAiB,CAAC,WAAW,CAC9B,MAAM;YACL,mDAAmD;YACnD,UAAU,CAAC,CAAC,OAAO,EAAE,CACxB,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAEzB,OAAO;IACT,CAAC;IAED,oCAAoC;IACpC,IAAI,kBAAkB,CAAC;IACvB,IAAI,YAAY,CAAC;IACjB,IAAI,sBAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,CAAC;YACC,YAAY,EAAE,kBAAkB;YAChC,YAAY;YACZ,sBAAsB;SACvB,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAC3E,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,uEAAuE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,EAAE,CAC9F,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QAEzB,OAAO;IACT,CAAC;IAED,IAAI,CAAC;;;YACH,MAAY,QAAQ,kCAAG,MAAM,MAAM,CAAC,cAAc,CAChD,OAAO,EACP,iBAAiB,EACjB,sBAAsB,CACvB,OAAA,CAAC;YAEF,MAAM,eAAe,GAAG,sBAAsB,CAC5C,YAAY,EACZ,iBAAiB,CAAC,iBAAiB,EACnC,UAAU,CACX,CAAC;YAEF,wCAAwC;YACxC,MAAM,uBAAuB,GAAG;gBAC9B,GAAG,kBAAkB;gBACrB,GAAG,kBAAkB;gBACrB,KAAK,EAAE,iBAAiB,CAAC,KAAK;gBAC9B,QAAQ,EAAE,iBAAiB,CAAC,aAAa,IAAI,kBAAkB,CAAC,QAAQ;gBACxE,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACpC,CAAC;YAE9C,MAAM,aAAa,GAAG,iBAAiB,CAAC,gBAAgB;gBACtD,CAAC,CAAC,mBAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC;gBAC7E,CAAC,CAAC,SAAS,CAAC;YAEd,KAAK,CAAC,CAAC,eAAe,CACpB,QAAQ,EACR,uBAAuB,EACvB,OAAO,EACP,aAAa,EACb,eAAe,CAChB,CAAC;;;;;;;;;;;KACH;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,4DAA4D,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,EAAE,CACnF,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC3B,CAAC;AACH,CAAC"}
|
|
@@ -17,9 +17,9 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
|
|
|
17
17
|
include: string[];
|
|
18
18
|
exclude: string[] | undefined;
|
|
19
19
|
filter: string | undefined;
|
|
20
|
-
runnerName:
|
|
20
|
+
runnerName: string;
|
|
21
21
|
coverage: {
|
|
22
|
-
|
|
22
|
+
enabled: boolean | undefined;
|
|
23
23
|
exclude: string[] | undefined;
|
|
24
24
|
include: string[] | undefined;
|
|
25
25
|
reporters: [string, Record<string, unknown>][] | undefined;
|
|
@@ -30,7 +30,7 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
|
|
|
30
30
|
functions?: [number, number];
|
|
31
31
|
lines?: [number, number];
|
|
32
32
|
};
|
|
33
|
-
}
|
|
33
|
+
};
|
|
34
34
|
tsConfig: string | undefined;
|
|
35
35
|
buildProgress: boolean | undefined;
|
|
36
36
|
reporters: [string, Record<string, unknown>][] | undefined;
|
|
@@ -42,9 +42,11 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
|
|
|
42
42
|
} | undefined;
|
|
43
43
|
watch: boolean;
|
|
44
44
|
debug: boolean;
|
|
45
|
+
ui: boolean;
|
|
45
46
|
providersFile: string | undefined;
|
|
46
47
|
setupFiles: string[];
|
|
47
48
|
dumpVirtualFiles: boolean | undefined;
|
|
48
49
|
listTests: boolean | undefined;
|
|
50
|
+
runnerConfig: string | boolean | undefined;
|
|
49
51
|
}>;
|
|
50
52
|
export declare function injectTestingPolyfills(polyfills?: string[]): string[];
|
|
@@ -43,7 +43,10 @@ async function normalizeOptions(context, projectName, options) {
|
|
|
43
43
|
// Target specifier defaults to the current project's build target using a development configuration
|
|
44
44
|
const buildTargetSpecifier = options.buildTarget ?? `::development`;
|
|
45
45
|
const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
|
|
46
|
-
const { runner, browsers, progress, filter, browserViewport } = options;
|
|
46
|
+
const { runner, browsers, progress, filter, browserViewport, ui, runnerConfig } = options;
|
|
47
|
+
if (ui && runner !== 'vitest') {
|
|
48
|
+
throw new Error('The "ui" option is only available for the "vitest" runner.');
|
|
49
|
+
}
|
|
47
50
|
const [width, height] = browserViewport?.split('x').map(Number) ?? [];
|
|
48
51
|
let tsConfig = options.tsConfig;
|
|
49
52
|
if (tsConfig) {
|
|
@@ -59,6 +62,11 @@ async function normalizeOptions(context, projectName, options) {
|
|
|
59
62
|
tsConfig = node_path_1.default.relative(workspaceRoot, tsconfigSpecPath);
|
|
60
63
|
}
|
|
61
64
|
}
|
|
65
|
+
let watch = options.watch ?? (0, tty_1.isTTY)();
|
|
66
|
+
if (options.ui && options.watch === false) {
|
|
67
|
+
context.logger.warn(`The '--ui' option requires watch mode. The '--no-watch' flag will be ignored.`);
|
|
68
|
+
watch = true;
|
|
69
|
+
}
|
|
62
70
|
return {
|
|
63
71
|
// Project/workspace information
|
|
64
72
|
workspaceRoot,
|
|
@@ -70,33 +78,33 @@ async function normalizeOptions(context, projectName, options) {
|
|
|
70
78
|
include: options.include ?? ['**/*.spec.ts'],
|
|
71
79
|
exclude: options.exclude,
|
|
72
80
|
filter,
|
|
73
|
-
runnerName: runner,
|
|
74
|
-
coverage:
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
}
|
|
85
|
-
: undefined,
|
|
81
|
+
runnerName: runner ?? 'vitest',
|
|
82
|
+
coverage: {
|
|
83
|
+
enabled: options.coverage,
|
|
84
|
+
exclude: options.coverageExclude,
|
|
85
|
+
include: options.coverageInclude,
|
|
86
|
+
reporters: normalizeReporterOption(options.coverageReporters),
|
|
87
|
+
thresholds: options.coverageThresholds,
|
|
88
|
+
// The schema generation tool doesn't support tuple types for items, but the schema validation
|
|
89
|
+
// does ensure that the array has exactly two numbers.
|
|
90
|
+
watermarks: options.coverageWatermarks,
|
|
91
|
+
},
|
|
86
92
|
tsConfig,
|
|
87
93
|
buildProgress: progress,
|
|
88
94
|
reporters: normalizeReporterOption(options.reporters),
|
|
89
95
|
outputFile: options.outputFile,
|
|
90
96
|
browsers,
|
|
91
97
|
browserViewport: width && height ? { width, height } : undefined,
|
|
92
|
-
watch
|
|
98
|
+
watch,
|
|
93
99
|
debug: options.debug ?? false,
|
|
100
|
+
ui: options.ui ?? false,
|
|
94
101
|
providersFile: options.providersFile && node_path_1.default.join(workspaceRoot, options.providersFile),
|
|
95
102
|
setupFiles: options.setupFiles
|
|
96
103
|
? options.setupFiles.map((setupFile) => node_path_1.default.join(workspaceRoot, setupFile))
|
|
97
104
|
: [],
|
|
98
105
|
dumpVirtualFiles: options.dumpVirtualFiles,
|
|
99
106
|
listTests: options.listTests,
|
|
107
|
+
runnerConfig: typeof runnerConfig === 'string' ? node_path_1.default.join(workspaceRoot, runnerConfig) : runnerConfig,
|
|
100
108
|
};
|
|
101
109
|
}
|
|
102
110
|
function injectTestingPolyfills(polyfills = []) {
|