@nx/vite 18.0.4 → 18.0.6

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

@@ -8,12 +8,13 @@ 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 || findViteConfig(tree, projectConfig.root);
+        const config = options.configFile || (0, _findviteconfig.findViteConfig)(tree, projectConfig.root);
         if (!config || !tree.exists(config)) {
             return;
         }
@@ -34,20 +35,5 @@ 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';\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\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","name","text","updatedContent","replace","withImportChange","write","searchRoot","allowsExt","ext","joinPathFragments"],"mappings":";+BAKA;;;eAAwBA;;;wBAL6B;sCACd;yBAEf;AAET,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,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;AAEA,SAASb,eAAeX,IAAU,EAAE0B,UAAkB;IACpD,MAAMC,YAAY;QAAC;QAAM;QAAO;QAAM;QAAO;QAAO;KAAM;IAE1D,KAAK,MAAMC,OAAOD,UAAW;QAC3B,IAAI3B,KAAKa,MAAM,CAACgB,IAAAA,yBAAiB,EAACH,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC,IAAI;YACpE,OAAOC,IAAAA,yBAAiB,EAACH,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC;QAC3D;IACF;AACF"}
+{"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"}

package/src/migrations/update-17-2-0/update-vite-config.js

@@ -22,13 +22,14 @@ const _editbuildconfig = require("./lib/edit-build-config");
 const _edittestconfig = require("./lib/edit-test-config");
 const _addfilereplacements = require("./lib/add-file-replacements");
 const _tsquery = require("@phenomnomnominal/tsquery");
