Merge pull request #6799 from alibaba/release/next

Release 3.4.4
alibaba · Feb 26, 2024 · e2cc5d8 · e2cc5d8
2 parents eb25016 + e786232
commit e2cc5d8
Show file tree

Hide file tree

Showing 49 changed files with 718 additions and 1,530 deletions.
diff --git a/examples/with-keep-alive/README.md → examples/with-keep-alive-react/README.md b/examples/with-keep-alive/README.md → examples/with-keep-alive-react/README.md
diff --git a/examples/with-keep-alive-react/ice.config.mts b/examples/with-keep-alive-react/ice.config.mts
@@ -0,0 +1,3 @@
+import { defineConfig } from '@ice/app';
+
+export default defineConfig(() => ({}));
diff --git a/examples/with-keep-alive-react/package.json b/examples/with-keep-alive-react/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@examples/with-keep-alive-react",
+  "private": true,
+  "version": "1.0.0",
+  "scripts": {
+    "start": "ice start",
+    "build": "ice build"
+  },
+  "dependencies": {
+    "react": "0.0.0-experimental-0cdfef19b-20231211",
+    "react-dom": "0.0.0-experimental-0cdfef19b-20231211"
+  },
+  "devDependencies": {
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.2"
+  },
+  "resolutions": {
+    "react": "0.0.0-experimental-0cdfef19b-20231211",
+    "react-dom": "0.0.0-experimental-0cdfef19b-20231211"
+  }
+}
diff --git a/examples/with-keep-alive-react/src/app.ts b/examples/with-keep-alive-react/src/app.ts
@@ -0,0 +1,3 @@
+import { defineAppConfig } from 'ice';
+
+export default defineAppConfig(() => ({}));
diff --git a/...ith-keep-alive/src/components/Counter.tsx → ...ep-alive-react/src/components/Counter.tsx b/...ith-keep-alive/src/components/Counter.tsx → ...ep-alive-react/src/components/Counter.tsx
diff --git a/examples/with-keep-alive-react/src/document.tsx b/examples/with-keep-alive-react/src/document.tsx
@@ -0,0 +1,22 @@
+import { Meta, Title, Links, Main, Scripts } from 'ice';
+
+function Document() {
+  return (
+    <html>
+      <head>
+        <meta charSet="utf-8" />
+        <meta name="description" content="ICE Demo" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <Meta />
+        <Title />
+        <Links />
+      </head>
+      <body>
+        <Main />
+        <Scripts />
+      </body>
+    </html>
+  );
+}
+
+export default Document;
diff --git a/...with-keep-alive/src/pages/about/index.tsx → ...eep-alive-react/src/pages/about/index.tsx b/...with-keep-alive/src/pages/about/index.tsx → ...eep-alive-react/src/pages/about/index.tsx
diff --git a/...ith-keep-alive/src/pages/about/layout.tsx → ...ep-alive-react/src/pages/about/layout.tsx b/...ith-keep-alive/src/pages/about/layout.tsx → ...ep-alive-react/src/pages/about/layout.tsx
diff --git a/...es/with-keep-alive/src/pages/about/me.tsx → ...h-keep-alive-react/src/pages/about/me.tsx b/...es/with-keep-alive/src/pages/about/me.tsx → ...h-keep-alive-react/src/pages/about/me.tsx
diff --git a/examples/with-keep-alive-react/src/pages/index.tsx b/examples/with-keep-alive-react/src/pages/index.tsx
@@ -0,0 +1,18 @@
+import { Link } from 'ice';
+import Counter from '@/components/Counter';
+
+export default function Home() {
+  return (
+    <main>
+      <h2>Home</h2>
+      <Counter />
+      <Link to="/about">About</Link>
+    </main>
+  );
+}
+
+export function pageConfig() {
+  return {
+    title: 'Home',
+  };
+}
diff --git a/examples/with-keep-alive-react/src/pages/layout.tsx b/examples/with-keep-alive-react/src/pages/layout.tsx
@@ -0,0 +1,10 @@
+import { KeepAliveOutlet } from 'ice';
+
+export default function Layout() {
+  return (
+    <>
+      <h1>I'm Keep Alive</h1>
+      <KeepAliveOutlet />
+    </>
+  );
+}
diff --git a/examples/with-keep-alive-react/tsconfig.json b/examples/with-keep-alive-react/tsconfig.json
@@ -0,0 +1,32 @@
+{
+  "compileOnSave": false,
+  "buildOnSave": false,
+  "compilerOptions": {
+    "baseUrl": ".",
+    "outDir": "build",
+    "module": "esnext",
+    "target": "es6",
+    "jsx": "react-jsx",
+    "moduleResolution": "node",
+    "allowSyntheticDefaultImports": true,
+    "lib": ["es6", "dom"],
+    "sourceMap": true,
+    "allowJs": true,
+    "rootDir": "./",
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitReturns": true,
+    "noImplicitThis": true,
+    "noImplicitAny": false,
+    "importHelpers": true,
+    "strictNullChecks": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "noUnusedLocals": true,
+    "skipLibCheck": true,
+    "paths": {
+      "@/*": ["./src/*"],
+      "ice": [".ice"]
+    }
+  },
+  "include": ["src", ".ice", "ice.config.*"],
+  "exclude": ["build", "public"]
+}
diff --git a/examples/with-keep-alive/package.json b/examples/with-keep-alive/package.json
@@ -7,15 +7,13 @@
     "build": "ice build"
   },
   "dependencies": {
-    "react": "0.0.0-experimental-0cdfef19b-20231211",
-    "react-dom": "0.0.0-experimental-0cdfef19b-20231211"
+    "@ice/app": "workspace:*",
+    "@ice/runtime": "workspace:*",
+    "react": "^18.0.0",
+    "react-dom": "^18.0.0"
   },
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2"
-  },
-  "resolutions": {
-    "react": "0.0.0-experimental-0cdfef19b-20231211",
-    "react-dom": "0.0.0-experimental-0cdfef19b-20231211"
   }
 }
