@nx/vite 16.6.0-beta.4 → 16.6.0-beta.6

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/vite",
3
- "version": "16.6.0-beta.4",
3
+ "version": "16.6.0-beta.6",
4
4
  "private": false,
5
5
  "description": "The Nx Plugin for building and testing applications using Vite",
6
6
  "repository": {
@@ -29,9 +29,9 @@
29
29
  "migrations": "./migrations.json"
30
30
  },
31
31
  "dependencies": {
32
- "@nrwl/vite": "16.6.0-beta.4",
33
- "@nx/devkit": "16.6.0-beta.4",
34
- "@nx/js": "16.6.0-beta.4",
32
+ "@nrwl/vite": "16.6.0-beta.6",
33
+ "@nx/devkit": "16.6.0-beta.6",
34
+ "@nx/js": "16.6.0-beta.6",
35
35
  "@phenomnomnominal/tsquery": "~5.0.1",
36
36
  "@swc/helpers": "~0.5.0",
37
37
  "dotenv": "~10.0.0",
@@ -46,12 +46,8 @@
46
46
  "access": "public"
47
47
  },
48
48
  "exports": {
49
- ".": {
50
- "require": "./index.js"
51
- },
52
- "./package.json": {
53
- "require": "./package.json"
54
- },
49
+ ".": "./index.js",
50
+ "./package.json": "./package.json",
55
51
  "./migrations.json": "./migrations.json",
56
52
  "./generators.json": "./generators.json",
57
53
  "./executors.json": "./executors.json",
@@ -61,5 +57,5 @@
61
57
  "./src/executors/*/compat": "./src/executors/*/compat.js",
62
58
  "./plugins/nx-tsconfig-paths.plugin": "./plugins/nx-tsconfig-paths.plugin.js"
63
59
  },
64
- "gitHead": "b1a9ae7ce76697019b26ec9a172005840cca8da6"
60
+ "gitHead": "9aad21dbfb2b659e488b6626f59df58ab23c0032"
65
61
  }
@@ -1,7 +1,7 @@
1
1
  export interface VitestGeneratorSchema {
2
2
  project: string;
3
3
  uiFramework: 'react' | 'none';
4
- coverageProvider: 'c8' | 'istanbul';
4
+ coverageProvider: 'v8' | 'c8' | 'istanbul';
5
5
  inSourceTests?: boolean;
6
6
  skipViteConfig?: boolean;
7
7
  testTarget?: string;
@@ -9,7 +9,9 @@
9
9
  "project": {
10
10
  "type": "string",
11
11
  "description": "The name of the project to test.",
12
- "$default": { "$source": "projectName" }
12
+ "$default": {
13
+ "$source": "projectName"
14
+ }
13
15
  },
14
16
  "uiFramework": {
15
17
  "type": "string",
@@ -29,8 +31,8 @@
29
31
  },
30
32
  "coverageProvider": {
31
33
  "type": "string",
32
- "enum": ["c8", "istanbul"],
33
- "default": "c8",
34
+ "enum": ["v8", "c8", "istanbul"],
35
+ "default": "v8",
34
36
  "description": "Coverage provider to use."
35
37
  },
36
38
  "testTarget": {
@@ -41,11 +41,8 @@ async function vitestGenerator(tree, schema) {
41
41
  }
42
42
  createFiles(tree, schema, root);
43
43
  updateTsConfig(tree, schema, root);
44
- const installCoverageProviderTask = (0, _devkit.addDependenciesToPackageJson)(tree, {}, schema.coverageProvider === 'istanbul' ? {
45
- '@vitest/coverage-istanbul': _versions.vitestCoverageIstanbulVersion
46
- } : {
47
- '@vitest/coverage-c8': _versions.vitestCoverageC8Version
48
- });
44
+ const coverageProviderDependency = getCoverageProviderDependency(schema.coverageProvider);
45
+ const installCoverageProviderTask = (0, _devkit.addDependenciesToPackageJson)(tree, {}, coverageProviderDependency);
49
46
  tasks.push(installCoverageProviderTask);
50
47
  if (!schema.skipFormat) {
51
48
  await (0, _devkit.formatFiles)(tree);
@@ -104,6 +101,22 @@ function createFiles(tree, options, projectRoot) {
104
101
  offsetFromRoot: (0, _devkit.offsetFromRoot)(projectRoot)
105
102
  }));
106
103
  }
