From 3ca8f6e557e8a93d9a5ab4b108e9088c47233779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=93=E9=99=8C=E5=90=8C=E5=AD=A6?=
 <answershuto@gmail.com>
Date: Mon, 15 Aug 2022 16:34:32 +0800
Subject: [PATCH 01/31] Fix/forward ref input compat (#444)

* fix: use forwardRef to InputCompat for pass ref

* chore: modify type of ref
---
 packages/rax-compat/src/create-element.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/rax-compat/src/create-element.ts b/packages/rax-compat/src/create-element.ts
index 43eb2d843..b77f45fd8 100644
--- a/packages/rax-compat/src/create-element.ts
+++ b/packages/rax-compat/src/create-element.ts
@@ -6,7 +6,7 @@ import type {
   RefObject,
   SyntheticEvent,
 } from 'react';
-import { createElement as _createElement, useEffect, useCallback, useRef, useState } from 'react';
+import { createElement as _createElement, useEffect, useCallback, useRef, useState, forwardRef as _forwardRef } from 'react';
 import { cached, convertUnit } from 'style-unit';
 import { observerElement } from './visibility';
 import { isFunction, isObject, isNumber } from './type';
@@ -29,7 +29,7 @@ import { isFunction, isObject, isNumber } from './type';
 const NON_DIMENSIONAL_REG = /opa|ntw|ne[ch]|ex(?:s|g|n|p|$)|^ord|zoo|grid|orp|ows|mnc|^columns$|bs|erim|onit/i;
 
 function createInputCompat(type: string) {
-  function InputCompat(props: any) {
+  function InputCompat(props: any, ref: RefObject<any>) {
     const { value, onInput, ...rest } = props;
     const [v, setV] = useState(value);
     const onChange = useCallback((event: SyntheticEvent) => {
@@ -43,10 +43,11 @@ function createInputCompat(type: string) {
       ...rest,
       value: v,
       onChange,
+      ref,
     });
   }
 
-  return InputCompat;
+  return _forwardRef(InputCompat);
 }
 
 /**

From 55598d04a1e5579d13bf435bdb57a9fd0539771b Mon Sep 17 00:00:00 2001
From: luhc228 <44047106+luhc228@users.noreply.github.com>
Date: Wed, 17 Aug 2022 15:11:12 +0800
Subject: [PATCH 02/31] feat: export createStore and createModel api from ice
 (#445)

---
 examples/with-store/src/models/user.ts            | 2 +-
 examples/with-store/src/pages/blog/models/info.ts | 2 +-
 examples/with-store/src/pages/blog/store.ts       | 2 +-
 examples/with-store/src/pages/models/counter.ts   | 2 +-
 examples/with-store/src/pages/store.ts            | 2 +-
 examples/with-store/src/store.ts                  | 2 +-
 packages/plugin-store/src/index.ts                | 9 ++++++++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/examples/with-store/src/models/user.ts b/examples/with-store/src/models/user.ts
index e162baf09..041b699b2 100644
--- a/examples/with-store/src/models/user.ts
+++ b/examples/with-store/src/models/user.ts
@@ -1,4 +1,4 @@
-import { createModel } from '@ice/plugin-store/esm/runtime';
+import { createModel } from 'ice';
 
 export default createModel({
   state: {
diff --git a/examples/with-store/src/pages/blog/models/info.ts b/examples/with-store/src/pages/blog/models/info.ts
index c99ee5b20..60924a244 100644
--- a/examples/with-store/src/pages/blog/models/info.ts
+++ b/examples/with-store/src/pages/blog/models/info.ts
@@ -1,4 +1,4 @@
-import { createModel } from '@ice/plugin-store/esm/runtime';
+import { createModel } from 'ice';
 
 export default createModel({
   state: {
diff --git a/examples/with-store/src/pages/blog/store.ts b/examples/with-store/src/pages/blog/store.ts
index 4375df669..4a1f21686 100644
--- a/examples/with-store/src/pages/blog/store.ts
+++ b/examples/with-store/src/pages/blog/store.ts
@@ -1,4 +1,4 @@
-import { createStore } from '@ice/plugin-store/esm/runtime';
+import { createStore } from 'ice';
 import info from './models/info';
 
 export default createStore({ info });
diff --git a/examples/with-store/src/pages/models/counter.ts b/examples/with-store/src/pages/models/counter.ts
index ed62a5603..d47da9565 100644
--- a/examples/with-store/src/pages/models/counter.ts
+++ b/examples/with-store/src/pages/models/counter.ts
@@ -1,4 +1,4 @@
-import { createModel } from '@ice/plugin-store/esm/runtime';
+import { createModel } from 'ice';
 
 export default createModel({
   state: {
diff --git a/examples/with-store/src/pages/store.ts b/examples/with-store/src/pages/store.ts
index 4a59915c7..fd399d4f1 100644
--- a/examples/with-store/src/pages/store.ts
+++ b/examples/with-store/src/pages/store.ts
@@ -1,4 +1,4 @@
-import { createStore } from '@ice/plugin-store/esm/runtime';
+import { createStore } from 'ice';
 import counter from './models/counter';
 
 const store = createStore({ counter });
diff --git a/examples/with-store/src/store.ts b/examples/with-store/src/store.ts
index 5fa480991..34eafd1ac 100644
--- a/examples/with-store/src/store.ts
+++ b/examples/with-store/src/store.ts
@@ -1,4 +1,4 @@
-import { createStore } from '@ice/plugin-store/esm/runtime';
+import { createStore } from 'ice';
 import user from './models/user';
 
 export default createStore({ user });
diff --git a/packages/plugin-store/src/index.ts b/packages/plugin-store/src/index.ts
index 0e0edf62b..373361373 100644
--- a/packages/plugin-store/src/index.ts
+++ b/packages/plugin-store/src/index.ts
@@ -13,7 +13,7 @@ const ignoreStoreFilePatterns = ['**/models/**', storeFilePattern];
 
 const plugin: Plugin<Options> = (options) => ({
   name: '@ice/plugin-store',
-  setup: ({ onGetConfig, modifyUserConfig, context: { rootDir, userConfig } }) => {
+  setup: ({ onGetConfig, modifyUserConfig, generator, context: { rootDir, userConfig } }) => {
     const { disableResetPageState = false } = options || {};
     const srcDir = path.join(rootDir, 'src');
     const pageDir = path.join(srcDir, 'pages');
@@ -38,6 +38,13 @@ const plugin: Plugin<Options> = (options) => ({
       ];
       return config;
     });
+
+    // Export store api: createStore, createModel from `.ice/index.ts`.
+    generator.addExport({
+      specifier: ['createStore', 'createModel'],
+      source: '@ice/plugin-store/esm/runtime',
+      type: false,
+    });
   },
   runtime: path.join(path.dirname(fileURLToPath(import.meta.url)), 'runtime.js'),
 });

From b74ff95563c863345b7114d9322c30abf8a40817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=93=E9=99=8C=E5=90=8C=E5=AD=A6?=
 <answershuto@gmail.com>
Date: Wed, 17 Aug 2022 15:13:46 +0800
Subject: [PATCH 03/31] Feat/compat maxlength (#448)

* feat: compat maxlength

* test: add test for maxlength

* feat: move maxlength to createInputCompat
---
 packages/rax-compat/src/create-element.ts     | 19 ++++++++++++++-----
 .../rax-compat/tests/createElement.test.tsx   | 15 +++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/packages/rax-compat/src/create-element.ts b/packages/rax-compat/src/create-element.ts
index b77f45fd8..d8f0aef17 100644
--- a/packages/rax-compat/src/create-element.ts
+++ b/packages/rax-compat/src/create-element.ts
@@ -39,6 +39,15 @@ function createInputCompat(type: string) {
       onInput && onInput(event.nativeEvent);
     }, [onInput]);
 
+    // Compat maxlength in rax-textinput, because maxlength is invalid props in web,it will be set attributes to element
+    // and react will Throw a warning in DEV.
+    // https://github.com/raxjs/rax-components/issues/459
+    // https://github.com/raxjs/rax-components/blob/master/packages/rax-textinput/src/index.tsx#L142
+    if (rest.maxlength) {
+      rest.maxLength = rest.maxlength;
+      delete rest.maxlength;
+    }
+
     return _createElement(type, {
       ...rest,
       value: v,
@@ -82,12 +91,12 @@ export function createElement<P extends {
     rest.style = compatStyleProps;
   }
 
-  // Setting the value of props makes the component be a controlled component in React.
-  // But setting the value is same as web in Rax.
-  // User can modify value of props to modify native input value
-  // and native input can also modify the value of self in Rax.
-  // So we should compat input to InputCompat, the same as textarea.
   if (type === 'input' || type === 'textarea') {
+    // Setting the value of props makes the component be a controlled component in React.
+    // But setting the value is same as web in Rax.
+    // User can modify value of props to modify native input value
+    // and native input can also modify the value of self in Rax.
+    // So we should compat input to InputCompat, the same as textarea.
     type = createInputCompat(type);
   }
 
diff --git a/packages/rax-compat/tests/createElement.test.tsx b/packages/rax-compat/tests/createElement.test.tsx
index 5b9ea82d3..0ba0e3afb 100644
--- a/packages/rax-compat/tests/createElement.test.tsx
+++ b/packages/rax-compat/tests/createElement.test.tsx
@@ -76,4 +76,19 @@ describe('createElement', () => {
     const node = wrapper.queryByTestId('valueTest');
     expect(node.value).toBe(str);
   });
+
+  it('input set empty string to maxlength not be 0', () => {
+    const str = 'hello world';
+    const wrapper = render(createElement(
+      'input',
+      {
+        'data-testid': 'maxlengthTest',
+        value: str,
+        maxlength: ''
+      },
+    ));
+
+    const node = wrapper.queryByTestId('valueTest');
+    expect(node?.getAttribute('maxlength')).toBe(null);
+  });
 });

From 26e04850f98f392baa14515d29222ff3b8cb86cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9F=93=E9=99=8C=E5=90=8C=E5=AD=A6?=
 <answershuto@gmail.com>
Date: Wed, 17 Aug 2022 15:14:04 +0800
Subject: [PATCH 04/31] fix: should get eventTarget by _nativeNode (#449)

---
 packages/rax-compat/src/create-element.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/rax-compat/src/create-element.ts b/packages/rax-compat/src/create-element.ts
index d8f0aef17..640d9747e 100644
--- a/packages/rax-compat/src/create-element.ts
+++ b/packages/rax-compat/src/create-element.ts
@@ -129,16 +129,19 @@ function VisibilityChange({
 
   const listen = useCallback((eventName: string, handler: Function) => {
     const { current } = ref;
-    if (current != null) {
-      if (isFunction(handler)) {
-        observerElement(current as HTMLElement);
-        current.addEventListener(eventName, handler);
-      }
+    // Rax components will set custom ref by useImperativeHandle.
+    // So We should get eventTarget by _nativeNode.
+    // https://github.com/raxjs/rax-components/blob/master/packages/rax-textinput/src/index.tsx#L151
+    if (current && isFunction(handler)) {
+      const eventTarget = current._nativeNode || current;
+      observerElement(eventTarget as HTMLElement);
+      eventTarget.addEventListener(eventName, handler);
     }
     return () => {
       const { current } = ref;
       if (current) {
-        current.removeEventListener(eventName, handler);
+        const eventTarget = current._nativeNode || current;
+        eventTarget.removeEventListener(eventName, handler);
       }
     };
   }, [ref]);

From 4d6bd3584f9b8ef46e10f0bf23b2b84f08e31022 Mon Sep 17 00:00:00 2001
From: luhc228 <44047106+luhc228@users.noreply.github.com>
Date: Thu, 18 Aug 2022 11:02:09 +0800
Subject: [PATCH 05/31] chore: remove unused constants.ts (#451)

---
 constants.ts | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 constants.ts

diff --git a/constants.ts b/constants.ts
deleted file mode 100644
index 089a034f2..000000000
--- a/constants.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const ICE_PKG_PACKAGES = [
-  'rax-compat',
-  'jsx-runtime',
-];

From 2fa2a482899aaa005cc2a3735efcdc71b333ce08 Mon Sep 17 00:00:00 2001
From: zkylearner <49386848+zkylearner@users.noreply.github.com>
Date: Mon, 22 Aug 2022 14:30:44 +0800
Subject: [PATCH 06/31] fix: transform component name (#469)

* fix: transform component name

* fix: modify params name
---
 packages/style-import/src/index.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/style-import/src/index.ts b/packages/style-import/src/index.ts
index ebf8e69f9..a1e2447d5 100644
--- a/packages/style-import/src/index.ts
+++ b/packages/style-import/src/index.ts
@@ -6,13 +6,14 @@ interface TransformOptions {
   libraryName: string;
   style: ((name: string) => string) | Boolean;
   sourceMap?: Boolean;
+  kebabCase?: Boolean;
 }
 
 export async function importStyle(code: string, options: TransformOptions): Promise<null | {
   code: string;
   map: ReturnType<MagicString['generateMap']>;
 }> {
-  const { style, libraryName, sourceMap } = options;
+  const { style, libraryName, sourceMap, kebabCase = true } = options;
   if (!style) {
     return null;
   }
@@ -45,7 +46,12 @@ export async function importStyle(code: string, options: TransformOptions): Prom
           console.log(e);
           return;
         }
-        exports.forEach(({ n: importName }) => {
+        exports.forEach(({ n }) => {
+          const toKebabCase = (str: string) => str.replace(/^[A-Z]/, $1 => $1.toLowerCase()).replace(/([A-Z])/g, $1 => `-${$1.toLowerCase()}`);
+          let importName = n;
+          if (kebabCase) {
+             importName = toKebabCase(importName);
+          }
           const stylePath = typeof style === 'function' ? style(importName) : `${libraryName}/es/${importName}/style`;
           if (stylePath) {
             styleStatements.push(`import '${stylePath}';`);

From 65e4f5b302fb47604f2bb7d18d6016b9e4ce44e5 Mon Sep 17 00:00:00 2001
From: luhc228 <44047106+luhc228@users.noreply.github.com>
Date: Mon, 22 Aug 2022 15:35:45 +0800
Subject: [PATCH 07/31] fix: importStyle test case (#471)

---
 packages/style-import/tests/importStyle.test.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/style-import/tests/importStyle.test.ts b/packages/style-import/tests/importStyle.test.ts
index 6ae744787..9bfdc3782 100644
--- a/packages/style-import/tests/importStyle.test.ts
+++ b/packages/style-import/tests/importStyle.test.ts
@@ -5,7 +5,7 @@ describe('import style', () => {
   it('simple import', async () => {
     const sourceCode = `import { Button } from 'antd';`;
     const result = await importStyle(sourceCode, { libraryName: 'antd', style: true });
-    expect(result?.code).toBe(`${sourceCode}\nimport 'antd/es/Button/style';`);
+    expect(result?.code).toBe(`${sourceCode}\nimport 'antd/es/button/style';`);
   });
   it('custom style', async () => {
     const sourceCode = `import { Button } from 'antd';`;
@@ -20,12 +20,12 @@ describe('import style', () => {
   it('multiple import', async () => {
     const sourceCode = `import { Button, Table } from 'antd';`;
     const result = await importStyle(sourceCode, { libraryName: 'antd', style: true });
-    expect(result?.code).toBe(`${sourceCode}\nimport 'antd/es/Button/style';\nimport 'antd/es/Table/style';`);
+    expect(result?.code).toBe(`${sourceCode}\nimport 'antd/es/button/style';\nimport 'antd/es/table/style';`);
   });
   it('named import', async () => {
     const sourceCode = `import { Button as Btn } from 'antd';`;
     const result = await importStyle(sourceCode, { libraryName: 'antd', style: true });
-    expect(result?.code).toBe(`${sourceCode}\nimport 'antd/es/Button/style';`);
+    expect(result?.code).toBe(`${sourceCode}\nimport 'antd/es/button/style';`);
   });
   it('default import', async () => {
     const sourceCode = `import * as antd from 'antd';`;

From f3029568d2fab0db35cdc54798ac8e9f35413648 Mon Sep 17 00:00:00 2001
From: ClarkXia <xiawenwu41@gmail.com>
Date: Mon, 22 Aug 2022 16:15:51 +0800
Subject: [PATCH 08/31] feat: support import history from ice (#458)

* feat: support import history from ice

* fix: test case
---
 examples/basic-project/src/pages/about.tsx |  5 +++--
 packages/ice/templates/core/index.ts.ejs   |  1 +
 packages/runtime/src/history.ts            | 13 +++++++++++++
 packages/runtime/src/index.ts              |  2 ++
 packages/runtime/src/runClientApp.tsx      |  3 +++
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 packages/runtime/src/history.ts

diff --git a/examples/basic-project/src/pages/about.tsx b/examples/basic-project/src/pages/about.tsx
index 0c46fcb0f..dce5b82a5 100644
--- a/examples/basic-project/src/pages/about.tsx
+++ b/examples/basic-project/src/pages/about.tsx
@@ -1,4 +1,4 @@
-import { Link, useData, useConfig } from 'ice';
+import { Link, useData, useConfig, history } from 'ice';
 import { isWeb } from '@uni/env';
 // @ts-expect-error
 import url from './ice.png';
@@ -12,6 +12,7 @@ export default function About() {
   const config = useConfig();
 
   console.log('render About', 'data', data, 'config', config);
+  console.log('history in component', history);
 
   return (
     <>
@@ -19,7 +20,7 @@ export default function About() {
       <Link to="/">home</Link>
       <img src={url} height="40" width="40" />
       <span className="mark">new</span>
-      <div>isWeb: { isWeb ? 'true' : 'false' }</div>
+      <div>isWeb: {isWeb ? 'true' : 'false'}</div>
     </>
   );
 }
diff --git a/packages/ice/templates/core/index.ts.ejs b/packages/ice/templates/core/index.ts.ejs
index 8dc432a46..83a75817a 100644
--- a/packages/ice/templates/core/index.ts.ejs
+++ b/packages/ice/templates/core/index.ts.ejs
@@ -52,6 +52,7 @@ export {
   Links,
   Scripts,
   Main,
+  history,
 } from '@ice/runtime';
 
 <%- framework.imports %>
diff --git a/packages/runtime/src/history.ts b/packages/runtime/src/history.ts
new file mode 100644
index 000000000..b9615c745
--- /dev/null
+++ b/packages/runtime/src/history.ts
@@ -0,0 +1,13 @@
+import type { History } from 'history';
+
+// Value of history will be modified after render Router.
+let routerHistory: History | null = null;
+
+function setHistory(customHistory: History) {
+  routerHistory = customHistory;
+}
+
+export {
+  routerHistory,
+  setHistory,
+};
\ No newline at end of file
diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
index 5f0785ff0..728ec4ca1 100644
--- a/packages/runtime/src/index.ts
+++ b/packages/runtime/src/index.ts
@@ -39,6 +39,7 @@ import type {
 } from './types.js';
 import dataLoader from './dataLoader.js';
 import getAppConfig, { defineAppConfig } from './appConfig.js';
+import { routerHistory as history } from './history.js';
 
 export {
   getAppConfig,
@@ -68,6 +69,7 @@ export {
   useParamsSingle,
   useSearchParamsSingle,
   useLocationSingle,
+  history,
 };
 
 export type {
diff --git a/packages/runtime/src/runClientApp.tsx b/packages/runtime/src/runClientApp.tsx
index 901753782..850e30e16 100644
--- a/packages/runtime/src/runClientApp.tsx
+++ b/packages/runtime/src/runClientApp.tsx
@@ -3,6 +3,7 @@ import * as ReactDOM from 'react-dom/client';
 import { createHashHistory, createBrowserHistory, createMemoryHistory } from 'history';
 import type { HashHistory, BrowserHistory, Action, Location, InitialEntry, MemoryHistory } from 'history';
 import { createHistorySingle } from './utils/history-single.js';
+import { setHistory } from './history.js';
 import Runtime from './runtime.js';
 import App from './App.js';
 import { AppContextProvider } from './AppContext.js';
@@ -56,6 +57,8 @@ export default async function runClientApp(options: RunClientAppOptions) {
 
   const appConfig = getAppConfig(app);
   const history = createHistory(appConfig, { memoryRouter, routePath });
+  // Set history for import it from ice.
+  setHistory(history);
 
   const matches = matchRoutes(
     routes,

From dffcace4e1ea9623f5273083f4c561670e2abee3 Mon Sep 17 00:00:00 2001
From: luhc228 <44047106+luhc228@users.noreply.github.com>
Date: Wed, 24 Aug 2022 14:47:00 +0800
Subject: [PATCH 09/31] chore: unite cache dir (#472)

---
 packages/ice/src/constant.ts                | 2 +-
 packages/ice/tests/preBundleCJSDeps.test.ts | 2 +-
 packages/ice/tests/transformImport.test.ts  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/ice/src/constant.ts b/packages/ice/src/constant.ts
index bd8e59305..8feb54785 100644
--- a/packages/ice/src/constant.ts
+++ b/packages/ice/src/constant.ts
@@ -6,7 +6,7 @@ export const ASSETS_MANIFEST = path.join(RUNTIME_TMP_DIR, 'assets-manifest.json'
 export const SERVER_ENTRY = path.join(RUNTIME_TMP_DIR, 'entry.server.ts');
 export const DATA_LOADER_ENTRY = path.join(RUNTIME_TMP_DIR, 'data-loader.ts');
 export const SERVER_OUTPUT_DIR = 'server';
-export const CACHE_DIR = path.join('node_modules', RUNTIME_TMP_DIR);
+export const CACHE_DIR = path.join('node_modules', '.cache');
 export const BUILDIN_ESM_DEPS = [
   '@ice/runtime',
 ];
diff --git a/packages/ice/tests/preBundleCJSDeps.test.ts b/packages/ice/tests/preBundleCJSDeps.test.ts
index 611e0db37..95c4c53d3 100644
--- a/packages/ice/tests/preBundleCJSDeps.test.ts
+++ b/packages/ice/tests/preBundleCJSDeps.test.ts
@@ -8,7 +8,7 @@ import { scanImports } from '../src/service/analyze';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const alias = { '@': path.join(__dirname, './fixtures/scan') };
 const rootDir = path.join(__dirname, './fixtures/scan');
-const cacheDir = path.join(rootDir, '.ice');
+const cacheDir = path.join(rootDir, '.cache');
 
 it('prebundle cjs deps', async () => {
   const deps = await scanImports([path.join(__dirname, './fixtures/scan/app.ts')], { alias, rootDir });
diff --git a/packages/ice/tests/transformImport.test.ts b/packages/ice/tests/transformImport.test.ts
index 553cfcbeb..4f5c40e2c 100644
--- a/packages/ice/tests/transformImport.test.ts
+++ b/packages/ice/tests/transformImport.test.ts
@@ -12,7 +12,7 @@ import { createUnplugin } from 'unplugin';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const alias = { '@': path.join(__dirname, './fixtures/scan') };
 const rootDir = path.join(__dirname, './fixtures/scan');
-const cacheDir = path.join(rootDir, '.ice');
+const cacheDir = path.join(rootDir, '.cache');
 const appEntry = path.join(__dirname, './fixtures/scan/app.ts');
 const outdir = path.join(rootDir, 'build');
 
@@ -33,8 +33,8 @@ it('transform module import', async () => {
     ],
   });
   const buildContent = await fse.readFile(path.join(outdir, 'app.js'));
-  expect(buildContent.includes(path.join(rootDir, '.ice/deps/@ice_runtime_client.js'))).toBeTruthy();
-  expect(buildContent.includes(path.join(rootDir, '.ice/deps/@ice_runtime.js'))).toBeTruthy();
+  expect(buildContent.includes(path.join(rootDir, '.cache/deps/@ice_runtime_client.js'))).toBeTruthy();
+  expect(buildContent.includes(path.join(rootDir, '.cache/deps/@ice_runtime.js'))).toBeTruthy();
 });
 
 afterAll(async () => {

From 898e94afa98f39e63578e3b8a437ee7d5ed3c7d4 Mon Sep 17 00:00:00 2001
From: luhc228 <44047106+luhc228@users.noreply.github.com>
Date: Wed, 24 Aug 2022 14:56:40 +0800
Subject: [PATCH 10/31] feat: add Data component (#404)

* feat: add Data component

* feat: compat ssr fallback to csr

* feat: support disableFallback when renderServer

* chore: remove Data component
---
 packages/ice/templates/core/index.ts.ejs |  1 +
 packages/runtime/src/Document.tsx        | 19 ++++++++++++++++++-
 packages/runtime/src/index.ts            |  2 ++
 packages/runtime/src/runServerApp.tsx    |  7 +++++--
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/ice/templates/core/index.ts.ejs b/packages/ice/templates/core/index.ts.ejs
index 83a75817a..9c9455b63 100644
--- a/packages/ice/templates/core/index.ts.ejs
+++ b/packages/ice/templates/core/index.ts.ejs
@@ -51,6 +51,7 @@ export {
   Title,
   Links,
   Scripts,
+  Data,
   Main,
   history,
 } from '@ice/runtime';
diff --git a/packages/runtime/src/Document.tsx b/packages/runtime/src/Document.tsx
index 5336a20ae..65b6a5216 100644
--- a/packages/runtime/src/Document.tsx
+++ b/packages/runtime/src/Document.tsx
@@ -94,7 +94,10 @@ export function Scripts(props) {
        * disable hydration warning for CSR.
        * initial app data may not equal CSR result.
        */}
-      <script suppressHydrationWarning={documentOnly} dangerouslySetInnerHTML={{ __html: `window.__ICE_APP_CONTEXT__=${JSON.stringify(appContext)}` }} />
+      <script
+        suppressHydrationWarning={documentOnly}
+        dangerouslySetInnerHTML={{ __html: `window.__ICE_APP_CONTEXT__=Object.assign(${JSON.stringify(appContext)}, window.__ICE_APP_CONTEXT__ || {})` }}
+      />
       {
         routeScripts.map(script => {
           const { block, ...routeScriptProps } = script;
@@ -110,6 +113,20 @@ export function Scripts(props) {
   );
 }
 
+export function Data() {
+  const { routesData, documentOnly } = useAppContext();
+  const appData = useAppData();
+
+  return (
+    // Disable hydration warning for csr.
+    // initial app data may not equal csr result.
+    <script
+      suppressHydrationWarning={documentOnly}
+      dangerouslySetInnerHTML={{ __html: `window.__ICE_APP_CONTEXT__=${JSON.stringify({ routesData, appData })}` }}
+    />
+  );
+}
+
 export function Main(props) {
   const { main } = useDocumentContext();
   const { appConfig } = useAppContext();
diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
index 728ec4ca1..cd9b9ec39 100644
--- a/packages/runtime/src/index.ts
+++ b/packages/runtime/src/index.ts
@@ -24,6 +24,7 @@ import {
   Links,
   Scripts,
   Main,
+  Data,
 } from './Document.js';
 import type {
   RuntimePlugin,
@@ -55,6 +56,7 @@ export {
   Title,
   Links,
   Scripts,
+  Data,
   Main,
   dataLoader,
   // react-router-dom API
diff --git a/packages/runtime/src/runServerApp.tsx b/packages/runtime/src/runServerApp.tsx
index f68a2455b..24d516dcd 100644
--- a/packages/runtime/src/runServerApp.tsx
+++ b/packages/runtime/src/runServerApp.tsx
@@ -137,7 +137,7 @@ function pipeToResponse(res: ServerResponse, pipe: NodeWritablePiper) {
 
 async function doRender(serverContext: ServerContext, renderOptions: RenderOptions): Promise<RenderResult> {
   const { req } = serverContext;
-  const { routes, documentOnly, app, basename, serverOnlyBasename } = renderOptions;
+  const { routes, documentOnly, app, basename, serverOnlyBasename, disableFallback } = renderOptions;
 
   const location = getLocation(req.url);
 
@@ -182,7 +182,10 @@ async function doRender(serverContext: ServerContext, renderOptions: RenderOptio
       routePath,
     });
   } catch (err) {
-    consola.error('Render server entry error, downgrade to CSR.', err);
+    if (disableFallback) {
+      throw err;
+    }
+    consola.error('Warning: render server entry error, downgrade to csr.', err);
     return renderDocument({ matches, routePath, renderOptions, routeModules: {} });
   }
 }

From d4b353d59bfb1aa79f3ca3f5b191e8801faa79bd Mon Sep 17 00:00:00 2001
From: luhc228 <44047106+luhc228@users.noreply.github.com>
Date: Wed, 24 Aug 2022 20:03:59 +0800
Subject: [PATCH 11/31] fix: can not read store api from ice (#476)

---
 packages/plugin-store/package.json    | 8 ++++----
 packages/plugin-store/src/api.ts      | 1 +
 packages/plugin-store/src/index.ts    | 2 +-
 packages/plugin-store/src/runtime.tsx | 2 --
 4 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 packages/plugin-store/src/api.ts

diff --git a/packages/plugin-store/package.json b/packages/plugin-store/package.json
index 3eb801350..b7a0b0ef9 100644
--- a/packages/plugin-store/package.json
+++ b/packages/plugin-store/package.json
@@ -15,10 +15,10 @@
       "import": "./esm/runtime.js",
       "default": "./esm/runtime.js"
     },
-    "./esm/runtime": {
-      "types": "./esm/runtime.d.ts",
-      "import": "./esm/runtime.js",
-      "default": "./esm/runtime.js"
+    "./api": {
+      "types": "./esm/api.d.ts",
+      "import": "./esm/api.js",
+      "default": "./esm/api.js"
     }
   },
   "main": "./esm/index.js",
diff --git a/packages/plugin-store/src/api.ts b/packages/plugin-store/src/api.ts
new file mode 100644
index 000000000..215dfc296
--- /dev/null
+++ b/packages/plugin-store/src/api.ts
@@ -0,0 +1 @@
+export { createStore, createModel } from '@ice/store';
diff --git a/packages/plugin-store/src/index.ts b/packages/plugin-store/src/index.ts
index 373361373..c64125150 100644
--- a/packages/plugin-store/src/index.ts
+++ b/packages/plugin-store/src/index.ts
@@ -42,7 +42,7 @@ const plugin: Plugin<Options> = (options) => ({
     // Export store api: createStore, createModel from `.ice/index.ts`.
     generator.addExport({
       specifier: ['createStore', 'createModel'],
-      source: '@ice/plugin-store/esm/runtime',
+      source: '@ice/plugin-store/api',
       type: false,
     });
   },
diff --git a/packages/plugin-store/src/runtime.tsx b/packages/plugin-store/src/runtime.tsx
index 9a9718d8f..e70dfb596 100644
--- a/packages/plugin-store/src/runtime.tsx
+++ b/packages/plugin-store/src/runtime.tsx
@@ -1,6 +1,5 @@
 import * as React from 'react';
 import type { RuntimePlugin, AppProvider, RouteWrapper } from '@ice/types';
-import { createStore, createModel } from '@ice/store';
 import { PAGE_STORE_INITIAL_STATES, PAGE_STORE_PROVIDER } from './constants.js';
 import appStore from '$store';
 
@@ -35,5 +34,4 @@ const runtime: RuntimePlugin = async ({ addWrapper, addProvider, useAppContext }
   addWrapper(StoreProviderWrapper, true);
 };
 
-export { createStore, createModel };
 export default runtime;

From 56161df979bf99662b617093f2f58338cc569a47 Mon Sep 17 00:00:00 2001
From: ClarkXia <xiawenwu41@gmail.com>
Date: Thu, 25 Aug 2022 10:31:16 +0800
Subject: [PATCH 12/31] fix: lock regenerate-runtime path (#462)

---
 examples/basic-project/package.json           |  1 -
 examples/csr-project/package.json             |  1 -
 examples/hash-router/package.json             |  3 +--
 examples/rax-project/package.json             |  1 -
 examples/routes-generate/package.json         |  3 +--
 examples/with-antd-mobile/package.json        |  3 +--
 examples/with-antd/package.json               |  3 +--
 examples/with-fusion/package.json             |  3 +--
 examples/with-pha/package.json                |  1 -
 examples/with-store/package.json              |  3 +--
 packages/ice/package.json                     |  3 ++-
 packages/ice/src/createService.ts             | 10 +++++++-
 packages/webpack-config/package.json          |  1 -
 .../src/unPlugins/compilation.ts              |  5 ----
 pnpm-lock.yaml                                | 24 ++-----------------
 15 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/examples/basic-project/package.json b/examples/basic-project/package.json
index 6d047b656..17452c715 100644
--- a/examples/basic-project/package.json
+++ b/examples/basic-project/package.json
@@ -22,7 +22,6 @@
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
     "browserslist": "^4.19.3",
-    "regenerator-runtime": "^0.13.9",
     "speed-measure-webpack-plugin": "^1.5.0",
     "webpack": "^5.73.0"
   }
diff --git a/examples/csr-project/package.json b/examples/csr-project/package.json
index aec43b654..503a3ea88 100644
--- a/examples/csr-project/package.json
+++ b/examples/csr-project/package.json
@@ -20,7 +20,6 @@
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "browserslist": "^4.19.3",
-    "regenerator-runtime": "^0.13.9",
     "speed-measure-webpack-plugin": "^1.5.0",
     "webpack": "^5.73.0"
   }
diff --git a/examples/hash-router/package.json b/examples/hash-router/package.json
index ea1f252b9..416b1dbb8 100644
--- a/examples/hash-router/package.json
+++ b/examples/hash-router/package.json
@@ -13,7 +13,6 @@
   },
   "devDependencies": {
     "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "regenerator-runtime": "^0.13.9"
+    "@types/react-dom": "^18.0.0"
   }
 }
\ No newline at end of file
diff --git a/examples/rax-project/package.json b/examples/rax-project/package.json
index 98d2eb2b7..0ecf3e2ee 100644
--- a/examples/rax-project/package.json
+++ b/examples/rax-project/package.json
@@ -24,7 +24,6 @@
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
     "browserslist": "^4.19.3",
-    "regenerator-runtime": "^0.13.9",
     "webpack": "^5.73.0"
   }
 }
diff --git a/examples/routes-generate/package.json b/examples/routes-generate/package.json
index e77e7f169..3328789f4 100644
--- a/examples/routes-generate/package.json
+++ b/examples/routes-generate/package.json
@@ -17,7 +17,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "browserslist": "^4.19.3",
-    "regenerator-runtime": "^0.13.9"
+    "browserslist": "^4.19.3"
   }
 }