diff --git a/examples/with-keep-alive/src/components/Count.tsx b/examples/with-keep-alive/src/components/Count.tsx
@@ -0,0 +1,11 @@
+import { useState } from 'react';
+
+export default function Count() {
+  const [count, setCount] = useState(0);
+  return (
+    <div>
+      <p>count: {count}</p>
+      <button onClick={() => setCount(count + 1)}>add</button>
+    </div>
+  );
+}
diff --git a/examples/with-keep-alive/src/pages/home.tsx b/examples/with-keep-alive/src/pages/home.tsx
@@ -0,0 +1,12 @@
+import { Link } from 'ice';
+import Count from '@/components/Count';
+
+export default function Home() {
+  return (
+    <div>
+      <h4>Home</h4>
+      <Count />
+      <Link to="/">Index</Link>
+    </div>
+  );
+}
diff --git a/examples/with-keep-alive/src/pages/index.tsx b/examples/with-keep-alive/src/pages/index.tsx
@@ -1,18 +1,23 @@
-import { Link } from 'ice';
-import Counter from '@/components/Counter';
+import { useEffect } from 'react';
+import { useActive, Link } from 'ice';
+import Count from '@/components/Count';
 
 export default function Home() {
+  const active = useActive();
+
+  useEffect(() => {
+    if (active) {
+      console.log('Page Index is actived');
+    } else {
+      console.log('Page Index is deactived');
+    }
+  }, [active]);
+
   return (
-    <main>
-      <h2>Home</h2>
-      <Counter />
-      <Link to="/about">About</Link>
-    </main>
+    <div>
+      <h4>Index</h4>
+      <Count />
+      <Link to="/home">Home</Link>
+    </div>
   );
 }
-
-export function pageConfig() {
-  return {
-    title: 'Home',
-  };
-}
diff --git a/examples/with-keep-alive/src/pages/layout.tsx b/examples/with-keep-alive/src/pages/layout.tsx
@@ -2,9 +2,9 @@ import { KeepAliveOutlet } from 'ice';
 
 export default function Layout() {
   return (
-    <>
-      <h1>I'm Keep Alive</h1>
+    <div>
+      <h2>Layout</h2>
       <KeepAliveOutlet />
-    </>
+    </div>
   );
 }
diff --git a/examples/with-keep-alive/tsconfig.json b/examples/with-keep-alive/tsconfig.json
@@ -19,7 +19,6 @@
     "noImplicitAny": false,
     "importHelpers": true,
     "strictNullChecks": true,
-    "suppressImplicitAnyIndexErrors": true,
     "noUnusedLocals": true,
     "skipLibCheck": true,
     "paths": {
@@ -29,4 +28,4 @@
   },
   "include": ["src", ".ice", "ice.config.*"],
   "exclude": ["build", "public"]
-}
+}
diff --git a/package.json b/package.json
@@ -71,7 +71,7 @@
   "packageManager": "[email protected]",
   "pnpm": {
     "patchedDependencies": {
-      "@rspack/[email protected].1": "patches/@[email protected].1.patch"
+      "@rspack/[email protected].4": "patches/@[email protected].4.patch"
     }
   }
 }
diff --git a/packages/bundles/CHANGELOG.md b/packages/bundles/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.2.4
+
+### Patch Changes
+
+- 4bce5d79: fix: bump rspack version
+
 ## 0.2.3
 
 ### Patch Changes

diff --git a/packages/bundles/package.json b/packages/bundles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/bundles",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "license": "MIT",
   "author": "ICE",
   "description": "Basic dependencies for ice.",
@@ -45,13 +45,13 @@
     "zod": "^3.22.3",
     "zod-validation-error": "1.2.0",
     "terminal-link": "^2.1.1",
-    "@ice/pack-binding": "0.0.9",
+    "@ice/pack-binding": "0.0.11",
     "mime-types": "2.1.35"
   },
   "devDependencies": {
-    "@rspack/plugin-react-refresh": "0.5.1",
-    "@rspack/dev-server": "0.5.1",
-    "@rspack/core": "0.5.1",
+    "@rspack/plugin-react-refresh": "0.5.4",
+    "@rspack/dev-server": "0.5.4",
+    "@rspack/core": "0.5.4",
     "@types/less": "^3.0.3",
     "@types/lodash": "^4.14.181",
     "@types/webpack-bundle-analyzer": "^4.4.1",

diff --git a/packages/bundles/scripts/tasks.ts b/packages/bundles/scripts/tasks.ts
@@ -274,7 +274,9 @@ const tasks = [
           const fileContent = fs.readFileSync(sourcePath, 'utf8');
           fs.writeFileSync(targetPath,
             replaceDeps(fileContent, webpackDevServerDeps.concat([...commonDeps, '@rspack/core', 'webpack-dev-server']))
-             .replace(/webpack-dev-server\/client\/clients/g, '@ice/bundles/compiled/webpack-dev-server/client/clients'),
+             .replace(/webpack-dev-server\//g, '@ice/bundles/compiled/webpack-dev-server/')
+             .replace(/@rspack\/core\//g, '@ice/bundles/compiled/@rspack/core/')
+             .replace(/@rspack\/dev-server\//g, '@ice/bundles/compiled/@rspack/dev-server/'),
           );
         } else {
           fs.copyFileSync(sourcePath, targetPath);