fix: re-order yarn pnp plugin

remix-run · Jun 26, 2022 · 54b64a6 · 54b64a6
1 parent 19b32f4
commit 54b64a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/contributors.yml b/contributors.yml
@@ -15,6 +15,7 @@
 - alex-ketch
 - alexuxui
 - alireza-bonab
+- alisd23
 - alvinthen
 - amorriscode
 - andrelandgraf

diff --git a/packages/remix-dev/compiler.ts b/packages/remix-dev/compiler.ts
@@ -353,8 +353,9 @@ async function createBrowserBuild(
     mdxPlugin(config),
     browserRouteModulesPlugin(config, /\?browser$/),
     emptyModulesPlugin(config, /\.server(\.[jt]sx?)?$/),
-    NodeModulesPolyfillPlugin(),
+    // Must be placed before NodeModulesPolyfillPlugin, so yarn can resolve polyfills correctly
     yarnPnpPlugin(),
+    NodeModulesPolyfillPlugin(),
   ];
 
   return esbuild.build({
@@ -418,8 +419,8 @@ function createServerBuild(
     serverRouteModulesPlugin(config),
     serverEntryModulePlugin(config),
     serverAssetsManifestPlugin(assetsManifestPromiseRef),
-    serverBareModulesPlugin(config, options.onWarning),
     yarnPnpPlugin(),
+    serverBareModulesPlugin(config, options.onWarning),
   ];
 
   if (config.serverPlatform !== "node") {