\ No newline at end of file
diff --git a/examples/with-antd-mobile/package.json b/examples/with-antd-mobile/package.json
index 7021da8ef..2a5707335 100644
--- a/examples/with-antd-mobile/package.json
+++ b/examples/with-antd-mobile/package.json
@@ -20,7 +20,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
-    "browserslist": "^4.19.3",
-    "regenerator-runtime": "^0.13.9"
+    "browserslist": "^4.19.3"
   }
 }
\ No newline at end of file
diff --git a/examples/with-antd/package.json b/examples/with-antd/package.json
index 6a946af4e..81eb8af58 100644
--- a/examples/with-antd/package.json
+++ b/examples/with-antd/package.json
@@ -21,7 +21,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
-    "browserslist": "^4.19.3",
-    "regenerator-runtime": "^0.13.9"
+    "browserslist": "^4.19.3"
   }
 }
diff --git a/examples/with-fusion/package.json b/examples/with-fusion/package.json
index 18bc2d41d..7eed0b8ef 100644
--- a/examples/with-fusion/package.json
+++ b/examples/with-fusion/package.json
@@ -18,7 +18,6 @@
   },
   "devDependencies": {
     "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.2",
-    "regenerator-runtime": "^0.13.9"
+    "@types/react-dom": "^18.0.2"
   }
 }
diff --git a/examples/with-pha/package.json b/examples/with-pha/package.json
index 090630352..5ff2a4c6f 100644
--- a/examples/with-pha/package.json
+++ b/examples/with-pha/package.json
@@ -19,7 +19,6 @@
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
     "browserslist": "^4.19.3",
-    "regenerator-runtime": "^0.13.9",
     "webpack": "^5.73.0"
   }
 }
diff --git a/examples/with-store/package.json b/examples/with-store/package.json
index 5dd61cb02..e14c66867 100644
--- a/examples/with-store/package.json
+++ b/examples/with-store/package.json
@@ -15,7 +15,6 @@
     "@ice/plugin-store": "workspace:*",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "browserslist": "^4.19.3",
-    "regenerator-runtime": "^0.13.9"
+    "browserslist": "^4.19.3"
   }
 }
\ No newline at end of file
diff --git a/packages/ice/package.json b/packages/ice/package.json
index b8fecdf7a..274763b7c 100644
--- a/packages/ice/package.json
+++ b/packages/ice/package.json
@@ -63,6 +63,7 @@
     "open": "^8.4.0",
     "path-to-regexp": "^6.2.0",
     "react-router": "^6.3.0",
+    "regenerator-runtime": "^0.13.9",
     "resolve.exports": "^1.1.0",
     "sass": "^1.49.9",
     "semver": "^7.3.5",
