@nx/vite 21.3.7 → 21.4.0-beta.1

package/src/utils/generator-utils.js

@@ -1,63 +1,26 @@
 "use strict";
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    addBuildTarget: function() {
-        return addBuildTarget;
-    },
-    addOrChangeTestTarget: function() {
-        return addOrChangeTestTarget;
-    },
-    addPreviewTarget: function() {
-        return addPreviewTarget;
-    },
-    addServeTarget: function() {
-        return addServeTarget;
-    },
-    createOrEditViteConfig: function() {
-        return createOrEditViteConfig;
-    },
-    deleteWebpackConfig: function() {
-        return deleteWebpackConfig;
-    },
-    editTsConfig: function() {
-        return editTsConfig;
-    },
-    findExistingJsBuildTargetInProject: function() {
-        return findExistingJsBuildTargetInProject;
-    },
-    getViteConfigPathForProject: function() {
-        return getViteConfigPathForProject;
-    },
-    handleUnknownConfiguration: function() {
-        return handleUnknownConfiguration;
-    },
-    handleUnsupportedUserProvidedTargets: function() {
-        return handleUnsupportedUserProvidedTargets;
-    },
-    moveAndEditIndexHtml: function() {
-        return moveAndEditIndexHtml;
-    },
-    normalizeViteConfigFilePathWithTree: function() {
-        return normalizeViteConfigFilePathWithTree;
-    }
-});
-const _devkit = require("@nx/devkit");
-const _targetdefaultsutils = require("@nx/devkit/src/generators/target-defaults-utils");
-const _tssolutionsetup = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const _viteconfigeditutils = require("./vite-config-edit-utils");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findExistingJsBuildTargetInProject = findExistingJsBuildTargetInProject;
+exports.addOrChangeTestTarget = addOrChangeTestTarget;
+exports.addBuildTarget = addBuildTarget;
+exports.addServeTarget = addServeTarget;
+exports.addPreviewTarget = addPreviewTarget;
+exports.editTsConfig = editTsConfig;
+exports.deleteWebpackConfig = deleteWebpackConfig;
+exports.moveAndEditIndexHtml = moveAndEditIndexHtml;
+exports.createOrEditViteConfig = createOrEditViteConfig;
+exports.normalizeViteConfigFilePathWithTree = normalizeViteConfigFilePathWithTree;
+exports.getViteConfigPathForProject = getViteConfigPathForProject;
+exports.handleUnsupportedUserProvidedTargets = handleUnsupportedUserProvidedTargets;
+exports.handleUnknownConfiguration = handleUnknownConfiguration;
+const devkit_1 = require("@nx/devkit");
+const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const vite_config_edit_utils_1 = require("./vite-config-edit-utils");
 function findExistingJsBuildTargetInProject(targets) {
     const output = {};
     const supportedExecutors = {
-        build: [
-            '@nx/js:babel',
-            '@nx/js:swc',
-            '@nx/rollup:rollup'
-        ]
+        build: ['@nx/js:babel', '@nx/js:swc', '@nx/rollup:rollup'],
     };
     const unsupportedExecutors = [
         '@nx/angular:ng-packagr-lite',
@@ -86,158 +49,154 @@ function findExistingJsBuildTargetInProject(targets) {
         '@nrwl/js:tsc',
         '@angular-devkit/build-angular:browser',
         '@angular-devkit/build-angular:browser-esbuild',
-        '@angular-devkit/build-angular:application'
+        '@angular-devkit/build-angular:application',
     ];
     // We try to find the target that is using the supported executors
     // for build since this is the one we will be converting
-    for(const target in targets){
+    for (const target in targets) {
         const executorName = targets[target].executor;
         if (supportedExecutors.build.includes(executorName)) {
             output.supported = target;
-        } else if (unsupportedExecutors.includes(executorName)) {
+        }
+        else if (unsupportedExecutors.includes(executorName)) {
             output.unsupported = target;
         }
     }
     return output;
 }
 function addOrChangeTestTarget(tree, options, hasPlugin) {
-    var _nxJson_plugins;
-    var _project;
-    const nxJson = (0, _devkit.readNxJson)(tree);
-    hasPlugin = (_nxJson_plugins = nxJson.plugins) == null ? void 0 : _nxJson_plugins.some((p)=>typeof p === 'string' ? p === '@nx/vite/plugin' : p.plugin === '@nx/vite/plugin' || hasPlugin);
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
+        ? p === '@nx/vite/plugin'
+        : p.plugin === '@nx/vite/plugin' || hasPlugin);
     if (hasPlugin) {
         return;
     }
-    const project = (0, _devkit.readProjectConfiguration)(tree, options.project);
-    var _options_testTarget;
-    const target = (_options_testTarget = options.testTarget) != null ? _options_testTarget : 'test';
-    const reportsDirectory = (0, _devkit.joinPathFragments)((0, _devkit.offsetFromRoot)(project.root), 'coverage', project.root === '.' ? options.project : project.root);
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const target = options.testTarget ?? 'test';
+    const reportsDirectory = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(project.root), 'coverage', project.root === '.' ? options.project : project.root);
     const testOptions = {
-        reportsDirectory
+        reportsDirectory,
     };
-    var _targets;
-    (_targets = (_project = project).targets) != null ? _targets : _project.targets = {};
+    project.targets ??= {};
     if (project.targets[target]) {
         throw new Error(`Target "${target}" already exists in the project.`);
-    } else {
+    }
+    else {
         project.targets[target] = {
             executor: '@nx/vite:test',
-            outputs: [
-                '{options.reportsDirectory}'
-            ],
-            options: testOptions
+            outputs: ['{options.reportsDirectory}'],
+            options: testOptions,
         };
     }
-    (0, _devkit.updateProjectConfiguration)(tree, options.project, project);
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
 }
 function addBuildTarget(tree, options, target) {
-    var _project;
-    (0, _targetdefaultsutils.addBuildTargetDefaults)(tree, '@nx/vite:build');
-    const project = (0, _devkit.readProjectConfiguration)(tree, options.project);
-    const isTsSolutionSetup = (0, _tssolutionsetup.isUsingTsSolutionSetup)(tree);
+    (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, '@nx/vite:build');
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     const buildOptions = {
-        outputPath: isTsSolutionSetup ? (0, _devkit.joinPathFragments)(project.root, 'dist') : (0, _devkit.joinPathFragments)('dist', project.root != '.' ? project.root : options.project)
+        outputPath: isTsSolutionSetup
+            ? (0, devkit_1.joinPathFragments)(project.root, 'dist')
+            : (0, devkit_1.joinPathFragments)('dist', project.root != '.' ? project.root : options.project),
     };
-    var _targets;
-    (_targets = (_project = project).targets) != null ? _targets : _project.targets = {};
+    project.targets ??= {};
     project.targets[target] = {
         executor: '@nx/vite:build',
-        outputs: [
-            '{options.outputPath}'
-        ],
+        outputs: ['{options.outputPath}'],
         defaultConfiguration: 'production',
         options: buildOptions,
         configurations: {
             development: {
-                mode: 'development'
+                mode: 'development',
             },
             production: {
-                mode: 'production'
-            }
-        }
+                mode: 'production',
+            },
+        },
     };
