Merge pull request #7025 from alibaba/release/next

Release @ice/app 3.5.1
alibaba · Nov 25, 2024 · 6b3167a · 6b3167a
2 parents e14dc87 + f0c2dde
commit 6b3167a
Show file tree

Hide file tree

Showing 22 changed files with 97 additions and 27 deletions.
diff --git a/packages/ice/CHANGELOG.md b/packages/ice/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 3.5.1
+
+### Patch Changes
+
+- Updated dependencies [4130611d]
+- Updated dependencies [2e274966]
+  - @ice/rspack-config@1.2.1
+  - @ice/runtime@1.5.1
+
 ## 3.5.0
 
 ### Minor Changes

diff --git a/packages/ice/package.json b/packages/ice/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/app",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "provide scripts and configuration used by web framework ice",
   "type": "module",
   "main": "./esm/index.js",

diff --git a/packages/jsx-runtime/CHANGELOG.md b/packages/jsx-runtime/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @ice/jsx-runtime
 
+## 0.3.1
+
+### Patch Changes
+
+- 2e274966: fix: export createElement for backward compatibility
+
 ## 0.3.0
 
 ### Minor Changes

diff --git a/packages/jsx-runtime/package.json b/packages/jsx-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/jsx-runtime",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "JSX runtime for ice.",
   "files": [
     "esm",
@@ -34,7 +34,8 @@
     "jsx-runtime"
   ],
   "dependencies": {
-    "style-unit": "^3.0.4"
+    "style-unit": "^3.0.4",
+    "@swc/helpers": "^0.5.13"
   },
   "devDependencies": {
     "@ice/pkg": "^1.5.0",

diff --git a/packages/jsx-runtime/src/createElement.ts b/packages/jsx-runtime/src/createElement.ts
@@ -0,0 +1,5 @@
+import { createElement as reactCreateElement } from 'react';
+import { hijackElementProps } from './style.js';
+export function createElement(type: any, props: any, ...children: any[]) {
+  return reactCreateElement(type, hijackElementProps(props), ...children);
+}
diff --git a/packages/jsx-runtime/src/index.ts b/packages/jsx-runtime/src/index.ts
@@ -1 +1,2 @@
 export * from './prod.js';
+export { createElement } from './createElement.js';
diff --git a/packages/miniapp-react-dom/CHANGELOG.md b/packages/miniapp-react-dom/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @ice/miniapp-react-dom
 
+## 1.1.1
+
+### Patch Changes
+
+- @ice/miniapp-runtime@1.2.1
+
 ## 1.1.0
 
 ### Minor Changes

diff --git a/packages/miniapp-react-dom/package.json b/packages/miniapp-react-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/miniapp-react-dom",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "like react-dom, but for miniapps.",
   "type": "module",
   "types": "./esm/index.d.ts",

diff --git a/packages/miniapp-runtime/CHANGELOG.md b/packages/miniapp-runtime/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.2.1
+
+### Patch Changes
+
+- Updated dependencies [2e274966]
+  - @ice/runtime@1.5.1
+
 ## 1.2.0
 
 ### Minor Changes

diff --git a/packages/miniapp-runtime/package.json b/packages/miniapp-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/miniapp-runtime",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "ice runtime for miniapps.",
   "type": "module",
   "types": "./esm/index.d.ts",

diff --git a/packages/plugin-i18n/package.json b/packages/plugin-i18n/package.json
@@ -39,7 +39,7 @@
     "plugin"
   ],
   "dependencies": {
-    "@ice/jsx-runtime": "^0.3.0",
+    "@ice/jsx-runtime": "^0.3.1",
     "@swc/helpers": "^0.5.1",
     "accept-language-parser": "^1.5.0",
     "universal-cookie": "^4.0.4",
@@ -56,8 +56,8 @@
     "webpack-dev-server": "4.15.0"
   },
   "peerDependencies": {
-    "@ice/app": "^3.5.0",
-    "@ice/runtime": "^1.5.0"
+    "@ice/app": "^3.5.1",
+    "@ice/runtime": "^1.5.1"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/plugin-miniapp/CHANGELOG.md b/packages/plugin-miniapp/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.2.1
+
+### Patch Changes
+
+- cce46e9b: fix: should check skeleton file existed before read
+  - @ice/miniapp-runtime@1.2.1
+  - @ice/miniapp-react-dom@1.1.1
+
 ## 1.2.0
 
 ### Minor Changes

diff --git a/packages/plugin-miniapp/package.json b/packages/plugin-miniapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/plugin-miniapp",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "ice.js plugin for miniapp.",
   "license": "MIT",
   "type": "module",
@@ -50,8 +50,8 @@
     "sax": "^1.2.4"
   },
   "devDependencies": {
-    "@ice/app": "^3.5.0",
-    "@ice/runtime": "^1.5.0",
+    "@ice/app": "^3.5.1",
+    "@ice/runtime": "^1.5.1",
     "webpack": "^5.88.0"
   },
   "repository": {

diff --git a/packages/plugin-miniapp/src/miniapp/webpack/plugins/MiniPlugin.ts b/packages/plugin-miniapp/src/miniapp/webpack/plugins/MiniPlugin.ts
@@ -588,6 +588,7 @@ export default class MiniPlugin {
           path: pagePath,
           isNative,
           stylePath: isNative ? this.getStylePath(pagePath) : undefined,
+          templatePath: isNative ? this.getTemplatePath(pagePath) : undefined,
           skeletonPath: isNative ? this.getSkeletonExtraPath(pagePath) : undefined,
         };
       }),
