Merge pull request #5090 from alibaba/release/2.5.0

Release/2.5.0
alibaba · Jan 17, 2022 · 9431415 · 9431415
2 parents a33146c + 4f833cf
commit 9431415
Show file tree

Hide file tree

Showing 185 changed files with 3,241 additions and 308 deletions.
diff --git a/examples/basic-i18n/build.json b/examples/basic-i18n/build.json
@@ -0,0 +1,17 @@
+{
+  "plugins": [
+    [
+      "build-plugin-ice-i18n",
+      {
+        "locales": [
+          "zh-CN",
+          "en-US"
+        ],
+        "defaultLocale": "zh-CN",
+        "redirect": true
+      }
+    ]
+  ],
+  "vite": false,
+  "ssr": "static"
+}
diff --git a/examples/basic-i18n/package.json b/examples/basic-i18n/package.json
@@ -0,0 +1,18 @@
+{
+  "dependencies": {
+    "react": "^17.0.0",
+    "react-dom": "^17.0.0",
+    "react-intl": "^5.22.0"
+  },
+  "devDependencies": {
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0"
+  },
+  "scripts": {
+    "start": "RUNTIME_DEBUG=true ../../packages/icejs/bin/ice-cli.js start",
+    "build": "../../packages/icejs/bin/ice-cli.js build"
+  },
+  "engines": {
+    "node": ">=8.0.0"
+  }
+}
diff --git a/examples/basic-i18n/public/favicon.png b/examples/basic-i18n/public/favicon.png
diff --git a/examples/basic-i18n/public/index.html b/examples/basic-i18n/public/index.html
@@ -0,0 +1,15 @@
+<!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 · i18n example</title>
+</head>
+
+<body>
+  <div id="ice-container"></div>
+</body>
+
+</html>
diff --git a/examples/basic-i18n/src/app.tsx b/examples/basic-i18n/src/app.tsx
@@ -0,0 +1,34 @@
+import { runApp, IAppConfig, useLocale, getDefaultLocale } from 'ice';
+import { IntlProvider as ReactIntlProvider } from 'react-intl';
+import { messages } from './locales';
+
+function IntlProvider({ children }) {
+  const [locale] = useLocale();
+  const defaultLocale = getDefaultLocale();
+
+  return (
+    <ReactIntlProvider 
+      messages={messages[locale]} 
+      locale={locale}
+      defaultLocale={defaultLocale}
+    >
+      {children}
+    </ReactIntlProvider>
+  );
+}
+
+const appConfig: IAppConfig = {
+  router: {
+    type: 'browser',
+    basename: '/ice'
+  },
+  app: {
+    addProvider: ({ children }) => {
+      return (
+        <IntlProvider>{children}</IntlProvider>
+      );
+    }
+  }
+};
+
+runApp(appConfig);
diff --git a/examples/basic-i18n/src/components/LocaleSwitcher.tsx b/examples/basic-i18n/src/components/LocaleSwitcher.tsx
@@ -0,0 +1,26 @@
+import { FormattedMessage } from 'react-intl';
+import { useLocale, getAllLocales, Link, useLocation } from 'ice';
+
+export default function LocaleSwitcher() {
+  const location = useLocation();
+
+  const [activeLocale, setLocale] = useLocale();
+  const allLocales = getAllLocales();
+  const otherLocales = allLocales.filter((locale) => activeLocale !== locale);
+  return (
+    <div>
+      <p><FormattedMessage id="localeSwitcher" />:</p>
+      <ul>
+        {
+          otherLocales.map((locale: string) => {
+            return (
+              <li key={locale}>
+                <Link to={location.pathname} onClick={() => setLocale(locale)}>{locale}</Link>
+              </li>
+            );
+          })
+        }
+      </ul>
+    </div>
+  );
+}
diff --git a/examples/basic-i18n/src/layouts/BasicLayout/index.module.less b/examples/basic-i18n/src/layouts/BasicLayout/index.module.less
@@ -0,0 +1,5 @@
+.basicLayout {
+  h1 {
+    color: red;
+  }
+}
diff --git a/examples/basic-i18n/src/layouts/BasicLayout/index.tsx b/examples/basic-i18n/src/layouts/BasicLayout/index.tsx
@@ -0,0 +1,13 @@
+import { FormattedMessage } from 'react-intl';
+import styles from './index.module.less';
+
+function BasicLayout({ children }) {
+  return (
+    <main className={styles.basicLayout}>
+      <h1><FormattedMessage id="basicLayout" /></h1>
+      {children}
+    </main>
+  );
+}
+
+export default BasicLayout;
diff --git a/examples/basic-i18n/src/locales/index.ts b/examples/basic-i18n/src/locales/index.ts
@@ -0,0 +1,2 @@
+export * from './locales';
+export * from './messages';
diff --git a/examples/basic-i18n/src/locales/locales.ts b/examples/basic-i18n/src/locales/locales.ts
@@ -0,0 +1,4 @@
+export const LOCALES = {
+  ENGLISH: 'en-US',
+  ZH_CN: 'zh-CN'
+};
diff --git a/examples/basic-i18n/src/locales/messages.ts b/examples/basic-i18n/src/locales/messages.ts
@@ -0,0 +1,22 @@
+import { LOCALES } from './locales';
+
+export const messages = {
+  [LOCALES.ENGLISH]: {
+    homeTitle: 'Home',
+    aboutTitle: 'About',
+    currentLocale: 'Current locale',
+    defaultLocale: 'Default locale',
+    configuredLocales: 'Configured locales',
+    localeSwitcher: 'Locale Switcher',
+    basicLayout: 'BasicLayout',
+  },
+  [LOCALES.ZH_CN]: {
+    homeTitle: '首页',
+    aboutTitle: '关于',
+    currentLocale: '当前语言',
+    defaultLocale: '默认语言',
+    configuredLocales: '配置的语言',
+    localeSwitcher: '语言切换',
+    basicLayout: '主布局'
+  },
+};
diff --git a/examples/basic-i18n/src/pages/About/index.tsx b/examples/basic-i18n/src/pages/About/index.tsx
@@ -0,0 +1,21 @@
+import { useLocale, getAllLocales, getDefaultLocale, Link } from 'ice';
+import { FormattedMessage } from 'react-intl';
+import LocaleSwitcher from '@/components/LocaleSwitcher';
+
+function About() {
+  const [locale] = useLocale();
+  const allLocales = getAllLocales();
+  const defaultLocale = getDefaultLocale();
+  return (
+    <div>
+      <h2><FormattedMessage id="aboutTitle" /></h2>
+      <div><FormattedMessage id="configuredLocales" />: {JSON.stringify(allLocales)}</div>
+      <div><FormattedMessage id="defaultLocale" />: {defaultLocale}</div>
+      <div><FormattedMessage id="currentLocale" />: {locale}</div>
+      <Link to="/">Home</Link>
+      <LocaleSwitcher />
+    </div>
+  );
+}
+
+export default About;
diff --git a/examples/basic-i18n/src/pages/Home/index.tsx b/examples/basic-i18n/src/pages/Home/index.tsx
@@ -0,0 +1,25 @@
+import { useLocale, getAllLocales, getDefaultLocale, Link, getLocale } from 'ice';
+import { FormattedMessage } from 'react-intl';
+import LocaleSwitcher from '@/components/LocaleSwitcher';
+
+function Home() {
+  const [locale] = useLocale();
+  const allLocales = getAllLocales();
+  const defaultLocale = getDefaultLocale();
+  return (
+    <div>
+      <h2><FormattedMessage id="homeTitle" /></h2>
+      <div><FormattedMessage id="configuredLocales" />: {JSON.stringify(allLocales)}</div>
+      <div><FormattedMessage id="defaultLocale" />: {defaultLocale}</div>
+      <div><FormattedMessage id="currentLocale" />: {locale}</div>
+      <Link to="/about">About</Link>
+      <LocaleSwitcher />
+    </div>
+  );
+}
+
+Home.getInitialProps = function () {
+  console.log('getLocale in getInitialProps', getLocale());
+};
+
+export default Home;
diff --git a/examples/basic-i18n/src/routes.ts b/examples/basic-i18n/src/routes.ts
@@ -0,0 +1,25 @@
+import { IRouterConfig } from 'ice';
+import BasicLayout from '@/layouts/BasicLayout';
+import Home from '@/pages/Home';
+import About from '@/pages/About';
+
+const routerConfig: IRouterConfig[] = [
+  {
+    path: '/',
+    component: BasicLayout,
+    children: [
+      {
+        path: '/about',
+        exact: true,
+        component: About
+      },
+      {
+        path: '/',
+        exact: true,
+        component: Home,
+      },
+    ]
+  },
+];
+
+export default routerConfig;
diff --git a/examples/basic-i18n/src/typing.d.ts b/examples/basic-i18n/src/typing.d.ts
@@ -0,0 +1,6 @@
+declare module '*.module.less' {
+  const classes: { [key: string]: string };
+  export default classes;
+}
+
+declare module '*.svg'
diff --git a/examples/basic-i18n/tsconfig.json b/examples/basic-i18n/tsconfig.json
@@ -0,0 +1,34 @@
+{
+  "compileOnSave": false,
+  "buildOnSave": false,
+  "compilerOptions": {
+    "baseUrl": ".",
+    "outDir": "build",
+    "module": "esnext",
+    "target": "es6",
+    "jsx": "react-jsx",
+    "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"],
+      "ice/*": [".ice/pages/*"]
+    }
+  },
+  "include": ["src/*"],
+  "exclude": ["node_modules", "build", "public"]
+}
diff --git a/examples/basic-mpa/build.json → examples/basic-mpa-vite/build.json b/examples/basic-mpa/build.json → examples/basic-mpa-vite/build.json
diff --git a/examples/basic-mpa/package.json → examples/basic-mpa-vite/package.json b/examples/basic-mpa/package.json → examples/basic-mpa-vite/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "exmaple-basic-mpa",
+  "name": "basic-mpa-vite",
   "description": "",
   "dependencies": {
     "react": "^16.4.1",

diff --git a/examples/basic-mpa/public/index.html → examples/basic-mpa-vite/public/index.html b/examples/basic-mpa/public/index.html → examples/basic-mpa-vite/public/index.html
diff --git a/examples/basic-mpa/public/web.html → examples/basic-mpa-vite/public/web.html b/examples/basic-mpa/public/web.html → examples/basic-mpa-vite/public/web.html
diff --git a/examples/basic-mpa/sandbox.config.json → examples/basic-mpa-vite/sandbox.config.json b/examples/basic-mpa/sandbox.config.json → examples/basic-mpa-vite/sandbox.config.json
diff --git a/examples/basic-mpa/src/pages/About/app.tsx → ...es/basic-mpa-vite/src/pages/About/app.tsx b/examples/basic-mpa/src/pages/About/app.tsx → ...es/basic-mpa-vite/src/pages/About/app.tsx
diff --git a/examples/basic-mpa/src/pages/About/index.tsx → .../basic-mpa-vite/src/pages/About/index.tsx b/examples/basic-mpa/src/pages/About/index.tsx → .../basic-mpa-vite/src/pages/About/index.tsx
diff --git a/...les/basic-mpa/src/pages/Dashboard/app.tsx → ...asic-mpa-vite/src/pages/Dashboard/app.tsx b/...les/basic-mpa/src/pages/Dashboard/app.tsx → ...asic-mpa-vite/src/pages/Dashboard/app.tsx
diff --git a/...s/basic-mpa/src/pages/Dashboard/index.tsx → ...ic-mpa-vite/src/pages/Dashboard/index.tsx b/...s/basic-mpa/src/pages/Dashboard/index.tsx → ...ic-mpa-vite/src/pages/Dashboard/index.tsx
diff --git a/...mpa/src/pages/Dashboard/models/counter.ts → ...ite/src/pages/Dashboard/models/counter.ts b/...mpa/src/pages/Dashboard/models/counter.ts → ...ite/src/pages/Dashboard/models/counter.ts
diff --git a/...s/basic-mpa/src/pages/Dashboard/routes.ts → ...ic-mpa-vite/src/pages/Dashboard/routes.ts b/...s/basic-mpa/src/pages/Dashboard/routes.ts → ...ic-mpa-vite/src/pages/Dashboard/routes.ts
diff --git a/...es/basic-mpa/src/pages/Dashboard/store.ts → ...sic-mpa-vite/src/pages/Dashboard/store.ts b/...es/basic-mpa/src/pages/Dashboard/store.ts → ...sic-mpa-vite/src/pages/Dashboard/store.ts
diff --git a/...ples/basic-mpa/src/pages/Detail/index.tsx → ...basic-mpa-vite/src/pages/Detail/index.tsx b/...ples/basic-mpa/src/pages/Detail/index.tsx → ...basic-mpa-vite/src/pages/Detail/index.tsx
diff --git a/examples/basic-mpa/src/pages/Home/index.tsx → ...s/basic-mpa-vite/src/pages/Home/index.tsx b/examples/basic-mpa/src/pages/Home/index.tsx → ...s/basic-mpa-vite/src/pages/Home/index.tsx
diff --git a/examples/basic-mpa/src/pages/Home/model.ts → ...es/basic-mpa-vite/src/pages/Home/model.ts b/examples/basic-mpa/src/pages/Home/model.ts → ...es/basic-mpa-vite/src/pages/Home/model.ts
diff --git a/examples/basic-mpa/src/pages/Home/store.ts → ...es/basic-mpa-vite/src/pages/Home/store.ts b/examples/basic-mpa/src/pages/Home/store.ts → ...es/basic-mpa-vite/src/pages/Home/store.ts
diff --git a/examples/basic-mpa/src/pages/Profile/app.tsx → .../basic-mpa-vite/src/pages/Profile/app.tsx b/examples/basic-mpa/src/pages/Profile/app.tsx → .../basic-mpa-vite/src/pages/Profile/app.tsx
diff --git a/...les/basic-mpa/src/pages/Profile/index.tsx → ...asic-mpa-vite/src/pages/Profile/index.tsx b/...les/basic-mpa/src/pages/Profile/index.tsx → ...asic-mpa-vite/src/pages/Profile/index.tsx
diff --git a/...c-mpa/src/pages/Profile/models/counter.ts → ...-vite/src/pages/Profile/models/counter.ts b/...c-mpa/src/pages/Profile/models/counter.ts → ...-vite/src/pages/Profile/models/counter.ts
diff --git a/...ples/basic-mpa/src/pages/Profile/store.ts → ...basic-mpa-vite/src/pages/Profile/store.ts b/...ples/basic-mpa/src/pages/Profile/store.ts → ...basic-mpa-vite/src/pages/Profile/store.ts
diff --git a/examples/basic-mpa/tsconfig.json → examples/basic-mpa-vite/tsconfig.json b/examples/basic-mpa/tsconfig.json → examples/basic-mpa-vite/tsconfig.json
diff --git a/examples/basic-mpa-webpack/build.json b/examples/basic-mpa-webpack/build.json
@@ -0,0 +1,19 @@
+{
+  "mpa": {
+    "openPage": "Dashboard",
+    "template": {
+      "web.html": [
+        "Dashboard",
+        "Home"
+      ]
+    },
+    "rewrites": {
+      "dashboard": "site/dashboard"
+    }
+  },
+  "devServer": {
+    "devMiddleware": {
+      "writeToDisk": true
+    }
+  }
+}
diff --git a/examples/basic-mpa-webpack/package.json b/examples/basic-mpa-webpack/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "basic-mpa-webpack",
+  "description": "",
+  "dependencies": {
+    "react": "^16.4.1",
+    "react-dom": "^16.4.1"
+  },
+  "devDependencies": {
+    "@types/react": "^16.9.13",
+    "@types/react-dom": "^16.9.4"
+  },
+  "scripts": {
+    "start": "../../packages/icejs/bin/ice-cli.js start",
+    "build": "../../packages/icejs/bin/ice-cli.js build"
+  },
+  "engines": {
+    "node": ">=8.0.0"
+  }
+}
diff --git a/examples/basic-mpa-webpack/public/index.html b/examples/basic-mpa-webpack/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 · mpa example</title>
+  </head>
+  <body>
+    <div>current page: <%= pageName %></div>
+    <div id="ice-container"></div>
+  </body>
+</html>
diff --git a/examples/basic-mpa-webpack/public/web.html b/examples/basic-mpa-webpack/public/web.html
@@ -0,0 +1,14 @@
+<!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 · mpa example</title>
+  </head>
+
+  <body>
+    <div>using web.html template</div>
+    <div id="ice-container"></div>
+  </body>
+</html>
diff --git a/examples/basic-mpa-webpack/sandbox.config.json b/examples/basic-mpa-webpack/sandbox.config.json
@@ -0,0 +1,6 @@
+{
+  "template": "node",
+  "container": {
+    "port": 3333
+  }
+}
diff --git a/examples/basic-mpa-webpack/src/pages/About/app.tsx b/examples/basic-mpa-webpack/src/pages/About/app.tsx
@@ -0,0 +1,11 @@
+import { runApp, IAppConfig } from 'ice';
+import Index from './index';
+
+const appConfig: IAppConfig = {
+  router: {
+    type: 'hash',
+    routes: [{ path: '/', component: Index }],
+  },
+};
+
+runApp(appConfig);
diff --git a/examples/basic-mpa-webpack/src/pages/About/index.tsx b/examples/basic-mpa-webpack/src/pages/About/index.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+const About = () => {
+  return (
+    <>
+      <h2>About Page...</h2>
+    </>
+  );
+};
+
+export default About;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from './locales';
		export * from './messages';