@nx/vite 17.0.4 → 17.0.6

package/src/generators/init/init.js

@@ -6,75 +6,92 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    updateNxJsonSettings: function() {
-        return updateNxJsonSettings;
+    createVitestConfig: function() {
+        return createVitestConfig;
     },
     initGenerator: function() {
         return initGenerator;
     },
-    initGeneratorInternal: function() {
-        return initGeneratorInternal;
-    },
     default: function() {
         return _default;
     }
 });
 const _extends = require("@swc/helpers/_/_extends");
 const _devkit = require("@nx/devkit");
-const _updatepackagescripts = require("@nx/devkit/src/utils/update-package-scripts");
-const _plugin = require("../../plugins/plugin");
-const _utils = require("./lib/utils");
-function updateNxJsonSettings(tree) {
-    var _nxJson_namedInputs, _nxJson_plugins;
+const _js = require("@nx/js");
+const _versions = require("../../utils/versions");
+function checkDependenciesInstalled(host, schema) {
+    const packageJson = (0, _devkit.readJson)(host, 'package.json');
+    const devDependencies = {};
+    const dependencies = {};
+    packageJson.dependencies = packageJson.dependencies || {};
+    packageJson.devDependencies = packageJson.devDependencies || {};
+    // base deps
+    devDependencies['@nx/vite'] = _versions.nxVersion;
+    devDependencies['vite'] = _versions.viteVersion;
+    devDependencies['vitest'] = _versions.vitestVersion;
+    devDependencies['@vitest/ui'] = _versions.vitestUiVersion;
+    if (schema.testEnvironment === 'jsdom') {
+        devDependencies['jsdom'] = _versions.jsdomVersion;
+    } else if (schema.testEnvironment === 'happy-dom') {
+        devDependencies['happy-dom'] = _versions.happyDomVersion;
+    } else if (schema.testEnvironment === 'edge-runtime') {
+        devDependencies['@edge-runtime/vm'] = _versions.edgeRuntimeVmVersion;
+    } else if (schema.testEnvironment !== 'node' && schema.testEnvironment) {
+        _devkit.logger.info(`A custom environment was provided: ${schema.testEnvironment}. You need to install it manually.`);
+    }
+    if (schema.uiFramework === 'react') {
+        if (schema.compiler === 'swc') {
+            devDependencies['@vitejs/plugin-react-swc'] = _versions.vitePluginReactSwcVersion;
+        } else {
+            devDependencies['@vitejs/plugin-react'] = _versions.vitePluginReactVersion;
+        }
+    }
+    if (schema.includeLib) {
+        devDependencies['vite-plugin-dts'] = _versions.vitePluginDtsVersion;
+    }
+    return (0, _devkit.addDependenciesToPackageJson)(host, dependencies, devDependencies);
+}
+function moveToDevDependencies(tree) {
+    (0, _devkit.updateJson)(tree, 'package.json', (packageJson)=>{
+        packageJson.dependencies = packageJson.dependencies || {};
+        packageJson.devDependencies = packageJson.devDependencies || {};
+        if (packageJson.dependencies['@nx/vite']) {
+            packageJson.devDependencies['@nx/vite'] = packageJson.dependencies['@nx/vite'];
+            delete packageJson.dependencies['@nx/vite'];
+        }
+        return packageJson;
+    });
+}
+function createVitestConfig(tree) {
+    var _nxJson_namedInputs;
+    var _nxJson, _nxJson_targetDefaults, _nxJson_targetDefaults_test;
     const nxJson = (0, _devkit.readNxJson)(tree);
     const productionFileSet = (_nxJson_namedInputs = nxJson.namedInputs) == null ? void 0 : _nxJson_namedInputs.production;
     if (productionFileSet) {
         productionFileSet.push('!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)', '!{projectRoot}/tsconfig.spec.json');
         nxJson.namedInputs.production = Array.from(new Set(productionFileSet));
     }
-    const hasPlugin = (_nxJson_plugins = nxJson.plugins) == null ? void 0 : _nxJson_plugins.some((p)=>typeof p === 'string' ? p === '@nx/vite/plugin' : p.plugin === '@nx/vite/plugin');
-    if (!hasPlugin) {
-        var _nxJson, _nxJson_targetDefaults, _nxvitetest, _nxJson_targetDefaults_nxvitetest, _nxJson_targetDefaults_nxvitetest1;
-        var _targetDefaults;
-        (_targetDefaults = (_nxJson = nxJson).targetDefaults) != null ? _targetDefaults : _nxJson.targetDefaults = {};
-        var _;
-        (_ = (_nxJson_targetDefaults = nxJson.targetDefaults)[_nxvitetest = '@nx/vite:test']) != null ? _ : _nxJson_targetDefaults[_nxvitetest] = {};
-        var _cache;
-        (_cache = (_nxJson_targetDefaults_nxvitetest = nxJson.targetDefaults['@nx/vite:test']).cache) != null ? _cache : _nxJson_targetDefaults_nxvitetest.cache = true;
-        var _inputs;
-        (_inputs = (_nxJson_targetDefaults_nxvitetest1 = nxJson.targetDefaults['@nx/vite:test']).inputs) != null ? _inputs : _nxJson_targetDefaults_nxvitetest1.inputs = [
-            'default',
-            productionFileSet ? '^production' : '^default'
-        ];
-    }
+    var _targetDefaults;
+    (_targetDefaults = (_nxJson = nxJson).targetDefaults) != null ? _targetDefaults : _nxJson.targetDefaults = {};
+    var _test;
+    (_test = (_nxJson_targetDefaults = nxJson.targetDefaults).test) != null ? _test : _nxJson_targetDefaults.test = {};
+    var _inputs;
+    (_inputs = (_nxJson_targetDefaults_test = nxJson.targetDefaults.test).inputs) != null ? _inputs : _nxJson_targetDefaults_test.inputs = [
+        'default',
+        productionFileSet ? '^production' : '^default'
+    ];
     (0, _devkit.updateNxJson)(tree, nxJson);
 }
-function initGenerator(tree, schema) {
-    return initGeneratorInternal(tree, _extends._({
-        addPlugin: false
-    }, schema));
-}
-async function initGeneratorInternal(tree, schema) {
-    var _schema;
-    const nxJson = (0, _devkit.readNxJson)(tree);
-    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' && nxJson.useInferencePlugins !== false;
-    var _addPlugin;
-    (_addPlugin = (_schema = schema).addPlugin) != null ? _addPlugin : _schema.addPlugin = addPluginDefault;
-    if (schema.addPlugin) {
-        (0, _utils.addPlugin)(tree);
-    }
-    updateNxJsonSettings(tree);
+async function initGenerator(tree, schema) {
+    moveToDevDependencies(tree);
+    createVitestConfig(tree);
     const tasks = [];
-    if (!schema.skipPackageJson) {
-        tasks.push((0, _utils.moveToDevDependencies)(tree));
-        tasks.push((0, _utils.checkDependenciesInstalled)(tree, schema));
-    }
-    if (schema.updatePackageScripts) {
-        await (0, _updatepackagescripts.updatePackageScripts)(tree, _plugin.createNodes);
-    }
-    if (!schema.skipFormat) {
-        await (0, _devkit.formatFiles)(tree);
-    }
+    tasks.push(await (0, _js.initGenerator)(tree, _extends._({}, schema, {
+        skipFormat: true,
+        tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json'
+    })));
+    tasks.push(checkDependenciesInstalled(tree, schema));
     return (0, _devkit.runTasksInSerial)(...tasks);
 }
 const _default = initGenerator;

package/src/generators/init/init.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"sourcesContent":["import {\n  formatFiles,\n  GeneratorCallback,\n  readNxJson,\n  runTasksInSerial,\n  Tree,\n  updateNxJson,\n} from '@nx/devkit';\nimport { updatePackageScripts } from '@nx/devkit/src/utils/update-package-scripts';\n\nimport { createNodes } from '../../plugins/plugin';\nimport { InitGeneratorSchema } from './schema';\nimport {\n  addPlugin,\n  checkDependenciesInstalled,\n  moveToDevDependencies,\n} from './lib/utils';\n\nexport function updateNxJsonSettings(tree: Tree) {\n  const nxJson = readNxJson(tree);\n\n  const productionFileSet = nxJson.namedInputs?.production;\n  if (productionFileSet) {\n    productionFileSet.push(\n      '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',\n      '!{projectRoot}/tsconfig.spec.json'\n    );\n\n    nxJson.namedInputs.production = Array.from(new Set(productionFileSet));\n  }\n\n  const hasPlugin = nxJson.plugins?.some((p) =>\n    typeof p === 'string'\n      ? p === '@nx/vite/plugin'\n      : p.plugin === '@nx/vite/plugin'\n  );\n\n  if (!hasPlugin) {\n    nxJson.targetDefaults ??= {};\n    nxJson.targetDefaults['@nx/vite:test'] ??= {};\n    nxJson.targetDefaults['@nx/vite:test'].cache ??= true;\n    nxJson.targetDefaults['@nx/vite:test'].inputs ??= [\n      'default',\n      productionFileSet ? '^production' : '^default',\n    ];\n  }\n\n  updateNxJson(tree, nxJson);\n}\n\nexport function initGenerator(tree: Tree, schema: InitGeneratorSchema) {\n  return initGeneratorInternal(tree, { addPlugin: false, ...schema });\n}\n\nexport async function initGeneratorInternal(\n  tree: Tree,\n  schema: InitGeneratorSchema\n) {\n  const nxJson = readNxJson(tree);\n  const addPluginDefault =\n    process.env.NX_ADD_PLUGINS !== 'false' &&\n    nxJson.useInferencePlugins !== false;\n  schema.addPlugin ??= addPluginDefault;\n  if (schema.addPlugin) {\n    addPlugin(tree);\n  }\n\n  updateNxJsonSettings(tree);\n\n  const tasks: GeneratorCallback[] = [];\n  if (!schema.skipPackageJson) {\n    tasks.push(moveToDevDependencies(tree));\n    tasks.push(checkDependenciesInstalled(tree, schema));\n  }\n\n  if (schema.updatePackageScripts) {\n    await updatePackageScripts(tree, createNodes);\n  }\n\n  if (!schema.skipFormat) {\n    await formatFiles(tree);\n  }\n\n  return runTasksInSerial(...tasks);\n}\n\nexport default initGenerator;\n"],"names":["updateNxJsonSettings","initGenerator","initGeneratorInternal","tree","nxJson","readNxJson","productionFileSet","namedInputs","production","push","Array","from","Set","hasPlugin","plugins","some","p","plugin","targetDefaults","cache","inputs","updateNxJson","schema","addPlugin","addPluginDefault","process","env","NX_ADD_PLUGINS","useInferencePlugins","tasks","skipPackageJson","moveToDevDependencies","checkDependenciesInstalled","updatePackageScripts","createNodes","skipFormat","formatFiles","runTasksInSerial"],"mappings":";;;;;;;;IAkBgBA,oBAAoB;eAApBA;;IAgCAC,aAAa;eAAbA;;IAIMC,qBAAqB;eAArBA;;IAgCtB,OAA6B;eAA7B;;;;wBA/EO;sCAC8B;wBAET;uBAMrB;AAEA,SAASF,qBAAqBG,IAAU;QAGnBC,qBAURA;IAZlB,MAAMA,SAASC,IAAAA,kBAAU,EAACF;IAE1B,MAAMG,qBAAoBF,sBAAAA,OAAOG,WAAW,qBAAlBH,oBAAoBI,UAAU;IACxD,IAAIF,mBAAmB;QACrBA,kBAAkBG,IAAI,CACpB,yDACA;QAGFL,OAAOG,WAAW,CAACC,UAAU,GAAGE,MAAMC,IAAI,CAAC,IAAIC,IAAIN;IACrD;IAEA,MAAMO,aAAYT,kBAAAA,OAAOU,OAAO,qBAAdV,gBAAgBW,IAAI,CAAC,CAACC,IACtC,OAAOA,MAAM,WACTA,MAAM,oBACNA,EAAEC,MAAM,KAAK;IAGnB,IAAI,CAACJ,WAAW;YACdT,SACAA,wBAAsB,aACtBA,mCACAA;;QAHAA,oBAAAA,UAAAA,QAAOc,4CAAPd,QAAOc,iBAAmB,CAAC;;QAC3Bd,MAAAA,yBAAAA,OAAOc,cAAc,CAAA,CAAC,cAAA,gBAAgB,gBAAtCd,sBAAqB,CAAC,YAAgB,GAAK,CAAC;;QAC5CA,WAAAA,oCAAAA,OAAOc,cAAc,CAAC,gBAAgB,EAACC,0BAAvCf,kCAAuCe,QAAU;;QACjDf,YAAAA,qCAAAA,OAAOc,cAAc,CAAC,gBAAgB,EAACE,4BAAvChB,mCAAuCgB,SAAW;YAChD;YACAd,oBAAoB,gBAAgB;SACrC;IACH;IAEAe,IAAAA,oBAAY,EAAClB,MAAMC;AACrB;AAEO,SAASH,cAAcE,IAAU,EAAEmB,MAA2B;IACnE,OAAOpB,sBAAsBC,MAAM;QAAEoB,WAAW;OAAUD;AAC5D;AAEO,eAAepB,sBACpBC,IAAU,EACVmB,MAA2B;QAM3BA;IAJA,MAAMlB,SAASC,IAAAA,kBAAU,EAACF;IAC1B,MAAMqB,mBACJC,QAAQC,GAAG,CAACC,cAAc,KAAK,WAC/BvB,OAAOwB,mBAAmB,KAAK;;IACjCN,eAAAA,UAAAA,QAAOC,kCAAPD,QAAOC,YAAcC;IACrB,IAAIF,OAAOC,SAAS,EAAE;QACpBA,IAAAA,gBAAS,EAACpB;IACZ;IAEAH,qBAAqBG;IAErB,MAAM0B,QAA6B,EAAE;IACrC,IAAI,CAACP,OAAOQ,eAAe,EAAE;QAC3BD,MAAMpB,IAAI,CAACsB,IAAAA,4BAAqB,EAAC5B;QACjC0B,MAAMpB,IAAI,CAACuB,IAAAA,iCAA0B,EAAC7B,MAAMmB;IAC9C;IAEA,IAAIA,OAAOW,oBAAoB,EAAE;QAC/B,MAAMA,IAAAA,0CAAoB,EAAC9B,MAAM+B,mBAAW;IAC9C;IAEA,IAAI,CAACZ,OAAOa,UAAU,EAAE;QACtB,MAAMC,IAAAA,mBAAW,EAACjC;IACpB;IAEA,OAAOkC,IAAAA,wBAAgB,KAAIR;AAC7B;MAEA,WAAe5B"}
+{"version":3,"sources":["../../../../../../packages/vite/src/generators/init/init.ts"],"sourcesContent":["import {\n  addDependenciesToPackageJson,\n  logger,\n  readJson,\n  readNxJson,\n  runTasksInSerial,\n  Tree,\n  updateJson,\n  updateNxJson,\n} from '@nx/devkit';\n\nimport { initGenerator as jsInitGenerator } from '@nx/js';\n\nimport {\n  edgeRuntimeVmVersion,\n  happyDomVersion,\n  jsdomVersion,\n  nxVersion,\n  vitePluginDtsVersion,\n  vitePluginReactSwcVersion,\n  vitePluginReactVersion,\n  vitestUiVersion,\n  vitestVersion,\n  viteVersion,\n} from '../../utils/versions';\nimport { InitGeneratorSchema } from './schema';\n\nfunction checkDependenciesInstalled(host: Tree, schema: InitGeneratorSchema) {\n  const packageJson = readJson(host, 'package.json');\n  const devDependencies = {};\n  const dependencies = {};\n  packageJson.dependencies = packageJson.dependencies || {};\n  packageJson.devDependencies = packageJson.devDependencies || {};\n\n  // base deps\n  devDependencies['@nx/vite'] = nxVersion;\n  devDependencies['vite'] = viteVersion;\n  devDependencies['vitest'] = vitestVersion;\n  devDependencies['@vitest/ui'] = vitestUiVersion;\n\n  if (schema.testEnvironment === 'jsdom') {\n    devDependencies['jsdom'] = jsdomVersion;\n  } else if (schema.testEnvironment === 'happy-dom') {\n    devDependencies['happy-dom'] = happyDomVersion;\n  } else if (schema.testEnvironment === 'edge-runtime') {\n    devDependencies['@edge-runtime/vm'] = edgeRuntimeVmVersion;\n  } else if (schema.testEnvironment !== 'node' && schema.testEnvironment) {\n    logger.info(\n      `A custom environment was provided: ${schema.testEnvironment}. You need to install it manually.`\n    );\n  }\n\n  if (schema.uiFramework === 'react') {\n    if (schema.compiler === 'swc') {\n      devDependencies['@vitejs/plugin-react-swc'] = vitePluginReactSwcVersion;\n    } else {\n      devDependencies['@vitejs/plugin-react'] = vitePluginReactVersion;\n    }\n  }\n\n  if (schema.includeLib) {\n    devDependencies['vite-plugin-dts'] = vitePluginDtsVersion;\n  }\n\n  return addDependenciesToPackageJson(host, dependencies, devDependencies);\n}\n\nfunction moveToDevDependencies(tree: Tree) {\n  updateJson(tree, 'package.json', (packageJson) => {\n    packageJson.dependencies = packageJson.dependencies || {};\n    packageJson.devDependencies = packageJson.devDependencies || {};\n\n    if (packageJson.dependencies['@nx/vite']) {\n      packageJson.devDependencies['@nx/vite'] =\n        packageJson.dependencies['@nx/vite'];\n      delete packageJson.dependencies['@nx/vite'];\n    }\n    return packageJson;\n  });\n}\n\nexport function createVitestConfig(tree: Tree) {\n  const nxJson = readNxJson(tree);\n\n  const productionFileSet = nxJson.namedInputs?.production;\n  if (productionFileSet) {\n    productionFileSet.push(\n      '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',\n      '!{projectRoot}/tsconfig.spec.json'\n    );\n\n    nxJson.namedInputs.production = Array.from(new Set(productionFileSet));\n  }\n\n  nxJson.targetDefaults ??= {};\n  nxJson.targetDefaults.test ??= {};\n  nxJson.targetDefaults.test.inputs ??= [\n    'default',\n    productionFileSet ? '^production' : '^default',\n  ];\n\n  updateNxJson(tree, nxJson);\n}\n\nexport async function initGenerator(tree: Tree, schema: InitGeneratorSchema) {\n  moveToDevDependencies(tree);\n  createVitestConfig(tree);\n  const tasks = [];\n\n  tasks.push(\n    await jsInitGenerator(tree, {\n      ...schema,\n      skipFormat: true,\n      tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',\n    })\n  );\n\n  tasks.push(checkDependenciesInstalled(tree, schema));\n  return runTasksInSerial(...tasks);\n}\n\nexport default initGenerator;\n"],"names":["createVitestConfig","initGenerator","checkDependenciesInstalled","host","schema","packageJson","readJson","devDependencies","dependencies","nxVersion","viteVersion","vitestVersion","vitestUiVersion","testEnvironment","jsdomVersion","happyDomVersion","edgeRuntimeVmVersion","logger","info","uiFramework","compiler","vitePluginReactSwcVersion","vitePluginReactVersion","includeLib","vitePluginDtsVersion","addDependenciesToPackageJson","moveToDevDependencies","tree","updateJson","nxJson","readNxJson","productionFileSet","namedInputs","production","push","Array","from","Set","targetDefaults","test","inputs","updateNxJson","tasks","jsInitGenerator","skipFormat","tsConfigName","rootProject","runTasksInSerial"],"mappings":"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"}

package/src/generators/init/schema.d.ts

@@ -1,7 +1,7 @@
 export interface InitGeneratorSchema {
-  skipFormat?: boolean;
-  skipPackageJson?: boolean;
-  keepExistingVersions?: boolean;
-  updatePackageScripts?: boolean;
-  addPlugin?: boolean;
+  uiFramework: 'react' | 'none';
+  compiler?: 'babel' | 'swc';
+  includeLib?: boolean;
+  testEnvironment?: 'node' | 'jsdom' | 'happy-dom' | 'edge-runtime' | string;
+  rootProject?: boolean;
 }

package/src/generators/init/schema.json

@@ -5,27 +5,30 @@
   "$id": "init-vite-plugin",
   "type": "object",
   "properties": {
-    "skipFormat": {
-      "description": "Skip formatting files.",
-      "type": "boolean",
-      "default": false
+    "uiFramework": {
+      "type": "string",
+      "description": "UI Framework to use for Vite.",
+      "enum": ["react", "none"],
+      "default": "react",
+      "x-prompt": "What UI framework plugin should Vite use?"
     },
-    "skipPackageJson": {
-      "description": "Do not add dependencies to `package.json`.",
-      "type": "boolean",
-      "default": false
+    "compiler": {
+      "type": "string",
+      "description": "Compiler to use for Vite when UI Framework is React.",
+      "enum": ["babel", "swc"],
+      "default": "babel"
     },
-    "keepExistingVersions": {
+    "includeLib": {
       "type": "boolean",
-      "x-priority": "internal",
-      "description": "Keep existing dependencies versions",
+      "description": "Add dependencies needed to build libraries.",
       "default": false
     },
-    "updatePackageScripts": {
-      "type": "boolean",
-      "x-priority": "internal",
-      "description": "Update `package.json` scripts with inferred targets",
-      "default": false
+    "testEnvironment": {
+      "description": "The vitest environment to use. See https://vitest.dev/config/#environment.",
+      "type": "string",
+      "enum": ["node", "jsdom", "happy-dom", "edge-runtime"],
+      "default": "jsdom"
     }
-  }
+  },
+  "examplesFile": "../../../docs/init-examples.md"
 }

package/src/generators/vitest/files/tsconfig.spec.json__tmpl__

@@ -1,12 +1,11 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "<%= offsetFromRoot %>dist/out-tsc",
+    "outDir": "../../dist/out-tsc",
     "types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"]
   },
   "include": [
     "vite.config.ts",
-    "vitest.config.ts",
     "src/**/*.test.ts",
     "src/**/*.spec.ts",
     "src/**/*.test.tsx",

package/src/generators/vitest/schema.d.ts

@@ -1,11 +1,10 @@
 export interface VitestGeneratorSchema {
   project: string;
   uiFramework: 'react' | 'none';
-  coverageProvider: 'v8' | 'istanbul' | 'custom';
+  coverageProvider: 'v8' | 'c8' | 'istanbul';
   inSourceTests?: boolean;
   skipViteConfig?: boolean;
   testTarget?: string;
   skipFormat?: boolean;
   testEnvironment?: 'node' | 'jsdom' | 'happy-dom' | 'edge-runtime' | string;
-  addPlugin?: boolean;
 }

package/src/generators/vitest/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "cli": "nx",
   "$id": "Vitest",
   "title": "Vitest",
@@ -31,7 +31,7 @@
     },
     "coverageProvider": {
       "type": "string",
-      "enum": ["v8", "istanbul", "custom"],
+      "enum": ["v8", "c8", "istanbul"],
       "default": "v8",
       "description": "Coverage provider to use."
     },

package/src/generators/vitest/vitest-generator.d.ts

@@ -1,5 +1,4 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { VitestGeneratorSchema } from './schema';
-export declare function vitestGenerator(tree: Tree, schema: VitestGeneratorSchema, hasPlugin?: boolean): Promise<GeneratorCallback>;
-export declare function vitestGeneratorInternal(tree: Tree, schema: VitestGeneratorSchema, hasPlugin?: boolean): Promise<GeneratorCallback>;
+export declare function vitestGenerator(tree: Tree, schema: VitestGeneratorSchema): Promise<GeneratorCallback>;
 export default vitestGenerator;

package/src/generators/vitest/vitest-generator.js

@@ -9,9 +9,6 @@ _export(exports, {
     vitestGenerator: function() {
         return vitestGenerator;
     },
-    vitestGeneratorInternal: function() {
-        return vitestGeneratorInternal;
-    },
     default: function() {
         return _default;
     }
@@ -23,33 +20,17 @@ const _init = require("../init/init");
 const _versions = require("../../utils/versions");
 const _js = require("@nx/js");
 const _path = require("path");
-const _ensuredependencies = require("../../utils/ensure-dependencies");
-function vitestGenerator(tree, schema, hasPlugin = false) {
-    return vitestGeneratorInternal(tree, _extends._({
-        addPlugin: false
-    }, schema), hasPlugin);
-}
-async function vitestGeneratorInternal(tree, schema, hasPlugin = false) {
-    var _nxJson_plugins;
+async function vitestGenerator(tree, schema) {
     const tasks = [];
-    const { root, projectType } = (0, _devkit.readProjectConfiguration)(tree, schema.project);
-    const isRootProject = root === '.';
-    tasks.push(await (0, _js.initGenerator)(tree, _extends._({}, schema, {
-        skipFormat: true
-    })));
+    const { targets, root, projectType } = (0, _devkit.readProjectConfiguration)(tree, schema.project);
+    var _schema_testTarget, _ref;
+    let testTarget = (_ref = (_schema_testTarget = schema.testTarget) != null ? _schema_testTarget : (0, _generatorutils.findExistingTargetsInProject)(targets).validFoundTargetName.test) != null ? _ref : 'test';
+    (0, _generatorutils.addOrChangeTestTarget)(tree, schema, testTarget);
     const initTask = await (0, _init.default)(tree, {
-        skipFormat: true,
-        addPlugin: schema.addPlugin
+        uiFramework: schema.uiFramework,
+        testEnvironment: schema.testEnvironment
     });
     tasks.push(initTask);
-    tasks.push((0, _ensuredependencies.ensureDependencies)(tree, schema));
-    const nxJson = (0, _devkit.readNxJson)(tree);
-    const hasPluginCheck = (_nxJson_plugins = nxJson.plugins) == null ? void 0 : _nxJson_plugins.some((p)=>(typeof p === 'string' ? p === '@nx/vite/plugin' : p.plugin === '@nx/vite/plugin') || hasPlugin);
-    if (!hasPluginCheck) {
-        var _schema_testTarget;
-        const testTarget = (_schema_testTarget = schema.testTarget) != null ? _schema_testTarget : 'test';
-        (0, _generatorutils.addOrChangeTestTarget)(tree, schema, testTarget);
-    }
     if (!schema.skipViteConfig) {
         if (schema.uiFramework === 'react') {
             (0, _generatorutils.createOrEditViteConfig)(tree, {
@@ -67,8 +48,7 @@ async function vitestGeneratorInternal(tree, schema, hasPlugin = false) {
                 ],
                 plugins: [
                     'react()'
-                ],
-                coverageProvider: schema.coverageProvider
+                ]
             }, true);
         } else {
             (0, _generatorutils.createOrEditViteConfig)(tree, _extends._({}, schema, {
@@ -82,10 +62,6 @@ async function vitestGeneratorInternal(tree, schema, hasPlugin = false) {
     const coverageProviderDependency = getCoverageProviderDependency(schema.coverageProvider);
     const installCoverageProviderTask = (0, _devkit.addDependenciesToPackageJson)(tree, {}, coverageProviderDependency);
     tasks.push(installCoverageProviderTask);
-    // Setup workspace config file (https://vitest.dev/guide/workspace.html)
-    if (!isRootProject && !tree.exists(`vitest.workspace.ts`) && !tree.exists(`vitest.workspace.js`) && !tree.exists(`vitest.workspace.json`) && !tree.exists(`vitest.projects.ts`) && !tree.exists(`vitest.projects.js`) && !tree.exists(`vitest.projects.json`)) {
-        tree.write('vitest.workspace.ts', `export default ['**/*/vite.config.ts', '**/*/vitest.config.ts'];`);
-    }
     if (!schema.skipFormat) {
         await (0, _devkit.formatFiles)(tree);
     }
@@ -168,9 +144,9 @@ function createFiles(tree, options, projectRoot) {
 }
 function getCoverageProviderDependency(coverageProvider) {
     switch(coverageProvider){
-        case 'v8':
+        case 'c8':
             return {
-                '@vitest/coverage-v8': _versions.vitestCoverageV8Version
+                '@vitest/coverage-c8': _versions.vitestCoverageC8Version
             };
         case 'istanbul':
             return {

package/src/generators/vitest/vitest-generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/generators/vitest/vitest-generator.ts"],"sourcesContent":["import {\n  addDependenciesToPackageJson,\n  formatFiles,\n  generateFiles,\n  GeneratorCallback,\n  joinPathFragments,\n  offsetFromRoot,\n  readNxJson,\n  readProjectConfiguration,\n  runTasksInSerial,\n  Tree,\n  updateJson,\n} from '@nx/devkit';\nimport {\n  addOrChangeTestTarget,\n  createOrEditViteConfig,\n} from '../../utils/generator-utils';\nimport { VitestGeneratorSchema } from './schema';\n\nimport initGenerator from '../init/init';\nimport {\n  vitestCoverageIstanbulVersion,\n  vitestCoverageV8Version,\n} from '../../utils/versions';\n\nimport { addTsLibDependencies, initGenerator as jsInitGenerator } from '@nx/js';\nimport { join } from 'path';\nimport { ensureDependencies } from '../../utils/ensure-dependencies';\n\nexport function vitestGenerator(\n  tree: Tree,\n  schema: VitestGeneratorSchema,\n  hasPlugin = false\n) {\n  return vitestGeneratorInternal(\n    tree,\n    { addPlugin: false, ...schema },\n    hasPlugin\n  );\n}\n\nexport async function vitestGeneratorInternal(\n  tree: Tree,\n  schema: VitestGeneratorSchema,\n  hasPlugin = false\n) {\n  const tasks: GeneratorCallback[] = [];\n\n  const { root, projectType } = readProjectConfiguration(tree, schema.project);\n  const isRootProject = root === '.';\n\n  tasks.push(await jsInitGenerator(tree, { ...schema, skipFormat: true }));\n  const initTask = await initGenerator(tree, {\n    skipFormat: true,\n    addPlugin: schema.addPlugin,\n  });\n  tasks.push(initTask);\n  tasks.push(ensureDependencies(tree, schema));\n\n  const nxJson = readNxJson(tree);\n  const hasPluginCheck = nxJson.plugins?.some(\n    (p) =>\n      (typeof p === 'string'\n        ? p === '@nx/vite/plugin'\n        : p.plugin === '@nx/vite/plugin') || hasPlugin\n  );\n  if (!hasPluginCheck) {\n    const testTarget = schema.testTarget ?? 'test';\n    addOrChangeTestTarget(tree, schema, testTarget);\n  }\n\n  if (!schema.skipViteConfig) {\n    if (schema.uiFramework === 'react') {\n      createOrEditViteConfig(\n        tree,\n        {\n          project: schema.project,\n          includeLib: projectType === 'library',\n          includeVitest: true,\n          inSourceTests: schema.inSourceTests,\n          rollupOptionsExternal: [\n            \"'react'\",\n            \"'react-dom'\",\n            \"'react/jsx-runtime'\",\n          ],\n          imports: [`import react from '@vitejs/plugin-react'`],\n          plugins: ['react()'],\n          coverageProvider: schema.coverageProvider,\n        },\n        true\n      );\n    } else {\n      createOrEditViteConfig(\n        tree,\n        {\n          ...schema,\n          includeVitest: true,\n          includeLib: projectType === 'library',\n        },\n        true\n      );\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  // Setup workspace config file (https://vitest.dev/guide/workspace.html)\n  if (\n    !isRootProject &&\n    !tree.exists(`vitest.workspace.ts`) &&\n    !tree.exists(`vitest.workspace.js`) &&\n    !tree.exists(`vitest.workspace.json`) &&\n    !tree.exists(`vitest.projects.ts`) &&\n    !tree.exists(`vitest.projects.js`) &&\n    !tree.exists(`vitest.projects.json`)\n  ) {\n    tree.write(\n      'vitest.workspace.ts',\n      `export default ['**/*/vite.config.ts', '**/*/vitest.config.ts'];`\n    );\n  }\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  if (tree.exists(joinPathFragments(projectRoot, 'tsconfig.spec.json'))) {\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.spec.json'),\n      (json) => {\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\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.json'),\n      (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        return json;\n      }\n    );\n  } else {\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.json'),\n      (json) => {\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  }\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, join(__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 'v8':\n      return {\n        '@vitest/coverage-v8': vitestCoverageV8Version,\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;\n"],"names":["vitestGenerator","vitestGeneratorInternal","tree","schema","hasPlugin","addPlugin","nxJson","tasks","root","projectType","readProjectConfiguration","project","isRootProject","push","jsInitGenerator","skipFormat","initTask","initGenerator","ensureDependencies","readNxJson","hasPluginCheck","plugins","some","p","plugin","testTarget","addOrChangeTestTarget","skipViteConfig","uiFramework","createOrEditViteConfig","includeLib","includeVitest","inSourceTests","rollupOptionsExternal","imports","coverageProvider","createFiles","updateTsConfig","coverageProviderDependency","getCoverageProviderDependency","installCoverageProviderTask","addDependenciesToPackageJson","exists","write","formatFiles","runTasksInSerial","options","projectRoot","joinPathFragments","updateJson","json","compilerOptions","types","includes","references","r","path","tsconfigLibPath","tsconfigAppPath","addTsLibDependencies","generateFiles","join","__dirname","tmpl","offsetFromRoot","vitestCoverageV8Version","vitestCoverageIstanbulVersion"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/vite/src/generators/vitest/vitest-generator.ts"],"sourcesContent":["import {\n  addDependenciesToPackageJson,\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';\nimport { join } from 'path';\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    if (schema.uiFramework === 'react') {\n      createOrEditViteConfig(\n        tree,\n        {\n          project: schema.project,\n          includeLib: projectType === 'library',\n          includeVitest: true,\n          inSourceTests: schema.inSourceTests,\n          rollupOptionsExternal: [\n            \"'react'\",\n            \"'react-dom'\",\n            \"'react/jsx-runtime'\",\n          ],\n          imports: [`import react from '@vitejs/plugin-react'`],\n          plugins: ['react()'],\n        },\n        true\n      );\n    } else {\n      createOrEditViteConfig(\n        tree,\n        {\n          ...schema,\n          includeVitest: true,\n          includeLib: projectType === 'library',\n        },\n        true\n      );\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  if (tree.exists(joinPathFragments(projectRoot, 'tsconfig.spec.json'))) {\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.spec.json'),\n      (json) => {\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\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.json'),\n      (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        return json;\n      }\n    );\n  } else {\n    updateJson(\n      tree,\n      joinPathFragments(projectRoot, 'tsconfig.json'),\n      (json) => {\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  }\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, join(__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;\n"],"names":["vitestGenerator","tree","schema","tasks","targets","root","projectType","readProjectConfiguration","project","testTarget","findExistingTargetsInProject","validFoundTargetName","test","addOrChangeTestTarget","initTask","initGenerator","uiFramework","testEnvironment","push","skipViteConfig","createOrEditViteConfig","includeLib","includeVitest","inSourceTests","rollupOptionsExternal","imports","plugins","createFiles","updateTsConfig","coverageProviderDependency","getCoverageProviderDependency","coverageProvider","installCoverageProviderTask","addDependenciesToPackageJson","skipFormat","formatFiles","runTasksInSerial","options","projectRoot","exists","joinPathFragments","updateJson","json","compilerOptions","types","includes","references","some","r","path","tsconfigLibPath","tsconfigAppPath","addTsLibDependencies","generateFiles","join","__dirname","tmpl","offsetFromRoot","vitestCoverageC8Version","vitestCoverageIstanbulVersion","vitestCoverageV8Version"],"mappings":"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"}

package/src/migrations/update-15-3-1/update-vite-tsconfig-paths.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-15-3-1/update-vite-tsconfig-paths.ts"],"sourcesContent":["import {\n  applyChangesToString,\n  ChangeType,\n  formatFiles,\n  readProjectConfiguration,\n  Tree,\n} from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport { findNodes } from '@nx/js';\nimport { normalizeViteConfigFilePathWithTree } from '../../utils/generator-utils';\nimport ts = require('typescript');\n\nexport async function removeProjectsFromViteTsConfigPaths(tree: Tree) {\n  findAllProjectsWithViteConfig(tree);\n  await formatFiles(tree);\n}\n\nexport default removeProjectsFromViteTsConfigPaths;\n\nfunction findAllProjectsWithViteConfig(tree: Tree): void {\n  forEachExecutorOptions(tree, '@nrwl/vite:build', (options, project) => {\n    const projectConfiguration = readProjectConfiguration(tree, project);\n    const viteConfig = normalizeViteConfigFilePathWithTree(\n      tree,\n      projectConfiguration.root,\n      options?.['configFile']\n    );\n    if (viteConfig) {\n      const appFileContent = tree.read(viteConfig, 'utf-8');\n      const file = tsquery.ast(appFileContent);\n      let newContents = appFileContent;\n      const defineConfig = tsquery.query(\n        file,\n        'CallExpression:has(Identifier[name=\"defineConfig\"])'\n      );\n      let startOfProjects, endOfProjects;\n\n      defineConfig?.[0]\n        ?.getChildren()\n        .forEach((defineConfigContentNode: any) => {\n          // Make sure it's the one we are looking for\n          // We cannot assume that it's called tsConfigPaths\n          // So make sure it includes `projects` and `root`\n          if (\n            defineConfigContentNode.getText().includes('projects') &&\n            defineConfigContentNode.getText().includes('root')\n          ) {\n            findNodes(defineConfigContentNode, [\n              ts.SyntaxKind.PropertyAssignment,\n            ]).forEach((nodePA) => {\n              if (nodePA.getText().startsWith('projects')) {\n                startOfProjects = nodePA.getStart();\n                endOfProjects = nodePA.getEnd();\n              }\n            });\n          }\n        });\n\n      if (startOfProjects && endOfProjects) {\n        newContents = applyChangesToString(newContents, [\n          {\n            type: ChangeType.Delete,\n            start: startOfProjects,\n            length: endOfProjects - startOfProjects + 1,\n          },\n        ]);\n        tree.write(viteConfig, newContents);\n      }\n    }\n  });\n}\n"],"names":["removeProjectsFromViteTsConfigPaths","ts","tree","findAllProjectsWithViteConfig","formatFiles","forEachExecutorOptions","options","project","projectConfiguration","readProjectConfiguration","viteConfig","normalizeViteConfigFilePathWithTree","root","defineConfig","appFileContent","read","file","tsquery","ast","newContents","query","startOfProjects","endOfProjects","getChildren","forEach","defineConfigContentNode","getText","includes","findNodes","SyntaxKind","PropertyAssignment","nodePA","startsWith","getStart","getEnd","applyChangesToString","type","ChangeType","Delete","start","length","write"],"mappings":";;;;;;;;IAasBA,mCAAmC;eAAnCA;;IAKtB,OAAmD;eAAnD;;;wBAZO;sCACgC;yBACf;oBACE;gCAC0B;AACpD,MAAOC,aAAa;AAEb,eAAeD,oCAAoCE,IAAU;IAClEC,8BAA8BD;IAC9B,MAAME,IAAAA,mBAAW,EAACF;AACpB;MAEA,WAAeF;AAEf,SAASG,8BAA8BD,IAAU;IAC/CG,IAAAA,4CAAsB,EAACH,MAAM,oBAAoB,CAACI,SAASC;QACzD,MAAMC,uBAAuBC,IAAAA,gCAAwB,EAACP,MAAMK;QAC5D,MAAMG,aAAaC,IAAAA,mDAAmC,EACpDT,MACAM,qBAAqBI,IAAI,EACzBN,2BAAAA,OAAS,CAAC,aAAa;QAEzB,IAAII,YAAY;gBAUdG;YATA,MAAMC,iBAAiBZ,KAAKa,IAAI,CAACL,YAAY;YAC7C,MAAMM,OAAOC,gBAAO,CAACC,GAAG,CAACJ;YACzB,IAAIK,cAAcL;YAClB,MAAMD,eAAeI,gBAAO,CAACG,KAAK,CAChCJ,MACA;YAEF,IAAIK,iBAAiBC;YAErBT,iCAAAA,iBAAAA,YAAc,CAAC,EAAE,qBAAjBA,eACIU,WAAW,GACZC,OAAO,CAAC,CAACC;gBACR,4CAA4C;gBAC5C,kDAAkD;gBAClD,iDAAiD;gBACjD,IACEA,wBAAwBC,OAAO,GAAGC,QAAQ,CAAC,eAC3CF,wBAAwBC,OAAO,GAAGC,QAAQ,CAAC,SAC3C;oBACAC,IAAAA,aAAS,EAACH,yBAAyB;wBACjCxB,GAAG4B,UAAU,CAACC,kBAAkB;qBACjC,EAAEN,OAAO,CAAC,CAACO;wBACV,IAAIA,OAAOL,OAAO,GAAGM,UAAU,CAAC,aAAa;4BAC3CX,kBAAkBU,OAAOE,QAAQ;4BACjCX,gBAAgBS,OAAOG,MAAM;wBAC/B;oBACF;gBACF;YACF;YAEF,IAAIb,mBAAmBC,eAAe;gBACpCH,cAAcgB,IAAAA,4BAAoB,EAAChB,aAAa;oBAC9C;wBACEiB,MAAMC,kBAAU,CAACC,MAAM;wBACvBC,OAAOlB;wBACPmB,QAAQlB,gBAAgBD,kBAAkB;oBAC5C;iBACD;gBACDnB,KAAKuC,KAAK,CAAC/B,YAAYS;YACzB;QACF;IACF;AACF"}
+{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-15-3-1/update-vite-tsconfig-paths.ts"],"sourcesContent":["import {\n  applyChangesToString,\n  ChangeType,\n  formatFiles,\n  readProjectConfiguration,\n  Tree,\n} from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport { findNodes } from '@nx/js';\nimport { normalizeViteConfigFilePathWithTree } from '../../utils/generator-utils';\nimport ts = require('typescript');\n\nexport async function removeProjectsFromViteTsConfigPaths(tree: Tree) {\n  findAllProjectsWithViteConfig(tree);\n  await formatFiles(tree);\n}\n\nexport default removeProjectsFromViteTsConfigPaths;\n\nfunction findAllProjectsWithViteConfig(tree: Tree): void {\n  forEachExecutorOptions(tree, '@nrwl/vite:build', (options, project) => {\n    const projectConfiguration = readProjectConfiguration(tree, project);\n    const viteConfig = normalizeViteConfigFilePathWithTree(\n      tree,\n      projectConfiguration.root,\n      options?.['configFile']\n    );\n    if (viteConfig) {\n      const appFileContent = tree.read(viteConfig, 'utf-8');\n      const file = tsquery.ast(appFileContent);\n      let newContents = appFileContent;\n      const defineConfig = tsquery.query(\n        file,\n        'CallExpression:has(Identifier[name=\"defineConfig\"])'\n      );\n      let startOfProjects, endOfProjects;\n\n      defineConfig?.[0]?.getChildren().forEach((defineConfigContentNode) => {\n        // Make sure it's the one we are looking for\n        // We cannot assume that it's called tsConfigPaths\n        // So make sure it includes `projects` and `root`\n        if (\n          defineConfigContentNode.getText().includes('projects') &&\n          defineConfigContentNode.getText().includes('root')\n        ) {\n          findNodes(defineConfigContentNode, [\n            ts.SyntaxKind.PropertyAssignment,\n          ]).forEach((nodePA) => {\n            if (nodePA.getText().startsWith('projects')) {\n              startOfProjects = nodePA.getStart();\n              endOfProjects = nodePA.getEnd();\n            }\n          });\n        }\n      });\n\n      if (startOfProjects && endOfProjects) {\n        newContents = applyChangesToString(newContents, [\n          {\n            type: ChangeType.Delete,\n            start: startOfProjects,\n            length: endOfProjects - startOfProjects + 1,\n          },\n        ]);\n        tree.write(viteConfig, newContents);\n      }\n    }\n  });\n}\n"],"names":["removeProjectsFromViteTsConfigPaths","ts","tree","findAllProjectsWithViteConfig","formatFiles","forEachExecutorOptions","options","project","projectConfiguration","readProjectConfiguration","viteConfig","normalizeViteConfigFilePathWithTree","root","defineConfig","appFileContent","read","file","tsquery","ast","newContents","query","startOfProjects","endOfProjects","getChildren","forEach","defineConfigContentNode","getText","includes","findNodes","SyntaxKind","PropertyAssignment","nodePA","startsWith","getStart","getEnd","applyChangesToString","type","ChangeType","Delete","start","length","write"],"mappings":";;;;;;;;IAasBA,mCAAmC;eAAnCA;;IAKtB,OAAmD;eAAnD;;;wBAZO;sCACgC;yBACf;oBACE;gCAC0B;AACpD,MAAOC,aAAa;AAEb,eAAeD,oCAAoCE,IAAU;IAClEC,8BAA8BD;IAC9B,MAAME,IAAAA,mBAAW,EAACF;AACpB;MAEA,WAAeF;AAEf,SAASG,8BAA8BD,IAAU;IAC/CG,IAAAA,4CAAsB,EAACH,MAAM,oBAAoB,CAACI,SAASC;QACzD,MAAMC,uBAAuBC,IAAAA,gCAAwB,EAACP,MAAMK;QAC5D,MAAMG,aAAaC,IAAAA,mDAAmC,EACpDT,MACAM,qBAAqBI,IAAI,EACzBN,2BAAAA,OAAS,CAAC,aAAa;QAEzB,IAAII,YAAY;gBAUdG;YATA,MAAMC,iBAAiBZ,KAAKa,IAAI,CAACL,YAAY;YAC7C,MAAMM,OAAOC,gBAAO,CAACC,GAAG,CAACJ;YACzB,IAAIK,cAAcL;YAClB,MAAMD,eAAeI,gBAAO,CAACG,KAAK,CAChCJ,MACA;YAEF,IAAIK,iBAAiBC;YAErBT,iCAAAA,iBAAAA,YAAc,CAAC,EAAE,qBAAjBA,eAAmBU,WAAW,GAAGC,OAAO,CAAC,CAACC;gBACxC,4CAA4C;gBAC5C,kDAAkD;gBAClD,iDAAiD;gBACjD,IACEA,wBAAwBC,OAAO,GAAGC,QAAQ,CAAC,eAC3CF,wBAAwBC,OAAO,GAAGC,QAAQ,CAAC,SAC3C;oBACAC,IAAAA,aAAS,EAACH,yBAAyB;wBACjCxB,GAAG4B,UAAU,CAACC,kBAAkB;qBACjC,EAAEN,OAAO,CAAC,CAACO;wBACV,IAAIA,OAAOL,OAAO,GAAGM,UAAU,CAAC,aAAa;4BAC3CX,kBAAkBU,OAAOE,QAAQ;4BACjCX,gBAAgBS,OAAOG,MAAM;wBAC/B;oBACF;gBACF;YACF;YAEA,IAAIb,mBAAmBC,eAAe;gBACpCH,cAAcgB,IAAAA,4BAAoB,EAAChB,aAAa;oBAC9C;wBACEiB,MAAMC,kBAAU,CAACC,MAAM;wBACvBC,OAAOlB;wBACPmB,QAAQlB,gBAAgBD,kBAAkB;oBAC5C;iBACD;gBACDnB,KAAKuC,KAAK,CAAC/B,YAAYS;YACzB;QACF;IACF;AACF"}

package/src/migrations/update-16-6-0-change-ts-paths-plugin/change-ts-paths-plugin.js

@@ -8,13 +8,12 @@ Object.defineProperty(exports, "default", {
 const _devkit = require("@nx/devkit");
 const _executoroptionsutils = require("@nx/devkit/src/generators/executor-options-utils");
 const _tsquery = require("@phenomnomnominal/tsquery");
-const _findviteconfig = require("../../utils/find-vite-config");
 function update(tree) {
     const projects = (0, _devkit.getProjects)(tree);
     (0, _executoroptionsutils.forEachExecutorOptions)(tree, '@nx/vite:build', (options, projectName)=>{
         var _oldTsConfigPathPlugin__importClause_name, _oldTsConfigPathPlugin__importClause, _oldTsConfigPathPlugin_;
         const projectConfig = projects.get(projectName);
-        const config = options.configFile || (0, _findviteconfig.findViteConfig)(tree, projectConfig.root);
+        const config = options.configFile || findViteConfig(tree, projectConfig.root);
         if (!config || !tree.exists(config)) {
             return;
         }
@@ -25,7 +24,7 @@ function update(tree) {
             return;
         }
         var _oldTsConfigPathPlugin__importClause_name_text;
-        const importName = (_oldTsConfigPathPlugin__importClause_name_text = (_oldTsConfigPathPlugin_ = oldTsConfigPathPlugin[0]) == null ? void 0 : (_oldTsConfigPathPlugin__importClause = _oldTsConfigPathPlugin_['importClause']) == null ? void 0 : (_oldTsConfigPathPlugin__importClause_name = _oldTsConfigPathPlugin__importClause.name) == null ? void 0 : _oldTsConfigPathPlugin__importClause_name.text) != null ? _oldTsConfigPathPlugin__importClause_name_text : 'viteTsConfigPaths';
+        const importName = (_oldTsConfigPathPlugin__importClause_name_text = (_oldTsConfigPathPlugin_ = oldTsConfigPathPlugin[0]) == null ? void 0 : (_oldTsConfigPathPlugin__importClause = _oldTsConfigPathPlugin_.importClause) == null ? void 0 : (_oldTsConfigPathPlugin__importClause_name = _oldTsConfigPathPlugin__importClause.name) == null ? void 0 : _oldTsConfigPathPlugin__importClause_name.text) != null ? _oldTsConfigPathPlugin__importClause_name_text : 'viteTsConfigPaths';
         const updatedContent = _tsquery.tsquery.replace(configContents, `PropertyAssignment:has(Identifier[name="plugins"]) CallExpression:has(Identifier[name="${importName}"])`, ()=>{
             return `nxViteTsPaths()`;
         });
@@ -35,5 +34,20 @@ function update(tree) {
         tree.write(config, withImportChange);
     });
 }
+function findViteConfig(tree, searchRoot) {
+    const allowsExt = [
+        'js',
+        'mjs',
+        'ts',
+        'cjs',
+        'mts',
+        'cts'
+    ];
+    for (const ext of allowsExt){
+        if (tree.exists((0, _devkit.joinPathFragments)(searchRoot, `vite.config.${ext}`))) {
+            return (0, _devkit.joinPathFragments)(searchRoot, `vite.config.${ext}`);
+        }
+    }
+}
 
 //# sourceMappingURL=change-ts-paths-plugin.js.map

package/src/migrations/update-16-6-0-change-ts-paths-plugin/change-ts-paths-plugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-16-6-0-change-ts-paths-plugin/change-ts-paths-plugin.ts"],"sourcesContent":["import { Tree, getProjects, joinPathFragments } from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\nimport { ViteBuildExecutorOptions } from '../../executors/build/schema';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport { findViteConfig } from '../../utils/find-vite-config';\n\nexport default function update(tree: Tree) {\n  const projects = getProjects(tree);\n  forEachExecutorOptions<ViteBuildExecutorOptions>(\n    tree,\n    '@nx/vite:build',\n    (options, projectName) => {\n      const projectConfig = projects.get(projectName);\n      const config =\n        options.configFile || findViteConfig(tree, projectConfig.root);\n      if (!config || !tree.exists(config)) {\n        return;\n      }\n\n      const configContents = tree.read(config, 'utf-8');\n\n      const oldTsConfigPathPlugin =\n        tsquery.query(\n          configContents,\n          'ImportDeclaration:has(StringLiteral[value=\"vite-tsconfig-paths\"])'\n        ) ?? [];\n\n      if (oldTsConfigPathPlugin.length === 0) {\n        return;\n      }\n\n      const importName =\n        oldTsConfigPathPlugin[0]?.['importClause']?.name?.text ??\n        'viteTsConfigPaths';\n      const updatedContent = tsquery.replace(\n        configContents,\n        `PropertyAssignment:has(Identifier[name=\"plugins\"]) CallExpression:has(Identifier[name=\"${importName}\"])`,\n        () => {\n          return `nxViteTsPaths()`;\n        }\n      );\n\n      const withImportChange = tsquery.replace(\n        updatedContent,\n        'ImportDeclaration:has(StringLiteral[value=\"vite-tsconfig-paths\"])',\n        () => {\n          return \"import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\";\n        }\n      );\n\n      tree.write(config, withImportChange);\n    }\n  );\n}\n"],"names":["update","tree","projects","getProjects","forEachExecutorOptions","options","projectName","oldTsConfigPathPlugin","projectConfig","get","config","configFile","findViteConfig","root","exists","configContents","read","tsquery","query","length","importName","name","text","updatedContent","replace","withImportChange","write"],"mappings":";+BAMA;;;eAAwBA;;;wBAN6B;sCACd;yBAEf;gCACO;AAEhB,SAASA,OAAOC,IAAU;IACvC,MAAMC,WAAWC,IAAAA,mBAAW,EAACF;IAC7BG,IAAAA,4CAAsB,EACpBH,MACA,kBACA,CAACI,SAASC;YAqBNC,2CAAAA,sCAAAA;QApBF,MAAMC,gBAAgBN,SAASO,GAAG,CAACH;QACnC,MAAMI,SACJL,QAAQM,UAAU,IAAIC,IAAAA,8BAAc,EAACX,MAAMO,cAAcK,IAAI;QAC/D,IAAI,CAACH,UAAU,CAACT,KAAKa,MAAM,CAACJ,SAAS;YACnC;QACF;QAEA,MAAMK,iBAAiBd,KAAKe,IAAI,CAACN,QAAQ;YAGvCO;QADF,MAAMV,wBACJU,CAAAA,iBAAAA,gBAAO,CAACC,KAAK,CACXH,gBACA,gFAFFE,iBAGK,EAAE;QAET,IAAIV,sBAAsBY,MAAM,KAAK,GAAG;YACtC;QACF;YAGEZ;QADF,MAAMa,aACJb,CAAAA,kDAAAA,0BAAAA,qBAAqB,CAAC,EAAE,sBAAxBA,uCAAAA,uBAA0B,CAAC,eAAe,sBAA1CA,4CAAAA,qCAA4Cc,IAAI,qBAAhDd,0CAAkDe,IAAI,YAAtDf,iDACA;QACF,MAAMgB,iBAAiBN,gBAAO,CAACO,OAAO,CACpCT,gBACA,CAAC,uFAAuF,EAAEK,WAAW,GAAG,CAAC,EACzG;YACE,OAAO,CAAC,eAAe,CAAC;QAC1B;QAGF,MAAMK,mBAAmBR,gBAAO,CAACO,OAAO,CACtCD,gBACA,qEACA;YACE,OAAO;QACT;QAGFtB,KAAKyB,KAAK,CAAChB,QAAQe;IACrB;AAEJ"}
+{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-16-6-0-change-ts-paths-plugin/change-ts-paths-plugin.ts"],"sourcesContent":["import { Tree, getProjects, joinPathFragments } from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\nimport { ViteBuildExecutorOptions } from '../../executors/build/schema';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport { ImportDeclaration } from 'typescript';\n\nexport default function update(tree: Tree) {\n  const projects = getProjects(tree);\n  forEachExecutorOptions<ViteBuildExecutorOptions>(\n    tree,\n    '@nx/vite:build',\n    (options, projectName) => {\n      const projectConfig = projects.get(projectName);\n      const config =\n        options.configFile || findViteConfig(tree, projectConfig.root);\n      if (!config || !tree.exists(config)) {\n        return;\n      }\n\n      const configContents = tree.read(config, 'utf-8');\n\n      const oldTsConfigPathPlugin =\n        tsquery.query<ImportDeclaration>(\n          configContents,\n          'ImportDeclaration:has(StringLiteral[value=\"vite-tsconfig-paths\"])'\n        ) ?? [];\n\n      if (oldTsConfigPathPlugin.length === 0) {\n        return;\n      }\n\n      const importName =\n        oldTsConfigPathPlugin[0]?.importClause?.name?.text ??\n        'viteTsConfigPaths';\n      const updatedContent = tsquery.replace(\n        configContents,\n        `PropertyAssignment:has(Identifier[name=\"plugins\"]) CallExpression:has(Identifier[name=\"${importName}\"])`,\n        () => {\n          return `nxViteTsPaths()`;\n        }\n      );\n\n      const withImportChange = tsquery.replace(\n        updatedContent,\n        'ImportDeclaration:has(StringLiteral[value=\"vite-tsconfig-paths\"])',\n        () => {\n          return \"import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\";\n        }\n      );\n\n      tree.write(config, withImportChange);\n    }\n  );\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    }\n  }\n}\n"],"names":["update","tree","projects","getProjects","forEachExecutorOptions","options","projectName","oldTsConfigPathPlugin","projectConfig","get","config","configFile","findViteConfig","root","exists","configContents","read","tsquery","query","length","importName","importClause","name","text","updatedContent","replace","withImportChange","write","searchRoot","allowsExt","ext","joinPathFragments"],"mappings":";+BAMA;;;eAAwBA;;;wBAN6B;sCACd;yBAEf;AAGT,SAASA,OAAOC,IAAU;IACvC,MAAMC,WAAWC,IAAAA,mBAAW,EAACF;IAC7BG,IAAAA,4CAAsB,EACpBH,MACA,kBACA,CAACI,SAASC;YAqBNC,2CAAAA,sCAAAA;QApBF,MAAMC,gBAAgBN,SAASO,GAAG,CAACH;QACnC,MAAMI,SACJL,QAAQM,UAAU,IAAIC,eAAeX,MAAMO,cAAcK,IAAI;QAC/D,IAAI,CAACH,UAAU,CAACT,KAAKa,MAAM,CAACJ,SAAS;YACnC;QACF;QAEA,MAAMK,iBAAiBd,KAAKe,IAAI,CAACN,QAAQ;YAGvCO;QADF,MAAMV,wBACJU,CAAAA,iBAAAA,gBAAO,CAACC,KAAK,CACXH,gBACA,gFAFFE,iBAGK,EAAE;QAET,IAAIV,sBAAsBY,MAAM,KAAK,GAAG;YACtC;QACF;YAGEZ;QADF,MAAMa,aACJb,CAAAA,kDAAAA,0BAAAA,qBAAqB,CAAC,EAAE,sBAAxBA,uCAAAA,wBAA0Bc,YAAY,sBAAtCd,4CAAAA,qCAAwCe,IAAI,qBAA5Cf,0CAA8CgB,IAAI,YAAlDhB,iDACA;QACF,MAAMiB,iBAAiBP,gBAAO,CAACQ,OAAO,CACpCV,gBACA,CAAC,uFAAuF,EAAEK,WAAW,GAAG,CAAC,EACzG;YACE,OAAO,CAAC,eAAe,CAAC;QAC1B;QAGF,MAAMM,mBAAmBT,gBAAO,CAACQ,OAAO,CACtCD,gBACA,qEACA;YACE,OAAO;QACT;QAGFvB,KAAK0B,KAAK,CAACjB,QAAQgB;IACrB;AAEJ;AAEA,SAASd,eAAeX,IAAU,EAAE2B,UAAkB;IACpD,MAAMC,YAAY;QAAC;QAAM;QAAO;QAAM;QAAO;QAAO;KAAM;IAE1D,KAAK,MAAMC,OAAOD,UAAW;QAC3B,IAAI5B,KAAKa,MAAM,CAACiB,IAAAA,yBAAiB,EAACH,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC,IAAI;YACpE,OAAOC,IAAAA,yBAAiB,EAACH,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC;QAC3D;IACF;AACF"}

package/src/utils/executor-utils.d.ts

@@ -7,5 +7,3 @@ export declare function validateTypes(opts: {
     tsconfig: string;
 }): Promise<void>;
 export declare function createBuildableTsConfig(projectRoot: string, options: ViteBuildExecutorOptions | ViteDevServerExecutorOptions, context: ExecutorContext): void;
-export declare function loadViteDynamicImport(): Promise<typeof import("vite")>;
-export declare function loadVitestDynamicImport(): Promise<typeof import("vitest/node")>;

package/src/utils/executor-utils.js

@@ -11,18 +11,11 @@ _export(exports, {
     },
     createBuildableTsConfig: function() {
         return createBuildableTsConfig;
-    },
-    loadViteDynamicImport: function() {
-        return loadViteDynamicImport;
-    },
-    loadVitestDynamicImport: function() {
-        return loadVitestDynamicImport;
     }
 });
 const _js = require("@nx/js");
 const _path = require("path");
 const _buildablelibsutils = require("@nx/js/src/utils/buildable-libs-utils");
-const _optionsutils = require("./options-utils");
 async function validateTypes(opts) {
     const result = await (0, _js.runTypeCheck)({
         workspaceRoot: opts.workspaceRoot,
@@ -35,25 +28,17 @@ async function validateTypes(opts) {
     }
 }
 function createBuildableTsConfig(projectRoot, options, context) {
-    var _options, _buildLibsFromSource;
-    const tsConfig = (0, _optionsutils.getProjectTsConfigPath)(projectRoot);
-    var _;
-    (_ = (_options = options)[_buildLibsFromSource = 'buildLibsFromSource']) != null ? _ : _options[_buildLibsFromSource] = true;
-    if (!options['buildLibsFromSource']) {
+    var _options;
+    const tsConfig = (0, _path.resolve)(projectRoot, 'tsconfig.json');
+    var _buildLibsFromSource;
+    (_buildLibsFromSource = (_options = options).buildLibsFromSource) != null ? _buildLibsFromSource : _options.buildLibsFromSource = true;
+    if (!options.buildLibsFromSource) {
         const { dependencies } = (0, _buildablelibsutils.calculateProjectBuildableDependencies)(context.taskGraph, context.projectGraph, context.root, context.projectName, // When using incremental building and the serve target is called
         // we need to get the deps for the 'build' target instead.
         context.targetName === 'serve' ? 'build' : context.targetName, context.configurationName);
-        // This tsconfig is used via the Vite ts paths plugin.
-        // It can be also used by other user-defined Vite plugins (e.g. for creating type declaration files).
-        const tmpTsConfigPath = (0, _buildablelibsutils.createTmpTsConfig)(tsConfig, context.root, projectRoot, dependencies);
-        process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;
+        // this tsconfig is used via the vite ts paths plugin
+        (0, _buildablelibsutils.createTmpTsConfig)(tsConfig, context.root, projectRoot, dependencies);
     }
 }
-function loadViteDynamicImport() {
-    return Function('return import("vite")')();
-}
-function loadVitestDynamicImport() {
-    return Function('return import("vitest/node")')();
-}
 
 //# sourceMappingURL=executor-utils.js.map