fix: toggle DENO_NO_PACKAGE_JSON conditionally (#4372)

* fix: toggle `DENO_NO_PACKAGE_JSON` conditionally

* stamp: meowmeow

* stamp: meow!

* chore: update `main.ts`

* chore: update `main.ts`

* chore: move package json check to bundler

* fix: handle custom import map path

* chore: respect global default

---------

Co-authored-by: Qiao Han <qiao@supabase.io>

Author: nyannyacha

internal/functions/deploy/bundle.go

@@ -62,6 +62,9 @@ func (b *dockerBundler) Bundle(ctx context.Context, slug, entrypoint, importMap
 	cmd = append(cmd, function.BundleFlags...)
 
 	env := []string{}
+	if !function.ShouldUsePackageJsonDiscovery(entrypoint, importMap, afero.NewIOFS(b.fsys)) {
+		env = append(env, "DENO_NO_PACKAGE_JSON=1")
+	}
 	if custom_registry := os.Getenv("NPM_CONFIG_REGISTRY"); custom_registry != "" {
 		env = append(env, "NPM_CONFIG_REGISTRY="+custom_registry)
 	}

internal/functions/serve/templates/main.ts

@@ -116,6 +116,22 @@ async function verifyJWT(jwt: string): Promise<boolean> {
   return true;
 }
 
+// Ref: https://docs.deno.com/examples/checking_file_existence/
+async function shouldUsePackageJsonDiscovery({ entrypointPath, importMapPath }: FunctionConfig): Promise<boolean> {
+  if (importMapPath) {
+    return false
+  }
+  const packageJsonPath = posix.join(posix.dirname(entrypointPath), "package.json")
+  try {
+    await Deno.lstat(packageJsonPath);
+  } catch (err) {
+    if (err instanceof Deno.errors.NotFound) {
+      return false
+    }
+  }
+  return true
+}
+
 Deno.serve({
   handler: async (req: Request) => {
     const url = new URL(req.url);
@@ -178,6 +194,7 @@ Deno.serve({
 
     const absEntrypoint = posix.join(Deno.cwd(), functionsConfig[functionName].entrypointPath);
     const maybeEntrypoint = posix.toFileUrl(absEntrypoint).href;
+    const usePackageJson = await shouldUsePackageJsonDiscovery(functionsConfig[functionName]);
 
     const staticPatterns = functionsConfig[functionName].staticFiles;
 
@@ -187,6 +204,7 @@ Deno.serve({
         memoryLimitMb,
         workerTimeoutMs,
         noModuleCache,
+        noNpm: !usePackageJson,
         importMapPath: functionsConfig[functionName].importMapPath,
         envVars,
         forceCreate,

pkg/function/bundle.go

@@ -68,6 +68,9 @@ func (b *nativeBundler) Bundle(ctx context.Context, slug, entrypoint, importMap
 	cmd := exec.CommandContext(ctx, edgeRuntimeBin, args...)
 	cmd.Stderr = os.Stderr
 	cmd.Stdout = os.Stdout
+	if fsys, ok := b.fsys.(fs.StatFS); ok && !ShouldUsePackageJsonDiscovery(entrypoint, importMap, fsys) {
+		cmd.Env = append(cmd.Environ(), "DENO_NO_PACKAGE_JSON=1")
+	}
 	if err := cmd.Run(); err != nil {
 		return meta, errors.Errorf("failed to bundle function: %w", err)
 	}
@@ -81,6 +84,17 @@ func (b *nativeBundler) Bundle(ctx context.Context, slug, entrypoint, importMap
 	return meta, Compress(eszipBytes, output)
 }
 
+func ShouldUsePackageJsonDiscovery(entrypoint, importMap string, fsys fs.StatFS) bool {
+	if len(importMap) > 0 {
+		return false
+	}
+	packageJsonPath := filepath.Join(filepath.Dir(entrypoint), "package.json")
+	if _, err := fsys.Stat(packageJsonPath); errors.Is(err, os.ErrNotExist) {
+		return false
+	}
+	return true
+}
+
 const compressedEszipMagicID = "EZBR"
 
 func Compress(r io.Reader, w io.Writer) error {