Merge branch 'release/next' into feat/rspack

alibaba · Aug 21, 2023 · e0100a2 · e0100a2
2 parents 99d670c + 1dbcfa5
commit e0100a2
Show file tree

Hide file tree

Showing 40 changed files with 524 additions and 570 deletions.
diff --git a/.changeset/late-trains-relate.md b/.changeset/late-trains-relate.md
@@ -0,0 +1,5 @@
+---
+'@ice/bundles': patch
+---
+
+fix: bump @swc/core, webpack, swc plugins, core-js version
diff --git a/examples/app-config/package.json b/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.86.0"
+    "webpack": "^5.88.0"
   }
 }
diff --git a/examples/basic-project/package.json b/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.86.0"
+    "webpack": "^5.88.0"
   }
 }
diff --git a/examples/cavans-project/package.json b/examples/cavans-project/package.json
@@ -20,6 +20,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "webpack": "^5.86.0"
+    "webpack": "^5.88.0"
   }
 }
diff --git a/examples/csr-project/package.json b/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.86.0"
+    "webpack": "^5.88.0"
   }
 }
diff --git a/examples/disable-data-loader/package.json b/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.86.0"
+    "webpack": "^5.88.0"
   }
 }
diff --git a/examples/miniapp-project/package.json b/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.86.0"
+    "webpack": "^5.88.0"
   }
 }
diff --git a/examples/rax-inline-style/package.json b/examples/rax-inline-style/package.json
@@ -24,6 +24,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
-    "webpack": "^5.86.0"
+    "webpack": "^5.88.0"
   }
 }
diff --git a/examples/rax-project/package.json b/examples/rax-project/package.json
@@ -26,6 +26,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
-    "webpack": "^5.86.0"
+    "webpack": "^5.88.0"
   }
 }
diff --git a/examples/with-entry-type/package.json b/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.86.0"
+    "webpack": "^5.88.0"
   }
 }
diff --git a/examples/with-nested-routes/package.json b/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.86.0"
+    "webpack": "^5.88.0"
   }
 }
diff --git a/examples/with-pha/package.json b/examples/with-pha/package.json
@@ -19,6 +19,6 @@
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.2",
-    "webpack": "^5.86.0"
+    "webpack": "^5.88.0"
   }
 }
diff --git a/packages/bundles/package.json b/packages/bundles/package.json
@@ -15,13 +15,13 @@
   "main": "./esm/index.js",
   "type": "module",
   "dependencies": {
-    "@swc/core": "1.3.19",
-    "@ice/swc-plugin-remove-export": "0.1.2",
-    "@ice/swc-plugin-keep-export": "0.1.4-2",
-    "@ice/swc-plugin-node-transform": "0.1.0-8",
+    "@swc/core": "1.3.77",
+    "@ice/swc-plugin-remove-export": "0.2.0",
+    "@ice/swc-plugin-keep-export": "0.2.0",
+    "@ice/swc-plugin-node-transform": "0.2.0",
     "ansi-html-community": "^0.0.8",
     "html-entities": "^2.3.2",
-    "core-js": "3.29.1",
+    "core-js": "3.32.0",
     "caniuse-lite": "^1.0.30001431",
     "chokidar": "3.5.3",
     "esbuild": "^0.17.16",
@@ -68,7 +68,7 @@
     "terser-webpack-plugin": "5.3.5",
     "typescript": "^4.6.4",
     "trusted-cert": "1.1.3",
-    "webpack": "5.86.0",
+    "webpack": "5.88.2",
     "webpack-bundle-analyzer": "4.5.0",
     "webpack-dev-server": "4.15.0",
     "unplugin": "0.9.5",

diff --git a/packages/ice/package.json b/packages/ice/package.json
@@ -86,7 +86,7 @@
     "react-router": "6.14.2",
     "sass": "^1.50.0",
     "unplugin": "^0.9.0",
-    "webpack": "^5.86.0",
+    "webpack": "^5.88.0",
     "webpack-dev-server": "^4.7.4",
     "@rspack/core": "0.2.12",
     "@rspack/dev-server": "0.2.12"

diff --git a/packages/ice/src/bundler/webpack/start.ts b/packages/ice/src/bundler/webpack/start.ts
@@ -33,7 +33,6 @@ export async function startDevServer(
     a.split('/').filter(Boolean).length - b.split('/').filter(Boolean).length);
   const webTaskConfig = taskConfigs.find(({ name }) => name === WEB);
   const customMiddlewares = webpackConfigs[0].devServer?.setupMiddlewares;
-  // @ts-expect-error
   const defaultDevServerConfig = await getDefaultServerConfig(webpackConfigs[0].devServer, commandArgs);
   let devServerConfig: DevServerConfiguration = {
     ...defaultDevServerConfig,
@@ -47,7 +46,6 @@ export async function startDevServer(
         mock: commandArgs.mock,
         rootDir,
       });
-      // @ts-expect-error
       return customMiddlewares ? customMiddlewares(builtInMiddlewares, devServer) : builtInMiddlewares;
     },
   };

