Merge pull request #6308 from alibaba/release/next

Release 3.2.6

examples/app-config/package.json

@@ -24,6 +24,6 @@
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
     "speed-measure-webpack-plugin": "^1.5.0",
-    "webpack": "^5.80.0"
+    "webpack": "^5.86.0"
   }
 }

examples/basic-project/package.json

@@ -23,6 +23,6 @@
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
     "speed-measure-webpack-plugin": "^1.5.0",
-    "webpack": "^5.80.0"
+    "webpack": "^5.86.0"
   }
 }

examples/basic-project/src/pages/index.tsx

@@ -73,6 +73,7 @@ export const dataLoader = defineDataLoader(({ pathname, query }) => {
         count: 100,
         pathname,
         query,
+        from: 'client',
       });
     }, 1 * 100);
   });

examples/csr-project/package.json

@@ -21,6 +21,6 @@
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "speed-measure-webpack-plugin": "^1.5.0",
-    "webpack": "^5.80.0"
+    "webpack": "^5.86.0"
   }
 }

examples/disable-data-loader/package.json

@@ -24,6 +24,6 @@
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
     "speed-measure-webpack-plugin": "^1.5.0",
-    "webpack": "^5.80.0"
+    "webpack": "^5.86.0"
   }
 }

examples/miniapp-project/package.json

@@ -28,6 +28,6 @@
     "@types/react-dom": "^18.0.2",
     "browserslist": "^4.19.3",
     "speed-measure-webpack-plugin": "^1.5.0",
-    "webpack": "^5.80.0"
+    "webpack": "^5.86.0"
   }
 }

examples/rax-inline-style/package.json

@@ -24,6 +24,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
-    "webpack": "^5.80.0"
+    "webpack": "^5.86.0"
   }
 }

examples/rax-project/package.json

@@ -26,6 +26,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
-    "webpack": "^5.80.0"
+    "webpack": "^5.86.0"
   }
 }

examples/single-route/ice.config.mts

@@ -5,4 +5,5 @@ export default defineConfig(() => ({
   optimization: {
     router: false,
   },
+  ssr: true,
 }));

examples/single-route/src/pages/index.tsx

@@ -1,8 +1,55 @@
-import { Link } from 'ice';
+import { Link, useData, defineDataLoader, useSuspenseData, withSuspense } from 'ice';
+
+function Comments() {
+  const comments = useSuspenseData(getData);
+
+  console.log('Render: Comments');
+
+  return (
+    <div>
+      {comments.map((comment, i) => (
+        <p className="comment" key={i}>
+          {comment}
+        </p>
+      ))}
+    </div>
+  );
+}
+const StreamingComments = withSuspense(Comments);
+const fakeData = [
+  "Wait, it doesn't wait for React to load?",
+  'How does this even work?',
+  'I like marshmallows',
+];
+
+async function getData() {
+  await new Promise<any>((resolve) => {
+    setTimeout(() => resolve(null), 1000);
+  });
+  return fakeData;
+}
 
 console.log('process.env.ICE_CORE_ROUTER', process.env.ICE_CORE_ROUTER);
 console.log('Link', Link);
 
 export default function Home() {
-  return <div>home <h2>Home Page</h2></div>;
-}
+  const data = useData();
+  console.log('render About', 'data', data);
+  return (
+    <div>
+      <h1>{data?.name}</h1>
+      <h2>Home Page</h2>
+      <StreamingComments id="comments" fallback={<div>loading</div>} />
+    </div>
+  );
+}
+
+export const dataLoader = defineDataLoader(() => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve({
+        name: 'home',
+      });
+    }, 1 * 100);
+  });
+});

examples/with-entry-type/package.json

@@ -19,6 +19,6 @@
     "fs-extra": "^10.0.0",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
-    "webpack": "^5.73.0"
+    "webpack": "^5.86.0"
   }
 }

examples/with-nested-routes/package.json

@@ -19,6 +19,6 @@
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "speed-measure-webpack-plugin": "^1.5.0",
-    "webpack": "^5.80.0"
+    "webpack": "^5.86.0"
   }
 }

examples/with-pha/package.json

@@ -19,6 +19,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
-    "webpack": "^5.80.0"
+    "webpack": "^5.86.0"
   }
 }

packages/bundles/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.1.12
+
+### Patch Changes
+
+- f95bbc2e: chore: bump webpack version(5.86.0)
+- c70c7737: fix: bump webpack(5.84.1) and webpack-dev-server(4.15.0)
+
 ## 0.1.11
 
 ### Patch Changes

packages/bundles/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ice/bundles",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "license": "MIT",
   "author": "ICE",
   "description": "Basic dependencies for ice.",
@@ -65,9 +65,9 @@
     "terser-webpack-plugin": "5.3.5",
     "typescript": "^4.6.4",
     "trusted-cert": "1.1.3",
-    "webpack": "5.80.0",
+    "webpack": "5.86.0",
     "webpack-bundle-analyzer": "4.5.0",
-    "webpack-dev-server": "4.11.1",
+    "webpack-dev-server": "4.15.0",
     "unplugin": "0.9.5",
     "bonjour-service": "^1.0.13",
     "colorette": "^2.0.10",