@@ -690,10 +691,10 @@ export default class MiniPlugin {
     }
     this.addEntry(path.resolve(__dirname, '..', 'template/custom-wrapper'), 'custom-wrapper', META_TYPE.STATIC);
 
-    const resolveComponentStyleEntry = (name: string, stylePaths: string[]) => {
+    const resolveComponentStyleEntry = (name: string, stylePaths: string[], ext = this.options.fileType.style) => {
       for (const stylePath of stylePaths) {
         if (fs.existsSync(stylePath)) {
-          this.addEntry(stylePath, this.getTargetFilePath(name, this.options.fileType.style), META_TYPE.NORMAL);
+          this.addEntry(stylePath, this.getTargetFilePath(name, ext), META_TYPE.NORMAL);
           break;
         }
       }
@@ -709,12 +710,10 @@ export default class MiniPlugin {
           this.addEntry(item.templatePath, this.getTemplatePath(item.name), META_TYPE.NORMAL);
         }
 
-        if (item.skeletonPath) {
-          if (item.skeletonPath.template) {
-            this.addEntry(item.skeletonPath.template, this.getTargetFilePath(item.name, `${this.options.fileType.skeletonMidExt}${this.options.fileType.templ}`), META_TYPE.NORMAL);
-          }
+        if (item.skeletonPath && item.skeletonPath.template && fs.existsSync(item.skeletonPath.template)) {
+          this.addEntry(item.skeletonPath.template, this.getTargetFilePath(item.name, `${this.options.fileType.skeletonMidExt}${this.options.fileType.templ}`), META_TYPE.NORMAL);
           if (item.skeletonPath.style) {
-            resolveComponentStyleEntry(this.getTargetFilePath(item.name, this.options.fileType.skeletonMidExt), item.skeletonPath.style);
+            resolveComponentStyleEntry(item.name, item.skeletonPath.style, `${this.options.fileType.skeletonMidExt}${this.options.fileType.style}`);
           }
         }
       } else {

diff --git a/packages/rspack-config/CHANGELOG.md b/packages/rspack-config/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @ice/rspack-config
 
+## 1.2.1
+
+### Patch Changes
+
+- 4130611d: fix: update splitChunk config
+
 ## 1.2.0
 
 ### Minor Changes

diff --git a/packages/rspack-config/package.json b/packages/rspack-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/rspack-config",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "repository": "alibaba/ice",
   "bugs": "https://github.com/alibaba/ice/issues",
   "homepage": "https://v3.ice.work",

diff --git a/packages/rspack-config/src/splitChunks.ts b/packages/rspack-config/src/splitChunks.ts
@@ -87,8 +87,9 @@ export const getVendorStrategy = (options: Configuration['splitChunks']) => {
 
 const getSplitChunks = (_: string, strategy: string | boolean) => {
   if (strategy === false) {
-    // Empty splitChunks configuration if strategy is false.
-    return {};
+    // Set minChunks to a large number to disable the splitChunks feature.
+    // the value of Infinity is not work properly for this version of rspack.
+    return { minChunks: 100000, cacheGroups: { default: false } };
   } else if (typeof strategy === 'string' && ['page-vendors', 'vendors'].includes(strategy)) {
     const splitChunksOptions = strategy === 'page-vendors' ? { chunks: 'all' } : {};
     return getVendorStrategy(splitChunksOptions);

diff --git a/packages/runtime/CHANGELOG.md b/packages/runtime/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @ice/runtime
 
+## 1.5.1
+
+### Patch Changes
+
+- 2e274966: feat: support hook of onBeforeHydrate
+- Updated dependencies [2e274966]
+  - @ice/jsx-runtime@0.3.1
+
 ## 1.5.0
 
 ### Minor Changes

diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/runtime",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Runtime module for ice.js",
   "type": "module",
   "types": "./esm/index.d.ts",
@@ -54,7 +54,7 @@
     "./esm/polyfills/abortcontroller.js"
   ],
   "dependencies": {
-    "@ice/jsx-runtime": "^0.3.0",
+    "@ice/jsx-runtime": "^0.3.1",
     "@ice/shared": "^1.1.0",
     "@remix-run/router": "1.14.2",
     "abortcontroller-polyfill": "1.7.5",

diff --git a/packages/runtime/src/runClientApp.tsx b/packages/runtime/src/runClientApp.tsx
@@ -120,6 +120,9 @@ export default async function runClientApp(options: RunClientAppOptions) {
           reportRecoverableError(error, errorInfo, { ignoreRuntimeWarning: revalidate });
         }),
       };
+      if (appConfig?.app?.onBeforeHydrate) {
+        appConfig?.app?.onBeforeHydrate();
+      }
       return ReactDOM.hydrateRoot(container, element, hydrateOptions);
     });
   }

diff --git a/packages/runtime/src/types.ts b/packages/runtime/src/types.ts
@@ -17,6 +17,7 @@ type App = Partial<{
   strict: boolean;
   errorBoundary: boolean;
   onRecoverableError: (error: unknown, errorInfo: ErrorStack) => void;
+  onBeforeHydrate: () => void;
 } & Record<AppLifecycle, VoidFunction>>;
 
 export interface ErrorStack {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml