Merge pull request #4981 from alibaba/release-next

Release/2.3.0

examples/basic-mpa/build.json

@@ -1,5 +1,4 @@
 {
-  "router": false,
   "vite": true,
   "mpa": {
     "openPage": "Dashboard",

examples/basic-mpa/src/pages/About/app.tsx

@@ -0,0 +1,12 @@
+import React from 'react';
+import { runApp, IAppConfig } from 'ice';
+import Index from './index';
+
+const appConfig: IAppConfig = {
+  router: {
+    type: 'hash',
+    routes: [{ path: '/', component: Index }],
+  },
+};
+
+runApp(appConfig);

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

@@ -0,0 +1,11 @@
+import React from 'react';
+
+const About = () => {
+  return (
+    <>
+      <h2>About Page...</h2>
+    </>
+  );
+};
+
+export default About;

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

@@ -7,7 +7,7 @@ const Provider = store.Provider;
 
 const appConfig: IAppConfig = {
   router: {
-    routes
+    routes,
   },
   app: {
     addProvider({ children }) {

examples/basic-mpa/src/pages/Profile/app.tsx

@@ -0,0 +1,18 @@
+import * as React from 'react';
+import { runApp, IAppConfig } from 'ice';
+import Page from './index';
+import store from './store';
+
+const Provider = store.Provider;
+
+const appConfig: IAppConfig = {
+  app: {
+    rootId: 'custom-container',
+    renderComponent: Page,
+    addProvider: ({ children }) => {
+      return <Provider>{children}</Provider>;
+    }
+  },
+};
+
+runApp(appConfig);

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

@@ -1,9 +1,16 @@
 import React from 'react';
+import store from './store';
 
 const Profile = () => {
+  const [pageState, pageActions] = store.useModel('counter');
   return (
     <>
-      <h2>Profile Page</h2>
+      <h2>Profile Page...</h2>
+      <div>
+        <button type="button" onClick={pageActions.increment}>+</button>
+        <span>{pageState.count}</span>
+        <button type="button" onClick={pageActions.decrement}>-</button>
+      </div>
     </>
   );
 };

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

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

examples/basic-mpa/src/pages/Profile/store.ts

@@ -0,0 +1,6 @@
+import { createStore } from 'ice';
+import counter from './models/counter';
+
+const store = createStore({ counter });
+
+export default store;

examples/basic-spa/build.json

@@ -1,4 +1,5 @@
 {
+  // "router": false,
   "remoteRuntime": true,
   "polyfill": false,
   "ignoreHtmlTemplate": false,

examples/basic-spa/src/app.tsx

@@ -10,6 +10,7 @@ const appConfig: IAppConfig = {
     rootId: 'ice-container',
     errorBoundary: true,
     parseSearchParams: true,
+    // renderComponent: () => <>HELLO</>,
     getInitialData: async() => {
       // const result = await request('/repo');
       const result = {
@@ -33,7 +34,8 @@ const appConfig: IAppConfig = {
   router: {
     basename: '/ice',
     type: 'hash',
-    fallback: <div>加载中...</div>
+    fallback: <div>加载中...</div>,
+    // routes: [{path: '/home', component: () => <>He</>}]
   },
   request: {
     timeout: 5000,

examples/basic-spa/src/pages/About/components/Child.tsx

@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
 
 const Child = () => {
   function getData() {
-    throw new Error('test Error');
+    throw new Error('Child Error');
   }
 
   useEffect(() => {

examples/basic-spa/src/pages/About/components/Todo.tsx

@@ -3,7 +3,7 @@ import React, { PureComponent } from 'react';
 
 class Todo extends PureComponent {
   componentDidMount() {
-    throw new Error('test error boundary');
+    throw new Error('Todo Error');
   }
 
   render() {

examples/icestark-layout/build.json

@@ -4,7 +4,6 @@
   "plugins": [
     "build-plugin-icestark",
     ["build-plugin-fusion", {
-      "themePackage": "@icedesign/theme",
       "themeConfig": {
         "nextPrefix": "next-fd-"
       }

examples/icestark-layout/src/app.tsx

@@ -6,12 +6,9 @@ import { ConfigProvider } from '@alifd/next';
 const appConfig: IAppConfig = {
   app: {
     rootId: 'ice-container',
-    addProvider: ({ children }) => (
-      <ConfigProvider prefix="next-fd-">{children}</ConfigProvider>
-    ),
-  },
-  logger: {
-    level: 'warn'
+    addProvider: ({ children }) => {
+      return <ConfigProvider prefix="next-fd-">{children}</ConfigProvider>;
+    },
   },
   router: {
     type: 'browser',

examples/icestark-layout/src/pages/index.tsx

@@ -0,0 +1,5 @@
+import * as React from 'react';
+
+export default function Home() {
+  return <h2>Index Page</h2>;
+}

examples/spa-renderComponent/build.json

@@ -0,0 +1,7 @@
+{
+  // "vite": true,
+  "store": true,
+  "router": false,
+  "plugins": [],
+  "ssr": true
+}

examples/spa-renderComponent/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "example-simple",
+  "dependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1"
+  },
+  "devDependencies": {
+    "@types/react": "^16.9.20",
+    "@types/react-dom": "^16.9.5"
+  },
+  "scripts": {
+    "start": "../../packages/icejs/bin/ice-cli.js start --mode dev",
+    "build": "../../packages/icejs/bin/ice-cli.js build --mode prod"
+  }
+}

examples/spa-renderComponent/public/index.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width" />
+    <title>icejs · icestark child example</title>
+  </head>
+
+  <body>
+    <div id="ice-container"></div>
+  </body>
+</html>

examples/spa-renderComponent/sandbox.config.json

@@ -0,0 +1,6 @@
+{
+  "template": "node",
+  "container": {
+    "port": 3333
+  }
+}

examples/spa-renderComponent/src/Test.tsx

@@ -0,0 +1,27 @@
+import * as React from 'react';
+import { getSearchParams } from 'ice';
+import store from './store';
+
+export default function Test(props) {
+  console.log('Test props', props);
+  console.log('search params', getSearchParams());
+
+  const [counterState, counterAction] = store.useModel('counter');
+
+  return <>
+    Hello: {props.name}
+    <div>Count: {counterState.count}</div>
+    <div onClick={counterAction.increment}>+</div>
+    <div onClick={counterAction.decrement}>-</div>
+  </>;
+}
+
+Test.pageConfig = {
+  title: '哈哈'
+};
+
+Test.getInitialProps = async (ctx) => {
+  return {
+    name: 'React(getInitialProps)'
+  };
+};

examples/basic-mpa/src/pages/Profile/app.ts → examples/spa-renderComponent/src/app.tsx

@@ -1,11 +1,12 @@
 import { runApp, IAppConfig } from 'ice';
-import Page from './index';
+import Test from './Test';
 
 const appConfig: IAppConfig = {
   app: {
-    rootId: 'custom-container',
+    rootId: 'ice-container',
+    renderComponent: Test,
   },
-  renderComponent: Page,
+  // router: {}
 };
 
 runApp(appConfig);

examples/spa-renderComponent/src/models/counter.ts

@@ -0,0 +1,14 @@
+export default {
+  state: {
+    count: 0,
+  },
+
+  reducers: {
+    increment(prevState) {
+      prevState.count += 1;
+    },
+    decrement(prevState) {
+      prevState.count -= 1;
+    }
+  }
+};

examples/spa-renderComponent/src/store.ts

@@ -0,0 +1,6 @@
+import { createStore } from 'ice';
+import counter from './models/counter';
+
+const store = createStore({ counter });
+
+export default store;

examples/spa-renderComponent/tsconfig.json

@@ -0,0 +1,38 @@
+{
+  "compileOnSave": false,
+  "buildOnSave": false,
+  "compilerOptions": {
+    "baseUrl": ".",
+    "outDir": "build",
+    "module": "esnext",
+    "target": "es6",
+    "jsx": "react",
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "lib": [
+      "es6",
+      "dom"
+    ],
+    "sourceMap": true,
+    "allowJs": true,
+    "rootDir": "./",
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitReturns": true,
+    "noImplicitThis": true,
+    "noImplicitAny": false,
+    "importHelpers": true,
+    "strictNullChecks": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "noUnusedLocals": true,
+    "skipLibCheck": true,
+    "types": ["node"],
+    "paths": {
+      "@/*": [
+        "./src/*"
+      ],
+      "ice": [
+        ".ice/index.ts"
+      ],
+    }
+  }
+}

examples/without-react-router/src/pages/About/app.tsx

@@ -3,9 +3,9 @@ import Main from './index';
 
 const appConfig: IAppConfig = {
   app: {
-    rootId: 'ice-container'
+    rootId: 'ice-container',
+    renderComponent: Main,
   },
-  renderComponent: Main,
 };
 
 runApp(appConfig);

examples/without-react-router/src/pages/Home/app.tsx

@@ -3,9 +3,9 @@ import Main from './index';
 
 const appConfig: IAppConfig = {
   app: {
-    rootId: 'ice-container'
+    rootId: 'ice-container',
+    renderComponent: Main,
   },
-  renderComponent: Main,
 };
 
 runApp(appConfig);

jest.config.js

@@ -9,12 +9,14 @@ module.exports = {
   moduleNameMapper,
   // 'testRunner': 'jest-circus/runner',
   'coverageDirectory': './coverage/',
-  'testEnvironment': 'node',
   'collectCoverage': true,
   'collectCoverageFrom': ['packages/*/lib/*.{js,jsx}'],
   'coveragePathIgnorePatterns': [
     '<rootDir>/node_modules/'
   ],
+  // copy from jest config
+
+  'testEnvironment': 'node',
   'transform': {
     '^.+\\.jsx?$': 'babel-jest',
     '^.+\\.tsx?$': 'ts-jest'
@@ -26,8 +28,15 @@ module.exports = {
   'testPathIgnorePatterns': [
     '/node_modules/',
     '/lib/',
-    'create-cli-utils/',
+    'create-cli-utils/'
   ],
-  // copy from jest config
   'testMatch': [ '**/__tests__/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[jt]s?(x)' ],
+  // For ts-jest use rootDir's tsconfig.json, while unable to resolve references.
+  // The following strategy maybe not the best, but it works.
+  // https://github.com/kulshekhar/ts-jest/issues/1648
+  'globals': {
+    'ts-jest': {
+      'tsconfig': 'tsconfig.settings.json',
+    },
+  },
 };

package.json

@@ -44,6 +44,7 @@
   "devDependencies": {
     "@commitlint/cli": "^8.2.0",
     "@ice/spec": "^1.0.0",
+    "@napi-rs/cli": "^1.1.0",
     "@testing-library/react-hooks": "^3.2.1",
     "@types/dts-bundle": "^0.0.32",
     "@types/jest": "^25.2.1",
@@ -74,8 +75,7 @@
     "simple-git": "^1.132.0",
     "ts-jest": "^26.0.0",
     "ts-node": "^9.0.0",
-    "typescript": "^4.0.0",
-    "@napi-rs/cli": "^1.1.0"
+    "typescript": "^4.0.0"
   },
   "dependencies": {
     "core-js": "^3.6.4"