fix(builder-cli): load provider based on package.json

web-infra-dev · Oct 16, 2023 · be1b8ef · be1b8ef
1 parent a777c9a
commit be1b8ef
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/.changeset/wild-zoos-type.md b/.changeset/wild-zoos-type.md
@@ -0,0 +1,7 @@
+---
+'@modern-js/builder': patch
+---
+
+fix(builder-cli): load provider based on package.json
+
+fix(builder-cli): 优先基于 package.json 加载 provider
diff --git a/packages/builder/builder/src/cli/provider.ts b/packages/builder/builder/src/cli/provider.ts
@@ -1,13 +1,27 @@
 import { RSPACK_PROVIDER, WEBPACK_PROVIDER } from '@modern-js/builder-shared';
-import { isPackageInstalled } from '@modern-js/utils';
+import { fs, isPackageInstalled } from '@modern-js/utils';
+import path from 'path';
 
 export function getProviderType() {
   const root = process.cwd();
+  const pkgJsonPath = path.join(root, 'package.json');
+  const pkgJson = fs.readJSONSync(pkgJsonPath);
+  const deps = {
+    ...pkgJson.dependencies,
+    ...pkgJson.devDependencies,
+  };
 
-  if (isPackageInstalled(RSPACK_PROVIDER, root)) {
+  // Judging based on package.json, this is more accurate
+  if (deps[RSPACK_PROVIDER]) {
     return 'rspack';
   }
+  if (deps[WEBPACK_PROVIDER]) {
+    return 'webpack';
+  }
 
+  if (isPackageInstalled(RSPACK_PROVIDER, root)) {
+    return 'rspack';
+  }
   if (isPackageInstalled(WEBPACK_PROVIDER, root)) {
     return 'webpack';
   }