feat: move plugin router

alitajs · Aug 24, 2021 · e889ec1 · e889ec1
1 parent e37e937
commit e889ec1
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 69 deletions.
diff --git a/packages/router/README.md b/packages/router/README.md
diff --git a/packages/router/package.json b/packages/router/package.json
diff --git a/packages/router/src/index.ts b/packages/router/src/index.ts
diff --git a/packages/router/src/utils/getContent.tsx b/packages/router/src/utils/getContent.tsx
diff --git a/packages/umi-presets-alita/package.json b/packages/umi-presets-alita/package.json
@@ -35,7 +35,6 @@
     "@alitajs/plugin-dva": "2.8.15-alpha.2",
     "@alitajs/plugin-layout": "2.8.15-alpha.2",
     "@alitajs/retain-log": "2.8.15-alpha.2",
-    "@alitajs/router": "2.8.15-alpha.2",
     "@alitajs/routes": "2.8.15-alpha.2",
     "@umijs/plugin-antd": "0.9.1",
     "@umijs/plugin-esbuild": "1.3.1",

diff --git a/packages/umi-presets-alita/src/index.ts b/packages/umi-presets-alita/src/index.ts
@@ -12,7 +12,9 @@ export default function (api: IApi) {
     require.resolve('@umijs/plugin-antd'),
     require.resolve('./plugins/features/appType'),
     require.resolve('@alitajs/routes'),
-    require.resolve('@alitajs/router'),
+    // 换成 内置 plugin 了
+    // require.resolve('@alitajs/router'),
+    require.resolve('./plugins/router/router'),
     require.resolve('@alitajs/keep-alive'),
     require.resolve('@alitajs/main-path'),
     require.resolve('@alitajs/retain-log'),
@@ -33,7 +35,7 @@ export default function (api: IApi) {
     plugins.push(require.resolve('@alitajs/cordova'));
   }
   // debug and console
-  if(api.userConfig.aconsole){
+  if (api.userConfig.aconsole) {
     plugins.push(require.resolve('@alitajs/aconsole'));
   }
   return {

diff --git a/packages/umi-presets-alita/src/plugins/router/historyAdapater.ts b/packages/umi-presets-alita/src/plugins/router/historyAdapater.ts
@@ -0,0 +1,32 @@
+// @ts-ignore
+import { history } from '@@/core/history';
+
+export function push(...args) {
+  history.push(...args);
+}
+
+export function replace(...args) {
+  history.replace(...args);
+}
+
+export function go(...args) {
+  history.go(...args);
+}
+
+export function goBack(...args) {
+  history.goBack(...args);
+}
+
+export function goForward(...args) {
+  history.goForward(...args);
+}
+
+const router = {
+  push,
+  replace,
+  go,
+  goBack,
+  goForward,
+};
+
+export { router };
diff --git a/packages/umi-presets-alita/src/plugins/router/router.ts b/packages/umi-presets-alita/src/plugins/router/router.ts
@@ -0,0 +1,14 @@
+import { IApi } from 'umi';
+
+export default (api: IApi) => {
+  api.addUmiExports(() => {
+    return [
+      {
+        source: require.resolve(
+          '../../../src/plugins/router/historyAdapater.ts',
+        ),
+        exportAll: true
+      },
+    ];
+  });
+};