Merge pull request #6881 from alibaba/release/next

Release 3.4.8
alibaba · May 7, 2024 · 280b290 · 280b290
2 parents 8fd6343 + 61ed9f0
commit 280b290
Show file tree

Hide file tree

Showing 57 changed files with 704 additions and 64 deletions.
diff --git a/examples/with-intl/.browserslistrc b/examples/with-intl/.browserslistrc
@@ -0,0 +1 @@
+chrome 55
diff --git a/examples/with-intl/ice.config.mts b/examples/with-intl/ice.config.mts
@@ -0,0 +1,6 @@
+import { defineConfig } from '@ice/app';
+import intl from '@ice/plugin-intl';
+
+export default defineConfig(() => ({
+  plugins: [intl()],
+}));
diff --git a/examples/with-intl/package.json b/examples/with-intl/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "@examples/with-intl",
+  "version": "1.0.0",
+  "private": true,
+  "scripts": {
+    "start": "ice start",
+    "build": "ice build"
+  },
+  "description": "",
+  "author": "",
+  "license": "MIT",
+  "dependencies": {
+    "@ice/app": "workspace:*",
+    "@ice/plugin-intl": "workspace:*",
+    "@ice/runtime": "workspace:*",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.2"
+  }
+}
diff --git a/examples/with-intl/public/favicon.ico b/examples/with-intl/public/favicon.ico
diff --git a/examples/with-intl/src/app.tsx b/examples/with-intl/src/app.tsx
@@ -0,0 +1,8 @@
+import { defineAppConfig } from 'ice';
+import type { LocaleConfig } from '@ice/plugin-intl/types';
+
+export default defineAppConfig(() => ({}));
+
+export const locale: LocaleConfig = {
+  getLocale: () => 'en-US',
+};
diff --git a/examples/with-intl/src/document.tsx b/examples/with-intl/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-intl/src/global.css b/examples/with-intl/src/global.css
@@ -0,0 +1,3 @@
+body {
+  font-size: 14px;
+}
diff --git a/examples/with-intl/src/locales/en-US.ts b/examples/with-intl/src/locales/en-US.ts
@@ -0,0 +1,3 @@
+export default {
+  new: 'New',
+};
diff --git a/examples/with-intl/src/locales/zh-CN.json b/examples/with-intl/src/locales/zh-CN.json
@@ -0,0 +1,3 @@
+{
+  "new": "新建"
+}
diff --git a/examples/with-intl/src/pages/index.tsx b/examples/with-intl/src/pages/index.tsx
@@ -0,0 +1,10 @@
+import { intl } from 'ice';
+
+export default function Home() {
+  return (
+    <>
+      <h1>home</h1>
+      <button>{intl.formatMessage({ id: 'new' })}</button>
+    </>
+  );
+}
diff --git a/examples/with-intl/src/typings.d.ts b/examples/with-intl/src/typings.d.ts
@@ -0,0 +1 @@
+/// <reference types="@ice/app/types" />
diff --git a/examples/with-intl/tsconfig.json b/examples/with-intl/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-request/src/app.tsx b/examples/with-request/src/app.tsx
@@ -1,7 +1,7 @@
 import { request as requestAPI, defineDataLoader } from 'ice';
 import { defineRequestConfig } from '@ice/plugin-request/types';
 