packages/ice/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## 3.2.6
+
+### Patch Changes
+
+- 94dac52e: chore: add return for default dataLoaderFetcher
+- 474e1935: feat: support usePageAssets
+  feat: export useAppContext
+- c70c7737: fix: refactor error handling
+- abdd49de: fix: modified task alias not be used
+- b10d9cb8: fix: support source map for stack traces in node
+- c4f625a2: fix: optimize single router
+- Updated dependencies [f839c67d]
+- Updated dependencies [137d6b1c]
+- Updated dependencies [f95bbc2e]
+- Updated dependencies [474e1935]
+- Updated dependencies [c68c5da3]
+- Updated dependencies [f95bbc2e]
+- Updated dependencies [c70c7737]
+- Updated dependencies [c70c7737]
+- Updated dependencies [1171475d]
+- Updated dependencies [9eec33ad]
+- Updated dependencies [c4f625a2]
+  - @ice/runtime@1.2.4
+  - @ice/bundles@0.1.12
+  - @ice/webpack-config@1.0.18
+
 ## 3.2.5
 
 ### Patch Changes

packages/ice/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ice/app",
-  "version": "3.2.5",
+  "version": "3.2.6",
   "description": "provide scripts and configuration used by web framework ice",
   "type": "module",
   "main": "./esm/index.js",
@@ -36,10 +36,10 @@
   "bugs": "https://github.com/alibaba/ice/issues",
   "homepage": "https://v3.ice.work",
   "dependencies": {
-    "@ice/bundles": "0.1.11",
+    "@ice/bundles": "0.1.12",
     "@ice/route-manifest": "1.2.0",
-    "@ice/runtime": "^1.2.3",
-    "@ice/webpack-config": "1.0.17",
+    "@ice/runtime": "^1.2.4",
+    "@ice/webpack-config": "1.0.18",
     "@swc/helpers": "0.5.1",
     "@types/express": "^4.17.14",
     "address": "^1.1.2",
@@ -63,6 +63,7 @@
     "regenerator-runtime": "^0.13.0",
     "resolve.exports": "^1.1.0",
     "semver": "^7.3.5",
+    "source-map-support": "^0.5.21",
     "temp": "^0.9.4",
     "yargs-parser": "^21.1.1"
   },
@@ -82,7 +83,7 @@
     "react-router": "6.11.2",
     "sass": "^1.50.0",
     "unplugin": "^0.9.0",
-    "webpack": "^5.80.0",
+    "webpack": "^5.86.0",
     "webpack-dev-server": "^4.7.4"
   },
   "peerDependencies": {

packages/ice/src/commands/build.ts

@@ -20,6 +20,8 @@ import { logger } from '../utils/logger.js';
 import { getExpandedEnvs } from '../utils/runtimeEnv.js';
 import type RouteManifest from '../utils/routeManifest.js';
 import injectInitialEntry from '../utils/injectInitialEntry.js';
+// Enable source map support when build.
+import 'source-map-support/register.js';
 
 const build = async (
   context: Context<Config, ExtendsPluginAPI>,

packages/ice/src/constant.ts

@@ -61,12 +61,16 @@ export const RUNTIME_EXPORTS = [
       'ClientOnly',
       'withSuspense',
       'useSuspenseData',
+      'usePublicAppContext',
       'Await',
       'defineDataLoader',
       'defineServerDataLoader',
       'defineStaticDataLoader',
       'usePageLifecycle',
     ],
+    alias: {
+      usePublicAppContext: 'useAppContext',
+    },
     source: '@ice/runtime',
   },
 ];

packages/ice/src/createService.ts

@@ -37,6 +37,7 @@ import { logger, createLogger } from './utils/logger.js';
 import ServerRunner from './service/ServerRunner.js';
 import RouteManifest from './utils/routeManifest.js';
 import dynamicImport from './utils/dynamicImport.js';
+import mergeTaskConfig from './utils/mergeTaskConfig.js';
 import addPolyfills from './utils/runtimePolyfill.js';
 
 const require = createRequire(import.meta.url);
@@ -144,9 +145,9 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
         delete require.cache[serverEntry];
         return await dynamicImport(serverEntry, true);
       }
-    } catch (err) {
+    } catch (error) {
       // make error clearly, notice typeof err === 'string'
-      logger.error('Excute server entry error:', err);
+      logger.error('Execute server entry error:', error);
       return;
     }
   }
@@ -232,14 +233,18 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
   const csr = !userConfig.ssr && !userConfig.ssg;
 
   const disableRouter = userConfig?.optimization?.router && routesInfo.routesCount <= 1;
-  let taskAlias = {};
   if (disableRouter) {
     logger.info('`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');
+    taskConfigs = mergeTaskConfig(taskConfigs, {
+      alias: {
+        '@ice/runtime/router': '@ice/runtime/single-router',
+      },
+    });
+  } else {
+    // Only when router is enabled, we will add router polyfills.
+    addPolyfills(generatorAPI, userConfig.featurePolyfill, rootDir, command === 'start');
   }
 
-  addPolyfills(generatorAPI, userConfig.featurePolyfill, rootDir, command === 'start');
-
   // Get first task config as default platform config.
   const platformTaskConfig = taskConfigs[0];
 
@@ -393,9 +398,9 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
             spinner: buildSpinner,
           });
         }
-      } catch (err) {
+      } catch (error) {
         buildSpinner.stop();
-        throw err;
+        throw error;
       }
     },
   };

packages/ice/src/esbuild/scan.ts

@@ -64,7 +64,9 @@ const scanPlugin = (options: Options): Plugin => {
       pkgNameCache.set(resolved, result);
       return result;
     } catch (err) {
-      logger.error(`cant resolve package of path: ${resolved}`, err);
+      logger.error(`Can't resolve package of path: ${resolved}`);
+      // Scan error doesn't affect the build process.
+      logger.error(err);
     }
   };
 
@@ -162,4 +164,4 @@ const scanPlugin = (options: Options): Plugin => {
   };
 };
 
-export default scanPlugin;
+export default scanPlugin;