@nx/js 23.2.0-beta.7 → 23.2.0-beta.8

package/dist/src/executors/copy-workspace-modules/copy-workspace-modules.js

@@ -6,7 +6,6 @@ const internal_1 = require("@nx/devkit/internal");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const fs_1 = require("fs");
-const internal_2 = require("@nx/devkit/internal");
 const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
 async function copyWorkspaceModules(schema, context) {
     devkit_1.logger.log('Copying Workspace Modules to Build Directory...');
@@ -21,7 +20,7 @@ function handleWorkspaceModules(outputDirectory, packageJson, projectGraph) {
     if (!packageJson.dependencies) {
         return;
     }
-    const workspaceModules = (0, internal_2.getWorkspacePackagesFromGraph)(projectGraph);
+    const workspaceModules = (0, internal_1.getWorkspacePackagesFromGraph)(projectGraph);
     const processedModules = new Set();
     const workspaceModulesDir = (0, path_1.join)(outputDirectory, 'workspace_modules');
     function calculateRelativePath(fromPkgName, toPkgName) {

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

@@ -6,16 +6,12 @@ const internal_1 = require("@nx/devkit/internal");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 const devkit_1 = require("@nx/devkit");
-const internal_2 = require("@nx/devkit/internal");
 const crypto_1 = require("crypto");
 const path = tslib_1.__importStar(require("path"));
 const path_1 = require("path");
 const buildable_libs_utils_1 = require("../../utils/buildable-libs-utils");
-const internal_3 = require("@nx/devkit/internal");
 const line_aware_writer_1 = require("./lib/line-aware-writer");
 const coalescing_debounce_1 = require("./lib/coalescing-debounce");
-const internal_4 = require("@nx/devkit/internal");
-const internal_5 = require("@nx/devkit/internal");
 const detect_module_format_1 = require("./lib/detect-module-format");
 const output_file_1 = require("./lib/output-file");
 const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
@@ -175,7 +171,7 @@ async function* nodeExecutor(options, context) {
                         // Windows cannot deliver graceful signals through this API, so
                         // skip the grace period and force-kill immediately (matching the
                         // previous taskkill /F behavior).
-                        await (0, internal_3.killProcessTreeGraceful)(task.childProcess.pid, signal, process.platform === 'win32' ? 0 : undefined);
+                        await (0, internal_1.killProcessTreeGraceful)(task.childProcess.pid, signal, process.platform === 'win32' ? 0 : undefined);
                     }
                     if (task.id === globalLineAwareWriter.currentProcessId) {
                         globalLineAwareWriter.setActiveProcess(null);
@@ -237,7 +233,7 @@ async function* nodeExecutor(options, context) {
                 await debouncedProcessQueue.trigger();
             };
             if ((0, devkit_1.isDaemonEnabled)()) {
-                additionalExitHandler = await internal_2.daemonClient.registerFileWatcher({
+                additionalExitHandler = await internal_1.daemonClient.registerFileWatcher({
                     watchProjects: [context.projectName],
                     includeDependencies: true,
                 }, async (err, data) => {
@@ -279,9 +275,12 @@ async function* nodeExecutor(options, context) {
             }, context);
             while (true) {
                 const event = await output.next();
+                if (event.done) {
+                    break;
+                }
                 await addToQueue(null, Promise.resolve(event.value));
                 await debouncedProcessQueue.trigger();
-                if (event.done && !options.watch) {
+                if (!options.watch) {
                     break;
                 }
             }
@@ -337,7 +336,7 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
         // {workspaceRoot}/dist/{projectRoot} -> dist/my-app
         const outputPath = project.data.targets[buildOptions.target]?.outputs?.[0];
         if (outputPath) {
-            const outputFilePath = (0, internal_5.interpolate)(outputPath, {
+            const outputFilePath = (0, internal_1.interpolate)(outputPath, {
                 projectName: project.name,
                 projectRoot: project.data.root,
                 workspaceRoot: context.root,
@@ -366,12 +365,12 @@ function getFileToRun(context, project, buildOptions, buildTargetExecutor) {
     return (0, path_1.join)(context.root, buildOptions.outputPath, outputFileName);
 }
 function fileToRunCorrectPath(fileToRun) {
-    if ((0, internal_4.fileExists)(fileToRun))
+    if ((0, internal_1.fileExists)(fileToRun))
         return fileToRun;
     const extensionsToTry = ['.cjs', '.mjs', '.cjs.js', '.esm.js'];
     for (const ext of extensionsToTry) {
         const file = fileToRun.replace(/\.js$/, ext);
-        if ((0, internal_4.fileExists)(file))
+        if ((0, internal_1.fileExists)(file))
             return file;
     }
     throw new Error(`Could not find ${fileToRun}. Make sure your build succeeded.`);

package/dist/src/executors/prune-lockfile/prune-lockfile.js

@@ -6,9 +6,6 @@ const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
-const internal_2 = require("@nx/devkit/internal");
-const internal_3 = require("@nx/devkit/internal");
-const internal_4 = require("@nx/devkit/internal");
 const strip_glob_to_base_dir_1 = require("../../utils/strip-glob-to-base-dir");
 async function pruneLockfileExecutor(schema, context) {
     devkit_1.logger.log('Pruning lockfile...');
@@ -33,9 +30,9 @@ async function pruneLockfileExecutor(schema, context) {
 }
 function createPrunedLockfile(packageJson, graph) {
     const packageManager = (0, devkit_1.detectPackageManager)(devkit_1.workspaceRoot);
-    const lockfileName = (0, internal_3.getLockFileName)(packageManager);
-    const lockFile = (0, internal_3.createLockFile)(packageJson, graph, packageManager);
-    const workspacePackages = (0, internal_4.getWorkspacePackagesFromGraph)(graph);
+    const lockfileName = (0, internal_1.getLockFileName)(packageManager);
+    const lockFile = (0, internal_1.createLockFile)(packageJson, graph, packageManager);
+    const workspacePackages = (0, internal_1.getWorkspacePackagesFromGraph)(graph);
     for (const [pkgName, pkgVersion] of Object.entries(packageJson.dependencies ?? {})) {
         if (pkgVersion.startsWith('workspace:') ||
             pkgVersion.startsWith('file:') ||
@@ -125,7 +122,7 @@ function getOutputDir(schema, context) {
     if (!maybeOutputPath) {
         throw new Error(`Could not infer an output directory from the '${schema.buildTarget}' target. Please provide 'outputPath'.`);
     }
-    maybeOutputPath = (0, internal_2.interpolate)(maybeOutputPath, {
+    maybeOutputPath = (0, internal_1.interpolate)(maybeOutputPath, {
         workspaceRoot: devkit_1.workspaceRoot,
         projectRoot: project.root,
         projectName: project.name,

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

@@ -7,7 +7,6 @@ const internal_1 = require("@nx/devkit/internal");
 const child_process_1 = require("child_process");
 const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
 const node_fs_1 = require("node:fs");
-const internal_2 = require("@nx/devkit/internal");
 const path_1 = require("path");
 const semver_1 = require("semver");
 let childProcess;
@@ -68,7 +67,7 @@ async function verdaccioExecutor(options, context) {
     };
 }
 function getVerdaccioBinPath() {
-    const { packageJson, path: packageJsonPath } = (0, internal_2.readModulePackageJson)('verdaccio');
+    const { packageJson, path: packageJsonPath } = (0, internal_1.readModulePackageJson)('verdaccio');
     const bin = typeof packageJson.bin === 'string'
         ? packageJson.bin
         : packageJson.bin['verdaccio'];

package/dist/src/generators/library/library.js

@@ -111,6 +111,8 @@ async function libraryGeneratorInternal(tree, schema) {
             testEnvironment: options.testEnvironment,
             runtimeTsconfigFileName: 'tsconfig.lib.json',
             compiler: options.compiler === 'swc' ? 'swc' : 'babel',
+            passWithNoTests: options.passWithNoTests,
+            skipPackageJson: options.skipPackageJson,
             addPlugin: options.addPlugin,
         });
         tasks.push(vitestTask);
@@ -560,22 +562,20 @@ async function normalizeOptions(tree, options) {
     const hasPlugin = (0, ts_solution_setup_1.isUsingTypeScriptPlugin)(tree);
     const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     if (isUsingTsSolutionConfig) {
-        options.unitTestRunner ??= await (0, internal_1.promptWhenInteractive)({
-            type: 'autocomplete',
-            name: 'unitTestRunner',
-            message: `Which unit test runner would you like to use?`,
-            choices: [{ name: 'none' }, { name: 'vitest' }, { name: 'jest' }],
-            initial: 0,
-        }, { unitTestRunner: 'none' }).then(({ unitTestRunner }) => unitTestRunner);
+        options.unitTestRunner ??= (0, internal_1.isInteractive)()
+            ? await (0, internal_1.selectPrompt)({
+                message: `Which unit test runner would you like to use?`,
+                choices: [{ value: 'none' }, { value: 'vitest' }, { value: 'jest' }],
+            })
+            : 'none';
     }
     else {
-        options.unitTestRunner ??= await (0, internal_1.promptWhenInteractive)({
-            type: 'autocomplete',
-            name: 'unitTestRunner',
-            message: `Which unit test runner would you like to use?`,
-            choices: [{ name: 'jest' }, { name: 'vitest' }, { name: 'none' }],
-            initial: 0,
-        }, { unitTestRunner: undefined }).then(({ unitTestRunner }) => unitTestRunner);
+        options.unitTestRunner ??= (0, internal_1.isInteractive)()
+            ? await (0, internal_1.selectPrompt)({
+                message: `Which unit test runner would you like to use?`,
+                choices: [{ value: 'jest' }, { value: 'vitest' }, { value: 'none' }],
+            })
+            : undefined;
         if (!options.unitTestRunner && options.bundler === 'vite') {
             options.unitTestRunner = 'vitest';
         }

package/dist/src/generators/library/schema.d.ts

@@ -36,6 +36,8 @@ export interface LibraryGeneratorSchema {
   addPlugin?: boolean;
   useProjectJson?: boolean;
   useTscExecutor?: boolean;
+  /** @internal Only honored by the vitest setup. */
+  passWithNoTests?: boolean;
 }
 
 export interface NormalizedLibraryGeneratorOptions

package/dist/src/plugins/typescript/plugin.js

@@ -5,12 +5,7 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const devkit_2 = require("@nx/devkit");
-const internal_2 = require("@nx/devkit/internal");
 const picomatch = require("picomatch");
-const internal_3 = require("@nx/devkit/internal");
-const internal_4 = require("@nx/devkit/internal");
-const internal_5 = require("@nx/devkit/internal");
 const util_1 = require("./util");
 let ts;
 const resolvedTypescriptPaths = {};
@@ -20,12 +15,12 @@ function resolveTypescriptPath(projectRoot, workspaceRoot) {
     // path is outside the workspace tree (e.g. pnpm's enableGlobalVirtualStore),
     // since typescript is not a declared dep.
     resolvedTypescriptPaths[projectRoot] ??= require.resolve('typescript', {
-        paths: [projectRoot, ...(0, internal_5.getNxRequirePaths)(workspaceRoot), __dirname],
+        paths: [projectRoot, ...(0, internal_1.getNxRequirePaths)(workspaceRoot), __dirname],
     });
     return resolvedTypescriptPaths[projectRoot];
 }
 const TSCONFIG_CACHE_VERSION = 2;
-const TS_CONFIG_CACHE_PATH = (0, node_path_1.join)(internal_4.workspaceDataDirectory, 'tsconfig-files.hash');
+const TS_CONFIG_CACHE_PATH = (0, node_path_1.join)(internal_1.workspaceDataDirectory, 'tsconfig-files.hash');
 // Module-level cache store — each invocation gets a unique Symbol key
 const cacheStore = new Map();
 // Shared tsconfig cache — initialized once per batch, persisted to disk
@@ -117,8 +112,8 @@ const tsConfigGlob = '**/tsconfig*.json';
 exports.createNodesV2 = [
     tsConfigGlob,
     async (configFilePaths, options, context) => {
-        const optionsHash = (0, internal_2.hashObject)(options);
-        const targetsCachePath = (0, node_path_1.join)(internal_4.workspaceDataDirectory, `tsc-${optionsHash}.hash`);
+        const optionsHash = (0, internal_1.hashObject)(options);
+        const targetsCachePath = (0, node_path_1.join)(internal_1.workspaceDataDirectory, `tsc-${optionsHash}.hash`);
         const targetsCache = readFromCache(targetsCachePath);
         // Each invocation gets a unique Symbol key — guaranteed no collisions
         const cacheKey = Symbol('tsc-invocation');
@@ -136,7 +131,7 @@ exports.createNodesV2 = [
         const normalizedOptions = normalizePluginOptions(options);
         const packageManager = (0, devkit_1.detectPackageManager)(context.workspaceRoot);
         const pmc = (0, devkit_1.getPackageManagerCommand)(packageManager);
-        const lockFileName = (0, internal_3.getLockFileName)(packageManager);
+        const lockFileName = (0, internal_1.getLockFileName)(packageManager);
         const { configFilePaths: validConfigFilePaths, hashes, projectRoots, } = await resolveValidConfigFilesAndHashes(configFilePaths, normalizedOptions, optionsHash, context, cache, lockFileName);
         try {
             return await (0, devkit_1.createNodesFromFiles)((configFilePath, options, context, idx) => {
@@ -171,7 +166,7 @@ exports.createNodesV2 = [
 ];
 exports.createNodes = exports.createNodesV2;
 async function resolveValidConfigFilesAndHashes(configFilePaths, options, optionsHash, context, cache, lockFileName) {
-    const lockFileHash = (0, internal_2.hashFile)((0, node_path_1.join)(context.workspaceRoot, lockFileName)) ?? '';
+    const lockFileHash = (0, internal_1.hashFile)((0, node_path_1.join)(context.workspaceRoot, lockFileName)) ?? '';
     const validConfigFilePaths = [];
     const hashes = [];
     const projectRoots = [];
@@ -218,7 +213,7 @@ async function getConfigFileHash(configFilePath, workspaceRoot, project, options
         packageJson = (0, devkit_1.readJsonFile)((0, node_path_1.join)(workspaceRoot, project.root, 'package.json'));
     }
     catch { }
-    return (0, devkit_2.hashArray)([
+    return (0, devkit_1.hashArray)([
         ...[
             fullConfigPath,
             ...extendedConfigFiles.files.sort(),
@@ -228,7 +223,7 @@ async function getConfigFileHash(configFilePath, workspaceRoot, project, options
         ...extendedConfigFiles.packages.sort(),
         lockFileHash,
         optionsHash,
-        ...(packageJson ? [(0, internal_2.hashObject)(packageJson)] : []),
+        ...(packageJson ? [(0, internal_1.hashObject)(packageJson)] : []),
     ]);
 }
 function checkIfConfigFileShouldBeProject(config, cache) {
@@ -956,7 +951,7 @@ function getFileHash(filePath, workspaceRoot, cache) {
     const relativePath = posixRelative(workspaceRoot, filePath);
     if (!cache.fileHashes[relativePath]) {
         const content = readFile(filePath, workspaceRoot, cache);
-        cache.fileHashes[relativePath] = (0, devkit_2.hashArray)([content]);
+        cache.fileHashes[relativePath] = (0, devkit_1.hashArray)([content]);
     }
     return cache.fileHashes[relativePath];
 }

package/dist/src/release/utils/update-lock-file.js

@@ -4,7 +4,6 @@ exports.updateLockFile = updateLockFile;
 const devkit_1 = require("@nx/devkit");
 const child_process_1 = require("child_process");
 const internal_1 = require("@nx/devkit/internal");
-const internal_2 = require("@nx/devkit/internal");
 const semver_1 = require("semver");
 async function updateLockFile(cwd, { dryRun, verbose, options, }) {
     if (options?.skipLockFileUpdate) {
@@ -47,7 +46,7 @@ async function updateLockFile(cwd, { dryRun, verbose, options, }) {
             installArgs = `${installArgs} --ignore-scripts`.trim();
         }
     }
-    const lockFile = (0, internal_2.getLockFileName)(packageManager);
+    const lockFile = (0, internal_1.getLockFileName)(packageManager);
     const command = `${packageManagerCommands.updateLockFile} ${installArgs}`.trim();
     if (verbose) {
         if (dryRun) {

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

@@ -16,30 +16,26 @@ async function normalizeLinterOption(tree, linter) {
     if (detected) {
         return detected;
     }
-    // Nothing to follow, so this is a real choice. `{ linter: 'none' }` is the
-    // non-interactive answer; `none` leads so the interactive default matches it.
-    return await (0, internal_1.promptWhenInteractive)({
-        type: 'autocomplete',
-        name: 'linter',
-        message: `Which linter would you like to use?`,
-        choices: [{ name: 'none' }, { name: 'eslint' }, { name: 'oxlint' }],
-        initial: 0,
-    }, { linter: 'none' }).then(({ linter }) => linter);
+    // Nothing to follow, so this is a real choice. `none` is the non-interactive
+    // answer, and leads the list so the interactive default matches it.
+    return (0, internal_1.isInteractive)()
+        ? (0, internal_1.selectPrompt)({
+            message: `Which linter would you like to use?`,
+            choices: [{ value: 'none' }, { value: 'eslint' }, { value: 'oxlint' }],
+        })
+        : 'none';
 }
 async function normalizeUnitTestRunnerOption(tree, unitTestRunner, testRunners = ['jest', 'vitest']) {
     if (unitTestRunner) {
         return unitTestRunner;
     }
     const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
-    const choices = isTsSolutionSetup
-        ? [{ name: 'none' }, ...testRunners.map((runner) => ({ name: runner }))]
-        : [...testRunners.map((runner) => ({ name: runner })), { name: 'none' }];
+    const choices = (isTsSolutionSetup ? ['none', ...testRunners] : [...testRunners, 'none']).map((value) => ({ value: value }));
     const defaultValue = (isTsSolutionSetup ? 'none' : testRunners[0]);
-    return await (0, internal_1.promptWhenInteractive)({
-        type: 'autocomplete',
-        name: 'unitTestRunner',
-        message: `Which unit test runner would you like to use?`,
-        choices,
-        initial: 0,
-    }, { unitTestRunner: defaultValue }).then(({ unitTestRunner }) => unitTestRunner);
+    return (0, internal_1.isInteractive)()
+        ? (0, internal_1.selectPrompt)({
+            message: `Which unit test runner would you like to use?`,
+            choices,
+        })
+        : defaultValue;
 }

package/dist/src/utils/package-json/update-package-json.js

@@ -5,21 +5,18 @@ exports.getExports = getExports;
 exports.getUpdatedPackageJsonContent = getUpdatedPackageJsonContent;
 exports.getOutputDir = getOutputDir;
 const internal_1 = require("@nx/devkit/internal");
-const internal_2 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
-const internal_3 = require("@nx/devkit/internal");
-const internal_4 = require("@nx/devkit/internal");
 const get_main_file_dir_1 = require("../get-main-file-dir");
 const strip_glob_to_base_dir_1 = require("../strip-glob-to-base-dir");
 function updatePackageJson(options, context, target, dependencies, fileMap = null) {
     let packageJson;
     if (fileMap == null) {
-        fileMap = (0, internal_4.readFileMapCache)()?.fileMap?.projectFileMap || {};
+        fileMap = (0, internal_1.readFileMapCache)()?.fileMap?.projectFileMap || {};
     }
     if (options.updateBuildableProjectDepsInPackageJson) {
-        packageJson = (0, internal_2.createPackageJson)(context.projectName, context.projectGraph, {
+        packageJson = (0, internal_1.createPackageJson)(context.projectName, context.projectGraph, {
             target: context.targetName,
             root: context.root,
             // By default we remove devDependencies since this is a production build.
@@ -32,7 +29,7 @@ function updatePackageJson(options, context, target, dependencies, fileMap = nul
     }
     else {
         const pathToPackageJson = (0, path_1.join)(context.root, options.projectRoot, 'package.json');
-        packageJson = (0, internal_3.fileExists)(pathToPackageJson)
+        packageJson = (0, internal_1.fileExists)(pathToPackageJson)
             ? (0, devkit_1.readJsonFile)(pathToPackageJson)
             : { name: context.projectName, version: '0.0.1' };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "23.2.0-beta.7",
+  "version": "23.2.0-beta.8",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -147,18 +147,18 @@
     "source-map-support": "0.5.19",
     "tinyglobby": "^0.2.12",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-beta.7",
-    "@nx/workspace": "23.2.0-beta.7"
+    "@nx/devkit": "23.2.0-beta.8",
+    "@nx/workspace": "23.2.0-beta.8"
   },
   "devDependencies": {
-    "@nx/esbuild": "23.2.0-beta.7",
-    "@nx/jest": "23.2.0-beta.7",
-    "@nx/eslint": "23.2.0-beta.7",
-    "@nx/oxlint": "23.2.0-beta.7",
-    "@nx/rollup": "23.2.0-beta.7",
-    "@nx/vite": "23.2.0-beta.7",
-    "@nx/vitest": "23.2.0-beta.7",
-    "nx": "23.2.0-beta.7"
+    "@nx/esbuild": "23.2.0-beta.8",
+    "@nx/eslint": "23.2.0-beta.8",
+    "@nx/jest": "23.2.0-beta.8",
+    "@nx/oxlint": "23.2.0-beta.8",
+    "@nx/vite": "23.2.0-beta.8",
+    "@nx/rollup": "23.2.0-beta.8",
+    "@nx/vitest": "23.2.0-beta.8",
+    "nx": "23.2.0-beta.8"
   },
   "peerDependencies": {
     "@swc/cli": ">=0.6.0 <0.9.0",