diff --git a/packages/ice/src/webpack/ServerCompilerPlugin.ts b/packages/ice/src/webpack/ServerCompilerPlugin.ts
@@ -60,6 +60,7 @@ export default class ServerCompilerPlugin {
     compiler.hooks.watchRun.tap(pluginName, () => {
       this.isCompiling = true;
     });
+    // @ts-expect-error webpack hooks type not match.
     compiler.hooks.emit.tapPromise(pluginName, async (compilation: Compilation) => {
       this.isCompiling = false;
       await this.compileTask(compilation);

diff --git a/packages/jsx-runtime/build.config.mts b/packages/jsx-runtime/build.config.mts
@@ -1,10 +1,6 @@
 import { defineConfig } from '@ice/pkg';
 
 export default defineConfig({
-  bundle: {
-    filename: 'jsx-runtime',
-    formats: ['umd'],
-  },
   transform: {
     formats: ['esm'],
   },

diff --git a/packages/jsx-runtime/package.json b/packages/jsx-runtime/package.json
@@ -37,7 +37,7 @@
     "style-unit": "^3.0.4"
   },
   "devDependencies": {
-    "@ice/pkg": "1.1.2-0",
+    "@ice/pkg": "^1.5.0",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "react": "^18.0.0",

diff --git a/packages/miniapp-loader/package.json b/packages/miniapp-loader/package.json
@@ -21,7 +21,7 @@
     "@ice/bundles": "^0.1.10"
   },
   "devDependencies": {
-    "webpack": "^5.86.0"
+    "webpack": "^5.88.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/plugin-cavans/package.json b/packages/plugin-cavans/package.json
@@ -32,7 +32,7 @@
   },
   "devDependencies": {
     "@ice/app": "^3.2.10",
-    "webpack": "^5.86.0",
+    "webpack": "^5.88.0",
     "@ice/runtime": "^1.2.5"
   },
   "repository": {

diff --git a/packages/plugin-i18n/package.json b/packages/plugin-i18n/package.json
@@ -46,7 +46,7 @@
     "url-join": "^5.0.0"
   },
   "devDependencies": {
-    "@ice/pkg": "^1.0.0",
+    "@ice/pkg": "^1.5.0",
     "@ice/app": "workspace:^",
     "@ice/runtime": "workspace:^",
     "@remix-run/router": "^1.6.1",

diff --git a/packages/plugin-miniapp/package.json b/packages/plugin-miniapp/package.json
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@ice/app": "^3.2.6",
     "@ice/runtime": "^1.2.4",
-    "webpack": "^5.86.0"
+    "webpack": "^5.88.0"
   },
   "repository": {
     "type": "http",

diff --git a/packages/plugin-miniapp/src/miniapp/index.ts b/packages/plugin-miniapp/src/miniapp/index.ts
@@ -79,7 +79,7 @@ const getMiniappTask = ({
     // FIXME: enable cache will cause error, disable it temporarily
     enableCache: false,
     plugins,
-    loaders: module.rules,
+    loaders: module?.rules,
     optimization: {
       sideEffects: true,
       usedExports: true,

diff --git a/packages/plugin-miniapp/src/types.ts b/packages/plugin-miniapp/src/types.ts
@@ -44,4 +44,7 @@ export interface MiniappWebpackOptions {
   nativeConfig: Record<string, any>;
 }
 
-export type MiniappWebpackConfig = Pick<webpack.Configuration, 'plugins' | 'module'>;
+export interface MiniappWebpackConfig {
+  plugins: Config['plugins'];
+  module: webpack.Configuration['module'];
+}
diff --git a/packages/plugin-pha/package.json b/packages/plugin-pha/package.json
@@ -28,7 +28,7 @@
     "@ice/app": "^3.2.9",
     "build-scripts": "^2.1.2-0",
     "esbuild": "^0.17.16",
-    "webpack": "^5.86.0",
+    "webpack": "^5.88.0",
     "webpack-dev-server": "^4.9.2"
   },
   "repository": {

diff --git a/packages/plugin-rax-compat/package.json b/packages/plugin-rax-compat/package.json
@@ -32,7 +32,7 @@
   "devDependencies": {
     "@ice/app": "^3.2.8",
     "@types/lodash-es": "^4.17.7",
-    "webpack": "^5.86.0"
+    "webpack": "^5.88.0"
   },
   "repository": {
     "type": "http",
@@ -45,4 +45,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}
diff --git a/packages/rax-compat/package.json b/packages/rax-compat/package.json
@@ -54,7 +54,7 @@
     "@ice/appear": "^0.2.0"
   },
   "devDependencies": {
-    "@ice/pkg": "1.1.2-0",
+    "@ice/pkg": "^1.5.0",
     "@types/rax": "^1.0.8",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",

diff --git a/packages/rspack-config/package.json b/packages/rspack-config/package.json
@@ -16,7 +16,7 @@
   ],
   "dependencies": {
     "@ice/shared-config": "1.0.0",
-    "@ice/bundles": "0.1.12"
+    "@ice/bundles": "0.1.13"
   },
   "devDependencies": {
     "@rspack/core": "^0.2.12"

diff --git a/packages/shared-config/package.json b/packages/shared-config/package.json
@@ -17,7 +17,7 @@
     "*.d.ts"
   ],
   "dependencies": {
-    "@ice/bundles": "0.1.12",
+    "@ice/bundles": "0.1.13",
     "@rollup/pluginutils": "^4.2.0",
     "browserslist": "^4.19.3",
     "consola": "^2.15.3",

diff --git a/packages/shared-config/src/getCompilerPlugins.ts b/packages/shared-config/src/getCompilerPlugins.ts
@@ -1,7 +1,6 @@
 import unplugin from '@ice/bundles/compiled/unplugin/index.js';
 import type { BuildOptions } from 'esbuild';
 import type { UnpluginOptions } from '@ice/bundles/compiled/unplugin/index.js';
-import type { Configuration } from 'webpack';
 import type { Config } from './types.js';
 import compilationPlugin from './unPlugins/compilation.js';
 import redirectImportPlugin from './unPlugins/redirectImport.js';
@@ -32,7 +31,7 @@ function transformInclude(id: string) {
   return !!id.match(/\.(js|jsx|ts|tsx|mjs|mts|css|less|scss)$/);
 }
 
-function getCompilerPlugins(rootDir: string, config: Config, compiler: 'webpack', transformOptions: TransformOptions): Configuration['plugins'];
+function getCompilerPlugins(rootDir: string, config: Config, compiler: 'webpack', transformOptions: TransformOptions): Config['plugins'];
 function getCompilerPlugins(rootDir: string, config: Config, compiler: 'esbuild', transformOptions: TransformOptions): BuildOptions['plugins'];
 function getCompilerPlugins(rootDir: string, config: Config, compiler: Compiler, transformOptions: TransformOptions) {
   const {
@@ -91,7 +90,7 @@ function getCompilerPlugins(rootDir: string, config: Config, compiler: Compiler,
     // Plugins will be transformed as webpack loader, the execute order of webpack loader is reversed.
     ? compilerPlugins
         .reverse()
-        .map((plugin) => createUnplugin(() => getPluginTransform(plugin, transformOptions)).webpack())
+        .map((plugin) => createUnplugin(() => getPluginTransform(plugin, transformOptions)).webpack()) as Config['plugins']
     : compilerPlugins.map(plugin => getPluginTransform(plugin, transformOptions));
 }
 

diff --git a/packages/shared-config/src/types.ts b/packages/shared-config/src/types.ts
@@ -96,7 +96,7 @@ export interface Config {
 
   publicPath?: string;
 
-  loaders?: (RuleSetRule | '...')[];
+  loaders?: (undefined | null | false | '' | 0 | RuleSetRule | '...')[];
 
   plugins?: (
     | ((this: Compiler, compiler: Compiler) => void)

diff --git a/packages/shared-config/src/unPlugins/compilation.ts b/packages/shared-config/src/unPlugins/compilation.ts
@@ -226,7 +226,7 @@ function getJsxTransformOptions({
       loose: false,
       ...(polyfill ? {
         mode: polyfill,
-        coreJs: '3.29',
+        coreJs: '3.32',
       } : {}),
     };
     const supportBrowsers = getSupportedBrowsers(rootDir, mode === 'development');

diff --git a/packages/shared-config/src/utils/transformImport.ts b/packages/shared-config/src/utils/transformImport.ts
@@ -40,10 +40,11 @@ const transformImport = async (source: string, coreJsPath: string) => {
       if (!isESM) {
         // Replace @swc/helpers with cjs path.
         const importStr = source.substring(targetImport.ss, targetImport.se);
-        const matchImport = importStr.match(/import\s+([\w*\s{},]*)\s+from\s+['"](.*)['"]/);
+        // Import rule: import { _ as _type_of } from "@swc/helpers/_/_type_of";
+        const matchImport = importStr.match(/import\s+{\s+([\w*\s{},]*)\s+}\s+from\s+['"](.*)['"]/);
         if (matchImport) {
           const [,identifier] = matchImport;
-          const replaceModule = `var ${identifier} = require('${targetImport.n.replace(/@swc\/helpers\/src\/(.*).mjs$/,
+          const replaceModule = `var ${identifier.split('as')[1].trim()} = require('${targetImport.n.replace(/@swc\/helpers\/_\/(.*)$/,
             (_, matched) => `@swc/helpers/cjs/${matched}.cjs`)}')._`;
           str().overwrite(targetImport.ss, targetImport.se, replaceModule);
         }

diff --git a/packages/shared-config/tests/fixtures/transformImport/swc-esm.js b/packages/shared-config/tests/fixtures/transformImport/swc-esm.js
@@ -1 +1 @@
-import _object_spread from '@swc/helpers/src/_object_spread.mjs';import 'react';
+import { _ as _object_spread } from '@swc/helpers/_/_object_spread';import 'react';
diff --git a/packages/shared-config/tests/fixtures/transformImport/swc.js b/packages/shared-config/tests/fixtures/transformImport/swc.js
@@ -1 +1 @@
-import _object_spread from '@swc/helpers/src/_object_spread.mjs';module.exports = {};
+import { _ as _object_spread } from '@swc/helpers/_/_object_spread';module.exports = {};
diff --git a/packages/shared-config/tests/transformImport.test.ts b/packages/shared-config/tests/transformImport.test.ts
@@ -40,7 +40,7 @@ describe('transform core js path', () => {
   it('@swc/helpers esm', async () => {
     const orignalCode = fs.readFileSync(path.join(__dirname, './fixtures/transformImport/swc-esm.js'), 'utf-8');
     expect(await transformImport(orignalCode, coreJsPath))
-      .toBe('import _object_spread from \'@swc/helpers/src/_object_spread.mjs\';import \'react\';');
+      .toBe('import { _ as _object_spread } from \'@swc/helpers/_/_object_spread\';import \'react\';');
   });
   it('@swc/helpers cjs', async () => {
     const orignalCode = fs.readFileSync(path.join(__dirname, './fixtures/transformImport/swc.js'), 'utf-8');

diff --git a/packages/webpack-config/package.json b/packages/webpack-config/package.json
@@ -21,7 +21,7 @@
     "process": "^0.11.10"
   },
   "devDependencies": {
-    "webpack": "^5.86.0"
+    "webpack": "^5.88.0"
   },
   "scripts": {
     "watch": "tsc -w",

diff --git a/packages/webpack-modify/package.json b/packages/webpack-modify/package.json
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@ice/webpack-config": "^1.0.0",
-    "webpack": "^5.86.0"
+    "webpack": "^5.88.0"
   },
   "scripts": {
     "watch": "tsc -w",