Feat/memory router

packages/create-app-shared/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.5
+
+- [feat] be able to pass arguments to memory router
+
 ## 1.2.4
 
 - [fix] support history for custom configuration

packages/create-app-shared/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-app-shared",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "https://github.com/alibaba/ice#readme",

packages/create-app-shared/src/createInitHistory.ts

@@ -14,6 +14,8 @@ export type CreateHistory = (options: {
   location?: Location;
   routes?: Route[];
   customHistory?: History;
+  initialIndex?: number;
+  initialEntries?: string[];
 }) => History<unknown>
 type InitialContext = null | { location?: Location }
 type Options = {
@@ -32,8 +34,16 @@ export default (createHistory: CreateHistory) =>
     }
     const { initialContext = null, staticConfig = { routes: [] } } = options;
     const { router } = appConfig;
-    const { type = DEFAULT_APP_CONFIG.router.type, basename, history: customHistory } = router;
+    const { type = DEFAULT_APP_CONFIG.router.type, basename, history: customHistory, initialEntries, initialIndex } = router;
     const location = initialContext ? initialContext.location : null;
-    const newHistory = createHistory({ type, basename, location, customHistory, routes: staticConfig.routes });
+    const newHistory = createHistory({
+      type,
+      basename,
+      location,
+      customHistory,
+      routes: staticConfig.routes,
+      initialEntries,
+      initialIndex
+    });
     appConfig.router.history = newHistory;
   };

packages/create-app-shared/src/types.ts

@@ -21,6 +21,8 @@ export interface AppConfig {
     type?: 'hash' | 'browser' | 'memory' | 'static';
     history?: History;
     basename?: string;
+    initialIndex?: number;
+    initialEntries?: string[];
   },
 }
 

packages/create-app-shared/src/web/history.ts

@@ -3,7 +3,14 @@ import type { CreateHistory, InitHistory } from '../createInitHistory';
 import createInitHistory from '../createInitHistory';
 import { setHistory } from '../storage';
 
-const createHistory: CreateHistory = ({ type, basename, location, customHistory }) => {
+const createHistory: CreateHistory = ({
+  type,
+  basename,
+  location,
+  customHistory,
+  initialIndex,
+  initialEntries,
+}) => {
   let history: History;
   if (process.env.__IS_SERVER__) {
     history = createMemoryHistory();
@@ -16,7 +23,10 @@ const createHistory: CreateHistory = ({ type, basename, location, customHistory
   } else if (type === 'browser') {
     history = createBrowserHistory({ basename });
   } else {
-    history = createMemoryHistory();
+    history = createMemoryHistory({
+      initialIndex,
+      initialEntries
+    });
   }
   setHistory(history);
   return history;

packages/plugin-icestark/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.5.3
+
+- [fix] revert from version 2.5.2 and suport memory router
+
 ## 2.5.2
 
 - [fix] support custom history configuration.

packages/plugin-icestark/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-icestark",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "description": "Easy use `icestark` in icejs.",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "",

packages/plugin-icestark/src/runtime.tsx

@@ -37,7 +37,14 @@ const module = ({
     getApps,
     $$props
   } = (icestark || {}) as IPrivateIceStark;
-  const { type, basename, modifyRoutes: runtimeModifyRoutes, fallback, history: customHistory } = router;
+  const {
+    type,
+    basename,
+    modifyRoutes: runtimeModifyRoutes,
+    fallback,
+    initialIndex,
+    initialEntries,
+  } = router;
   // compatible with deprecated runtime API
   const wrapperComponent = wrapperPageComponent || wrapperRouteComponent;
   const createAppHistory = createHistory || ((options: any) => applyRuntimeAPI('createHistory', options));
@@ -54,7 +61,7 @@ const module = ({
 
     const childBasename = isInIcestark() ? getBasename() : basename;
 
-    const history = createAppHistory({ type, basename: childBasename, customHistory });
+    const history = createAppHistory({ type, basename: childBasename, initialIndex, initialEntries });
 
     addDOMRender(({ App, appMountNode }) => {
       return new Promise(resolve => {
@@ -136,7 +143,7 @@ const module = ({
       modifyRoutes(removeRootLayout);
     }
     const RootApp = ({ routes }) => {
-      const [routerHistory] = useState(createAppHistory({ type, basename, customHistory }));
+      const [routerHistory] = useState(createAppHistory({ type, basename, initialEntries, initialIndex }));
       const routerProps = {
         type,
         routes,

packages/plugin-router/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.3
+
+- [fix] be able to pass arguments to memory router
+
 ## 2.1.2
 
 - [fix] bump version of `@builder/pack`(^0.6.0)

packages/plugin-router/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ice-router",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "build-plugin-ice-router",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "",

packages/plugin-router/src/runtime.tsx

@@ -28,7 +28,12 @@ const module = ({ setRenderApp, appConfig, modifyRoutes, modifyRoutesComponent,
       ...customRouterProps,
     };
     if (!routerProps.history) {
-      routerProps.history = applyRuntimeAPI('createHistory', { type: appConfigRouter.type, basename: appConfigRouter.basename });
+      routerProps.history = applyRuntimeAPI('createHistory', {
+        type: appConfigRouter.type,
+        basename: appConfigRouter.basename,
+        initialIndex: appConfigRouter.initialIndex,
+        initialEntries: appConfigRouter.initialEntries
+      });
     }
     if (process.env.__IS_SERVER__) {
       const { initialContext = {} } = context;

packages/plugin-router/src/types/index.ts

@@ -12,6 +12,8 @@ export interface IAppRouterProps {
   modifyRoutes?: IModifyRoutes;
   fallback?: React.ReactNode;
   history?: History;
+  initialIndex?: number;
+  initialEntries?: string[];
 }
 
 export interface IRouterConfig extends DefaultRouteProps {