-    (0, _devkit.updateProjectConfiguration)(tree, options.project, project);
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
 }
 function addServeTarget(tree, options, target) {
-    var _project;
-    const project = (0, _devkit.readProjectConfiguration)(tree, options.project);
-    var _targets;
-    (_targets = (_project = project).targets) != null ? _targets : _project.targets = {};
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    project.targets ??= {};
     project.targets[target] = {
         executor: '@nx/vite:dev-server',
         defaultConfiguration: 'development',
         options: {
-            buildTarget: `${options.project}:build`
+            buildTarget: `${options.project}:build`,
         },
         configurations: {
             development: {
                 buildTarget: `${options.project}:build:development`,
-                hmr: true
+                hmr: true,
             },
             production: {
                 buildTarget: `${options.project}:build:production`,
-                hmr: false
-            }
-        }
+                hmr: false,
+            },
+        },
     };
-    (0, _devkit.updateProjectConfiguration)(tree, options.project, project);
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
 }
+/**
+ * Adds a target for the preview server.
+ *
+ * @param tree
+ * @param options
+ * @param serveTarget An existing serve target.
+ */
 function addPreviewTarget(tree, options, serveTarget) {
-    var _project;
-    const project = (0, _devkit.readProjectConfiguration)(tree, options.project);
+    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const previewOptions = {
-        buildTarget: `${options.project}:build`
+        buildTarget: `${options.project}:build`,
     };
-    var _targets;
-    (_targets = (_project = project).targets) != null ? _targets : _project.targets = {};
+    project.targets ??= {};
     // Update the options from the passed serve target.
     if (project.targets[serveTarget]) {
-        var _target_options, _target_options1;
         const target = project.targets[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?.https;
+        previewOptions['open'] = target.options?.open;
     }
     // Adds a preview target.
     project.targets.preview = {
-        dependsOn: [
-            'build'
-        ],
+        dependsOn: ['build'],
         executor: '@nx/vite:preview-server',
         defaultConfiguration: 'development',
         options: previewOptions,
         configurations: {
             development: {
-                buildTarget: `${options.project}:build:development`
+                buildTarget: `${options.project}:build:development`,
             },
             production: {
-                buildTarget: `${options.project}:build:production`
-            }
-        }
+                buildTarget: `${options.project}:build:production`,
+            },
+        },
     };
