fix(pnp): esm - correct named commonjs imports regression (#4739)

yarnpkg · Aug 12, 2022 · 5de0763 · 5de0763
1 parent 755407d
commit 5de0763
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 2 deletions.
diff --git a/.yarn/versions/e065ea09.yml b/.yarn/versions/e065ea09.yml
@@ -0,0 +1,36 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/core": patch
+  "@yarnpkg/pnp": patch
+
+declined:
+  - "@yarnpkg/esbuild-plugin-pnp"
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-exec"
+  - "@yarnpkg/plugin-file"
+  - "@yarnpkg/plugin-git"
+  - "@yarnpkg/plugin-github"
+  - "@yarnpkg/plugin-http"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-link"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/extensions"
+  - "@yarnpkg/nm"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/sdks"
diff --git a/packages/acceptance-tests/pkg-tests-fixtures/packages/no-deps-exports-1.0.0/index.js b/packages/acceptance-tests/pkg-tests-fixtures/packages/no-deps-exports-1.0.0/index.js
@@ -0,0 +1 @@
+module.exports.foo = 42;
diff --git a/packages/acceptance-tests/pkg-tests-fixtures/packages/no-deps-exports-1.0.0/package.json b/packages/acceptance-tests/pkg-tests-fixtures/packages/no-deps-exports-1.0.0/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "no-deps-exports",
+  "version": "1.0.0"
+}
diff --git a/packages/acceptance-tests/pkg-tests-specs/sources/pnp-esm.test.ts b/packages/acceptance-tests/pkg-tests-specs/sources/pnp-esm.test.ts
@@ -581,4 +581,30 @@ describe(`Plug'n'Play - ESM`, () => {
       },
     ),
   );
+
+  // Tests /packages/yarnpkg-pnp/sources/esm-loader/fspatch.ts
+  test(
+    `it should support named exports in commonjs files`,
+    makeTemporaryEnv(
+      {
+        dependencies: {
+          'no-deps-exports': `1.0.0`,
+        },
+        type: `module`,
+      },
+      async ({path, run, source}) => {
+        await expect(run(`install`)).resolves.toMatchObject({code: 0});
+
+        await xfs.writeFilePromise(
+          ppath.join(path, `index.js` as Filename),
+          `import {foo} from 'no-deps-exports';\nconsole.log(foo)`,
+        );
+
+        await expect(run(`node`, `./index.js`)).resolves.toMatchObject({
+          code: 0,
+          stdout: `42\n`,
+        });
+      },
+    ),
+  );
 });
diff --git a/packages/yarnpkg-pnp/sources/esm-loader/built-loader.js b/packages/yarnpkg-pnp/sources/esm-loader/built-loader.js
diff --git a/packages/yarnpkg-pnp/sources/esm-loader/fspatch.ts b/packages/yarnpkg-pnp/sources/esm-loader/fspatch.ts
@@ -28,7 +28,7 @@ const ZIP_MAGIC = 0x2a000000;
 
 binding.fstat = function(...args) {
   const [fd, useBigint, req] = args;
-  if ((fd & ZIP_MASK) !== ZIP_MAGIC && useBigint === false && req === undefined) {
+  if ((fd & ZIP_MASK) === ZIP_MAGIC && useBigint === false && req === undefined) {
     try {
       const stats = fs.fstatSync(fd);
       // The reverse of this internal util