@nx/vite 17.2.5 → 17.2.7

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.
Files changed (29) hide show
  1. package/README.md +4 -9
  2. package/migrations.json +3 -24
  3. package/package.json +5 -5
  4. package/src/executors/build/build.impl.d.ts +1 -2
  5. package/src/executors/build/build.impl.js.map +1 -1
  6. package/src/executors/dev-server/dev-server.impl.js +20 -9
  7. package/src/executors/dev-server/dev-server.impl.js.map +1 -1
  8. package/src/executors/preview-server/preview-server.impl.d.ts +1 -1
  9. package/src/executors/preview-server/preview-server.impl.js +13 -7
  10. package/src/executors/preview-server/preview-server.impl.js.map +1 -1
  11. package/src/migrations/update-17-3-0/lib/{fix-coverage.d.ts → fix-coverage-and-reporters.d.ts} +1 -1
  12. package/src/migrations/update-17-3-0/lib/fix-coverage-and-reporters.js +117 -0
  13. package/src/migrations/update-17-3-0/lib/fix-coverage-and-reporters.js.map +1 -0
  14. package/src/migrations/update-17-3-0/{vitest-coverage-threshold.js → vitest-coverage-and-reporters.js} +3 -3
  15. package/src/migrations/update-17-3-0/vitest-coverage-and-reporters.js.map +1 -0
  16. package/src/plugins/plugin.js +16 -11
  17. package/src/plugins/plugin.js.map +1 -1
  18. package/src/utils/generator-utils.js +10 -8
  19. package/src/utils/generator-utils.js.map +1 -1
  20. package/src/utils/options-utils.d.ts +2 -3
  21. package/src/utils/options-utils.js +1 -0
  22. package/src/utils/options-utils.js.map +1 -1
  23. package/src/utils/versions.d.ts +3 -3
  24. package/src/utils/versions.js +3 -3
  25. package/src/utils/versions.js.map +1 -1
  26. package/src/migrations/update-17-3-0/lib/fix-coverage.js +0 -109
  27. package/src/migrations/update-17-3-0/lib/fix-coverage.js.map +0 -1
  28. package/src/migrations/update-17-3-0/vitest-coverage-threshold.js.map +0 -1
  29. /package/src/migrations/update-17-3-0/{vitest-coverage-threshold.d.ts → vitest-coverage-and-reporters.d.ts} +0 -0
