nx 23.0.0-beta.15 → 23.0.0-beta.17

package/dist/src/command-line/format/format.js

@@ -34,10 +34,15 @@ async function format(command, args) {
         process.exit(1);
     }
     const { nxArgs } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)(args, 'affected', { printWarnings: false }, (0, configuration_1.readNxJson)());
-    const patterns = (await getPatterns(prettier, { ...args, ...nxArgs })).map(
-    // prettier removes one of the \
-    // prettier-ignore
-    (p) => `"${p.replace(/\$/g, '\\\$')}"`);
+    const patterns = (await getPatterns(prettier, { ...args, ...nxArgs })).map((p) => {
+        // On non-Windows, escape $ to prevent shell variable interpolation
+        // (the shell consumes one \, so \\$ becomes \$ which the shell treats as literal $)
+        // On Windows (cmd.exe), $ is not a special character, so escaping it would
+        // cause prettier to look for a file with a literal \$ in the name
+        // prettier-ignore
+        const escaped = process.platform !== 'win32' ? p.replace(/\$/g, '\\\$') : p;
+        return `"${escaped}"`;
+    });
     // Chunkify the patterns array to prevent crashing the windows terminal
     const chunkList = (0, chunkify_1.chunkify)(patterns);
     switch (command) {
@@ -204,7 +209,12 @@ function getPrettierPath() {
         return prettierPath;
     }
     const { packageJson, path: packageJsonPath } = (0, package_json_1.readModulePackageJson)('prettier');
-    prettierPath = path.resolve(path.dirname(packageJsonPath), packageJson.bin);
+    const bin = packageJson.bin;
+    const binPath = typeof bin === 'string' ? bin : bin?.['prettier'];
+    if (!binPath) {
+        throw new Error(`Could not find prettier binary in ${packageJsonPath}`);
+    }
+    prettierPath = path.resolve(path.dirname(packageJsonPath), binPath);
     return prettierPath;
 }
 let useListDifferent;

package/dist/src/command-line/release/utils/resolve-changelog-renderer.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveChangelogRenderer = resolveChangelogRenderer;
 const register_1 = require("../../../plugins/js/utils/register");
