chore: export @remix-run/router cjs instead of react-router-dom (#4011)

docs: change changeset
web-infra-dev · Jun 19, 2023 · 4a82c3b · 4a82c3b
1 parent 580fcf7
commit 4a82c3b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.changeset/tender-forks-grow.md b/.changeset/tender-forks-grow.md
@@ -0,0 +1,7 @@
+---
+'@modern-js/plugin-data-loader': patch
+'@modern-js/utils': patch
+---
+
+fix: export `@remix-run/router` cjs instead of `react-router-dom`
+fix: 暴露 `@remix-run/router` 的 cjs 导出代替 `react-router-dom`
diff --git a/packages/cli/plugin-data-loader/src/cli/createRequest.ts b/packages/cli/plugin-data-loader/src/cli/createRequest.ts
@@ -1,5 +1,6 @@
 // eslint-disable-next-line eslint-comments/disable-enable-pair
 /* eslint-disable node/prefer-global/url */
+// Todo move this file to `runtime/` dir
 import { compile } from 'path-to-regexp';
 import { redirect } from '@modern-js/utils/runtime/router';
 import { type UNSAFE_DeferredData as DeferredData } from '@modern-js/utils/runtime/remix-router';

diff --git a/packages/cli/plugin-data-loader/src/server/index.ts b/packages/cli/plugin-data-loader/src/server/index.ts
@@ -17,6 +17,7 @@ export default (): ServerPlugin => ({
       distDir: string;
     }) {
       return async (context: ServerContext) => {
+        // Todo remove matchEntry, bundle follow logic to server-loader
         const entry = matchEntry(context.path, serverRoutes);
         if (!entry) {
           return;

diff --git a/packages/toolkit/utils/package.json b/packages/toolkit/utils/package.json
@@ -36,11 +36,11 @@
     },
     "./runtime/router": {
       "jsnext:source": "./src/runtime/router.ts",
-      "require": "./dist/cjs/runtime/router.js",
       "default": "./dist/esm/runtime/router.js"
     },
     "./runtime/remix-router": {
       "jsnext:source": "./src/runtime/remixRouter.ts",
+      "require": "./dist/cjs/runtime/remixRouter.js",
       "default": "./dist/esm/runtime/remixRouter.js"
     },
     "./runtime/nested-routes": {
@@ -58,7 +58,6 @@
     },
     "./runtime-node/router": {
       "jsnext:source": "./src/runtime-node/router.ts",
-      "require": "./dist/cjs/runtime-node/router.js",
       "default": "./dist/esm/runtime-node/router.js"
     },
     "./universal/constants": {
@@ -118,11 +117,11 @@
       },
       "./runtime/router": {
         "types": "./dist/types/runtime/router.d.ts",
-        "require": "./dist/cjs/runtime/router.js",
         "default": "./dist/esm/runtime/router.js"
       },
       "./runtime/remix-router": {
         "types": "./dist/types/runtime/remixRouter.d.ts",
+        "require": "./dist/cjs/runtime/remixRouter.js",
         "default": "./dist/esm/runtime/remixRouter.js"
       },
       "./runtime/nested-routes": {