fix: yarn pnp resolution for empty modules

remix-run · Jul 1, 2022 · f685817 · f685817
1 parent f2c5226
commit f685817
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/packages/remix-dev/compiler.ts b/packages/remix-dev/compiler.ts
@@ -357,9 +357,15 @@ async function createBrowserBuild(
     mdxPlugin(config),
     browserRouteModulesPlugin(config, /\?browser$/),
     emptyModulesPlugin(config, /\.server(\.[jt]sx?)?$/),
-    // Must be placed before NodeModulesPolyfillPlugin, so yarn can resolve polyfills correctly
-    yarnPnpPlugin(),
     NodeModulesPolyfillPlugin(),
+    yarnPnpPlugin({
+      onLoad: async (args) => ({
+        contents: await fse.promises.readFile(args.path),
+        loader: `default`,
+        // https://esbuild.github.io/plugins/#on-load-results
+        resolveDir: path.dirname(args.path),
+      })
+    }),
   ];
 
   return esbuild.build({

diff --git a/packages/remix-dev/package.json b/packages/remix-dev/package.json
@@ -26,7 +26,7 @@
     "@npmcli/package-json": "^2.0.0",
     "@remix-run/server-runtime": "1.6.2",
     "arg": "^5.0.1",
-    "@yarnpkg/esbuild-plugin-pnp": "^2.0.0",
+    "@yarnpkg/esbuild-plugin-pnp": "3.0.0-rc.10",
     "cacache": "^15.0.5",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.1",