-const typescript_1 = require("../../../plugins/js/utils/typescript");
 const utils_1 = require("../../../tasks-runner/utils");
 const workspace_root_1 = require("../../../utils/workspace-root");
 function resolveChangelogRenderer(changelogRendererPathOrImplementation) {
@@ -13,22 +12,11 @@ function resolveChangelogRenderer(changelogRendererPathOrImplementation) {
     const interpolatedChangelogRendererPath = (0, utils_1.interpolate)(changelogRendererPathOrImplementation, {
         workspaceRoot: workspace_root_1.workspaceRoot,
     });
-    // Try and load the provided (or default) changelog renderer
-    let ChangelogRendererClass;
-    let cleanupTranspiler = () => { };
-    try {
-        const rootTsconfigPath = (0, typescript_1.getRootTsConfigPath)();
-        if (rootTsconfigPath) {
-            cleanupTranspiler = (0, register_1.registerTsProject)(rootTsconfigPath);
-        }
-        const r = require(interpolatedChangelogRendererPath);
-        ChangelogRendererClass = r.default || r;
-    }
-    catch (err) {
-        throw err;
-    }
-    finally {
-        cleanupTranspiler();
-    }
-    return ChangelogRendererClass;
+    // TS renderers go through loadTsFile (native-strip -> swc/ts-node + paths).
+    // JS renderers use require() with a lazy tsconfig-paths fallback so workspace
+    // alias imports still resolve, without paying registration cost up front.
+    const r = /\.[cm]?ts$/.test(interpolatedChangelogRendererPath)
+        ? (0, register_1.loadTsFile)(interpolatedChangelogRendererPath)
+        : (0, register_1.requireWithTsconfigFallback)(interpolatedChangelogRendererPath);
+    return r.default || r;
 }

package/dist/src/command-line/release/version/version-actions.js

@@ -4,7 +4,6 @@ exports.NOOP_VERSION_ACTIONS = exports.VersionActions = void 0;
 exports.resolveVersionActionsForProject = resolveVersionActionsForProject;
 const node_path_1 = require("node:path");
 const register_1 = require("../../../plugins/js/utils/register");
-const typescript_1 = require("../../../plugins/js/utils/typescript");
 const utils_1 = require("../../../tasks-runner/utils");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const config_1 = require("../config/config");
@@ -52,12 +51,9 @@ async function resolveVersionActionsForProject(tree, releaseGroup, projectGraphN
         afterAllProjectsVersioned = cachedData.afterAllProjectsVersioned;
     }
     else {
-        let cleanupTranspiler;
-        if (versionActionsPath.endsWith('.ts')) {
-            cleanupTranspiler = (0, register_1.registerTsProject)((0, typescript_1.getRootTsConfigPath)());
-        }
-        const loaded = require(versionActionsPath);
-        cleanupTranspiler?.();
+        const loaded = /\.[cm]?ts$/.test(versionActionsPath)
+            ? (0, register_1.loadTsFile)(versionActionsPath)
+            : (0, register_1.requireWithTsconfigFallback)(versionActionsPath);
         VersionActionsClass = loaded.default ?? loaded;
         if (!VersionActionsClass) {
             throw new Error(`For project "${projectGraphNode.name}" it was not possible to resolve the VersionActions implementation from: "${versionActionsPath}"`);

package/dist/src/command-line/report/report.js

@@ -383,7 +383,6 @@ function findRegisteredPluginsBeingUsed(nxJson) {
 }
 function findInstalledPackagesWeCareAbout() {
     const packagesWeMayCareAbout = {};
-    // TODO (v20): Remove workaround for hiding @nrwl packages when matching @nx package is found.
     for (const pkg of exports.packagesWeCareAbout) {
         const v = readPackageVersion(pkg);
         if (v) {

package/dist/src/config/schema-utils.js

@@ -6,8 +6,9 @@ exports.resolveSchema = resolveSchema;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const resolve_exports_1 = require("resolve.exports");
+const register_1 = require("../plugins/js/utils/register");
 const packages_1 = require("../plugins/js/utils/packages");
-const plugins_1 = require("../project-graph/plugins");
+const typescript_1 = require("../plugins/js/utils/typescript");
 const path_2 = require("../utils/path");
 /**
  * This function is used to get the implementation factory of an executor or generator.
@@ -19,10 +20,14 @@ function getImplementationFactory(implementation, directory, packageName, projec
     const [implementationModulePath, implementationExportName] = implementation.split('#');
     return () => {
         const modulePath = resolveImplementation(implementationModulePath, directory, packageName, projects);
-        if ((0, path_1.extname)(modulePath) === '.ts') {
-            (0, plugins_1.registerPluginTSTranspiler)();
-        }
-        const module = require(modulePath);
+        // Route .ts entrypoints through loadTsFile so the native-strip ->
+        // swc/ts-node fallback chain runs. Plain require() bypasses the matcher
+        // set and bubbles errors like extensionless `./schema` imports (strict
+        // ESM resolution failures) straight to the CLI. JS entrypoints use
+        // requireWithTsconfigFallback so workspace-alias imports still resolve.
+        const module = /\.[cm]?ts$/.test(modulePath)
+            ? (0, register_1.loadTsFile)(modulePath)
+            : (0, register_1.requireWithTsconfigFallback)(modulePath);
         return implementationExportName
             ? module[implementationExportName]
             : (module.default ?? module);
@@ -92,7 +97,7 @@ function tryResolveFromSource(path, directory, packageName, projects) {
         const fromExports = (0, resolve_exports_1.resolve)({
             name: localProject.metadata.js.packageName,
             exports: localProject.metadata.js.packageExports,
-        }, path, { conditions: ['development'] });
+        }, path, { conditions: (0, typescript_1.getRootTsConfigResolveExportsConditions)() });
         if (fromExports && fromExports.length) {
             for (const exportPath of fromExports) {
                 if ((0, fs_1.existsSync)((0, path_1.join)(directory, exportPath))) {