feat: router v5 runtime plugin use meta path for runtime package (#5989)

web-infra-dev · Jul 24, 2024 · dcbfa14 · dcbfa14
1 parent 88e3f9a
commit dcbfa14
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 8 deletions.
diff --git a/.changeset/soft-oranges-fix.md b/.changeset/soft-oranges-fix.md
@@ -0,0 +1,8 @@
+---
+'@modern-js/plugin-router-v5': patch
+'@modern-js/plugin-garfish': patch
+---
+
+feat: router v5 and garfish runtime plugin use @meta/runtime path for @modern-js/runtime package
+
+feat: router v5 和 garfish runtime 插件使用 @meta/runtime 路径导入 @modern-js/runtime
diff --git a/packages/runtime/plugin-garfish/jest.config.js b/packages/runtime/plugin-garfish/jest.config.js
@@ -4,4 +4,7 @@ const sharedConfig = require('@scripts/jest-config');
 module.exports = {
   ...sharedConfig,
   rootDir: __dirname,
+  moduleNameMapper: {
+    '^@meta/runtime$': '<rootDir>/node_modules/@modern-js/runtime/src',
+  },
 };
diff --git a/packages/runtime/plugin-garfish/src/cli/index.ts b/packages/runtime/plugin-garfish/src/cli/index.ts
@@ -137,6 +137,7 @@ export const garfishPlugin = (): CliPlugin<
           source: {
             alias: {
               [`@${metaName}/runtime/garfish`]: `@${metaName}/plugin-garfish/runtime`,
+              '@meta/runtime': '@modern-js/runtime',
               '@meta/runtime/browser': '@modern-js/runtime/browser',
               '@meta/runtime/react': '@modern-js/runtime/react',
             },

diff --git a/packages/runtime/plugin-garfish/src/global.d.ts b/packages/runtime/plugin-garfish/src/global.d.ts
@@ -7,3 +7,7 @@ declare module '@meta/runtime/react' {
 declare module '@meta/runtime/browser' {
   export * from '@modern-js/runtime/browser';
 }
+
+declare module '@meta/runtime' {
+  export * from '@modern-js/runtime';
+}
diff --git a/packages/runtime/plugin-garfish/src/runtime/utils/apps.tsx b/packages/runtime/plugin-garfish/src/runtime/utils/apps.tsx
@@ -1,7 +1,6 @@
 // The loading logic of the current component refers to react-loadable https://github.com/jamiebuilds/react-loadable
 import React, { useContext, useState, useEffect, useRef } from 'react';
-// import { withRouter, useMatches } from '@modern-js/runtime/router';
-import { RuntimeReactContext } from '@modern-js/runtime';
+import { RuntimeReactContext } from '@meta/runtime';
 // eslint-disable-next-line import/no-named-as-default
 import Garfish, { interfaces } from 'garfish';
 // import Loadable from 'react-loadable';

diff --git a/packages/runtime/plugin-router-v5/jest.config.js b/packages/runtime/plugin-router-v5/jest.config.js
@@ -4,4 +4,9 @@ const sharedConfig = require('@scripts/jest-config');
 module.exports = {
   ...sharedConfig,
   rootDir: __dirname,
+  moduleNameMapper: {
+    '^@meta/runtime$': '<rootDir>/node_modules/@modern-js/runtime/src',
+    '^@meta/runtime/context$':
+      '<rootDir>/node_modules/@modern-js/runtime/src/core/context',
+  },
 };
diff --git a/packages/runtime/plugin-router-v5/src/cli/index.ts b/packages/runtime/plugin-router-v5/src/cli/index.ts
@@ -54,6 +54,8 @@ export const routerPlugin = (): CliPlugin<AppTools> => ({
           source: {
             alias: {
               [`@${metaName}/runtime/router-v5`]: routerExportsUtils.getPath(),
+              '@meta/runtime': '@modern-js/runtime',
+              '@meta/runtime/context': '@modern-js/runtime/context',
             },
           },
         };

diff --git a/packages/runtime/plugin-router-v5/src/modern-app-env.d.ts b/packages/runtime/plugin-router-v5/src/modern-app-env.d.ts
@@ -1 +1,9 @@
 /// <reference types="@modern-js/types" />
+
+declare module '@meta/runtime/context' {
+  export * from '@modern-js/runtime/context';
+}
+
+declare module '@meta/runtime' {
+  export * from '@modern-js/runtime';
+}
diff --git a/packages/runtime/plugin-router-v5/src/runtime/plugin.tsx b/packages/runtime/plugin-router-v5/src/runtime/plugin.tsx
@@ -15,13 +15,10 @@ import {
   useLocation,
   useHistory,
 } from 'react-router-dom';
-import { RuntimeReactContext, isBrowser } from '@modern-js/runtime';
+import { RuntimeReactContext, isBrowser } from '@meta/runtime';
 import type { Plugin } from '@modern-js/runtime';
 import { parsedJSONFromElement } from '@modern-js/runtime-utils/parsed';
-import {
-  getGlobalLayoutApp,
-  getGlobalRoutes,
-} from '@modern-js/runtime/context';
+import { getGlobalLayoutApp, getGlobalRoutes } from '@meta/runtime/context';
 import { renderRoutes, getLocation, urlJoin } from './utils';
 import { modifyRoutesHook } from './hooks';
 

diff --git a/tests/jest-ut.config.js b/tests/jest-ut.config.js
@@ -24,7 +24,11 @@ module.exports = {
           },
         ],
       },
-      moduleNameMapper: {},
+      moduleNameMapper: {
+        '^@meta/runtime$': '<rootDir>/packages/runtime/plugin-runtime/src',
+        '^@meta/runtime/context$':
+          '<rootDir>/packages/runtime/plugin-runtime/src/core/context',
+      },
       globals: {},
       resolver: '<rootDir>/tests/jest.resolver.js',
       transformIgnorePatterns: [