@nx/vite 21.3.7 → 21.4.0-beta.1

package/src/generators/init/init.js

@@ -1,133 +1,81 @@
 "use strict";
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    default: function() {
-        return _default;
-    },
-    initGenerator: function() {
-        return initGenerator;
-    },
-    initGeneratorInternal: function() {
-        return initGeneratorInternal;
-    },
-    updateNxJsonSettings: function() {
-        return updateNxJsonSettings;
-    }
-});
-const _extends = require("@swc/helpers/_/_extends");
-const _devkit = require("@nx/devkit");
-const _addplugin = require("@nx/devkit/src/utils/add-plugin");
-const _setuppathsplugin = require("../setup-paths-plugin/setup-paths-plugin");
-const _plugin = require("../../plugins/plugin");
-const _utils = require("./lib/utils");
-const _ignorevitetempfiles = require("../../utils/ignore-vite-temp-files");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateNxJsonSettings = updateNxJsonSettings;
+exports.initGenerator = initGenerator;
+exports.initGeneratorInternal = initGeneratorInternal;
+const devkit_1 = require("@nx/devkit");
+const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
+const setup_paths_plugin_1 = require("../setup-paths-plugin/setup-paths-plugin");
+const plugin_1 = require("../../plugins/plugin");
+const utils_1 = require("./lib/utils");
+const ignore_vite_temp_files_1 = require("../../utils/ignore-vite-temp-files");
 function updateNxJsonSettings(tree) {
-    var _nxJson_namedInputs, _nxJson_plugins;
-    const nxJson = (0, _devkit.readNxJson)(tree);
-    const productionFileSet = (_nxJson_namedInputs = nxJson.namedInputs) == null ? void 0 : _nxJson_namedInputs.production;
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const productionFileSet = nxJson.namedInputs?.production;
     if (productionFileSet) {
         productionFileSet.push('!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)', '!{projectRoot}/tsconfig.spec.json', '!{projectRoot}/src/test-setup.[jt]s');
         nxJson.namedInputs.production = Array.from(new Set(productionFileSet));
     }
-    const hasPlugin = (_nxJson_plugins = nxJson.plugins) == null ? void 0 : _nxJson_plugins.some((p)=>typeof p === 'string' ? p === '@nx/vite/plugin' : p.plugin === '@nx/vite/plugin');
+    const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
+        ? p === '@nx/vite/plugin'
+        : p.plugin === '@nx/vite/plugin');
     if (!hasPlugin) {
-        var _nxJson, _nxJson_targetDefaults, _nxvitetest, _nxJson_targetDefaults_nxvitetest, _nxJson_targetDefaults_nxvitetest1;
-        var _targetDefaults;
-        (_targetDefaults = (_nxJson = nxJson).targetDefaults) != null ? _targetDefaults : _nxJson.targetDefaults = {};
-        var _;
-        (_ = (_nxJson_targetDefaults = nxJson.targetDefaults)[_nxvitetest = '@nx/vite:test']) != null ? _ : _nxJson_targetDefaults[_nxvitetest] = {};
-        var _cache;
-        (_cache = (_nxJson_targetDefaults_nxvitetest = nxJson.targetDefaults['@nx/vite:test']).cache) != null ? _cache : _nxJson_targetDefaults_nxvitetest.cache = true;
-        var _inputs;
-        (_inputs = (_nxJson_targetDefaults_nxvitetest1 = nxJson.targetDefaults['@nx/vite:test']).inputs) != null ? _inputs : _nxJson_targetDefaults_nxvitetest1.inputs = [
+        nxJson.targetDefaults ??= {};
+        nxJson.targetDefaults['@nx/vite:test'] ??= {};
+        nxJson.targetDefaults['@nx/vite:test'].cache ??= true;
+        nxJson.targetDefaults['@nx/vite:test'].inputs ??= [
             'default',
-            productionFileSet ? '^production' : '^default'
+            productionFileSet ? '^production' : '^default',
         ];
     }
-    (0, _devkit.updateNxJson)(tree, nxJson);
+    (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function initGenerator(tree, schema) {
-    return initGeneratorInternal(tree, _extends._({
-        addPlugin: false
-    }, schema));
+    return initGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function initGeneratorInternal(tree, schema) {
-    var _schema;
-    const nxJson = (0, _devkit.readNxJson)(tree);
-    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' && nxJson.useInferencePlugins !== false;
-    var _addPlugin;
-    (_addPlugin = (_schema = schema).addPlugin) != null ? _addPlugin : _schema.addPlugin = addPluginDefault;
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        await (0, _addplugin.addPlugin)(tree, await (0, _devkit.createProjectGraphAsync)(), '@nx/vite/plugin', _plugin.createNodesV2, {
-            buildTargetName: [
-                'build',
-                'vite:build',
-                'vite-build'
-            ],
-            testTargetName: [
-                'test',
-                'vite:test',
-                'vite-test'
-            ],
-            serveTargetName: [
-                'serve',
-                'vite:serve',
-                'vite-serve'
-            ],
-            devTargetName: [
-                'dev',
-                'vite:dev',
-                'vite-dev'
-            ],
-            previewTargetName: [
-                'preview',
-                'vite:preview',
-                'vite-preview'
-            ],
+        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/vite/plugin', plugin_1.createNodesV2, {
+            buildTargetName: ['build', 'vite:build', 'vite-build'],
+            testTargetName: ['test', 'vite:test', 'vite-test'],
+            serveTargetName: ['serve', 'vite:serve', 'vite-serve'],
+            devTargetName: ['dev', 'vite:dev', 'vite-dev'],
+            previewTargetName: ['preview', 'vite:preview', 'vite-preview'],
             serveStaticTargetName: [
                 'serve-static',
                 'vite:serve-static',
-                'vite-serve-static'
-            ],
-            typecheckTargetName: [
-                'typecheck',
-                'vite:typecheck',
-                'vite-typecheck'
+                'vite-serve-static',
             ],
+            typecheckTargetName: ['typecheck', 'vite:typecheck', 'vite-typecheck'],
             buildDepsTargetName: [
                 'build-deps',
                 'vite:build-deps',
-                'vite-build-deps'
+                'vite-build-deps',
             ],
             watchDepsTargetName: [
                 'watch-deps',
                 'vite:watch-deps',
-                'vite-watch-deps'
-            ]
+                'vite-watch-deps',
+            ],
         }, schema.updatePackageScripts);
     }
     updateNxJsonSettings(tree);
-    await (0, _ignorevitetempfiles.ignoreViteTempFiles)(tree, schema.projectRoot);
+    await (0, ignore_vite_temp_files_1.ignoreViteTempFiles)(tree, schema.projectRoot);
     if (schema.setupPathsPlugin) {
-        await (0, _setuppathsplugin.setupPathsPlugin)(tree, {
-            skipFormat: true
-        });
+        await (0, setup_paths_plugin_1.setupPathsPlugin)(tree, { skipFormat: true });
     }
     const tasks = [];
     if (!schema.skipPackageJson) {
-        tasks.push((0, _utils.moveToDevDependencies)(tree));
-        tasks.push(await (0, _utils.checkDependenciesInstalled)(tree, schema));
+        tasks.push((0, utils_1.moveToDevDependencies)(tree));
+        tasks.push(await (0, utils_1.checkDependenciesInstalled)(tree, schema));
     }
     if (!schema.skipFormat) {
-        await (0, _devkit.formatFiles)(tree);
+        await (0, devkit_1.formatFiles)(tree);
     }
-    return (0, _devkit.runTasksInSerial)(...tasks);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-const _default = initGenerator;
-
-//# sourceMappingURL=init.js.map
+exports.default = initGenerator;

package/src/generators/init/lib/utils.d.ts

@@ -3,3 +3,4 @@ import { InitGeneratorSchema } from '../schema';
 export declare function checkDependenciesInstalled(host: Tree, schema: InitGeneratorSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export declare function moveToDevDependencies(tree: Tree): () => void;
 export declare function createVitestConfig(tree: Tree): void;
+//# sourceMappingURL=utils.d.ts.map

package/src/generators/init/lib/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/init/lib/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,IAAI,EAGL,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAGhD,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,mDAiB5B;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,IAAI,cAgB/C;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,QAc5C"}

package/src/generators/init/lib/utils.js

@@ -1,58 +1,43 @@
 "use strict";
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    checkDependenciesInstalled: function() {
-        return checkDependenciesInstalled;
-    },
-    createVitestConfig: function() {
-        return createVitestConfig;
-    },
-    moveToDevDependencies: function() {
-        return moveToDevDependencies;
-    }
-});
-const _devkit = require("@nx/devkit");
-const _versions = require("../../../utils/versions");
-const _versionutils = require("../../../utils/version-utils");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkDependenciesInstalled = checkDependenciesInstalled;
+exports.moveToDevDependencies = moveToDevDependencies;
+exports.createVitestConfig = createVitestConfig;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../../utils/versions");
+const version_utils_1 = require("../../../utils/version-utils");
 async function checkDependenciesInstalled(host, schema) {
-    const { vitest } = await (0, _versionutils.getVitestDependenciesVersionsToInstall)(host);
-    return (0, _devkit.addDependenciesToPackageJson)(host, {}, {
-        '@nx/vite': _versions.nxVersion,
-        '@nx/web': _versions.nxVersion,
-        vite: schema.useViteV5 ? _versions.viteV5Version : _versions.viteVersion,
+    const { vitest } = await (0, version_utils_1.getVitestDependenciesVersionsToInstall)(host);
+    return (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
+        '@nx/vite': versions_1.nxVersion,
+        '@nx/web': versions_1.nxVersion,
+        vite: schema.useViteV5 ? versions_1.viteV5Version : versions_1.viteVersion,
         vitest: vitest,
         '@vitest/ui': vitest,
-        jiti: _versions.jitiVersion
+        jiti: versions_1.jitiVersion,
     }, undefined, schema.keepExistingVersions);
 }
 function moveToDevDependencies(tree) {
     let wasUpdated = false;
-    (0, _devkit.updateJson)(tree, 'package.json', (packageJson)=>{
+    (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
         packageJson.dependencies = packageJson.dependencies || {};
         packageJson.devDependencies = packageJson.devDependencies || {};
         if (packageJson.dependencies['@nx/vite']) {
-            packageJson.devDependencies['@nx/vite'] = packageJson.dependencies['@nx/vite'];
+            packageJson.devDependencies['@nx/vite'] =
+                packageJson.dependencies['@nx/vite'];
             delete packageJson.dependencies['@nx/vite'];
             wasUpdated = true;
         }
         return packageJson;
     });
-    return wasUpdated ? ()=>(0, _devkit.installPackagesTask)(tree) : ()=>{};
+    return wasUpdated ? () => (0, devkit_1.installPackagesTask)(tree) : () => { };
 }
 function createVitestConfig(tree) {
-    var _nxJson_namedInputs;
-    const nxJson = (0, _devkit.readNxJson)(tree);
-    const productionFileSet = (_nxJson_namedInputs = nxJson.namedInputs) == null ? void 0 : _nxJson_namedInputs.production;
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const productionFileSet = nxJson.namedInputs?.production;
     if (productionFileSet) {
         productionFileSet.push('!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)', '!{projectRoot}/tsconfig.spec.json');
         nxJson.namedInputs.production = Array.from(new Set(productionFileSet));
     }
-    (0, _devkit.updateNxJson)(tree, nxJson);
+    (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-
-//# sourceMappingURL=utils.js.map

package/src/generators/setup-paths-plugin/lib/utils.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=utils.d.ts.map

package/src/generators/setup-paths-plugin/lib/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vite/src/generators/setup-paths-plugin/lib/utils.ts"],"names":[],"mappings":""}

package/src/generators/setup-paths-plugin/lib/utils.js

@@ -1,3 +0,0 @@
-"use strict";
-
-//# sourceMappingURL=utils.js.map

package/src/generators/setup-paths-plugin/setup-paths-plugin.d.ts

@@ -3,3 +3,4 @@ export declare function setupPathsPlugin(tree: Tree, schema: {
     skipFormat?: boolean;
 }): Promise<void>;
 export default setupPathsPlugin;
+//# sourceMappingURL=setup-paths-plugin.d.ts.map

package/src/generators/setup-paths-plugin/setup-paths-plugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-paths-plugin.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/setup-paths-plugin/setup-paths-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAA;CAAE,iBAcjC;AAqID,eAAe,gBAAgB,CAAC"}

package/src/generators/setup-paths-plugin/setup-paths-plugin.js

@@ -1,29 +1,17 @@
 "use strict";
-function _export(target, all) {
-    for(var name in all)Object.defineProperty(target, name, {
-        enumerable: true,
-        get: all[name]
-    });
-}
-_export(exports, {
-    default: function() {
-        return _default;
-    },
-    setupPathsPlugin: function() {
-        return setupPathsPlugin;
-    }
-});
-const _devkit = require("@nx/devkit");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupPathsPlugin = setupPathsPlugin;
+const devkit_1 = require("@nx/devkit");
 async function setupPathsPlugin(tree, schema) {
-    const files = await (0, _devkit.globAsync)(tree, [
-        '**/vite.config.{js,ts,mjs,mts,cjs,cts}'
+    const files = await (0, devkit_1.globAsync)(tree, [
+        '**/vite.config.{js,ts,mjs,mts,cjs,cts}',
     ]);
-    for (const file of files){
+    for (const file of files) {
         ensureImportExists(tree, file);
         ensurePluginAdded(tree, file);
     }
     if (!schema.skipFormat) {
-        await (0, _devkit.formatFiles)(tree);
+        await (0, devkit_1.formatFiles)(tree);
     }
 }
 function ensureImportExists(tree, file) {
@@ -36,29 +24,31 @@ function ensureImportExists(tree, file) {
     }
     if (allImports.length) {
         const lastImport = allImports[allImports.length - 1];
-        tree.write(file, (0, _devkit.applyChangesToString)(content, [
+        tree.write(file, (0, devkit_1.applyChangesToString)(content, [
             {
-                type: _devkit.ChangeType.Insert,
+                type: devkit_1.ChangeType.Insert,
                 index: lastImport.end + 1,
-                text: `import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\n`
-            }
+                text: `import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\n`,
+            },
         ]));
-    } else {
+    }
+    else {
         if (file.endsWith('.cts') || file.endsWith('.cjs')) {
-            tree.write(file, (0, _devkit.applyChangesToString)(content, [
+            tree.write(file, (0, devkit_1.applyChangesToString)(content, [
                 {
-                    type: _devkit.ChangeType.Insert,
+                    type: devkit_1.ChangeType.Insert,
                     index: 0,
-                    text: `const { nxViteTsPaths } = require('@nx/vite/plugins/nx-tsconfig-paths.plugin');\n`
-                }
+                    text: `const { nxViteTsPaths } = require('@nx/vite/plugins/nx-tsconfig-paths.plugin');\n`,
+                },
             ]));
-        } else {
-            tree.write(file, (0, _devkit.applyChangesToString)(content, [
+        }
+        else {
+            tree.write(file, (0, devkit_1.applyChangesToString)(content, [
                 {
-                    type: _devkit.ChangeType.Insert,
+                    type: devkit_1.ChangeType.Insert,
                     index: 0,
-                    text: `import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\n`
-                }
+                    text: `import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';\n`,
+                },
             ]));
         }
     }
@@ -68,48 +58,49 @@ function ensurePluginAdded(tree, file) {
     const content = tree.read(file, 'utf-8');
     const ast = tsquery.ast(content);
     const foundDefineConfig = tsquery.query(ast, 'CallExpression:has(Identifier[name="defineConfig"])');
-    if (!foundDefineConfig.length) return content;
+    if (!foundDefineConfig.length)
+        return content;
     // Do not update defineConfig if it has an arrow function since it can be tricky and error-prone.
     const defineUsingArrowFunction = tsquery.query(foundDefineConfig[0], 'ArrowFunction');
-    if (defineUsingArrowFunction.length) return content;
+    if (defineUsingArrowFunction.length)
+        return content;
     const propertyAssignments = tsquery.query(foundDefineConfig[0], 'PropertyAssignment');
     if (propertyAssignments.length) {
         const pluginsNode = tsquery.query(foundDefineConfig[0], 'PropertyAssignment:has(Identifier[name="plugins"])');
         if (pluginsNode.length) {
-            const updated = tsquery.replace(content, 'PropertyAssignment:has(Identifier[name="plugins"])', (node)=>{
+            const updated = tsquery.replace(content, 'PropertyAssignment:has(Identifier[name="plugins"])', (node) => {
                 const found = tsquery.query(node, 'ArrayLiteralExpression');
                 let updatedPluginsString = '';
-                var _found__elements;
-                const existingPluginNodes = (_found__elements = found == null ? void 0 : found[0].elements) != null ? _found__elements : [];
-                for (const plugin of existingPluginNodes){
+                const existingPluginNodes = found?.[0].elements ?? [];
+                for (const plugin of existingPluginNodes) {
                     updatedPluginsString += `${plugin.getText()},`;
                 }
-                if (!(existingPluginNodes == null ? void 0 : existingPluginNodes.some((node)=>node.getText().includes('nxViteTsPaths')))) {
+                if (!existingPluginNodes?.some((node) => node.getText().includes('nxViteTsPaths'))) {
                     updatedPluginsString += ` nxViteTsPaths(),`;
                 }
                 return `plugins: [${updatedPluginsString}]`;
             });
             tree.write(file, updated);
-        } else {
-            tree.write(file, (0, _devkit.applyChangesToString)(content, [
+        }
+        else {
+            tree.write(file, (0, devkit_1.applyChangesToString)(content, [
                 {
-                    type: _devkit.ChangeType.Insert,
+                    type: devkit_1.ChangeType.Insert,
                     index: propertyAssignments[0].getStart(),
                     text: `plugins: [nxViteTsPaths()],
-            `
-                }
+            `,
+                },
             ]));
         }
-    } else {
-        tree.write(file, (0, _devkit.applyChangesToString)(content, [
+    }
+    else {
+        tree.write(file, (0, devkit_1.applyChangesToString)(content, [
             {
-                type: _devkit.ChangeType.Insert,
-                index: foundDefineConfig[0].getStart() + 14,
-                text: `plugins: [nxViteTsPaths()],`
-            }
+                type: devkit_1.ChangeType.Insert,
+                index: foundDefineConfig[0].getStart() + 14, // length of "defineConfig(" + 1
+                text: `plugins: [nxViteTsPaths()],`,
+            },
         ]));
     }
 }
-const _default = setupPathsPlugin;
-
-//# sourceMappingURL=setup-paths-plugin.js.map
+exports.default = setupPathsPlugin;

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

@@ -6,3 +6,4 @@ import { VitestGeneratorSchema } from './schema';
 export declare function vitestGenerator(tree: Tree, schema: VitestGeneratorSchema, hasPlugin?: boolean): Promise<GeneratorCallback>;
 export declare function vitestGeneratorInternal(tree: Tree, schema: VitestGeneratorSchema, hasPlugin?: boolean): Promise<GeneratorCallback>;
 export default vitestGenerator;
+//# sourceMappingURL=vitest-generator.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"vitest-generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/vite/src/generators/vitest/vitest-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EASjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAKjD;;GAEG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAOlB;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,qBAAqB,EAC7B,SAAS,UAAQ,8BAoLlB;AA0LD,eAAe,eAAe,CAAC"}