+const _findviteconfig = require("../../utils/find-vite-config");
 const ts = require("typescript");
 async function updateBuildDir(tree) {
     const projects = (0, _devkit.getProjects)(tree);
     (0, _executoroptionsutils.forEachExecutorOptions)(tree, '@nx/vite:build', (options, projectName, targetName)=>{
         var _options_fileReplacements;
         const projectConfig = projects.get(projectName);
-        const config = options.configFile || findViteConfig(tree, projectConfig.root);
+        const config = options.configFile || (0, _findviteconfig.findViteConfig)(tree, projectConfig.root);
         if (!config || !tree.exists(config)) {
             return;
         }
@@ -42,21 +43,6 @@ async function updateBuildDir(tree) {
     });
     await (0, _devkit.formatFiles)(tree);
 }
-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}`);
-        }
-    }
-}
 function getConfigNode(configFileContents) {
     var _tsquery_query, _tsquery_query1;
     if (!configFileContents) {

package/src/migrations/update-17-2-0/update-vite-config.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-17-2-0/update-vite-config.ts"],"sourcesContent":["import {\n  Tree,\n  formatFiles,\n  getProjects,\n  joinPathFragments,\n  logger,\n} from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\nimport { ViteBuildExecutorOptions } from '../../executors/build/schema';\nimport { updateBuildOutDirAndRoot } from './lib/edit-build-config';\nimport { updateTestConfig } from './lib/edit-test-config';\nimport { addFileReplacements } from './lib/add-file-replacements';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport ts = require('typescript');\n\nexport default async function updateBuildDir(tree: Tree) {\n  const projects = getProjects(tree);\n  forEachExecutorOptions<ViteBuildExecutorOptions>(\n    tree,\n    '@nx/vite:build',\n    (options, projectName, targetName) => {\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      let configContents = tree.read(config, 'utf-8');\n\n      configContents = updateBuildOutDirAndRoot(\n        options,\n        configContents,\n        projectConfig,\n        targetName,\n        tree,\n        projectName,\n        config\n      );\n\n      configContents = updateTestConfig(configContents, projectConfig, config);\n\n      if (options['fileReplacements']?.length > 0) {\n        configContents = addFileReplacements(\n          configContents,\n          options['fileReplacements'],\n          config\n        );\n      }\n\n      tree.write(config, configContents);\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    }\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\nexport function notFoundWarning(configPath: string) {\n  logger.warn(`\n  Could not migrate your ${configPath} file.\n  Please add the build.outDir and root options in your ${configPath} file.\n  You can find more information on how to configure vite for Nx here:\n  \n  https://nx.dev/recipes/vite/configure-vite\n  `);\n}\n"],"names":["updateBuildDir","getConfigNode","notFoundWarning","ts","tree","projects","getProjects","forEachExecutorOptions","options","projectName","targetName","projectConfig","get","config","configFile","findViteConfig","root","exists","configContents","read","updateBuildOutDirAndRoot","updateTestConfig","length","addFileReplacements","write","formatFiles","searchRoot","allowsExt","ext","joinPathFragments","configFileContents","tsquery","configNode","query","arrowFunctionReturnStatement","configPath","logger","warn"],"mappings":";;;;;;;;IAeA,OAuCC;eAvC6BA;;IAmDdC,aAAa;eAAbA;;IAqBAC,eAAe;eAAfA;;;wBAjFT;sCACgC;iCAEE;gCACR;qCACG;yBACZ;AACxB,MAAOC,aAAa;AAEL,eAAeH,eAAeI,IAAU;IACrD,MAAMC,WAAWC,IAAAA,mBAAW,EAACF;IAC7BG,IAAAA,4CAAsB,EACpBH,MACA,kBACA,CAACI,SAASC,aAAaC;YAqBjBF;QApBJ,MAAMG,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;QACA,IAAIK,iBAAiBd,KAAKe,IAAI,CAACN,QAAQ;QAEvCK,iBAAiBE,IAAAA,yCAAwB,EACvCZ,SACAU,gBACAP,eACAD,YACAN,MACAK,aACAI;QAGFK,iBAAiBG,IAAAA,gCAAgB,EAACH,gBAAgBP,eAAeE;QAEjE,IAAIL,EAAAA,4BAAAA,OAAO,CAAC,mBAAmB,qBAA3BA,0BAA6Bc,MAAM,IAAG,GAAG;YAC3CJ,iBAAiBK,IAAAA,wCAAmB,EAClCL,gBACAV,OAAO,CAAC,mBAAmB,EAC3BK;QAEJ;QAEAT,KAAKoB,KAAK,CAACX,QAAQK;IACrB;IAGF,MAAMO,IAAAA,mBAAW,EAACrB;AACpB;AAEA,SAASW,eAAeX,IAAU,EAAEsB,UAAkB;IACpD,MAAMC,YAAY;QAAC;QAAM;QAAO;QAAM;QAAO;QAAO;KAAM;IAE1D,KAAK,MAAMC,OAAOD,UAAW;QAC3B,IAAIvB,KAAKa,MAAM,CAACY,IAAAA,yBAAiB,EAACH,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC,IAAI;YACpE,OAAOC,IAAAA,yBAAiB,EAACH,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC;QAC3D;IACF;AACF;AAEO,SAAS3B,cAAc6B,kBAA0B;QAIrCC,gBAKoBA;IARrC,IAAI,CAACD,oBAAoB;QACvB;IACF;IACA,IAAIE,cAAaD,iBAAAA,gBAAO,CAACE,KAAK,CAC5BH,oBACA,CAAC,uBAAuB,CAAC,sBAFVC,cAGd,CAAC,EAAE;IAEN,MAAMG,gCAA+BH,kBAAAA,gBAAO,CAACE,KAAK,CAChDH,oBACA,CAAC,2DAA2D,CAAC,sBAF1BC,eAGlC,CAAC,EAAE;IAEN,IAAIG,8BAA8B;QAChCF,aAAaE;IACf;IAEA,OAAOF;AACT;AAEO,SAAS9B,gBAAgBiC,UAAkB;IAChDC,cAAM,CAACC,IAAI,CAAC,CAAC;yBACU,EAAEF,WAAW;uDACiB,EAAEA,WAAW;;;;EAIlE,CAAC;AACH"}
+{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-17-2-0/update-vite-config.ts"],"sourcesContent":["import {\n  Tree,\n  formatFiles,\n  getProjects,\n  joinPathFragments,\n  logger,\n} from '@nx/devkit';\nimport { forEachExecutorOptions } from '@nx/devkit/src/generators/executor-options-utils';\nimport { ViteBuildExecutorOptions } from '../../executors/build/schema';\nimport { updateBuildOutDirAndRoot } from './lib/edit-build-config';\nimport { updateTestConfig } from './lib/edit-test-config';\nimport { addFileReplacements } from './lib/add-file-replacements';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport ts = require('typescript');\nimport { findViteConfig } from '../../utils/find-vite-config';\n\nexport default async function updateBuildDir(tree: Tree) {\n  const projects = getProjects(tree);\n  forEachExecutorOptions<ViteBuildExecutorOptions>(\n    tree,\n    '@nx/vite:build',\n    (options, projectName, targetName) => {\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      let configContents = tree.read(config, 'utf-8');\n\n      configContents = updateBuildOutDirAndRoot(\n        options,\n        configContents,\n        projectConfig,\n        targetName,\n        tree,\n        projectName,\n        config\n      );\n\n      configContents = updateTestConfig(configContents, projectConfig, config);\n\n      if (options['fileReplacements']?.length > 0) {\n        configContents = addFileReplacements(\n          configContents,\n          options['fileReplacements'],\n          config\n        );\n      }\n\n      tree.write(config, configContents);\n    }\n  );\n\n  await formatFiles(tree);\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\nexport function notFoundWarning(configPath: string) {\n  logger.warn(`\n  Could not migrate your ${configPath} file.\n  Please add the build.outDir and root options in your ${configPath} file.\n  You can find more information on how to configure vite for Nx here:\n  \n  https://nx.dev/recipes/vite/configure-vite\n  `);\n}\n"],"names":["updateBuildDir","getConfigNode","notFoundWarning","ts","tree","projects","getProjects","forEachExecutorOptions","options","projectName","targetName","projectConfig","get","config","configFile","findViteConfig","root","exists","configContents","read","updateBuildOutDirAndRoot","updateTestConfig","length","addFileReplacements","write","formatFiles","configFileContents","tsquery","configNode","query","arrowFunctionReturnStatement","configPath","logger","warn"],"mappings":";;;;;;;;IAgBA,OAuCC;eAvC6BA;;IAyCdC,aAAa;eAAbA;;IAqBAC,eAAe;eAAfA;;;wBAxET;sCACgC;iCAEE;gCACR;qCACG;yBACZ;gCAEO;AAD/B,MAAOC,aAAa;AAGL,eAAeH,eAAeI,IAAU;IACrD,MAAMC,WAAWC,IAAAA,mBAAW,EAACF;IAC7BG,IAAAA,4CAAsB,EACpBH,MACA,kBACA,CAACI,SAASC,aAAaC;YAqBjBF;QApBJ,MAAMG,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;QACA,IAAIK,iBAAiBd,KAAKe,IAAI,CAACN,QAAQ;QAEvCK,iBAAiBE,IAAAA,yCAAwB,EACvCZ,SACAU,gBACAP,eACAD,YACAN,MACAK,aACAI;QAGFK,iBAAiBG,IAAAA,gCAAgB,EAACH,gBAAgBP,eAAeE;QAEjE,IAAIL,EAAAA,4BAAAA,OAAO,CAAC,mBAAmB,qBAA3BA,0BAA6Bc,MAAM,IAAG,GAAG;YAC3CJ,iBAAiBK,IAAAA,wCAAmB,EAClCL,gBACAV,OAAO,CAAC,mBAAmB,EAC3BK;QAEJ;QAEAT,KAAKoB,KAAK,CAACX,QAAQK;IACrB;IAGF,MAAMO,IAAAA,mBAAW,EAACrB;AACpB;AAEO,SAASH,cAAcyB,kBAA0B;QAIrCC,gBAKoBA;IARrC,IAAI,CAACD,oBAAoB;QACvB;IACF;IACA,IAAIE,cAAaD,iBAAAA,gBAAO,CAACE,KAAK,CAC5BH,oBACA,CAAC,uBAAuB,CAAC,sBAFVC,cAGd,CAAC,EAAE;IAEN,MAAMG,gCAA+BH,kBAAAA,gBAAO,CAACE,KAAK,CAChDH,oBACA,CAAC,2DAA2D,CAAC,sBAF1BC,eAGlC,CAAC,EAAE;IAEN,IAAIG,8BAA8B;QAChCF,aAAaE;IACf;IAEA,OAAOF;AACT;AAEO,SAAS1B,gBAAgB6B,UAAkB;IAChDC,cAAM,CAACC,IAAI,CAAC,CAAC;yBACU,EAAEF,WAAW;uDACiB,EAAEA,WAAW;;;;EAIlE,CAAC;AACH"}

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

@@ -8,3 +8,4 @@ export declare function validateTypes(opts: {
 }): 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

@@ -14,6 +14,9 @@ _export(exports, {
     },
     loadViteDynamicImport: function() {
         return loadViteDynamicImport;
+    },
+    loadVitestDynamicImport: function() {
+        return loadVitestDynamicImport;
     }
 });
 const _js = require("@nx/js");
@@ -49,5 +52,8 @@ function createBuildableTsConfig(projectRoot, options, context) {
 function loadViteDynamicImport() {
     return Function('return import("vite")')();
 }
+function loadVitestDynamicImport() {
+    return Function('return import("vitest/node")')();
+}
 
 //# sourceMappingURL=executor-utils.js.map

package/src/utils/executor-utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/vite/src/utils/executor-utils.ts"],"sourcesContent":["import { printDiagnostics, runTypeCheck } from '@nx/js';\nimport { join } 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';\nimport { getProjectTsConfigPath } from './options-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 = getProjectTsConfigPath(projectRoot);\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      // When using incremental building and the serve target is called\n      // we need to get the deps for the 'build' target instead.\n      context.targetName === 'serve' ? 'build' : context.targetName,\n      context.configurationName\n    );\n    // This tsconfig is used via the Vite ts paths plugin.\n    // It can be also used by other user-defined Vite plugins (e.g. for creating type declaration files).\n    const tmpTsConfigPath = createTmpTsConfig(\n      tsConfig,\n      context.root,\n      projectRoot,\n      dependencies\n    );\n    process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;\n  }\n}\n\nexport function loadViteDynamicImport() {\n  return Function('return import(\"vite\")')() as Promise<typeof import('vite')>;\n}\n"],"names":["validateTypes","createBuildableTsConfig","loadViteDynamicImport","opts","result","runTypeCheck","workspaceRoot","tsConfigPath","join","tsconfig","mode","printDiagnostics","errors","warnings","length","Error","projectRoot","options","context","tsConfig","getProjectTsConfigPath","dependencies","calculateProjectBuildableDependencies","taskGraph","projectGraph","root","projectName","targetName","configurationName","tmpTsConfigPath","createTmpTsConfig","process","env","NX_TSCONFIG_PATH","Function"],"mappings":";;;;;;;;IAWsBA,aAAa;eAAbA;;IAkBNC,uBAAuB;eAAvBA;;IA+BAC,qBAAqB;eAArBA;;;oBA5D+B;sBAC1B;oCAOd;8BACgC;AAEhC,eAAeF,cAAcG,IAInC;IACC,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;IAClB;AACF;AAEO,SAASd,wBACde,WAAmB,EACnBC,OAAgE,EAChEC,OAAwB;QAGxBD,UAAQ;IADR,MAAME,WAAWC,IAAAA,oCAAsB,EAACJ;;IACxCC,MAAAA,WAAAA,QAAO,CAAC,uBAAA,sBAAsB,gBAA9BA,QAAO,CAAC,qBAAsB,GAAK;IAEnC,IAAI,CAACA,OAAO,CAAC,sBAAsB,EAAE;QACnC,MAAM,EAAEI,YAAY,EAAE,GAAGC,IAAAA,yDAAqC,EAC5DJ,QAAQK,SAAS,EACjBL,QAAQM,YAAY,EACpBN,QAAQO,IAAI,EACZP,QAAQQ,WAAW,EACnB,iEAAiE;QACjE,0DAA0D;QAC1DR,QAAQS,UAAU,KAAK,UAAU,UAAUT,QAAQS,UAAU,EAC7DT,QAAQU,iBAAiB;QAE3B,sDAAsD;QACtD,qGAAqG;QACrG,MAAMC,kBAAkBC,IAAAA,qCAAiB,EACvCX,UACAD,QAAQO,IAAI,EACZT,aACAK;QAEFU,QAAQC,GAAG,CAACC,gBAAgB,GAAGJ;IACjC;AACF;AAEO,SAAS3B;IACd,OAAOgC,SAAS;AAClB"}
+{"version":3,"sources":["../../../../../packages/vite/src/utils/executor-utils.ts"],"sourcesContent":["import { printDiagnostics, runTypeCheck } from '@nx/js';\nimport { join } 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';\nimport { getProjectTsConfigPath } from './options-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 = getProjectTsConfigPath(projectRoot);\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      // When using incremental building and the serve target is called\n      // we need to get the deps for the 'build' target instead.\n      context.targetName === 'serve' ? 'build' : context.targetName,\n      context.configurationName\n    );\n    // This tsconfig is used via the Vite ts paths plugin.\n    // It can be also used by other user-defined Vite plugins (e.g. for creating type declaration files).\n    const tmpTsConfigPath = createTmpTsConfig(\n      tsConfig,\n      context.root,\n      projectRoot,\n      dependencies\n    );\n    process.env.NX_TSCONFIG_PATH = tmpTsConfigPath;\n  }\n}\n\nexport function loadViteDynamicImport() {\n  return Function('return import(\"vite\")')() as Promise<typeof import('vite')>;\n}\n\nexport function loadVitestDynamicImport() {\n  return Function('return import(\"vitest/node\")')() as Promise<\n    typeof import('vitest/node')\n  >;\n}\n"],"names":["validateTypes","createBuildableTsConfig","loadViteDynamicImport","loadVitestDynamicImport","opts","result","runTypeCheck","workspaceRoot","tsConfigPath","join","tsconfig","mode","printDiagnostics","errors","warnings","length","Error","projectRoot","options","context","tsConfig","getProjectTsConfigPath","dependencies","calculateProjectBuildableDependencies","taskGraph","projectGraph","root","projectName","targetName","configurationName","tmpTsConfigPath","createTmpTsConfig","process","env","NX_TSCONFIG_PATH","Function"],"mappings":";;;;;;;;IAWsBA,aAAa;eAAbA;;IAkBNC,uBAAuB;eAAvBA;;IA+BAC,qBAAqB;eAArBA;;IAIAC,uBAAuB;eAAvBA;;;oBAhE+B;sBAC1B;oCAOd;8BACgC;AAEhC,eAAeH,cAAcI,IAInC;IACC,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;IAClB;AACF;AAEO,SAASf,wBACdgB,WAAmB,EACnBC,OAAgE,EAChEC,OAAwB;QAGxBD,UAAQ;IADR,MAAME,WAAWC,IAAAA,oCAAsB,EAACJ;;IACxCC,MAAAA,WAAAA,QAAO,CAAC,uBAAA,sBAAsB,gBAA9BA,QAAO,CAAC,qBAAsB,GAAK;IAEnC,IAAI,CAACA,OAAO,CAAC,sBAAsB,EAAE;QACnC,MAAM,EAAEI,YAAY,EAAE,GAAGC,IAAAA,yDAAqC,EAC5DJ,QAAQK,SAAS,EACjBL,QAAQM,YAAY,EACpBN,QAAQO,IAAI,EACZP,QAAQQ,WAAW,EACnB,iEAAiE;QACjE,0DAA0D;QAC1DR,QAAQS,UAAU,KAAK,UAAU,UAAUT,QAAQS,UAAU,EAC7DT,QAAQU,iBAAiB;QAE3B,sDAAsD;QACtD,qGAAqG;QACrG,MAAMC,kBAAkBC,IAAAA,qCAAiB,EACvCX,UACAD,QAAQO,IAAI,EACZT,aACAK;QAEFU,QAAQC,GAAG,CAACC,gBAAgB,GAAGJ;IACjC;AACF;AAEO,SAAS5B;IACd,OAAOiC,SAAS;AAClB;AAEO,SAAShC;IACd,OAAOgC,SAAS;AAGlB"}

package/src/{migrations/update-17-2-0/lib → utils}/find-vite-config.d.ts

@@ -1,2 +1,3 @@
 import { Tree } from '@nx/devkit';
 export declare function findViteConfig(tree: Tree, searchRoot: string): string;
+export declare function findWebpackConfig(tree: Tree, searchRoot: string): string;

package/src/utils/find-vite-config.js

@@ -0,0 +1,46 @@
+"use strict";
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    findViteConfig: function() {
+        return findViteConfig;
+    },
+    findWebpackConfig: function() {
+        return findWebpackConfig;
+    }
+});
+const _devkit = require("@nx/devkit");
+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}`);
+        }
+    }
+}
+function findWebpackConfig(tree, searchRoot) {
+    const allowsExt = [
+        'js',
+        'ts',
+        'mjs',
+        'cjs'
+    ];
+    for (const ext of allowsExt){
+        if (tree.exists((0, _devkit.joinPathFragments)(searchRoot, `webpack.config.${ext}`))) {
+            return (0, _devkit.joinPathFragments)(searchRoot, `webpack.config.${ext}`);
+        }
+    }
+}
+
+//# sourceMappingURL=find-vite-config.js.map

package/src/utils/find-vite-config.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../packages/vite/src/utils/find-vite-config.ts"],"sourcesContent":["import { Tree, joinPathFragments } from '@nx/devkit';\n\nexport function 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\nexport function findWebpackConfig(tree: Tree, searchRoot: string) {\n  const allowsExt = ['js', 'ts', 'mjs', 'cjs'];\n\n  for (const ext of allowsExt) {\n    if (tree.exists(joinPathFragments(searchRoot, `webpack.config.${ext}`))) {\n      return joinPathFragments(searchRoot, `webpack.config.${ext}`);\n    }\n  }\n}\n"],"names":["findViteConfig","findWebpackConfig","tree","searchRoot","allowsExt","ext","exists","joinPathFragments"],"mappings":";;;;;;;;IAEgBA,cAAc;eAAdA;;IAUAC,iBAAiB;eAAjBA;;;wBAZwB;AAEjC,SAASD,eAAeE,IAAU,EAAEC,UAAkB;IAC3D,MAAMC,YAAY;QAAC;QAAM;QAAO;QAAM;QAAO;QAAO;KAAM;IAE1D,KAAK,MAAMC,OAAOD,UAAW;QAC3B,IAAIF,KAAKI,MAAM,CAACC,IAAAA,yBAAiB,EAACJ,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC,IAAI;YACpE,OAAOE,IAAAA,yBAAiB,EAACJ,YAAY,CAAC,YAAY,EAAEE,IAAI,CAAC;QAC3D;IACF;AACF;AAEO,SAASJ,kBAAkBC,IAAU,EAAEC,UAAkB;IAC9D,MAAMC,YAAY;QAAC;QAAM;QAAM;QAAO;KAAM;IAE5C,KAAK,MAAMC,OAAOD,UAAW;QAC3B,IAAIF,KAAKI,MAAM,CAACC,IAAAA,yBAAiB,EAACJ,YAAY,CAAC,eAAe,EAAEE,IAAI,CAAC,IAAI;YACvE,OAAOE,IAAAA,yBAAiB,EAACJ,YAAY,CAAC,eAAe,EAAEE,IAAI,CAAC;QAC9D;IACF;AACF"}

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

@@ -4,29 +4,26 @@ export type Target = 'build' | 'serve' | 'test' | 'preview';
 export type TargetFlags = Partial<Record<Target, boolean>>;
 export type UserProvidedTargetName = Partial<Record<Target, string>>;
 export type ValidFoundTargetName = Partial<Record<Target, string>>;
-export declare function findExistingTargetsInProject(targets: {
+export declare function findExistingJsBuildTargetInProject(targets: {
     [targetName: string]: TargetConfiguration;
-}, userProvidedTargets?: UserProvidedTargetName): {
-    validFoundTargetName: ValidFoundTargetName;
-    projectContainsUnsupportedExecutor: boolean;
-    userProvidedTargetIsUnsupported: TargetFlags;
-    alreadyHasNxViteTargets: TargetFlags;
+}): {
+    supported?: string;
+    unsupported?: string;
 };
 export declare function addOrChangeTestTarget(tree: Tree, options: ViteConfigurationGeneratorSchema, target: string): void;
-export declare function addOrChangeBuildTarget(tree: Tree, options: ViteConfigurationGeneratorSchema, target: string): void;
-export declare function addOrChangeServeTarget(tree: Tree, options: ViteConfigurationGeneratorSchema, target: string): void;
+export declare function addBuildTarget(tree: Tree, options: ViteConfigurationGeneratorSchema, target: string): void;
+export declare function addServeTarget(tree: Tree, options: ViteConfigurationGeneratorSchema, target: string): void;
 /**
  * Adds a target for the preview server.
  *
  * @param tree
  * @param options
  * @param serveTarget An existing serve target.
- * @param previewTarget  The preview target to create.
  */
 export declare function addPreviewTarget(tree: Tree, options: ViteConfigurationGeneratorSchema, serveTarget: string): void;
 export declare function editTsConfig(tree: Tree, options: ViteConfigurationGeneratorSchema): void;
 export declare function deleteWebpackConfig(tree: Tree, projectRoot: string, webpackConfigFilePath?: string): void;
-export declare function moveAndEditIndexHtml(tree: Tree, options: ViteConfigurationGeneratorSchema, buildTarget: string): void;
+export declare function moveAndEditIndexHtml(tree: Tree, options: ViteConfigurationGeneratorSchema): void;
 export interface ViteConfigFileOptions {
     project: string;
     includeLib?: boolean;
@@ -42,4 +39,4 @@ export declare function createOrEditViteConfig(tree: Tree, options: ViteConfigFi
 export declare function normalizeViteConfigFilePathWithTree(tree: Tree, projectRoot: string, configFile?: string): string;
 export declare function getViteConfigPathForProject(tree: Tree, projectName: string, target?: string): string;
 export declare function handleUnsupportedUserProvidedTargets(userProvidedTargetIsUnsupported: TargetFlags, userProvidedTargetName: UserProvidedTargetName, validFoundTargetName: ValidFoundTargetName): Promise<void>;
-export declare function handleUnknownExecutors(projectName: string): Promise<void>;
+export declare function handleUnknownConfiguration(projectName: string): Promise<void>;