@@ -1,109 +0,0 @@
1
- "use strict";
2
- function _export(target, all) {
3
- for(var name in all)Object.defineProperty(target, name, {
4
- enumerable: true,
5
- get: all[name]
6
- });
7
- }
8
- _export(exports, {
9
- fixCoverage: function() {
10
- return fixCoverage;
11
- },
12
- getConfigNode: function() {
13
- return getConfigNode;
14
- }
15
- });
16
- const _devkit = require("@nx/devkit");
17
- const _tsquery = require("@phenomnomnominal/tsquery");
18
- const ts = require("typescript");
19
- function fixCoverage(configContents) {
20
- var _tsquery_query, _tsquery_query1, _tsquery_query2, _tsquery_query3, _tsquery_query4, _tsquery_query5;
21
- const configNode = getConfigNode(configContents);
22
- if (!configNode) {
23
- return;
24
- }
25
- const testHasCoverage = (_tsquery_query = _tsquery.tsquery.query(configNode, `PropertyAssignment:has(Identifier[name="test"]):has(PropertyAssignment:has(Identifier[name="coverage"]))`)) == null ? void 0 : _tsquery_query[0];
26
- let changes = [];
27
- if (!testHasCoverage) {
28
- return;
29
- }
30
- const testObjectLiteralExpressionNode = (_tsquery_query1 = _tsquery.tsquery.query(testHasCoverage, `ObjectLiteralExpression:has(Identifier[name="coverage"])`)) == null ? void 0 : _tsquery_query1[0];
31
- const coverageNode = findCoverageNode(testObjectLiteralExpressionNode);
32
- console.log('coverage node', coverageNode == null ? void 0 : coverageNode.getText());
33
- console.log('coverage node getStart', coverageNode == null ? void 0 : coverageNode.getStart());
34
- if (!coverageNode) {
35
- return;
36
- }
37
- const linesNode = (_tsquery_query2 = _tsquery.tsquery.query(coverageNode, `PropertyAssignment:has(Identifier[name="lines"])`)) == null ? void 0 : _tsquery_query2[0];
38
- const statementsNode = (_tsquery_query3 = _tsquery.tsquery.query(coverageNode, `PropertyAssignment:has(Identifier[name="statements"])`)) == null ? void 0 : _tsquery_query3[0];
39
- const functionsNode = (_tsquery_query4 = _tsquery.tsquery.query(coverageNode, `PropertyAssignment:has(Identifier[name="functions"])`)) == null ? void 0 : _tsquery_query4[0];
40
- const branchesNode = (_tsquery_query5 = _tsquery.tsquery.query(coverageNode, `PropertyAssignment:has(Identifier[name="branches"])`)) == null ? void 0 : _tsquery_query5[0];
41
- if (linesNode) {
42
- changes.push({
43
- type: _devkit.ChangeType.Delete,
44
- start: linesNode.getStart(),
45
- length: linesNode.getWidth() + 1
46
- });
47
- }
48
- if (statementsNode) {
49
- changes.push({
50
- type: _devkit.ChangeType.Delete,
51
- start: statementsNode.getStart(),
52
- length: statementsNode.getWidth() + 1
53
- });
54
- }
55
- if (functionsNode) {
56
- changes.push({
57
- type: _devkit.ChangeType.Delete,
58
- start: functionsNode.getStart(),
59
- length: functionsNode.getWidth() + 1
60
- });
61
- }
62
- if (branchesNode) {
63
- changes.push({
64
- type: _devkit.ChangeType.Delete,
65
- start: branchesNode.getStart(),
66
- length: branchesNode.getWidth() + 1
67
- });
68
- }
69
- if (branchesNode || functionsNode || statementsNode || linesNode) {
70
- changes.push({
71
- type: _devkit.ChangeType.Insert,
72
- index: coverageNode.getStart() + 1,
73
- text: `thresholds: {
74
- ${linesNode ? linesNode.getText() + ',' : ''}
75
- ${statementsNode ? statementsNode.getText() + ',' : ''}
76
- ${functionsNode ? functionsNode.getText() + ',' : ''}
77
- ${branchesNode ? branchesNode.getText() + ',' : ''}
78
- },`
79
- });
80
- }
81
- if (changes.length > 0) {
82
- return (0, _devkit.applyChangesToString)(configContents, changes);
83
- } else {
84
- return;
85
- }
86
- }
87
- function getConfigNode(configFileContents) {
88
- var _tsquery_query, _tsquery_query1;
89
- if (!configFileContents) {
90
- return;
91
- }
92
- let configNode = (_tsquery_query = _tsquery.tsquery.query(configFileContents, `ObjectLiteralExpression`)) == null ? void 0 : _tsquery_query[0];
93
- const arrowFunctionReturnStatement = (_tsquery_query1 = _tsquery.tsquery.query(configFileContents, `ArrowFunction Block ReturnStatement ObjectLiteralExpression`)) == null ? void 0 : _tsquery_query1[0];
94
- if (arrowFunctionReturnStatement) {
95
- configNode = arrowFunctionReturnStatement;
96
- }
97
- return configNode;
98
- }
99
- function findCoverageNode(testNode) {
100
- let coverageNode;
101
- testNode.forEachChild((child)=>{
102
- if (ts.isPropertyAssignment(child) && child.name.getText() === 'coverage') {
103
- coverageNode = child.initializer;
104
- }
105
- });
106
- return coverageNode;
107
- }
108
-
109
- //# sourceMappingURL=fix-coverage.js.map
@@ -1 +0,0 @@
1
- {"version":3,"sources":["../../../../../../../packages/vite/src/migrations/update-17-3-0/lib/fix-coverage.ts"],"sourcesContent":["import { ChangeType, applyChangesToString } from '@nx/devkit';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport ts = require('typescript');\n\nexport function fixCoverage(configContents: string): string | undefined {\n const configNode = getConfigNode(configContents);\n if (!configNode) {\n return;\n }\n\n const testHasCoverage = tsquery.query(\n configNode,\n `PropertyAssignment:has(Identifier[name=\"test\"]):has(PropertyAssignment:has(Identifier[name=\"coverage\"]))`\n )?.[0];\n let changes = [];\n\n if (!testHasCoverage) {\n return;\n }\n const testObjectLiteralExpressionNode = tsquery.query(\n testHasCoverage,\n `ObjectLiteralExpression:has(Identifier[name=\"coverage\"])`\n )?.[0];\n const coverageNode = findCoverageNode(testObjectLiteralExpressionNode);\n console.log('coverage node', coverageNode?.getText());\n console.log('coverage node getStart', coverageNode?.getStart());\n\n if (!coverageNode) {\n return;\n }\n\n const linesNode = tsquery.query(\n coverageNode,\n `PropertyAssignment:has(Identifier[name=\"lines\"])`\n )?.[0];\n\n const statementsNode = tsquery.query(\n coverageNode,\n `PropertyAssignment:has(Identifier[name=\"statements\"])`\n )?.[0];\n\n const functionsNode = tsquery.query(\n coverageNode,\n `PropertyAssignment:has(Identifier[name=\"functions\"])`\n )?.[0];\n\n const branchesNode = tsquery.query(\n coverageNode,\n `PropertyAssignment:has(Identifier[name=\"branches\"])`\n )?.[0];\n\n if (linesNode) {\n changes.push({\n type: ChangeType.Delete,\n start: linesNode.getStart(),\n length: linesNode.getWidth() + 1,\n });\n }\n if (statementsNode) {\n changes.push({\n type: ChangeType.Delete,\n start: statementsNode.getStart(),\n length: statementsNode.getWidth() + 1,\n });\n }\n\n if (functionsNode) {\n changes.push({\n type: ChangeType.Delete,\n start: functionsNode.getStart(),\n length: functionsNode.getWidth() + 1,\n });\n }\n\n if (branchesNode) {\n changes.push({\n type: ChangeType.Delete,\n start: branchesNode.getStart(),\n length: branchesNode.getWidth() + 1,\n });\n }\n\n if (branchesNode || functionsNode || statementsNode || linesNode) {\n changes.push({\n type: ChangeType.Insert,\n index: coverageNode.getStart() + 1,\n text: `thresholds: {\n ${linesNode ? linesNode.getText() + ',' : ''}\n ${statementsNode ? statementsNode.getText() + ',' : ''}\n ${functionsNode ? functionsNode.getText() + ',' : ''}\n ${branchesNode ? branchesNode.getText() + ',' : ''}\n },`,\n });\n }\n\n if (changes.length > 0) {\n return applyChangesToString(configContents, changes);\n } else {\n return;\n }\n}\n\nexport function getConfigNode(configFileContents: string): ts.Node | undefined {\n if (!configFileContents) {\n return;\n }\n let configNode = tsquery.query(\n configFileContents,\n `ObjectLiteralExpression`\n )?.[0];\n\n const arrowFunctionReturnStatement = tsquery.query(\n configFileContents,\n `ArrowFunction Block ReturnStatement ObjectLiteralExpression`\n )?.[0];\n\n if (arrowFunctionReturnStatement) {\n configNode = arrowFunctionReturnStatement;\n }\n\n return configNode;\n}\n\nfunction findCoverageNode(testNode: ts.Node) {\n let coverageNode: ts.Node | undefined;\n testNode.forEachChild((child) => {\n if (ts.isPropertyAssignment(child) && child.name.getText() === 'coverage') {\n coverageNode = child.initializer;\n }\n });\n return coverageNode;\n}\n"],"names":["fixCoverage","getConfigNode","ts","configContents","tsquery","configNode","testHasCoverage","query","changes","testObjectLiteralExpressionNode","coverageNode","findCoverageNode","console","log","getText","getStart","linesNode","statementsNode","functionsNode","branchesNode","push","type","ChangeType","Delete","start","length","getWidth","Insert","index","text","applyChangesToString","configFileContents","arrowFunctionReturnStatement","testNode","forEachChild","child","isPropertyAssignment","name","initializer"],"mappings":"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"}
@@ -1 +0,0 @@
1
- {"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-17-3-0/vitest-coverage-threshold.ts"],"sourcesContent":["import {\n ProjectConfiguration,\n Tree,\n formatFiles,\n getProjects,\n joinPathFragments,\n} from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\nimport { fixCoverage } from './lib/fix-coverage';\n\nexport default async function fixCoverageThreshold(tree: Tree) {\n const projects = getProjects(tree);\n forEachExecutorOptions(tree, '@nx/vite:test', (_options, projectName) => {\n const projectConfig: ProjectConfiguration = projects.get(\n projectName\n ) as ProjectConfiguration;\n const configPath = findViteConfig(tree, projectConfig.root);\n if (!configPath || !tree.exists(configPath)) {\n return;\n }\n const configContents = tree.read(configPath, 'utf-8') as string;\n\n const updatedConfigContents = fixCoverage(configContents);\n\n if (updatedConfigContents) {\n tree.write(configPath, updatedConfigContents);\n }\n });\n\n await formatFiles(tree);\n}\n\nfunction findViteConfig(tree: Tree, searchRoot: string) {\n const allowsExt = ['js', 'mjs', 'ts', 'cjs', 'mts', 'cts'];\n\n for (const ext of allowsExt) {\n if (tree.exists(joinPathFragments(searchRoot, `vite.config.${ext}`))) {\n return joinPathFragments(searchRoot, `vite.config.${ext}`);\n } else if (\n tree.exists(joinPathFragments(searchRoot, `vitest.config.${ext}`))\n ) {\n return joinPathFragments(searchRoot, `vitest.config.${ext}`);\n }\n }\n}\n"],"names":["fixCoverageThreshold","tree","projects","getProjects","forEachExecutorOptions","_options","projectName","projectConfig","get","configPath","findViteConfig","root","exists","configContents","read","updatedConfigContents","fixCoverage","write","formatFiles","searchRoot","allowsExt","ext","joinPathFragments"],"mappings":";+BAUA;;;eAA8BA;;;wBAJvB;sCACgC;6BACX;AAEb,eAAeA,qBAAqBC,IAAU;IAC3D,MAAMC,WAAWC,IAAAA,mBAAW,EAACF;IAC7BG,IAAAA,4CAAsB,EAACH,MAAM,iBAAiB,CAACI,UAAUC;QACvD,MAAMC,gBAAsCL,SAASM,GAAG,CACtDF;QAEF,MAAMG,aAAaC,eAAeT,MAAMM,cAAcI,IAAI;QAC1D,IAAI,CAACF,cAAc,CAACR,KAAKW,MAAM,CAACH,aAAa;YAC3C;QACF;QACA,MAAMI,iBAAiBZ,KAAKa,IAAI,CAACL,YAAY;QAE7C,MAAMM,wBAAwBC,IAAAA,wBAAW,EAACH;QAE1C,IAAIE,uBAAuB;YACzBd,KAAKgB,KAAK,CAACR,YAAYM;QACzB;IACF;IAEA,MAAMG,IAAAA,mBAAW,EAACjB;AACpB;AAEA,SAASS,eAAeT,IAAU,EAAEkB,UAAkB;IACpD,MAAMC,YAAY;QAAC;QAAM;QAAO;QAAM;QAAO;QAAO;KAAM;IAE1D,KAAK,MAAMC,OAAOD,UAAW;QAC3B,IAAInB,KAAKW,MAAM,CAACU,IAAAA,yBAAiB,EAACH,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC,IAAI;YACpE,OAAOC,IAAAA,yBAAiB,EAACH,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC;QAC3D,OAAO,IACLpB,KAAKW,MAAM,CAACU,IAAAA,yBAAiB,EAACH,YAAY,CAAC,cAAc,EAAEE,IAAI,CAAC,IAChE;YACA,OAAOC,IAAAA,yBAAiB,EAACH,YAAY,CAAC,cAAc,EAAEE,IAAI,CAAC;QAC7D;IACF;AACF"}