Merge pull request #6513 from alibaba/release/next

Release 3.3.2

examples/with-store/src/pages/index.tsx

@@ -1,4 +1,4 @@
-import { Link } from 'ice';
+import { Link, definePageConfig } from 'ice';
 import pageStore from './store';
 import logo from './ice.png';
 import appStore from '@/store';
@@ -26,5 +26,8 @@ function Home() {
   );
 }
 
+export const pageConfig = definePageConfig(() => ({
+  title: 'Home Page',
+}));
 
 export default Home;

examples/with-store/src/store.ts

@@ -1,4 +1,4 @@
 import { createStore } from 'ice';
 import user from './models/user';
-
+console.log('app store depend on window', window);
 export default createStore({ user });

packages/appear/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @ice/appear
 
+## 0.2.1
+
+### Patch Changes
+
+- b8b1d5e4: fix: sourceMap url in prod files but not publish with sourceMap file
+
 ## 0.2.0
 
 ### Minor Changes

packages/appear/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@ice/appear",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "",
   "main": "./esm/index.js",
   "types": "./esm/index.d.ts",
   "scripts": {
-    "watch": "tsc -w",
+    "watch": "tsc -w --sourceMap",
     "build": "tsc",
     "prepublishOnly": "npm run build"
   },

packages/bundles/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.1.16
+
+### Patch Changes
+
+- b8b1d5e4: fix: sourceMap url in prod files but not publish with sourceMap file
+
 ## 0.1.15
 
 ### Patch Changes

packages/bundles/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ice/bundles",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "license": "MIT",
   "author": "ICE",
   "description": "Basic dependencies for ice.",
@@ -9,7 +9,7 @@
     "compiled"
   ],
   "scripts": {
-    "watch": "tsc -w",
+    "watch": "tsc -w --sourceMap",
     "build": "tsx scripts/build.ts && tsc"
   },
   "main": "./esm/index.js",

packages/cache-canvas/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @ice/cache-canvas
 
+## 0.0.13
+
+### Patch Changes
+
+- 1e4b20af: fix: The base64 of canvans may be too large, and the syncCall will block the thread.
+- b8b1d5e4: fix: sourceMap url in prod files but not publish with sourceMap file
+- a04cc002: fix: fix style not match when hydrate
+
 ## 0.0.12
 
 ### Patch Changes

packages/cache-canvas/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@ice/cache-canvas",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "",
   "main": "./esm/index.js",
   "types": "./esm/index.d.ts",
   "scripts": {
-    "watch": "tsc -w",
+    "watch": "tsc -w --sourceMap",
     "build": "tsc",
     "prepublishOnly": "npm run build"
   },

packages/cache-canvas/src/index.tsx

@@ -25,6 +25,7 @@ declare global {
     _windvane_backControl: Function | null;
     __megability_bridge__: {
       syncCall: Function;
+      asyncCall: Function;
     };
   }
 }