-    (0, _devkit.updateProjectConfiguration)(tree, options.project, project);
+    (0, devkit_1.updateProjectConfiguration)(tree, options.project, project);
 }
 function editTsConfig(tree, options) {
-    const projectConfig = (0, _devkit.readProjectConfiguration)(tree, options.project);
-    let tsconfigPath = (0, _devkit.joinPathFragments)(projectConfig.root, 'tsconfig.json');
-    const isTsSolutionSetup = (0, _tssolutionsetup.isUsingTsSolutionSetup)(tree);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    let tsconfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json');
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     if (isTsSolutionSetup) {
         tsconfigPath = [
-            (0, _devkit.joinPathFragments)(projectConfig.root, 'tsconfig.app.json'),
-            (0, _devkit.joinPathFragments)(projectConfig.root, 'tsconfig.lib.json')
-        ].find((p)=>tree.exists(p));
+            (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.app.json'),
+            (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.lib.json'),
+        ].find((p) => tree.exists(p));
     }
-    const config = (0, _devkit.readJson)(tree, tsconfigPath);
-    switch(options.uiFramework){
+    const config = (0, devkit_1.readJson)(tree, tsconfigPath);
+    switch (options.uiFramework) {
         case 'react':
             config.compilerOptions = {
                 jsx: 'react-jsx',
                 allowJs: false,
                 esModuleInterop: false,
                 allowSyntheticDefaultImports: true,
-                strict: true
+                strict: true,
             };
             break;
         case 'none':
@@ -249,29 +208,36 @@ function editTsConfig(tree, options) {
                     noImplicitOverride: true,
                     noPropertyAccessFromIndexSignature: true,
                     noImplicitReturns: true,
-                    noFallthroughCasesInSwitch: true
+                    noFallthroughCasesInSwitch: true,
                 };
             }
             break;
         default:
             break;
     }
-    (0, _devkit.writeJson)(tree, tsconfigPath, config);
+    (0, devkit_1.writeJson)(tree, tsconfigPath, config);
 }
 function deleteWebpackConfig(tree, projectRoot, webpackConfigFilePath) {
-    const webpackConfigPath = webpackConfigFilePath && tree.exists(webpackConfigFilePath) ? webpackConfigFilePath : tree.exists(`${projectRoot}/webpack.config.js`) ? `${projectRoot}/webpack.config.js` : tree.exists(`${projectRoot}/webpack.config.ts`) ? `${projectRoot}/webpack.config.ts` : null;
+    const webpackConfigPath = webpackConfigFilePath && tree.exists(webpackConfigFilePath)
+        ? webpackConfigFilePath
+        : tree.exists(`${projectRoot}/webpack.config.js`)
+            ? `${projectRoot}/webpack.config.js`
+            : tree.exists(`${projectRoot}/webpack.config.ts`)
+                ? `${projectRoot}/webpack.config.ts`
+                : null;
     if (webpackConfigPath) {
         tree.delete(webpackConfigPath);
     }
 }
 function moveAndEditIndexHtml(tree, options) {
-    const projectConfig = (0, _devkit.readProjectConfiguration)(tree, options.project);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     let indexHtmlPath = `${projectConfig.root}/src/index.html`;
     let mainPath = `${projectConfig.root}/src/main.ts${options.uiFramework === 'react' ? 'x' : ''}`;
     if (projectConfig.root !== '.') {
         mainPath = mainPath.replace(projectConfig.root, '');
     }
-    if (!tree.exists(indexHtmlPath) && tree.exists(`${projectConfig.root}/index.html`)) {
+    if (!tree.exists(indexHtmlPath) &&
+        tree.exists(`${projectConfig.root}/index.html`)) {
         indexHtmlPath = `${projectConfig.root}/index.html`;
     }
     if (tree.exists(indexHtmlPath)) {
@@ -283,7 +249,8 @@ function moveAndEditIndexHtml(tree, options) {
                 tree.delete(`${projectConfig.root}/src/index.html`);
             }
         }
-    } else {
+    }
+    else {
         tree.write(`${projectConfig.root}/index.html`, `<!DOCTYPE html>
       <html lang='en'>
         <head>
@@ -300,13 +267,21 @@ function moveAndEditIndexHtml(tree, options) {
     }
 }
 function createOrEditViteConfig(tree, options, onlyVitest, projectAlreadyHasViteTargets, vitestFileName) {
-    const { root: projectRoot } = (0, _devkit.readProjectConfiguration)(tree, options.project);
+    const { root: projectRoot } = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const extension = options.useEsmExtension ? 'mts' : 'ts';
-    const viteConfigPath = vitestFileName ? `${projectRoot}/vitest.config.${extension}` : `${projectRoot}/vite.config.${extension}`;
-    const isTsSolutionSetup = (0, _tssolutionsetup.isUsingTsSolutionSetup)(tree);
-    const buildOutDir = isTsSolutionSetup ? './dist' : projectRoot === '.' ? `./dist/${options.project}` : `${(0, _devkit.offsetFromRoot)(projectRoot)}dist/${projectRoot}`;
-    var _options_rollupOptionsExternal;
-    const buildOption = onlyVitest ? '' : options.includeLib ? `  // Configuration for building your library.
+    const viteConfigPath = vitestFileName
+        ? `${projectRoot}/vitest.config.${extension}`
+        : `${projectRoot}/vite.config.${extension}`;
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const buildOutDir = isTsSolutionSetup
+        ? './dist'
+        : projectRoot === '.'
+            ? `./dist/${options.project}`
+            : `${(0, devkit_1.offsetFromRoot)(projectRoot)}dist/${projectRoot}`;
+    const buildOption = onlyVitest
+        ? ''
+        : options.includeLib
+            ? `  // Configuration for building your library.
   // See: https://vitejs.dev/guide/build.html#library-mode
   build: {
     outDir: '${buildOutDir}',
@@ -326,9 +301,10 @@ 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 : ''}]
+      external: [${options.rollupOptionsExternal ?? ''}]
     },
-  },` : `  build: {
+  },`
+            : `  build: {
     outDir: '${buildOutDir}',
     emptyOutDir: true,
     reportCompressedSize: true,
@@ -336,12 +312,8 @@ function createOrEditViteConfig(tree, options, onlyVitest, projectAlreadyHasVite
       transformMixedEsModules: true,
     },
   },`;
-    const imports = options.imports ? [
-        ...options.imports
-    ] : [];
-    const plugins = options.plugins ? [
-        ...options.plugins
-    ] : [];
+    const imports = options.imports ? [...options.imports] : [];
+    const plugins = options.plugins ? [...options.plugins] : [];
     if (!onlyVitest && options.includeLib) {
         imports.push(`import dts from 'vite-plugin-dts'`, `import * as path from 'path'`);
     }
@@ -352,41 +324,58 @@ function createOrEditViteConfig(tree, options, onlyVitest, projectAlreadyHasVite
     if (!onlyVitest && options.includeLib) {
         plugins.push(`dts({ entryRoot: 'src', tsconfigPath: path.join(__dirname, 'tsconfig.lib.json')${!isTsSolutionSetup ? ', pathsToAliases: false' : ''} })`);
     }
-    const reportsDirectory = isTsSolutionSetup ? './test-output/vitest/coverage' : projectRoot === '.' ? `./coverage/${options.project}` : `${(0, _devkit.offsetFromRoot)(projectRoot)}coverage/${projectRoot}`;
-    var _options_testEnvironment;
-    const testOption = options.includeVitest ? `  test: {
+    const reportsDirectory = isTsSolutionSetup
+        ? './test-output/vitest/coverage'
+        : projectRoot === '.'
+            ? `./coverage/${options.project}`
+            : `${(0, devkit_1.offsetFromRoot)(projectRoot)}coverage/${projectRoot}`;
+    const testOption = options.includeVitest
+        ? `  test: {
     watch: false,
     globals: true,
-    environment: '${(_options_testEnvironment = options.testEnvironment) != null ? _options_testEnvironment : 'jsdom'}',
+    environment: '${options.testEnvironment ?? 'jsdom'}',
     include: ['{src,tests}/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
 ${options.setupFile ? `    setupFiles: ['${options.setupFile}'],\n` : ''}\
-${options.inSourceTests ? `    includeSource: ['src/**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],\n` : ''}\
+${options.inSourceTests
+            ? `    includeSource: ['src/**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],\n`
+            : ''}\
     reporters: ['default'],
     coverage: {
       reportsDirectory: '${reportsDirectory}',
-      provider: ${options.coverageProvider ? `'${options.coverageProvider}' as const` : `'v8' as const`},
+      provider: ${options.coverageProvider
+            ? `'${options.coverageProvider}' as const`
+            : `'v8' as const`},
     }
-  },` : '';
-    const defineOption = options.inSourceTests ? `  define: {
+  },`
+        : '';
+    const defineOption = options.inSourceTests
+        ? `  define: {
     'import.meta.vitest': undefined
-  },` : '';
-    var _options_port;
-    const devServerOption = onlyVitest ? '' : options.includeLib ? '' : `  server:{
-    port: ${(_options_port = options.port) != null ? _options_port : 4200},
+  },`
+        : '';
+    const devServerOption = onlyVitest
+        ? ''
+        : options.includeLib
+            ? ''
+            : `  server:{
+    port: ${options.port ?? 4200},
     host: 'localhost',
   },`;
-    var _options_previewPort;
-    const previewServerOption = onlyVitest ? '' : options.includeLib ? '' : `  preview:{
-    port: ${(_options_previewPort = options.previewPort) != null ? _options_previewPort : 4300},
+    const previewServerOption = onlyVitest
+        ? ''
+        : options.includeLib
+            ? ''
+            : `  preview:{
+    port: ${options.previewPort ?? 4300},
     host: 'localhost',
   },`;
     const workerOption = `  // Uncomment this if you are using workers.
   // worker: {
   //  plugins: [ nxViteTsPaths() ],
   // },`;
-    const cacheDir = `cacheDir: '${normalizedJoinPaths((0, _devkit.offsetFromRoot)(projectRoot), 'node_modules', '.vite', projectRoot === '.' ? options.project : projectRoot)}',`;
+    const cacheDir = `cacheDir: '${normalizedJoinPaths((0, devkit_1.offsetFromRoot)(projectRoot), 'node_modules', '.vite', projectRoot === '.' ? options.project : projectRoot)}',`;
     if (tree.exists(viteConfigPath)) {
-        handleViteConfigFileExists(tree, viteConfigPath, options, buildOption, buildOutDir, imports, plugins, testOption, reportsDirectory, cacheDir, projectRoot, (0, _devkit.offsetFromRoot)(projectRoot), projectAlreadyHasViteTargets);
+        handleViteConfigFileExists(tree, viteConfigPath, options, buildOption, buildOutDir, imports, plugins, testOption, reportsDirectory, cacheDir, projectRoot, (0, devkit_1.offsetFromRoot)(projectRoot), projectAlreadyHasViteTargets);
         return;
     }
     const viteConfigContent = `/// <reference types='vitest' />
@@ -404,18 +393,24 @@ function printOptions(...options) {
     return options.filter(Boolean).join('\n');
 }
 function normalizeViteConfigFilePathWithTree(tree, projectRoot, configFile) {
-    return configFile && tree.exists(configFile) ? configFile : tree.exists((0, _devkit.joinPathFragments)(`${projectRoot}/vite.config.ts`)) ? (0, _devkit.joinPathFragments)(`${projectRoot}/vite.config.ts`) : tree.exists((0, _devkit.joinPathFragments)(`${projectRoot}/vite.config.js`)) ? (0, _devkit.joinPathFragments)(`${projectRoot}/vite.config.js`) : undefined;
+    return configFile && tree.exists(configFile)
+        ? configFile
+        : tree.exists((0, devkit_1.joinPathFragments)(`${projectRoot}/vite.config.ts`))
+            ? (0, devkit_1.joinPathFragments)(`${projectRoot}/vite.config.ts`)
+            : tree.exists((0, devkit_1.joinPathFragments)(`${projectRoot}/vite.config.js`))
+                ? (0, devkit_1.joinPathFragments)(`${projectRoot}/vite.config.js`)
+                : undefined;
 }
 function getViteConfigPathForProject(tree, projectName, target) {
     let viteConfigPath;
-    const { targets, root } = (0, _devkit.readProjectConfiguration)(tree, projectName);
+    const { targets, root } = (0, devkit_1.readProjectConfiguration)(tree, projectName);
     if (target) {
-        var _targets_target_options, _targets_target;
-        viteConfigPath = targets == null ? void 0 : (_targets_target = targets[target]) == null ? void 0 : (_targets_target_options = _targets_target.options) == null ? void 0 : _targets_target_options.configFile;
-    } else {
-        var _config_options;
-        const config = Object.values(targets).find((config)=>config.executor === '@nrwl/nx:build' || config.executor === '@nrwl/vite:build');
-        viteConfigPath = config == null ? void 0 : (_config_options = config.options) == null ? void 0 : _config_options.configFile;
+        viteConfigPath = targets?.[target]?.options?.configFile;
+    }
+    else {
+        const config = Object.values(targets).find((config) => config.executor === '@nrwl/nx:build' ||
+            config.executor === '@nrwl/vite:build');
+        viteConfigPath = config?.options?.configFile;
     }
     return normalizeViteConfigFilePathWithTree(tree, root, viteConfigPath);
 }
@@ -431,7 +426,7 @@ async function handleUnsupportedUserProvidedTargets(userProvidedTargetIsUnsuppor
     }
 }
 async function handleUnsupportedUserProvidedTargetsErrors(userProvidedTargetName, validFoundTargetName, target, executor) {
-    _devkit.logger.warn(`The custom ${target} target you provided (${userProvidedTargetName}) cannot be converted to use the @nx/vite:${executor} executor.
+    devkit_1.logger.warn(`The custom ${target} target you provided (${userProvidedTargetName}) cannot be converted to use the @nx/vite:${executor} executor.
      However, we found the following ${target} target in your project that can be converted: ${validFoundTargetName}
 
      Please note that converting a potentially non-compatible project to use Vite.js may result in unexpected behavior. Always commit
@@ -441,7 +436,7 @@ async function handleUnsupportedUserProvidedTargetsErrors(userProvidedTargetName
     const prompt = new Confirm({
         name: 'question',
         message: `Should we convert the ${validFoundTargetName} target to use the @nx/vite:${executor} executor?`,
-        initial: true
+        initial: true,
     });
     const shouldConvert = await prompt.run();
     if (!shouldConvert) {
@@ -458,7 +453,7 @@ async function handleUnknownConfiguration(projectName) {
     if (process.env.NX_INTERACTIVE === 'false') {
         return;
     }
-    _devkit.logger.warn(`
+    devkit_1.logger.warn(`
       We could not find any configuration in project ${projectName} that 
       indicates whether we can definitely convert to Vite.
       
@@ -469,7 +464,7 @@ async function handleUnknownConfiguration(projectName) {
     const prompt = new Confirm({
         name: 'question',
         message: `Should Nx convert your project to use Vite?`,
-        initial: true
+        initial: true,
     });
     const shouldConvert = await prompt.run();
     if (!shouldConvert) {
@@ -480,55 +475,50 @@ async function handleUnknownConfiguration(projectName) {
     }
 }
 function handleViteConfigFileExists(tree, viteConfigPath, options, buildOption, buildOutDir, imports, plugins, testOption, reportsDirectory, cacheDir, projectRoot, offsetFromRoot, projectAlreadyHasViteTargets) {
-    if ((projectAlreadyHasViteTargets == null ? void 0 : projectAlreadyHasViteTargets.build) && (projectAlreadyHasViteTargets == null ? void 0 : projectAlreadyHasViteTargets.test)) {
+    if (projectAlreadyHasViteTargets?.build &&
+        projectAlreadyHasViteTargets?.test) {
         return;
     }
     if (process.env.NX_VERBOSE_LOGGING === 'true') {
-        _devkit.logger.info(`vite.config.ts already exists for project ${options.project}.`);
+        devkit_1.logger.info(`vite.config.ts already exists for project ${options.project}.`);
     }
-    var _options_rollupOptionsExternal;
-    const buildOptionObject = options.includeLib ? {
-        lib: {
-            entry: 'src/index.ts',
-            name: options.project,
-            fileName: 'index',
-            formats: [
-                'es'
-            ]
-        },
-        rollupOptions: {
-            external: (_options_rollupOptionsExternal = options.rollupOptionsExternal) != null ? _options_rollupOptionsExternal : []
-        },
-        outDir: buildOutDir,
-        reportCompressedSize: true,
-        commonjsOptions: {
-            transformMixedEsModules: true
-        }
-    } : {
-        outDir: buildOutDir,
-        reportCompressedSize: true,
-        commonjsOptions: {
-            transformMixedEsModules: true
+    const buildOptionObject = options.includeLib
+        ? {
+            lib: {
+                entry: 'src/index.ts',
+                name: options.project,
+                fileName: 'index',
+                formats: ['es'],
+            },
+            rollupOptions: {
+                external: options.rollupOptionsExternal ?? [],
+            },
+            outDir: buildOutDir,
+            reportCompressedSize: true,
+            commonjsOptions: {
+                transformMixedEsModules: true,
+            },
         }
-    };
-    var _options_testEnvironment, _options_coverageProvider;
+        : {
+            outDir: buildOutDir,
+            reportCompressedSize: true,
+            commonjsOptions: {
+                transformMixedEsModules: true,
+            },
+        };
     const testOptionObject = {
         globals: true,
-        environment: (_options_testEnvironment = options.testEnvironment) != null ? _options_testEnvironment : 'jsdom',
-        include: [
-            'src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'
-        ],
-        reporters: [
-            'default'
-        ],
+        environment: options.testEnvironment ?? 'jsdom',
+        include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+        reporters: ['default'],
         coverage: {
             reportsDirectory: reportsDirectory,
-            provider: `'${(_options_coverageProvider = options.coverageProvider) != null ? _options_coverageProvider : 'v8'}'`
-        }
+            provider: `'${options.coverageProvider ?? 'v8'}'`,
+        },
     };
-    const changed = (0, _viteconfigeditutils.ensureViteConfigIsCorrect)(tree, viteConfigPath, buildOption, buildOptionObject, imports, plugins, testOption, testOptionObject, cacheDir, projectAlreadyHasViteTargets != null ? projectAlreadyHasViteTargets : {});
+    const changed = (0, vite_config_edit_utils_1.ensureViteConfigIsCorrect)(tree, viteConfigPath, buildOption, buildOptionObject, imports, plugins, testOption, testOptionObject, cacheDir, projectAlreadyHasViteTargets ?? {});
     if (!changed) {
-        _devkit.logger.warn(`Make sure the following setting exists in your Vite configuration file (${viteConfigPath}):
+        devkit_1.logger.warn(`Make sure the following setting exists in your Vite configuration file (${viteConfigPath}):
         
         ${buildOption}
         
@@ -536,8 +526,6 @@ function handleViteConfigFileExists(tree, viteConfigPath, options, buildOption,
     }
 }
 function normalizedJoinPaths(...paths) {
-    const path = (0, _devkit.joinPathFragments)(...paths);
+    const path = (0, devkit_1.joinPathFragments)(...paths);
     return path.startsWith('.') ? path : `./${path}`;
 }
-
-//# sourceMappingURL=generator-utils.js.map