@@ -71,8 +72,8 @@
     "webpack-dev-server": "^4.7.4"
   },
   "devDependencies": {
-    "@types/babel__traverse": "^7.17.1",
     "@types/babel__generator": "^7.6.4",
+    "@types/babel__traverse": "^7.17.1",
     "@types/cross-spawn": "^6.0.2",
     "@types/ejs": "^3.1.0",
     "@types/estree": "^0.0.51",
diff --git a/packages/ice/src/createService.ts b/packages/ice/src/createService.ts
index 6e8e7baf5..f1bf16c1d 100644
--- a/packages/ice/src/createService.ts
+++ b/packages/ice/src/createService.ts
@@ -1,5 +1,6 @@
 import * as path from 'path';
 import { fileURLToPath } from 'url';
+import { createRequire } from 'module';
 import { Context } from 'build-scripts';
 import consola from 'consola';
 import type { CommandArgs, CommandName } from 'build-scripts';
@@ -27,6 +28,7 @@ import { getAppExportConfig, getRouteExportConfig } from './service/config.js';
 import renderExportsTemplate from './utils/renderExportsTemplate.js';
 import { getFileExports } from './service/analyze.js';
 
+const require = createRequire(import.meta.url);
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 interface CreateServiceOptions {
@@ -98,7 +100,13 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
 
   let taskConfigs = await ctx.setup();
   // merge task config with built-in config
-  taskConfigs = mergeTaskConfig(taskConfigs, { port: commandArgs.port });
+  taskConfigs = mergeTaskConfig(taskConfigs, {
+    port: commandArgs.port,
+    alias: {
+      // Get absolute path of `regenerator-runtime`, so it's unnecessary to add it to project dependencies
+      'regenerator-runtime': require.resolve('regenerator-runtime'),
+    },
+  });
   const webTaskConfig = taskConfigs.find(({ name }) => name === 'web');
 
   // get userConfig after setup because of userConfig maybe modified by plugins
diff --git a/packages/webpack-config/package.json b/packages/webpack-config/package.json
index b09667440..19682069f 100644
--- a/packages/webpack-config/package.json
+++ b/packages/webpack-config/package.json
@@ -24,7 +24,6 @@
     "magic-string": "^0.26.1",
     "mini-css-extract-plugin": "2.6.0",
     "react-refresh": "^0.12.0",
-    "regenerator-runtime": "0.13.9",
     "unplugin": "^0.3.2"
   },
   "devDependencies": {
diff --git a/packages/webpack-config/src/unPlugins/compilation.ts b/packages/webpack-config/src/unPlugins/compilation.ts
index 42aa250e7..ebfda9bb9 100644
--- a/packages/webpack-config/src/unPlugins/compilation.ts
+++ b/packages/webpack-config/src/unPlugins/compilation.ts
@@ -7,7 +7,6 @@ import type { Config } from '@ice/types';
 
 const { merge } = lodash;
 const require = createRequire(import.meta.url);
-const regeneratorRuntimePath = require.resolve('regenerator-runtime');
 
 type JSXSuffix = 'jsx' | 'tsx';
 
@@ -131,10 +130,6 @@ function getJsxTransformOptions({
       transform: {
         react: reactTransformConfig,
         legacyDecorator: true,
-        // @ts-expect-error fix me when @builder/swc fix type error
-        regenerator: {
-          importPath: regeneratorRuntimePath,
-        },
       },
       externalHelpers: false,
     },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d1cf31f61..fdf4ee1e8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -87,7 +87,6 @@ importers:
       browserslist: ^4.19.3
       react: ^18.0.0
       react-dom: ^18.0.0
-      regenerator-runtime: ^0.13.9
       speed-measure-webpack-plugin: ^1.5.0
       webpack: ^5.73.0
     dependencies:
@@ -103,7 +102,6 @@ importers:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
       browserslist: 4.20.3
-      regenerator-runtime: 0.13.9
       speed-measure-webpack-plugin: 1.5.0_webpack@5.73.0
       webpack: 5.73.0
 
@@ -118,7 +116,6 @@ importers:
       browserslist: ^4.19.3
       react: ^18.0.0
       react-dom: ^18.0.0
-      regenerator-runtime: ^0.13.9
       speed-measure-webpack-plugin: ^1.5.0
       webpack: ^5.73.0
     dependencies:
@@ -132,7 +129,6 @@ importers:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
       browserslist: 4.20.3
-      regenerator-runtime: 0.13.9
       speed-measure-webpack-plugin: 1.5.0_webpack@5.73.0
       webpack: 5.73.0
 
@@ -144,7 +140,6 @@ importers:
       '@types/react-dom': ^18.0.0
       react: ^18.0.0
       react-dom: ^18.0.0
-      regenerator-runtime: ^0.13.9
     dependencies:
       '@ice/app': link:../../packages/ice
       '@ice/runtime': link:../../packages/runtime
@@ -153,7 +148,6 @@ importers:
     devDependencies:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
-      regenerator-runtime: 0.13.9
 
   examples/rax-project:
     specifiers:
@@ -170,7 +164,6 @@ importers:
       rax-view: ^2.3.0
       react: ^18.0.0
       react-dom: ^18.0.0
-      regenerator-runtime: ^0.13.9
       webpack: ^5.73.0
     dependencies:
       '@ice/app': link:../../packages/ice
@@ -187,7 +180,6 @@ importers:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
       browserslist: 4.20.3
-      regenerator-runtime: 0.13.9
       webpack: 5.73.0
 
   examples/routes-generate:
@@ -199,7 +191,6 @@ importers:
       browserslist: ^4.19.3
       react: ^18.0.0
       react-dom: ^18.0.0
-      regenerator-runtime: ^0.13.9
     dependencies:
       '@ice/app': link:../../packages/ice
       '@ice/runtime': link:../../packages/runtime
@@ -209,7 +200,6 @@ importers:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
       browserslist: 4.20.3
-      regenerator-runtime: 0.13.9
 
   examples/single-route:
     specifiers:
@@ -245,7 +235,6 @@ importers:
       moment: ^2.29.4
       react: ^18.0.0
       react-dom: ^18.0.0
-      regenerator-runtime: ^0.13.9
     dependencies:
       '@ice/app': link:../../packages/ice
       '@ice/plugin-antd': link:../../packages/plugin-antd
@@ -259,7 +248,6 @@ importers:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
       browserslist: 4.20.3
-      regenerator-runtime: 0.13.9
 
   examples/with-antd-mobile:
     specifiers:
@@ -272,7 +260,6 @@ importers:
       constate: ^3.3.2
       react: ^18.2.0
       react-dom: ^18.2.0
-      regenerator-runtime: ^0.13.9
     dependencies:
       '@ice/app': link:../../packages/ice
       '@ice/runtime': link:../../packages/runtime
@@ -284,7 +271,6 @@ importers:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
       browserslist: 4.20.3
-      regenerator-runtime: 0.13.9
 
   examples/with-fusion:
     specifiers:
@@ -296,7 +282,6 @@ importers:
       '@types/react-dom': ^18.0.2
       react: ^18.0.0
       react-dom: ^18.0.0
-      regenerator-runtime: ^0.13.9
     dependencies:
       '@alifd/next': 1.25.49_biqbaboplfbrettd7655fr4n2y
       '@ice/app': link:../../packages/ice
@@ -307,7 +292,6 @@ importers:
     devDependencies:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
-      regenerator-runtime: 0.13.9
 
   examples/with-pha:
     specifiers:
@@ -319,7 +303,6 @@ importers:
       browserslist: ^4.19.3
       react: ^18.0.0
       react-dom: ^18.0.0
-      regenerator-runtime: ^0.13.9
       webpack: ^5.73.0
     dependencies:
       '@ice/app': link:../../packages/ice
@@ -331,7 +314,6 @@ importers:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
       browserslist: 4.20.3
-      regenerator-runtime: 0.13.9
       webpack: 5.73.0
 
   examples/with-store:
@@ -342,7 +324,6 @@ importers:
       '@types/react': ^18.0.0
       '@types/react-dom': ^18.0.0
       browserslist: ^4.19.3
-      regenerator-runtime: ^0.13.9
     dependencies:
       '@ice/app': link:../../packages/ice
       '@ice/runtime': link:../../packages/runtime
@@ -351,7 +332,6 @@ importers:
       '@types/react': 18.0.15
       '@types/react-dom': 18.0.6
       browserslist: 4.21.3
-      regenerator-runtime: 0.13.9
 
   packages/bundles:
     specifiers:
@@ -486,6 +466,7 @@ importers:
       path-to-regexp: ^6.2.0
       react: ^18.0.0
       react-router: ^6.3.0
+      regenerator-runtime: ^0.13.9
       resolve.exports: ^1.1.0
       sass: ^1.49.9
       semver: ^7.3.5
@@ -529,6 +510,7 @@ importers:
       open: 8.4.0
       path-to-regexp: 6.2.1
       react-router: 6.3.0_react@18.2.0
+      regenerator-runtime: 0.13.9
       resolve.exports: 1.1.0
       sass: 1.50.1
       semver: 7.3.7
@@ -775,7 +757,6 @@ importers:
       magic-string: ^0.26.1
       mini-css-extract-plugin: 2.6.0
       react-refresh: ^0.12.0
-      regenerator-runtime: 0.13.9
       unplugin: ^0.3.2
       webpack: ^5.73.0
       webpack-dev-server: ^4.7.4
@@ -792,7 +773,6 @@ importers:
       magic-string: 0.26.1
       mini-css-extract-plugin: 2.6.0_webpack@5.73.0
       react-refresh: 0.12.0
-      regenerator-runtime: 0.13.9
       unplugin: 0.3.3_4upc34oiflw3lduyjvrzpjntau
     devDependencies:
       '@ice/types': link:../types

From bd98cfb6cb41b9a5780100f44e5388b3af6aa742 Mon Sep 17 00:00:00 2001
From: ClarkXia <xiawenwu41@gmail.com>
Date: Thu, 25 Aug 2022 11:14:40 +0800
Subject: [PATCH 13/31] fix: import css from node_modules (#482)

---
 examples/with-fusion/src/pages/index.tsx      |  1 +
 .../webpack-config/src/config/splitChunks.ts  | 24 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/examples/with-fusion/src/pages/index.tsx b/examples/with-fusion/src/pages/index.tsx
index 8561086f7..354ffcc85 100644
--- a/examples/with-fusion/src/pages/index.tsx
+++ b/examples/with-fusion/src/pages/index.tsx
@@ -1,4 +1,5 @@
 import { Button } from '@alifd/next';
+import '@alifd/next/dist/next.css';
 
 export default function Home() {
   return (
diff --git a/packages/webpack-config/src/config/splitChunks.ts b/packages/webpack-config/src/config/splitChunks.ts
index 8bfa3c326..04c1361b7 100644
--- a/packages/webpack-config/src/config/splitChunks.ts
+++ b/packages/webpack-config/src/config/splitChunks.ts
@@ -8,6 +8,7 @@ interface TestModule {
 interface NameModule {
   libIdent?: Function;
   type: string;
+  updateHash: (hash: crypto.Hash) => void;
 }
 
 export const FRAMEWORK_BUNDLES = [
@@ -15,6 +16,15 @@ export const FRAMEWORK_BUNDLES = [
   'react', 'react-dom', '@ice/runtime', 'react-router', 'react-router-dom',
 ];
 
+
+const isModuleCSS = (module: { type: string }): boolean => {
+  return (
+    // mini-css-extract-plugin
+    module.type === 'css/mini-extract' ||
+    // extract-css-chunks-webpack-plugin
+    module.type === 'css/extract-css-chunks'
+  );
+};
 const getSplitChunksConfig = (rootDir: string): webpack.Configuration['optimization']['splitChunks'] => {
   const frameworkRegex = new RegExp(`[\\\\/]node_modules[\\\\/](${FRAMEWORK_BUNDLES.join('|')})[\\\\/]`);
   return {
@@ -39,12 +49,16 @@ const getSplitChunksConfig = (rootDir: string): webpack.Configuration['optimizat
         },
         name(module: NameModule) {
           const hash = crypto.createHash('sha1');
-          if (!module.libIdent) {
-            throw new Error(
-              `Encountered unknown module type: ${module.type}.`,
-            );
+          if (isModuleCSS(module)) {
+            module.updateHash(hash);
+          } else {
+            if (!module.libIdent) {
+              throw new Error(
+                `Encountered unknown module type: ${module.type}.`,
+              );
+            }
+            hash.update(module.libIdent({ context: rootDir }));
           }
-          hash.update(module.libIdent({ context: rootDir }));
           return hash.digest('hex').substring(0, 8);
         },
       },

From 0bb1459964f2783750b1ecb2b8eadbc637d6b4d9 Mon Sep 17 00:00:00 2001
From: ClarkXia <xiawenwu41@gmail.com>
Date: Thu, 25 Aug 2022 11:34:59 +0800
Subject: [PATCH 14/31] fix: add semicolon for style import (#475)

---
 packages/plugin-fusion/src/index.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/plugin-fusion/src/index.ts b/packages/plugin-fusion/src/index.ts
index c478f5a7a..87acc32ce 100644
--- a/packages/plugin-fusion/src/index.ts
+++ b/packages/plugin-fusion/src/index.ts
@@ -57,13 +57,13 @@ const plugin: Plugin<PluginOptions> = (options = {}) => ({
             return false;
           });
           if (sassLoader) {
-            let additionalContent = '';
+            const additionalContent = [];
             if (themePackage) {
               const themeFile = getVariablesPath({
                 packageName: themePackage,
               });
               if (themeFile) {
-                additionalContent += `@import '${themePackage}/variables.scss'`;
+                additionalContent.push(`@import '${themePackage}/variables.scss';`);
               }
               // Try to get icon.scss if exists.
               const iconFile = getVariablesPath({
@@ -72,14 +72,14 @@ const plugin: Plugin<PluginOptions> = (options = {}) => ({
                 silent: true,
               });
               if (iconFile) {
-                additionalContent += `@import '${themePackage}/icons.scss'`;
+                additionalContent.push(`@import '${themePackage}/icons.scss';`);
               }
             }
             let themeConfig = [];
             Object.keys(theme || {}).forEach((key) => {
               themeConfig.push(`$${key}: ${theme[key]};`);
             });
-            additionalContent += themeConfig.join('\n');
+            additionalContent.push(themeConfig.join('\n'));
 
             const loaderOptions = sassLoader.options || {};
             sassLoader.options = {
@@ -88,7 +88,7 @@ const plugin: Plugin<PluginOptions> = (options = {}) => ({
                 const originalContent = typeof loaderOptions.additionalData === 'function'
                   ? loaderOptions.additionalData(content, loaderContext)
                   : `${loaderOptions.additionalData || ''}${content}`;
-                return `${additionalContent}\n${originalContent}`;
+                return `${additionalContent.join('\n')}\n${originalContent}`;
               },
             };
           }

From bcb74da42bcf4bed41f6067c2ec742a2b1c4ff9b Mon Sep 17 00:00:00 2001
From: ClarkXia <xiawenwu41@gmail.com>
Date: Thu, 25 Aug 2022 11:46:47 +0800
Subject: [PATCH 15/31] fix: nested routes of which getData (#481)

---
 packages/ice/src/routes.ts | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/ice/src/routes.ts b/packages/ice/src/routes.ts
index 501bdef06..7ae355de6 100644
--- a/packages/ice/src/routes.ts
+++ b/packages/ice/src/routes.ts
@@ -99,19 +99,18 @@ function generateRouteConfig(
   function importConfig(routes: NestedRouteManifest[], parentPath: string) {
     return routes.reduce((prev, route) => {
       const { children, file, id, exports } = route;
-      if (exports.indexOf(exportKey) === -1) {
-        return prev;
-      }
-
-      const fileExtname = path.extname(file);
-      const componentFile = file.replace(new RegExp(`${fileExtname}$`), '');
-      const componentPath = path.isAbsolute(componentFile) ? componentFile : `@/pages/${componentFile}`;
-
-      const loaderName = `${exportKey}_${id}`.replace(/[-/]/g, '_');
       const routePath = route.path || (route.index ? 'index' : '/');
-      const fullPath = path.join(parentPath, routePath);
-      imports.push([id, loaderName, fullPath]);
-      let str = `import { ${exportKey} as ${loaderName} } from '${componentPath}';\n`;
+      let str = '';
+      if (exports.includes(exportKey)) {
+        const fileExtname = path.extname(file);
+        const componentFile = file.replace(new RegExp(`${fileExtname}$`), '');
+        const componentPath = path.isAbsolute(componentFile) ? componentFile : `@/pages/${componentFile}`;
+
+        const loaderName = `${exportKey}_${id}`.replace(/[-/]/g, '_');
+        const fullPath = path.join(parentPath, routePath);
+        imports.push([id, loaderName, fullPath]);
+        str = `import { ${exportKey} as ${loaderName} } from '${componentPath}';\n`;
+      }
 
       if (children) {
         str += importConfig(children, routePath);

From 43b33c2b38f553643531b25347349bc52793a291 Mon Sep 17 00:00:00 2001
From: ClarkXia <xiawenwu41@gmail.com>
Date: Thu, 25 Aug 2022 11:47:31 +0800
Subject: [PATCH 16/31] fix: remove code of top level expression (#480)

---
 packages/ice/src/utils/babelPluginRemoveCode.ts      | 6 ++++--
 packages/ice/tests/fixtures/removeCode/expression.ts | 2 ++
 packages/ice/tests/removeTopLevelCode.test.ts        | 7 +++++++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 packages/ice/tests/fixtures/removeCode/expression.ts

diff --git a/packages/ice/src/utils/babelPluginRemoveCode.ts b/packages/ice/src/utils/babelPluginRemoveCode.ts
index 64f59f679..e928a4665 100644
--- a/packages/ice/src/utils/babelPluginRemoveCode.ts
+++ b/packages/ice/src/utils/babelPluginRemoveCode.ts
@@ -92,8 +92,10 @@ const removeTopLevelCode = (keepExports: string[] = []) => {
     ExpressionStatement: {
       enter(nodePath: NodePath<t.ExpressionStatement>) {
         // Remove top level call expression.
-        if (nodePath.parentPath.isProgram() && t.isCallExpression(nodePath.node.expression)) {
-          nodePath.remove();
+        if (nodePath.parentPath.isProgram()) {
+          if (t.isCallExpression(nodePath.node.expression) || t.isAssignmentExpression(nodePath.node.expression)) {
+            nodePath.remove();
+          }
         }
       },
     },
diff --git a/packages/ice/tests/fixtures/removeCode/expression.ts b/packages/ice/tests/fixtures/removeCode/expression.ts
new file mode 100644
index 000000000..5c56a1367
--- /dev/null
+++ b/packages/ice/tests/fixtures/removeCode/expression.ts
@@ -0,0 +1,2 @@
+const a = {};
+a.test = 1;
diff --git a/packages/ice/tests/removeTopLevelCode.test.ts b/packages/ice/tests/removeTopLevelCode.test.ts
index 49726f871..5ed015e20 100644
--- a/packages/ice/tests/removeTopLevelCode.test.ts
+++ b/packages/ice/tests/removeTopLevelCode.test.ts
@@ -85,4 +85,11 @@ describe('remove top level code', () => {
     const content = generate(ast).code;
     expect(content.replace(/\n/g, '').replace(/\s+/g, ' ')).toBe(`const a = 1;export default a;`);
   });
+
+  it('remove expression statement', () => {
+    const ast = parse(fs.readFileSync(path.join(__dirname, './fixtures/removeCode/expression.ts'), 'utf-8'), parserOptions);
+    traverse(ast, removeTopLevelCodePlugin(['default']));
+    const content = generate(ast).code;
+    expect(content.replace(/\n/g, '').replace(/\s+/g, ' ')).toBe('');
+  });
 })
\ No newline at end of file

From 9ae10f05bd94af6523d630b988e52d635cb04477 Mon Sep 17 00:00:00 2001
From: luhc228 <44047106+luhc228@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:48:12 +0800
Subject: [PATCH 17/31] fix: hash router fail when no index route (#461)

* fix: hash router fail when no index route

* fix: dev url not contain hash character
---
 packages/ice/src/middlewares/ssr/renderMiddleware.ts |  3 ++-
 packages/ice/src/service/webpackCompiler.ts          | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/ice/src/middlewares/ssr/renderMiddleware.ts b/packages/ice/src/middlewares/ssr/renderMiddleware.ts
index 11068801f..544213b16 100644
--- a/packages/ice/src/middlewares/ssr/renderMiddleware.ts
+++ b/packages/ice/src/middlewares/ssr/renderMiddleware.ts
@@ -27,7 +27,8 @@ export default function createRenderMiddleware(options: Options): Middleware {
     const routes = JSON.parse(fse.readFileSync(routeManifestPath, 'utf-8'));
     const basename = getRouterBasename(taskConfig, (await getAppConfig()).default);
     const matches = matchRoutes(routes, req.path, basename);
-    if (matches.length) {
+    // When documentOnly is true, it means that the app is CSR and it should return the html.
+    if (matches.length || documentOnly) {
       // Wait for the server compilation to finish
       const { serverEntry, error } = await serverCompileTask.get();
       if (error) {
diff --git a/packages/ice/src/service/webpackCompiler.ts b/packages/ice/src/service/webpackCompiler.ts
index 9a0e151b4..9998acdbc 100644
--- a/packages/ice/src/service/webpackCompiler.ts
+++ b/packages/ice/src/service/webpackCompiler.ts
@@ -95,20 +95,22 @@ async function webpackCompiler(options: {
       consola.warn(messages.warnings.join('\n'));
     }
     if (command === 'start') {
+      const appConfig = (await hooksAPI.getAppConfig()).default;
+      const hashChar = appConfig?.router?.type === 'hash' ? '#/' : '';
       if (isSuccessful && isFirstCompile) {
         let logoutMessage = '\n';
         logoutMessage += chalk.green(' Starting the development server at:');
         if (process.env.CLOUDIDE_ENV) {
-          logoutMessage += `\n   - IDE server: https://${process.env.WORKSPACE_UUID}-${commandArgs.port}.${process.env.WORKSPACE_HOST}${devPath}`;
+          logoutMessage += `\n   - IDE server: https://${process.env.WORKSPACE_UUID}-${commandArgs.port}.${process.env.WORKSPACE_HOST}${hashChar}${devPath}`;
         } else {
           logoutMessage += `\n
-   - Local  : ${chalk.underline.white(`${urls.localUrlForBrowser}${devPath}`)}
-   - Network:  ${chalk.underline.white(`${urls.lanUrlForTerminal}${devPath}`)}`;
+   - Local  : ${chalk.underline.white(`${urls.localUrlForBrowser}${hashChar}${devPath}`)}
+   - Network:  ${chalk.underline.white(`${urls.lanUrlForTerminal}${hashChar}${devPath}`)}`;
         }
         consola.log(`${logoutMessage}\n`);
 
         if (commandArgs.open) {
-          openBrowser(`${urls.localUrlForBrowser}${devPath}`);
+          openBrowser(`${urls.localUrlForBrowser}${hashChar}${devPath}`);
         }
       }
       // compiler.hooks.done is AsyncSeriesHook which does not support async function

From 5c8f5676ca7b1e61e680bdd3c4de6a7917b935e9 Mon Sep 17 00:00:00 2001
From: ClarkXia <xiawenwu41@gmail.com>
Date: Thu, 25 Aug 2022 12:13:43 +0800
Subject: [PATCH 18/31] Fix: add package version for cache key (#443)

* fix: add cache version for package update

* fix: fallback for compile error
---
 packages/ice/src/service/config.ts | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/ice/src/service/config.ts b/packages/ice/src/service/config.ts
index 646860b31..4483a001c 100644
--- a/packages/ice/src/service/config.ts
+++ b/packages/ice/src/service/config.ts
@@ -18,7 +18,7 @@ interface CompileConfig {
 
 class Config {
   private compileTasks: Record<string, Promise<string>>;
-  private compiler: (keepExports: string[]) => Promise<string>;
+  private compiler: (keepExports: string[]) => Promise<string | null>;
   private compileConfig: CompileConfig;
   private lastOptions: string[];
   private getOutfile: GetOutfile;
@@ -39,15 +39,17 @@ class Config {
       const { entry, transformInclude } = this.compileConfig;
       const outfile = this.getOutfile(entry, keepExports);
       this.status = 'PENDING';
-      await esbuildCompiler({
+      const { error } = await esbuildCompiler({
         entryPoints: [entry],
         format: 'esm',
         inject: [],
         outfile,
         plugins: [removeTopLevelCode(keepExports, transformInclude)],
       });
-      this.status = 'RESOLVED';
-      return `${outfile}?version=${new Date().getTime()}`;
+      if (!error) {
+        this.status = 'RESOLVED';
+        return `${outfile}?version=${new Date().getTime()}`;
+      }
     };
   }
 
@@ -79,7 +81,7 @@ class Config {
     if (!targetFile) {
       targetFile = await this.compileTasks[taskKey];
     }
-    return await import(targetFile);
+    if (targetFile) return await import(targetFile);
   };
 }
 
@@ -95,7 +97,7 @@ export const getAppExportConfig = (rootDir: string) => {
     getOutfile,
     needRecompile: async (entry, keepExports) => {
       let cached = null;
-      const cachedKey = `app_${keepExports.join('_')}`;
+      const cachedKey = `app_${keepExports.join('_')}_${process.env.__ICE_VERSION__}`;
       try {
         cached = await getCache(rootDir, cachedKey);
       } catch (err) {}
@@ -109,7 +111,7 @@ export const getAppExportConfig = (rootDir: string) => {
   });
 
   const getAppConfig = async (exportNames?: string[]) => {
-    return await appExportConfig.getConfig(exportNames || ['default', 'defineAppConfig']);
+    return (await appExportConfig.getConfig(exportNames || ['default', 'defineAppConfig'])) || {};
   };
 
   return {
@@ -129,7 +131,7 @@ export const getRouteExportConfig = (rootDir: string) => {
     transformInclude: (id) => id.includes('src/pages'),
     needRecompile: async (entry) => {
       let cached = false;
-      const cachedKey = 'route_config_file';
+      const cachedKey = `route_config_file_${process.env.__ICE_VERSION__}`;
       try {
         cached = await getCache(rootDir, cachedKey);
       } catch (err) {}
@@ -147,7 +149,7 @@ export const getRouteExportConfig = (rootDir: string) => {
     if (!fs.existsSync(routeConfigFile)) {
       return undefined;
     }
-    const routeConfig = (await routeExportConfig.getConfig(['getConfig'])).default;
+    const routeConfig = (await routeExportConfig.getConfig(['getConfig']) || {}).default;
     return specifyRoutId ? routeConfig[specifyRoutId] : routeConfig;
   };
   return {

From 8d719a83b04f7ac7c0ae52c08ca09b5f40c6eaa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B0=B4=E6=BE=9C?= <shuilan.cj@taobao.com>
Date: Thu, 25 Aug 2022 13:51:06 +0800
Subject: [PATCH 19/31] fix: assets order (#470)

* fix: assets order

* fix: delete anotation

* fix: page assets should load before entry assets
---
 packages/runtime/src/Document.tsx                             | 4 ++++
 packages/runtime/src/types.ts                                 | 1 +
 .../webpack-config/src/webpackPlugins/AssetsManifestPlugin.ts | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/runtime/src/Document.tsx b/packages/runtime/src/Document.tsx
index 65b6a5216..4228caf99 100644
--- a/packages/runtime/src/Document.tsx
+++ b/packages/runtime/src/Document.tsx
@@ -73,6 +73,10 @@ export function Scripts(props) {
   // Page assets need to be load before entry assets, so when call dynamic import won't cause duplicate js chunk loaded.
   const scripts = pageAssets.concat(entryAssets).filter(path => path.indexOf('.js') > -1);
 
+  if (assetsManifest.dataLoader) {
+    scripts.unshift(`${assetsManifest.publicPath}${assetsManifest.dataLoader}`);
+  }
+
   const matchedIds = matches.map(match => match.route.id);
   const routePath = getCurrentRoutePath(matches);
 
diff --git a/packages/runtime/src/types.ts b/packages/runtime/src/types.ts
index 25a57195c..117148f8b 100644
--- a/packages/runtime/src/types.ts
+++ b/packages/runtime/src/types.ts
@@ -140,6 +140,7 @@ export interface RouteModules {
 }
 
 export interface AssetsManifest {
+  dataLoader?: string;
   publicPath: string;
   entries: string[];
   pages: string[];
diff --git a/packages/webpack-config/src/webpackPlugins/AssetsManifestPlugin.ts b/packages/webpack-config/src/webpackPlugins/AssetsManifestPlugin.ts
index 74ec199b6..0042ac1f3 100644
--- a/packages/webpack-config/src/webpackPlugins/AssetsManifestPlugin.ts
+++ b/packages/webpack-config/src/webpackPlugins/AssetsManifestPlugin.ts
@@ -69,7 +69,7 @@ export default class AssetsManifestPlugin {
     // data-loader is built by another webpack task
     const dataLoader = resolve(this.outputDir, './data-loader.ts');
     if (existsSync(dataLoader)) {
-      manifest.entries['main']?.unshift('js/data-loader.js');
+      manifest['dataLoader'] = 'js/data-loader.js';
     }
 
     const output = JSON.stringify(manifest, null, 2);

From 4a1ae9b938c04be33597a5f7c58d0b79fb50cf0b Mon Sep 17 00:00:00 2001
From: ClarkXia <xiawenwu41@gmail.com>
Date: Thu, 25 Aug 2022 16:16:09 +0800
Subject: [PATCH 20/31] chore: remove useless devDependencies (#464)

---
 examples/basic-project/package.json    |  1 -
 examples/csr-project/package.json      |  1 -
 examples/rax-project/package.json      |  1 -
 examples/routes-generate/package.json  |  3 +--
 examples/single-route/package.json     |  1 -
 examples/with-antd-mobile/package.json |  3 +--
 examples/with-antd/package.json        |  3 +--
 examples/with-pha/package.json         |  1 -
 examples/with-store/package.json       |  3 +--
 pnpm-lock.yaml                         | 18 ------------------
 10 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/examples/basic-project/package.json b/examples/basic-project/package.json
index 17452c715..d60d83b3b 100644
--- a/examples/basic-project/package.json
+++ b/examples/basic-project/package.json
@@ -21,7 +21,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
-    "browserslist": "^4.19.3",
     "speed-measure-webpack-plugin": "^1.5.0",
     "webpack": "^5.73.0"
   }
diff --git a/examples/csr-project/package.json b/examples/csr-project/package.json
index 503a3ea88..d77a50cfd 100644
--- a/examples/csr-project/package.json
+++ b/examples/csr-project/package.json
@@ -19,7 +19,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "browserslist": "^4.19.3",
     "speed-measure-webpack-plugin": "^1.5.0",
     "webpack": "^5.73.0"
   }
diff --git a/examples/rax-project/package.json b/examples/rax-project/package.json
index 0ecf3e2ee..adb81eb63 100644
--- a/examples/rax-project/package.json
+++ b/examples/rax-project/package.json
@@ -23,7 +23,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
-    "browserslist": "^4.19.3",
     "webpack": "^5.73.0"
   }
 }
diff --git a/examples/routes-generate/package.json b/examples/routes-generate/package.json
index 3328789f4..c91e04f2d 100644
--- a/examples/routes-generate/package.json
+++ b/examples/routes-generate/package.json
@@ -16,7 +16,6 @@
   },
   "devDependencies": {
     "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "browserslist": "^4.19.3"
+    "@types/react-dom": "^18.0.0"
   }
 }
\ No newline at end of file
diff --git a/examples/single-route/package.json b/examples/single-route/package.json
index da8ea68b0..600438de1 100644
--- a/examples/single-route/package.json
+++ b/examples/single-route/package.json
@@ -15,7 +15,6 @@
     "react-dom": "^18.0.0"
   },
   "devDependencies": {
-    "browserslist": "^4.19.3",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "webpack-bundle-analyzer": "^4.5.0"
diff --git a/examples/with-antd-mobile/package.json b/examples/with-antd-mobile/package.json
index 2a5707335..900e72d27 100644
--- a/examples/with-antd-mobile/package.json
+++ b/examples/with-antd-mobile/package.json
@@ -19,7 +19,6 @@
   },
   "devDependencies": {
     "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.2",
-    "browserslist": "^4.19.3"
+    "@types/react-dom": "^18.0.2"
   }
 }
\ No newline at end of file
diff --git a/examples/with-antd/package.json b/examples/with-antd/package.json
index 81eb8af58..be7de568d 100644
--- a/examples/with-antd/package.json
+++ b/examples/with-antd/package.json
@@ -20,7 +20,6 @@
   },
   "devDependencies": {
     "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.2",
-    "browserslist": "^4.19.3"
+    "@types/react-dom": "^18.0.2"
   }
 }
diff --git a/examples/with-pha/package.json b/examples/with-pha/package.json
index 5ff2a4c6f..c4af75689 100644
--- a/examples/with-pha/package.json
+++ b/examples/with-pha/package.json
@@ -18,7 +18,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
-    "browserslist": "^4.19.3",
     "webpack": "^5.73.0"
   }
 }
diff --git a/examples/with-store/package.json b/examples/with-store/package.json
index e14c66867..ff07de011 100644
--- a/examples/with-store/package.json
+++ b/examples/with-store/package.json
@@ -14,7 +14,6 @@
   "devDependencies": {
     "@ice/plugin-store": "workspace:*",
     "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "browserslist": "^4.19.3"
+    "@types/react-dom": "^18.0.0"
   }
 }
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fdf4ee1e8..4ff1ca57b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -84,7 +84,6 @@ importers:
       '@types/react-dom': ^18.0.2
       '@uni/env': ^1.1.0
       ahooks: ^3.3.8
-      browserslist: ^4.19.3
       react: ^18.0.0
       react-dom: ^18.0.0
       speed-measure-webpack-plugin: ^1.5.0
@@ -101,7 +100,6 @@ importers:
     devDependencies:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
-      browserslist: 4.20.3
       speed-measure-webpack-plugin: 1.5.0_webpack@5.73.0
       webpack: 5.73.0
 
@@ -113,7 +111,6 @@ importers:
       '@types/react': ^18.0.0
       '@types/react-dom': ^18.0.0
       antd-mobile: ^5.12.6
-      browserslist: ^4.19.3
       react: ^18.0.0
       react-dom: ^18.0.0
       speed-measure-webpack-plugin: ^1.5.0
@@ -128,7 +125,6 @@ importers:
     devDependencies:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
-      browserslist: 4.20.3
       speed-measure-webpack-plugin: 1.5.0_webpack@5.73.0
       webpack: 5.73.0
 
@@ -156,7 +152,6 @@ importers:
       '@ice/runtime': workspace:*
       '@types/react': ^18.0.0
       '@types/react-dom': ^18.0.2
-      browserslist: ^4.19.3
       rax: ^1.2.2
       rax-image: ^2.4.1
       rax-is-valid-element: ^1.0.0
@@ -179,7 +174,6 @@ importers:
     devDependencies:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
-      browserslist: 4.20.3
       webpack: 5.73.0
 
   examples/routes-generate:
@@ -188,7 +182,6 @@ importers:
       '@ice/runtime': workspace:*
       '@types/react': ^18.0.0
       '@types/react-dom': ^18.0.0
-      browserslist: ^4.19.3
       react: ^18.0.0
       react-dom: ^18.0.0
     dependencies:
@@ -199,7 +192,6 @@ importers:
     devDependencies:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
-      browserslist: 4.20.3
 
   examples/single-route:
     specifiers:
@@ -207,7 +199,6 @@ importers:
       '@ice/runtime': workspace:*
       '@types/react': ^18.0.0
       '@types/react-dom': ^18.0.0
-      browserslist: ^4.19.3
       react: ^18.0.0
       react-dom: ^18.0.0
       webpack-bundle-analyzer: ^4.5.0
@@ -219,7 +210,6 @@ importers:
     devDependencies:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
-      browserslist: 4.20.3
       webpack-bundle-analyzer: 4.5.0
 
   examples/with-antd:
@@ -231,7 +221,6 @@ importers:
       '@types/react': ^18.0.0
       '@types/react-dom': ^18.0.2
       antd: ^4.0.0
-      browserslist: ^4.19.3
       moment: ^2.29.4
       react: ^18.0.0
       react-dom: ^18.0.0
@@ -247,7 +236,6 @@ importers:
     devDependencies:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
-      browserslist: 4.20.3
 
   examples/with-antd-mobile:
     specifiers:
@@ -256,7 +244,6 @@ importers:
       '@types/react': ^18.0.0
       '@types/react-dom': ^18.0.2
       antd-mobile: ^5.12.4
-      browserslist: ^4.19.3
       constate: ^3.3.2
       react: ^18.2.0
       react-dom: ^18.2.0
@@ -270,7 +257,6 @@ importers:
     devDependencies:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
-      browserslist: 4.20.3
 
   examples/with-fusion:
     specifiers:
@@ -300,7 +286,6 @@ importers:
       '@ice/runtime': workspace:*
       '@types/react': ^18.0.0
       '@types/react-dom': ^18.0.2
-      browserslist: ^4.19.3
       react: ^18.0.0
       react-dom: ^18.0.0
       webpack: ^5.73.0
@@ -313,7 +298,6 @@ importers:
     devDependencies:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
-      browserslist: 4.20.3
       webpack: 5.73.0
 
   examples/with-store:
@@ -323,7 +307,6 @@ importers:
       '@ice/runtime': workspace:*
       '@types/react': ^18.0.0
       '@types/react-dom': ^18.0.0
-      browserslist: ^4.19.3
     dependencies:
       '@ice/app': link:../../packages/ice
       '@ice/runtime': link:../../packages/runtime
@@ -331,7 +314,6 @@ importers:
       '@ice/plugin-store': link:../../packages/plugin-store
       '@types/react': 18.0.15
       '@types/react-dom': 18.0.6
-      browserslist: 4.21.3
 
   packages/bundles:
     specifiers:

From 2eecc910269f33df948822e622538e94b36f75ed Mon Sep 17 00:00:00 2001
From: luhc228 <44047106+luhc228@users.noreply.github.com>
Date: Thu, 25 Aug 2022 16:16:43 +0800
Subject: [PATCH 21/31] feat: use lint-staged to run lint before commit (#452)

* chore: remove lintDiff file

* chore: update lock

* chore: add lint script
---
 .husky/pre-commit   |   2 +-
 package.json        |  21 ++++---
 pnpm-lock.yaml      | 132 +++++++++++++++++++++++++++++++++++++++++++-
 scripts/lintDiff.ts |  37 -------------
 4 files changed, 141 insertions(+), 51 deletions(-)
 delete mode 100644 scripts/lintDiff.ts

diff --git a/.husky/pre-commit b/.husky/pre-commit
index cb5024d8f..36af21989 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run lint:diff
+npx lint-staged
diff --git a/package.json b/package.json
index eb34bd51a..80a172ce8 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,12 @@
 {
+  "name": "ice-monorepo",
   "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
-  "version": "0.0.1",
   "description": "A universal framework based on React",
+  "author": "ice-admin@alibaba-inc.com",
+  "license": "MIT",
+  "homepage": "https://v3.ice.work",
+  "repository": "ice-lab/ice-next",
+  "bugs": "https://github.com/ice-lab/ice-next/issues",
   "scripts": {
     "prepare": "husky install",
     "setup": "rm -rf node_modules packages/*/node_modules && pnpm install && pnpm prebundle && pnpm build",
@@ -16,20 +18,13 @@
     "dependency:check": "esmo ./scripts/dependencyCheck.ts",
     "version": "esmo ./scripts/tagVersion.ts",
     "version:check": "esmo ./scripts/versionCheck.ts",
-    "lint:diff": "esmo ./scripts/lintDiff.ts",
     "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx ./",
-    "lint:fix": "npm run lint -- --fix",
     "publish:alpha": "PUBLISH_TYPE=alpha esmo ./scripts/publishPackageWithDistTag.ts",
     "publish:beta": "PUBLISH_TYPE=beta esmo ./scripts/publishPackageWithDistTag.ts",
     "publish:release": "PUBLISH_TYPE=release VERSION_PREFIX=rc esmo ./scripts/publishPackageWithDistTag.ts",
     "cov": "vitest run --coverage",
     "test": "vitest"
   },
-  "author": "ice-admin@alibaba-inc.com",
-  "license": "MIT",
-  "repository": "ice-lab/ice-next",
-  "bugs": "https://github.com/ice-lab/ice-next/issues",
-  "homepage": "https://v3.ice.work",
   "devDependencies": {
     "@applint/spec": "^1.2.3",
     "@commitlint/cli": "^16.3.0",
@@ -56,6 +51,7 @@
     "husky": "^7.0.4",
     "ice-npm-utils": "^3.0.2",
     "jsdom": "^20.0.0",
+    "lint-staged": "^13.0.3",
     "prettier": "^2.7.1",
     "puppeteer": "^13.7.0",
     "react": "^18.2.0",
@@ -66,5 +62,8 @@
     "typescript": "^4.7.4",
     "vitest": "^0.15.2"
   },
+  "lint-staged": {
+    "*.{js,jsx,ts,tsx}": "eslint --cache --fix"
+  },
   "packageManager": "pnpm@7.2.1"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4ff1ca57b..e0f58d0c7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -29,6 +29,7 @@ importers:
       husky: ^7.0.4
       ice-npm-utils: ^3.0.2
       jsdom: ^20.0.0
+      lint-staged: ^13.0.3
       prettier: ^2.7.1
       puppeteer: ^13.7.0
       react: ^18.2.0
@@ -64,6 +65,7 @@ importers:
       husky: 7.0.4
       ice-npm-utils: 3.0.2
       jsdom: 20.0.0
+      lint-staged: 13.0.3
       prettier: 2.7.1
       puppeteer: 13.7.0
       react: 18.2.0
@@ -7171,7 +7173,6 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.21.3
-    dev: false
 
   /ansi-html-community/0.0.8:
     resolution: {integrity: sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==}
@@ -8135,6 +8136,22 @@ packages:
     optionalDependencies:
       '@colors/colors': 1.5.0
 
+  /cli-truncate/2.1.0:
+    resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
+    engines: {node: '>=8'}
+    dependencies:
+      slice-ansi: 3.0.0
+      string-width: 4.2.3
+    dev: true
+
+  /cli-truncate/3.1.0:
+    resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      slice-ansi: 5.0.0
+      string-width: 5.1.2
+    dev: true
+
   /cli-width/3.0.0:
     resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==}
     engines: {node: '>= 10'}
@@ -8218,6 +8235,10 @@ packages:
   /colorette/2.0.16:
     resolution: {integrity: sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==}
 
+  /colorette/2.0.19:
+    resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==}
+    dev: true
+
   /combine-promises/1.1.0:
     resolution: {integrity: sha512-ZI9jvcLDxqwaXEixOhArm3r7ReIivsXkpbyEWyeOhzz1QS0iSgBPnWvEqvIQtYyamGCYA88gFhmUrs9hrrQ0pg==}
     engines: {node: '>=10'}
@@ -8256,6 +8277,11 @@ packages:
     engines: {node: ^12.20.0 || >=14}
     dev: false
 
+  /commander/9.4.0:
+    resolution: {integrity: sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==}
+    engines: {node: ^12.20.0 || >=14}
+    dev: true
+
   /common-path-prefix/3.0.0:
     resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==}
     dev: false
@@ -11998,6 +12024,11 @@ packages:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
+  /is-fullwidth-code-point/4.0.0:
+    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
+    engines: {node: '>=12'}
+    dev: true
+
   /is-generator-function/1.0.10:
     resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
     engines: {node: '>= 0.4'}
@@ -12514,6 +12545,48 @@ packages:
   /lines-and-columns/1.2.4:
     resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
 
+  /lint-staged/13.0.3:
+    resolution: {integrity: sha512-9hmrwSCFroTSYLjflGI8Uk+GWAwMB4OlpU4bMJEAT5d/llQwtYKoim4bLOyLCuWFAhWEupE0vkIFqtw/WIsPug==}
+    engines: {node: ^14.13.1 || >=16.0.0}
+    hasBin: true
+    dependencies:
+      cli-truncate: 3.1.0
+      colorette: 2.0.19
+      commander: 9.4.0
+      debug: 4.3.4
+      execa: 6.1.0
+      lilconfig: 2.0.5
+      listr2: 4.0.5
+      micromatch: 4.0.5
+      normalize-path: 3.0.0
+      object-inspect: 1.12.2
+      pidtree: 0.6.0
+      string-argv: 0.3.1
+      yaml: 2.1.1
+    transitivePeerDependencies:
+      - enquirer
+      - supports-color
+    dev: true
+
+  /listr2/4.0.5:
+    resolution: {integrity: sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      enquirer: '>= 2.3.0 < 3'
+    peerDependenciesMeta:
+      enquirer:
+        optional: true
+    dependencies:
+      cli-truncate: 2.1.0
+      colorette: 2.0.19
+      log-update: 4.0.0
+      p-map: 4.0.0
+      rfdc: 1.3.0
+      rxjs: 7.5.5
+      through: 2.3.8
+      wrap-ansi: 7.0.0
+    dev: true
+
   /loader-runner/4.3.0:
     resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
     engines: {node: '>=6.11.5'}
@@ -12618,6 +12691,16 @@ packages:
       is-unicode-supported: 0.1.0
     dev: true
 
+  /log-update/4.0.0:
+    resolution: {integrity: sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==}
+    engines: {node: '>=10'}
+    dependencies:
+      ansi-escapes: 4.3.2
+      cli-cursor: 3.1.0
+      slice-ansi: 4.0.0
+      wrap-ansi: 6.2.0
+    dev: true
+
   /loose-envify/1.4.0:
     resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
@@ -13588,6 +13671,12 @@ packages:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
+  /pidtree/0.6.0:
+    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+    dev: true
+
   /pify/4.0.1:
     resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
     engines: {node: '>=6'}
@@ -16196,6 +16285,10 @@ packages:
     resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
+  /rfdc/1.3.0:
+    resolution: {integrity: sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==}
+    dev: true
+
   /rimraf/2.6.3:
     resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==}
     hasBin: true
@@ -16605,6 +16698,15 @@ packages:
     resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==}
     engines: {node: '>=12'}
 
+  /slice-ansi/3.0.0:
+    resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-styles: 4.3.0
+      astral-regex: 2.0.0
+      is-fullwidth-code-point: 3.0.0
+    dev: true
+
   /slice-ansi/4.0.0:
     resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
     engines: {node: '>=10'}
@@ -16614,6 +16716,14 @@ packages:
       is-fullwidth-code-point: 3.0.0
     dev: true
 
+  /slice-ansi/5.0.0:
+    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      ansi-styles: 6.1.0
+      is-fullwidth-code-point: 4.0.0
+    dev: true
+
   /sockjs/0.3.24:
     resolution: {integrity: sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==}
     dependencies:
@@ -16777,6 +16887,11 @@ packages:
     engines: {node: '>=10.0.0'}
     dev: false
 
+  /string-argv/0.3.1:
+    resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==}
+    engines: {node: '>=0.6.19'}
+    dev: true
+
   /string-convert/0.2.1:
     resolution: {integrity: sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A==}
     dev: false
@@ -17551,7 +17666,6 @@ packages:
   /type-fest/0.21.3:
     resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
     engines: {node: '>=10'}
-    dev: false
 
   /type-fest/0.6.0:
     resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
@@ -18736,6 +18850,15 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /wrap-ansi/6.2.0:
+    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
+    engines: {node: '>=8'}
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+    dev: true
+
   /wrap-ansi/7.0.0:
     resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
     engines: {node: '>=10'}
@@ -18843,6 +18966,11 @@ packages:
     resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
     engines: {node: '>= 6'}
 
+  /yaml/2.1.1:
+    resolution: {integrity: sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==}
+    engines: {node: '>= 14'}
+    dev: true
+
   /yargs-parser/20.2.9:
     resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
     engines: {node: '>=10'}
diff --git a/scripts/lintDiff.ts b/scripts/lintDiff.ts
deleted file mode 100644
index 5a5b1af99..000000000
--- a/scripts/lintDiff.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { execSync } from 'child_process';
-import { ESLint } from 'eslint';
-import chalk from 'chalk';
-
-const GIT_DIFF = 'git diff --cached --diff-filter=ACMR --name-only';
-
-(async () => {
-  const linter = new ESLint();
-
-  // file level
-  const fileList = execSync(GIT_DIFF).toString().split('\n');
-  // ignore file which is not js/jsx/ts/tsx
-  const lintFileList = (await Promise.all(fileList
-    .map(async (file) => !!file && (/\.(j|t)sx?$/g.test(file) && !(await linter.isPathIgnored(file)) && file))))
-    .filter(Boolean);
-
-  if (!lintFileList.length) {
-    console.log(chalk.green('no file should be lint.'));
-    return;
-  }
-
-  console.log(chalk.green(lintFileList.join('\n')));
-  console.log();
-  console.log(chalk.green('above file should be lint.'));
-  const lintResults = await linter.lintFiles(lintFileList);
-  const Formatter = await linter.loadFormatter();
-  console.log(Formatter.format(lintResults));
-  const error = ESLint.getErrorResults(lintResults);
-  if (error.length > 0) {
-    process.exit(1);
-  } else {
-    console.log(chalk.green('lint successfully.'));
-  }
-})().catch((error) => {
-  console.trace(error);
-  process.exit(1);
-});
\ No newline at end of file

From 4354c19ea86e35806271e52933246c121f31eb71 Mon Sep 17 00:00:00 2001
From: ClarkXia <xiawenwu41@gmail.com>
Date: Thu, 25 Aug 2022 16:54:30 +0800
Subject: [PATCH 22/31] feat: support optimize router (#456)

* feat: support optimize router

* feat: export useNavigate

* chore: remove useless code
---
 examples/single-route/ice.config.mts          |  5 ++-
 examples/single-route/optimization.config.mts |  8 ++++
 examples/single-route/package.json            |  6 +--
 packages/ice/src/config.ts                    |  4 +-
 packages/ice/src/createService.ts             | 30 +++++++------
 packages/ice/templates/core/index.ts.ejs      | 42 ++++---------------
 packages/runtime/package.json                 |  4 +-
 packages/runtime/src/AppRouter.tsx            |  2 +-
 packages/runtime/src/index.ts                 | 13 ------
 packages/runtime/src/matchRoutes.ts           |  2 +-
 packages/runtime/src/router.ts                |  8 ++++
 packages/runtime/src/runClientApp.tsx         |  2 +-
 .../history-single.tsx => single-router.tsx}  | 24 ++++++-----
 packages/types/src/userConfig.ts              |  6 ++-
 pnpm-lock.yaml                                |  5 +--
 tests/integration/single-router.test.ts       | 32 ++++++++++++++
 tests/utils/build.ts                          |  6 ++-
 17 files changed, 112 insertions(+), 87 deletions(-)
 create mode 100644 examples/single-route/optimization.config.mts
 create mode 100644 packages/runtime/src/router.ts
 rename packages/runtime/src/{utils/history-single.tsx => single-router.tsx} (50%)
 create mode 100644 tests/integration/single-router.test.ts

diff --git a/examples/single-route/ice.config.mts b/examples/single-route/ice.config.mts
index e91d7cc3e..2038c4c35 100644
--- a/examples/single-route/ice.config.mts
+++ b/examples/single-route/ice.config.mts
@@ -2,6 +2,7 @@ import { defineConfig } from '@ice/app';
 
 export default defineConfig({
   publicPath: '/',
-  removeHistoryDeadCode: true,
-  sourceMap: true,
+  optimization: {
+    router: false,
+  }
 });
\ No newline at end of file
diff --git a/examples/single-route/optimization.config.mts b/examples/single-route/optimization.config.mts
new file mode 100644
index 000000000..deb4235b4
--- /dev/null
+++ b/examples/single-route/optimization.config.mts
@@ -0,0 +1,8 @@
+import { defineConfig } from '@ice/app';
+
+export default defineConfig({
+  publicPath: '/',
+  optimization: {
+    router: true,
+  }
+});
\ No newline at end of file
diff --git a/examples/single-route/package.json b/examples/single-route/package.json
index 600438de1..f813e5717 100644
--- a/examples/single-route/package.json
+++ b/examples/single-route/package.json
@@ -3,7 +3,8 @@
   "version": "1.0.0",
   "scripts": {
     "start": "ice start",
-    "build": "ice build"
+    "build": "ice build",
+    "build:optimization": "ice build --config optimization.config.mts"
   },
   "description": "",
   "author": "",
@@ -16,7 +17,6 @@
   },
   "devDependencies": {
     "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "webpack-bundle-analyzer": "^4.5.0"
+    "@types/react-dom": "^18.0.0"
   }
 }
diff --git a/packages/ice/src/config.ts b/packages/ice/src/config.ts
index 1b8679ada..cadefc20e 100644
--- a/packages/ice/src/config.ts
+++ b/packages/ice/src/config.ts
@@ -279,8 +279,8 @@ const userConfig = [
     },
   },
   {
-    name: 'removeHistoryDeadCode',
-    validation: 'boolean',
+    name: 'optimization',
+    validation: 'object',
   },
   {
     name: 'mock',
diff --git a/packages/ice/src/createService.ts b/packages/ice/src/createService.ts
index f1bf16c1d..2181bb073 100644
--- a/packages/ice/src/createService.ts
+++ b/packages/ice/src/createService.ts
@@ -99,15 +99,6 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
   ['userConfig', 'cliOption'].forEach((configType) => ctx.registerConfig(configType, config[configType]));
 
   let taskConfigs = await ctx.setup();
-  // merge task config with built-in config
-  taskConfigs = mergeTaskConfig(taskConfigs, {
-    port: commandArgs.port,
-    alias: {
-      // Get absolute path of `regenerator-runtime`, so it's unnecessary to add it to project dependencies
-      'regenerator-runtime': require.resolve('regenerator-runtime'),
-    },
-  });
-  const webTaskConfig = taskConfigs.find(({ name }) => name === 'web');
 
   // get userConfig after setup because of userConfig maybe modified by plugins
   const { userConfig } = ctx;
@@ -120,6 +111,22 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
   const hasExportAppData = (await getFileExports({ rootDir, file: 'src/app' })).includes('getAppData');
   const csr = !userConfig.ssr && !userConfig.ssg;
 
+  const disableRouter = userConfig?.optimization?.router && routesInfo.routesCount <= 1;
+  let taskAlias = {};
+  if (disableRouter) {
+    consola.info('[ice]', 'optimization.router is enabled and only have one route, ice build will remove react-router and history which is unnecessary.');
+    taskAlias['@ice/runtime/router'] = path.join(require.resolve('@ice/runtime'), '../single-router.js');
+  }
+  // merge task config with built-in config
+  taskConfigs = mergeTaskConfig(taskConfigs, {
+    port: commandArgs.port,
+    alias: {
+      // Get absolute path of `regenerator-runtime`, so it's unnecessary to add it to project dependencies
+      'regenerator-runtime': require.resolve('regenerator-runtime'),
+    },
+  });
+  const webTaskConfig = taskConfigs.find(({ name }) => name === 'web');
+
   // add render data
   generator.setRenderData({
     ...routesInfo,
@@ -132,6 +139,7 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
   });
   dataCache.set('routes', JSON.stringify(routesInfo));
   dataCache.set('hasExportAppData', hasExportAppData ? 'true' : '');
+
   // Render exports files if route component export getData / getConfig.
   renderExportsTemplate({
     ...routesInfo,
@@ -184,10 +192,6 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
     consola.debug(err);
   }
 
-  const disableRouter = userConfig.removeHistoryDeadCode && routesInfo.routesCount <= 1;
-  if (disableRouter) {
-    consola.info('[ice] removeHistoryDeadCode is enabled and only have one route, ice build will remove history and react-router dead code.');
-  }
   updateRuntimeEnv(appConfig, { disableRouter });
 
   return {
diff --git a/packages/ice/templates/core/index.ts.ejs b/packages/ice/templates/core/index.ts.ejs
index 9c9455b63..e161f248b 100644
--- a/packages/ice/templates/core/index.ts.ejs
+++ b/packages/ice/templates/core/index.ts.ejs
@@ -1,39 +1,15 @@
 import {
-  Link as OriginLink,
-  Outlet as OriginOutlet,
-  useParams as useOriginParams,
-  useSearchParams as useOriginSearchParams,
-  useLocation as useOriginLocation,
-  LinkSingle,
-  OutletSingle,
-  useParamsSingle,
-  useSearchParamsSingle,
-  useLocationSingle,
-} from '@ice/runtime';
-
+  Link,
+  Outlet,
+  useParams,
+  useSearchParams,
+  useLocation,
+  useNavigate,
+} from '@ice/runtime/router';
 <% if (globalStyle) {-%>
 import '<%= globalStyle %>'
 <% } -%>
 
-let Link: typeof OriginLink;
-let Outlet: typeof OriginOutlet;
-let useParams: typeof useOriginParams;
-let useSearchParams: typeof useOriginSearchParams;
-let useLocation: typeof useOriginLocation; 
-if (process.env.ICE_CORE_ROUTER === 'true') {
-  Link = OriginLink;
-  Outlet = OriginOutlet;
-  useParams = useOriginParams;
-  useSearchParams = useOriginSearchParams;
-  useLocation = useOriginLocation;
-} else {
-  Link = LinkSingle as any;
-  Outlet = OutletSingle;
-  useParams = useParamsSingle as typeof useParams;
-  useSearchParams = useSearchParamsSingle as any;
-  useLocation = useLocationSingle as typeof useLocation;
-}
-
 export {
   Link,
   Outlet,
@@ -58,10 +34,10 @@ export {
 
 <%- framework.imports %>
 
-export {
 <% if (framework.exports) { -%>
+export {
   <%- framework.exports %>
-<% } -%>
 };
+<% } -%>
 
 export * from './types';
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
index c1f30d6a2..156a2e8a2 100644
--- a/packages/runtime/package.json
+++ b/packages/runtime/package.json
@@ -11,7 +11,9 @@
     "./server": "./esm/index.server.js",
     "./jsx-runtime": "./esm/jsx-runtime.js",
     "./jsx-dev-runtime": "./esm/jsx-dev-runtime.js",
-    "./matchRoutes": "./esm/matchRoutes.js"
+    "./matchRoutes": "./esm/matchRoutes.js",
+    "./router": "./esm/router.js",
+    "./single-router": "./esm/single-router.js"
   },
   "files": [
     "esm",
diff --git a/packages/runtime/src/AppRouter.tsx b/packages/runtime/src/AppRouter.tsx
index 66cad0d3f..e360f4a72 100644
--- a/packages/runtime/src/AppRouter.tsx
+++ b/packages/runtime/src/AppRouter.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import type { RouteObject } from 'react-router-dom';
 import { Router, useRoutes } from 'react-router-dom';
-import { RouterSingle, useRoutesSingle } from './utils/history-single.js';
+import { Router as RouterSingle, useRoutes as useRoutesSingle } from './single-router.js';
 import type { AppRouterProps } from './types.js';
 
 const AppRouter: React.ComponentType<AppRouterProps> = (props) => {
diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
index cd9b9ec39..1ce3e167b 100644
--- a/packages/runtime/src/index.ts
+++ b/packages/runtime/src/index.ts
@@ -5,13 +5,6 @@ import {
   useSearchParams,
   useLocation,
 } from 'react-router-dom';
-import {
-  LinkSingle,
-  OutletSingle,
-  useParamsSingle,
-  useSearchParamsSingle,
-  useLocationSingle,
-} from './utils/history-single.js';
 import Runtime from './runtime.js';
 import App from './App.js';
 import runClientApp from './runClientApp.js';
@@ -65,12 +58,6 @@ export {
   useParams,
   useSearchParams,
   useLocation,
-  // Single Route API
-  LinkSingle,
-  OutletSingle,
-  useParamsSingle,
-  useSearchParamsSingle,
-  useLocationSingle,
   history,
 };
 
diff --git a/packages/runtime/src/matchRoutes.ts b/packages/runtime/src/matchRoutes.ts
index 23bf820d1..d2715ef3d 100644
--- a/packages/runtime/src/matchRoutes.ts
+++ b/packages/runtime/src/matchRoutes.ts
@@ -4,7 +4,7 @@
 import type { Location } from 'history';
 import type { RouteObject } from 'react-router-dom';
 import { matchRoutes as originMatchRoutes } from 'react-router-dom';
-import { matchRoutesSingle } from './utils/history-single.js';
+import { matchRoutes as matchRoutesSingle } from './single-router.js';
 import type { RouteItem, RouteMatch } from './types.js';
 
 export default function matchRoutes(
diff --git a/packages/runtime/src/router.ts b/packages/runtime/src/router.ts
new file mode 100644
index 000000000..5dc65e77c
--- /dev/null
+++ b/packages/runtime/src/router.ts
@@ -0,0 +1,8 @@
+export {
+  Link,
+  Outlet,
+  useParams,
+  useSearchParams,
+  useLocation,
+  useNavigate,
+} from 'react-router-dom';
\ No newline at end of file
diff --git a/packages/runtime/src/runClientApp.tsx b/packages/runtime/src/runClientApp.tsx
index 850e30e16..5350d8a04 100644
--- a/packages/runtime/src/runClientApp.tsx
+++ b/packages/runtime/src/runClientApp.tsx
@@ -2,7 +2,7 @@ import React, { useLayoutEffect, useState } from 'react';
 import * as ReactDOM from 'react-dom/client';
 import { createHashHistory, createBrowserHistory, createMemoryHistory } from 'history';
 import type { HashHistory, BrowserHistory, Action, Location, InitialEntry, MemoryHistory } from 'history';
-import { createHistorySingle } from './utils/history-single.js';
+import { createHistory as createHistorySingle } from './single-router.js';
 import { setHistory } from './history.js';
 import Runtime from './runtime.js';
 import App from './App.js';
diff --git a/packages/runtime/src/utils/history-single.tsx b/packages/runtime/src/single-router.tsx
similarity index 50%
rename from packages/runtime/src/utils/history-single.tsx
rename to packages/runtime/src/single-router.tsx
index e097d7f4a..97b5ab2af 100644
--- a/packages/runtime/src/utils/history-single.tsx
+++ b/packages/runtime/src/single-router.tsx
@@ -1,18 +1,19 @@
 /**
- * 对 react-router-dom 进行二次封装，保证只有一个路由时能够通过 tree-shaking 将 react-router 相关代码全量移除
+ * Fake API of react-router-dom, react-router-dom will be remove
+ * if user config `optimize.router` false
  */
 import * as React from 'react';
 import type { History } from 'history';
 
-export const useRoutesSingle = (routes) => {
+export const useRoutes = (routes) => {
   return <>{routes[0].element}</>;
 };
 
-export const RouterSingle = (props) => {
+export const Router = (props) => {
   return <>{props.children}</>;
 };
 
-export const createHistorySingle = (): History => {
+export const createHistory = (): History => {
   return {
     // @ts-expect-error
     listen: () => {},
@@ -23,7 +24,7 @@ export const createHistorySingle = (): History => {
   };
 };
 
-export const matchRoutesSingle = (routes) => {
+export const matchRoutes = (routes: any[]) => {
   return routes.map(item => {
     return {
       params: {},
@@ -34,16 +35,19 @@ export const matchRoutesSingle = (routes) => {
   });
 };
 
-export const LinkSingle = () => null;
-export const OutletSingle = () => {
+export const Link = () => null;
+export const Outlet = () => {
   return <></>;
 };
-export const useParamsSingle = () => {
+export const useParams = () => {
   return {};
 };
-export const useSearchParamsSingle = () => {
+export const useSearchParams = () => {
   return [{}, () => {}];
 };
-export const useLocationSingle = () => {
+export const useLocation = () => {
+  return {};
+};
+export const useNavigate = () => {
   return {};
 };
diff --git a/packages/types/src/userConfig.ts b/packages/types/src/userConfig.ts
index 3795a9d53..cc2a59dc8 100644
--- a/packages/types/src/userConfig.ts
+++ b/packages/types/src/userConfig.ts
@@ -10,6 +10,10 @@ interface SyntaxFeatures {
   functionBind?: boolean;
 }
 
+interface Optimization {
+  router?: boolean;
+}
+
 export interface UserConfig {
   alias?: Record<string, string | false>;
   define?: Record<string, string | boolean>;
@@ -38,7 +42,7 @@ export interface UserConfig {
     format: 'esm' | 'cjs';
     bundle: boolean;
   };
-  removeHistoryDeadCode?: boolean;
+  optimization?: Optimization;
   mock?: { exclude?: string[] };
   experimental?: Config['experimental'];
   transform?: UnpluginOptions['transform'];
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e0f58d0c7..35505dde6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -203,7 +203,6 @@ importers:
       '@types/react-dom': ^18.0.0
       react: ^18.0.0
       react-dom: ^18.0.0
-      webpack-bundle-analyzer: ^4.5.0
     dependencies:
       '@ice/app': link:../../packages/ice
       '@ice/runtime': link:../../packages/runtime
@@ -212,7 +211,6 @@ importers:
     devDependencies:
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
-      webpack-bundle-analyzer: 4.5.0
 
   examples/with-antd:
     specifiers:
@@ -4768,7 +4766,7 @@ packages:
     peerDependencies:
       react: '*'
     dependencies:
-      '@types/react': 18.0.15
+      '@types/react': 18.0.17
       prop-types: 15.8.1
       react: 17.0.2
 
@@ -6584,7 +6582,6 @@ packages:
       '@types/prop-types': 15.7.5
       '@types/scheduler': 0.16.2
       csstype: 3.1.0
-    dev: true
 
   /@types/react/18.0.8:
     resolution: {integrity: sha512-+j2hk9BzCOrrOSJASi5XiOyBbERk9jG5O73Ya4M0env5Ixi6vUNli4qy994AINcEF+1IEHISYFfIT4zwr++LKw==}
diff --git a/tests/integration/single-router.test.ts b/tests/integration/single-router.test.ts
new file mode 100644
index 000000000..b882b425a
--- /dev/null
+++ b/tests/integration/single-router.test.ts
@@ -0,0 +1,32 @@
+import { expect, test, describe, afterAll } from 'vitest';
+import * as path from 'path';
+import * as fs from 'fs';
+import { buildFixture } from '../utils/build';
+
+const example = 'single-route';
+
+describe(`build ${example}`, () => {
+  let sizeWithOptimize = 0;
+  let sizeWithoutOptimize = 0;
+
+  test('optimize router', async () => {
+    await buildFixture(example, {
+      config: 'optimization.config.mts'
+    });
+    const dataLoaderPath = path.join(__dirname, `../../examples/${example}/build/js/framework.js`);
+    sizeWithOptimize = fs.statSync(dataLoaderPath).size;
+    
+  }, 120000);
+
+  test('disable optimize router', async () => {
+    await buildFixture(example);
+    const dataLoaderPath = path.join(__dirname, `../../examples/${example}/build/js/framework.js`);
+    sizeWithoutOptimize = fs.statSync(dataLoaderPath).size;
+    
+  }, 120000);
+
+  afterAll(async () => {
+    expect(sizeWithOptimize).toBeLessThan(sizeWithoutOptimize);
+    expect(sizeWithoutOptimize - sizeWithOptimize).toBeGreaterThan(6 * 1024) // reduce more than 6kb after minify
+  });
+});
diff --git a/tests/utils/build.ts b/tests/utils/build.ts
index 1a003d196..d63d23966 100644
--- a/tests/utils/build.ts
+++ b/tests/utils/build.ts
@@ -22,10 +22,12 @@ interface ReturnValue {
 }
 
 // get builtIn plugins
-export const buildFixture = async function(example: string) {
+export const buildFixture = async function(example: string, commandArgs?: Record<string, string>) {
   const rootDir = path.join(__dirname, `../../examples/${example}`);
   process.env.DISABLE_FS_CACHE = 'true';
-  const service = await createService({ rootDir, command: 'build', commandArgs: {} });
+  const service = await createService({ rootDir, command: 'build', commandArgs: {
+    ...(commandArgs || {}),
+  } });
   await service.run();
 }
 

From 03df0d852aa560e734f5db5ebb4e284d26738323 Mon Sep 17 00:00:00 2001
From: ClarkXia <xiawenwu41@gmail.com>
Date: Thu, 25 Aug 2022 18:43:08 +0800
Subject: [PATCH 23/31] fix: compatible with win32 system (#477)

* fix: compatible with win32

* fix: lint

* chore: optimize code

* fix: test case

* fix: build-scripts version

* chore: update version

* chore: update lock file

* feat: add test case of win

* fix: node matrix

* fix: format path

* fix: win32 compatible

* fix: format path
---
 .github/workflows/ci.yml                      |   6 +-
 examples/basic-project/ice.config.mts         |   5 +-
 packages/bundles/scripts/tasks.ts             |   4 +-
 packages/ice/package.json                     |   2 +-
 packages/ice/src/createService.ts             |   2 +-
 packages/ice/src/esbuild/transformImport.ts   |   5 +-
 .../src/middlewares/ssr/renderMiddleware.ts   |   5 +-
 packages/ice/src/routes.ts                    |   7 +-
 packages/ice/src/service/analyze.ts           |   3 +-
 packages/ice/src/service/config.ts            |  12 +-
 packages/ice/src/service/serverCompiler.ts    |   5 +-
 packages/ice/src/utils/dynamicImport.ts       |  19 +
 packages/ice/src/utils/generateHTML.ts        |   7 +-
 packages/ice/src/utils/getRoutePaths.ts       |   3 +-
 packages/ice/src/utils/getRuntimeModules.ts   |   4 +-
 packages/ice/src/utils/hash.ts                |   3 +-
 packages/ice/tests/preAnalyze.test.ts         |   3 +-
 packages/ice/tests/scan.test.ts               |   9 +-
 packages/ice/tests/transformImport.test.ts    |   6 +-
 .../{build.config.ts => build.config.mts}     |   0
 packages/jsx-runtime/package.json             |   2 +-
 packages/plugin-store/src/index.ts            |   2 +-
 .../{build.config.ts => build.config.mts}     |   0
 packages/rax-compat/package.json              |   2 +-
 packages/route-manifest/src/index.ts          |   6 +-
 packages/types/package.json                   |   2 +-
 packages/webpack-config/package.json          |   2 +-
 packages/webpack-config/src/index.ts          |   2 +-
 pnpm-lock.yaml                                | 543 ++++++++++++++----
 tests/utils/browser.ts                        |   2 +-
 30 files changed, 517 insertions(+), 156 deletions(-)
 create mode 100644 packages/ice/src/utils/dynamicImport.ts
 rename packages/jsx-runtime/{build.config.ts => build.config.mts} (100%)
 rename packages/rax-compat/{build.config.ts => build.config.mts} (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bfa8c2e4d..1039cd78d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,10 +7,12 @@ on: [push]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [14.x, 16.x]
+        os: [ubuntu-latest, windows-latest]
+      fail-fast: false
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/examples/basic-project/ice.config.mts b/examples/basic-project/ice.config.mts
index ba3e6d26c..809efa536 100644
--- a/examples/basic-project/ice.config.mts
+++ b/examples/basic-project/ice.config.mts
@@ -12,10 +12,7 @@ export default defineConfig({
     'process.env.HAHA': JSON.stringify(true),
   },
   transform: (code, id) => {
-    if (id.includes('src/pages')) {
-      // console.log('transform page:', id);
-    }
-    return code;
+    return id.includes('src/pages') && id.endsWith('.js') ? code : null;
   },
   webpack: (webpackConfig) => {
     if (process.env.NODE_ENV !== 'test') {
diff --git a/packages/bundles/scripts/tasks.ts b/packages/bundles/scripts/tasks.ts
index b0de7a0f8..628e9b548 100644
--- a/packages/bundles/scripts/tasks.ts
+++ b/packages/bundles/scripts/tasks.ts
@@ -77,8 +77,8 @@ const tasks = [
   {
     pkgName: 'terser-webpack-plugin',
     matchCopyFiles: (data: { resolvePath: string; resolveId: string }): boolean => {
-      const { resolvePath, resolveId } = data;
-      return resolvePath.endsWith('./utils') && resolveId.endsWith('terser-webpack-plugin/dist/index.js');
+      const { resolvePath } = data;
+      return resolvePath.endsWith('./utils') || resolvePath.endsWith('.json');
     },
   },
   {
diff --git a/packages/ice/package.json b/packages/ice/package.json
index 274763b7c..fd96b1383 100644
--- a/packages/ice/package.json
+++ b/packages/ice/package.json
@@ -41,7 +41,7 @@
     "acorn": "^8.7.1",
     "address": "^1.1.2",
     "body-parser": "^1.20.0",
-    "build-scripts": "^2.0.0-23",
+    "build-scripts": "^2.0.0-24",
     "chalk": "^4.0.0",
     "commander": "^9.0.0",
     "consola": "^2.15.3",
diff --git a/packages/ice/src/createService.ts b/packages/ice/src/createService.ts
index 2181bb073..faa344347 100644
--- a/packages/ice/src/createService.ts
+++ b/packages/ice/src/createService.ts
@@ -210,7 +210,7 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
             reCompileRouteConfig,
             dataCache,
             appConfig,
-            devPath: (routePaths[0] || '').replace(/^\//, ''),
+            devPath: (routePaths[0] || '').replace(/^[\/\\]/, ''),
             spinner: buildSpinner,
           });
         } else if (command === 'build') {
diff --git a/packages/ice/src/esbuild/transformImport.ts b/packages/ice/src/esbuild/transformImport.ts
index 13464a3ea..b593cc906 100644
--- a/packages/ice/src/esbuild/transformImport.ts
+++ b/packages/ice/src/esbuild/transformImport.ts
@@ -8,13 +8,14 @@ import type { ImportSpecifier } from '@ice/bundles/compiled/es-module-lexer/inde
 import type { Node } from 'estree';
 import type { UnpluginOptions } from 'unplugin';
 import type { DepsMetaData } from '../service/preBundleCJSDeps.js';
+import formatPath from '../utils/formatPath.js';
 
 const { init, parse } = esModuleLexer;
 
 type ImportNameSpecifier = { importedName: string; localName: string };
 
 // Redirect original dependency to the pre-bundle dependency(cjs) which is handled by preBundleCJSDeps function.
-const transformImportPlugin = (metadata: DepsMetaData): UnpluginOptions => {
+const transformImportPlugin = (metadata: DepsMetaData, serverDir: string): UnpluginOptions => {
   const { deps } = metadata;
   const redirectDepIds = [];
   return {
@@ -54,7 +55,7 @@ const transformImportPlugin = (metadata: DepsMetaData): UnpluginOptions => {
         }
 
         const importExp = source.slice(expStart, expEnd);
-        const filePath = deps[specifier].file;
+        const filePath = formatPath(path.relative(formatPath(serverDir), formatPath(deps[specifier].file)));
         redirectDepIds.push(filePath);
         const rewritten = transformCjsImport(
           importExp,
diff --git a/packages/ice/src/middlewares/ssr/renderMiddleware.ts b/packages/ice/src/middlewares/ssr/renderMiddleware.ts
index 544213b16..b66e280e7 100644
--- a/packages/ice/src/middlewares/ssr/renderMiddleware.ts
+++ b/packages/ice/src/middlewares/ssr/renderMiddleware.ts
@@ -9,6 +9,7 @@ import type { ExtendsPluginAPI } from '@ice/types/esm/plugin.js';
 import type { TaskConfig } from 'build-scripts';
 import type { Config } from '@ice/types';
 import getRouterBasename from '../../utils/getRouterBasename.js';
+import dynamicImport from '../../utils/dynamicImport.js';
 
 const require = createRequire(import.meta.url);
 
@@ -38,9 +39,7 @@ export default function createRenderMiddleware(options: Options): Middleware {
       let serverModule;
       try {
         delete require.cache[serverEntry];
-        // timestamp for disable import cache
-        const serverEntryWithVersion = `${serverEntry}?version=${new Date().getTime()}`;
-        serverModule = await import(serverEntryWithVersion);
+        serverModule = await dynamicImport(serverEntry, true);
       } catch (err) {
         // make error clearly, notice typeof err === 'string'
         consola.error(`import ${serverEntry} error: ${err}`);
diff --git a/packages/ice/src/routes.ts b/packages/ice/src/routes.ts
index 7ae355de6..f1102a264 100644
--- a/packages/ice/src/routes.ts
+++ b/packages/ice/src/routes.ts
@@ -3,6 +3,7 @@ import { formatNestedRouteManifest, generateRouteManifest } from '@ice/route-man
 import type { NestedRouteManifest } from '@ice/route-manifest';
 import type { UserConfig } from '@ice/types';
 import { getFileExports } from './service/analyze.js';
+import formatPath from './utils/formatPath.js';
 
 export async function generateRoutesInfo(rootDir: string, routesConfig: UserConfig['routes'] = {}) {
   const routeManifest = generateRouteManifest(rootDir, routesConfig.ignoreFiles, routesConfig.defineRoutes);
@@ -12,7 +13,7 @@ export async function generateRoutesInfo(rootDir: string, routesConfig: UserConf
     // add exports filed for route manifest
     routeItem.exports = await getFileExports({
       rootDir,
-      file: path.join('./src/pages', routeItem.file),
+      file: formatPath(path.join('./src/pages', routeItem.file)),
     });
   });
   await Promise.all(analyzeTasks);
@@ -59,8 +60,8 @@ function recurseRoutesStr(nestRouteManifest: NestedRouteManifest[], depth = 0) {
 
     const componentPath = id.startsWith('__') ? file : `@/pages/${file}`.replace(new RegExp(`${path.extname(file)}$`), '');
     const routeProperties: string[] = [
-      `path: '${routePath || ''}',`,
-      `load: () => import(/* webpackChunkName: "${componentName}" */ '${componentPath}'),`,
+      `path: '${formatPath(routePath || '')}',`,
+      `load: () => import(/* webpackChunkName: "${componentName}" */ '${formatPath(componentPath)}'),`,
       `componentName: '${componentName}',`,
       `index: ${index},`,
       `id: '${id}',`,
diff --git a/packages/ice/src/service/analyze.ts b/packages/ice/src/service/analyze.ts
index 63016bcab..236916e94 100644
--- a/packages/ice/src/service/analyze.ts
+++ b/packages/ice/src/service/analyze.ts
@@ -10,6 +10,7 @@ import { getCache, setCache } from '../utils/persistentCache.js';
 import { getFileHash } from '../utils/hash.js';
 import scanPlugin from '../esbuild/scan.js';
 import type { DepScanData } from '../esbuild/scan.js';
+import formatPath from '../utils/formatPath.js';
 
 interface Options {
   parallel?: number;
@@ -68,7 +69,7 @@ export function getImportPath(
   let aliasedPath = resolveId(id, alias) || '';
   if (!path.isAbsolute(aliasedPath)) {
     if (aliasedPath.startsWith('.')) {
-      aliasedPath = path.resolve(path.dirname(importer), aliasedPath);
+      aliasedPath = formatPath(path.resolve(path.dirname(importer), aliasedPath));
     } else {
       // node_modules dependencies
       aliasedPath = '';
diff --git a/packages/ice/src/service/config.ts b/packages/ice/src/service/config.ts
index 4483a001c..760959d37 100644
--- a/packages/ice/src/service/config.ts
+++ b/packages/ice/src/service/config.ts
@@ -4,6 +4,8 @@ import type { ServerCompiler } from '@ice/types/esm/plugin.js';
 import removeTopLevelCode from '../esbuild/removeTopLevelCode.js';
 import { getCache, setCache } from '../utils/persistentCache.js';
 import { getFileHash } from '../utils/hash.js';
+import dynamicImport from '../utils/dynamicImport.js';
+import formatPath from '../utils/formatPath.js';
 import { RUNTIME_TMP_DIR } from '../constant.js';
 
 type GetOutfile = (entry: string, exportNames: string[]) => string;
@@ -31,7 +33,7 @@ class Config {
     this.lastOptions = [];
     this.status = 'PENDING';
     this.getOutfile = compileConfig.getOutfile ||
-      (() => path.join(rootDir, 'node_modules', `${path.basename(entry)}.mjs`));
+      (() => formatPath(path.join(rootDir, 'node_modules', `${path.basename(entry)}.mjs`)));
   }
 
   public setCompiler(esbuildCompiler: ServerCompiler): void {
@@ -48,7 +50,7 @@ class Config {
       });
       if (!error) {
         this.status = 'RESOLVED';
-        return `${outfile}?version=${new Date().getTime()}`;
+        return outfile;
       }
     };
   }
@@ -69,7 +71,7 @@ class Config {
       const outfile = this.getOutfile(this.compileConfig.entry, keepExports);
       const cached = await this.compileConfig?.needRecompile(outfile, keepExports);
       if (cached && typeof cached === 'string') {
-        targetFile = this.status === 'RESOLVED' ? `${cached}?version=${new Date().getTime()}`
+        targetFile = this.status === 'RESOLVED' ? cached
           : (await this.compileTasks[taskKey]);
       } else if (!cached) {
         this.reCompile(taskKey);
@@ -81,14 +83,14 @@ class Config {
     if (!targetFile) {
       targetFile = await this.compileTasks[taskKey];
     }
-    if (targetFile) return await import(targetFile);
+    if (targetFile) return await dynamicImport(targetFile, true);
   };
 }
 
 export const getAppExportConfig = (rootDir: string) => {
   const appEntry = path.join(rootDir, 'src/app');
   const getOutfile = (entry: string, keepExports: string[]) =>
-    path.join(rootDir, 'node_modules', `${keepExports.join('_')}_${path.basename(entry)}.mjs`);
+    formatPath(path.join(rootDir, 'node_modules', `${keepExports.join('_')}_${path.basename(entry)}.mjs`));
   const appExportConfig = new Config({
     entry: appEntry,
     rootDir,
diff --git a/packages/ice/src/service/serverCompiler.ts b/packages/ice/src/service/serverCompiler.ts
index bb54b3ae4..5cd706b41 100644
--- a/packages/ice/src/service/serverCompiler.ts
+++ b/packages/ice/src/service/serverCompiler.ts
@@ -140,7 +140,10 @@ export function createServerCompiler(options: Options) {
           plugins: [
             ...transformPlugins,
             // Plugin transformImportPlugin need after transformPlugins in case of it has onLoad lifecycle.
-            dev && preBundle && transformImportPlugin(depsMetadata),
+            dev && preBundle && transformImportPlugin(
+              depsMetadata,
+              path.join(rootDir, task.config.outputDir, SERVER_OUTPUT_DIR),
+            ),
           ].filter(Boolean),
         }),
       ].filter(Boolean),
diff --git a/packages/ice/src/utils/dynamicImport.ts b/packages/ice/src/utils/dynamicImport.ts
new file mode 100644
index 000000000..e0d8e3048
--- /dev/null
+++ b/packages/ice/src/utils/dynamicImport.ts
@@ -0,0 +1,19 @@
+import { pathToFileURL } from 'url';
+import formatPath from './formatPath.js';
+
+export default async function dynamicImport(filePath: string, timestamp?: boolean) {
+  const isWin32 = process.platform === 'win32';
+  let importPath = formatPath(filePath);
+
+  if (isWin32) {
+    // Compatible with win32 path which starts with unsupported url scheme such as `D:/xx/xx/index.mjs`
+    const importUrl = pathToFileURL(importPath);
+    if (timestamp) {
+      importUrl.search = `version=${new Date().getTime()}`;
+    }
+    importPath = importUrl.toString();
+  } else if (timestamp) {
+    importPath += `?version=${new Date().getTime()}`;
+  }
+  return await import(importPath);
+}
\ No newline at end of file
diff --git a/packages/ice/src/utils/generateHTML.ts b/packages/ice/src/utils/generateHTML.ts
index 8a7e5731b..6df6860bf 100644
--- a/packages/ice/src/utils/generateHTML.ts
+++ b/packages/ice/src/utils/generateHTML.ts
@@ -5,6 +5,7 @@ import consola from 'consola';
 import type { ServerContext, RenderMode } from '@ice/runtime';
 import { ROUTER_MANIFEST } from '../constant.js';
 import getRoutePaths from './getRoutePaths.js';
+import dynamicImport from './dynamicImport.js';
 
 interface Options {
   rootDir: string;
@@ -26,7 +27,7 @@ export default async function generateHTML(options: Options) {
   let serverEntry;
 
   try {
-    serverEntry = await import(entry);
+    serverEntry = await dynamicImport(entry);
   } catch (err) {
     // make error clearly, notice typeof err === 'string'
     throw new Error(`import ${entry} error: ${err}`);
@@ -52,8 +53,8 @@ export default async function generateHTML(options: Options) {
       routePath,
       serverOnlyBasename: '/',
     });
-
-    const fileName = routePath === '/' ? 'index.html' : `${routePath}.html`;
+    // Win32 do not support file name with
+    const fileName = routePath === '/' ? 'index.html' : `${routePath.replace(/\/:/g, '/$')}.html`;
     if (fse.existsSync(path.join(rootDir, 'public', fileName))) {
       consola.warn(`${fileName} is overwrite by framework, rename file name if it is necessary`);
     }
diff --git a/packages/ice/src/utils/getRoutePaths.ts b/packages/ice/src/utils/getRoutePaths.ts
index fa403a536..af0bbe94f 100644
--- a/packages/ice/src/utils/getRoutePaths.ts
+++ b/packages/ice/src/utils/getRoutePaths.ts
@@ -1,5 +1,6 @@
 import * as path from 'path';
 import type { RouteObject } from 'react-router';
+import formatPath from './formatPath.js';
 
 /**
  * get all route path
@@ -13,7 +14,7 @@ function getRoutePaths(routes: RouteObject[], parentPath = ''): string[] {
     if (route.children) {
       pathList = pathList.concat(getRoutePaths(route.children, route.path));
     } else {
-      pathList.push(path.join('/', parentPath, route.path || ''));
+      pathList.push(formatPath(path.join('/', parentPath, route.path || '')));
     }
   });
 
diff --git a/packages/ice/src/utils/getRuntimeModules.ts b/packages/ice/src/utils/getRuntimeModules.ts
index 45a8d3359..f9c3c3f91 100644
--- a/packages/ice/src/utils/getRuntimeModules.ts
+++ b/packages/ice/src/utils/getRuntimeModules.ts
@@ -4,6 +4,7 @@ import findUp from 'find-up';
 import consola from 'consola';
 import type { PluginInfo } from 'build-scripts';
 import type { ExtendsPluginAPI } from '@ice/types/esm/plugin.js';
+import formatPath from './formatPath.js';
 
 export interface RuntimeModule {
   staticModule: boolean;
@@ -27,7 +28,8 @@ function getRuntimeModules(plugins: Array<PluginInfo<any, ExtendsPluginAPI>>) {
         const pkgInfo = fse.readJSONSync(pkgPath);
         return {
           staticModule: !!pkgInfo?.pluginConfig?.staticModule,
-          path: runtime,
+          // Format path for win32 while runtime path will be render to template.
+          path: formatPath(runtime),
           name: pkgInfo.name as string,
         };
       } catch (error) {
diff --git a/packages/ice/src/utils/hash.ts b/packages/ice/src/utils/hash.ts
index 0837e4143..55b0a121a 100644
--- a/packages/ice/src/utils/hash.ts
+++ b/packages/ice/src/utils/hash.ts
@@ -2,9 +2,10 @@ import * as path from 'path';
 import * as fs from 'fs';
 import { createHash } from 'crypto';
 import fg from 'fast-glob';
+import formatPath from './formatPath.js';
 
 export async function getFileHash(file: string): Promise<string> {
-  let filePath = file;
+  let filePath = formatPath(file);
   if (!path.extname(filePath)) {
     const patterns = [`${filePath}.{js,ts,jsx,tsx}`];
     filePath = fg.sync(patterns)[0];
diff --git a/packages/ice/tests/preAnalyze.test.ts b/packages/ice/tests/preAnalyze.test.ts
index 82862f1d1..b640ff22b 100644
--- a/packages/ice/tests/preAnalyze.test.ts
+++ b/packages/ice/tests/preAnalyze.test.ts
@@ -42,7 +42,8 @@ describe('resolveId', () => {
 describe('getImportPath', () => {
   it('import from relative path', () => {
     const filePath = getImportPath('./page.js', '/rootDir/test.ts', {});
-    expect(filePath).toBe('/rootDir/page.js');
+    // Compatible with test case in win32.
+    expect(filePath.replace(/^[A-Za-z]:/, '')).toBe('/rootDir/page.js');
   });
   it('import from alias', () => {
     const filePath = getImportPath('ice', '/rootDir/test.ts', { ice: '/rootDir/component.tsx'});
diff --git a/packages/ice/tests/scan.test.ts b/packages/ice/tests/scan.test.ts
index f721013e5..fbc07d5de 100644
--- a/packages/ice/tests/scan.test.ts
+++ b/packages/ice/tests/scan.test.ts
@@ -2,6 +2,7 @@ import { expect, it, describe } from 'vitest';
 import * as path from 'path';
 import { fileURLToPath } from 'url';
 import { scanImports } from '../src/service/analyze';
+import formatPath from '../src/utils/formatPath';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
@@ -12,17 +13,17 @@ describe('scan import', () => {
   it('basic scan', async () => {
     const deps = await scanImports([path.join(__dirname, './fixtures/scan/app.ts')], { alias, rootDir });
     expect(deps['@ice/runtime'].name).toEqual('@ice/runtime');
-    expect(/(@ice\/)?runtime\/package\.json/.test(deps['@ice/runtime'].pkgPath!)).toBeTruthy();
+    expect(/(@ice\/)?runtime\/package\.json/.test(formatPath(deps['@ice/runtime'].pkgPath!))).toBeTruthy();
     expect(deps['@ice/runtime/client'].name).toEqual('@ice/runtime/client');
-    expect(/(@ice\/)?runtime\/package\.json/.test(deps['@ice/runtime/client'].pkgPath!)).toBeTruthy();
+    expect(/(@ice\/)?runtime\/package\.json/.test(formatPath(deps['@ice/runtime/client'].pkgPath!))).toBeTruthy();
     expect(deps.react.name).toEqual('react');
-    expect(/react\/package\.json/.test(deps['react'].pkgPath!)).toBeTruthy();
+    expect(/react\/package\.json/.test(formatPath(deps['react'].pkgPath!))).toBeTruthy();
   });
 
   it('scan with exclude', async () => {
     const deps = await scanImports([path.join(__dirname, './fixtures/scan/app.ts')], { alias, rootDir, exclude: ['@ice/runtime'] });
     expect(deps.react.name).toEqual('react');
-    expect(/react\/package\.json/.test(deps['react'].pkgPath!)).toBeTruthy();
+    expect(/react\/package\.json/.test(formatPath(deps['react'].pkgPath!))).toBeTruthy();
     expect(deps['@ice/runtime']).toBeUndefined();
   });
 
diff --git a/packages/ice/tests/transformImport.test.ts b/packages/ice/tests/transformImport.test.ts
index 4f5c40e2c..01a7e3ae4 100644
--- a/packages/ice/tests/transformImport.test.ts
+++ b/packages/ice/tests/transformImport.test.ts
@@ -23,7 +23,7 @@ it('transform module import', async () => {
     cacheDir,
     taskConfig: { mode: 'production' }
   });
-  const transformImportPlugin = createUnplugin(() => transformImport(metadata)).esbuild;
+  const transformImportPlugin = createUnplugin(() => transformImport(metadata, path.join(outdir, 'server'))).esbuild;
   await esbuild.build({
     entryPoints: [appEntry],
     outdir,
@@ -33,8 +33,8 @@ it('transform module import', async () => {
     ],
   });
   const buildContent = await fse.readFile(path.join(outdir, 'app.js'));
-  expect(buildContent.includes(path.join(rootDir, '.cache/deps/@ice_runtime_client.js'))).toBeTruthy();
-  expect(buildContent.includes(path.join(rootDir, '.cache/deps/@ice_runtime.js'))).toBeTruthy();
+  expect(buildContent.includes('../../.cache/deps/@ice_runtime_client.js')).toBeTruthy();
+  expect(buildContent.includes('../../.cache/deps/@ice_runtime.js')).toBeTruthy();
 });
 
 afterAll(async () => {
diff --git a/packages/jsx-runtime/build.config.ts b/packages/jsx-runtime/build.config.mts
similarity index 100%
rename from packages/jsx-runtime/build.config.ts
rename to packages/jsx-runtime/build.config.mts
diff --git a/packages/jsx-runtime/package.json b/packages/jsx-runtime/package.json
index 031386fee..cfdd3e0c5 100644
--- a/packages/jsx-runtime/package.json
+++ b/packages/jsx-runtime/package.json
@@ -38,7 +38,7 @@
     "style-unit": "^3.0.4"
   },
   "devDependencies": {
-    "@ice/pkg": "^1.0.0",
+    "@ice/pkg": "1.1.2-0",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "react": "^18.0.0",
diff --git a/packages/plugin-store/src/index.ts b/packages/plugin-store/src/index.ts
index c64125150..16efbb420 100644
--- a/packages/plugin-store/src/index.ts
+++ b/packages/plugin-store/src/index.ts
@@ -54,7 +54,7 @@ function exportStoreProviderPlugin({ pageDir, disableResetPageState }: { pageDir
     name: 'export-store-provider',
     enforce: 'post',
     transformInclude: (id) => {
-      return id.startsWith(pageDir) && !micromatch.isMatch(id, ignoreStoreFilePatterns);
+      return id.startsWith(pageDir.split(path.sep).join('/')) && !micromatch.isMatch(id, ignoreStoreFilePatterns);
     },
     transform: async (source, id) => {
       const pageStorePath = getPageStorePath(id);
diff --git a/packages/rax-compat/build.config.ts b/packages/rax-compat/build.config.mts
similarity index 100%
rename from packages/rax-compat/build.config.ts
rename to packages/rax-compat/build.config.mts
diff --git a/packages/rax-compat/package.json b/packages/rax-compat/package.json
index 0573ee0ca..f997da7d1 100644
--- a/packages/rax-compat/package.json
+++ b/packages/rax-compat/package.json
@@ -50,7 +50,7 @@
     "create-react-class": "^15.7.0"
   },
   "devDependencies": {
-    "@ice/pkg": "^1.0.0",
+    "@ice/pkg": "1.1.2-0",
     "@types/rax": "^1.0.8",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
diff --git a/packages/route-manifest/src/index.ts b/packages/route-manifest/src/index.ts
index da8d2c051..d111057aa 100644
--- a/packages/route-manifest/src/index.ts
+++ b/packages/route-manifest/src/index.ts
@@ -2,7 +2,7 @@
 import fs from 'fs';
 import path from 'path';
 import minimatch from 'minimatch';
-import { createRouteId, defineRoutes } from './routes.js';
+import { createRouteId, defineRoutes, normalizeSlashes } from './routes.js';
 import type { RouteManifest, DefineRouteFunction, NestedRouteManifest, ConfigRoute } from './routes.js';
 
 export type {
@@ -122,7 +122,7 @@ function defineConventionalRoutes(
         // in order to escape the child route path is absolute path
         routeId.slice(parentRoutePath.length + (parentRoutePath ? 1 : 0)),
       );
-      const routeFilePath = path.join('src', 'pages', files[routeId]);
+      const routeFilePath = normalizeSlashes(path.join('src', 'pages', files[routeId]));
       if (RegExp(`[^${validRouteChar.join(',')}]`).test(routePath)) {
         throw new Error(`invalid character in '${routeFilePath}'. Only support char: ${validRouteChar.join(', ')}`);
       }
@@ -231,7 +231,7 @@ function visitFiles(
     if (stat.isDirectory()) {
       visitFiles(file, visitor, baseDir);
     } else if (stat.isFile()) {
-      visitor(path.relative(baseDir, file));
+      visitor(normalizeSlashes(path.relative(baseDir, file)));
     }
   }
 }
diff --git a/packages/types/package.json b/packages/types/package.json
index 55110e1cf..577c0b8bd 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -33,7 +33,7 @@
     "@builder/swc": "^0.2.0",
     "@ice/route-manifest": "^1.0.0",
     "@ice/runtime": "^1.0.0",
-    "build-scripts": "^2.0.0-23",
+    "build-scripts": "^2.0.0-24",
     "esbuild": "^0.14.23",
     "eslint": "^8.14.0",
     "eslint-webpack-plugin": "3.1.1",
diff --git a/packages/webpack-config/package.json b/packages/webpack-config/package.json
index 19682069f..ce119111f 100644
--- a/packages/webpack-config/package.json
+++ b/packages/webpack-config/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@ice/types": "^1.0.0",
-    "build-scripts": "^2.0.0-23",
+    "build-scripts": "^2.0.0-24",
     "esbuild": "^0.14.23",
     "webpack": "^5.73.0",
     "webpack-dev-server": "^4.7.4"
diff --git a/packages/webpack-config/src/index.ts b/packages/webpack-config/src/index.ts
index b6d94c7bb..31637fec8 100644
--- a/packages/webpack-config/src/index.ts
+++ b/packages/webpack-config/src/index.ts
@@ -232,7 +232,7 @@ const getWebpackConfig: GetWebpackConfig = ({ rootDir, config, webpack, runtimeT
       ...plugins,
       ...compilerWebpackPlugins,
       dev && fastRefresh && new ReactRefreshWebpackPlugin({
-        exclude: [/node_modules/, /bundles\/compiled/],
+        exclude: [/node_modules/, /bundles[\\\\/]compiled/],
         // use webpack-dev-server overlay instead
         overlay: false,
       }),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 35505dde6..3d4d9a40e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -424,7 +424,7 @@ importers:
       acorn: ^8.7.1
       address: ^1.1.2
       body-parser: ^1.20.0
-      build-scripts: ^2.0.0-23
+      build-scripts: ^2.0.0-24
       chalk: ^4.0.0
       chokidar: ^3.5.3
       commander: ^9.0.0
@@ -470,7 +470,7 @@ importers:
       acorn: 8.7.1
       address: 1.1.2
       body-parser: 1.20.0
-      build-scripts: 2.0.0-23
+      build-scripts: 2.0.0-24
       chalk: 4.1.2
       commander: 9.2.0
       consola: 2.15.3
@@ -517,7 +517,7 @@ importers:
 
   packages/jsx-runtime:
     specifiers:
-      '@ice/pkg': ^1.0.0
+      '@ice/pkg': 1.1.2-0
       '@types/react': ^18.0.0
       '@types/react-dom': ^18.0.0
       react: ^18.0.0
@@ -526,7 +526,7 @@ importers:
     dependencies:
       style-unit: 3.0.4
     devDependencies:
-      '@ice/pkg': 1.1.1
+      '@ice/pkg': 1.1.2-0
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
       react: 18.2.0
@@ -629,7 +629,7 @@ importers:
 
   packages/rax-compat:
     specifiers:
-      '@ice/pkg': ^1.0.0
+      '@ice/pkg': 1.1.2-0
       '@swc/helpers': ^0.4.3
       '@types/rax': ^1.0.8
       '@types/react': ^18.0.0
@@ -643,7 +643,7 @@ importers:
       create-react-class: 15.7.0
       style-unit: 3.0.5
     devDependencies:
-      '@ice/pkg': 1.1.1
+      '@ice/pkg': 1.1.2-0
       '@types/rax': 1.0.8
       '@types/react': 18.0.8
       '@types/react-dom': 18.0.3
@@ -695,7 +695,7 @@ importers:
       '@builder/swc': ^0.2.0
       '@ice/route-manifest': ^1.0.0
       '@ice/runtime': ^1.0.0
-      build-scripts: ^2.0.0-23
+      build-scripts: ^2.0.0-24
       esbuild: ^0.14.23
       eslint: ^8.14.0
       eslint-webpack-plugin: 3.1.1
@@ -710,7 +710,7 @@ importers:
       '@builder/swc': 0.2.0
       '@ice/route-manifest': link:../route-manifest
       '@ice/runtime': link:../runtime
-      build-scripts: 2.0.0-23
+      build-scripts: 2.0.0-24
       esbuild: 0.14.38
       eslint: 8.14.0
       eslint-webpack-plugin: 3.1.1_7fh3pplfe77vb5lwiuqfjafe74
@@ -732,7 +732,7 @@ importers:
       '@rollup/pluginutils': ^4.2.0
       '@swc/core': 1.2.210
       browserslist: ^4.19.3
-      build-scripts: ^2.0.0-23
+      build-scripts: ^2.0.0-24
       consola: ^2.15.3
       esbuild: ^0.14.23
       fast-glob: ^3.2.11
@@ -758,7 +758,7 @@ importers:
       unplugin: 0.3.3_4upc34oiflw3lduyjvrzpjntau
     devDependencies:
       '@ice/types': link:../types
-      build-scripts: 2.0.0-23
+      build-scripts: 2.0.0-24
       esbuild: 0.14.38
       webpack: 5.73.0_ohfecwmx44wixok6ry5c6snfbe
       webpack-dev-server: 4.8.1_webpack@5.73.0
@@ -5195,7 +5195,6 @@ packages:
     cpu: [loong64]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /@esbuild/linux-loong64/0.15.1:
@@ -5300,22 +5299,22 @@ packages:
       fs-extra: 10.1.0
     dev: true
 
-  /@ice/pkg/1.1.1:
-    resolution: {integrity: sha512-Ub6i5kfbX0xpdYZHv8UiIoBa6FukKHF4dzXcr/+LSUeAVnlBsc+e/hfjJjxZzv6sIBxLBNs7H62lx+79UopR7g==}
+  /@ice/pkg/1.1.2-0:
+    resolution: {integrity: sha512-cv//5fNdAZz6QZRnnNe0aiEa3n/K/dhlTcYrDbb2kcki4CAzn1ZN0YxxVWQQxpiphAkCo+FOWDG0IZF8PF8+Ug==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     hasBin: true
     dependencies:
       '@babel/core': 7.18.10
       '@babel/parser': 7.18.11
       '@ice/pkg-plugin-component': 1.0.0
-      '@rollup/plugin-alias': 3.1.9_rollup@2.77.2
-      '@rollup/plugin-commonjs': 21.1.0_rollup@2.77.2
-      '@rollup/plugin-node-resolve': 13.3.0_rollup@2.77.2
+      '@rollup/plugin-alias': 3.1.9_rollup@2.77.3
+      '@rollup/plugin-commonjs': 21.1.0_rollup@2.77.3
+      '@rollup/plugin-node-resolve': 13.3.0_rollup@2.77.3
       '@rollup/pluginutils': 4.2.1
       '@swc/core': 1.2.210
       acorn: 8.8.0
-      autoprefixer: 10.4.8_postcss@8.4.14
-      build-scripts: 2.0.0-18
+      autoprefixer: 10.4.8_postcss@8.4.16
+      build-scripts: 2.0.0-24
       cac: 6.7.12
       chokidar: 3.5.3
       consola: 2.15.3
@@ -5328,9 +5327,9 @@ packages:
       gzip-size: 7.0.0
       magic-string: 0.25.9
       picocolors: 1.0.0
-      postcss: 8.4.14
-      rollup: 2.77.2
-      rollup-plugin-postcss: 4.0.2_postcss@8.4.14
+      postcss: 8.4.16
+      rollup: 2.77.3
+      rollup-plugin-postcss: 4.0.2_postcss@8.4.16
       typescript: 4.7.4
     transitivePeerDependencies:
       - supports-color
@@ -5731,48 +5730,48 @@ packages:
       react-dom: 18.2.0_react@18.2.0
     dev: false
 
-  /@rollup/plugin-alias/3.1.9_rollup@2.77.2:
+  /@rollup/plugin-alias/3.1.9_rollup@2.77.3:
     resolution: {integrity: sha512-QI5fsEvm9bDzt32k39wpOwZhVzRcL5ydcffUHMyLVaVaLeC70I8TJZ17F1z1eMoLu4E/UOcH9BWVkKpIKdrfiw==}
     engines: {node: '>=8.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0
     dependencies:
-      rollup: 2.77.2
+      rollup: 2.77.3
       slash: 3.0.0
     dev: true
 
-  /@rollup/plugin-commonjs/21.1.0_rollup@2.77.2:
+  /@rollup/plugin-commonjs/21.1.0_rollup@2.77.3:
     resolution: {integrity: sha512-6ZtHx3VHIp2ReNNDxHjuUml6ur+WcQ28N1yHgCQwsbNkQg2suhxGMDQGJOn/KuDxKtd1xuZP5xSTwBA4GQ8hbA==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
       rollup: ^2.38.3
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.77.2
+      '@rollup/pluginutils': 3.1.0_rollup@2.77.3
       commondir: 1.0.1
       estree-walker: 2.0.2
       glob: 7.2.3
       is-reference: 1.2.1
       magic-string: 0.25.9
       resolve: 1.22.1
-      rollup: 2.77.2
+      rollup: 2.77.3
     dev: true
 
-  /@rollup/plugin-node-resolve/13.3.0_rollup@2.77.2:
+  /@rollup/plugin-node-resolve/13.3.0_rollup@2.77.3:
     resolution: {integrity: sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
       rollup: ^2.42.0
     dependencies:
-      '@rollup/pluginutils': 3.1.0_rollup@2.77.2
+      '@rollup/pluginutils': 3.1.0_rollup@2.77.3
       '@types/resolve': 1.17.1
       deepmerge: 4.2.2
       is-builtin-module: 3.1.0
       is-module: 1.0.0
       resolve: 1.22.1
-      rollup: 2.77.2
+      rollup: 2.77.3
     dev: true
 
-  /@rollup/pluginutils/3.1.0_rollup@2.77.2:
+  /@rollup/pluginutils/3.1.0_rollup@2.77.3:
     resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
@@ -5781,7 +5780,7 @@ packages:
       '@types/estree': 0.0.39
       estree-walker: 1.0.1
       picomatch: 2.3.1
-      rollup: 2.77.2
+      rollup: 2.77.3
     dev: true
 
   /@rollup/pluginutils/4.2.1:
@@ -6553,14 +6552,14 @@ packages:
     resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==}
     dependencies:
       '@types/history': 4.7.11
-      '@types/react': 18.0.15
+      '@types/react': 18.0.17
       '@types/react-router': 5.1.18
 
   /@types/react-router/5.1.18:
     resolution: {integrity: sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==}
     dependencies:
       '@types/history': 4.7.11
-      '@types/react': 18.0.15
+      '@types/react': 18.0.17
 
   /@types/react/17.0.48:
     resolution: {integrity: sha512-zJ6IYlJ8cYYxiJfUaZOQee4lh99mFihBoqkOSEGV+dFi9leROW6+PgstzQ+w3gWTnUfskALtQPGHK6dYmPj+2A==}
@@ -7495,6 +7494,22 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /autoprefixer/10.4.8_postcss@8.4.16:
+    resolution: {integrity: sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==}
+    engines: {node: ^10 || ^12 || >=14}
+    hasBin: true
+    peerDependencies:
+      postcss: ^8.1.0
+    dependencies:
+      browserslist: 4.21.3
+      caniuse-lite: 1.0.30001374
+      fraction.js: 4.2.0
+      normalize-range: 0.1.2
+      picocolors: 1.0.0
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /available-typed-arrays/1.0.5:
     resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
     engines: {node: '>= 0.4'}
@@ -7797,14 +7812,13 @@ packages:
       ieee754: 1.2.1
     dev: true
 
-  /build-scripts/2.0.0-18:
-    resolution: {integrity: sha512-GN2V91DGV9ATUoa4dYLA+HBZnqRp/OlP7f0K5a9V9XSjVBTAi5ciJo27c+cTuOU9UU9q+lcjeYcqAT5rrmVx8g==}
+  /build-scripts/2.0.0-24:
+    resolution: {integrity: sha512-FoGyAZ+Xz3B51ui8mMnAtswVL7rxPjeA67ggzG08mDYK29XPdLdnS8rAI6cagxFiPjQ6o4BMzR2uFXcegxmBgA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dependencies:
       camelcase: 5.3.1
       commander: 2.20.3
       consola: 2.15.3
-      deepmerge: 4.2.2
       esbuild: 0.14.54
       fast-glob: 3.2.11
       fs-extra: 8.1.0
@@ -7813,23 +7827,6 @@ packages:
       npmlog: 4.1.2
       picocolors: 1.0.0
       semver: 7.3.7
-    dev: true
-
-  /build-scripts/2.0.0-23:
-    resolution: {integrity: sha512-2hoh/Zhcjx1HuELEd3+tnuk8koN2aLgwZsXn2oJpGuAjf0IhsglzZKKyaVxFbkOstlKik0s4AA1tJsQTA4qVYA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dependencies:
-      camelcase: 5.3.1
-      commander: 2.20.3
-      consola: 2.15.3
-      esbuild: 0.14.38
-      fast-glob: 3.2.11
-      fs-extra: 8.1.0
-      json5: 2.2.1
-      lodash: 4.17.21
-      npmlog: 4.1.2
-      picocolors: 1.0.0
-      semver: 7.3.7
 
   /builtin-modules/3.3.0:
     resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}
@@ -8592,6 +8589,15 @@ packages:
     dependencies:
       postcss: 8.4.14
 
+  /css-declaration-sorter/6.3.0_postcss@8.4.16:
+    resolution: {integrity: sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og==}
+    engines: {node: ^10 || ^12 || >=14}
+    peerDependencies:
+      postcss: ^8.0.9
+    dependencies:
+      postcss: 8.4.16
+    dev: true
+
   /css-functions-list/3.1.0:
     resolution: {integrity: sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==}
     engines: {node: '>=12.22'}
@@ -8831,6 +8837,44 @@ packages:
       postcss-svgo: 5.1.0_postcss@8.4.14
       postcss-unique-selectors: 5.1.1_postcss@8.4.14
 
+  /cssnano-preset-default/5.2.12_postcss@8.4.16:
+    resolution: {integrity: sha512-OyCBTZi+PXgylz9HAA5kHyoYhfGcYdwFmyaJzWnzxuGRtnMw/kR6ilW9XzlzlRAtB6PLT/r+prYgkef7hngFew==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      css-declaration-sorter: 6.3.0_postcss@8.4.16
+      cssnano-utils: 3.1.0_postcss@8.4.16
+      postcss: 8.4.16
+      postcss-calc: 8.2.4_postcss@8.4.16
+      postcss-colormin: 5.3.0_postcss@8.4.16
+      postcss-convert-values: 5.1.2_postcss@8.4.16
+      postcss-discard-comments: 5.1.2_postcss@8.4.16
+      postcss-discard-duplicates: 5.1.0_postcss@8.4.16
+      postcss-discard-empty: 5.1.1_postcss@8.4.16
+      postcss-discard-overridden: 5.1.0_postcss@8.4.16
+      postcss-merge-longhand: 5.1.6_postcss@8.4.16
+      postcss-merge-rules: 5.1.2_postcss@8.4.16
+      postcss-minify-font-values: 5.1.0_postcss@8.4.16
+      postcss-minify-gradients: 5.1.1_postcss@8.4.16
+      postcss-minify-params: 5.1.3_postcss@8.4.16
+      postcss-minify-selectors: 5.2.1_postcss@8.4.16
+      postcss-normalize-charset: 5.1.0_postcss@8.4.16
+      postcss-normalize-display-values: 5.1.0_postcss@8.4.16
+      postcss-normalize-positions: 5.1.1_postcss@8.4.16
+      postcss-normalize-repeat-style: 5.1.1_postcss@8.4.16
+      postcss-normalize-string: 5.1.0_postcss@8.4.16
+      postcss-normalize-timing-functions: 5.1.0_postcss@8.4.16
+      postcss-normalize-unicode: 5.1.0_postcss@8.4.16
+      postcss-normalize-url: 5.1.0_postcss@8.4.16
+      postcss-normalize-whitespace: 5.1.1_postcss@8.4.16
+      postcss-ordered-values: 5.1.3_postcss@8.4.16
+      postcss-reduce-initial: 5.1.0_postcss@8.4.16
+      postcss-reduce-transforms: 5.1.0_postcss@8.4.16
+      postcss-svgo: 5.1.0_postcss@8.4.16
+      postcss-unique-selectors: 5.1.1_postcss@8.4.16
+    dev: true
+
   /cssnano-preset-default/5.2.7_postcss@8.4.12:
     resolution: {integrity: sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -8886,6 +8930,15 @@ packages:
     dependencies:
       postcss: 8.4.14
 
+  /cssnano-utils/3.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+    dev: true
+
   /cssnano/5.1.12_postcss@8.4.14:
     resolution: {integrity: sha512-TgvArbEZu0lk/dvg2ja+B7kYoD7BBCmn3+k58xD0qjrGHsFzXY/wKTo9M5egcUCabPol05e/PVoIu79s2JN4WQ==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -8897,6 +8950,18 @@ packages:
       postcss: 8.4.14
       yaml: 1.10.2
 
+  /cssnano/5.1.12_postcss@8.4.16:
+    resolution: {integrity: sha512-TgvArbEZu0lk/dvg2ja+B7kYoD7BBCmn3+k58xD0qjrGHsFzXY/wKTo9M5egcUCabPol05e/PVoIu79s2JN4WQ==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      cssnano-preset-default: 5.2.12_postcss@8.4.16
+      lilconfig: 2.0.5
+      postcss: 8.4.16
+      yaml: 1.10.2
+    dev: true
+
   /cssnano/5.1.7_postcss@8.4.12:
     resolution: {integrity: sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -9525,7 +9590,6 @@ packages:
     cpu: [x64]
     os: [android]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-android-64/0.15.1:
@@ -9551,7 +9615,6 @@ packages:
     cpu: [arm64]
     os: [android]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-android-arm64/0.15.1:
@@ -9577,7 +9640,6 @@ packages:
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-darwin-64/0.15.1:
@@ -9603,7 +9665,6 @@ packages:
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-darwin-arm64/0.15.1:
@@ -9629,7 +9690,6 @@ packages:
     cpu: [x64]
     os: [freebsd]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-freebsd-64/0.15.1:
@@ -9655,7 +9715,6 @@ packages:
     cpu: [arm64]
     os: [freebsd]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-freebsd-arm64/0.15.1:
@@ -9681,7 +9740,6 @@ packages:
     cpu: [ia32]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-linux-32/0.15.1:
@@ -9707,7 +9765,6 @@ packages:
     cpu: [x64]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-linux-64/0.15.1:
@@ -9733,7 +9790,6 @@ packages:
     cpu: [arm]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-linux-arm/0.15.1:
@@ -9759,7 +9815,6 @@ packages:
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-linux-arm64/0.15.1:
@@ -9785,7 +9840,6 @@ packages:
     cpu: [mips64el]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-linux-mips64le/0.15.1:
@@ -9811,7 +9865,6 @@ packages:
     cpu: [ppc64]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-linux-ppc64le/0.15.1:
@@ -9837,7 +9890,6 @@ packages:
     cpu: [riscv64]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-linux-riscv64/0.15.1:
@@ -9863,7 +9915,6 @@ packages:
     cpu: [s390x]
     os: [linux]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-linux-s390x/0.15.1:
@@ -9889,7 +9940,6 @@ packages:
     cpu: [x64]
     os: [netbsd]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-netbsd-64/0.15.1:
@@ -9921,7 +9971,6 @@ packages:
     cpu: [x64]
     os: [openbsd]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-openbsd-64/0.15.1:
@@ -9963,7 +10012,6 @@ packages:
     cpu: [x64]
     os: [sunos]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-sunos-64/0.15.1:
@@ -9989,7 +10037,6 @@ packages:
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-windows-32/0.15.1:
@@ -10015,7 +10062,6 @@ packages:
     cpu: [x64]
     os: [win32]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-windows-64/0.15.1:
@@ -10041,7 +10087,6 @@ packages:
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
-    dev: true
     optional: true
 
   /esbuild-windows-arm64/0.15.1:
@@ -10107,7 +10152,6 @@ packages:
       esbuild-windows-32: 0.14.54
       esbuild-windows-64: 0.14.54
       esbuild-windows-arm64: 0.14.54
-    dev: true
 
   /esbuild/0.15.1:
     resolution: {integrity: sha512-zgxo2st9wSbdiR6rTo44l/L7ohttqdXFmhUi5tE6yWahgdBjCwZjBgIkm/gr/TcBTTIwyzd7em8WI37yZ+F2Mg==}
@@ -11750,13 +11794,13 @@ packages:
     dependencies:
       postcss: 8.4.12
 
-  /icss-utils/5.1.0_postcss@8.4.14:
+  /icss-utils/5.1.0_postcss@8.4.16:
     resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      postcss: 8.4.14
+      postcss: 8.4.16
     dev: true
 
   /ieee754/1.2.1:
@@ -13734,6 +13778,16 @@ packages:
       postcss-selector-parser: 6.0.10
       postcss-value-parser: 4.2.0
 
+  /postcss-calc/8.2.4_postcss@8.4.16:
+    resolution: {integrity: sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==}
+    peerDependencies:
+      postcss: ^8.2.2
+    dependencies:
+      postcss: 8.4.16
+      postcss-selector-parser: 6.0.10
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-clamp/4.1.0_postcss@8.4.12:
     resolution: {integrity: sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==}
     engines: {node: '>=7.6.0'}
@@ -13799,6 +13853,19 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-colormin/5.3.0_postcss@8.4.16:
+    resolution: {integrity: sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      browserslist: 4.20.3
+      caniuse-api: 3.0.0
+      colord: 2.9.2
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-convert-values/5.1.0_postcss@8.4.12:
     resolution: {integrity: sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -13819,6 +13886,17 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-convert-values/5.1.2_postcss@8.4.16:
+    resolution: {integrity: sha512-c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      browserslist: 4.21.3
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-custom-media/8.0.0_postcss@8.4.12:
     resolution: {integrity: sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==}
     engines: {node: '>=10.0.0'}
@@ -13875,6 +13953,15 @@ packages:
     dependencies:
       postcss: 8.4.14
 
+  /postcss-discard-comments/5.1.2_postcss@8.4.16:
+    resolution: {integrity: sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+    dev: true
+
   /postcss-discard-duplicates/5.1.0_postcss@8.4.12:
     resolution: {integrity: sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -13892,6 +13979,15 @@ packages:
     dependencies:
       postcss: 8.4.14
 
+  /postcss-discard-duplicates/5.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+    dev: true
+
   /postcss-discard-empty/5.1.1_postcss@8.4.12:
     resolution: {integrity: sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -13909,6 +14005,15 @@ packages:
     dependencies:
       postcss: 8.4.14
 
+  /postcss-discard-empty/5.1.1_postcss@8.4.16:
+    resolution: {integrity: sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+    dev: true
+
   /postcss-discard-overridden/5.1.0_postcss@8.4.12:
     resolution: {integrity: sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -13926,6 +14031,15 @@ packages:
     dependencies:
       postcss: 8.4.14
 
+  /postcss-discard-overridden/5.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+    dev: true
+
   /postcss-discard-unused/5.1.0_postcss@8.4.14:
     resolution: {integrity: sha512-KwLWymI9hbwXmJa0dkrzpRbSJEh0vVUd7r8t0yOGPcfKzyJJxFM8kLyC5Ev9avji6nY95pOp1W6HqIrfT+0VGw==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14031,7 +14145,7 @@ packages:
       postcss: 8.4.16
     dev: true
 
-  /postcss-load-config/3.1.4_postcss@8.4.14:
+  /postcss-load-config/3.1.4_postcss@8.4.16:
     resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
     engines: {node: '>= 10'}
     peerDependencies:
@@ -14044,7 +14158,7 @@ packages:
         optional: true
     dependencies:
       lilconfig: 2.0.5
-      postcss: 8.4.14
+      postcss: 8.4.16
       yaml: 1.10.2
     dev: true
 
@@ -14128,6 +14242,17 @@ packages:
       postcss-value-parser: 4.2.0
       stylehacks: 5.1.0_postcss@8.4.14
 
+  /postcss-merge-longhand/5.1.6_postcss@8.4.16:
+    resolution: {integrity: sha512-6C/UGF/3T5OE2CEbOuX7iNO63dnvqhGZeUnKkDeifebY0XqkkvrctYSZurpNE902LDf2yKwwPFgotnfSoPhQiw==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+      stylehacks: 5.1.0_postcss@8.4.16
+    dev: true
+
   /postcss-merge-rules/5.1.1_postcss@8.4.12:
     resolution: {integrity: sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14153,6 +14278,19 @@ packages:
       postcss: 8.4.14
       postcss-selector-parser: 6.0.10
 
+  /postcss-merge-rules/5.1.2_postcss@8.4.16:
+    resolution: {integrity: sha512-zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      browserslist: 4.21.3
+      caniuse-api: 3.0.0
+      cssnano-utils: 3.1.0_postcss@8.4.16
+      postcss: 8.4.16
+      postcss-selector-parser: 6.0.10
+    dev: true
+
   /postcss-minify-font-values/5.1.0_postcss@8.4.12:
     resolution: {integrity: sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14172,6 +14310,16 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-minify-font-values/5.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-minify-gradients/5.1.1_postcss@8.4.12:
     resolution: {integrity: sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14195,6 +14343,18 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-minify-gradients/5.1.1_postcss@8.4.16:
+    resolution: {integrity: sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      colord: 2.9.2
+      cssnano-utils: 3.1.0_postcss@8.4.16
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-minify-params/5.1.2_postcss@8.4.12:
     resolution: {integrity: sha512-aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14218,6 +14378,18 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-minify-params/5.1.3_postcss@8.4.16:
+    resolution: {integrity: sha512-bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      browserslist: 4.21.3
+      cssnano-utils: 3.1.0_postcss@8.4.16
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-minify-selectors/5.2.0_postcss@8.4.12:
     resolution: {integrity: sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14237,6 +14409,16 @@ packages:
       postcss: 8.4.14
       postcss-selector-parser: 6.0.10
 
+  /postcss-minify-selectors/5.2.1_postcss@8.4.16:
+    resolution: {integrity: sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+      postcss-selector-parser: 6.0.10
+    dev: true
+
   /postcss-modules-extract-imports/3.0.0_postcss@8.4.12:
     resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
     engines: {node: ^10 || ^12 || >= 14}
@@ -14245,13 +14427,13 @@ packages:
     dependencies:
       postcss: 8.4.12
 
-  /postcss-modules-extract-imports/3.0.0_postcss@8.4.14:
+  /postcss-modules-extract-imports/3.0.0_postcss@8.4.16:
     resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      postcss: 8.4.14
+      postcss: 8.4.16
     dev: true
 
   /postcss-modules-local-by-default/4.0.0_postcss@8.4.12:
@@ -14265,14 +14447,14 @@ packages:
       postcss-selector-parser: 6.0.10
       postcss-value-parser: 4.2.0
 
-  /postcss-modules-local-by-default/4.0.0_postcss@8.4.14:
+  /postcss-modules-local-by-default/4.0.0_postcss@8.4.16:
     resolution: {integrity: sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      icss-utils: 5.1.0_postcss@8.4.14
-      postcss: 8.4.14
+      icss-utils: 5.1.0_postcss@8.4.16
+      postcss: 8.4.16
       postcss-selector-parser: 6.0.10
       postcss-value-parser: 4.2.0
     dev: true
@@ -14286,13 +14468,13 @@ packages:
       postcss: 8.4.12
       postcss-selector-parser: 6.0.10
 
-  /postcss-modules-scope/3.0.0_postcss@8.4.14:
+  /postcss-modules-scope/3.0.0_postcss@8.4.16:
     resolution: {integrity: sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      postcss: 8.4.14
+      postcss: 8.4.16
       postcss-selector-parser: 6.0.10
     dev: true
 
@@ -14305,14 +14487,14 @@ packages:
       icss-utils: 5.1.0_postcss@8.4.12
       postcss: 8.4.12
 
-  /postcss-modules-values/4.0.0_postcss@8.4.14:
+  /postcss-modules-values/4.0.0_postcss@8.4.16:
     resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
     engines: {node: ^10 || ^12 || >= 14}
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      icss-utils: 5.1.0_postcss@8.4.14
-      postcss: 8.4.14
+      icss-utils: 5.1.0_postcss@8.4.16
+      postcss: 8.4.16
     dev: true
 
   /postcss-modules/4.3.1_postcss@8.4.12:
@@ -14331,7 +14513,7 @@ packages:
       string-hash: 1.1.3
     dev: true
 
-  /postcss-modules/4.3.1_postcss@8.4.14:
+  /postcss-modules/4.3.1_postcss@8.4.16:
     resolution: {integrity: sha512-ItUhSUxBBdNamkT3KzIZwYNNRFKmkJrofvC2nWab3CPKhYBQ1f27XXh1PAPE27Psx58jeelPsxWB/+og+KEH0Q==}
     peerDependencies:
       postcss: ^8.0.0
@@ -14339,11 +14521,11 @@ packages:
       generic-names: 4.0.0
       icss-replace-symbols: 1.1.0
       lodash.camelcase: 4.3.0
-      postcss: 8.4.14
-      postcss-modules-extract-imports: 3.0.0_postcss@8.4.14
-      postcss-modules-local-by-default: 4.0.0_postcss@8.4.14
-      postcss-modules-scope: 3.0.0_postcss@8.4.14
-      postcss-modules-values: 4.0.0_postcss@8.4.14
+      postcss: 8.4.16
+      postcss-modules-extract-imports: 3.0.0_postcss@8.4.16
+      postcss-modules-local-by-default: 4.0.0_postcss@8.4.16
+      postcss-modules-scope: 3.0.0_postcss@8.4.16
+      postcss-modules-values: 4.0.0_postcss@8.4.16
       string-hash: 1.1.3
     dev: true
 
@@ -14384,6 +14566,15 @@ packages:
     dependencies:
       postcss: 8.4.14
 
+  /postcss-normalize-charset/5.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+    dev: true
+
   /postcss-normalize-display-values/5.1.0_postcss@8.4.12:
     resolution: {integrity: sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14403,6 +14594,16 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-normalize-display-values/5.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-normalize-positions/5.1.0_postcss@8.4.12:
     resolution: {integrity: sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14422,6 +14623,16 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-normalize-positions/5.1.1_postcss@8.4.16:
+    resolution: {integrity: sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-normalize-repeat-style/5.1.0_postcss@8.4.12:
     resolution: {integrity: sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14441,6 +14652,16 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-normalize-repeat-style/5.1.1_postcss@8.4.16:
+    resolution: {integrity: sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-normalize-string/5.1.0_postcss@8.4.12:
     resolution: {integrity: sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14460,6 +14681,16 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-normalize-string/5.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-normalize-timing-functions/5.1.0_postcss@8.4.12:
     resolution: {integrity: sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14479,6 +14710,16 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-normalize-timing-functions/5.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-normalize-unicode/5.1.0_postcss@8.4.12:
     resolution: {integrity: sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14500,6 +14741,17 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-normalize-unicode/5.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      browserslist: 4.20.3
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-normalize-url/5.1.0_postcss@8.4.12:
     resolution: {integrity: sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14521,6 +14773,17 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-normalize-url/5.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      normalize-url: 6.1.0
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-normalize-whitespace/5.1.1_postcss@8.4.12:
     resolution: {integrity: sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14540,6 +14803,16 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-normalize-whitespace/5.1.1_postcss@8.4.16:
+    resolution: {integrity: sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-opacity-percentage/1.1.2:
     resolution: {integrity: sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w==}
     engines: {node: ^12 || ^14 || >=16}
@@ -14566,6 +14839,17 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-ordered-values/5.1.3_postcss@8.4.16:
+    resolution: {integrity: sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      cssnano-utils: 3.1.0_postcss@8.4.16
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-overflow-shorthand/3.0.3_postcss@8.4.12:
     resolution: {integrity: sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==}
     engines: {node: ^12 || ^14 || >=16}
@@ -14693,6 +14977,17 @@ packages:
       caniuse-api: 3.0.0
       postcss: 8.4.14
 
+  /postcss-reduce-initial/5.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      browserslist: 4.20.3
+      caniuse-api: 3.0.0
+      postcss: 8.4.16
+    dev: true
+
   /postcss-reduce-transforms/5.1.0_postcss@8.4.12:
     resolution: {integrity: sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14712,6 +15007,16 @@ packages:
       postcss: 8.4.14
       postcss-value-parser: 4.2.0
 
+  /postcss-reduce-transforms/5.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+    dev: true
+
   /postcss-replace-overflow-wrap/4.0.0_postcss@8.4.12:
     resolution: {integrity: sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==}
     peerDependencies:
@@ -14788,6 +15093,17 @@ packages:
       postcss-value-parser: 4.2.0
       svgo: 2.8.0
 
+  /postcss-svgo/5.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+      postcss-value-parser: 4.2.0
+      svgo: 2.8.0
+    dev: true
+
   /postcss-unique-selectors/5.1.1_postcss@8.4.12:
     resolution: {integrity: sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==}
     engines: {node: ^10 || ^12 || >=14.0}
@@ -14807,6 +15123,16 @@ packages:
       postcss: 8.4.14
       postcss-selector-parser: 6.0.10
 
+  /postcss-unique-selectors/5.1.1_postcss@8.4.16:
+    resolution: {integrity: sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      postcss: 8.4.16
+      postcss-selector-parser: 6.0.10
+    dev: true
+
   /postcss-value-parser/4.2.0:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
@@ -16299,7 +16625,7 @@ packages:
     dependencies:
       glob: 7.2.3
 
-  /rollup-plugin-postcss/4.0.2_postcss@8.4.14:
+  /rollup-plugin-postcss/4.0.2_postcss@8.4.16:
     resolution: {integrity: sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==}
     engines: {node: '>=10'}
     peerDependencies:
@@ -16307,13 +16633,13 @@ packages:
     dependencies:
       chalk: 4.1.2
       concat-with-sourcemaps: 1.1.0
-      cssnano: 5.1.12_postcss@8.4.14
+      cssnano: 5.1.12_postcss@8.4.16
       import-cwd: 3.0.0
       p-queue: 6.6.2
       pify: 5.0.0
-      postcss: 8.4.14
-      postcss-load-config: 3.1.4_postcss@8.4.14
-      postcss-modules: 4.3.1_postcss@8.4.14
+      postcss: 8.4.16
+      postcss-load-config: 3.1.4_postcss@8.4.16
+      postcss-modules: 4.3.1_postcss@8.4.16
       promise.series: 0.2.0
       resolve: 1.22.1
       rollup-pluginutils: 2.8.2
@@ -16329,14 +16655,6 @@ packages:
       estree-walker: 0.6.1
     dev: true
 
-  /rollup/2.77.2:
-    resolution: {integrity: sha512-m/4YzYgLcpMQbxX3NmAqDvwLATZzxt8bIegO78FZLl+lAgKJBd1DRAOeEiZcKOIOPjxE6ewHWHNgGEalFXuz1g==}
-    engines: {node: '>=10.0.0'}
-    hasBin: true
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
-
   /rollup/2.77.3:
     resolution: {integrity: sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==}
     engines: {node: '>=10.0.0'}
@@ -17083,6 +17401,17 @@ packages:
       postcss: 8.4.14
       postcss-selector-parser: 6.0.10
 
+  /stylehacks/5.1.0_postcss@8.4.16:
+    resolution: {integrity: sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+    dependencies:
+      browserslist: 4.20.3
+      postcss: 8.4.16
+      postcss-selector-parser: 6.0.10
+    dev: true
+
   /stylelint-scss/4.3.0_stylelint@14.10.0:
     resolution: {integrity: sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ==}
     peerDependencies:
diff --git a/tests/utils/browser.ts b/tests/utils/browser.ts
index f1f3a67f4..8b64cdc74 100644
--- a/tests/utils/browser.ts
+++ b/tests/utils/browser.ts
@@ -37,7 +37,7 @@ export default class Browser {
   createServer(cwd: string, port: number) {
     return http.createServer((req, res) => {
       const requrl: string = req.url || '';
-      const pathname = `${cwd}${url.parse(requrl).pathname}`;
+      const pathname = `${cwd}${url.parse(requrl).pathname}`.split(path.sep).join('/');
       if (fse.existsSync(pathname)) {
         switch (path.extname(pathname)) { // set HTTP HEAD
           case '.html':

From bbbb06b3d5c88218dfb35cfc2509782db59b3b19 Mon Sep 17 00:00:00 2001
From: ClarkXia <xiawenwu41@gmail.com>
Date: Mon, 29 Aug 2022 11:04:21 +0800
Subject: [PATCH 24/31] fix: import theme icon (#484)

* fix: import theme icon

* fix: match entry
---
 packages/plugin-fusion/src/index.ts | 41 ++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/packages/plugin-fusion/src/index.ts b/packages/plugin-fusion/src/index.ts
index 87acc32ce..473403734 100644
--- a/packages/plugin-fusion/src/index.ts
+++ b/packages/plugin-fusion/src/index.ts
@@ -27,6 +27,29 @@ function getVariablesPath({
   return filePath;
 }
 
+function importIcon(iconPath: string, cssPrefix: string) {
+  let entryFile = '';
+  return {
+    name: 'transform-import-icon',
+    enforce: 'pre',
+    async transform(code: string, id: string, options: { isServer: boolean }) {
+      const { isServer } = options;
+      // Only import icon scss in client
+      if (!isServer) {
+        // Icon just import once.
+        if (!entryFile && !id.match(/node_modules/) && id.match(/[js|jsx|ts|tsx]$/)) {
+          entryFile = id;
+        }
+        if (id === entryFile) {
+          return `import '${iconPath}';\n${code}`;
+        } else if (id === iconPath) {
+          return `$css-prefix: '${cssPrefix}';\n${code}`;
+        }
+      }
+    },
+  };
+}
+
 const plugin: Plugin<PluginOptions> = (options = {}) => ({
   name: '@ice/plugin-fusion',
   setup: ({ onGetConfig }) => {
@@ -41,6 +64,15 @@ const plugin: Plugin<PluginOptions> = (options = {}) => ({
     }
     if (theme || themePackage) {
       onGetConfig((config) => {
+        // Try to get icon.scss if exists.
+        const iconFile = getVariablesPath({
+          packageName: themePackage,
+          filename: 'icons.scss',
+          silent: true,
+        });
+        if (iconFile) {
+          config.transformPlugins = [...(config.transformPlugins || []), importIcon(iconFile, theme['css-prefix'] || 'next-')];
+        }
         // Modify webpack config of scss rule for fusion theme.
         config.configureWebpack ??= [];
         config.configureWebpack.push((webpackConfig) => {
@@ -65,15 +97,6 @@ const plugin: Plugin<PluginOptions> = (options = {}) => ({
               if (themeFile) {
                 additionalContent.push(`@import '${themePackage}/variables.scss';`);
               }
-              // Try to get icon.scss if exists.
-              const iconFile = getVariablesPath({
-                packageName: themePackage,
-                filename: 'icons.scss',
-                silent: true,
-              });
-              if (iconFile) {
-                additionalContent.push(`@import '${themePackage}/icons.scss';`);
-              }
             }
             let themeConfig = [];
             Object.keys(theme || {}).forEach((key) => {

From 294fdcc19c03629fee9851b654812b4b7f2e9bc7 Mon Sep 17 00:00:00 2001
From: luhc228 <44047106+luhc228@users.noreply.github.com>
Date: Mon, 29 Aug 2022 11:44:17 +0800
Subject: [PATCH 25/31] fix: rax project ssr failed (#467)

* fix: prebundle alias

* fix: rax multiple version

* fix: test case

* chore: rename param
---
 examples/rax-project/ice.config.mts          |  2 --
 packages/ice/src/service/analyze.ts          |  8 +++---
 packages/ice/src/service/preBundleCJSDeps.ts | 27 ++++++++++++++------
 packages/ice/src/service/serverCompiler.ts   |  5 ++--
 packages/ice/tests/preBundleCJSDeps.test.ts  |  1 +
 packages/ice/tests/transformImport.test.ts   |  1 +
 packages/types/src/config.ts                 |  3 ++-
 packages/webpack-config/src/index.ts         |  3 ++-
 tests/integration/rax-project.test.ts        | 10 +++++++-
 9 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/examples/rax-project/ice.config.mts b/examples/rax-project/ice.config.mts
index de6cbd325..95a7ba884 100644
--- a/examples/rax-project/ice.config.mts
+++ b/examples/rax-project/ice.config.mts
@@ -2,8 +2,6 @@ import { defineConfig } from '@ice/app';
 import compatRax from '@ice/plugin-rax-compat';
 
 export default defineConfig({
-  ssr: false,
-  ssg: false,
   publicPath: '/',
   plugins: [compatRax()],
 });
diff --git a/packages/ice/src/service/analyze.ts b/packages/ice/src/service/analyze.ts
index 236916e94..f4b7b03f8 100644
--- a/packages/ice/src/service/analyze.ts
+++ b/packages/ice/src/service/analyze.ts
@@ -6,22 +6,22 @@ import moduleLexer from '@ice/bundles/compiled/es-module-lexer/index.js';
 import { transform, build } from 'esbuild';
 import type { Loader, Plugin } from 'esbuild';
 import consola from 'consola';
+import type { TaskConfig } from 'build-scripts';
+import type { Config } from '@ice/types';
 import { getCache, setCache } from '../utils/persistentCache.js';
 import { getFileHash } from '../utils/hash.js';
 import scanPlugin from '../esbuild/scan.js';
 import type { DepScanData } from '../esbuild/scan.js';
 import formatPath from '../utils/formatPath.js';
 
+type Alias = TaskConfig<Config>['config']['alias'];
+
 interface Options {
   parallel?: number;
   analyzeRelativeImport?: boolean;
   alias?: Alias;
 }
 
-export interface Alias {
-  [x: string]: string | false;
-}
-
 const { init, parse } = moduleLexer;
 
 function addLastSlash(filePath: string) {
diff --git a/packages/ice/src/service/preBundleCJSDeps.ts b/packages/ice/src/service/preBundleCJSDeps.ts
index fb76b1f7c..d30216dfa 100644
--- a/packages/ice/src/service/preBundleCJSDeps.ts
+++ b/packages/ice/src/service/preBundleCJSDeps.ts
@@ -7,10 +7,12 @@ import type { Plugin } from 'esbuild';
 import { resolve as resolveExports } from 'resolve.exports';
 import moduleLexer from '@ice/bundles/compiled/es-module-lexer/index.js';
 import type { Config } from '@ice/types';
+import type { TaskConfig } from 'build-scripts';
 import flattenId from '../utils/flattenId.js';
 import formatPath from '../utils/formatPath.js';
 import { BUILDIN_CJS_DEPS, BUILDIN_ESM_DEPS } from '../constant.js';
 import type { DepScanData } from '../esbuild/scan.js';
+import aliasPlugin from '../esbuild/alias.js';
 
 interface DepInfo {
   file: string;
@@ -30,6 +32,7 @@ interface PreBundleDepsOptions {
   depsInfo: Record<string, DepScanData>;
   cacheDir: string;
   taskConfig: Config;
+  alias: TaskConfig<Config>['config']['alias'];
   plugins?: Plugin[];
 }
 
@@ -37,7 +40,7 @@ interface PreBundleDepsOptions {
  * Pre bundle dependencies from esm to cjs.
  */
 export default async function preBundleCJSDeps(options: PreBundleDepsOptions): Promise<PreBundleDepsResult> {
-  const { depsInfo, cacheDir, taskConfig, plugins = [] } = options;
+  const { depsInfo, cacheDir, taskConfig, plugins = [], alias } = options;
   const metadata = createDepsMetadata(depsInfo, taskConfig);
 
   if (!Object.keys(depsInfo)) {
@@ -64,7 +67,7 @@ export default async function preBundleCJSDeps(options: PreBundleDepsOptions): P
 
   await moduleLexer.init;
   for (const depId in depsInfo) {
-    const packageEntry = resolvePackageEntry(depId, depsInfo[depId].pkgPath);
+    const packageEntry = resolvePackageEntry(depId, depsInfo[depId].pkgPath, alias);
     const flatId = flattenId(depId);
     flatIdDeps[flatId] = packageEntry;
 
@@ -87,7 +90,10 @@ export default async function preBundleCJSDeps(options: PreBundleDepsOptions): P
       platform: 'node',
       loader: { '.js': 'jsx' },
       ignoreAnnotations: true,
-      plugins,
+      plugins: [
+        aliasPlugin({ alias, format: 'cjs', externalDependencies: false }),
+        ...plugins,
+      ],
       external: [...BUILDIN_CJS_DEPS, ...BUILDIN_ESM_DEPS],
     });
   } catch (error) {
@@ -102,15 +108,20 @@ export default async function preBundleCJSDeps(options: PreBundleDepsOptions): P
   };
 }
 
-function resolvePackageEntry(depId: string, pkgPath: string) {
+function resolvePackageEntry(depId: string, pkgPath: string, alias: TaskConfig<Config>['config']['alias']) {
   const pkgJSON = fse.readJSONSync(pkgPath);
   const pkgDir = path.dirname(pkgPath);
+  const aliasKey = Object.keys(alias).find(key => depId === key || depId.startsWith(`${depId}/`));
+  // alias: { rax: 'rax-compat' }
+  // rax -> .
+  // rax/element -> ./element
+  const entry = aliasKey ? depId.replace(new RegExp(`^${aliasKey}`), '.') : depId;
   // resolve exports cjs field
-  let entryPoint = resolveExports(pkgJSON, depId, { require: true }) || '';
-  if (!entryPoint) {
-    entryPoint = pkgJSON['main'] || 'index.js';
+  let resolvedEntryPoint = resolveExports(pkgJSON, entry, { require: true }) || '';
+  if (!resolvedEntryPoint) {
+    resolvedEntryPoint = pkgJSON['main'] || 'index.js';
   }
-  const entryPointPath = path.join(pkgDir, entryPoint);
+  const entryPointPath = path.join(pkgDir, resolvedEntryPoint);
   return entryPointPath;
 }
 
diff --git a/packages/ice/src/service/serverCompiler.ts b/packages/ice/src/service/serverCompiler.ts
index 5cd706b41..fd0d15dcd 100644
--- a/packages/ice/src/service/serverCompiler.ts
+++ b/packages/ice/src/service/serverCompiler.ts
@@ -191,10 +191,10 @@ interface CreateDepsMetadataOptions {
  */
 async function createDepsMetadata({ rootDir, task, plugins }: CreateDepsMetadataOptions) {
   const serverEntry = getServerEntry(rootDir, task.config?.server?.entry);
-
+  const alias = (task.config?.alias || {}) as TaskConfig<Config>['config']['alias'];
   const deps = await scanImports([serverEntry], {
     rootDir,
-    alias: (task.config?.alias || {}) as Record<string, string | false>,
+    alias,
     plugins,
   });
 
@@ -215,6 +215,7 @@ async function createDepsMetadata({ rootDir, task, plugins }: CreateDepsMetadata
     depsInfo: preBundleDepsInfo,
     cacheDir,
     taskConfig: task.config,
+    alias,
     plugins,
   });
 
diff --git a/packages/ice/tests/preBundleCJSDeps.test.ts b/packages/ice/tests/preBundleCJSDeps.test.ts
index 95c4c53d3..65a81db94 100644
--- a/packages/ice/tests/preBundleCJSDeps.test.ts
+++ b/packages/ice/tests/preBundleCJSDeps.test.ts
@@ -15,6 +15,7 @@ it('prebundle cjs deps', async () => {
   await preBundleCJSDeps({
     depsInfo: deps,
     cacheDir,
+    alias,
     taskConfig: { mode: 'production' }
   });
 
diff --git a/packages/ice/tests/transformImport.test.ts b/packages/ice/tests/transformImport.test.ts
index 01a7e3ae4..ad57033f5 100644
--- a/packages/ice/tests/transformImport.test.ts
+++ b/packages/ice/tests/transformImport.test.ts
@@ -21,6 +21,7 @@ it('transform module import', async () => {
   const { metadata } = await preBundleCJSDeps({
     depsInfo: deps,
     cacheDir,
+    alias,
     taskConfig: { mode: 'production' }
   });
   const transformImportPlugin = createUnplugin(() => transformImport(metadata, path.join(outdir, 'server'))).esbuild;
diff --git a/packages/types/src/config.ts b/packages/types/src/config.ts
index 4a3435a32..d89c348da 100644
--- a/packages/types/src/config.ts
+++ b/packages/types/src/config.ts
@@ -15,6 +15,7 @@ import type Server from 'webpack-dev-server';
 import type { ECMA } from 'terser';
 import type { Config as SWCCompilationConfig } from '@builder/swc';
 import type { BuildOptions } from 'esbuild';
+import type { UserConfig } from './userConfig';
 
 // get type definitions from terser-webpack-plugin
 interface CustomOptions {
@@ -82,7 +83,7 @@ export interface Config {
     | WebpackPluginInstance
   )[];
 
-  alias?: Record<string, any>;
+  alias?: UserConfig['alias'];
 
   hash?: boolean | string;
 
diff --git a/packages/webpack-config/src/index.ts b/packages/webpack-config/src/index.ts
index 31637fec8..6b008c571 100644
--- a/packages/webpack-config/src/index.ts
+++ b/packages/webpack-config/src/index.ts
@@ -93,7 +93,8 @@ const getWebpackConfig: GetWebpackConfig = ({ rootDir, config, webpack, runtimeT
   // formate alias
   const aliasWithRoot = {};
   Object.keys(alias).forEach((key) => {
-    aliasWithRoot[key] = alias[key] && alias[key].startsWith('.') ? path.join(rootDir, alias[key]) : alias[key];
+    const aliasValue = alias[key];
+    aliasWithRoot[key] = (aliasValue && typeof aliasValue === 'string' && aliasValue.startsWith('.')) ? path.join(rootDir, aliasValue) : aliasValue;
   });
 
   // auto stringify define value
diff --git a/tests/integration/rax-project.test.ts b/tests/integration/rax-project.test.ts
index 44235811b..9e0bbfb57 100644
--- a/tests/integration/rax-project.test.ts
+++ b/tests/integration/rax-project.test.ts
@@ -17,7 +17,11 @@ describe(`build ${example}`, () => {
 
     page = res.page;
     browser = res.browser;
-    expect(await page.$$text('div')).toStrictEqual(['']);
+    expect((await page.$$text('span')).length).toEqual(3);
+    expect((await page.$$text('span'))[0]).toStrictEqual('Welcome to Your Rax App');
+    expect((await page.$$text('span'))[1]).toStrictEqual('More information about Rax');
+    expect((await page.$$text('span'))[2]).toStrictEqual('Visit https://rax.js.org');
+    expect((await page.$$text('img')).length).toEqual(1);
     expect(fs.existsSync(path.join(__dirname, `../../examples/${example}/build/js/data-loader.js`))).toBe(false);
   }, 120000);
 
@@ -35,7 +39,11 @@ describe(`start ${example}`, () => {
     const res = await setupStartBrowser({ server: devServer, port });
     page = res.page;
     browser = res.browser;
+    expect((await page.$$text('span')).length).toEqual(3);
     expect((await page.$$text('span'))[0]).toStrictEqual('Welcome to Your Rax App');
+    expect((await page.$$text('span'))[1]).toStrictEqual('More information about Rax');
+    expect((await page.$$text('span'))[2]).toStrictEqual('Visit https://rax.js.org');
+    expect((await page.$$text('img')).length).toEqual(1);
   }, 120000);
 
   afterAll(async () => {

From 9f6c17efe72ddb2ae2b5287612e55c8e27ed698a Mon Sep 17 00:00:00 2001
From: ZeroLing <i@zeroling.com>
Date: Mon, 29 Aug 2022 11:44:27 +0800
Subject: [PATCH 26/31] Feat/appconfig (#485)

* feat: appConfig or defineAppConfig

* test: add test for defineAppConfig
---
 packages/runtime/src/appConfig.ts        | 10 +++++++---
 packages/runtime/tests/appConfig.test.ts | 14 ++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 packages/runtime/tests/appConfig.test.ts

diff --git a/packages/runtime/src/appConfig.ts b/packages/runtime/src/appConfig.ts
index 0c87f8a0b..dbce91fff 100644
--- a/packages/runtime/src/appConfig.ts
+++ b/packages/runtime/src/appConfig.ts
@@ -28,6 +28,10 @@ export default function getAppConfig(appExport: AppExport): AppConfig {
   };
 }
 
-export function defineAppConfig(appConfig: AppConfig) {
-  return appConfig;
-}
\ No newline at end of file
+export function defineAppConfig(appConfigOrDefineAppConfig: AppConfig | (() => AppConfig)): AppConfig {
+  if (typeof appConfigOrDefineAppConfig === 'function') {
+    return appConfigOrDefineAppConfig();
+  } else {
+    return appConfigOrDefineAppConfig;
+  }
+}
diff --git a/packages/runtime/tests/appConfig.test.ts b/packages/runtime/tests/appConfig.test.ts
new file mode 100644
index 000000000..0f1833da1
--- /dev/null
+++ b/packages/runtime/tests/appConfig.test.ts
@@ -0,0 +1,14 @@
+import { expect, test, describe } from 'vitest';
+import { defineAppConfig } from '../src/appConfig.js';
+
+describe('AppConfig', () => {
+  test('defineAppConfig', () => {
+    const appConfig = {};
+    expect(defineAppConfig(appConfig)).toEqual(appConfig);
+  });
+
+  test('defineAppConfig fn', () => {
+    const appConfig = {};
+    expect(defineAppConfig(() => appConfig)).toEqual(appConfig);
+  });
+});

From b8483fcd0c2b7f7de587d0101394eb26de05444c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B0=B4=E6=BE=9C?= <shuilan.cj@taobao.com>
Date: Mon, 29 Aug 2022 16:00:32 +0800
Subject: [PATCH 27/31] fix: remove component in csr (#486)

* fix: remove component in csr

* fix: keep export default for app

* fix: should load route modules first to get config
---
 packages/ice/src/commands/start.ts            |  2 +-
 packages/runtime/src/runServerApp.tsx         |  6 ++--
 .../src/unPlugins/compilation.ts              | 28 +++++++++++++++----
 tests/integration/rax-project.test.ts         |  1 +
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/packages/ice/src/commands/start.ts b/packages/ice/src/commands/start.ts
index ec943f999..2de7f3dc9 100644
--- a/packages/ice/src/commands/start.ts
+++ b/packages/ice/src/commands/start.ts
@@ -78,7 +78,7 @@ const start = async (
           preBundle: format === 'esm' && (ssr || ssg),
           swc: {
             // Remove components and getData when document only.
-            removeExportExprs: false ? ['default', 'getData', 'getServerData', 'getStaticData'] : [],
+            removeExportExprs: (!ssg && !ssr) ? ['default', 'getData', 'getServerData', 'getStaticData'] : [],
             keepPlatform: 'node',
           },
         },
diff --git a/packages/runtime/src/runServerApp.tsx b/packages/runtime/src/runServerApp.tsx
index 24d516dcd..7564878e6 100644
--- a/packages/runtime/src/runServerApp.tsx
+++ b/packages/runtime/src/runServerApp.tsx
@@ -162,11 +162,11 @@ async function doRender(serverContext: ServerContext, renderOptions: RenderOptio
 
   const routePath = getCurrentRoutePath(matches);
 
+  const routeModules = await loadRouteModules(matches.map(({ route: { id, load } }) => ({ id, load })));
+
   if (documentOnly) {
-    return renderDocument({ matches, routePath, renderOptions, routeModules: {} });
+    return renderDocument({ matches, routePath, renderOptions, routeModules });
   }
-  // FIXME: https://github.com/ice-lab/ice-next/issues/427
-  const routeModules = await loadRouteModules(matches.map(({ route: { id, load } }) => ({ id, load })));
 
   try {
     return await renderServerEntry({
diff --git a/packages/webpack-config/src/unPlugins/compilation.ts b/packages/webpack-config/src/unPlugins/compilation.ts
index ebfda9bb9..7a1824833 100644
--- a/packages/webpack-config/src/unPlugins/compilation.ts
+++ b/packages/webpack-config/src/unPlugins/compilation.ts
@@ -66,11 +66,29 @@ const compilationPlugin = (options: Options): UnpluginOptions => {
 
       const swcPlugins = [];
       // handle app.tsx and page entries only
-      if (removeExportExprs && (/(.*)pages(.*)\.(jsx?|tsx?|mjs)$/.test(id) || /(.*)src\/app/.test(id))) {
-        swcPlugins.push([
-          require.resolve('@ice/swc-plugin-remove-export'),
-          removeExportExprs,
-        ]);
+      if (removeExportExprs) {
+        if (/(.*)pages(.*)\.(jsx?|tsx?|mjs)$/.test(id)) {
+          swcPlugins.push([
+            require.resolve('@ice/swc-plugin-remove-export'),
+            removeExportExprs,
+          ]);
+        } else if (/(.*)src\/app/.test(id)) {
+          let removeList;
+
+          // FIXME: https://github.com/ice-lab/ice-next/issues/487
+          if (removeExportExprs.indexOf('getConfig') === -1) {
+            // when build for getConfig, should keep default, it equals to getAppConfig
+            removeList = removeExportExprs.filter(key => key !== 'default');
+          } else {
+            // when build for getData, should remove all other exports
+            removeList = removeExportExprs;
+          }
+
+          swcPlugins.push([
+            require.resolve('@ice/swc-plugin-remove-export'),
+            removeList,
+          ]);
+        }
       }
 
       if (keepPlatform) {
diff --git a/tests/integration/rax-project.test.ts b/tests/integration/rax-project.test.ts
index 9e0bbfb57..c6f871aef 100644
--- a/tests/integration/rax-project.test.ts
+++ b/tests/integration/rax-project.test.ts
@@ -39,6 +39,7 @@ describe(`start ${example}`, () => {
     const res = await setupStartBrowser({ server: devServer, port });
     page = res.page;
     browser = res.browser;
+    await page.waitForFunction(`document.getElementsByTagName('span').length > 0`);
     expect((await page.$$text('span')).length).toEqual(3);
     expect((await page.$$text('span'))[0]).toStrictEqual('Welcome to Your Rax App');
     expect((await page.$$text('span'))[1]).toStrictEqual('More information about Rax');

From c894b44741b113991657ab18d2651e212effbd31 Mon Sep 17 00:00:00 2001
From: luhc228 <44047106+luhc228@users.noreply.github.com>
Date: Mon, 29 Aug 2022 16:16:49 +0800
Subject: [PATCH 28/31] feat: add splitChunks to userConfig (#454)

* feat: add splitChunks to userConfig

* docs: splitChunks

* test: splitChunks test case

* fix: splitChunk test case
---
 examples/basic-project/package.json           |  3 ++-
 examples/basic-project/splitChunks.config.mts |  6 +++++
 packages/ice/src/config.ts                    |  8 +++++++
 packages/types/src/userConfig.ts              |  1 +
 packages/webpack-config/src/index.ts          |  4 +++-
 tests/integration/basic-project.test.ts       | 23 ++++++++++++++-----
 website/docs/guide/basic/config.md            |  7 ++++++
 7 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 examples/basic-project/splitChunks.config.mts

diff --git a/examples/basic-project/package.json b/examples/basic-project/package.json
index d60d83b3b..4f79c1abc 100644
--- a/examples/basic-project/package.json
+++ b/examples/basic-project/package.json
@@ -3,7 +3,8 @@
   "version": "1.0.0",
   "scripts": {
     "start": "ice start",
-    "build": "ice build"
+    "build": "ice build",
+    "build:splitChunks": "ice build --config splitChunks.config.mts"
   },
   "description": "",
   "author": "",
diff --git a/examples/basic-project/splitChunks.config.mts b/examples/basic-project/splitChunks.config.mts
new file mode 100644
index 000000000..a8c0f5e33
--- /dev/null
+++ b/examples/basic-project/splitChunks.config.mts
@@ -0,0 +1,6 @@
+import { defineConfig } from '@ice/app';
+
+export default defineConfig({
+  splitChunks: false,
+  minify: false,
+});
diff --git a/packages/ice/src/config.ts b/packages/ice/src/config.ts
index cadefc20e..816dd3f40 100644
--- a/packages/ice/src/config.ts
+++ b/packages/ice/src/config.ts
@@ -311,6 +311,14 @@ const userConfig = [
       }
     },
   },
+  {
+    name: 'splitChunks',
+    validation: 'boolean',
+    defaultValue: true,
+    setConfig: (config: Config, splitChunks: UserConfig['splitChunks']) => {
+      config.splitChunks = splitChunks;
+    },
+  },
 ];
 
 const cliOption = [
diff --git a/packages/types/src/userConfig.ts b/packages/types/src/userConfig.ts
index cc2a59dc8..a9a67f6d8 100644
--- a/packages/types/src/userConfig.ts
+++ b/packages/types/src/userConfig.ts
@@ -47,4 +47,5 @@ export interface UserConfig {
   experimental?: Config['experimental'];
   transform?: UnpluginOptions['transform'];
   syntaxFeatures?: SyntaxFeatures;
+  splitChunks?: boolean;
 }
diff --git a/packages/webpack-config/src/index.ts b/packages/webpack-config/src/index.ts
index 6b008c571..c3672724e 100644
--- a/packages/webpack-config/src/index.ts
+++ b/packages/webpack-config/src/index.ts
@@ -193,7 +193,9 @@ const getWebpackConfig: GetWebpackConfig = ({ rootDir, config, webpack, runtimeT
       ignored: watchIgnoredRegexp,
     },
     optimization: {
-      splitChunks: splitChunks == false ? undefined : getSplitChunksConfig(rootDir),
+      splitChunks: splitChunks == false
+        ? { minChunks: Infinity, cacheGroups: { default: false } }
+        : getSplitChunksConfig(rootDir),
       minimize: minify,
       minimizer: [
         new TerserPlugin({
diff --git a/tests/integration/basic-project.test.ts b/tests/integration/basic-project.test.ts
index 08103c36a..2063607ac 100644
--- a/tests/integration/basic-project.test.ts
+++ b/tests/integration/basic-project.test.ts
@@ -4,16 +4,15 @@ import * as fs from 'fs';
 import { fileURLToPath } from 'url';
 import { buildFixture, setupBrowser } from '../utils/build';
 import { startFixture, setupStartBrowser } from '../utils/start';
-import { Page } from '../utils/browser';
+import Browser, { Page } from '../utils/browser';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
 
 const example = 'basic-project';
 
 describe(`build ${example}`, () => {
-  let page: Page = null;
-  let browser = null;
+  let page: Page;
+  let browser: Browser;
 
   test('open /', async () => {
     await buildFixture(example);
@@ -43,14 +42,26 @@ describe(`build ${example}`, () => {
     expect(stats.size).toBeLessThan(1024 * 14);
   }, 120000);
 
+  test('disable splitChunks', async () => {
+    await buildFixture(example, {
+      config: 'splitChunks.config.mts'
+    });
+    const res = await setupBrowser({ example });
+    page = res.page;
+    browser = res.browser;
+
+    const files = fs.readdirSync(path.join(__dirname, `../../examples/${example}/build/js`), 'utf-8');
+    expect(files.length).toBe(7);
+  }, 120000);
+
   afterAll(async () => {
     await browser.close();
   });
 });
 
 describe(`start ${example}`, () => {
-  let page: Page = null;
-  let browser = null;
+  let page: Page;
+  let browser: Browser;
 
   test('setup devServer', async () => {
     const { devServer, port } = await startFixture(example);
diff --git a/website/docs/guide/basic/config.md b/website/docs/guide/basic/config.md
index fe93f49e5..799592098 100644
--- a/website/docs/guide/basic/config.md
+++ b/website/docs/guide/basic/config.md
@@ -307,6 +307,13 @@ export default defineConfig({
 - 类型：`boolean | string`
 - 默认值：`development` 模式：默认为 'cheap-module-source-map'，支持通过 `false` 关闭，不支持设置为其他枚举值。`production` 模式：默认 `false`。
 
+### splitChunks
+
+- 类型：`boolean`
+- 默认值：`true`
+
+默认会根据模块体积自动拆分 chunks，有可能会出现多个 bundle。如果不希望打包产物出现过多 bundle ，可设置成 `false`。
+
 ### syntaxFeatures
 
 - 类型：`{ exportDefaultFrom: boolean; functionBind: boolean; }`

From 392620f7a5135f2f1aa3449b4ec4ba783f885649 Mon Sep 17 00:00:00 2001
From: luhc228 <44047106+luhc228@users.noreply.github.com>
Date: Mon, 29 Aug 2022 17:33:05 +0800
Subject: [PATCH 29/31] fix: incorrect sourcemap (#457)

* fix: incorrect sourcemap

* fix: can not require esm module

* fix: not compile user's transform

* chore: remove require.resolve dir
---
 .../webpack-config/src/compileExcludes.ts     | 15 +++++++++++
 .../webpack-config/src/getCompilerPlugins.ts  | 20 ++++-----------
 packages/webpack-config/src/index.ts          | 25 ++++++++++++++++++-
 .../src/webpackLoaders/compilationLoader.cts  | 13 ++++++++++
 4 files changed, 57 insertions(+), 16 deletions(-)
 create mode 100644 packages/webpack-config/src/compileExcludes.ts
 create mode 100644 packages/webpack-config/src/webpackLoaders/compilationLoader.cts

diff --git a/packages/webpack-config/src/compileExcludes.ts b/packages/webpack-config/src/compileExcludes.ts
new file mode 100644
index 000000000..89c45bd73
--- /dev/null
+++ b/packages/webpack-config/src/compileExcludes.ts
@@ -0,0 +1,15 @@
+const SKIP_COMPILE = [
+  // polyfill and helpers
+  'core-js', 'core-js-pure', '@swc/helpers', '@babel/runtime',
+  // built-in runtime
+  'react', 'react-dom',
+  // dev dependencies
+  '@pmmmwh/react-refresh-webpack-plugin', 'webpack', 'webpack-dev-server', 'react-refresh',
+];
+
+const compileExcludes = [
+  new RegExp(SKIP_COMPILE.map((dep) => `node_modules/?.+${dep}/`).join('|')),
+  /bundles\/compiled/,
+];
+
+export default compileExcludes;
diff --git a/packages/webpack-config/src/getCompilerPlugins.ts b/packages/webpack-config/src/getCompilerPlugins.ts
index 803796174..85e3a392d 100644
--- a/packages/webpack-config/src/getCompilerPlugins.ts
+++ b/packages/webpack-config/src/getCompilerPlugins.ts
@@ -3,19 +3,11 @@ import type { BuildOptions } from 'esbuild';
 import { createUnplugin } from 'unplugin';
 import type { UnpluginOptions } from 'unplugin';
 import compilationPlugin from './unPlugins/compilation.js';
+import compileExcludes from './compileExcludes.js';
 import type { WebpackConfig } from './index.js';
 
 type Compiler = 'webpack' | 'esbuild';
 
-const SKIP_COMPILE = [
-  // polyfill and helpers
-  'core-js', 'core-js-pure', '@swc/helpers', '@babel/runtime',
-  // built-in runtime
-  'react', 'react-dom',
-  // dev dependencies
-  '@pmmmwh/react-refresh-webpack-plugin', 'webpack', 'webpack-dev-server', 'react-refresh',
-];
-
 function getPluginTransform(plugin: UnpluginOptions, type: 'esbuild' | 'webpack') {
   const { transform } = plugin;
   if (transform) {
@@ -46,17 +38,15 @@ function getCompilerPlugins(config: Config, compiler: Compiler) {
     cacheDir,
   } = config;
   const compilerPlugins = [];
-  const compileExcludes = [
-    new RegExp(SKIP_COMPILE.map((dep) => `node_modules/?.+${dep}/`).join('|')),
-    /bundles\/compiled/,
-  ];
+
   // Add custom transform before swc compilation so the source code can be got before transformed.
   compilerPlugins.push(
     ...(transformPlugins.filter(({ enforce }) => !enforce || enforce === 'pre') || []),
     ...transforms.map((transform, index) => ({ name: `transform_${index}`, transform })),
   );
-
-  if (swcOptions) {
+  // Use webpack loader instead of webpack plugin to do the compilation.
+  // Reason: https://github.com/unjs/unplugin/issues/154
+  if (swcOptions && compiler !== 'webpack') {
     compilerPlugins.push(compilationPlugin({
       cacheDir,
       sourceMap,
diff --git a/packages/webpack-config/src/index.ts b/packages/webpack-config/src/index.ts
index c3672724e..8d777715f 100644
--- a/packages/webpack-config/src/index.ts
+++ b/packages/webpack-config/src/index.ts
@@ -21,6 +21,8 @@ import configCss from './config/css.js';
 import AssetsManifestPlugin from './webpackPlugins/AssetsManifestPlugin.js';
 import getCompilerPlugins from './getCompilerPlugins.js';
 import getSplitChunksConfig, { FRAMEWORK_BUNDLES } from './config/splitChunks.js';
+import compilationPlugin from './unPlugins/compilation.js';
+import compileExcludes from './compileExcludes.js';
 
 const require = createRequire(import.meta.url);
 const { merge } = lodash;
@@ -85,6 +87,8 @@ const getWebpackConfig: GetWebpackConfig = ({ rootDir, config, webpack, runtimeT
     devServer,
     fastRefresh,
     logging,
+    swcOptions,
+    compileIncludes,
   } = config;
   const absoluteOutputDir = path.isAbsolute(outputDir) ? outputDir : path.join(rootDir, outputDir);
   const dev = mode !== 'production';
@@ -147,7 +151,15 @@ const getWebpackConfig: GetWebpackConfig = ({ rootDir, config, webpack, runtimeT
       ascii_only: true,
     },
   }, minimizerOptions);
-
+  const compilation = compilationPlugin({
+    cacheDir,
+    sourceMap,
+    fastRefresh,
+    mode,
+    compileIncludes,
+    compileExcludes,
+    swcOptions,
+  });
   const webpackConfig: WebpackConfig = {
     mode,
     experiments: {
@@ -174,6 +186,17 @@ const getWebpackConfig: GetWebpackConfig = ({ rootDir, config, webpack, runtimeT
         },
       },
       rules: [
+        // Use webpack loader instead of webpack plugin which is generated by unplugin.
+        // Reason: https://github.com/unjs/unplugin/issues/154
+        {
+          test: compilation.transformInclude,
+          use: {
+            loader: require.resolve('./webpackLoaders/compilationLoader.cjs'),
+            options: {
+              transform: compilation.transform,
+            },
+          },
+        },
         ...loaders,
       ],
     },
diff --git a/packages/webpack-config/src/webpackLoaders/compilationLoader.cts b/packages/webpack-config/src/webpackLoaders/compilationLoader.cts
new file mode 100644
index 000000000..f08e3342a
--- /dev/null
+++ b/packages/webpack-config/src/webpackLoaders/compilationLoader.cts
@@ -0,0 +1,13 @@
+module.exports = async function compilationLoader(source: string, map: any) {
+  const options = this.getOptions();
+  const callback = this.async();
+  const { transform } = options;
+
+  const result = await transform(source, this.resourcePath);
+  if (result) {
+    const { code, map } = result;
+    callback(null, code, map);
+  } else {
+    callback(null, source, map);
+  }
+};

From 6fc832f7fbef4a7e3e04c31b6d5164a0f98f9847 Mon Sep 17 00:00:00 2001
From: luhc228 <44047106+luhc228@users.noreply.github.com>
Date: Tue, 30 Aug 2022 10:56:02 +0800
Subject: [PATCH 30/31] chore: upgrade unplugin version to fix sourcemap type
 (#489)

* chore: upgrade unplugin version to fix sourcemap type

* chore: remove debugger
---
 packages/ice/package.json                     |  2 +-
 packages/types/package.json                   |  2 +-
 packages/webpack-config/package.json          |  2 +-
 .../src/unPlugins/compilation.ts              |  5 ---
 pnpm-lock.yaml                                | 42 ++++---------------
 5 files changed, 11 insertions(+), 42 deletions(-)

diff --git a/packages/ice/package.json b/packages/ice/package.json
index fd96b1383..828061fe0 100644
--- a/packages/ice/package.json
+++ b/packages/ice/package.json
@@ -84,7 +84,7 @@
     "@types/temp": "^0.9.1",
     "chokidar": "^3.5.3",
     "react": "^18.0.0",
-    "unplugin": "^0.8.0",
+    "unplugin": "^0.9.5",
     "webpack": "^5.73.0"
   },
   "peerDependencies": {
diff --git a/packages/types/package.json b/packages/types/package.json
index 577c0b8bd..8083f9467 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -41,7 +41,7 @@
     "react": "^18.0.0",
     "terser": "^5.12.1",
     "typescript": "^4.6.4",
-    "unplugin": "^0.3.2",
+    "unplugin": "^0.9.5",
     "webpack": "^5.73.0",
     "webpack-dev-server": "^4.7.4"
   }
diff --git a/packages/webpack-config/package.json b/packages/webpack-config/package.json
index ce119111f..8d6e12da4 100644
--- a/packages/webpack-config/package.json
+++ b/packages/webpack-config/package.json
@@ -24,7 +24,7 @@
     "magic-string": "^0.26.1",
     "mini-css-extract-plugin": "2.6.0",
     "react-refresh": "^0.12.0",
-    "unplugin": "^0.3.2"
+    "unplugin": "^0.9.5"
   },
   "devDependencies": {
     "@ice/types": "^1.0.0",
diff --git a/packages/webpack-config/src/unPlugins/compilation.ts b/packages/webpack-config/src/unPlugins/compilation.ts
index 7a1824833..3b60ab8f0 100644
--- a/packages/webpack-config/src/unPlugins/compilation.ts
+++ b/packages/webpack-config/src/unPlugins/compilation.ts
@@ -32,7 +32,6 @@ const compilationPlugin = (options: Options): UnpluginOptions => {
     transformInclude(id) {
       return extensionRegex.test(id) && !compileExcludes.some((regex) => regex.test(id));
     },
-    // @ts-expect-error TODO: source map types
     async transform(source: string, id: string) {
       if ((/node_modules/.test(id) && !compileRegex.some((regex) => regex.test(id)))) {
         return;
@@ -114,10 +113,6 @@ const compilationPlugin = (options: Options): UnpluginOptions => {
 
         const { code } = output;
         let { map } = output;
-        if (typeof map === 'string') {
-          // map require object type
-          map = JSON.parse(map);
-        }
         return { code, map };
       } catch (e) {
         // catch error for Unhandled promise rejection
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3d4d9a40e..090349cc4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -454,7 +454,7 @@ importers:
       semver: ^7.3.5
       temp: ^0.9.4
       trusted-cert: ^1.1.3
-      unplugin: ^0.8.0
+      unplugin: ^0.9.5
       webpack: ^5.73.0
       webpack-dev-server: ^4.7.4
     dependencies:
@@ -512,7 +512,7 @@ importers:
       '@types/temp': 0.9.1
       chokidar: 3.5.3
       react: 18.2.0
-      unplugin: 0.8.1_4upc34oiflw3lduyjvrzpjntau
+      unplugin: 0.9.5_4upc34oiflw3lduyjvrzpjntau
       webpack: 5.73.0_esbuild@0.14.38
 
   packages/jsx-runtime:
@@ -703,7 +703,7 @@ importers:
       react: ^18.0.0
       terser: ^5.12.1
       typescript: ^4.6.4
-      unplugin: ^0.3.2
+      unplugin: ^0.9.5
       webpack: ^5.73.0
       webpack-dev-server: ^4.7.4
     devDependencies:
@@ -718,7 +718,7 @@ importers:
       react: 18.2.0
       terser: 5.12.1
       typescript: 4.6.4
-      unplugin: 0.3.3_4upc34oiflw3lduyjvrzpjntau
+      unplugin: 0.9.5_4upc34oiflw3lduyjvrzpjntau
       webpack: 5.73.0_esbuild@0.14.38
       webpack-dev-server: 4.8.1_webpack@5.73.0
 
@@ -739,7 +739,7 @@ importers:
       magic-string: ^0.26.1
       mini-css-extract-plugin: 2.6.0
       react-refresh: ^0.12.0
-      unplugin: ^0.3.2
+      unplugin: ^0.9.5
       webpack: ^5.73.0
       webpack-dev-server: ^4.7.4
     dependencies:
@@ -755,7 +755,7 @@ importers:
       magic-string: 0.26.1
       mini-css-extract-plugin: 2.6.0_webpack@5.73.0
       react-refresh: 0.12.0
-      unplugin: 0.3.3_4upc34oiflw3lduyjvrzpjntau
+      unplugin: 0.9.5_4upc34oiflw3lduyjvrzpjntau
     devDependencies:
       '@ice/types': link:../types
       build-scripts: 2.0.0-24
@@ -18180,29 +18180,8 @@ packages:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
     engines: {node: '>= 0.8'}
 
-  /unplugin/0.3.3_4upc34oiflw3lduyjvrzpjntau:
-    resolution: {integrity: sha512-WjZWpUqqcYPQ/efR00Zm2m1+J1LitwoZ4uhHV4VdZ+IpW0Nh/qnDYtVf+nLhozXdGxslMPecOshVR7NiWFl4gA==}
-    peerDependencies:
-      esbuild: '>=0.13'
-      rollup: ^2.50.0
-      vite: ^2.3.0
-      webpack: 4 || 5
-    peerDependenciesMeta:
-      esbuild:
-        optional: true
-      rollup:
-        optional: true
-      vite:
-        optional: true
-      webpack:
-        optional: true
-    dependencies:
-      esbuild: 0.14.38
-      webpack: 5.73.0_esbuild@0.14.38
-      webpack-virtual-modules: 0.4.3
-
-  /unplugin/0.8.1_4upc34oiflw3lduyjvrzpjntau:
-    resolution: {integrity: sha512-o7rUZoPLG1fH4LKinWgb77gDtTE6mw/iry0Pq0Z5UPvZ9+HZ1/4+7fic7t58s8/CGkPrDpGq+RltO+DmswcR4g==}
+  /unplugin/0.9.5_4upc34oiflw3lduyjvrzpjntau:
+    resolution: {integrity: sha512-luraheyfxwtvkvHpsOvMNv7IjLdORTWKZp0gWYNHGLi2ImON3iIZOj464qEyyEwLA/EMt12fC415HW9zRpOfTg==}
     peerDependencies:
       esbuild: '>=0.13'
       rollup: ^2.50.0
@@ -18224,7 +18203,6 @@ packages:
       webpack: 5.73.0_esbuild@0.14.38
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.4.4
-    dev: true
 
   /unquote/1.1.1:
     resolution: {integrity: sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==}
@@ -18824,12 +18802,8 @@ packages:
     resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
     engines: {node: '>=10.13.0'}
 
-  /webpack-virtual-modules/0.4.3:
-    resolution: {integrity: sha512-5NUqC2JquIL2pBAAo/VfBP6KuGkHIZQXW/lNKupLPfhViwh8wNsu0BObtl09yuKZszeEUfbXz8xhrHvSG16Nqw==}
-
   /webpack-virtual-modules/0.4.4:
     resolution: {integrity: sha512-h9atBP/bsZohWpHnr+2sic8Iecb60GxftXsWNLLLSqewgIsGzByd2gcIID4nXcG+3tNe4GQG3dLcff3kXupdRA==}
-    dev: true
 
   /webpack/5.72.1:
     resolution: {integrity: sha512-dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung==}

From c2c697eb4aabc68183159100979e0342082b4e32 Mon Sep 17 00:00:00 2001
From: luhc228 <44047106+luhc228@users.noreply.github.com>
Date: Tue, 30 Aug 2022 11:20:56 +0800
Subject: [PATCH 31/31] fix: basename order (#491)

---
 packages/ice/src/utils/getRouterBasename.ts     | 2 +-
 packages/ice/templates/core/entry.client.ts.ejs | 2 +-
 packages/ice/templates/core/entry.server.ts.ejs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/ice/src/utils/getRouterBasename.ts b/packages/ice/src/utils/getRouterBasename.ts
index 32482fdfa..716e8bb5e 100644
--- a/packages/ice/src/utils/getRouterBasename.ts
+++ b/packages/ice/src/utils/getRouterBasename.ts
@@ -3,7 +3,7 @@ import type { Config } from '@ice/types';
 import type { TaskConfig } from 'build-scripts';
 
 const getRouterBasename = (taskConfig: TaskConfig<Config>, appConfig: AppConfig) => {
-  return taskConfig?.config?.basename || appConfig?.router?.basename;
+  return appConfig?.router?.basename ?? taskConfig?.config?.basename ?? '';
 };
 
 export default getRouterBasename;
diff --git a/packages/ice/templates/core/entry.client.ts.ejs b/packages/ice/templates/core/entry.client.ts.ejs
index 8e1c90285..14f5fb191 100644
--- a/packages/ice/templates/core/entry.client.ts.ejs
+++ b/packages/ice/templates/core/entry.client.ts.ejs
@@ -6,7 +6,7 @@ import Document from '@/document';
 
 const getRouterBasename = () => {
   const appConfig = getAppConfig(app);
-  return '<%- basename %>' || appConfig?.router?.basename || '';
+  return appConfig?.router?.basename ?? '<%- basename %>' ?? '';
 }
 
 runClientApp({
diff --git a/packages/ice/templates/core/entry.server.ts.ejs b/packages/ice/templates/core/entry.server.ts.ejs
index 0b8cedcb9..86ea77594 100644
--- a/packages/ice/templates/core/entry.server.ts.ejs
+++ b/packages/ice/templates/core/entry.server.ts.ejs
@@ -9,7 +9,7 @@ import routes from './routes';
 
 const getRouterBasename = () => {
   const appConfig = runtime.getAppConfig(app);
-  return '<%- basename %>' || appConfig?.router?.basename || '';
+  return appConfig?.router?.basename ?? '<%- basename %>' ?? '';
 }
 
 const setRuntimeEnv = (renderMode) => {