fix: bump rspack version

alibaba · Nov 13, 2023 · 67d1f3d · 67d1f3d
1 parent 37008a3
commit 67d1f3d
Show file tree

Hide file tree

Showing 6 changed files with 372 additions and 661 deletions.
diff --git a/packages/bundles/package.json b/packages/bundles/package.json
@@ -33,8 +33,8 @@
     "react-refresh": "0.14.0",
     "core-js-pure": "^3.8.1",
     "error-stack-parser": "^2.0.6",
-    "@rspack/core": "0.3.6",
-    "@rspack/dev-server": "0.3.6",
+    "@rspack/core": "0.3.11",
+    "@rspack/dev-server": "0.3.11",
     "@ice/css-modules-hash": "0.0.6"
   },
   "devDependencies": {

diff --git a/packages/ice/package.json b/packages/ice/package.json
@@ -101,8 +101,8 @@
     "unplugin": "^1.5.0",
     "webpack": "^5.88.0",
     "webpack-dev-server": "^4.7.4",
-    "@rspack/core": "0.3.6",
-    "@rspack/dev-server": "0.3.6"
+    "@rspack/core": "0.3.11",
+    "@rspack/dev-server": "0.3.11"
   },
   "peerDependencies": {
     "react": ">=18.0.0",

diff --git a/packages/ice/src/bundler/rspack/getConfig.ts b/packages/ice/src/bundler/rspack/getConfig.ts
@@ -71,9 +71,9 @@ const getConfig: GetConfig = async (context, options, rspack) => {
       }),
     ].filter(Boolean);
   };
-  return taskConfigs.map(({ config }) => {
+  return await Promise.all(taskConfigs.map(async ({ config }) => {
     const plugins = getPlugins(config);
-    return getRspackConfig({
+    return await getRspackConfig({
       rootDir,
       rspack,
       runtimeTmpDir: RUNTIME_TMP_DIR,
@@ -89,7 +89,7 @@ const getConfig: GetConfig = async (context, options, rspack) => {
         plugins: (config.plugins || []).concat(plugins),
       },
     });
-  });
+  }));
 };
 
 

diff --git a/packages/rspack-config/package.json b/packages/rspack-config/package.json
@@ -19,7 +19,7 @@
     "@ice/bundles": "0.1.17"
   },
   "devDependencies": {
-    "@rspack/core": "0.3.6"
+    "@rspack/core": "0.3.11"
   },
   "scripts": {
     "watch": "tsc -w --sourceMap",

diff --git a/packages/rspack-config/src/index.ts b/packages/rspack-config/src/index.ts
@@ -22,11 +22,11 @@ interface GetRspackConfigOptions {
 
 type GetConfig = (
   options: GetRspackConfigOptions,
-) => Configuration;
+) => Promise<Configuration>;
 
 const require = createRequire(import.meta.url);
 
-const getConfig: GetConfig = (options) => {
+const getConfig: GetConfig = async (options) => {
   const {
     rootDir,
     taskConfig,
@@ -75,6 +75,7 @@ const getConfig: GetConfig = (options) => {
     enableEnv: true,
     getRoutesFile,
   });
+  const { DefinePlugin, ProvidePlugin } = await import('@ice/bundles/esm/rspack.js');
   const cssFilename = `css/${hashKey ? `[name]-[${hashKey}].css` : '[name].css'}`;
   // get compile plugins
   const compilerWebpackPlugins = getCompilerPlugins(rootDir, taskConfig || {}, 'rspack', { isServer: false });
@@ -136,13 +137,13 @@ const getConfig: GetConfig = (options) => {
         fileName: 'assets-manifest.json',
         outputDir: path.join(rootDir, runtimeTmpDir),
       }),
-    ].filter(Boolean),
-    builtins: {
-      define: getDefineVars(define, runtimeDefineVars, getExpandedEnvs),
-      provide: {
+      new DefinePlugin(getDefineVars(define, runtimeDefineVars, getExpandedEnvs)),
+      new ProvidePlugin({
         process: [require.resolve('process/browser')],
         $ReactRefreshRuntime$: [require.resolve('./client/reactRefresh.cjs')],
-      },
+      }),
+    ].filter(Boolean),
+    builtins: {
       devFriendlySplitChunks: true,
       css: {
         modules: { localIdentName },