@nx/vite 17.2.0-beta.0 → 17.2.0-beta.10

package/src/migrations/update-17-2-0/lib/edit-build-config.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "updateBuildOutDirAndRoot", {
+    enumerable: true,
+    get: function() {
+        return updateBuildOutDirAndRoot;
+    }
+});
+const _devkit = require("@nx/devkit");
+const _tsquery = require("@phenomnomnominal/tsquery");
+const ts = require("typescript");
+function updateBuildOutDirAndRoot(options, configContents, projectConfig, targetName, tree, projectName) {
+    var _tsquery_query;
+    const foundDefineConfig = (_tsquery_query = _tsquery.tsquery.query(configContents, 'CallExpression:has(Identifier[name="defineConfig"])')) == null ? void 0 : _tsquery_query[0];
+    if (!foundDefineConfig) {
+        _devkit.logger.warn(`
+    Could not find defineConfig in your vite.config file.
+    Please add the build.outDir and root options to your vite.config file.
+    `);
+    }
+    configContents = fixBuild(options, configContents, projectConfig, targetName, tree, projectName, foundDefineConfig);
+    configContents = addRoot(configContents, foundDefineConfig);
+    return configContents;
+}
+function fixBuild(options, configContents, projectConfig, targetName, tree, projectName, foundDefineConfig) {
+    var _tsquery_query;
+    let outputPath = '';
+    // In vite.config.ts, we want to keep the path relative to workspace root
+    if (options.outputPath) {
+        outputPath = (0, _devkit.joinPathFragments)((0, _devkit.offsetFromRoot)(projectConfig.root), options.outputPath);
+    } else {
+        outputPath = (0, _devkit.joinPathFragments)((0, _devkit.offsetFromRoot)(projectConfig.root), 'dist', projectConfig.root);
+    }
+    // In project.json, we want to keep the path starting from workspace root
+    projectConfig.targets[targetName].options.outputPath = options.outputPath ? options.outputPath : (0, _devkit.joinPathFragments)('dist', projectConfig.root);
+    (0, _devkit.updateProjectConfiguration)(tree, projectName, projectConfig);
+    const buildObject = (_tsquery_query = _tsquery.tsquery.query(configContents, `PropertyAssignment:has(Identifier[name="build"])`)) == null ? void 0 : _tsquery_query[0];
+    let buildOutDir;
+    if (buildObject) {
+        buildOutDir = _tsquery.tsquery.query(buildObject, `PropertyAssignment:has(Identifier[name="outDir"])`);
+    }
+    if ((buildOutDir == null ? void 0 : buildOutDir.length) > 0) {
+        return configContents;
+    } else if (buildObject) {
+        // has build, has no outDir
+        // so add outDir
+        return (0, _devkit.applyChangesToString)(configContents, [
+            {
+                type: _devkit.ChangeType.Insert,
+                index: buildObject.getStart() + `build: {`.length + 1,
+                text: `outDir: '${outputPath}',`
+            }
+        ]);
+    } else {
+        return addBuildProperty(configContents, outputPath, foundDefineConfig);
+    }
+}
+function addRoot(configFileContents, foundDefineConfig) {
+    var _tsquery_query;
+    const rootOption = (_tsquery_query = _tsquery.tsquery.query(configFileContents, `PropertyAssignment:has(Identifier[name="root"]) Identifier[name="__dirname"]`)) == null ? void 0 : _tsquery_query[0];
+    if (rootOption || !foundDefineConfig) {
+        return configFileContents;
+    } else {
+        return (0, _devkit.applyChangesToString)(configFileContents, [
+            {
+                type: _devkit.ChangeType.Insert,
+                index: foundDefineConfig.getStart() + 14,
+                text: `root: __dirname,`
+            }
+        ]);
+    }
+}
+function addBuildProperty(configFileContents, outputPath, foundDefineConfig) {
+    if (foundDefineConfig) {
+        return (0, _devkit.applyChangesToString)(configFileContents, [
+            {
+                type: _devkit.ChangeType.Insert,
+                index: foundDefineConfig.getStart() + 14,
+                text: `build: {
+                outDir: '${outputPath}',
+              },`
+            }
+        ]);
+    } else {
+        return configFileContents;
+    }
+}
+
+//# sourceMappingURL=edit-build-config.js.map

