Merge pull request #4067 from alibaba/release-next

Release/1.15.2
alibaba · Jan 28, 2021 · 1d428d0 · 1d428d0
2 parents 39ec797 + 1343838
commit 1d428d0
Show file tree

Hide file tree

Showing 28 changed files with 639 additions and 377 deletions.
diff --git a/examples/basic-mpa/package.json b/examples/basic-mpa/package.json
@@ -2,7 +2,6 @@
   "name": "exmaple-basic-mpa",
   "description": "",
   "dependencies": {
-    "ice.js": "^1.0.11",
     "react": "^16.4.1",
     "react-dom": "^16.4.1"
   },

diff --git a/examples/basic-ssr-with-lazy-load/src/app.tsx b/examples/basic-ssr-with-lazy-load/src/app.tsx
@@ -1,11 +1,23 @@
-import { runApp, IAppConfig, config, request } from 'ice';
+import { runApp, IAppConfig, config } from 'ice';
 import React from 'react';
 
+const delay = (time) => new Promise<void>((resolve) => setTimeout(() => resolve(), time));
+
 const appConfig: IAppConfig = {
   app: {
     getInitialData: async () => {
-      const res = await request('/user');
-      return res;
+      // const res = await request('/user');
+      // return res;
+      await delay(1500);
+
+      return {
+        data: {
+          user: {
+            name: 'Jack Ma',
+            id: 10001,
+          }
+        },
+      };
     }
   },
   router: {

diff --git a/examples/basic-ssr-with-lazy-load/src/pages/Home/index.tsx b/examples/basic-ssr-with-lazy-load/src/pages/Home/index.tsx
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
-import { request, Link, logger, Helmet, store as appStore } from 'ice';
+import { Link, logger, Helmet, store as appStore } from 'ice';
+import pageStore from './store';
 import styles from './index.module.scss';
 
 export default function Home(props) {
@@ -13,29 +14,42 @@ export default function Home(props) {
   }, []);
 
   const [userState] = appStore.useModel('user');
+  const [counterState] = pageStore.useModel('counter');
 
   return (
-    <>
+    <main>
       <Helmet>
         <meta charSet="utf-8" />
         <title>{props.title}</title>
         <meta name="keywords" content={props.keywords} />
         <meta name="description" content={props.description} />
       </Helmet>
       <h2 className={styles.title}>{props.title}</h2>
-      <div>
-        <div><strong>name：</strong>{userState.name}</div>
-        <div><strong>id：</strong>{userState.id}</div>
-        <div><strong>address：</strong>{props.profile && props.profile.address}</div>
-        <div><strong>data：</strong>{dataSource.join(' ')}</div>
-      </div>
+      <div>counterState: {counterState.count}</div>
+      <div>name: {userState.name}</div>
+      <div>id: {userState.id}</div>
+      <div>address: {props.profile && props.profile.address}</div>
+      <strong>data: {dataSource.join(' ')}</strong>
       <br />
       <Link to="/about">about</Link>
-    </>
+    </main>
   );
 }
 
 Home.getInitialProps = async () => {
-  const res = await request('/profile');
+  // const res = await request('/profile');
+  const res = {
+    data: {
+      profile: {
+        id: 10001,
+        name: 'Jack Ma',
+        edu: 'Hangzhou Normal University',
+        address: 'Hangzhou'
+      },
+      title: 'Home Page...',
+      content: 'Home Content...',
+      description: 'Home Description...'
+    }
+  };
   return { ...res.data, title: 'Home Page...' };
 };
diff --git a/examples/basic-ssr-with-lazy-load/src/pages/Home/models/counter.ts b/examples/basic-ssr-with-lazy-load/src/pages/Home/models/counter.ts
@@ -0,0 +1,5 @@
+export default {
+  state: {
+    count: 1
+  }
+};
diff --git a/examples/basic-ssr-with-lazy-load/src/pages/Home/store.ts b/examples/basic-ssr-with-lazy-load/src/pages/Home/store.ts
@@ -0,0 +1,6 @@
+import { createStore } from 'ice';
+import counter from './models/counter';
+
+const models = { counter };
+
+export default createStore(models);
diff --git a/examples/basic-ssr/src/app.ts b/examples/basic-ssr/src/app.ts
@@ -1,12 +1,23 @@
-import { runApp, IAppConfig, config, request } from 'ice';
+import { runApp, IAppConfig, config } from 'ice';
+
+const delay = (time) => new Promise<void>((resolve) => setTimeout(() => resolve(), time));
 
 const appConfig: IAppConfig = {
   app: {
-    getInitialData: async (ctx) => {
-      console.log('getInitialData ctx', ctx);
+    getInitialData: async () => {
+      // console.log('getInitialData ctx', ctx);
 
-      const res = await request('/user');
-      return res;
+      // const res = await request('/user');
+      // return res;
+      await delay(1500);
+      return {
+        data: {
+          user: {
+            name: 'Jack Ma',
+            id: 10001,
+          }
+        },
+      };
     }
   },
   router: {

diff --git a/examples/basic-ssr/src/pages/Home/index.tsx b/examples/basic-ssr/src/pages/Home/index.tsx
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
-import { request, Link, logger, Helmet, store as appStore } from 'ice';
+import { Link, logger, Helmet, store as appStore } from 'ice';
+import pageStore from './store';
 import styles from './index.module.scss';
 
 export default function Home(props) {
@@ -13,30 +14,45 @@ export default function Home(props) {
   }, []);
 
   const [userState] = appStore.useModel('user');
+  const [counterState] = pageStore.useModel('counter');
 
   return (
-    <>
+    <main>
       <Helmet>
         <meta charSet="utf-8" />
         <title>{props.title}</title>
         <meta name="keywords" content={props.keywords} />
         <meta name="description" content={props.description} />
       </Helmet>
       <h2 className={styles.title}>{props.title}</h2>
-      <div>
-        <div><strong>name：</strong>{userState.name}</div>
-        <div><strong>id：</strong>{userState.id}</div>
-        <div><strong>address：</strong>{props.profile && props.profile.address}</div>
-        <div><strong>data：</strong>{dataSource.join(' ')}</div>
-      </div>
+      <div>counterState: {counterState.count}</div>
+      <div>name: {userState.name}</div>
+      <div>id: {userState.id}</div>
+      <div>address: {props.profile && props.profile.address}</div>
+      <strong>data: {dataSource.join(' ')}</strong>
       <br />
       <Link to="/about">about</Link>
+      <br />
       <Link to="/dashboard">dashboard</Link>
-    </>
+    </main>
   );
 }
 
 Home.getInitialProps = async () => {
-  const res = await request('/profile');
+  // const res = await request('/profile');
+  const res = {
+    data: {
+      profile: {
+        id: 10001,
+        name: 'Jack Ma',
+        edu: 'Hangzhou Normal University',
+        address: 'Hangzhou'
+      },
+      title: 'Home Page...',
+      content: 'Home Content...',
+      description: 'Home Description...'
+    }
+  };
+
   return { ...res.data, title: 'Home Page...' };
 };
diff --git a/examples/basic-ssr/src/pages/Home/models/counter.ts b/examples/basic-ssr/src/pages/Home/models/counter.ts
@@ -0,0 +1,5 @@
+export default {
+  state: {
+    count: 1
+  }
+};
diff --git a/examples/basic-ssr/src/pages/Home/store.ts b/examples/basic-ssr/src/pages/Home/store.ts
@@ -0,0 +1,6 @@
+import { createStore } from 'ice';
+import counter from './models/counter';
+
+const models = { counter };
+
+export default createStore(models);
diff --git a/package.json b/package.json
@@ -43,6 +43,7 @@
     "@types/node": "^14.14.21",
     "@types/puppeteer": "^5.4.2",
     "ali-oss": "^6.7.0",
+    "cheerio": "^1.0.0-rc.3",
     "codecov": "^3.6.5",
     "create-test-server": "^3.0.1",
     "dependency-check": "^4.1.0",

diff --git a/packages/create-app-shared/package.json b/packages/create-app-shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-app-shared",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "https://github.com/alibaba/ice#readme",
@@ -30,4 +30,4 @@
   "bugs": {
     "url": "https://github.com/alibaba/ice/issues"
   }
-}
+}
diff --git a/packages/create-app-shared/src/createBaseApp.ts b/packages/create-app-shared/src/createBaseApp.ts
@@ -2,7 +2,6 @@ import RuntimeModule from './runtimeModule';
 import { createHistory } from './history';
 import { isMiniAppPlatform } from './env';
 import collectAppLifeCycle from './collectAppLifeCycle';
-import getSearchParams from './getSearchParams';
 
 // eslint-disable-next-line
 const deepmerge = require('deepmerge');
@@ -17,7 +16,7 @@ const DEFAULE_APP_CONFIG = {
 };
 
 export default ({ loadRuntimeModules, createElement, initHistory = true }) => {
-  const createBaseApp = async (appConfig, buildConfig, context: any = {}) => {
+  const createBaseApp = (appConfig, buildConfig, context: any = {}) => {
 
     // Merge default appConfig to user appConfig
     appConfig = deepmerge(DEFAULE_APP_CONFIG, appConfig);
@@ -32,17 +31,6 @@ export default ({ loadRuntimeModules, createElement, initHistory = true }) => {
       appConfig.router.history = history;
     }
 
-    if (!context.initialData && appConfig?.app?.getInitialData) {
-      const location = history.location ? history.location : window.location;
-      const pathname = location.pathname;
-      context.initialData = await appConfig.app.getInitialData({
-        pathname,
-        path: pathname,
-        query: getSearchParams(location),
-        ssrError: (window as any)?.__ICE_SSR_ERROR__
-      });
-    }
-
     context.createElement = createElement;
 
     // Load runtime modules
@@ -51,7 +39,6 @@ export default ({ loadRuntimeModules, createElement, initHistory = true }) => {
 
     // Collect app lifeCyle
     collectAppLifeCycle(appConfig);
-
     return {
       history,
       runtime,

diff --git a/packages/create-app-shared/src/getSearchParams.ts b/packages/create-app-shared/src/getSearchParams.ts
@@ -1,8 +1,7 @@
 import * as queryString from 'query-string';
 import { getHistory } from './history';
 
-export default function(location?) {
-  if (location) return queryString.parse(location.search);
+export default function() {
   const history = getHistory();
   if (history && history.location && history.location.search) {
     return queryString.parse(history.location.search);

diff --git a/packages/icejs/package.json b/packages/icejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ice.js",
-  "version": "1.15.1",
+  "version": "1.15.2",
   "description": "command line interface and builtin plugin for icejs",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "",
@@ -31,8 +31,8 @@
     "build-plugin-ice-mpa": "1.8.4",
     "build-plugin-ice-request": "1.7.4",
     "build-plugin-ice-router": "1.9.0",
-    "build-plugin-ice-ssr": "2.0.0",
-    "build-plugin-ice-store": "1.9.2",
+    "build-plugin-ice-ssr": "2.0.1",
+    "build-plugin-ice-store": "1.9.3",
     "build-plugin-react-app": "1.8.0",
     "build-plugin-miniapp": "0.1.7",
     "chalk": "^4.1.0",

diff --git a/packages/miniapp-renderer/package.json b/packages/miniapp-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "miniapp-renderer",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "https://github.com/alibaba/ice#readme",

diff --git a/packages/miniapp-renderer/src/miniappRenderer.ts b/packages/miniapp-renderer/src/miniappRenderer.ts
@@ -1,10 +1,10 @@
-async function miniappRenderer(
+function miniappRenderer(
   { appConfig = {} as any, createBaseApp, createHistory, staticConfig, pageProps, emitLifeCycles, ErrorBoundary },
   { mount, unmount, createElement, Component }
 ) {
   const history = createHistory({ routes: staticConfig.routes });
 
-  const { runtime } = await createBaseApp(appConfig);
+  const { runtime } = createBaseApp(appConfig);
   const AppProvider = runtime?.composeAppProvider?.();
 
   const { app = {} } = appConfig;

diff --git a/packages/plugin-app-core/package.json b/packages/plugin-app-core/package.json
@@ -39,4 +39,4 @@
     "url": "git@github.com:alibaba/ice.git"
   },
   "gitHead": "07ac7bb07162aac8c90778dd1de4a2060f8df498"
-}
+}
diff --git a/packages/plugin-ice-ssr/package.json b/packages/plugin-ice-ssr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "build-plugin-ice-ssr",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "ssr plugin",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "",
@@ -32,4 +32,4 @@
     "parseurl": "^1.3.3",
     "query-string": "^6.13.7"
   }
-}
+}
diff --git a/packages/plugin-ice-ssr/src/server.ts.ejs b/packages/plugin-ice-ssr/src/server.ts.ejs
@@ -75,7 +75,7 @@ const serverRender = async ({ ctx = {}, pathname, initialData, htmlTemplate, loa
 
     // generate bundle content and register global variables in html
     console.log('[SSR]', 'generating html content');
-    const renderResult = await reactAppRendererWithSSR({
+    const renderResult = reactAppRendererWithSSR({
       initialContext,
       initialData,
       pageInitialProps
@@ -109,7 +109,7 @@ const serverRender = async ({ ctx = {}, pathname, initialData, htmlTemplate, loa
     error = e;
     $('head').append(`
     <script>
-      window.__ICE_SSR_ERROR__ = '${error}';
+      window.__ICE_SSR_ERROR__ = "${(error instanceof Error ? error.message : error).replace(/\"/g, '\'')}";
     </script>`)
     logError('[SSR] generate html template error');
   }

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.9.2",
+  "version": "1.9.3",
   "description": "builtin `icestore` in icejs",
   "author": "ice-admin@alibaba-inc.com",
   "homepage": "",