Merge pull request #5638 from alibaba/release/3.0

Release/3.0.2
alibaba · Dec 8, 2022 · fbe25b8 · fbe25b8
2 parents dbcde91 + ee145bc
commit fbe25b8
Show file tree

Hide file tree

Showing 40 changed files with 365 additions and 103 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,6 +53,5 @@ compiled
 .docusaurus
 .cache-loader
 
-.env
 *.local
 .fleet/
diff --git a/examples/basic-project/.env b/examples/basic-project/.env
@@ -0,0 +1 @@
+ICE_ENV=common
diff --git a/examples/basic-project/.env.development b/examples/basic-project/.env.development
@@ -0,0 +1 @@
+ICE_ENV=development
diff --git a/examples/basic-project/ice.config.mts b/examples/basic-project/ice.config.mts
@@ -4,6 +4,7 @@ import customPlugin from './plugin';
 
 export default defineConfig(() => ({
   publicPath: '/',
+  polyfill: 'entry',
   syntaxFeatures: {
     exportDefaultFrom: true,
   },
@@ -23,7 +24,7 @@ export default defineConfig(() => ({
     }
     return webpackConfig;
   },
-  dropLogLevel: 'warn',
+  dropLogLevel: process.env.ICE_ENV === 'common' ? 'warn' : 'error',
   plugins: [
     customPlugin(),
   ],

diff --git a/examples/with-antd-mobile/ice.config.mts b/examples/with-antd-mobile/ice.config.mts
@@ -1,6 +1,7 @@
 import { defineConfig } from '@ice/app';
 
 export default defineConfig(() => ({
+  polyfill: 'usage',
   server: {
     bundle: true,
     format: 'cjs',

diff --git a/packages/bundles/src/index.ts b/packages/bundles/src/index.ts
@@ -10,7 +10,6 @@ const swcPluginRemoveExport = require.resolve('@ice/swc-plugin-remove-export');
 const swcPluginKeepExport = require.resolve('@ice/swc-plugin-keep-export');
 const swcPluginKeepPlatform = require.resolve('@ice/swc-plugin-keep-platform');
 const coreJsPath = dirname(require.resolve('core-js/package.json'));
-
 export {
   postcss,
   less,

diff --git a/packages/ice/CHANGELOG.md b/packages/ice/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## v3.0.2
+
+- [fix] rule of page chunk name
+- [fix] load env before resolve user config
+- [fix] change css module export to make it be compatible with cjs output
+- [fix] change main fields order for ssr
+- [feat] add fetcher config in dataLoader
+- [feat]: force to use port which user set in commandArgs
+
 ## v3.0.1
 
 - [fix] file resolve when use css module in server compiling

diff --git a/packages/ice/bin/ice-cli.mjs b/packages/ice/bin/ice-cli.mjs
@@ -43,7 +43,7 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
     .option('--mode <mode>', 'set mode', 'development')
     .option('--config <config>', 'custom config path')
     .option('-h, --host <host>', 'dev server host', '0.0.0.0')
-    .option('-p, --port <port>', 'dev server port', 3000)
+    .option('-p, --port <port>', 'dev server port')
     .option('--no-open', "don't open browser on startup")
     .option('--no-mock', "don't start mock service")
     .option('--rootDir <rootDir>', 'project root directory', cwd)
@@ -52,7 +52,8 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
     .option('--force', 'force remove cache directory', false)
     .action(async ({ rootDir, ...commandArgs }) => {
       process.env.NODE_ENV = 'development';
-      commandArgs.port = await detectPort(commandArgs.port);
+      const DEFAULT_PORT = 3000;
+      commandArgs.port = typeof commandArgs.port === 'undefined' ? await detectPort(DEFAULT_PORT) : commandArgs.port;
       const service = await createService({ rootDir, command: 'start', commandArgs });
       service.run();
     });

diff --git a/packages/ice/package.json b/packages/ice/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/app",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "provide scripts and configuration used by web framework ice",
   "type": "module",
   "main": "./esm/index.js",
@@ -40,7 +40,7 @@
     "@ice/bundles": "0.1.1",
     "@ice/route-manifest": "1.0.0",
     "@ice/runtime": "^1.0.0",
-    "@ice/webpack-config": "1.0.1",
+    "@ice/webpack-config": "1.0.2",
     "@swc/helpers": "0.4.12",
     "@types/express": "^4.17.14",
     "address": "^1.1.2",

diff --git a/packages/ice/src/config.ts b/packages/ice/src/config.ts
@@ -54,7 +54,7 @@ const userConfig = [
   },
   {
     name: 'dataLoader',
-    validation: 'boolean',
+    validation: 'boolean|object',
     defaultValue: true,
   },
   {

diff --git a/packages/ice/src/createService.ts b/packages/ice/src/createService.ts
@@ -108,6 +108,8 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
       dataCache,
     },
   });
+  // Load .env before resolve user config, so we can access env variables defined in .env files.
+  await setEnv(rootDir, commandArgs);
   // resolve userConfig from ice.config.ts before registerConfig
   await ctx.resolveUserConfig();
 
@@ -140,7 +142,6 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
   const { routes: routesConfig, server, syntaxFeatures, polyfill } = userConfig;
   const userConfigHash = await getFileHash(path.join(rootDir, fg.sync(configFile, { cwd: rootDir })[0]));
 
-  await setEnv(rootDir, commandArgs);
   const coreEnvKeys = getCoreEnvKeys();
 
   const routesInfo = await generateRoutesInfo(rootDir, routesConfig);
@@ -188,9 +189,27 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
     rootDir,
     runtimeDir: RUNTIME_TMP_DIR,
     templateDir: path.join(templateDir, 'exports'),
-    dataLoader: userConfig.dataLoader,
+    dataLoader: Boolean(userConfig.dataLoader),
   });
 
+  if (typeof userConfig.dataLoader === 'object' && userConfig.dataLoader.fetcher) {
+    const {
+      packageName,
+      method,
+    } = userConfig.dataLoader.fetcher;
+
+    generatorAPI.addDataLoaderImport(method ? {
+      source: packageName,
+      alias: {
+        [method]: 'fetcher',
+      },
+      specifier: [method],
+    } : {
+      source: packageName,
+      specifier: '',
+    });
+  }
+
   // render template before webpack compile
   const renderStart = new Date().getTime();
   generator.render();

diff --git a/packages/ice/src/esbuild/cssModules.ts b/packages/ice/src/esbuild/cssModules.ts
@@ -66,7 +66,7 @@ function onStyleLoad(options: PluginOptions) {
     ];
     const result = await postcss(postcssPlugins).process(css, { from: args.path });
     css = result.css;
-    contents += `export default ${data.exportedClasses};`;
+    contents += `module.exports = ${data.exportedClasses};`;
 
     if (extract) {
       const writestream = temp.createWriteStream({ suffix: '.css' });

diff --git a/packages/ice/src/routes.ts b/packages/ice/src/routes.ts
@@ -61,7 +61,7 @@ function recurseRoutesStr(nestRouteManifest: NestedRouteManifest[], depth = 0) {
     const componentPath = id.startsWith('__') ? file : `@/pages/${file}`.replace(new RegExp(`${path.extname(file)}$`), '');
     const routeProperties: string[] = [
       `path: '${formatPath(routePath || '')}',`,
-      `load: () => import(/* webpackChunkName: "${componentName}" */ '${formatPath(componentPath)}'),`,
+      `load: () => import(/* webpackChunkName: "p_${componentName}" */ '${formatPath(componentPath)}'),`,
       `componentName: '${componentName}',`,
       `index: ${index},`,
       `id: '${id}',`,

diff --git a/packages/ice/src/types/plugin.ts b/packages/ice/src/types/plugin.ts
@@ -24,6 +24,7 @@ type ServerCompilerBuildOptions = Pick<
   'outdir' |
   'splitting' |
   'platform' |
+  'mainFields' |
   'outExtension' |
   'plugins' |
   'logLevel' |

diff --git a/packages/ice/src/types/userConfig.ts b/packages/ice/src/types/userConfig.ts
@@ -25,6 +25,11 @@ interface IgnorePattern {
   contextRegExp?: RegExp;
 }
 
+interface Fetcher {
+  packageName: string;
+  method?: string;
+}
+
 export interface UserConfig {
   alias?: Record<string, string | false>;
   define?: Record<string, string | boolean>;
@@ -63,6 +68,8 @@ export interface UserConfig {
   transform?: UnpluginOptions['transform'];
   syntaxFeatures?: SyntaxFeatures;
   splitChunks?: boolean;
-  dataLoader?: boolean;
+  dataLoader?: {
+    fetcher?: Fetcher;
+  } | Boolean;
   crossOriginLoading?: Config['output']['crossOriginLoading'];
 }
diff --git a/packages/ice/src/utils/getServerCompilerPlugin.ts b/packages/ice/src/utils/getServerCompilerPlugin.ts
@@ -28,7 +28,11 @@ function getServerCompilerPlugin(serverCompiler: ServerCompiler, options: Option
         outdir: path.join(outputDir, SERVER_OUTPUT_DIR),
         splitting: isEsm,
         format,
+        // When format set to esm and platform set to node,
+        // will cause error `Dynamic require of "XXX" is not supported`.
+        // https://github.com/evanw/esbuild/issues/1921
         platform: isEsm ? 'browser' : 'node',
+        mainFields: ['module', 'main'],
         outExtension: { '.js': isEsm ? '.mjs' : '.cjs' },
         metafile: true,
       },

diff --git a/packages/ice/src/utils/runtimeEnv.ts b/packages/ice/src/utils/runtimeEnv.ts
@@ -31,7 +31,7 @@ export async function setEnv(
 
   dotenvFiles.forEach(dotenvFile => {
     const filepath = path.join(rootDir, dotenvFile);
-    if (fs.existsSync(dotenvFile)) {
+    if (fs.existsSync(filepath)) {
       dotenvExpand(
         dotenv.config({
           path: filepath,

diff --git a/packages/plugin-pha/CHANGELOG.md b/packages/plugin-pha/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.0.2
+
+- [fix] fix dev lanUrlForTerminal err
+- [fix] add title of manifest
+- [fix] add pha = true when dev
+
 ## 1.0.1
 
 - [fix] failed to get route config when re-define route path

diff --git a/packages/plugin-pha/package.json b/packages/plugin-pha/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/plugin-pha",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "ice.js plugin for PHA.",
   "license": "MIT",
   "type": "module",
@@ -32,4 +32,4 @@
     "type": "http",
     "url": "https://github.com/alibaba/ice/tree/master/packages/plugin-pha"
   }
-}
+}
diff --git a/packages/plugin-pha/src/constants.ts b/packages/plugin-pha/src/constants.ts
@@ -1,5 +1,6 @@
 // Keys of appConfig  need transform to manifest.
 export const decamelizeKeys = [
+  'title',
   'name',
   'startUrl',
   'shortName',

diff --git a/packages/plugin-pha/src/index.ts b/packages/plugin-pha/src/index.ts
@@ -52,11 +52,13 @@ const plugin: Plugin<PluginOptions> = (options) => ({
       getAppConfig = restAPI.getAppConfig;
       getRoutesConfig = restAPI.getRoutesConfig;
 
+      const urlForTerminal = urls.lanUrlForTerminal || urls.localUrlForTerminal;
+
       // Need absolute path for pha dev.
-      publicPath = command === 'start' ? getDevPath(urls.lanUrlForTerminal) : (taskConfig.publicPath || '/');
+      publicPath = command === 'start' ? getDevPath(urlForTerminal) : (taskConfig.publicPath || '/');
 
       // process.env.DEPLOY_PATH is defined by cloud environment such as DEF plugin.
-      urlPrefix = command === 'start' ? urls.lanUrlForTerminal : process.env.DEPLOY_PATH;
+      urlPrefix = command === 'start' ? urlForTerminal : process.env.DEPLOY_PATH;
 
       compiler = async (options) => {
         const { entry, outfile, minify = false } = options;
@@ -94,13 +96,13 @@ const plugin: Plugin<PluginOptions> = (options) => ({
       const { phaManifest } = appConfig || {};
       const phaDevUrls = [];
       if (phaManifest?.tabBar) {
-        phaDevUrls.push(`${lanUrl}manifest.json`);
+        phaDevUrls.push(`${lanUrl}manifest.json?pha=true`);
       } else if (phaManifest?.routes?.length > 0) {
         phaManifest.routes.forEach((route) => {
           if (typeof route === 'string') {
-            phaDevUrls.push(`${lanUrl}${route}-manifest.json`);
+            phaDevUrls.push(`${lanUrl}${route}-manifest.json?pha=true`);
           } else if (typeof route?.frames![0] === 'string') {
-            phaDevUrls.push(`${lanUrl}${route.frames[0]}-manifest.json`);
+            phaDevUrls.push(`${lanUrl}${route.frames[0]}-manifest.json?pha=true`);
           }
         });
       }

diff --git a/packages/plugin-pha/src/manifestHelpers.ts b/packages/plugin-pha/src/manifestHelpers.ts
@@ -96,7 +96,11 @@ function getPageUrl(routeId: string, options: ParseOptions) {
   return `${urlPrefix}${splitCharacter}${routeId}${urlSuffix}`;
 }
 
-async function getPageConfig(routeId: string, routeManifest: string, routesConfig: Record<string, any>): Promise<MixedPage> {
+async function getPageConfig(
+  routeId: string,
+  routeManifest: string,
+  routesConfig: Record<string, any>,
+): Promise<MixedPage> {
   const routes = fs.readFileSync(routeManifest, 'utf-8');
   const matches = matchRoutes(JSON.parse(routes), routeId.startsWith('/') ? routeId : `/${routeId}`);
   let routeConfig: MixedPage = {};

diff --git a/packages/runtime/CHANGELOG.md b/packages/runtime/CHANGELOG.md
@@ -1,5 +1,10 @@
 # @ice/runtime
 
+## v1.0.2
+
+- [fix] window context merge order
+- [feat] support custom document components
+
 ## v1.0.1
 
 - [fix] merge window context

diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ice/runtime",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "type": "module",
   "types": "./esm/index.d.ts",
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,6 +53,5 @@ compiled @@
     .docusaurus
     .cache-loader
-    .env
     *.local
     .fleet/