-export const dataLader = defineDataLoader(async () => {
+export const dataLoader = defineDataLoader(async () => {
   try {
     return await requestAPI('/user');
   } catch (err) {

diff --git a/packages/ice/CHANGELOG.md b/packages/ice/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## 3.4.8
+
+### Patch Changes
+
+- 8dada9b6: feat: support generator api to inject code in server entry
+- 5c40dc93: fix: do not remove request config of dataLoader compilation in speedup mode
+- 11a87dc6: feat: support spilt page chunk in cjs format
+- Updated dependencies [e4a32686]
+- Updated dependencies [e78c7d22]
+- Updated dependencies [e858a522]
+- Updated dependencies [a805fa95]
+  - @ice/shared-config@1.2.7
+  - @ice/runtime@1.4.7
+  - @ice/rspack-config@1.1.7
+  - @ice/webpack-config@1.1.14
+
 ## 3.4.7
 
 ### Patch Changes

diff --git a/packages/ice/package.json b/packages/ice/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/app",
-  "version": "3.4.7",
+  "version": "3.4.8",
   "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.5",
-    "@ice/shared-config": "1.2.6",
-    "@ice/webpack-config": "1.1.13",
-    "@ice/rspack-config": "1.1.6",
+    "@ice/runtime": "^1.4.7",
+    "@ice/shared-config": "1.2.7",
+    "@ice/webpack-config": "1.1.14",
+    "@ice/rspack-config": "1.1.7",
     "@swc/helpers": "0.5.1",
     "@types/express": "^4.17.14",
     "address": "^1.1.2",

diff --git a/packages/ice/src/bundler/config/plugins.ts b/packages/ice/src/bundler/config/plugins.ts
@@ -2,6 +2,8 @@ import ServerRunnerPlugin from '../../webpack/ServerRunnerPlugin.js';
 import { IMPORT_META_RENDERER, IMPORT_META_TARGET, WEB } from '../../constant.js';
 import getServerCompilerPlugin from '../../utils/getServerCompilerPlugin.js';
 import ReCompilePlugin from '../../webpack/ReCompilePlugin.js';
+import getEntryPoints from '../../utils/getEntryPoints.js';
+import { multipleServerEntry } from '../../utils/multipleEntry.js';
 import type ServerRunner from '../../service/ServerRunner';
 import type ServerCompileTask from '../../utils/ServerCompileTask.js';
 import type { ServerCompiler, UserConfig } from '../../types';
@@ -28,6 +30,8 @@ interface ServerPluginOptions {
   serverEntry?: string;
   ensureRoutesConfig: () => Promise<void>;
   userConfig?: UserConfig;
+  getFlattenRoutes?: () => string[];
+  command?: string;
 }
 export const getServerPlugin = ({
   serverRunner,
@@ -39,6 +43,8 @@ export const getServerPlugin = ({
   outputDir,
   serverCompileTask,
   userConfig,
+  getFlattenRoutes,
+  command,
 }: ServerPluginOptions) => {
   if (serverRunner) {
     return new ServerRunnerPlugin(serverRunner, ensureRoutesConfig);
@@ -51,6 +57,8 @@ export const getServerPlugin = ({
       serverCompileTask,
       userConfig,
       ensureRoutesConfig,
+      entryPoints: multipleServerEntry(userConfig, command)
+        ? getEntryPoints(rootDir, getFlattenRoutes(), serverEntry) : undefined,
       runtimeDefineVars: {
         [IMPORT_META_TARGET]: JSON.stringify(target),
         [IMPORT_META_RENDERER]: JSON.stringify('server'),

diff --git a/packages/ice/src/bundler/rspack/getConfig.ts b/packages/ice/src/bundler/rspack/getConfig.ts
@@ -14,6 +14,7 @@ import {
 import { getReCompilePlugin, getServerPlugin, getSpinnerPlugin } from '../config/plugins.js';
 import { getExpandedEnvs } from '../../utils/runtimeEnv.js';
 import type { BundlerOptions, Context } from '../types.js';
+import type { PluginData } from '../../types/plugin.js';
 
 type GetConfig = (
   context: Context,
@@ -34,9 +35,11 @@ const getConfig: GetConfig = async (context, options, rspack) => {
   const {
     rootDir,
     userConfig,
+    command,
     extendsPluginAPI: {
       serverCompileTask,
       getRoutesFile,
+      getFlattenRoutes,
     },
   } = context;
   const { reCompile, ensureRoutesConfig } = getRouteExportConfig(rootDir);
@@ -56,6 +59,8 @@ const getConfig: GetConfig = async (context, options, rspack) => {
         outputDir,
         serverCompileTask,
         userConfig,
+        getFlattenRoutes,
+        command,
       }),
       // Add ReCompile plugin when routes config changed.
       getReCompilePlugin(reCompile, routeManifest),
@@ -94,9 +99,17 @@ export const getDataLoaderConfig: GetDataLoaderRspackConfig = async (context, ta
     extendsPluginAPI: {
       generator,
     },
+    getAllPlugin,
   } = context;
   const { config } = task;
   const frameworkExports = generator.getExportList('framework', config.target);
+  const plugins = getAllPlugin(['keepExports']) as PluginData[];
+  let keepExports = ['dataLoader'];
+  plugins.forEach(plugin => {
+    if (plugin.keepExports) {
+      keepExports = keepExports.concat(plugin.keepExports);
+    }
+  });
   return await getRspackConfig({
     rootDir,
     rspack,
@@ -115,7 +128,7 @@ export const getDataLoaderConfig: GetDataLoaderRspackConfig = async (context, ta
         'data-loader': path.join(rootDir, RUNTIME_TMP_DIR, 'data-loader.ts'),
       },
       swcOptions: {
-        keepExports: ['dataLoader'],
+        keepExports,
       },
       splitChunks: false,
       redirectImports: frameworkExports,

diff --git a/packages/ice/src/bundler/webpack/getWebpackConfig.ts b/packages/ice/src/bundler/webpack/getWebpackConfig.ts
@@ -59,6 +59,7 @@ const getWebpackConfig: GetWebpackConfig = async (context, options) => {
     configFilePath,
     extendsPluginAPI: {
       serverCompileTask,
+      getFlattenRoutes,
       getRoutesFile,
       generator,
     },
@@ -96,6 +97,8 @@ const getWebpackConfig: GetWebpackConfig = async (context, options) => {
       outputDir,
       serverCompileTask,
       userConfig,
+      command,
+      getFlattenRoutes,
     });
     if (serverCompilerPlugin) {
       webpackConfig.plugins.push(serverCompilerPlugin);

diff --git a/packages/ice/src/createService.ts b/packages/ice/src/createService.ts
@@ -38,6 +38,7 @@ import addPolyfills from './utils/runtimePolyfill.js';
 import webpackBundler from './bundler/webpack/index.js';
 import rspackBundler from './bundler/rspack/index.js';
 import getDefaultTaskConfig from './plugins/task.js';
+import { multipleServerEntry, renderMultiEntry } from './utils/multipleEntry.js';
 import hasDocument from './utils/hasDocument.js';
 
 const require = createRequire(import.meta.url);
@@ -93,8 +94,13 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
     addEntryCode: (callback: (originalCode: string) => string) => {
       entryCode = callback(entryCode);
     },
-    addEntryImportAhead: (declarationData: Pick<DeclarationData, 'source'>) => {
-      generator.addDeclaration('entry', declarationData);
+    addEntryImportAhead: (declarationData: Pick<DeclarationData, 'source'>, type = 'client') => {
+      if (type === 'both' || type === 'server') {
+        generator.addDeclaration('entryServer', declarationData);
+      }
+      if (type === 'both' || type === 'client') {
+        generator.addDeclaration('entry', declarationData);
+      }
     },
     modifyRenderData: generator.modifyRenderData,
     addDataLoaderImport: (declarationData: DeclarationData) => {
@@ -243,7 +249,10 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
   const iceRuntimePath = '@ice/runtime';
   // Only when code splitting use the default strategy or set to `router`, the router will be lazy loaded.
   const lazy = [true, 'chunks', 'page', 'page-vendors'].includes(userConfig.codeSplitting);
-  const { routeImports, routeDefinition } = getRoutesDefinition(routesInfo.routes, lazy);
+  const { routeImports, routeDefinition } = getRoutesDefinition({
+    manifest: routesInfo.routes,
+    lazy,
+  });
   const loaderExports = hasExportAppData || Boolean(routesInfo.loaders);
   const hasDataLoader = Boolean(userConfig.dataLoader) && loaderExports;
   // add render data
@@ -267,6 +276,7 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
     hasDataLoader,
     routeImports,
     routeDefinition,
+    routesFile: './routes',
   });
   dataCache.set('routes', JSON.stringify(routesInfo));
   dataCache.set('hasExportAppData', hasExportAppData ? 'true' : '');
@@ -304,6 +314,15 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
     });
   }
 
+  if (multipleServerEntry(userConfig, command)) {
+    renderMultiEntry({
+      generator,
+      renderRoutes: routeManifest.getFlattenRoute(),
+      routesManifest: routesInfo.routes,
+      lazy,
+    });
+  }
+
   // render template before webpack compile
   const renderStart = new Date().getTime();
   generator.render();

diff --git a/packages/ice/src/getWatchEvents.ts b/packages/ice/src/getWatchEvents.ts
@@ -30,7 +30,10 @@ const getWatchEvents = (options: Options): WatchEvent[] => {
     async (eventName: string) => {
       if (eventName === 'add' || eventName === 'unlink' || eventName === 'change') {
         const routesRenderData = await generateRoutesInfo(rootDir, routesConfig);
-        const { routeImports, routeDefinition } = getRoutesDefinition(routesRenderData.routes, lazyRoutes);
+        const { routeImports, routeDefinition } = getRoutesDefinition({
+          manifest: routesRenderData.routes,
+          lazy: lazyRoutes,
+        });
         const stringifiedData = JSON.stringify(routesRenderData);
         if (cache.get('routes') !== stringifiedData) {
           cache.set('routes', stringifiedData);

diff --git a/packages/ice/src/routes.ts b/packages/ice/src/routes.ts
@@ -64,9 +64,20 @@ function getFilePath(file: string) {
   return formatPath(path.isAbsolute(file) ? file : `@/pages/${file}`.replace(new RegExp(`${path.extname(file)}$`), ''));
 }
 
-export function getRoutesDefinition(nestRouteManifest: NestedRouteManifest[], lazy = false, depth = 0) {
+interface GetDefinationOptions {
+  manifest: NestedRouteManifest[];
+  lazy?: boolean;
+  depth?: number;
+  matchRoute?: (route: NestedRouteManifest) => boolean;
+}
+
+export function getRoutesDefinition(options: GetDefinationOptions) {
+  const { manifest, lazy = false, depth = 0, matchRoute = () => true } = options;
   const routeImports: string[] = [];
-  const routeDefinition = nestRouteManifest.reduce((prev, route) => {
+  const routeDefinition = manifest.reduce((prev, route) => {
+    if (!matchRoute(route)) {
+      return prev;
+    }
     const { children, path: routePath, index, componentName, file, id, layout, exports } = route;
     const componentPath = id.startsWith('__') ? file : getFilePath(file);
 
@@ -112,7 +123,12 @@ export function getRoutesDefinition(nestRouteManifest: NestedRouteManifest[], la
       routeProperties.push('layout: true,');
     }
     if (children) {
-      const res = getRoutesDefinition(children, lazy, depth + 1);
+      const res = getRoutesDefinition({
+        manifest: children,
+        lazy,
+        depth: depth + 1,
+        matchRoute,
+      });
       routeImports.push(...res.routeImports);
       routeProperties.push(`children: [${res.routeDefinition}]`);
     }