Release v1.1.8

chenbin92 · web-flow · commit 9520a3346e9c · 2020-04-20T21:23:58.000+08:00
Release
diff --git a/examples/basic-store/src/pages/About/index.tsx b/examples/basic-store/src/pages/About/index.tsx
@@ -2,7 +2,8 @@ import React, { useEffect } from 'react';
 import { Link, store as appStore  } from 'ice';
 import { store as pageStore } from 'ice/About';
 
-const About = () => {
+const About = (props) => {
+  console.log(props);
   const [userState, userActions] = appStore.useModel('user');
   const [pageState, pageActions] = pageStore.useModel('default');
   const actionsState = appStore.useModelEffectsState('user');
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.6",
+  "version": "1.1.8",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": [
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ice.js",
   "private": true,
-  "version": "1.1.6",
+  "version": "1.1.7",
   "workspaces": [
     "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.6",
+  "version": "1.1.8",
   "description": "npm init ice",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "",
diff --git a/packages/icejs/package.json b/packages/icejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ice.js",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "command line interface and builtin plugin for icejs",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "",
@@ -21,16 +21,16 @@
   },
   "dependencies": {
     "@alib/build-scripts": "^0.1.13",
-    "build-plugin-ice-config": "1.1.6",
-    "build-plugin-ice-core": "1.1.6",
-    "build-plugin-ice-helpers": "1.1.6",
-    "build-plugin-ice-logger": "1.1.6",
-    "build-plugin-ice-mpa": "1.1.6",
-    "build-plugin-ice-request": "1.1.6",
-    "build-plugin-ice-router": "1.1.6",
-    "build-plugin-ice-ssr": "1.1.6",
-    "build-plugin-ice-store": "1.1.6",
-    "build-plugin-react-app": "1.1.6",
+    "build-plugin-ice-config": "1.1.8",
+    "build-plugin-ice-core": "1.1.8",
+    "build-plugin-ice-helpers": "1.1.8",
+    "build-plugin-ice-logger": "1.1.8",
+    "build-plugin-ice-mpa": "1.1.8",
+    "build-plugin-ice-request": "1.1.8",
+    "build-plugin-ice-router": "1.1.8",
+    "build-plugin-ice-ssr": "1.1.8",
+    "build-plugin-ice-store": "1.1.8",
+    "build-plugin-react-app": "1.1.8",
     "chokidar": "^3.3.1",
     "commander": "^5.0.0",
     "detect-port": "^1.3.0",
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.6",
+  "version": "1.1.8",
   "description": "Define application config in icejs",
   "author": "ice-admin@alibaba-inc.com",
   "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.6",
+  "version": "1.1.8",
   "description": "the core plugin for icejs.",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "",
diff --git a/packages/plugin-core/src/utils/getPages.ts b/packages/plugin-core/src/utils/getPages.ts
@@ -10,8 +10,8 @@ function getPages(rootDir: string): string[] {
     })
     .map((page) => {
       const { name } = path.parse(page);
-      return name.replace(/^\S/,(s) => s.toUpperCase());
+      return name;
     }) : [];
 }
 
-export default getPages;
+export default getPages;
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.6",
+  "version": "1.1.8",
   "description": "builtin helpers in icejs",
   "author": "ice-admin@alibaba-inc.com",
   "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.6",
+  "version": "1.1.8",
   "description": "Easy use `icestark` in icejs.",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "",
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.6",
+  "version": "1.1.8",
   "description": "builtin logger in icejs",
   "author": "ice-admin@alibaba-inc.com",
   "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.6",
+  "version": "1.1.8",
   "description": "enable mpa project for icejs framework",
   "author": "ice-admin@alibaba-inc.com",
   "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.6",
+  "version": "1.1.8",
   "description": "The basic webpack configuration for ice project",
   "author": "ice-admin@alibaba-inc.com",
   "main": "src/index.js",
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.6",
+  "version": "1.1.8",
   "description": "Easy use `rematch` in icejs",
   "author": "ice-admin@alibaba-inc.com",
   "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.6",
+  "version": "1.1.8",
   "description": "request for build-plugin-ice-request",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "",
diff --git a/packages/plugin-rml/package.json b/packages/plugin-rml/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-rml",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "RML loader for icejs",
   "author": "ice-admin@alibaba-inc.com",
   "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.6",
+  "version": "1.1.8",
   "description": "build-plugin-ice-router",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "",
diff --git a/packages/plugin-service/package.json b/packages/plugin-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ice-service",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "service pulgin",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "https://github.com/ice-lab/icejs#readme",
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.6",
+  "version": "1.1.8",
   "description": "ssr plugin",
   "author": "ice-admin@alibaba-inc.com",
   "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.6",
+  "version": "1.1.8",
   "description": "builtin `icestore` in icejs",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "",
diff --git a/packages/plugin-store/src/babelPluginReplacePath.ts b/packages/plugin-store/src/babelPluginReplacePath.ts
@@ -1,7 +1,10 @@
 import * as path from 'path';
 
 module.exports = ({ types: t }, { routesPath, alias }) => {
-  const regex = /src\/pages\/\w+(.tsx|.jsx)?(\/index(.tsx|.jsx)?)?/;
+  // match:
+  // src/pages/home  | src/pages/home/index | src/pages/home/index(.tsx|.jsx)
+  // src/pages/index | src/pages/home/index(.tsx|.jsx)
+  const regex = /src\/pages\/\w+((.tsx|.jsx?)$|(\/index(.tsx|.jsx?))?$)/;
   const isConventionRouting = /\.ice\/routes\.ts/.test(routesPath);
 
   return {
diff --git a/packages/plugin-store/src/template/pageComponent.tsx.ejs b/packages/plugin-store/src/template/pageComponent.tsx.ejs
@@ -9,10 +9,10 @@ const PageComponentName = <%= pageComponentExport %>;
 
 <% if(hasPageStore) { %>
   const PageProvider = store.Provider;
-  const StoreWrapperedPage = () => {
+  const StoreWrapperedPage = (props) => {
     return (
       <PageProvider>
-        <PageComponentName />
+        <PageComponentName {...props} />
       </PageProvider>
     )
   }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "1.1.6",`
	`2`	`+ "version": "1.1.8",`
`3`	`3`	`"npmClient": "yarn",`
`4`	`4`	`"useWorkspaces": true,`
`5`	`5`	`"packages": [`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ice.js",`
`3`	`3`	`"private": true,`
`4`		`- "version": "1.1.6",`
	`4`	`+ "version": "1.1.7",`
`5`	`5`	`"workspaces": [`
`6`	`6`	`"packages/*"`
`7`	`7`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-ice",`
`3`		`- "version": "1.1.6",`
	`3`	`+ "version": "1.1.8",`
`4`	`4`	`"description": "npm init ice",`
`5`	`5`	`"author": "ice-admin@alibaba-inc.com",`
`6`	`6`	`"homepage": "",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "build-plugin-ice-config",`
`3`		`- "version": "1.1.6",`
	`3`	`+ "version": "1.1.8",`
`4`	`4`	`"description": "Define application config in icejs",`
`5`	`5`	`"author": "ice-admin@alibaba-inc.com",`
`6`	`6`	`"homepage": "",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "build-plugin-ice-core",`
`3`		`- "version": "1.1.6",`
	`3`	`+ "version": "1.1.8",`
`4`	`4`	`"description": "the core plugin for icejs.",`
`5`	`5`	`"author": "ice-admin@alibaba-inc.com",`
`6`	`6`	`"homepage": "",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "build-plugin-ice-helpers",`
`3`		`- "version": "1.1.6",`
	`3`	`+ "version": "1.1.8",`
`4`	`4`	`"description": "builtin helpers in icejs",`
`5`	`5`	`"author": "ice-admin@alibaba-inc.com",`
`6`	`6`	`"homepage": "",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "build-plugin-icestark",`
`3`		`- "version": "1.1.6",`
	`3`	`+ "version": "1.1.8",`
`4`	`4`	"description": "Easy use `icestark` in icejs.",
`5`	`5`	`"author": "ice-admin@alibaba-inc.com",`
`6`	`6`	`"homepage": "",`