Fixes of Bun planner (#392)

#### Description (required) - **fix(planner/bun): Add more determinations** - **fix(planner/nodejs): Remove bunVersion fallback if bun is disabled** - **chore: Update snapshot** #### Related issues & labels (optional) - Suggested label: bug
zeabur · Nov 30, 2024 · f5cf727 · f5cf727
2 parents cc96ee4 + a1a6c9d
commit f5cf727
Show file tree

Hide file tree

Showing 27 changed files with 36 additions and 40 deletions.
diff --git a/internal/bun/identify.go b/internal/bun/identify.go
@@ -22,22 +22,40 @@ func (i *identify) PlanType() types.PlanType {
 }
 
 func (i *identify) Match(fs afero.Fs) bool {
-	hasPackageJSON := utils.HasFile(fs, "package.json")
-	hasBunLockfile := utils.HasFile(fs, "bun.lockb")
-	hasBunTypes := false
-
-	packageJSON, err := utils.ReadFileToUTF8(fs, "package.json")
-	if err == nil {
-		hasBunTypes = bytes.Contains(packageJSON, []byte(`"bun-types"`))
+	strategies := []func() bool{
+		// has bun lockfile
+		func() bool {
+			return utils.HasFile(fs, "bun.lockb")
+		},
+		// has .bun-version
+		func() bool {
+			return utils.HasFile(fs, ".bun-version")
+		},
+		// has bun types
+		func() bool {
+			packageJSON, err := utils.ReadFileToUTF8(fs, "package.json")
+			if err != nil {
+				return false
+			}
+			return bytes.Contains(packageJSON, []byte(`"bun-types"`))
+		},
+		// has bun@ (engine)
+		func() bool {
+			packageJSON, err := utils.ReadFileToUTF8(fs, "package.json")
+			if err != nil {
+				return false
+			}
+			return bytes.Contains(packageJSON, []byte(`bun@`))
+		},
 	}
 
-	// Some developer use bun as package manager for their Next.js project.
-	// In this case, we should treat it as a Node.js project.
-	if bytes.Contains(packageJSON, []byte(`"next"`)) {
-		return false
+	for _, strategy := range strategies {
+		if strategy() {
+			return true
+		}
 	}
 
-	return hasPackageJSON && (hasBunLockfile || hasBunTypes)
+	return false
 }
 
 func (i *identify) PlanMeta(options plan.NewPlannerOptions) types.PlanMeta {

diff --git a/internal/nodejs/plan.go b/internal/nodejs/plan.go
@@ -1020,8 +1020,10 @@ func GetMeta(opt GetMetaOptions) types.PlanMeta {
 	}
 
 	meta := types.PlanMeta{
-		"bun":        strconv.FormatBool(opt.Bun),
-		"bunVersion": "latest",
+		"bun": strconv.FormatBool(opt.Bun),
+	}
+	if opt.Bun {
+		meta["bunVersion"] = "latest"
 	}
 
 	_, reldir := ctx.GetAppSource()

diff --git a/tests/snapshots/bun-nextjs.txt b/tests/snapshots/bun-nextjs.txt
@@ -1,9 +1,9 @@
-PlanType: nodejs
+PlanType: bun
 
 Meta:
   appDir: ""
   buildCmd: "bun run build"
-  bun: "false"
+  bun: "true"
   bunVersion: "latest"
   framework: "next.js"
   installCmd: "COPY . .\nRUN bun install"

diff --git a/tests/snapshots/node-astro.txt b/tests/snapshots/node-astro.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "astro"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/node-sveltekit.txt b/tests/snapshots/node-sveltekit.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "svelte"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-a-lot-of-dependencies.txt b/tests/snapshots/nodejs-a-lot-of-dependencies.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: ""
   bun: "false"
-  bunVersion: "latest"
   framework: "next.js"
   installCmd: "COPY . .\nRUN yarn install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-angular.txt b/tests/snapshots/nodejs-angular.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "npm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "angular"
   installCmd: "COPY . .\nRUN npm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-docusaurus.txt b/tests/snapshots/nodejs-docusaurus.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "docusaurus"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "16"

diff --git a/tests/snapshots/nodejs-expressjs.txt b/tests/snapshots/nodejs-expressjs.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "none"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-foal.txt b/tests/snapshots/nodejs-foal.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "none"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "18"

diff --git a/tests/snapshots/nodejs-nestjs.txt b/tests/snapshots/nodejs-nestjs.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "nest.js"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-nextjs.txt b/tests/snapshots/nodejs-nextjs.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "next.js"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-nuejs.txt b/tests/snapshots/nodejs-nuejs.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: ""
   bun: "false"
-  bunVersion: "latest"
   framework: "nuejs"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-nuxtjs.txt b/tests/snapshots/nodejs-nuxtjs.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "NITRO_PRESET=node pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "nuxt.js"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-payload.txt b/tests/snapshots/nodejs-payload.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "yarn build"
   bun: "false"
-  bunVersion: "latest"
   framework: "next.js"
   installCmd: "COPY . .\nRUN yarn install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-qwik-city.txt b/tests/snapshots/nodejs-qwik-city.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "npm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "qwik"
   installCmd: "COPY . .\nRUN npm install"
   nodeVersion: "15"

diff --git a/tests/snapshots/nodejs-remix.txt b/tests/snapshots/nodejs-remix.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "remix"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "18"

diff --git a/tests/snapshots/nodejs-rspress.txt b/tests/snapshots/nodejs-rspress.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "rspress"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-slidev.txt b/tests/snapshots/nodejs-slidev.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "sli.dev"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-starlight.txt b/tests/snapshots/nodejs-starlight.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "astro-starlight"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-sveltekit-v2.txt b/tests/snapshots/nodejs-sveltekit-v2.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "npm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "svelte"
   installCmd: "COPY . .\nRUN npm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-umi.txt b/tests/snapshots/nodejs-umi.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "umi"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-vite-vanilla.txt b/tests/snapshots/nodejs-vite-vanilla.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "yarn build"
   bun: "false"
-  bunVersion: "latest"
   framework: "vite"
   installCmd: "COPY . .\nRUN yarn install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-vitepress.txt b/tests/snapshots/nodejs-vitepress.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run docs:build"
   bun: "false"
-  bunVersion: "latest"
   framework: "vitepress"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-vocs.txt b/tests/snapshots/nodejs-vocs.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "vocs"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/nodejs-waku.txt b/tests/snapshots/nodejs-waku.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "pnpm run build"
   bun: "false"
-  bunVersion: "latest"
   framework: "waku"
   installCmd: "COPY . .\nRUN pnpm install"
   nodeVersion: "20"

diff --git a/tests/snapshots/static-hexo.txt b/tests/snapshots/static-hexo.txt
@@ -4,7 +4,6 @@ Meta:
   appDir: ""
   buildCmd: "yarn build"
   bun: "false"
-  bunVersion: "latest"
   framework: "hexo"
   installCmd: "COPY . .\nRUN yarn install"
   nodeVersion: "20"