104
+ function getCoverageProviderDependency(coverageProvider) {
105
+ switch(coverageProvider){
106
+ case 'c8':
107
+ return {
108
+ '@vitest/coverage-c8': _versions.vitestCoverageC8Version
109
+ };
110
+ case 'istanbul':
111
+ return {
112
+ '@vitest/coverage-istanbul': _versions.vitestCoverageIstanbulVersion
113
+ };
114
+ default:
115
+ return {
116
+ '@vitest/coverage-v8': _versions.vitestCoverageV8Version
117
+ };
118
+ }
119
+ }
107
120
  const _default = vitestGenerator;
108
121
  const vitestSchematic = (0, _devkit.convertNxGenerator)(vitestGenerator);
109
122
 
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../../../packages/vite/src/generators/vitest/vitest-generator.ts"],"sourcesContent":["import {\n addDependenciesToPackageJson,\n convertNxGenerator,\n formatFiles,\n generateFiles,\n GeneratorCallback,\n joinPathFragments,\n offsetFromRoot,\n readProjectConfiguration,\n runTasksInSerial,\n Tree,\n updateJson,\n} from '@nx/devkit';\nimport {\n addOrChangeTestTarget,\n createOrEditViteConfig,\n findExistingTargetsInProject,\n} from '../../utils/generator-utils';\nimport { VitestGeneratorSchema } from './schema';\n\nimport initGenerator from '../init/init';\nimport {\n vitestCoverageC8Version,\n vitestCoverageIstanbulVersion,\n} from '../../utils/versions';\n\nimport { addTsLibDependencies } from '@nx/js';\n\nexport async function vitestGenerator(\n tree: Tree,\n schema: VitestGeneratorSchema\n) {\n const tasks: GeneratorCallback[] = [];\n\n const { targets, root, projectType } = readProjectConfiguration(\n tree,\n schema.project\n );\n let testTarget =\n schema.testTarget ??\n findExistingTargetsInProject(targets).validFoundTargetName.test ??\n 'test';\n\n addOrChangeTestTarget(tree, schema, testTarget);\n\n const initTask = await initGenerator(tree, {\n uiFramework: schema.uiFramework,\n testEnvironment: schema.testEnvironment,\n });\n tasks.push(initTask);\n\n if (!schema.skipViteConfig) {\n createOrEditViteConfig(\n tree,\n {\n ...schema,\n includeVitest: true,\n includeLib: projectType === 'library',\n },\n true\n );\n }\n\n createFiles(tree, schema, root);\n updateTsConfig(tree, schema, root);\n\n const installCoverageProviderTask = addDependenciesToPackageJson(\n tree,\n {},\n schema.coverageProvider === 'istanbul'\n ? {\n '@vitest/coverage-istanbul': vitestCoverageIstanbulVersion,\n }\n : {\n '@vitest/coverage-c8': vitestCoverageC8Version,\n }\n );\n tasks.push(installCoverageProviderTask);\n\n if (!schema.skipFormat) {\n await formatFiles(tree);\n }\n\n return runTasksInSerial(...tasks);\n}\n\nfunction updateTsConfig(\n tree: Tree,\n options: VitestGeneratorSchema,\n projectRoot: string\n) {\n updateJson(tree, joinPathFragments(projectRoot, 'tsconfig.json'), (json) => {\n if (\n json.references &&\n !json.references.some((r) => r.path === './tsconfig.spec.json')\n ) {\n json.references.push({\n path: './tsconfig.spec.json',\n });\n }\n\n if (!json.compilerOptions?.types?.includes('vitest')) {\n if (json.compilerOptions?.types) {\n json.compilerOptions.types.push('vitest');\n } else {\n json.compilerOptions ??= {};\n json.compilerOptions.types = ['vitest'];\n }\n }\n return json;\n });\n\n if (options.inSourceTests) {\n const tsconfigLibPath = joinPathFragments(projectRoot, 'tsconfig.lib.json');\n const tsconfigAppPath = joinPathFragments(projectRoot, 'tsconfig.app.json');\n if (tree.exists(tsconfigLibPath)) {\n updateJson(\n tree,\n joinPathFragments(projectRoot, 'tsconfig.lib.json'),\n (json) => {\n (json.compilerOptions.types ??= []).push('vitest/importMeta');\n return json;\n }\n );\n } else if (tree.exists(tsconfigAppPath)) {\n updateJson(\n tree,\n joinPathFragments(projectRoot, 'tsconfig.app.json'),\n (json) => {\n (json.compilerOptions.types ??= []).push('vitest/importMeta');\n return json;\n }\n );\n }\n\n addTsLibDependencies(tree);\n }\n}\n\nfunction createFiles(\n tree: Tree,\n options: VitestGeneratorSchema,\n projectRoot: string\n) {\n generateFiles(tree, joinPathFragments(__dirname, 'files'), projectRoot, {\n tmpl: '',\n ...options,\n projectRoot,\n offsetFromRoot: offsetFromRoot(projectRoot),\n });\n}\n\nexport default vitestGenerator;\nexport const vitestSchematic = convertNxGenerator(vitestGenerator);\n"],"names":["vitestGenerator","vitestSchematic","tree","schema","tasks","targets","root","projectType","readProjectConfiguration","project","testTarget","findExistingTargetsInProject","validFoundTargetName","test","addOrChangeTestTarget","initTask","initGenerator","uiFramework","testEnvironment","push","skipViteConfig","createOrEditViteConfig","includeVitest","includeLib","createFiles","updateTsConfig","installCoverageProviderTask","addDependenciesToPackageJson","coverageProvider","vitestCoverageIstanbulVersion","vitestCoverageC8Version","skipFormat","formatFiles","runTasksInSerial","options","projectRoot","updateJson","joinPathFragments","json","references","some","r","path","compilerOptions","types","includes","inSourceTests","tsconfigLibPath","tsconfigAppPath","exists","addTsLibDependencies","generateFiles","__dirname","tmpl","offsetFromRoot","convertNxGenerator"],"mappings":"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"}
1
+ {"version":3,"sources":["../../../../../../packages/vite/src/generators/vitest/vitest-generator.ts"],"sourcesContent":["import {\n addDependenciesToPackageJson,\n convertNxGenerator,\n formatFiles,\n generateFiles,\n GeneratorCallback,\n joinPathFragments,\n offsetFromRoot,\n readProjectConfiguration,\n runTasksInSerial,\n Tree,\n updateJson,\n} from '@nx/devkit';\nimport {\n addOrChangeTestTarget,\n createOrEditViteConfig,\n findExistingTargetsInProject,\n} from '../../utils/generator-utils';\nimport { VitestGeneratorSchema } from './schema';\n\nimport initGenerator from '../init/init';\nimport {\n vitestCoverageC8Version,\n vitestCoverageIstanbulVersion,\n vitestCoverageV8Version,\n} from '../../utils/versions';\n\nimport { addTsLibDependencies } from '@nx/js';\n\nexport async function vitestGenerator(\n tree: Tree,\n schema: VitestGeneratorSchema\n) {\n const tasks: GeneratorCallback[] = [];\n\n const { targets, root, projectType } = readProjectConfiguration(\n tree,\n schema.project\n );\n let testTarget =\n schema.testTarget ??\n findExistingTargetsInProject(targets).validFoundTargetName.test ??\n 'test';\n\n addOrChangeTestTarget(tree, schema, testTarget);\n\n const initTask = await initGenerator(tree, {\n uiFramework: schema.uiFramework,\n testEnvironment: schema.testEnvironment,\n });\n tasks.push(initTask);\n\n if (!schema.skipViteConfig) {\n createOrEditViteConfig(\n tree,\n {\n ...schema,\n includeVitest: true,\n includeLib: projectType === 'library',\n },\n true\n );\n }\n\n createFiles(tree, schema, root);\n updateTsConfig(tree, schema, root);\n\n const coverageProviderDependency = getCoverageProviderDependency(\n schema.coverageProvider\n );\n\n const installCoverageProviderTask = addDependenciesToPackageJson(\n tree,\n {},\n coverageProviderDependency\n );\n tasks.push(installCoverageProviderTask);\n\n if (!schema.skipFormat) {\n await formatFiles(tree);\n }\n\n return runTasksInSerial(...tasks);\n}\n\nfunction updateTsConfig(\n tree: Tree,\n options: VitestGeneratorSchema,\n projectRoot: string\n) {\n updateJson(tree, joinPathFragments(projectRoot, 'tsconfig.json'), (json) => {\n if (\n json.references &&\n !json.references.some((r) => r.path === './tsconfig.spec.json')\n ) {\n json.references.push({\n path: './tsconfig.spec.json',\n });\n }\n\n if (!json.compilerOptions?.types?.includes('vitest')) {\n if (json.compilerOptions?.types) {\n json.compilerOptions.types.push('vitest');\n } else {\n json.compilerOptions ??= {};\n json.compilerOptions.types = ['vitest'];\n }\n }\n return json;\n });\n\n if (options.inSourceTests) {\n const tsconfigLibPath = joinPathFragments(projectRoot, 'tsconfig.lib.json');\n const tsconfigAppPath = joinPathFragments(projectRoot, 'tsconfig.app.json');\n if (tree.exists(tsconfigLibPath)) {\n updateJson(\n tree,\n joinPathFragments(projectRoot, 'tsconfig.lib.json'),\n (json) => {\n (json.compilerOptions.types ??= []).push('vitest/importMeta');\n return json;\n }\n );\n } else if (tree.exists(tsconfigAppPath)) {\n updateJson(\n tree,\n joinPathFragments(projectRoot, 'tsconfig.app.json'),\n (json) => {\n (json.compilerOptions.types ??= []).push('vitest/importMeta');\n return json;\n }\n );\n }\n\n addTsLibDependencies(tree);\n }\n}\n\nfunction createFiles(\n tree: Tree,\n options: VitestGeneratorSchema,\n projectRoot: string\n) {\n generateFiles(tree, joinPathFragments(__dirname, 'files'), projectRoot, {\n tmpl: '',\n ...options,\n projectRoot,\n offsetFromRoot: offsetFromRoot(projectRoot),\n });\n}\n\nfunction getCoverageProviderDependency(\n coverageProvider: VitestGeneratorSchema['coverageProvider']\n) {\n switch (coverageProvider) {\n case 'c8':\n return {\n '@vitest/coverage-c8': vitestCoverageC8Version,\n };\n case 'istanbul':\n return {\n '@vitest/coverage-istanbul': vitestCoverageIstanbulVersion,\n };\n default:\n return {\n '@vitest/coverage-v8': vitestCoverageV8Version,\n };\n }\n}\n\nexport default vitestGenerator;\nexport const vitestSchematic = convertNxGenerator(vitestGenerator);\n"],"names":["vitestGenerator","vitestSchematic","tree","schema","tasks","targets","root","projectType","readProjectConfiguration","project","testTarget","findExistingTargetsInProject","validFoundTargetName","test","addOrChangeTestTarget","initTask","initGenerator","uiFramework","testEnvironment","push","skipViteConfig","createOrEditViteConfig","includeVitest","includeLib","createFiles","updateTsConfig","coverageProviderDependency","getCoverageProviderDependency","coverageProvider","installCoverageProviderTask","addDependenciesToPackageJson","skipFormat","formatFiles","runTasksInSerial","options","projectRoot","updateJson","joinPathFragments","json","references","some","r","path","compilerOptions","types","includes","inSourceTests","tsconfigLibPath","tsconfigAppPath","exists","addTsLibDependencies","generateFiles","__dirname","tmpl","offsetFromRoot","vitestCoverageC8Version","vitestCoverageIstanbulVersion","vitestCoverageV8Version","convertNxGenerator"],"mappings":"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"}
@@ -33,7 +33,7 @@ function createBuildableTsConfig(projectRoot, options, context) {
33
33
  var _buildLibsFromSource;
34
34
  (_buildLibsFromSource = (_options = options).buildLibsFromSource) != null ? _buildLibsFromSource : _options.buildLibsFromSource = true;
35
35
  if (!options.buildLibsFromSource) {
36
- const { dependencies } = (0, _buildablelibsutils.calculateProjectDependencies)(context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
36
+ const { dependencies } = (0, _buildablelibsutils.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, context.targetName, context.configurationName);
37
37
  // this tsconfig is used via the vite ts paths plugin
38
38
  (0, _buildablelibsutils.createTmpTsConfig)(tsConfig, context.root, projectRoot, dependencies);
39
39
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../../packages/vite/src/utils/executor-utils.ts"],"sourcesContent":["import { printDiagnostics, runTypeCheck } from '@nx/js';\nimport { join, resolve } from 'path';\nimport { ViteBuildExecutorOptions } from '../executors/build/schema';\nimport { ExecutorContext } from '@nx/devkit';\nimport { ViteDevServerExecutorOptions } from '../executors/dev-server/schema';\nimport {\n calculateProjectDependencies,\n createTmpTsConfig,\n} from '@nx/js/src/utils/buildable-libs-utils';\n\nexport async function validateTypes(opts: {\n workspaceRoot: string;\n projectRoot: string;\n tsconfig: string;\n}): Promise<void> {\n const result = await runTypeCheck({\n workspaceRoot: opts.workspaceRoot,\n tsConfigPath: join(opts.workspaceRoot, opts.tsconfig),\n mode: 'noEmit',\n });\n\n await printDiagnostics(result.errors, result.warnings);\n\n if (result.errors.length > 0) {\n throw new Error('Found type errors. See above.');\n }\n}\n\nexport function createBuildableTsConfig(\n projectRoot: string,\n options: ViteBuildExecutorOptions | ViteDevServerExecutorOptions,\n context: ExecutorContext\n) {\n const tsConfig = resolve(projectRoot, 'tsconfig.json');\n options.buildLibsFromSource ??= true;\n\n if (!options.buildLibsFromSource) {\n const { dependencies } = calculateProjectDependencies(\n context.projectGraph,\n context.root,\n context.projectName,\n context.targetName,\n context.configurationName\n );\n // this tsconfig is used via the vite ts paths plugin\n createTmpTsConfig(tsConfig, context.root, projectRoot, dependencies);\n }\n}\n"],"names":["validateTypes","createBuildableTsConfig","opts","result","runTypeCheck","workspaceRoot","tsConfigPath","join","tsconfig","mode","printDiagnostics","errors","warnings","length","Error","projectRoot","options","context","tsConfig","resolve","buildLibsFromSource","dependencies","calculateProjectDependencies","projectGraph","root","projectName","targetName","configurationName","createTmpTsConfig"],"mappings":";;;;;;;;IAUsBA,aAAa;eAAbA;;IAkBNC,uBAAuB;eAAvBA;;;oBA5B+B;sBACjB;oCAOvB;AAEA,eAAeD,cAAcE,IAInC,EAAiB;IAChB,MAAMC,SAAS,MAAMC,IAAAA,gBAAY,EAAC;QAChCC,eAAeH,KAAKG,aAAa;QACjCC,cAAcC,IAAAA,UAAI,EAACL,KAAKG,aAAa,EAAEH,KAAKM,QAAQ;QACpDC,MAAM;IACR;IAEA,MAAMC,IAAAA,oBAAgB,EAACP,OAAOQ,MAAM,EAAER,OAAOS,QAAQ;IAErD,IAAIT,OAAOQ,MAAM,CAACE,MAAM,GAAG,GAAG;QAC5B,MAAM,IAAIC,MAAM,iCAAiC;IACnD,CAAC;AACH;AAEO,SAASb,wBACdc,WAAmB,EACnBC,OAAgE,EAChEC,OAAwB,EACxB;QAEAD;IADA,MAAME,WAAWC,IAAAA,aAAO,EAACJ,aAAa;;IACtCC,yBAAAA,WAAAA,SAAQI,sDAARJ,SAAQI,sBAAwB,IAAI;IAEpC,IAAI,CAACJ,QAAQI,mBAAmB,EAAE;QAChC,MAAM,EAAEC,aAAY,EAAE,GAAGC,IAAAA,gDAA4B,EACnDL,QAAQM,YAAY,EACpBN,QAAQO,IAAI,EACZP,QAAQQ,WAAW,EACnBR,QAAQS,UAAU,EAClBT,QAAQU,iBAAiB;QAE3B,qDAAqD;QACrDC,IAAAA,qCAAiB,EAACV,UAAUD,QAAQO,IAAI,EAAET,aAAaM;IACzD,CAAC;AACH"}
1
+ {"version":3,"sources":["../../../../../packages/vite/src/utils/executor-utils.ts"],"sourcesContent":["import { printDiagnostics, runTypeCheck } from '@nx/js';\nimport { join, resolve } from 'path';\nimport { ViteBuildExecutorOptions } from '../executors/build/schema';\nimport { ExecutorContext } from '@nx/devkit';\nimport { ViteDevServerExecutorOptions } from '../executors/dev-server/schema';\nimport {\n calculateProjectBuildableDependencies,\n createTmpTsConfig,\n} from '@nx/js/src/utils/buildable-libs-utils';\n\nexport async function validateTypes(opts: {\n workspaceRoot: string;\n projectRoot: string;\n tsconfig: string;\n}): Promise<void> {\n const result = await runTypeCheck({\n workspaceRoot: opts.workspaceRoot,\n tsConfigPath: join(opts.workspaceRoot, opts.tsconfig),\n mode: 'noEmit',\n });\n\n await printDiagnostics(result.errors, result.warnings);\n\n if (result.errors.length > 0) {\n throw new Error('Found type errors. See above.');\n }\n}\n\nexport function createBuildableTsConfig(\n projectRoot: string,\n options: ViteBuildExecutorOptions | ViteDevServerExecutorOptions,\n context: ExecutorContext\n) {\n const tsConfig = resolve(projectRoot, 'tsconfig.json');\n options.buildLibsFromSource ??= true;\n\n if (!options.buildLibsFromSource) {\n const { dependencies } = calculateProjectBuildableDependencies(\n context.taskGraph,\n context.projectGraph,\n context.root,\n context.projectName,\n context.targetName,\n context.configurationName\n );\n // this tsconfig is used via the vite ts paths plugin\n createTmpTsConfig(tsConfig, context.root, projectRoot, dependencies);\n }\n}\n"],"names":["validateTypes","createBuildableTsConfig","opts","result","runTypeCheck","workspaceRoot","tsConfigPath","join","tsconfig","mode","printDiagnostics","errors","warnings","length","Error","projectRoot","options","context","tsConfig","resolve","buildLibsFromSource","dependencies","calculateProjectBuildableDependencies","taskGraph","projectGraph","root","projectName","targetName","configurationName","createTmpTsConfig"],"mappings":";;;;;;;;IAUsBA,aAAa;eAAbA;;IAkBNC,uBAAuB;eAAvBA;;;oBA5B+B;sBACjB;oCAOvB;AAEA,eAAeD,cAAcE,IAInC,EAAiB;IAChB,MAAMC,SAAS,MAAMC,IAAAA,gBAAY,EAAC;QAChCC,eAAeH,KAAKG,aAAa;QACjCC,cAAcC,IAAAA,UAAI,EAACL,KAAKG,aAAa,EAAEH,KAAKM,QAAQ;QACpDC,MAAM;IACR;IAEA,MAAMC,IAAAA,oBAAgB,EAACP,OAAOQ,MAAM,EAAER,OAAOS,QAAQ;IAErD,IAAIT,OAAOQ,MAAM,CAACE,MAAM,GAAG,GAAG;QAC5B,MAAM,IAAIC,MAAM,iCAAiC;IACnD,CAAC;AACH;AAEO,SAASb,wBACdc,WAAmB,EACnBC,OAAgE,EAChEC,OAAwB,EACxB;QAEAD;IADA,MAAME,WAAWC,IAAAA,aAAO,EAACJ,aAAa;;IACtCC,yBAAAA,WAAAA,SAAQI,sDAARJ,SAAQI,sBAAwB,IAAI;IAEpC,IAAI,CAACJ,QAAQI,mBAAmB,EAAE;QAChC,MAAM,EAAEC,aAAY,EAAE,GAAGC,IAAAA,yDAAqC,EAC5DL,QAAQM,SAAS,EACjBN,QAAQO,YAAY,EACpBP,QAAQQ,IAAI,EACZR,QAAQS,WAAW,EACnBT,QAAQU,UAAU,EAClBV,QAAQW,iBAAiB;QAE3B,qDAAqD;QACrDC,IAAAA,qCAAiB,EAACX,UAAUD,QAAQQ,IAAI,EAAEV,aAAaM;IACzD,CAAC;AACH"}
@@ -9,4 +9,5 @@ export declare const vitePluginDtsVersion = "~2.3.0";
9
9
  export declare const happyDomVersion = "~9.20.3";
10
10
  export declare const edgeRuntimeVmVersion = "~3.0.2";
11
11
  export declare const vitestCoverageC8Version = "~0.32.0";
12
+ export declare const vitestCoverageV8Version = "~0.32.0";
12
13
  export declare const vitestCoverageIstanbulVersion = "~0.32.0";
@@ -39,6 +39,9 @@ _export(exports, {
39
39
  vitestCoverageC8Version: function() {
40
40
  return vitestCoverageC8Version;
41
41
  },
42
+ vitestCoverageV8Version: function() {
43
+ return vitestCoverageV8Version;
44
+ },
42
45
  vitestCoverageIstanbulVersion: function() {
43
46
  return vitestCoverageIstanbulVersion;
44
47
  }
@@ -54,6 +57,7 @@ const vitePluginDtsVersion = '~2.3.0';
54
57
  const happyDomVersion = '~9.20.3';
55
58
  const edgeRuntimeVmVersion = '~3.0.2';
56
59
  const vitestCoverageC8Version = '~0.32.0';
60
+ const vitestCoverageV8Version = '~0.32.0';
57
61
  const vitestCoverageIstanbulVersion = '~0.32.0';
58
62
 
59
63
  //# sourceMappingURL=versions.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../../packages/vite/src/utils/versions.ts"],"sourcesContent":["export const nxVersion = require('../../package.json').version;\nexport const viteVersion = '~4.3.9';\nexport const vitestVersion = '~0.32.0';\nexport const vitestUiVersion = '~0.32.0';\nexport const vitePluginReactVersion = '~4.0.0';\nexport const vitePluginReactSwcVersion = '~3.3.2';\nexport const jsdomVersion = '~22.1.0';\nexport const vitePluginDtsVersion = '~2.3.0';\nexport const happyDomVersion = '~9.20.3';\nexport const edgeRuntimeVmVersion = '~3.0.2';\n\n// Coverage providers\nexport const vitestCoverageC8Version = '~0.32.0';\nexport const vitestCoverageIstanbulVersion = '~0.32.0';\n"],"names":["nxVersion","viteVersion","vitestVersion","vitestUiVersion","vitePluginReactVersion","vitePluginReactSwcVersion","jsdomVersion","vitePluginDtsVersion","happyDomVersion","edgeRuntimeVmVersion","vitestCoverageC8Version","vitestCoverageIstanbulVersion","require","version"],"mappings":";;;;;;;;IAAaA,SAAS;eAATA;;IACAC,WAAW;eAAXA;;IACAC,aAAa;eAAbA;;IACAC,eAAe;eAAfA;;IACAC,sBAAsB;eAAtBA;;IACAC,yBAAyB;eAAzBA;;IACAC,YAAY;eAAZA;;IACAC,oBAAoB;eAApBA;;IACAC,eAAe;eAAfA;;IACAC,oBAAoB;eAApBA;;IAGAC,uBAAuB;eAAvBA;;IACAC,6BAA6B;eAA7BA;;;AAbN,MAAMX,YAAYY,QAAQ,sBAAsBC,OAAO;AACvD,MAAMZ,cAAc;AACpB,MAAMC,gBAAgB;AACtB,MAAMC,kBAAkB;AACxB,MAAMC,yBAAyB;AAC/B,MAAMC,4BAA4B;AAClC,MAAMC,eAAe;AACrB,MAAMC,uBAAuB;AAC7B,MAAMC,kBAAkB;AACxB,MAAMC,uBAAuB;AAG7B,MAAMC,0BAA0B;AAChC,MAAMC,gCAAgC"}
1
+ {"version":3,"sources":["../../../../../packages/vite/src/utils/versions.ts"],"sourcesContent":["export const nxVersion = require('../../package.json').version;\nexport const viteVersion = '~4.3.9';\nexport const vitestVersion = '~0.32.0';\nexport const vitestUiVersion = '~0.32.0';\nexport const vitePluginReactVersion = '~4.0.0';\nexport const vitePluginReactSwcVersion = '~3.3.2';\nexport const jsdomVersion = '~22.1.0';\nexport const vitePluginDtsVersion = '~2.3.0';\nexport const happyDomVersion = '~9.20.3';\nexport const edgeRuntimeVmVersion = '~3.0.2';\n\n// Coverage providers\nexport const vitestCoverageC8Version = '~0.32.0';\nexport const vitestCoverageV8Version = '~0.32.0';\nexport const vitestCoverageIstanbulVersion = '~0.32.0';\n"],"names":["nxVersion","viteVersion","vitestVersion","vitestUiVersion","vitePluginReactVersion","vitePluginReactSwcVersion","jsdomVersion","vitePluginDtsVersion","happyDomVersion","edgeRuntimeVmVersion","vitestCoverageC8Version","vitestCoverageV8Version","vitestCoverageIstanbulVersion","require","version"],"mappings":";;;;;;;;IAAaA,SAAS;eAATA;;IACAC,WAAW;eAAXA;;IACAC,aAAa;eAAbA;;IACAC,eAAe;eAAfA;;IACAC,sBAAsB;eAAtBA;;IACAC,yBAAyB;eAAzBA;;IACAC,YAAY;eAAZA;;IACAC,oBAAoB;eAApBA;;IACAC,eAAe;eAAfA;;IACAC,oBAAoB;eAApBA;;IAGAC,uBAAuB;eAAvBA;;IACAC,uBAAuB;eAAvBA;;IACAC,6BAA6B;eAA7BA;;;AAdN,MAAMZ,YAAYa,QAAQ,sBAAsBC,OAAO;AACvD,MAAMb,cAAc;AACpB,MAAMC,gBAAgB;AACtB,MAAMC,kBAAkB;AACxB,MAAMC,yBAAyB;AAC/B,MAAMC,4BAA4B;AAClC,MAAMC,eAAe;AACrB,MAAMC,uBAAuB;AAC7B,MAAMC,kBAAkB;AACxB,MAAMC,uBAAuB;AAG7B,MAAMC,0BAA0B;AAChC,MAAMC,0BAA0B;AAChC,MAAMC,gCAAgC"}