fix(remix): Rework dynamic imports of react-router-dom.

getsentry · Oct 6, 2022 · 69dfc35 · 69dfc35
1 parent ff1229b
commit 69dfc35
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/packages/remix/package.json b/packages/remix/package.json
@@ -41,7 +41,8 @@
   "peerDependencies": {
     "@remix-run/node": "1.x",
     "@remix-run/react": "1.x",
-    "react": "16.x || 17.x || 18.x"
+    "react": "16.x || 17.x || 18.x",
+    "react-router": "6.x"
   },
   "scripts": {
     "build": "run-p build:rollup build:types",

diff --git a/packages/remix/rollup.npm.config.js b/packages/remix/rollup.npm.config.js
@@ -3,5 +3,11 @@ import { makeBaseNPMConfig, makeNPMConfigVariants } from '../../rollup/index.js'
 export default makeNPMConfigVariants(
   makeBaseNPMConfig({
     entrypoints: ['src/index.server.ts', 'src/index.client.tsx'],
+    packageSpecificConfig: {
+      output: {
+        // make it so Rollup calms down about the fact that we're combining default and named exports
+        exports: 'named',
+      },
+    },
   }),
 );
diff --git a/packages/remix/src/utils/serverAdapters/express.ts b/packages/remix/src/utils/serverAdapters/express.ts
@@ -43,7 +43,15 @@ function wrapExpressRequestHandler(
     next: ExpressNextFunction,
   ): Promise<void> {
     if (!pkg) {
-      pkg = await import(`${cwd()}/node_modules/react-router-dom`);
+      try {
+        pkg = await import('react-router-dom');
+      } catch (e) {
+        pkg = await import(`${cwd()}/node_modules/react-router-dom`);
+      } finally {
+        if (!pkg) {
+          __DEBUG_BUILD__ && logger.error('Could not find `react-router-dom` package.');
+        }
+      }
     }
 
     // eslint-disable-next-line @typescript-eslint/unbound-method