@nx/js 24.0.0-rc.0 → 24.0.0-rc.1

package/dist/src/plugins/scripts/create-script-nodes.d.ts

@@ -1,7 +1,7 @@
 import { type CreateNodes, type TargetConfiguration } from '@nx/devkit';
 import { type Shebang } from './shebang';
 export interface ScriptPluginOptions {
-    /** Runs claimed scripts in watch mode as continuous targets. */
+    /** Runs claimed scripts in watch mode as continuous targets. Defaults to `true`. */
     watch?: boolean;
 }
 export interface ScriptPluginDefinition<T extends ScriptPluginOptions> {

package/dist/src/plugins/scripts/create-script-nodes.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createScriptNodes = createScriptNodes;
 exports.quoteShellArg = quoteShellArg;
+const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const node_path_1 = require("node:path");
 const shebang_1 = require("./shebang");
 const target_name_1 = require("./target-name");
-const SCRIPT_GLOB = '**/*.{js,cjs,mjs,ts,cts,mts}';
+/** Specs, tests, stories and typings are never scripts. */
+const SCRIPT_GLOB = '**/!(*.spec|*.test|*.stories|*.d).{js,cjs,mjs,ts,cts,mts}';
 const PROJECT_MARKERS = ['package.json', 'project.json'];
 function createScriptNodes(definition) {
     return [
@@ -15,7 +17,7 @@ function createScriptNodes(definition) {
             ...PROJECT_MARKERS.map((marker) => `**/${marker}`),
         ]),
         async (files, options, context) => {
-            const scriptsByRoot = groupScriptsByProjectRoot(files, !!definition.extraTargets);
+            const scriptsByRoot = groupScriptsByProjectRoot(files, context.workspaceRoot, !!definition.extraTargets);
             const projectRoots = [...scriptsByRoot.keys()];
             if (!projectRoots.length) {
                 return [];
@@ -32,7 +34,7 @@ function createScriptNodes(definition) {
                     if (!cache.has(key)) {
                         cache.set(key, {
                             ...(await definition.extraTargets?.(projectRoot, context.workspaceRoot, options)),
-                            ...createTargets(definition, context.workspaceRoot, projectRoot, scripts, options?.watch === true),
+                            ...createTargets(definition, context.workspaceRoot, projectRoot, scripts, options?.watch !== false),
                         });
                     }
                     const targets = cache.get(key);
@@ -52,18 +54,35 @@ function createScriptNodes(definition) {
     ];
 }
 /**
- * Assigns each script to its nearest enclosing project root. Roots without
- * scripts are kept only when `includeAllRoots` is set.
+ * Assigns each script to its nearest enclosing project root among the
+ * markers the plugin was handed, so `include`/`exclude` scope projects as well
+ * as scripts. Roots without scripts are kept only when `includeAllRoots` is set.
  */
-function groupScriptsByProjectRoot(files, includeAllRoots) {
-    const markers = new Map();
+function groupScriptsByProjectRoot(files, workspaceRoot, includeAllRoots) {
+    const handed = new Map();
     const scripts = [];
     for (const file of files) {
-        if (PROJECT_MARKERS.includes((0, node_path_1.basename)(file))) {
-            markers.set((0, node_path_1.dirname)(file), file);
-        }
-        else {
+        const name = (0, node_path_1.basename)(file);
+        if (!PROJECT_MARKERS.includes(name)) {
             scripts.push(file);
+            continue;
+        }
+        const dir = (0, node_path_1.dirname)(file);
+        const entry = handed.get(dir) ?? {};
+        entry[name === 'project.json' ? 'projectJson' : 'packageJson'] = file;
+        handed.set(dir, entry);
+    }
+    // A package.json is a project root only where core's default package-json
+    // plugin makes one: in the package manager workspaces, or beside a
+    // project.json. The opt-in `nx/plugins/package-json` is not consulted.
+    const inWorkspaces = isInPackageManagerWorkspaces(workspaceRoot);
+    const markers = new Map();
+    for (const [dir, { packageJson, projectJson }] of handed) {
+        if (projectJson) {
+            markers.set(dir, projectJson);
+        }
+        else if (inWorkspaces(packageJson)) {
+            markers.set(dir, packageJson);
         }
     }
     const byRoot = new Map();
@@ -87,21 +106,23 @@ function groupScriptsByProjectRoot(files, includeAllRoots) {
     }
     return byRoot;
 }
+function isInPackageManagerWorkspaces(workspaceRoot) {
+    return (0, internal_1.buildPackageJsonWorkspacesMatcher)((0, internal_1.buildPackageJsonPatterns)(workspaceRoot, (file) => (0, devkit_1.readJsonFile)((0, node_path_1.join)(workspaceRoot, file))));
+}
 function createTargets(definition, workspaceRoot, projectRoot, scripts, watch) {
     const claimed = [];
-    for (const script of scripts) {
-        const header = (0, shebang_1.readScriptHeader)((0, node_path_1.join)(workspaceRoot, script));
-        const shebang = header === null ? null : (0, shebang_1.parseShebang)((0, shebang_1.getShebangLine)(header));
+    for (const { file, header } of (0, internal_1.readShebangHeaders)(workspaceRoot, scripts)) {
+        const shebang = (0, shebang_1.parseShebang)((0, shebang_1.getShebangLine)(header));
         if (!shebang || !definition.claims(shebang)) {
             continue;
         }
         const { name, warnings } = (0, target_name_1.parseTargetName)(header);
         for (const warning of warnings) {
-            (0, internal_1.emitPluginWorkerLog)('warn', `${script}: ${warning}.`);
+            (0, internal_1.emitPluginWorkerLog)('warn', `${file}: ${warning}.`);
         }
         claimed.push({
-            path: script,
-            relativePath: node_path_1.posix.relative(projectRoot, script),
+            path: file,
+            relativePath: node_path_1.posix.relative(projectRoot, file),
             shebang,
             targetName: name,
         });

package/dist/src/plugins/scripts/shebang.d.ts

@@ -4,16 +4,10 @@ export interface Shebang {
     /** Arguments that follow the interpreter on the shebang line. */
     args: string[];
 }
-/**
- * Returns the first bytes of a script that starts with `#!`, or `null` when it
- * has no shebang or cannot be read (e.g. a tracked broken symlink).
- */
-export declare function readScriptHeader(absolutePath: string): string | null;
-/** The shebang line of a header from `readScriptHeader`, without `#!`. */
+/** The shebang line of a header from `readShebangHeaders`, without `#!`. */
 export declare function getShebangLine(header: string): string;
 /**
  * Handles `/usr/bin/env node`, `/usr/bin/env -S node --flags`,
  * `/usr/bin/env -S npx tsx` and direct paths such as `/usr/local/bin/node`.
  */
 export declare function parseShebang(line: string): Shebang | null;
-export declare function stripBom(text: string): string;

package/dist/src/plugins/scripts/shebang.js

@@ -1,43 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readScriptHeader = readScriptHeader;
 exports.getShebangLine = getShebangLine;
 exports.parseShebang = parseShebang;
-exports.stripBom = stripBom;
-const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const SNIFF_BYTES = 512;
 const PACKAGE_RUNNERS = new Set(['npx', 'pnpx', 'bunx']);
-/**
- * Returns the first bytes of a script that starts with `#!`, or `null` when it
- * has no shebang or cannot be read (e.g. a tracked broken symlink).
- */
-function readScriptHeader(absolutePath) {
-    const buffer = Buffer.alloc(SNIFF_BYTES);
-    let bytesRead;
-    try {
-        const fd = (0, node_fs_1.openSync)(absolutePath, 'r');
-        try {
-            bytesRead = (0, node_fs_1.readSync)(fd, buffer, 0, SNIFF_BYTES, 0);
-        }
-        finally {
-            (0, node_fs_1.closeSync)(fd);
-        }
-    }
-    catch {
-        return null;
-    }
-    let text = stripBom(buffer.toString('utf8', 0, bytesRead));
-    if (!text.startsWith('#!')) {
-        return null;
-    }
-    // Drop a line the sniff cut off, so a directive is never read truncated.
-    if (bytesRead === SNIFF_BYTES && text.includes('\n')) {
-        text = text.slice(0, text.lastIndexOf('\n'));
-    }
-    return text;
-}
-/** The shebang line of a header from `readScriptHeader`, without `#!`. */
+/** The shebang line of a header from `readShebangHeaders`, without `#!`. */
 function getShebangLine(header) {
     const end = header.search(/\r?\n/);
     return (end === -1 ? header : header.slice(0, end)).slice(2).trim();
@@ -62,6 +29,3 @@ function parseShebang(line) {
     }
     return { interpreter: (0, node_path_1.basename)(tokens[0]), args: tokens.slice(1) };
 }
-function stripBom(text) {
-    return text.charCodeAt(0) === 0xfeff ? text.slice(1) : text;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "24.0.0-rc.0",
+  "version": "24.0.0-rc.1",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -162,8 +162,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "24.0.0-rc.0",
-    "@nx/workspace": "24.0.0-rc.0",
+    "@nx/devkit": "24.0.0-rc.1",
+    "@nx/workspace": "24.0.0-rc.1",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^3.1.0",
@@ -183,14 +183,14 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@nx/esbuild": "24.0.0-rc.0",
-    "@nx/eslint": "24.0.0-rc.0",
-    "@nx/jest": "24.0.0-rc.0",
-    "@nx/oxlint": "24.0.0-rc.0",
-    "@nx/rollup": "24.0.0-rc.0",
-    "@nx/vite": "24.0.0-rc.0",
-    "@nx/vitest": "24.0.0-rc.0",
-    "nx": "24.0.0-rc.0"
+    "@nx/esbuild": "24.0.0-rc.1",
+    "@nx/eslint": "24.0.0-rc.1",
+    "@nx/jest": "24.0.0-rc.1",
+    "@nx/oxlint": "24.0.0-rc.1",
+    "@nx/rollup": "24.0.0-rc.1",
+    "@nx/vite": "24.0.0-rc.1",
+    "@nx/vitest": "24.0.0-rc.1",
+    "nx": "24.0.0-rc.1"
   },
   "peerDependencies": {
     "@swc/cli": ">=0.6.0 <0.9.0",