Release 1.1.5

* fix: pass history params to icestark router (#224) * fix: transform core-js path added by preset-env (#225)
ice-lab · Apr 8, 2020 · 605ba87 · 605ba87
2 parents 91ef16c + df81054
commit 605ba87
Show file tree

Hide file tree

Showing 31 changed files with 72 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -106,8 +106,9 @@ Finally, To start developing your application run `npm run start`. The applicati
 
 - [hello-world](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/hello-world)
 - [basic-spa](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/basic-spa)
-- [basic-store](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/basic-store)
+- [basic-ssr](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/basic-ssr)
 - [basic-mpa](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/basic-mpa)
+- [basic-store](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/basic-store)
 - [basic-request](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/basic-request)
 - [icestark-child](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/icestark-child)
 - [icestark-layout](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/icestark-layout)

diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -106,8 +106,9 @@ createApp(appConfig)
 
 - [hello-world](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/hello-world)
 - [basic-spa](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/basic-spa)
-- [basic-store](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/basic-store)
+- [basic-ssr](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/basic-ssr)
 - [basic-mpa](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/basic-mpa)
+- [basic-store](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/basic-store)
 - [basic-request](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/basic-request)
 - [icestark-child](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/icestark-child)
 - [icestark-layout](https://codesandbox.io/s/github/ice-lab/icejs/tree/master/examples/icestark-layout)

diff --git a/examples/basic-mpa/public/dashboard.html b/examples/basic-mpa/public/dashboard.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
     <meta name="viewport" content="width=device-width" />
-    <title>mpa-dashboard</title>
+    <title>icejs · mpa example</title>
   </head>
 
   <body>

diff --git a/examples/basic-mpa/public/index.html b/examples/basic-mpa/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
     <meta name="viewport" content="width=device-width" />
-    <title>mpa-index</title>
+    <title>icejs · mpa example</title>
   </head>
 
   <body>

diff --git a/examples/basic-request/public/index.html b/examples/basic-request/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
     <meta name="viewport" content="width=device-width" />
-    <title>icejs simple app</title>
+    <title>icejs · request example</title>
   </head>
 
   <body>

diff --git a/examples/basic-spa/public/index.html b/examples/basic-spa/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
     <meta name="viewport" content="width=device-width" />
-    <title>Lite</title>
+    <title>icejs · spa example</title>
   </head>
 
   <body>

diff --git a/examples/hello-world/public/index.html b/examples/hello-world/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
     <meta name="viewport" content="width=device-width" />
-    <title>icejs simple app</title>
+    <title>icejs · hello world example</title>
   </head>
 
   <body>

diff --git a/examples/icestark-child/public/index.html b/examples/icestark-child/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
     <meta name="viewport" content="width=device-width" />
-    <title>Lite</title>
+    <title>icejs · icestark child example</title>
   </head>
 
   <body>

diff --git a/examples/icestark-layout/public/index.html b/examples/icestark-layout/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
     <meta name="viewport" content="width=device-width" />
-    <title>Lite</title>
+    <title>icejs · icestark layout example</title>
   </head>
 
   <body>

diff --git a/examples/with-fusion-design/public/index.html b/examples/with-fusion-design/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
     <meta name="viewport" content="width=device-width" />
-    <title>Scaffold Lite</title>
+    <title>icejs · with fusion design example</title>
   </head>
 
   <body>

diff --git a/examples/with-rematch/public/index.html b/examples/with-rematch/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
     <meta name="viewport" content="width=device-width" />
-    <title>Lite</title>
+    <title>icejs · with rematch example</title>
   </head>
 
   <body>

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.4",
+  "version": "1.1.5",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": [

diff --git a/packages/create-ice/package.json b/packages/create-ice/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-ice",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "npm init ice",
   "author": "[email protected]",
   "homepage": "",

diff --git a/packages/icejs/package.json b/packages/icejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ice.js",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "command line interface and builtin plugin for icejs",
   "author": "[email protected]",
   "homepage": "",
@@ -21,16 +21,16 @@
   },
   "dependencies": {
     "@alib/build-scripts": "^0.1.13",
-    "build-plugin-ice-config": "1.1.4",
-    "build-plugin-ice-core": "1.1.4",
-    "build-plugin-ice-helpers": "1.1.4",
-    "build-plugin-ice-logger": "1.1.4",
-    "build-plugin-ice-mpa": "1.1.4",
-    "build-plugin-ice-request": "1.1.4",
-    "build-plugin-ice-router": "1.1.4",
-    "build-plugin-ice-ssr": "1.1.4",
-    "build-plugin-ice-store": "1.1.4",
-    "build-plugin-react-app": "1.1.4",
+    "build-plugin-ice-config": "1.1.5",
+    "build-plugin-ice-core": "1.1.5",
+    "build-plugin-ice-helpers": "1.1.5",
+    "build-plugin-ice-logger": "1.1.5",
+    "build-plugin-ice-mpa": "1.1.5",
+    "build-plugin-ice-request": "1.1.5",
+    "build-plugin-ice-router": "1.1.5",
+    "build-plugin-ice-ssr": "1.1.5",
+    "build-plugin-ice-store": "1.1.5",
+    "build-plugin-react-app": "1.1.5",
     "inquirer": "^7.1.0"
   },
   "engines": {

diff --git a/packages/plugin-config/package.json b/packages/plugin-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ice-config",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Define application config in icejs",
   "author": "[email protected]",
   "homepage": "",

diff --git a/packages/plugin-core/package.json b/packages/plugin-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ice-core",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "the core plugin for icejs.",
   "author": "[email protected]",
   "homepage": "",

diff --git a/packages/plugin-helpers/package.json b/packages/plugin-helpers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ice-helpers",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "builtin helpers in icejs",
   "author": "[email protected]",
   "homepage": "",

diff --git a/packages/plugin-icestark/package.json b/packages/plugin-icestark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-icestark",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Easy use `icestark` in icejs.",
   "author": "[email protected]",
   "homepage": "",

diff --git a/packages/plugin-icestark/src/module.tsx b/packages/plugin-icestark/src/module.tsx
@@ -8,7 +8,8 @@ import {
   registerAppLeave,
   getBasename,
 } from '@ice/stark-app';
-import { Router } from '$ice/Router';
+import { IceRouter } from '$ice/Router';
+import { createHashHistory, createBrowserHistory } from '$ice/history';
 import DefaultLayout from '$ice/Layout';
 import removeRootLayout from './runtime/removeLayout';
 import { IIceStark } from './types';
@@ -19,10 +20,13 @@ const module = ({ appConfig, addDOMRender, setRenderRouter, modifyRoutes }) => {
   const { icestark, router } = appConfig;
   const { type: appType } = (icestark || {}) as IIceStark;
   const { type, basename, modifyRoutes: runtimeModifyRoutes } = router;
+
   if (runtimeModifyRoutes) {
     modifyRoutes(runtimeModifyRoutes);
   }
   if (appType === 'child') {
+    const history = createHistory(type, getBasename());
+
     addDOMRender(({ App, appMountNode }) => {
       return new Promise(resolve => {
         if (isInIcestark()) {
@@ -42,13 +46,15 @@ const module = ({ appConfig, addDOMRender, setRenderRouter, modifyRoutes }) => {
     setRenderRouter((routes) => () => {
       const routerProps = {
         type,
-        basename: getBasename(),
         routes,
+        basename: getBasename(),
+        history
       };
-      return <Router {...routerProps} />;
+      return <IceRouter {...routerProps} />;
     });
   } else if (appType === 'framework') {
     const { getApps, appRouter, Layout, AppRoute: CustomAppRoute, removeRoutesLayout } = (icestark || {}) as IIceStark;
+    const history = createHistory(type, basename);
     if (removeRoutesLayout) {
       modifyRoutes(removeRootLayout);
     }
@@ -60,8 +66,9 @@ const module = ({ appConfig, addDOMRender, setRenderRouter, modifyRoutes }) => {
       const [apps, setApps] = useState(null);
       const routerProps = {
         type,
-        basename,
         routes,
+        basename,
+        history
       };
       const BasicLayout = Layout || DefaultLayout;
       const RenderAppRoute = CustomAppRoute || AppRoute;
@@ -113,7 +120,9 @@ const module = ({ appConfig, addDOMRender, setRenderRouter, modifyRoutes }) => {
               {routes && routes.length && (
                 <RenderAppRoute
                   path="/"
-                  component={<Router {...routerProps} />}
+                  render={() => {
+                    return <IceRouter {...routerProps} />;
+                  }}
                 />
               )}
             </AppRouter>
@@ -125,4 +134,12 @@ const module = ({ appConfig, addDOMRender, setRenderRouter, modifyRoutes }) => {
   }
 };
 
+function createHistory(type: string, basename: string) {
+  const histories = {
+    hash: createHashHistory,
+    browser: createBrowserHistory,
+  };
+  return histories[type]({basename});
+}
+
 export default module;
diff --git a/packages/plugin-icestark/src/runtime/_Router.tsx b/packages/plugin-icestark/src/runtime/_Router.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 
 // eslint-disable-next-line
-const Router = ({ type, routes, basename }) => {
+const IceRouter = ({ type, routes, basename, history }) => {
   return (<div />);
 };
 
-export { Router };
+export { IceRouter };
diff --git a/packages/plugin-icestark/src/runtime/_history.ts b/packages/plugin-icestark/src/runtime/_history.ts
@@ -0,0 +1,6 @@
+export {
+  createBrowserHistory,
+  createHashHistory,
+  createMemoryHistory,
+  History
+} from 'history';
diff --git a/packages/plugin-icestark/tsconfig.json b/packages/plugin-icestark/tsconfig.json
@@ -6,7 +6,8 @@
     "outDir": "lib",
     "paths": {
       "$ice/Router": ["./src/runtime/_Router"],
+      "$ice/history": ["./src/runtime/_history"],
       "$ice/Layout": ["./src/runtime/Layout"]
     }
   }
-}
+}
diff --git a/packages/plugin-logger/package.json b/packages/plugin-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ice-logger",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "builtin logger in icejs",
   "author": "[email protected]",
   "homepage": "",

diff --git a/packages/plugin-mpa/package.json b/packages/plugin-mpa/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ice-mpa",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "enable mpa project for icejs framework",
   "author": "[email protected]",
   "homepage": "",

diff --git a/packages/plugin-react-app/package.json b/packages/plugin-react-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-react-app",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "The basic webpack configuration for ice project",
   "author": "[email protected]",
   "main": "src/index.js",

diff --git a/packages/plugin-react-app/src/utils/babelPluginCorejsLock.js b/packages/plugin-react-app/src/utils/babelPluginCorejsLock.js
@@ -12,7 +12,8 @@ module.exports = ({ types }, { fileList }) => {
         });
         if (entryFile) {
           const { node } = nodePath;
-          if (node.source.value.startsWith('core-js/')) {
+          // only replace core-js/modules/xxx added by @babel/preset-env
+          if (node.source.value.startsWith('core-js/modules')) {
             node.source.value = node.source.value.replace('core-js/', `${coreJSPath}/`);
           }
         }

diff --git a/packages/plugin-rematch/package.json b/packages/plugin-rematch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ice-rematch",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Easy use `rematch` in icejs",
   "author": "[email protected]",
   "homepage": "",

diff --git a/packages/plugin-request/package.json b/packages/plugin-request/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ice-request",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "request for build-plugin-ice-request",
   "author": "[email protected]",
   "homepage": "",

diff --git a/packages/plugin-router/package.json b/packages/plugin-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ice-router",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "build-plugin-ice-router",
   "author": "[email protected]",
   "homepage": "",

diff --git a/packages/plugin-ssr/package.json b/packages/plugin-ssr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ice-ssr",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "ssr plugin",
   "author": "[email protected]",
   "homepage": "",

diff --git a/packages/plugin-store/package.json b/packages/plugin-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ice-store",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "builtin `icestore` in icejs",
   "author": "[email protected]",
   "homepage": "",