nx 22.7.2 → 22.7.4

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/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

@@ -8,6 +8,7 @@ const path_1 = require("path");
 const resolve_exports_1 = require("resolve.exports");
 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.
@@ -92,7 +93,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))) {