package/src/migrations/update-17-2-0/lib/edit-build-config.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/vite/src/migrations/update-17-2-0/lib/edit-build-config.ts"],"sourcesContent":["import {\n  ChangeType,\n  ProjectConfiguration,\n  Tree,\n  applyChangesToString,\n  joinPathFragments,\n  logger,\n  offsetFromRoot,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport ts = require('typescript');\n\nexport function updateBuildOutDirAndRoot(\n  options: Record<string, any>,\n  configContents: string,\n  projectConfig: ProjectConfiguration,\n  targetName: string,\n  tree: Tree,\n  projectName: string\n): string {\n  const foundDefineConfig = tsquery.query(\n    configContents,\n    'CallExpression:has(Identifier[name=\"defineConfig\"])'\n  )?.[0];\n\n  if (!foundDefineConfig) {\n    logger.warn(`\n    Could not find defineConfig in your vite.config file.\n    Please add the build.outDir and root options to your vite.config file.\n    `);\n  }\n\n  configContents = fixBuild(\n    options,\n    configContents,\n    projectConfig,\n    targetName,\n    tree,\n    projectName,\n    foundDefineConfig\n  );\n\n  configContents = addRoot(configContents, foundDefineConfig);\n\n  return configContents;\n}\n\nfunction fixBuild(\n  options: Record<string, any>,\n  configContents: string,\n  projectConfig: ProjectConfiguration,\n  targetName: string,\n  tree: Tree,\n  projectName: string,\n  foundDefineConfig?: ts.Node\n) {\n  let outputPath = '';\n\n  // In vite.config.ts, we want to keep the path relative to workspace root\n  if (options.outputPath) {\n    outputPath = joinPathFragments(\n      offsetFromRoot(projectConfig.root),\n      options.outputPath\n    );\n  } else {\n    outputPath = joinPathFragments(\n      offsetFromRoot(projectConfig.root),\n      'dist',\n      projectConfig.root\n    );\n  }\n\n  // In project.json, we want to keep the path starting from workspace root\n  projectConfig.targets[targetName].options.outputPath = options.outputPath\n    ? options.outputPath\n    : joinPathFragments('dist', projectConfig.root);\n  updateProjectConfiguration(tree, projectName, projectConfig);\n\n  const buildObject = tsquery.query(\n    configContents,\n    `PropertyAssignment:has(Identifier[name=\"build\"])`\n  )?.[0];\n  let buildOutDir: ts.Node[];\n  if (buildObject) {\n    buildOutDir = tsquery.query(\n      buildObject,\n      `PropertyAssignment:has(Identifier[name=\"outDir\"])`\n    );\n  }\n\n  if (buildOutDir?.length > 0) {\n    return configContents;\n  } else if (buildObject) {\n    // has build, has no outDir\n    // so add outDir\n    return applyChangesToString(configContents, [\n      {\n        type: ChangeType.Insert,\n        index: buildObject.getStart() + `build: {`.length + 1,\n        text: `outDir: '${outputPath}',`,\n      },\n    ]);\n  } else {\n    return addBuildProperty(configContents, outputPath, foundDefineConfig);\n  }\n}\n\nfunction addRoot(\n  configFileContents: string,\n  foundDefineConfig?: ts.Node\n): string {\n  const rootOption = tsquery.query(\n    configFileContents,\n    `PropertyAssignment:has(Identifier[name=\"root\"]) Identifier[name=\"__dirname\"]`\n  )?.[0];\n\n  if (rootOption || !foundDefineConfig) {\n    return configFileContents;\n  } else {\n    return applyChangesToString(configFileContents, [\n      {\n        type: ChangeType.Insert,\n        index: foundDefineConfig.getStart() + 14,\n        text: `root: __dirname,`,\n      },\n    ]);\n  }\n}\n\nfunction addBuildProperty(\n  configFileContents: string,\n  outputPath: string,\n  foundDefineConfig: ts.Node\n): string {\n  if (foundDefineConfig) {\n    return applyChangesToString(configFileContents, [\n      {\n        type: ChangeType.Insert,\n        index: foundDefineConfig.getStart() + 14,\n        text: `build: {\n                outDir: '${outputPath}',\n              },`,\n      },\n    ]);\n  } else {\n    return configFileContents;\n  }\n}\n"],"names":["updateBuildOutDirAndRoot","ts","options","configContents","projectConfig","targetName","tree","projectName","tsquery","foundDefineConfig","query","logger","warn","fixBuild","addRoot","outputPath","joinPathFragments","offsetFromRoot","root","targets","updateProjectConfiguration","buildObject","buildOutDir","length","applyChangesToString","type","ChangeType","Insert","index","getStart","text","addBuildProperty","configFileContents","rootOption"],"mappings":"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"}

package/src/migrations/update-17-2-0/lib/edit-test-config.d.ts

@@ -0,0 +1,2 @@
+import { ProjectConfiguration } from '@nx/devkit';
+export declare function updateTestConfig(configContents: string, projectConfig: ProjectConfiguration): string;

package/src/migrations/update-17-2-0/lib/edit-test-config.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "updateTestConfig", {
+    enumerable: true,
+    get: function() {
+        return updateTestConfig;
+    }
+});
+const _devkit = require("@nx/devkit");
+const _tsquery = require("@phenomnomnominal/tsquery");
+const ts = require("typescript");
+function updateTestConfig(configContents, projectConfig) {
+    var _tsquery_query, _projectConfig_targets_test_options, _projectConfig_targets_test, _projectConfig_targets;
+    const testObject = (_tsquery_query = _tsquery.tsquery.query(configContents, `PropertyAssignment:has(Identifier[name="test"])`)) == null ? void 0 : _tsquery_query[0];
+    let testCoverageDir;
+    let testCoverage;
+    let provider;
+    if (testObject) {
+        var _tsquery_query1;
+        testCoverage = (_tsquery_query1 = _tsquery.tsquery.query(testObject, `PropertyAssignment:has(Identifier[name="coverage"])`)) == null ? void 0 : _tsquery_query1[0];
+        if (testCoverage) {
+            var _tsquery_query2, _tsquery_query3;
+            testCoverageDir = (_tsquery_query2 = _tsquery.tsquery.query(testCoverage, `PropertyAssignment:has(Identifier[name="reportsDirectory"])`)) == null ? void 0 : _tsquery_query2[0];
+            provider = (_tsquery_query3 = _tsquery.tsquery.query(testCoverage, `PropertyAssignment:has(Identifier[name="provider"])`)) == null ? void 0 : _tsquery_query3[0];
+        }
+    }
+    let coverageDir = '';
+    if ((_projectConfig_targets = projectConfig.targets) == null ? void 0 : (_projectConfig_targets_test = _projectConfig_targets.test) == null ? void 0 : (_projectConfig_targets_test_options = _projectConfig_targets_test.options) == null ? void 0 : _projectConfig_targets_test_options.reportsDirectory) {
+        var _projectConfig_targets_test_options1, _projectConfig_targets_test1, _projectConfig_targets1;
+        coverageDir = (_projectConfig_targets1 = projectConfig.targets) == null ? void 0 : (_projectConfig_targets_test1 = _projectConfig_targets1.test) == null ? void 0 : (_projectConfig_targets_test_options1 = _projectConfig_targets_test1.options) == null ? void 0 : _projectConfig_targets_test_options1.reportsDirectory;
+    } else {
+        coverageDir = (0, _devkit.joinPathFragments)((0, _devkit.offsetFromRoot)(projectConfig.root), 'coverage', projectConfig.root);
+    }
+    if (testCoverageDir) {
+    // Do nothing
+    } else if (testCoverage) {
+        // has test.coverage, has no reportsDirectory
+        // so add reportsDirectory
+        configContents = (0, _devkit.applyChangesToString)(configContents, [
+            {
+                type: _devkit.ChangeType.Insert,
+                index: testCoverage.getStart() + `coverage: {`.length + 1,
+                text: `reportsDirectory: '${coverageDir}',`
+            }
+        ]);
+        if (!provider) {
+            configContents = (0, _devkit.applyChangesToString)(configContents, [
+                {
+                    type: _devkit.ChangeType.Insert,
+                    index: testCoverage.getStart() + `coverage: {`.length + 1,
+                    text: `provider: 'v8',`
+                }
+            ]);
+        }
+    } else if (testObject) {
+        configContents = (0, _devkit.applyChangesToString)(configContents, [
+            {
+                type: _devkit.ChangeType.Insert,
+                index: testObject.getStart() + `test: {`.length + 1,
+                text: `coverage: {
+          reportsDirectory: '${coverageDir}',
+          provider: 'v8',
+        },`
+            }
+        ]);
+    } else {
+    // has no test so do nothing
+    }
+    return configContents;
+}
+
+//# sourceMappingURL=edit-test-config.js.map

package/src/migrations/update-17-2-0/lib/edit-test-config.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/vite/src/migrations/update-17-2-0/lib/edit-test-config.ts"],"sourcesContent":["import {\n  ChangeType,\n  ProjectConfiguration,\n  applyChangesToString,\n  joinPathFragments,\n  offsetFromRoot,\n} from '@nx/devkit';\nimport { tsquery } from '@phenomnomnominal/tsquery';\nimport ts = require('typescript');\n\nexport function updateTestConfig(\n  configContents: string,\n  projectConfig: ProjectConfiguration\n): string {\n  const testObject = tsquery.query(\n    configContents,\n    `PropertyAssignment:has(Identifier[name=\"test\"])`\n  )?.[0];\n  let testCoverageDir: ts.Node;\n  let testCoverage: ts.Node;\n  let provider: ts.Node;\n  if (testObject) {\n    testCoverage = tsquery.query(\n      testObject,\n      `PropertyAssignment:has(Identifier[name=\"coverage\"])`\n    )?.[0];\n    if (testCoverage) {\n      testCoverageDir = tsquery.query(\n        testCoverage,\n        `PropertyAssignment:has(Identifier[name=\"reportsDirectory\"])`\n      )?.[0];\n      provider = tsquery.query(\n        testCoverage,\n        `PropertyAssignment:has(Identifier[name=\"provider\"])`\n      )?.[0];\n    }\n  }\n\n  let coverageDir = '';\n\n  if (projectConfig.targets?.test?.options?.reportsDirectory) {\n    coverageDir = projectConfig.targets?.test?.options?.reportsDirectory;\n  } else {\n    coverageDir = joinPathFragments(\n      offsetFromRoot(projectConfig.root),\n      'coverage',\n      projectConfig.root\n    );\n  }\n\n  if (testCoverageDir) {\n    // Do nothing\n  } else if (testCoverage) {\n    // has test.coverage, has no reportsDirectory\n    // so add reportsDirectory\n    configContents = applyChangesToString(configContents, [\n      {\n        type: ChangeType.Insert,\n        index: testCoverage.getStart() + `coverage: {`.length + 1,\n        text: `reportsDirectory: '${coverageDir}',`,\n      },\n    ]);\n    if (!provider) {\n      configContents = applyChangesToString(configContents, [\n        {\n          type: ChangeType.Insert,\n          index: testCoverage.getStart() + `coverage: {`.length + 1,\n          text: `provider: 'v8',`,\n        },\n      ]);\n    }\n  } else if (testObject) {\n    configContents = applyChangesToString(configContents, [\n      {\n        type: ChangeType.Insert,\n        index: testObject.getStart() + `test: {`.length + 1,\n        text: `coverage: {\n          reportsDirectory: '${coverageDir}',\n          provider: 'v8',\n        },`,\n      },\n    ]);\n  } else {\n    // has no test so do nothing\n  }\n\n  return configContents;\n}\n"],"names":["updateTestConfig","ts","configContents","projectConfig","tsquery","testObject","query","testCoverageDir","testCoverage","provider","coverageDir","targets","test","options","reportsDirectory","joinPathFragments","offsetFromRoot","root","applyChangesToString","type","ChangeType","Insert","index","getStart","length","text"],"mappings":";+BAUgBA;;;eAAAA;;;wBAJT;yBACiB;AACxB,MAAOC,aAAa;AAEb,SAASD,iBACdE,cAAsB,EACtBC,aAAmC;QAEhBC,gBA0BfD,qCAAAA,6BAAAA;IA1BJ,MAAME,cAAaD,iBAAAA,gBAAO,CAACE,KAAK,CAC9BJ,gBACA,CAAC,+CAA+C,CAAC,sBAFhCE,cAGhB,CAAC,EAAE;IACN,IAAIG;IACJ,IAAIC;IACJ,IAAIC;IACJ,IAAIJ,YAAY;YACCD;QAAfI,gBAAeJ,kBAAAA,gBAAO,CAACE,KAAK,CAC1BD,YACA,CAAC,mDAAmD,CAAC,sBAFxCD,eAGZ,CAAC,EAAE;QACN,IAAII,cAAc;gBACEJ,iBAIPA;YAJXG,mBAAkBH,kBAAAA,gBAAO,CAACE,KAAK,CAC7BE,cACA,CAAC,2DAA2D,CAAC,sBAF7CJ,eAGf,CAAC,EAAE;YACNK,YAAWL,kBAAAA,gBAAO,CAACE,KAAK,CACtBE,cACA,CAAC,mDAAmD,CAAC,sBAF5CJ,eAGR,CAAC,EAAE;QACR;IACF;IAEA,IAAIM,cAAc;IAElB,KAAIP,yBAAAA,cAAcQ,OAAO,sBAArBR,8BAAAA,uBAAuBS,IAAI,sBAA3BT,sCAAAA,4BAA6BU,OAAO,qBAApCV,oCAAsCW,gBAAgB,EAAE;YAC5CX,sCAAAA,8BAAAA;QAAdO,eAAcP,0BAAAA,cAAcQ,OAAO,sBAArBR,+BAAAA,wBAAuBS,IAAI,sBAA3BT,uCAAAA,6BAA6BU,OAAO,qBAApCV,qCAAsCW,gBAAgB;IACtE,OAAO;QACLJ,cAAcK,IAAAA,yBAAiB,EAC7BC,IAAAA,sBAAc,EAACb,cAAcc,IAAI,GACjC,YACAd,cAAcc,IAAI;IAEtB;IAEA,IAAIV,iBAAiB;IACnB,aAAa;IACf,OAAO,IAAIC,cAAc;QACvB,6CAA6C;QAC7C,0BAA0B;QAC1BN,iBAAiBgB,IAAAA,4BAAoB,EAAChB,gBAAgB;YACpD;gBACEiB,MAAMC,kBAAU,CAACC,MAAM;gBACvBC,OAAOd,aAAae,QAAQ,KAAK,CAAC,WAAW,CAAC,CAACC,MAAM,GAAG;gBACxDC,MAAM,CAAC,mBAAmB,EAAEf,YAAY,EAAE,CAAC;YAC7C;SACD;QACD,IAAI,CAACD,UAAU;YACbP,iBAAiBgB,IAAAA,4BAAoB,EAAChB,gBAAgB;gBACpD;oBACEiB,MAAMC,kBAAU,CAACC,MAAM;oBACvBC,OAAOd,aAAae,QAAQ,KAAK,CAAC,WAAW,CAAC,CAACC,MAAM,GAAG;oBACxDC,MAAM,CAAC,eAAe,CAAC;gBACzB;aACD;QACH;IACF,OAAO,IAAIpB,YAAY;QACrBH,iBAAiBgB,IAAAA,4BAAoB,EAAChB,gBAAgB;YACpD;gBACEiB,MAAMC,kBAAU,CAACC,MAAM;gBACvBC,OAAOjB,WAAWkB,QAAQ,KAAK,CAAC,OAAO,CAAC,CAACC,MAAM,GAAG;gBAClDC,MAAM,CAAC;6BACc,EAAEf,YAAY;;UAEjC,CAAC;YACL;SACD;IACH,OAAO;IACL,4BAA4B;IAC9B;IAEA,OAAOR;AACT"}

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

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

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

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "findViteConfig", {
+    enumerable: true,
+    get: function() {
+        return findViteConfig;
+    }
+});
+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}`);
+        }
+    }
+}
+
+//# sourceMappingURL=find-vite-config.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/vite/src/migrations/update-17-2-0/lib/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"],"names":["findViteConfig","tree","searchRoot","allowsExt","ext","exists","joinPathFragments"],"mappings":";+BAEgBA;;;eAAAA;;;wBAFwB;AAEjC,SAASA,eAAeC,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"}

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

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function updateBuildDir(tree: Tree): Promise<void>;

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

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return updateBuildDir;
+    }
+});
+const _devkit = require("@nx/devkit");
+const _executoroptionsutils = require("@nx/devkit/src/generators/executor-options-utils");
+const _editbuildconfig = require("./lib/edit-build-config");
+const _edittestconfig = require("./lib/edit-test-config");
+const _addfilereplacements = require("./lib/add-file-replacements");
+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);
+        if (!config || !tree.exists(config)) {
+            return;
+        }
+        let configContents = tree.read(config, 'utf-8');
+        configContents = (0, _editbuildconfig.updateBuildOutDirAndRoot)(options, configContents, projectConfig, targetName, tree, projectName);
+        configContents = (0, _edittestconfig.updateTestConfig)(configContents, projectConfig);
+        if (((_options_fileReplacements = options.fileReplacements) == null ? void 0 : _options_fileReplacements.length) > 0) {
+            configContents = (0, _addfilereplacements.addFileReplacements)(configContents, options.fileReplacements);
+        }
+        tree.write(config, configContents);
+    });
+    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}`);
+        }
+    }
+}
+
+//# sourceMappingURL=update-vite-config.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../packages/vite/src/migrations/update-17-2-0/update-vite-config.ts"],"sourcesContent":["import { Tree, formatFiles, getProjects, joinPathFragments } 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';\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      );\n\n      configContents = updateTestConfig(configContents, projectConfig);\n\n      if (options.fileReplacements?.length > 0) {\n        configContents = addFileReplacements(\n          configContents,\n          options.fileReplacements\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"],"names":["updateBuildDir","tree","projects","getProjects","forEachExecutorOptions","options","projectName","targetName","projectConfig","get","config","configFile","findViteConfig","root","exists","configContents","read","updateBuildOutDirAndRoot","updateTestConfig","fileReplacements","length","addFileReplacements","write","formatFiles","searchRoot","allowsExt","ext","joinPathFragments"],"mappings":";+BAOA;;;eAA8BA;;;wBAPoC;sCAC3B;iCAEE;gCACR;qCACG;AAErB,eAAeA,eAAeC,IAAU;IACrD,MAAMC,WAAWC,IAAAA,mBAAW,EAACF;IAC7BG,IAAAA,4CAAsB,EACpBH,MACA,kBACA,CAACI,SAASC,aAAaC;YAoBjBF;QAnBJ,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;QAGFS,iBAAiBG,IAAAA,gCAAgB,EAACH,gBAAgBP;QAElD,IAAIH,EAAAA,4BAAAA,QAAQc,gBAAgB,qBAAxBd,0BAA0Be,MAAM,IAAG,GAAG;YACxCL,iBAAiBM,IAAAA,wCAAmB,EAClCN,gBACAV,QAAQc,gBAAgB;QAE5B;QAEAlB,KAAKqB,KAAK,CAACZ,QAAQK;IACrB;IAGF,MAAMQ,IAAAA,mBAAW,EAACtB;AACpB;AAEA,SAASW,eAAeX,IAAU,EAAEuB,UAAkB;IACpD,MAAMC,YAAY;QAAC;QAAM;QAAO;QAAM;QAAO;QAAO;KAAM;IAE1D,KAAK,MAAMC,OAAOD,UAAW;QAC3B,IAAIxB,KAAKa,MAAM,CAACa,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.js

