Merge pull request #6912 from alibaba/release/next

Release 3.4.10
alibaba · Jun 26, 2024 · 1c3f6ae · 1c3f6ae
2 parents de66896 + 2616c68
commit 1c3f6ae
Show file tree

Hide file tree

Showing 72 changed files with 842 additions and 575 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -14,6 +14,7 @@ coverage/
 /packages/*/lib/
 /packages/*/esm/
 /packages/*/es2017/
+/packages/*/es2021/
 **/tests/libs/*.js
 
 # 忽略第三方包

diff --git a/examples/app-config/ice.config.mts b/examples/app-config/ice.config.mts
@@ -1,3 +1,6 @@
 import { defineConfig } from '@ice/app';
+import externals from '@ice/plugin-externals';
 
-export default defineConfig(() => ({}));
+export default defineConfig(() => ({
+  plugins: [externals({ preset: 'react' })]
+}));
diff --git a/examples/app-config/package.json b/examples/app-config/package.json
@@ -12,18 +12,13 @@
   "license": "MIT",
   "dependencies": {
     "@ice/app": "workspace:*",
-    "@ice/plugin-auth": "workspace:*",
-    "@ice/plugin-rax-compat": "workspace:*",
+    "@ice/plugin-externals": "workspace:*",
     "@ice/runtime": "workspace:*",
-    "@uni/env": "^1.1.0",
-    "ahooks": "^3.3.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.2",
-    "speed-measure-webpack-plugin": "^1.5.0",
-    "webpack": "^5.88.0"
+    "@types/react-dom": "^18.0.2"
   }
 }
diff --git a/examples/basic-project/tsconfig.json b/examples/basic-project/tsconfig.json
@@ -29,4 +29,4 @@
   },
   "include": ["src", ".ice", "ice.config.*"],
   "exclude": ["build", "public"]
-}
+}
diff --git a/examples/with-entry-type/ice.config.mts b/examples/with-entry-type/ice.config.mts
diff --git a/examples/with-entry-type/src/document.tsx b/examples/with-entry-type/src/document.tsx
diff --git a/examples/with-entry-type/src/pages/Custom/index.tsx b/examples/with-entry-type/src/pages/Custom/index.tsx
diff --git a/examples/with-entry-type/src/pages/about.tsx b/examples/with-entry-type/src/pages/about.tsx
diff --git a/examples/with-entry-type/src/pages/blog.tsx b/examples/with-entry-type/src/pages/blog.tsx
diff --git a/examples/with-entry-type/src/pages/home.tsx b/examples/with-entry-type/src/pages/home.tsx
diff --git a/examples/with-entry-type/src/pages/index.module.css b/examples/with-entry-type/src/pages/index.module.css
diff --git a/examples/with-entry-type/src/pages/layout.tsx b/examples/with-entry-type/src/pages/layout.tsx
diff --git a/examples/with-entry-type/.browserslistrc → examples/with-fallback-entry/.browserslistrc b/examples/with-entry-type/.browserslistrc → examples/with-fallback-entry/.browserslistrc
diff --git a/examples/with-fallback-entry/ice.config.mts b/examples/with-fallback-entry/ice.config.mts
@@ -0,0 +1,10 @@
+import { defineConfig } from '@ice/app';
+import plugin from './plugin';
+
+export default defineConfig(() => ({
+  plugins: [plugin()],
+  ssr: true,
+  server: {
+    format: 'cjs',
+  }
+}));
diff --git a/examples/with-entry-type/package.json → examples/with-fallback-entry/package.json b/examples/with-entry-type/package.json → examples/with-fallback-entry/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@examples/with-entry-type",
-  "private": true,
+  "name": "@examples/with-fallback-entry",
   "version": "1.0.0",
+  "private": true,
   "scripts": {
     "start": "ice start",
     "build": "ice build"
@@ -12,11 +12,10 @@
   "dependencies": {
     "@ice/app": "workspace:*",
     "@ice/runtime": "workspace:*",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "fs-extra": "^10.0.0",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
     "webpack": "^5.88.0"

diff --git a/examples/with-fallback-entry/plugin.ts b/examples/with-fallback-entry/plugin.ts
@@ -0,0 +1,12 @@
+export default function createPlugin() {
+  return {
+    name: 'custom-plugin',
+    setup({ onGetConfig }) {
+      onGetConfig((config) => {
+        config.server = {
+          fallbackEntry: true,
+        };
+      });
+    },
+  };
+}
diff --git a/examples/with-entry-type/public/favicon.ico → ...es/with-fallback-entry/public/favicon.ico b/examples/with-entry-type/public/favicon.ico → ...es/with-fallback-entry/public/favicon.ico
diff --git a/examples/with-entry-type/src/app.tsx → examples/with-fallback-entry/src/app.tsx b/examples/with-entry-type/src/app.tsx → examples/with-fallback-entry/src/app.tsx
diff --git a/examples/with-fallback-entry/src/document.tsx b/examples/with-fallback-entry/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/examples/with-fallback-entry/src/global.css b/examples/with-fallback-entry/src/global.css
@@ -0,0 +1,3 @@
+body {
+  font-size: 14px;
+}
diff --git a/examples/with-fallback-entry/src/pages/index.tsx b/examples/with-fallback-entry/src/pages/index.tsx
@@ -0,0 +1,3 @@
+export default function Home() {
+  return <h1>home</h1>;
+}
diff --git a/examples/with-entry-type/src/typings.d.ts → ...ples/with-fallback-entry/src/typings.d.ts b/examples/with-entry-type/src/typings.d.ts → ...ples/with-fallback-entry/src/typings.d.ts
diff --git a/examples/with-entry-type/tsconfig.json → examples/with-fallback-entry/tsconfig.json b/examples/with-entry-type/tsconfig.json → examples/with-fallback-entry/tsconfig.json
diff --git a/packages/ice/CHANGELOG.md b/packages/ice/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## 3.4.10
+
+### Patch Changes
+
+- 15c8200f: feat: support build additional server entry for fallback
+- Updated dependencies [15c8200f]
+- Updated dependencies [d073ee5a]
+  - @ice/shared-config@1.2.8
+  - @ice/runtime@1.4.10
+  - @ice/rspack-config@1.1.8
+  - @ice/webpack-config@1.1.15
+
 ## 3.4.9
 
 ### Patch Changes

diff --git a/packages/ice/package.json b/packages/ice/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/app",
-  "version": "3.4.9",
+  "version": "3.4.10",
   "description": "provide scripts and configuration used by web framework ice",
   "type": "module",
   "main": "./esm/index.js",
@@ -49,10 +49,10 @@
   "dependencies": {
     "@ice/bundles": "0.2.6",
     "@ice/route-manifest": "1.2.2",
-    "@ice/runtime": "^1.4.8",
-    "@ice/shared-config": "1.2.7",
-    "@ice/webpack-config": "1.1.14",
-    "@ice/rspack-config": "1.1.7",
+    "@ice/runtime": "^1.4.10",
+    "@ice/shared-config": "1.2.8",
+    "@ice/webpack-config": "1.1.15",
+    "@ice/rspack-config": "1.1.8",
     "@swc/helpers": "0.5.1",
     "@types/express": "^4.17.14",
     "address": "^1.1.2",