fix: improve bun support

WillBooster · Aug 15, 2024 · b31fa33 · b31fa33
1 parent feda7cb
commit b31fa33
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/generators/packageJson.ts b/src/generators/packageJson.ts
@@ -205,6 +205,9 @@ async function core(config: PackageConfig, rootConfig: PackageConfig, skipAdding
   ) {
     if (config.isBun) {
       devDependencies.push('@biomejs/biome', '@willbooster/biome-config');
+      delete jsonObj.devDependencies['eslint'];
+      delete jsonObj.devDependencies['micromatch'];
+      delete jsonObj.devDependencies['@typescript-eslint/parser'];
     } else {
       devDependencies.push('[email protected]', 'micromatch');
       // TODO: not needed anymore?
@@ -363,7 +366,7 @@ async function core(config: PackageConfig, rootConfig: PackageConfig, skipAdding
   if (!skipAddingDeps) {
     // We cannot add dependencies which are already included in devDependencies.
     dependencies = dependencies.filter((dep) => !jsonObj.devDependencies?.[dep]);
-    const packageManager = rootConfig.isBun ? 'bun' : 'yarn';
+    const packageManager = config.isBun ? 'bun' : 'yarn';
     if (dependencies.length > 0) {
       spawnSync(packageManager, ['add', ...new Set(dependencies)], config.dirPath);
     }

diff --git a/src/index.ts b/src/index.ts
@@ -92,7 +92,9 @@ async function main(): Promise<void> {
     }
     const abbreviationPromise = fixTypos(rootConfig);
 
-    const nullableSubPackageConfigs = await Promise.all(subDirPaths.map((subDirPath) => getPackageConfig(subDirPath)));
+    const nullableSubPackageConfigs = await Promise.all(
+      subDirPaths.map((subDirPath) => getPackageConfig(subDirPath, rootConfig))
+    );
     const subPackageConfigs = nullableSubPackageConfigs.filter((config) => !!config) as PackageConfig[];
     const allPackageConfigs = [rootConfig, ...subPackageConfigs];
 

diff --git a/src/packageConfig.ts b/src/packageConfig.ts
@@ -73,7 +73,10 @@ const wbfyJsonSchema = z.object({
     .optional(),
 });
 
-export async function getPackageConfig(dirPath: string): Promise<PackageConfig | undefined> {
+export async function getPackageConfig(
+  dirPath: string,
+  rootConfig?: PackageConfig
+): Promise<PackageConfig | undefined> {
   const packageJsonPath = path.resolve(dirPath, 'package.json');
   try {
     const doesContainsPackageJson = fs.existsSync(packageJsonPath);
@@ -156,7 +159,7 @@ export async function getPackageConfig(dirPath: string): Promise<PackageConfig |
       isPublicRepo: repoInfo?.private === false,
       isReferredByOtherRepo: !!packageJson.files,
       repository: repoInfo?.full_name ? `github:${repoInfo?.full_name}` : undefined,
-      isBun: fs.existsSync(path.join(dirPath, 'bunfig.toml')),
+      isBun: rootConfig?.isBun || fs.existsSync(path.join(dirPath, 'bunfig.toml')),
       isEsmPackage: esmPackage,
       isWillBoosterConfigs: packageJsonPath.includes(`${path.sep}willbooster-configs`),
       doesContainsSubPackageJsons: containsAny('packages/**/package.json', dirPath),