@@ -28,11 +28,11 @@ async function validateTypes(opts) {
     }
 }
 function createBuildableTsConfig(projectRoot, options, context) {
-    var _options;
+    var _options, _buildLibsFromSource;
     const tsConfig = (0, _path.resolve)(projectRoot, 'tsconfig.json');
-    var _buildLibsFromSource;
-    (_buildLibsFromSource = (_options = options).buildLibsFromSource) != null ? _buildLibsFromSource : _options.buildLibsFromSource = true;
-    if (!options.buildLibsFromSource) {
+    var _;
+    (_ = (_options = options)[_buildLibsFromSource = 'buildLibsFromSource']) != null ? _ : _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);

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, resolve } from 'path';\nimport { ViteBuildExecutorOptions } from '../executors/build/schema';\nimport { ExecutorContext } from '@nx/devkit';\nimport { ViteDevServerExecutorOptions } from '../executors/dev-server/schema';\nimport {\n  calculateProjectBuildableDependencies,\n  createTmpTsConfig,\n} from '@nx/js/src/utils/buildable-libs-utils';\n\nexport async function validateTypes(opts: {\n  workspaceRoot: string;\n  projectRoot: string;\n  tsconfig: string;\n}): Promise<void> {\n  const result = await runTypeCheck({\n    workspaceRoot: opts.workspaceRoot,\n    tsConfigPath: join(opts.workspaceRoot, opts.tsconfig),\n    mode: 'noEmit',\n  });\n\n  await printDiagnostics(result.errors, result.warnings);\n\n  if (result.errors.length > 0) {\n    throw new Error('Found type errors. See above.');\n  }\n}\n\nexport function createBuildableTsConfig(\n  projectRoot: string,\n  options: ViteBuildExecutorOptions | ViteDevServerExecutorOptions,\n  context: ExecutorContext\n) {\n  const tsConfig = resolve(projectRoot, 'tsconfig.json');\n  options.buildLibsFromSource ??= true;\n\n  if (!options.buildLibsFromSource) {\n    const { dependencies } = calculateProjectBuildableDependencies(\n      context.taskGraph,\n      context.projectGraph,\n      context.root,\n      context.projectName,\n      // 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    createTmpTsConfig(tsConfig, context.root, projectRoot, dependencies);\n  }\n}\n"],"names":["validateTypes","createBuildableTsConfig","opts","result","runTypeCheck","workspaceRoot","tsConfigPath","join","tsconfig","mode","printDiagnostics","errors","warnings","length","Error","projectRoot","options","context","tsConfig","resolve","buildLibsFromSource","dependencies","calculateProjectBuildableDependencies","taskGraph","projectGraph","root","projectName","targetName","configurationName","createTmpTsConfig"],"mappings":";;;;;;;;IAUsBA,aAAa;eAAbA;;IAkBNC,uBAAuB;eAAvBA;;;oBA5B+B;sBACjB;oCAOvB;AAEA,eAAeD,cAAcE,IAInC;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,SAASb,wBACdc,WAAmB,EACnBC,OAAgE,EAChEC,OAAwB;QAGxBD;IADA,MAAME,WAAWC,IAAAA,aAAO,EAACJ,aAAa;;IACtCC,yBAAAA,WAAAA,SAAQI,sDAARJ,SAAQI,sBAAwB;IAEhC,IAAI,CAACJ,QAAQI,mBAAmB,EAAE;QAChC,MAAM,EAAEC,YAAY,EAAE,GAAGC,IAAAA,yDAAqC,EAC5DL,QAAQM,SAAS,EACjBN,QAAQO,YAAY,EACpBP,QAAQQ,IAAI,EACZR,QAAQS,WAAW,EACnB,iEAAiE;QACjE,0DAA0D;QAC1DT,QAAQU,UAAU,KAAK,UAAU,UAAUV,QAAQU,UAAU,EAC7DV,QAAQW,iBAAiB;QAE3B,qDAAqD;QACrDC,IAAAA,qCAAiB,EAACX,UAAUD,QAAQQ,IAAI,EAAEV,aAAaM;IACzD;AACF"}
+{"version":3,"sources":["../../../../../packages/vite/src/utils/executor-utils.ts"],"sourcesContent":["import { printDiagnostics, runTypeCheck } from '@nx/js';\nimport { join, resolve } from 'path';\nimport { ViteBuildExecutorOptions } from '../executors/build/schema';\nimport { ExecutorContext } from '@nx/devkit';\nimport { ViteDevServerExecutorOptions } from '../executors/dev-server/schema';\nimport {\n  calculateProjectBuildableDependencies,\n  createTmpTsConfig,\n} from '@nx/js/src/utils/buildable-libs-utils';\n\nexport async function validateTypes(opts: {\n  workspaceRoot: string;\n  projectRoot: string;\n  tsconfig: string;\n}): Promise<void> {\n  const result = await runTypeCheck({\n    workspaceRoot: opts.workspaceRoot,\n    tsConfigPath: join(opts.workspaceRoot, opts.tsconfig),\n    mode: 'noEmit',\n  });\n\n  await printDiagnostics(result.errors, result.warnings);\n\n  if (result.errors.length > 0) {\n    throw new Error('Found type errors. See above.');\n  }\n}\n\nexport function createBuildableTsConfig(\n  projectRoot: string,\n  options: ViteBuildExecutorOptions | ViteDevServerExecutorOptions,\n  context: ExecutorContext\n) {\n  const tsConfig = resolve(projectRoot, 'tsconfig.json');\n  options['buildLibsFromSource'] ??= true;\n\n  if (!options['buildLibsFromSource']) {\n    const { dependencies } = calculateProjectBuildableDependencies(\n      context.taskGraph,\n      context.projectGraph,\n      context.root,\n      context.projectName,\n      // 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    createTmpTsConfig(tsConfig, context.root, projectRoot, dependencies);\n  }\n}\n"],"names":["validateTypes","createBuildableTsConfig","opts","result","runTypeCheck","workspaceRoot","tsConfigPath","join","tsconfig","mode","printDiagnostics","errors","warnings","length","Error","projectRoot","options","context","tsConfig","resolve","dependencies","calculateProjectBuildableDependencies","taskGraph","projectGraph","root","projectName","targetName","configurationName","createTmpTsConfig"],"mappings":";;;;;;;;IAUsBA,aAAa;eAAbA;;IAkBNC,uBAAuB;eAAvBA;;;oBA5B+B;sBACjB;oCAOvB;AAEA,eAAeD,cAAcE,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,SAASb,wBACdc,WAAmB,EACnBC,OAAgE,EAChEC,OAAwB;QAGxBD,UAAQ;IADR,MAAME,WAAWC,IAAAA,aAAO,EAACJ,aAAa;;IACtCC,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,qDAAqD;QACrDC,IAAAA,qCAAiB,EAACV,UAAUD,QAAQO,IAAI,EAAET,aAAaK;IACzD;AACF"}

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

@@ -36,8 +36,9 @@ export interface ViteConfigFileOptions {
     rollupOptionsExternal?: string[];
     imports?: string[];
     plugins?: string[];
+    coverageProvider?: 'v8' | 'istanbul' | 'custom';
 }
-export declare function createOrEditViteConfig(tree: Tree, options: ViteConfigFileOptions, onlyVitest: boolean, projectAlreadyHasViteTargets?: TargetFlags): void;
+export declare function createOrEditViteConfig(tree: Tree, options: ViteConfigFileOptions, onlyVitest: boolean, projectAlreadyHasViteTargets?: TargetFlags, vitestFileName?: boolean): void;
 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>;

package/src/utils/generator-utils.js

@@ -157,11 +157,9 @@ function findExistingTargetsInProject(targets, userProvidedTargets) {
 function addOrChangeTestTarget(tree, options, target) {
     var _project;
     const project = (0, _devkit.readProjectConfiguration)(tree, options.project);
-    const coveragePath = (0, _devkit.joinPathFragments)('coverage', project.root === '.' ? options.project : project.root);
+    const reportsDirectory = (0, _devkit.joinPathFragments)((0, _devkit.offsetFromRoot)(project.root), 'coverage', project.root === '.' ? options.project : project.root);
     const testOptions = {
-        passWithNoTests: true,
-        // vitest runs in the project root so we have to offset to the workspaceRoot
-        reportsDirectory: (0, _devkit.joinPathFragments)((0, _devkit.offsetFromRoot)(project.root), coveragePath)
+        reportsDirectory
     };
     var _targets;
     (_targets = (_project = project).targets) != null ? _targets : _project.targets = {};
@@ -193,8 +191,8 @@ function addOrChangeBuildTarget(tree, options, target) {
         buildOptions.fileReplacements = (_project_targets_target_options = project.targets[target].options) == null ? void 0 : _project_targets_target_options.fileReplacements;
         if (project.targets[target].executor === '@nxext/vite:build') {
             var _project_targets_target_options1, _project_targets_target_options2;
-            buildOptions.base = (_project_targets_target_options1 = project.targets[target].options) == null ? void 0 : _project_targets_target_options1.baseHref;
-            buildOptions.sourcemap = (_project_targets_target_options2 = project.targets[target].options) == null ? void 0 : _project_targets_target_options2.sourcemaps;
+            buildOptions['base'] = (_project_targets_target_options1 = project.targets[target].options) == null ? void 0 : _project_targets_target_options1.baseHref;
+            buildOptions['sourcemap'] = (_project_targets_target_options2 = project.targets[target].options) == null ? void 0 : _project_targets_target_options2.sourcemaps;
         }
         project.targets[target].options = _extends._({}, buildOptions);
         project.targets[target].executor = '@nx/vite:build';
@@ -224,13 +222,9 @@ function addOrChangeServeTarget(tree, options, target) {
     var _targets;
     (_targets = (_project = project).targets) != null ? _targets : _project.targets = {};
     if (project.targets[target]) {
-        var _project_targets_target_options, _project_targets_target_options1, _project_targets_target_options2;
         const serveTarget = project.targets[target];
         const serveOptions = {
-            buildTarget: `${options.project}:build`,
-            https: (_project_targets_target_options = project.targets[target].options) == null ? void 0 : _project_targets_target_options.https,
-            hmr: (_project_targets_target_options1 = project.targets[target].options) == null ? void 0 : _project_targets_target_options1.hmr,
-            open: (_project_targets_target_options2 = project.targets[target].options) == null ? void 0 : _project_targets_target_options2.open
+            buildTarget: `${options.project}:build`
         };
         if (serveTarget.executor === '@nxext/vite:dev') {
             serveOptions.proxyConfig = project.targets[target].options.proxyConfig;
@@ -273,8 +267,8 @@ function addPreviewTarget(tree, options, serveTarget) {
         if (target.executor === '@nxext/vite:dev') {
             previewOptions.proxyConfig = target.options.proxyConfig;
         }
-        previewOptions.https = (_target_options = target.options) == null ? void 0 : _target_options.https;
-        previewOptions.open = (_target_options1 = target.options) == null ? void 0 : _target_options1.open;
+        previewOptions['https'] = (_target_options = target.options) == null ? void 0 : _target_options.https;
+        previewOptions['open'] = (_target_options1 = target.options) == null ? void 0 : _target_options1.open;
     }
     // Adds a preview target.
     project.targets.preview = {
@@ -395,14 +389,15 @@ function moveAndEditIndexHtml(tree, options, buildTarget) {
       </html>`);
     }
 }
-function createOrEditViteConfig(tree, options, onlyVitest, projectAlreadyHasViteTargets) {
-    const projectConfig = (0, _devkit.readProjectConfiguration)(tree, options.project);
-    const viteConfigPath = `${projectConfig.root}/vite.config.ts`;
+function createOrEditViteConfig(tree, options, onlyVitest, projectAlreadyHasViteTargets, vitestFileName) {
+    const { root: projectRoot } = (0, _devkit.readProjectConfiguration)(tree, options.project);
+    const viteConfigPath = vitestFileName ? `${projectRoot}/vitest.config.ts` : `${projectRoot}/vite.config.ts`;
     var _options_rollupOptionsExternal;
     const buildOption = onlyVitest ? '' : options.includeLib ? `
       // Configuration for building your library.
       // See: https://vitejs.dev/guide/build.html#library-mode
       build: {
+        outDir: '${(0, _devkit.offsetFromRoot)(projectRoot)}dist/${projectRoot}',
         lib: {
           // Could also be a dictionary or array of multiple entry points.
           entry: 'src/index.ts',
@@ -415,8 +410,12 @@ function createOrEditViteConfig(tree, options, onlyVitest, projectAlreadyHasVite
         rollupOptions: {
           // External packages that should not be bundled into your library.
           external: [${(_options_rollupOptionsExternal = options.rollupOptionsExternal) != null ? _options_rollupOptionsExternal : ''}]
-        }
-      },` : ``;
+        },
+      },` : `
+    build: {
+      outDir: '${(0, _devkit.offsetFromRoot)(projectRoot)}dist/${projectRoot}',
+    },
+    `;
     const imports = options.imports ? options.imports : [];
     if (!onlyVitest && options.includeLib) {
         imports.push(`import dts from 'vite-plugin-dts'`, `import * as path from 'path'`);
@@ -435,11 +434,15 @@ function createOrEditViteConfig(tree, options, onlyVitest, projectAlreadyHasVite
     const testOption = options.includeVitest ? `test: {
     globals: true,
     cache: {
-      dir: '${(0, _devkit.offsetFromRoot)(projectConfig.root)}node_modules/.vitest'
+      dir: '${(0, _devkit.offsetFromRoot)(projectRoot)}node_modules/.vitest'
     },
     environment: '${(_options_testEnvironment = options.testEnvironment) != null ? _options_testEnvironment : 'jsdom'}',
     include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    ${options.inSourceTests ? `includeSource: ['src/**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}']` : ''}
+    ${options.inSourceTests ? `includeSource: ['src/**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],` : ''}
+    coverage: {
+      reportsDirectory: '${(0, _devkit.offsetFromRoot)(projectRoot)}coverage/${projectRoot}',
+      provider: ${options.coverageProvider ? `'${options.coverageProvider}'` : `'v8'`},
+    }
   },` : '';
     const defineOption = options.inSourceTests ? `define: {
     'import.meta.vitest': undefined
@@ -459,9 +462,9 @@ function createOrEditViteConfig(tree, options, onlyVitest, projectAlreadyHasVite
     // worker: {
     //  plugins: [ nxViteTsPaths() ],
     // },`;
-    const cacheDir = `cacheDir: '${(0, _devkit.offsetFromRoot)(projectConfig.root)}node_modules/.vite/${options.project}',`;
+    const cacheDir = `cacheDir: '${(0, _devkit.offsetFromRoot)(projectRoot)}node_modules/.vite/${projectRoot}',`;
     if (tree.exists(viteConfigPath)) {
-        handleViteConfigFileExists(tree, viteConfigPath, options, buildOption, imports, plugins, testOption, cacheDir, (0, _devkit.offsetFromRoot)(projectConfig.root), projectAlreadyHasViteTargets);
+        handleViteConfigFileExists(tree, viteConfigPath, options, buildOption, imports, plugins, testOption, cacheDir, (0, _devkit.offsetFromRoot)(projectRoot), projectRoot, projectAlreadyHasViteTargets);
         return;
     }
     viteConfigContent = `
@@ -471,6 +474,7 @@ function createOrEditViteConfig(tree, options, onlyVitest, projectAlreadyHasVite
       import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
       
       export default defineConfig({
+        root: __dirname,
         ${cacheDir}
         ${devServerOption}
         ${previewServerOption}
@@ -560,7 +564,7 @@ async function handleUnknownExecutors(projectName) {
     `);
     }
 }
-function handleViteConfigFileExists(tree, viteConfigPath, options, buildOption, imports, plugins, testOption, cacheDir, offsetFromRoot, projectAlreadyHasViteTargets) {
+function handleViteConfigFileExists(tree, viteConfigPath, options, buildOption, imports, plugins, testOption, cacheDir, offsetFromRoot, projectRoot, projectAlreadyHasViteTargets) {
     if ((projectAlreadyHasViteTargets == null ? void 0 : projectAlreadyHasViteTargets.build) && (projectAlreadyHasViteTargets == null ? void 0 : projectAlreadyHasViteTargets.test)) {
         return;
     }
@@ -568,7 +572,7 @@ function handleViteConfigFileExists(tree, viteConfigPath, options, buildOption,
         _devkit.logger.info(`vite.config.ts already exists for project ${options.project}.`);
     }
     var _options_rollupOptionsExternal;
-    const buildOptionObject = {
+    const buildOptionObject = options.includeLib ? {
         lib: {
             entry: 'src/index.ts',
             name: options.project,
@@ -580,9 +584,12 @@ function handleViteConfigFileExists(tree, viteConfigPath, options, buildOption,
         },
         rollupOptions: {
             external: (_options_rollupOptionsExternal = options.rollupOptionsExternal) != null ? _options_rollupOptionsExternal : []
-        }
+        },
+        outDir: `${offsetFromRoot}dist/${projectRoot}`
+    } : {
+        outDir: `${offsetFromRoot}dist/${projectRoot}`
     };
-    var _options_testEnvironment;
+    var _options_testEnvironment, _options_coverageProvider;
     const testOptionObject = {
         globals: true,
         cache: {
@@ -591,7 +598,11 @@ function handleViteConfigFileExists(tree, viteConfigPath, options, buildOption,
         environment: (_options_testEnvironment = options.testEnvironment) != null ? _options_testEnvironment : 'jsdom',
         include: [
             'src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'
-        ]
+        ],
+        coverage: {
+            reportsDirectory: `${offsetFromRoot}coverage/${projectRoot}`,
+            provider: `${(_options_coverageProvider = options.coverageProvider) != null ? _options_coverageProvider : 'v8'}`
+        }
     };
     const changed = (0, _viteconfigeditutils.ensureViteConfigIsCorrect)(tree, viteConfigPath, buildOption, buildOptionObject, imports, plugins, testOption, testOptionObject, cacheDir, projectAlreadyHasViteTargets != null ? projectAlreadyHasViteTargets : {});
     if (!changed) {