@analogjs/vitest-angular 2.4.0-beta.9 → 3.0.0-alpha.10
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 +2 -2
- package/_virtual/_@oxc-project_runtime@0.120.0/helpers/decorate.js +9 -0
- package/package.json +8 -8
- package/setup-snapshots.d.ts +18 -18
- package/setup-snapshots.js +71 -95
- package/setup-snapshots.js.map +1 -0
- package/setup-testbed.d.ts +12 -5
- package/setup-testbed.js +23 -24
- package/setup-testbed.js.map +1 -0
- package/setup-zone.d.ts +6 -5
- package/setup-zone.js +90 -105
- package/setup-zone.js.map +1 -0
- package/src/index.d.ts +2 -2
- package/src/index.js +3 -4
- package/src/lib/builders/build/devkit.d.ts +2 -2
- package/src/lib/builders/build/devkit.js +23 -17
- package/src/lib/builders/build/devkit.js.map +1 -0
- package/src/lib/builders/build/plugins/angular-memory-plugin.d.ts +13 -20
- package/src/lib/builders/build/plugins/angular-memory-plugin.js +51 -77
- package/src/lib/builders/build/plugins/angular-memory-plugin.js.map +1 -0
- package/src/lib/builders/build/plugins/downlevel-plugin.d.ts +10 -0
- package/src/lib/builders/build/plugins/downlevel-plugin.js +24 -0
- package/src/lib/builders/build/plugins/downlevel-plugin.js.map +1 -0
- package/src/lib/builders/build/schema.js +53 -0
- package/src/lib/builders/build/schema.js.map +1 -0
- package/src/lib/builders/build/schema.json +44 -44
- package/src/lib/builders/build/utils.d.ts +3 -3
- package/src/lib/builders/build/vitest.impl.d.ts +5 -5
- package/src/lib/builders/build/vitest.impl.js +154 -190
- package/src/lib/builders/build/vitest.impl.js.map +1 -0
- package/src/lib/builders/test/schema.js +51 -0
- package/src/lib/builders/test/schema.js.map +1 -0
- package/src/lib/builders/test/schema.json +44 -44
- package/src/lib/builders/test/vitest.impl.d.ts +1 -1
- package/src/lib/builders/test/vitest.impl.js +48 -58
- package/src/lib/builders/test/vitest.impl.js.map +1 -0
- package/src/lib/tools/package.json +1 -5
- package/src/lib/tools/src/index.d.ts +1 -1
- package/src/lib/tools/src/index.js +3 -6
- package/src/lib/tools/src/schematics/setup/index.d.ts +2 -2
- package/src/lib/tools/src/schematics/setup/index.js +46 -71
- package/src/lib/tools/src/schematics/setup/index.js.map +1 -1
- package/src/lib/tools/src/schematics/utils/angular.d.ts +1 -1
- package/src/lib/tools/src/schematics/utils/angular.js +16 -22
- package/src/lib/tools/src/schematics/utils/angular.js.map +1 -1
- package/src/lib/tools/src/schematics/utils/dependencies.d.ts +2 -2
- package/src/lib/tools/src/schematics/utils/dependencies.js +34 -44
- package/src/lib/tools/src/schematics/utils/dependencies.js.map +1 -1
- package/src/lib/tools/src/schematics/utils/index.d.ts +4 -4
- package/src/lib/tools/src/schematics/utils/index.js +4 -8
- package/src/lib/tools/src/schematics/utils/versions.d.ts +1 -1
- package/src/lib/tools/src/schematics/utils/versions.js +17 -12
- package/src/lib/tools/src/schematics/utils/versions.js.map +1 -1
- package/src/lib/tools/src/schematics/utils/workspace.d.ts +8 -8
- package/src/lib/tools/src/schematics/utils/workspace.js +14 -17
- package/src/lib/tools/src/schematics/utils/workspace.js.map +1 -1
- package/src/lib/tools/src/test-global-setup.d.ts +1 -0
- package/src/lib/builders/build/plugins/esbuild-downlevel-plugin.d.ts +0 -7
- package/src/lib/builders/build/plugins/esbuild-downlevel-plugin.js +0 -23
- package/src/lib/builders/build/utils.js +0 -1
- package/src/lib/tools/src/index.js.map +0 -1
- package/src/lib/tools/src/schematics/utils/index.js.map +0 -1
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
var schema_default = {
|
|
2
|
+
version: 2,
|
|
3
|
+
cli: "nx",
|
|
4
|
+
title: "Vitest Builder for Angular",
|
|
5
|
+
description: "Run unit tests using Vitest.",
|
|
6
|
+
type: "object",
|
|
7
|
+
properties: {
|
|
8
|
+
"configFile": {
|
|
9
|
+
"type": "string",
|
|
10
|
+
"description": "The path to the local vitest config",
|
|
11
|
+
"x-completion-type": "file",
|
|
12
|
+
"x-completion-glob": "@(vitest|vite).config@(.js|.ts)",
|
|
13
|
+
"aliases": ["config"]
|
|
14
|
+
},
|
|
15
|
+
"reportsDirectory": {
|
|
16
|
+
"type": "string",
|
|
17
|
+
"description": "Directory to write coverage report to."
|
|
18
|
+
},
|
|
19
|
+
"mode": {
|
|
20
|
+
"type": "string",
|
|
21
|
+
"description": "Mode for Vite."
|
|
22
|
+
},
|
|
23
|
+
"testFiles": {
|
|
24
|
+
"aliases": ["testFile"],
|
|
25
|
+
"type": "array",
|
|
26
|
+
"items": { "type": "string" }
|
|
27
|
+
},
|
|
28
|
+
"watch": {
|
|
29
|
+
"description": "Watch files for changes and rerun tests related to changed files.",
|
|
30
|
+
"type": "boolean"
|
|
31
|
+
},
|
|
32
|
+
"ui": {
|
|
33
|
+
"description": "Run tests using Vitest UI Mode.",
|
|
34
|
+
"type": "boolean"
|
|
35
|
+
},
|
|
36
|
+
"coverage": {
|
|
37
|
+
"description": "Enable code coverage analysis.",
|
|
38
|
+
"type": "boolean"
|
|
39
|
+
},
|
|
40
|
+
"update": {
|
|
41
|
+
"description": "Update snapshot.",
|
|
42
|
+
"type": "boolean",
|
|
43
|
+
"aliases": ["u"]
|
|
44
|
+
}
|
|
45
|
+
},
|
|
46
|
+
required: []
|
|
47
|
+
};
|
|
48
|
+
//#endregion
|
|
49
|
+
export { schema_default as default };
|
|
50
|
+
|
|
51
|
+
//# sourceMappingURL=schema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schema.js","names":[],"sources":["../../../../../../../packages/vitest-angular/src/lib/builders/test/schema.json"],"sourcesContent":["{\n \"version\": 2,\n \"cli\": \"nx\",\n \"title\": \"Vitest Builder for Angular\",\n \"description\": \"Run unit tests using Vitest.\",\n \"type\": \"object\",\n \"properties\": {\n \"configFile\": {\n \"type\": \"string\",\n \"description\": \"The path to the local vitest config\",\n \"x-completion-type\": \"file\",\n \"x-completion-glob\": \"@(vitest|vite).config@(.js|.ts)\",\n \"aliases\": [\"config\"]\n },\n \"reportsDirectory\": {\n \"type\": \"string\",\n \"description\": \"Directory to write coverage report to.\"\n },\n \"mode\": {\n \"type\": \"string\",\n \"description\": \"Mode for Vite.\"\n },\n \"testFiles\": {\n \"aliases\": [\"testFile\"],\n \"type\": \"array\",\n \"items\": { \"type\": \"string\" }\n },\n \"watch\": {\n \"description\": \"Watch files for changes and rerun tests related to changed files.\",\n \"type\": \"boolean\"\n },\n \"ui\": {\n \"description\": \"Run tests using Vitest UI Mode.\",\n \"type\": \"boolean\"\n },\n \"coverage\": {\n \"description\": \"Enable code coverage analysis.\",\n \"type\": \"boolean\"\n },\n \"update\": {\n \"description\": \"Update snapshot.\",\n \"type\": \"boolean\",\n \"aliases\": [\"u\"]\n }\n },\n \"required\": []\n}\n"],"mappings":""}
|
|
@@ -1,47 +1,47 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
},
|
|
15
|
-
"reportsDirectory": {
|
|
16
|
-
"type": "string",
|
|
17
|
-
"description": "Directory to write coverage report to."
|
|
18
|
-
},
|
|
19
|
-
"mode": {
|
|
20
|
-
"type": "string",
|
|
21
|
-
"description": "Mode for Vite."
|
|
22
|
-
},
|
|
23
|
-
"testFiles": {
|
|
24
|
-
"aliases": ["testFile"],
|
|
25
|
-
"type": "array",
|
|
26
|
-
"items": { "type": "string" }
|
|
27
|
-
},
|
|
28
|
-
"watch": {
|
|
29
|
-
"description": "Watch files for changes and rerun tests related to changed files.",
|
|
30
|
-
"type": "boolean"
|
|
31
|
-
},
|
|
32
|
-
"ui": {
|
|
33
|
-
"description": "Run tests using Vitest UI Mode.",
|
|
34
|
-
"type": "boolean"
|
|
35
|
-
},
|
|
36
|
-
"coverage": {
|
|
37
|
-
"description": "Enable code coverage analysis.",
|
|
38
|
-
"type": "boolean"
|
|
39
|
-
},
|
|
40
|
-
"update": {
|
|
41
|
-
"description": "Update snapshot.",
|
|
42
|
-
"type": "boolean",
|
|
43
|
-
"aliases": ["u"]
|
|
44
|
-
}
|
|
2
|
+
"version": 2,
|
|
3
|
+
"cli": "nx",
|
|
4
|
+
"title": "Vitest Builder for Angular",
|
|
5
|
+
"description": "Run unit tests using Vitest.",
|
|
6
|
+
"type": "object",
|
|
7
|
+
"properties": {
|
|
8
|
+
"configFile": {
|
|
9
|
+
"type": "string",
|
|
10
|
+
"description": "The path to the local vitest config",
|
|
11
|
+
"x-completion-type": "file",
|
|
12
|
+
"x-completion-glob": "@(vitest|vite).config@(.js|.ts)",
|
|
13
|
+
"aliases": ["config"]
|
|
45
14
|
},
|
|
46
|
-
"
|
|
15
|
+
"reportsDirectory": {
|
|
16
|
+
"type": "string",
|
|
17
|
+
"description": "Directory to write coverage report to."
|
|
18
|
+
},
|
|
19
|
+
"mode": {
|
|
20
|
+
"type": "string",
|
|
21
|
+
"description": "Mode for Vite."
|
|
22
|
+
},
|
|
23
|
+
"testFiles": {
|
|
24
|
+
"aliases": ["testFile"],
|
|
25
|
+
"type": "array",
|
|
26
|
+
"items": { "type": "string" }
|
|
27
|
+
},
|
|
28
|
+
"watch": {
|
|
29
|
+
"description": "Watch files for changes and rerun tests related to changed files.",
|
|
30
|
+
"type": "boolean"
|
|
31
|
+
},
|
|
32
|
+
"ui": {
|
|
33
|
+
"description": "Run tests using Vitest UI Mode.",
|
|
34
|
+
"type": "boolean"
|
|
35
|
+
},
|
|
36
|
+
"coverage": {
|
|
37
|
+
"description": "Enable code coverage analysis.",
|
|
38
|
+
"type": "boolean"
|
|
39
|
+
},
|
|
40
|
+
"update": {
|
|
41
|
+
"description": "Update snapshot.",
|
|
42
|
+
"type": "boolean",
|
|
43
|
+
"aliases": ["u"]
|
|
44
|
+
}
|
|
45
|
+
},
|
|
46
|
+
"required": []
|
|
47
47
|
}
|
|
@@ -1,61 +1,51 @@
|
|
|
1
|
-
import { createBuilder
|
|
1
|
+
import { createBuilder } from "@angular-devkit/architect";
|
|
2
|
+
//#region packages/vitest-angular/src/lib/builders/test/vitest.impl.ts
|
|
2
3
|
async function vitestBuilder(options, context) {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
process.on('SIGINT', processExit);
|
|
40
|
-
process.on('SIGTERM', processExit);
|
|
41
|
-
process.on('exit', processExit);
|
|
42
|
-
}
|
|
43
|
-
// vitest sets the exitCode = 1 when code coverage isn't met
|
|
44
|
-
hasErrors = (process.exitCode && process.exitCode !== 0);
|
|
45
|
-
return {
|
|
46
|
-
success: !hasErrors,
|
|
47
|
-
};
|
|
4
|
+
process.env["TEST"] = "true";
|
|
5
|
+
process.env["VITEST"] = "true";
|
|
6
|
+
const { startVitest } = await Function("return import(\"vitest/node\")")();
|
|
7
|
+
const projectConfig = await context.getProjectMetadata(context.target);
|
|
8
|
+
const { coverageArgs, ...extraArgs } = await getExtraArgs(options);
|
|
9
|
+
const watch = options.watch === true;
|
|
10
|
+
const ui = options.ui === true;
|
|
11
|
+
const coverageEnabled = options.coverage === true;
|
|
12
|
+
const update = options.update === true;
|
|
13
|
+
const config = {
|
|
14
|
+
root: `${projectConfig["root"] || "."}`,
|
|
15
|
+
watch,
|
|
16
|
+
ui,
|
|
17
|
+
config: options.configFile,
|
|
18
|
+
coverage: {
|
|
19
|
+
enabled: coverageEnabled,
|
|
20
|
+
...coverageArgs
|
|
21
|
+
},
|
|
22
|
+
update,
|
|
23
|
+
...extraArgs
|
|
24
|
+
};
|
|
25
|
+
const viteOverrides = { test: { watch } };
|
|
26
|
+
const server = await startVitest("test", options.testFiles ?? [], config, viteOverrides);
|
|
27
|
+
let hasErrors = false;
|
|
28
|
+
const processExit = () => {
|
|
29
|
+
server?.exit();
|
|
30
|
+
if (hasErrors) process.exit(1);
|
|
31
|
+
else process.exit(0);
|
|
32
|
+
};
|
|
33
|
+
if (options.watch) {
|
|
34
|
+
process.once("SIGINT", processExit);
|
|
35
|
+
process.once("SIGTERM", processExit);
|
|
36
|
+
process.once("exit", processExit);
|
|
37
|
+
}
|
|
38
|
+
hasErrors = process.exitCode && process.exitCode !== 0;
|
|
39
|
+
return { success: !hasErrors };
|
|
48
40
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
if (!schema.default.properties[key]) {
|
|
55
|
-
extraArgs[key] = options[key];
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
return extraArgs;
|
|
41
|
+
async function getExtraArgs(options) {
|
|
42
|
+
const schema = await import("./schema.json", { with: { type: "json" } });
|
|
43
|
+
const extraArgs = {};
|
|
44
|
+
for (const key of Object.keys(options)) if (!schema.default.properties[key]) extraArgs[key] = options[key];
|
|
45
|
+
return extraArgs;
|
|
59
46
|
}
|
|
60
|
-
|
|
61
|
-
//#
|
|
47
|
+
var vitest_impl_default = createBuilder(vitestBuilder);
|
|
48
|
+
//#endregion
|
|
49
|
+
export { vitest_impl_default as default };
|
|
50
|
+
|
|
51
|
+
//# sourceMappingURL=vitest.impl.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vitest.impl.js","names":[],"sources":["../../../../../../../packages/vitest-angular/src/lib/builders/test/vitest.impl.ts"],"sourcesContent":["import {\n BuilderContext,\n BuilderOutput,\n createBuilder,\n} from '@angular-devkit/architect';\n\nimport { VitestSchema } from './schema';\n\nasync function vitestBuilder(\n options: VitestSchema,\n context: BuilderContext,\n): Promise<BuilderOutput> {\n process.env['TEST'] = 'true';\n process.env['VITEST'] = 'true';\n\n const { startVitest } = await (Function(\n 'return import(\"vitest/node\")',\n )() as Promise<typeof import('vitest/node')>);\n\n const projectConfig = await context.getProjectMetadata(\n context.target as unknown as string,\n );\n const { coverageArgs, ...extraArgs } = await getExtraArgs(options);\n const watch = options.watch === true;\n const ui = options.ui === true;\n const coverageEnabled = options.coverage === true;\n const update = options.update === true;\n const config = {\n root: `${projectConfig['root'] || '.'}`,\n watch,\n ui,\n config: options.configFile,\n coverage: {\n enabled: coverageEnabled,\n ...coverageArgs,\n },\n update,\n ...extraArgs,\n };\n const viteOverrides: any = {\n test: { watch },\n };\n\n const server = await startVitest(\n 'test',\n options.testFiles ?? [],\n config,\n viteOverrides,\n );\n\n let hasErrors = false;\n\n const processExit = () => {\n server?.exit();\n if (hasErrors) {\n process.exit(1);\n } else {\n process.exit(0);\n }\n };\n\n // .once() prevents listener stacking across repeated Nx executor runs\n // that share the same host process (avoids MaxListenersExceededWarning).\n if (options.watch) {\n process.once('SIGINT', processExit);\n process.once('SIGTERM', processExit);\n process.once('exit', processExit);\n }\n\n // vitest sets the exitCode = 1 when code coverage isn't met\n hasErrors = (process.exitCode && process.exitCode !== 0) as boolean;\n\n return {\n success: !hasErrors,\n };\n}\n\nexport async function getExtraArgs(\n options: VitestSchema,\n): Promise<Record<string, any>> {\n // support passing extra args to Vitest CLI\n const schema = await import('./schema.json', { with: { type: 'json' } });\n const extraArgs: Record<string, any> = {};\n for (const key of Object.keys(options)) {\n if (!(schema as any).default.properties[key]) {\n extraArgs[key] = (options as any)[key];\n }\n }\n\n return extraArgs;\n}\n\nexport default createBuilder(vitestBuilder) as any;\n"],"mappings":";;AAQA,eAAe,cACb,SACA,SACwB;AACxB,SAAQ,IAAI,UAAU;AACtB,SAAQ,IAAI,YAAY;CAExB,MAAM,EAAE,gBAAgB,MAAO,SAC7B,iCACD,EAAE;CAEH,MAAM,gBAAgB,MAAM,QAAQ,mBAClC,QAAQ,OACT;CACD,MAAM,EAAE,cAAc,GAAG,cAAc,MAAM,aAAa,QAAQ;CAClE,MAAM,QAAQ,QAAQ,UAAU;CAChC,MAAM,KAAK,QAAQ,OAAO;CAC1B,MAAM,kBAAkB,QAAQ,aAAa;CAC7C,MAAM,SAAS,QAAQ,WAAW;CAClC,MAAM,SAAS;EACb,MAAM,GAAG,cAAc,WAAW;EAClC;EACA;EACA,QAAQ,QAAQ;EAChB,UAAU;GACR,SAAS;GACT,GAAG;GACJ;EACD;EACA,GAAG;EACJ;CACD,MAAM,gBAAqB,EACzB,MAAM,EAAE,OAAO,EAChB;CAED,MAAM,SAAS,MAAM,YACnB,QACA,QAAQ,aAAa,EAAE,EACvB,QACA,cACD;CAED,IAAI,YAAY;CAEhB,MAAM,oBAAoB;AACxB,UAAQ,MAAM;AACd,MAAI,UACF,SAAQ,KAAK,EAAE;MAEf,SAAQ,KAAK,EAAE;;AAMnB,KAAI,QAAQ,OAAO;AACjB,UAAQ,KAAK,UAAU,YAAY;AACnC,UAAQ,KAAK,WAAW,YAAY;AACpC,UAAQ,KAAK,QAAQ,YAAY;;AAInC,aAAa,QAAQ,YAAY,QAAQ,aAAa;AAEtD,QAAO,EACL,SAAS,CAAC,WACX;;AAGH,eAAsB,aACpB,SAC8B;CAE9B,MAAM,SAAS,MAAM,OAAO,iBAAiB,EAAE,MAAM,EAAE,MAAM,QAAQ,EAAE;CACvE,MAAM,YAAiC,EAAE;AACzC,MAAK,MAAM,OAAO,OAAO,KAAK,QAAQ,CACpC,KAAI,CAAE,OAAe,QAAQ,WAAW,KACtC,WAAU,OAAQ,QAAgB;AAItC,QAAO;;AAGT,IAAA,sBAAe,cAAc,cAAc"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export { setupSchematic } from
|
|
1
|
+
export { setupSchematic } from "./schematics/setup/index";
|
|
@@ -1,6 +1,3 @@
|
|
|
1
|
-
"
|
|
2
|
-
|
|
3
|
-
exports.setupSchematic =
|
|
4
|
-
var index_1 = require("./schematics/setup/index");
|
|
5
|
-
Object.defineProperty(exports, "setupSchematic", { enumerable: true, get: function () { return index_1.setupSchematic; } });
|
|
6
|
-
//# sourceMappingURL=index.js.map
|
|
1
|
+
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
2
|
+
const require_index = require("./schematics/setup/index.js");
|
|
3
|
+
exports.setupSchematic = require_index.setupSchematic;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { Rule } from
|
|
2
|
-
import { Schema } from
|
|
1
|
+
import { Rule } from "@angular-devkit/schematics";
|
|
2
|
+
import { Schema } from "./schema";
|
|
3
3
|
export declare function setupSchematic(options: Schema): Rule;
|
|
@@ -1,80 +1,55 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
const require_angular = require("../utils/angular.js");
|
|
2
|
+
const require_workspace = require("../utils/workspace.js");
|
|
3
|
+
const require_dependencies = require("../utils/dependencies.js");
|
|
4
|
+
require("../utils/index.js");
|
|
5
|
+
let _angular_devkit_schematics = require("@angular-devkit/schematics");
|
|
6
|
+
let _angular_devkit_schematics_tasks = require("@angular-devkit/schematics/tasks");
|
|
7
|
+
let jsonc_parser = require("jsonc-parser");
|
|
8
|
+
//#region packages/vitest-angular-tools/src/schematics/setup/index.ts
|
|
8
9
|
function updateTsConfigSpec(tree, projectRoot) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
delete tsConfig.compilerOptions.module;
|
|
23
|
-
// Set target to es2022
|
|
24
|
-
tsConfig.compilerOptions.target = 'es2022';
|
|
25
|
-
// Update types: remove jest, add vitest/globals
|
|
26
|
-
const types = tsConfig.compilerOptions.types || ['node'];
|
|
27
|
-
const filteredTypes = types.filter((t) => t !== 'jest' && t !== 'jasmine');
|
|
28
|
-
if (!filteredTypes.includes('vitest/globals')) {
|
|
29
|
-
filteredTypes.push('vitest/globals');
|
|
30
|
-
}
|
|
31
|
-
tsConfig.compilerOptions.types = filteredTypes;
|
|
32
|
-
// Set files to include test-setup.ts
|
|
33
|
-
tsConfig.files = ['src/test-setup.ts'];
|
|
34
|
-
tree.overwrite(tsConfigPath, JSON.stringify(tsConfig, null, 2) + '\n');
|
|
10
|
+
const tsConfigPath = projectRoot ? `${projectRoot}/tsconfig.spec.json` : "tsconfig.spec.json";
|
|
11
|
+
if (!tree.exists(tsConfigPath)) return;
|
|
12
|
+
const tsConfigContent = tree.read(tsConfigPath);
|
|
13
|
+
if (!tsConfigContent) return;
|
|
14
|
+
const tsConfig = (0, jsonc_parser.parse)(tsConfigContent.toString("utf-8"));
|
|
15
|
+
tsConfig.compilerOptions = tsConfig.compilerOptions || {};
|
|
16
|
+
delete tsConfig.compilerOptions.module;
|
|
17
|
+
tsConfig.compilerOptions.target = "es2022";
|
|
18
|
+
const filteredTypes = (tsConfig.compilerOptions.types || ["node"]).filter((t) => t !== "jest" && t !== "jasmine");
|
|
19
|
+
if (!filteredTypes.includes("vitest/globals")) filteredTypes.push("vitest/globals");
|
|
20
|
+
tsConfig.compilerOptions.types = filteredTypes;
|
|
21
|
+
tsConfig.files = ["src/test-setup.ts"];
|
|
22
|
+
tree.overwrite(tsConfigPath, JSON.stringify(tsConfig, null, 2) + "\n");
|
|
35
23
|
}
|
|
36
24
|
function updateAngularJson(tree, projectName) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
project.architect['test'] = {
|
|
43
|
-
builder: '@analogjs/vitest-angular:test',
|
|
44
|
-
};
|
|
45
|
-
tree.overwrite('angular.json', JSON.stringify(workspace, null, 2) + '\n');
|
|
25
|
+
const workspace = require_workspace.getWorkspace(tree);
|
|
26
|
+
const project = workspace.projects[projectName];
|
|
27
|
+
if (!project.architect) project.architect = {};
|
|
28
|
+
project.architect["test"] = { builder: "@analogjs/vitest-angular:test" };
|
|
29
|
+
tree.overwrite("angular.json", JSON.stringify(workspace, null, 2) + "\n");
|
|
46
30
|
}
|
|
47
31
|
function generateFiles(projectRoot, majorAngularVersion, isNx, browserMode) {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
}),
|
|
54
|
-
(0, schematics_1.move)(projectRoot),
|
|
55
|
-
]));
|
|
32
|
+
return (0, _angular_devkit_schematics.mergeWith)((0, _angular_devkit_schematics.apply)((0, _angular_devkit_schematics.url)("./files"), [(0, _angular_devkit_schematics.applyTemplates)({
|
|
33
|
+
majorAngularVersion,
|
|
34
|
+
isNx,
|
|
35
|
+
browserMode
|
|
36
|
+
}), (0, _angular_devkit_schematics.move)(projectRoot)]));
|
|
56
37
|
}
|
|
57
38
|
function setupSchematic(options) {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
// Update angular.json test target
|
|
71
|
-
updateAngularJson(tree, options.project);
|
|
72
|
-
// Schedule package install
|
|
73
|
-
context.addTask(new tasks_1.NodePackageInstallTask());
|
|
74
|
-
// Generate files
|
|
75
|
-
return (0, schematics_1.chain)([
|
|
76
|
-
generateFiles(projectRoot, majorAngularVersion, isNx, browserMode),
|
|
77
|
-
]);
|
|
78
|
-
};
|
|
39
|
+
return (tree, context) => {
|
|
40
|
+
const angularVersion = require_angular.getAngularVersion(tree);
|
|
41
|
+
const majorAngularVersion = require_angular.getMajorAngularVersion(angularVersion);
|
|
42
|
+
const projectRoot = require_workspace.getProject(require_workspace.getWorkspace(tree), options.project).root || "";
|
|
43
|
+
const isNx = require_workspace.isNxWorkspace(tree);
|
|
44
|
+
const browserMode = options.browserMode ?? false;
|
|
45
|
+
require_dependencies.addDevDependencies(tree, angularVersion, { browserMode });
|
|
46
|
+
updateTsConfigSpec(tree, projectRoot);
|
|
47
|
+
updateAngularJson(tree, options.project);
|
|
48
|
+
context.addTask(new _angular_devkit_schematics_tasks.NodePackageInstallTask());
|
|
49
|
+
return (0, _angular_devkit_schematics.chain)([generateFiles(projectRoot, majorAngularVersion, isNx, browserMode)]);
|
|
50
|
+
};
|
|
79
51
|
}
|
|
52
|
+
//#endregion
|
|
53
|
+
exports.setupSchematic = setupSchematic;
|
|
54
|
+
|
|
80
55
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","
|
|
1
|
+
{"version":3,"file":"index.js","names":[],"sources":["../../../../../../../../../packages/vitest-angular-tools/src/schematics/setup/index.ts"],"sourcesContent":["import {\n Rule,\n Tree,\n apply,\n url,\n applyTemplates,\n move,\n chain,\n mergeWith,\n SchematicContext,\n} from '@angular-devkit/schematics';\nimport { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';\nimport { parse } from 'jsonc-parser';\nimport {\n getAngularVersion,\n getMajorAngularVersion,\n getWorkspace,\n getProject,\n addDevDependencies,\n isNxWorkspace,\n} from '../utils';\nimport { Schema } from './schema';\n\nfunction updateTsConfigSpec(tree: Tree, projectRoot: string): void {\n const tsConfigPath = projectRoot\n ? `${projectRoot}/tsconfig.spec.json`\n : 'tsconfig.spec.json';\n\n if (!tree.exists(tsConfigPath)) {\n return;\n }\n\n const tsConfigContent = tree.read(tsConfigPath);\n if (!tsConfigContent) {\n return;\n }\n\n const tsConfig = parse(tsConfigContent.toString('utf-8')) as Record<\n string,\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n any\n >;\n\n tsConfig.compilerOptions = tsConfig.compilerOptions || {};\n\n // Remove module (let Vite handle it)\n delete tsConfig.compilerOptions.module;\n\n // Set target to es2022\n tsConfig.compilerOptions.target = 'es2022';\n\n // Update types: remove jest, add vitest/globals\n const types: string[] = tsConfig.compilerOptions.types || ['node'];\n const filteredTypes = types.filter(\n (t: string) => t !== 'jest' && t !== 'jasmine',\n );\n if (!filteredTypes.includes('vitest/globals')) {\n filteredTypes.push('vitest/globals');\n }\n tsConfig.compilerOptions.types = filteredTypes;\n\n // Set files to include test-setup.ts\n tsConfig.files = ['src/test-setup.ts'];\n\n tree.overwrite(tsConfigPath, JSON.stringify(tsConfig, null, 2) + '\\n');\n}\n\nfunction updateAngularJson(tree: Tree, projectName: string): void {\n const workspace = getWorkspace(tree);\n const project = workspace.projects[projectName];\n\n if (!project.architect) {\n project.architect = {};\n }\n\n project.architect['test'] = {\n builder: '@analogjs/vitest-angular:test',\n };\n\n tree.overwrite('angular.json', JSON.stringify(workspace, null, 2) + '\\n');\n}\n\nfunction generateFiles(\n projectRoot: string,\n majorAngularVersion: number,\n isNx: boolean,\n browserMode: boolean,\n): Rule {\n return mergeWith(\n apply(url('./files'), [\n applyTemplates({\n majorAngularVersion,\n isNx,\n browserMode,\n }),\n move(projectRoot),\n ]),\n );\n}\n\nexport function setupSchematic(options: Schema): Rule {\n return (tree: Tree, context: SchematicContext) => {\n const angularVersion = getAngularVersion(tree);\n const majorAngularVersion = getMajorAngularVersion(angularVersion);\n\n const workspace = getWorkspace(tree);\n const project = getProject(workspace, options.project);\n const projectRoot = project.root || '';\n const isNx = isNxWorkspace(tree);\n\n const browserMode = options.browserMode ?? false;\n\n // Add devDependencies\n addDevDependencies(tree, angularVersion, { browserMode });\n\n // Update tsconfig.spec.json (if exists)\n updateTsConfigSpec(tree, projectRoot);\n\n // Update angular.json test target\n updateAngularJson(tree, options.project);\n\n // Schedule package install\n context.addTask(new NodePackageInstallTask());\n\n // Generate files\n return chain([\n generateFiles(projectRoot, majorAngularVersion, isNx, browserMode),\n ]);\n };\n}\n"],"mappings":";;;;;;;;AAuBA,SAAS,mBAAmB,MAAY,aAA2B;CACjE,MAAM,eAAe,cACjB,GAAG,YAAY,uBACf;AAEJ,KAAI,CAAC,KAAK,OAAO,aAAa,CAC5B;CAGF,MAAM,kBAAkB,KAAK,KAAK,aAAa;AAC/C,KAAI,CAAC,gBACH;CAGF,MAAM,YAAA,GAAA,aAAA,OAAiB,gBAAgB,SAAS,QAAQ,CAAC;AAMzD,UAAS,kBAAkB,SAAS,mBAAmB,EAAE;AAGzD,QAAO,SAAS,gBAAgB;AAGhC,UAAS,gBAAgB,SAAS;CAIlC,MAAM,iBADkB,SAAS,gBAAgB,SAAS,CAAC,OAAO,EACtC,QACzB,MAAc,MAAM,UAAU,MAAM,UACtC;AACD,KAAI,CAAC,cAAc,SAAS,iBAAiB,CAC3C,eAAc,KAAK,iBAAiB;AAEtC,UAAS,gBAAgB,QAAQ;AAGjC,UAAS,QAAQ,CAAC,oBAAoB;AAEtC,MAAK,UAAU,cAAc,KAAK,UAAU,UAAU,MAAM,EAAE,GAAG,KAAK;;AAGxE,SAAS,kBAAkB,MAAY,aAA2B;CAChE,MAAM,YAAY,kBAAA,aAAa,KAAK;CACpC,MAAM,UAAU,UAAU,SAAS;AAEnC,KAAI,CAAC,QAAQ,UACX,SAAQ,YAAY,EAAE;AAGxB,SAAQ,UAAU,UAAU,EAC1B,SAAS,iCACV;AAED,MAAK,UAAU,gBAAgB,KAAK,UAAU,WAAW,MAAM,EAAE,GAAG,KAAK;;AAG3E,SAAS,cACP,aACA,qBACA,MACA,aACM;AACN,SAAA,GAAA,2BAAA,YAAA,GAAA,2BAAA,QAAA,GAAA,2BAAA,KACY,UAAU,EAAE,EAAA,GAAA,2BAAA,gBACL;EACb;EACA;EACA;EACD,CAAC,GAAA,GAAA,2BAAA,MACG,YAAY,CAClB,CAAC,CACH;;AAGH,SAAgB,eAAe,SAAuB;AACpD,SAAQ,MAAY,YAA8B;EAChD,MAAM,iBAAiB,gBAAA,kBAAkB,KAAK;EAC9C,MAAM,sBAAsB,gBAAA,uBAAuB,eAAe;EAIlE,MAAM,cADU,kBAAA,WADE,kBAAA,aAAa,KAAK,EACE,QAAQ,QAAQ,CAC1B,QAAQ;EACpC,MAAM,OAAO,kBAAA,cAAc,KAAK;EAEhC,MAAM,cAAc,QAAQ,eAAe;AAG3C,uBAAA,mBAAmB,MAAM,gBAAgB,EAAE,aAAa,CAAC;AAGzD,qBAAmB,MAAM,YAAY;AAGrC,oBAAkB,MAAM,QAAQ,QAAQ;AAGxC,UAAQ,QAAQ,IAAI,iCAAA,wBAAwB,CAAC;AAG7C,UAAA,GAAA,2BAAA,OAAa,CACX,cAAc,aAAa,qBAAqB,MAAM,YAAY,CACnE,CAAC"}
|
|
@@ -1,27 +1,21 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
exports.getMajorAngularVersion = getMajorAngularVersion;
|
|
5
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
|
6
|
-
const semver_1 = require("semver");
|
|
1
|
+
let _angular_devkit_schematics = require("@angular-devkit/schematics");
|
|
2
|
+
let semver = require("semver");
|
|
3
|
+
//#region packages/vitest-angular-tools/src/schematics/utils/angular.ts
|
|
7
4
|
function getAngularVersion(tree) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
pkg.devDependencies?.['@angular/core'];
|
|
15
|
-
if (!angularVersion) {
|
|
16
|
-
throw new schematics_1.SchematicsException('Could not find @angular/core in package.json');
|
|
17
|
-
}
|
|
18
|
-
return angularVersion;
|
|
5
|
+
const packageJson = tree.read("package.json");
|
|
6
|
+
if (!packageJson) throw new _angular_devkit_schematics.SchematicsException("Could not find package.json");
|
|
7
|
+
const pkg = JSON.parse(packageJson.toString("utf-8"));
|
|
8
|
+
const angularVersion = pkg.dependencies?.["@angular/core"] || pkg.devDependencies?.["@angular/core"];
|
|
9
|
+
if (!angularVersion) throw new _angular_devkit_schematics.SchematicsException("Could not find @angular/core in package.json");
|
|
10
|
+
return angularVersion;
|
|
19
11
|
}
|
|
20
12
|
function getMajorAngularVersion(angularVersion) {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
25
|
-
return (0, semver_1.major)(coerced);
|
|
13
|
+
const coerced = (0, semver.coerce)(angularVersion);
|
|
14
|
+
if (!coerced) throw new _angular_devkit_schematics.SchematicsException(`Could not parse Angular version: ${angularVersion}`);
|
|
15
|
+
return (0, semver.major)(coerced);
|
|
26
16
|
}
|
|
17
|
+
//#endregion
|
|
18
|
+
exports.getAngularVersion = getAngularVersion;
|
|
19
|
+
exports.getMajorAngularVersion = getMajorAngularVersion;
|
|
20
|
+
|
|
27
21
|
//# sourceMappingURL=angular.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angular.js","
|
|
1
|
+
{"version":3,"file":"angular.js","names":[],"sources":["../../../../../../../../../packages/vitest-angular-tools/src/schematics/utils/angular.ts"],"sourcesContent":["import { Tree, SchematicsException } from '@angular-devkit/schematics';\nimport { coerce, major } from 'semver';\n\nexport function getAngularVersion(tree: Tree): string {\n const packageJson = tree.read('package.json');\n if (!packageJson) {\n throw new SchematicsException('Could not find package.json');\n }\n\n const pkg = JSON.parse(packageJson.toString('utf-8'));\n const angularVersion =\n pkg.dependencies?.['@angular/core'] ||\n pkg.devDependencies?.['@angular/core'];\n\n if (!angularVersion) {\n throw new SchematicsException(\n 'Could not find @angular/core in package.json',\n );\n }\n\n return angularVersion;\n}\n\nexport function getMajorAngularVersion(angularVersion: string): number {\n const coerced = coerce(angularVersion);\n if (!coerced) {\n throw new SchematicsException(\n `Could not parse Angular version: ${angularVersion}`,\n );\n }\n return major(coerced);\n}\n"],"mappings":";;;AAGA,SAAgB,kBAAkB,MAAoB;CACpD,MAAM,cAAc,KAAK,KAAK,eAAe;AAC7C,KAAI,CAAC,YACH,OAAM,IAAI,2BAAA,oBAAoB,8BAA8B;CAG9D,MAAM,MAAM,KAAK,MAAM,YAAY,SAAS,QAAQ,CAAC;CACrD,MAAM,iBACJ,IAAI,eAAe,oBACnB,IAAI,kBAAkB;AAExB,KAAI,CAAC,eACH,OAAM,IAAI,2BAAA,oBACR,+CACD;AAGH,QAAO;;AAGT,SAAgB,uBAAuB,gBAAgC;CACrE,MAAM,WAAA,GAAA,OAAA,QAAiB,eAAe;AACtC,KAAI,CAAC,QACH,OAAM,IAAI,2BAAA,oBACR,oCAAoC,iBACrC;AAEH,SAAA,GAAA,OAAA,OAAa,QAAQ"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Tree } from
|
|
1
|
+
import { Tree } from "@angular-devkit/schematics";
|
|
2
2
|
export interface DependencyOptions {
|
|
3
|
-
|
|
3
|
+
browserMode?: boolean;
|
|
4
4
|
}
|
|
5
5
|
export declare function getDevDependencies(angularVersion: string, options?: DependencyOptions): Record<string, string>;
|
|
6
6
|
export declare function addDevDependencies(tree: Tree, angularVersion: string, options?: DependencyOptions): void;
|