@@ -74,7 +75,7 @@ export const CacheCanvas = forwardRef((props: CacheCanvasProps, ref) => {
     }
     // Cache base64 string when canvas rendered.
     if (renderedCanvas && strBase64) {
-      Storage.setItem(cacheKey, strBase64, {
+      return Storage.setItem(cacheKey, strBase64, {
         bizID,
       });
     }
@@ -88,27 +89,6 @@ export const CacheCanvas = forwardRef((props: CacheCanvasProps, ref) => {
     setMounted(true);
   }, []);
 
-  useEffect(() => {
-    if (window.WindVane) {
-      window.WindVane.call('WebAppInterface', 'enableHookNativeBack', {});
-      window._windvane_backControl = () => {
-        cacheCanvasFunc();
-        // Windvane must return a string value of true for it to work properly.
-        return 'false';
-      };
-    }
-    document.addEventListener('wvBackClickEvent', cacheCanvasFunc, false);
-    window.addEventListener('beforeunload', cacheCanvasFunc);
-
-    return () => {
-      window.removeEventListener('beforeunload', cacheCanvasFunc);
-      window.removeEventListener('wvBackClickEvent', cacheCanvasFunc);
-      if (window._windvane_backControl) {
-        window._windvane_backControl = null;
-      }
-    };
-  }, [cacheCanvasFunc]);
-
   useEffect(() => {
     if (mounted && typeof init === 'function') {
       const res = init();
@@ -139,10 +119,9 @@ export const CacheCanvas = forwardRef((props: CacheCanvasProps, ref) => {
           {
             (typeof fallback === 'function') && (<div
               id={`fallback-${id}`}
-              style={isNode || Storage.getItem(cacheKey, { bizID }) ? { display: 'none' } : { display: 'block' }}
             >
               {
-                fallback()
+                (isNode || !Storage.getItem(cacheKey, { bizID })) && fallback()
               }
             </div>)
           }
@@ -175,9 +154,9 @@ export const CacheCanvas = forwardRef((props: CacheCanvasProps, ref) => {
                   if (base64Data) {
                     const img = document.getElementById('canvas-img-${id}');
                     img && (img.src = base64Data);
-                    fallback && (fallback.style.display = 'none');
-                  } else {
-                    fallback && (fallback.style.display = 'block');
+                    if (fallback && fallback.childNodes[0]) {
+                      fallback.removeChild(fallback.childNodes[0]);
+                    }
                   }
                 `,
               }}

packages/cache-canvas/src/storage.tsx

@@ -14,24 +14,33 @@ export const Storage = {
         });
 
         if (canIUse) {
-          const res = window.__megability_bridge__.syncCall('userKVStorage', 'setItem', {
-            key,
-            value,
-            bizID,
+          return new Promise((resolve, reject) => {
+            // The base64 of canvans may be too large, and the syncCall will block the thread.
+            window.__megability_bridge__.asyncCall('userKVStorage', 'setItem', {
+              key,
+              value,
+              bizID,
+            }, (res) => {
+              if (res && res.statusCode <= 100) {
+                resolve(res);
+              } else {
+                reject();
+              }
+            });
           });
-          if (res && res.statusCode === 0) {
-            return;
-          }
         }
       }
 
-      if (typeof window !== 'undefined' && window.localStorage) {
-        return localStorage.setItem(key, value);
-      }
-
-      return (cache[key] = value);
+      return new Promise((resolve, reject) => {
+        if (typeof window !== 'undefined' && typeof localStorage !== 'undefined') {
+          resolve(localStorage.setItem(key, value));
+        } else {
+          reject(new Error('localStorage is undefined.'));
+        }
+      });
     } catch (e) {
       console.error('Storage setItem error:', e);
+      return Promise.reject(e);
     }
   },
   getItem: (key, { bizID = '' }) => {

packages/create-ice/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.9.1
+
+### Patch Changes
+
+- b8b1d5e4: fix: sourceMap url in prod files but not publish with sourceMap file
+
 ## 1.9.0
 
 ### Minor Changes

packages/create-ice/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-ice",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "npm init ice",
   "type": "module",
   "main": "./esm/index.mjs",
@@ -20,7 +20,7 @@
     "npm": ">=3.0.0"
   },
   "scripts": {
-    "watch": "tsc -w",
+    "watch": "tsc -w --sourceMap",
     "build": "tsc"
   },
   "dependencies": {

packages/ice/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## 3.3.2
+
+### Patch Changes
+
+- b8b1d5e4: fix: sourceMap url in prod files but not publish with sourceMap file
+- 06829a4e: fix: params urls for hook before.start.run
+- 7194c75c: fix: throw error when server compile failed
+- 68f19eae: fix: should not import runtime module and routes when csr
+- cec448c3: fix: browsers compatibility of dataLoader
+- 64442269: fix: redirect import of definePageConfig
+- Updated dependencies [b8b1d5e4]
+- Updated dependencies [68f19eae]
+- Updated dependencies [64442269]
+- Updated dependencies [b7488105]
+  - @ice/route-manifest@1.2.2
+  - @ice/webpack-config@1.1.2
+  - @ice/rspack-config@1.0.3
+  - @ice/shared-config@1.0.3
+  - @ice/bundles@0.1.16
+  - @ice/runtime@1.2.9
+
 ## 3.3.1
 
 ### Patch Changes

packages/ice/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ice/app",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "provide scripts and configuration used by web framework ice",
   "type": "module",
   "main": "./esm/index.js",
@@ -27,7 +27,7 @@
     "npm": ">=3.0.0"
   },
   "scripts": {
-    "watch": "tsc -w",
+    "watch": "tsc -w --sourceMap",
     "build": "tsc",
     "postinstall": "node ./scripts/postinstall.mjs"
   },
@@ -37,12 +37,12 @@
   "bugs": "https://github.com/alibaba/ice/issues",
   "homepage": "https://v3.ice.work",
   "dependencies": {
-    "@ice/bundles": "0.1.15",
-    "@ice/route-manifest": "1.2.1",
-    "@ice/runtime": "^1.2.8",
-    "@ice/shared-config": "1.0.2",
-    "@ice/webpack-config": "1.1.1",
-    "@ice/rspack-config": "1.0.2",
+    "@ice/bundles": "0.1.16",
+    "@ice/route-manifest": "1.2.2",
+    "@ice/runtime": "^1.2.9",
+    "@ice/shared-config": "1.0.3",
+    "@ice/webpack-config": "1.1.2",
+    "@ice/rspack-config": "1.0.3",
     "@swc/helpers": "0.5.1",
     "@types/express": "^4.17.14",
     "address": "^1.1.2",

packages/ice/src/bundler/rspack/build.ts

@@ -6,7 +6,13 @@ import formatStats from './formatStats.js';
 
 async function build(options: BuildOptions) {
   const { compiler, context, hooksAPI, taskConfigs, rspackConfigs, appConfig, routeManifest } = options;
-  const { rootDir, extendsPluginAPI, applyHook, userConfig } = context;
+  const { rootDir, extendsPluginAPI, applyHook, userConfig, commandArgs } = context;
+  await applyHook('before.build.run', {
+    commandArgs,
+    taskConfigs,
+    rspackConfigs,
+    ...hooksAPI,
+  });
   const { stats, isSuccessful, messages } = await new Promise<CompileResults>((resolve, reject) => {
     let messages: { errors: string[]; warnings: string[] };
     compiler.run(async (_, stats: MultiStats) => {
@@ -41,7 +47,10 @@ async function build(options: BuildOptions) {
 
   if (isSuccessful) {
     const outputDir = rspackConfigs[0].output.path;
-    const { serverEntry } = await extendsPluginAPI.serverCompileTask.get() || {};
+    const { serverEntry, error } = await extendsPluginAPI.serverCompileTask.get() || {};
+    if (error) {
+      throw new Error('Build failed, please check the error message.');
+    }
     const outputPaths = await getOutputPaths({
       rootDir,
       serverEntry,

packages/ice/src/bundler/rspack/index.ts

@@ -10,20 +10,14 @@ async function bundler(
   context: Context,
   options: BundlerOptions,
 ) {
-  const { command, applyHook, commandArgs } = context;
+  const { command } = context;
   const {
     taskConfigs,
     hooksAPI,
     routeManifest,
     appConfig,
   } = options;
   const rspackConfigs = await getConfig(context, options);
-  await applyHook(`before.${command}.run`, {
-    commandArgs,
-    taskConfigs,
-    rspackConfigs,
-    ...hooksAPI,
-  });
 
   let compiler: MultiCompiler;
   let devServer: RspackDevServer;

packages/ice/src/bundler/rspack/start.ts

@@ -45,6 +45,13 @@ const start = async ({
     appConfig,
     devServerConfig,
   });
+  await applyHook('before.start.run', {
+    commandArgs,
+    taskConfigs,
+    rspackConfigs,
+    urls,
+    ...hooksAPI,
+  });
 
   const { RspackDevServer } = await import('@ice/bundles/esm/dev-server.js');
   const devServer = new RspackDevServer(devServerConfig, compiler);