fix: auto detect deno.json for globbed slugs (#2852)

supabase · Nov 8, 2024 · a062a45 · a062a45
1 parent 136b6ae
commit a062a45
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/internal/functions/deploy/deploy.go b/internal/functions/deploy/deploy.go
@@ -82,13 +82,22 @@ func GetFunctionConfig(slugs []string, importMapPath string, noVerifyJWT *bool,
 	for _, name := range slugs {
 		function := utils.Config.Functions[name]
 		// Precedence order: flag > config > fallback
+		functionDir := filepath.Join(utils.FunctionsDir, name)
 		if len(function.Entrypoint) == 0 {
-			function.Entrypoint = filepath.Join(utils.FunctionsDir, name, "index.ts")
+			function.Entrypoint = filepath.Join(functionDir, "index.ts")
 		}
 		if len(importMapPath) > 0 {
 			function.ImportMap = importMapPath
-		} else if len(function.ImportMap) == 0 && fallbackExists {
-			function.ImportMap = utils.FallbackImportMapPath
+		} else if len(function.ImportMap) == 0 {
+			denoJsonPath := filepath.Join(functionDir, "deno.json")
+			denoJsoncPath := filepath.Join(functionDir, "deno.jsonc")
+			if _, err := fsys.Stat(denoJsonPath); err == nil {
+				function.ImportMap = denoJsonPath
+			} else if _, err := fsys.Stat(denoJsoncPath); err == nil {
+				function.ImportMap = denoJsoncPath
+			} else if fallbackExists {
+				function.ImportMap = utils.FallbackImportMapPath
+			}
 		}
 		if noVerifyJWT != nil {
 			function.VerifyJWT = cast.Ptr(!*noVerifyJWT)

diff --git a/pkg/config/db.go b/pkg/config/db.go
@@ -148,8 +148,6 @@ func (a *settings) ToPostgresConfig() string {
 	// using toml, then replace double quotes with single.
 	data, _ := ToTomlBytes(*a)
 	body := bytes.ReplaceAll(data, []byte{'"'}, []byte{'\''})
-	body = bytes.ReplaceAll(body, []byte("= true"), []byte("= on"))
-	body = bytes.ReplaceAll(body, []byte("= false"), []byte("= off"))
 	return pgConfHeader + string(body)
 }