Merge pull request #157 from ice-lab/release-next

* chore: release version

* fix: semicolons is required (#162)

* chore: fallback example (#169)

* fix: onHook position (#173)

* chore: version

* v1.1.3-alpha.0

* fix: pass location params to StaticRouter (#176)

* fix: pass location params

* fix: context params

* chore: code optimization

* fix: pass staticRouter context

* Feat/enhance request (#161)

* feat: enhance request

* refactor: load module time (#174)

* refactor: load module

Co-authored-by: ClarkXia <xiawenwu41@gmail.com>

* feat: downgraded to csr when ssr error (#179)

* fix: define process.env.APP_MODE in ssr (#181)

* fix: define process.env.APP_MODE in ssr

* fix: modify define plugin

Co-authored-by: 大果 <sobear.me@gmail.com>

* fix: publish script (#180)

* v1.1.3-alpha.1

* fix: ssr to csr (#182)

* fix: use window variable

* chore: typo

* fix: remove define variables

* refactor: server render

* v1.1.3-alpha.2

* chore: fix lint (#183)

* chore: update example

* fix: params

* chore: revert beforeload (#185)

* Revert "Feat/enhance request (#161)"

This reverts commit 0ceed05.

* v1.1.3-alpha.3

* feat: support runtime app_mode (#189)

* feat: support runtime app_mode

* feat: support process.env.SERVER_PORT

* fix: lock core-js version (#184)

* fix: lint error (#190)

* feat: add static module (#188)

* fix: set polyfill

* fix: before load module

* fix: load module in createApp

* chore: rename variable

* feat: support uglify

* refactor: code optim

* fix: window is not defined (#193)

* v1.1.3-alpha.4

* v1.1.3

Author: chenbin92

.eslintrc.js

@@ -2,11 +2,10 @@ const { eslint, tslint, deepmerge } = require('@ice/spec');
 
 const commonRules = {
   "react/jsx-filename-extension": 0,
-  "semi": 0,
   "no-underscore-dangle": 0,
   "class-methods-use-this": 0,
   "no-param-reassign": 0,
-  "comma-dangle": 0,
+  "comma-dangle": 0
 };
 
 const jsRules = deepmerge(eslint, {

examples/basic-mpa/src/pages/Dashboard/app.ts

@@ -1,10 +1,10 @@
-import { createApp, IAppConfig } from 'ice'
-import Dashboard from './index'
+import { createApp, IAppConfig } from 'ice';
+import Dashboard from './index';
 
 const appConfig: IAppConfig = {
   router: {
     routes: [{ path: '/', component: Dashboard }],
   },
-}
+};
 
-createApp(appConfig)
+createApp(appConfig);

examples/basic-mpa/src/pages/Dashboard/index.tsx

@@ -1,8 +1,8 @@
-import * as React from 'react'
-import { store } from 'ice/Dashboard'
+import * as React from 'react';
+import { store } from 'ice/Dashboard';
 
 const Dashboard = () => {
-  const [pageState, pageActions] = store.useModel('counter')
+  const [pageState, pageActions] = store.useModel('counter');
   return (
     <>
       <h2>Dashboard Page...</h2>
@@ -12,7 +12,7 @@ const Dashboard = () => {
         <button type="button" onClick={pageActions.decrement}>-</button>
       </div>
     </>
-  )
-}
+  );
+};
 
-export default Dashboard
+export default Dashboard;

examples/basic-mpa/src/pages/Dashboard/models/counter.ts

@@ -7,10 +7,10 @@ export default {
 
   reducers: {
     increment (prevState) {
-      return { count: prevState.count + 1 }
+      return { count: prevState.count + 1 };
     },
     decrement (prevState) {
-      return { count: prevState.count - 1 }
+      return { count: prevState.count - 1 };
     }
   },
 

examples/basic-mpa/src/pages/Home/app.ts

@@ -1,10 +1,10 @@
-import { createApp, IAppConfig } from 'ice'
-import Home from './index'
+import { createApp, IAppConfig } from 'ice';
+import Home from './index';
 
 const appConfig: IAppConfig = {
   router: {
     routes: [{ path: '/', component: Home }],
   },
-}
+};
 
-createApp(appConfig)
+createApp(appConfig);

examples/basic-mpa/src/pages/Home/index.tsx

@@ -1,15 +1,15 @@
-import React from 'react'
+import React from 'react';
 
 const Home = () => {
   return (
     <>
       <h2>Home Page</h2>
     </>
   );
-}
+};
 
 Home.pageConfig = {
   title: 'Home Page',
 };
 
-export default Home
+export default Home;

examples/basic-request/src/pages/Home/index.tsx

@@ -1,26 +1,29 @@
-import React, { useEffect } from 'react'
-import { useRequest, request } from 'ice'
+import React, { useEffect } from 'react';
+import { useRequest, request } from 'ice';
+
+// 1. request in outside
+request('/user').then(res => console.log('request in outside:', res));
 
 const Home = () => {
-  // 1. useRequest hook
-  const { data, loading, request: fetchRepo } = useRequest({ url: '/repo' })
+  // 2. useRequest hook
+  const { data, loading, request: fetchRepo } = useRequest({ url: '/repo' });
 
   useEffect(() => {
-    fetchRepo()
-    
-    request('/user').then(res => console.log('get:', res))
-    // 2. requse.get alias
-    request.get('/user').then(res => console.log('get:', res))
+    fetchRepo();
+
+    // 3. requse.get alias
+    request.get('/user').then(res => console.log('get:', res));
 
-    // 3. requse.post alias
-    request.post('/users/123').then(res => console.log('post:', res))
+    // 4. requse.post alias
+    request.post('/users/123').then(res => console.log('post:', res));
 
-    // 4. requse.delete alias
-    request.delete('/user/123').then(res => console.log('delete:', res))
+    // 5. requse.delete alias
+    request.delete('/user/123').then(res => console.log('delete:', res));
 
-    // 5. request method
-    request({ url: '/user'}).then((res) => {console.log('request:', res)})
-  }, [])
+    // 6. request method
+    request({ url: '/user'}).then((res) => {console.log('request:', res);});
+    // eslint-disable-next-line
+  }, []);
 
   return (
     <div>
@@ -35,7 +38,7 @@ const Home = () => {
           </>
       }
     </div>
-  )
+  );
 };
 
 export default Home;

examples/basic-request/src/routes.ts

@@ -1,10 +1,10 @@
-import Home from '@/pages/Home'
+import Home from '@/pages/Home';
 
 const routerConfig = [
   {
     path: '/',
     component: Home
   }
-]
+];
 
-export default routerConfig
+export default routerConfig;

examples/basic-spa/mock/index.js

@@ -35,7 +35,7 @@ const projects = [
     description: 'A universal framework based on React.js.',
     logo: 'https://avatars1.githubusercontent.com/u/1961952',
   },
-]
+];
 
 // mock/index.js
 module.exports = {

examples/basic-spa/src/app.ts examples/basic-spa/src/app.tsxexamples/basic-spa/src/app.ts renamed to examples/basic-spa/src/app.tsx

@@ -1,4 +1,5 @@
-import { createApp, APP_MODE, IAppConfig } from 'ice'
+import React from 'react';
+import { createApp, APP_MODE, IAppConfig } from 'ice';
 
 const appConfig: IAppConfig = {
   app: {
@@ -8,19 +9,20 @@ const appConfig: IAppConfig = {
     level: APP_MODE === 'build' ? 'error' : 'debug',
   },
   router: {
-    type: 'hash'
+    type: 'hash',
+    fallback: <div>加载中...</div>
   },
   request: {
     timeout: 5000,
     baseURL: '/',
     interceptors: {
       request: {
         onConfig: (config) => {
-          return config
+          return config;
         }
       }
     }
   }
 };
 
-createApp(appConfig)
+createApp(appConfig);