fix: add dependencies to bundles

alibaba · Aug 15, 2023 · 8d91b58 · 8d91b58
1 parent 3dbd20b
commit 8d91b58
Show file tree

Hide file tree

Showing 9 changed files with 245 additions and 108 deletions.
diff --git a/packages/bundles/package.json b/packages/bundles/package.json
@@ -32,7 +32,10 @@
     "sass": "1.50.0",
     "react-refresh": "0.14.0",
     "core-js-pure": "^3.8.1",
-    "error-stack-parser": "^2.0.6"
+    "error-stack-parser": "^2.0.6",
+    "@rspack/core": "0.2.12",
+    "@rspack/dev-server": "0.2.12",
+    "@ice/css-modules-hash": "0.0.6"
   },
   "devDependencies": {
     "@types/less": "^3.0.3",

diff --git a/packages/bundles/src/dev-server.ts b/packages/bundles/src/dev-server.ts
@@ -0,0 +1 @@
+export * from '@rspack/dev-server';
diff --git a/packages/bundles/src/index.ts b/packages/bundles/src/index.ts
@@ -6,6 +6,7 @@ import sass from 'sass';
 import swc from '@swc/core';
 import esbuild from 'esbuild';
 import * as caniuseLite from 'caniuse-lite';
+import { getCssModulesLocalIdent } from '@ice/css-modules-hash';
 
 const require = createRequire(import.meta.url);
 const swcPluginRemoveExport = require.resolve('@ice/swc-plugin-remove-export');
@@ -26,6 +27,7 @@ export {
 
   esbuild,
   caniuseLite,
+  getCssModulesLocalIdent,
 };
 
 export type { ProcessOptions } from 'postcss';

diff --git a/packages/bundles/src/rspack.ts b/packages/bundles/src/rspack.ts
@@ -0,0 +1 @@
+export * from '@rspack/core';
diff --git a/packages/ice/package.json b/packages/ice/package.json
@@ -38,9 +38,6 @@
   "dependencies": {
     "@ice/bundles": "0.1.12",
     "@ice/route-manifest": "1.2.0",
-    "@rspack/core": "0.2.10",
-    "@rspack/dev-server": "0.2.10",
-    "@ice/css-modules-hash": "0.0.6",
     "@ice/runtime": "^1.2.7",
     "@ice/webpack-config": "1.0.19",
     "@swc/helpers": "0.5.1",
@@ -88,7 +85,9 @@
     "sass": "^1.50.0",
     "unplugin": "^0.9.0",
     "webpack": "^5.86.0",
-    "webpack-dev-server": "^4.7.4"
+    "webpack-dev-server": "^4.7.4",
+    "@rspack/core": "0.2.12",
+    "@rspack/dev-server": "0.2.12"
   },
   "peerDependencies": {
     "react": ">=18.0.0",

diff --git a/packages/ice/src/bundler/rspack/index.ts b/packages/ice/src/bundler/rspack/index.ts
@@ -28,7 +28,7 @@ async function bundler(
   let compiler: MultiCompiler;
   let devServer: RspackDevServer;
   try {
-    const { rspack } = await import('@rspack/core');
+    const { rspack } = await import('@ice/bundles/esm/rspack.js');
     compiler = rspack(rspackConfigs);
   } catch (error) {
     logger.error('Webpack compile error.');

diff --git a/packages/ice/src/bundler/rspack/start.ts b/packages/ice/src/bundler/rspack/start.ts
@@ -46,7 +46,7 @@ const start = async ({
     devServerConfig,
   });
 
-  const { RspackDevServer } = await import('@rspack/dev-server');
+  const { RspackDevServer } = await import('@ice/bundles/esm/dev-server.js');
   const devServer = new RspackDevServer(devServerConfig, compiler);
 
   compiler.hooks.done.tap('done', async stats => {

diff --git a/packages/ice/src/utils/getCSSModuleIdent.ts b/packages/ice/src/utils/getCSSModuleIdent.ts
@@ -1,6 +1,6 @@
 import * as path from 'path';
 import { getCSSModuleLocalIdent } from '@ice/webpack-config';
-import { getCssModulesLocalIdent as getIdentByRust } from '@ice/css-modules-hash';
+import { getCssModulesLocalIdent as getIdentByRust } from '@ice/bundles';
 import { CSS_MODULES_LOCAL_IDENT_NAME, CSS_MODULES_LOCAL_IDENT_NAME_DEV } from '../constant.js';
 import escapeLocalIdent from '../utils/escapeLocalIdent.js';