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

package/dist/plugins/nx-vite-build-coordination.plugin.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxViteBuildCoordinationPlugin = nxViteBuildCoordinationPlugin;
-const watch_1 = require("nx/src/command-line/watch/watch");
 const child_process_1 = require("child_process");
-const client_1 = require("nx/src/daemon/client/client");
-const output_1 = require("nx/src/utils/output");
+const internal_1 = require("@nx/devkit/internal");
+const devkit_1 = require("@nx/devkit");
 function nxViteBuildCoordinationPlugin(options) {
     let activeBuildProcess;
     let unregisterFileWatcher;
@@ -40,13 +39,13 @@ function nxViteBuildCoordinationPlugin(options) {
     function createFileWatcher() {
         // Failed rebuilds in watch mode should not crash the dev server. Log and
         // keep watching so the next file change can rebuild.
-        const runner = new watch_1.BatchFunctionRunner(() => buildChangedProjects().catch((error) => {
-            output_1.output.error({
+        const runner = new internal_1.BatchFunctionRunner(() => buildChangedProjects().catch((error) => {
+            devkit_1.output.error({
                 title: 'Failed to rebuild projects. Fix the errors and save again.',
                 bodyLines: error?.message ? [error.message] : undefined,
             });
         }));
-        return client_1.daemonClient.registerFileWatcher({ watchProjects: 'all' }, (err, data) => {
+        return internal_1.daemonClient.registerFileWatcher({ watchProjects: 'all' }, (err, data) => {
             if (err === 'reconnecting') {
                 // Silent - daemon restarts automatically on lockfile changes
                 return;
@@ -56,13 +55,13 @@ function nxViteBuildCoordinationPlugin(options) {
                 return;
             }
             else if (err === 'closed') {
-                output_1.output.error({
+                devkit_1.output.error({
                     title: `Failed to reconnect to daemon after multiple attempts`,
                 });
                 process.exit(1);
             }
             else if (err) {
-                output_1.output.error({
+                devkit_1.output.error({
                     title: `Watch error: ${err?.message ?? 'Unknown'}`,
                 });
             }
@@ -83,13 +82,13 @@ function nxViteBuildCoordinationPlugin(options) {
             if (firstBuildStart) {
                 firstBuildStart = false;
                 await buildChangedProjects();
-                if (client_1.daemonClient.enabled()) {
+                if (internal_1.daemonClient.enabled()) {
                     unregisterFileWatcher = await createFileWatcher();
                     process.on('exit', () => unregisterFileWatcher());
                     process.on('SIGINT', () => process.exit());
                 }
                 else {
-                    output_1.output.warn({
+                    devkit_1.output.warn({
                         title: 'Nx Daemon is not enabled. Projects will not be rebuilt when files change.',
                     });
                 }

package/dist/src/executors/build/build.impl.js

@@ -93,17 +93,13 @@ async function* viteBuildExecutor(options, context) {
                 skipPackageManager: options.skipPackageManager,
             });
             builtPackageJson.type ??= 'module';
-            (0, devkit_1.writeJsonFile)(`${outDirRelativeToWorkspaceRoot}/package.json`, builtPackageJson);
             const packageManager = (0, devkit_1.detectPackageManager)(context.root);
-            if (packageManager === 'bun') {
-                devkit_1.logger.warn('Bun lockfile generation is not supported. The generated package.json will not include a lockfile. Run "bun install" in the output directory after deployment if needed.');
-            }
-            else {
-                const lockFile = (0, js_1.createLockFile)(builtPackageJson, context.projectGraph, packageManager);
-                (0, fs_1.writeFileSync)(`${outDirRelativeToWorkspaceRoot}/${(0, js_1.getLockFileName)(packageManager)}`, lockFile, {
-                    encoding: 'utf-8',
-                });
-            }
+            (0, js_1.generatePrunedDeployOutput)(builtPackageJson, context.projectGraph, projectRoot, {
+                outputDirectory: outDirRelativeToWorkspaceRoot,
+                packageManager,
+                workspaceRoot: context.root,
+            });
+            (0, devkit_1.writeJsonFile)(`${outDirRelativeToWorkspaceRoot}/package.json`, builtPackageJson);
         }
         // For buildable libs, copy package.json if it exists.
         else if (options.generatePackageJson !== false &&

package/dist/src/executors/dev-server/dev-server.impl.js

@@ -117,9 +117,13 @@ async function getServerExtraArgs(options, configuration, buildOptionsFromBuildT
         }
     }
     if (configuration) {
+        const normalizeWatchOption = (watch) => {
+            return watch === false ? undefined : watch;
+        };
         serverOptions = {
             ...serverOptions,
-            watch: buildOptionsFromBuildTarget?.watch ?? serverOptions?.watch,
+            watch: normalizeWatchOption(buildOptionsFromBuildTarget?.watch) ??
+                normalizeWatchOption(serverOptions?.watch),
         };
         otherOptions = {
             ...otherOptions,

package/dist/src/plugins/plugin.js

@@ -7,8 +7,6 @@ const js_1 = require("@nx/js");
 const internal_2 = require("@nx/js/internal");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const file_hasher_1 = require("nx/src/hasher/file-hasher");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
 const executor_utils_1 = require("../utils/executor-utils");
 const picomatch = require("picomatch");
 /**
@@ -22,9 +20,9 @@ const viteConfigGlob = '**/vite.config.{js,ts,mjs,mts,cjs,cts}';
 exports.createNodes = [
     viteConfigGlob,
     async (configFilePaths, options, context) => {
-        const optionsHash = (0, file_hasher_1.hashObject)(options);
+        const optionsHash = (0, internal_1.hashObject)(options);
         const normalizedOptions = normalizeOptions(options);
-        const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `vite-${optionsHash}.hash`);
+        const cachePath = (0, node_path_1.join)(internal_1.workspaceDataDirectory, `vite-${optionsHash}.hash`);
         const targetsCache = new internal_1.PluginCache(cachePath);
         const isUsingTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();
         const { roots: projectRoots, configFiles: validConfigFiles } = configFilePaths.reduce((acc, configFile) => {

package/dist/src/utils/generator-utils.js

@@ -413,13 +413,9 @@ async function handleUnsupportedUserProvidedTargetsErrors(userProvidedTargetName
      Please note that converting a potentially non-compatible project to use Vite may result in unexpected behavior. Always commit
      your changes before converting a project to use Vite, and test the converted project thoroughly before deploying it.
     `);
-    const { Confirm } = require('enquirer');
-    const prompt = new Confirm({
-        name: 'question',
+    const shouldConvert = await (0, internal_1.confirmationPrompt)({
         message: `Should we convert the ${validFoundTargetName} target to use the @nx/vite:${executor} executor?`,
-        initial: true,
     });
-    const shouldConvert = await prompt.run();
     if (!shouldConvert) {
         throw new Error(`The ${target} target ${userProvidedTargetName} cannot be converted to use the @nx/vite:${executor} executor.
       Please try again, either by providing a different ${target} target or by not providing a target at all (Nx will
@@ -441,13 +437,9 @@ async function handleUnknownConfiguration(projectName) {
       If you still want to convert your project to use Vite,
       please make sure to commit your changes before running this generator.
       `);
-    const { Confirm } = require('enquirer');
-    const prompt = new Confirm({
-        name: 'question',
+    const shouldConvert = await (0, internal_1.confirmationPrompt)({
         message: `Should Nx convert your project to use Vite?`,
-        initial: true,
     });
-    const shouldConvert = await prompt.run();
     if (!shouldConvert) {
         throw new Error(`
       Nx could not verify that your project can be converted to use Vite.

package/dist/src/utils/ignore-vite-temp-files.d.ts

@@ -1,4 +1,3 @@
 import { type Tree } from '@nx/devkit';
 export declare function ignoreViteTempFiles(tree: Tree, projectRoot?: string | undefined): Promise<void>;
 export declare function addViteTempFilesToGitIgnore(tree: Tree): void;
-export declare function isEslintInstalled(tree: Tree): boolean;

package/dist/src/utils/ignore-vite-temp-files.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ignoreViteTempFiles = ignoreViteTempFiles;
 exports.addViteTempFilesToGitIgnore = addViteTempFilesToGitIgnore;
-exports.isEslintInstalled = isEslintInstalled;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/js/internal");
 const versions_1 = require("./versions");
 async function ignoreViteTempFiles(tree, projectRoot) {
     addViteTempFilesToGitIgnore(tree);
@@ -20,7 +20,9 @@ function addViteTempFilesToGitIgnore(tree) {
     tree.write('.gitignore', gitIgnoreContents);
 }
 async function ignoreViteTempFilesInEslintConfig(tree, projectRoot) {
-    if (!isEslintInstalled(tree)) {
+    // Checked before `ensurePackage` so an Oxlint workspace does not install
+    // `@nx/eslint` only for `isEslintConfigSupported` to send it straight back.
+    if (!(0, internal_1.detectLinters)(tree).includes('eslint')) {
         return;
     }
     (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
@@ -45,15 +47,3 @@ async function ignoreViteTempFilesInEslintConfig(tree, projectRoot) {
     const directory = isUsingFlatConfig ? '' : (projectRoot ?? '');
     addIgnoresToLintConfig(tree, directory, ['**/vite.config.*.timestamp*']);
 }
-function isEslintInstalled(tree) {
-    try {
-        require('eslint');
-        return true;
-    }
-    catch { }
-    // it might not be installed yet, but it might be in the tree pending install
-    const { devDependencies, dependencies } = tree.exists('package.json')
-        ? (0, devkit_1.readJson)(tree, 'package.json')
-        : {};
-    return !!devDependencies?.['eslint'] || !!dependencies?.['eslint'];
-}

package/dist/src/utils/version-utils.d.ts

@@ -1,3 +1,3 @@
-import type { Tree } from 'nx/src/generators/tree';
+import { type Tree } from '@nx/devkit';
 export declare function getInstalledViteVersion(tree: Tree): string | undefined;
 export declare function getInstalledViteMajorVersion(tree: Tree): 5 | 6 | 7 | 8 | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "23.2.0-beta.0",
+  "version": "23.2.0-beta.10",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -95,19 +95,18 @@
   },
   "dependencies": {
     "@phenomnomnominal/tsquery": "~6.2.0",
-    "enquirer": "~2.3.6",
     "picomatch": "4.0.4",
     "tsconfig-paths": "^4.1.2",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "ajv": "^8.0.0",
-    "@nx/devkit": "23.2.0-beta.0",
-    "@nx/js": "23.2.0-beta.0",
-    "@nx/vitest": "23.2.0-beta.0"
+    "@nx/devkit": "23.2.0-beta.10",
+    "@nx/js": "23.2.0-beta.10",
+    "@nx/vitest": "23.2.0-beta.10"
   },
   "devDependencies": {
-    "@nx/eslint": "23.2.0-beta.0",
-    "nx": "23.2.0-beta.0"
+    "@nx/eslint": "23.2.0-beta.10",
+    "nx": "23.2.0-beta.10"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"