fix: toggle DENO_NO_PACKAGE_JSON conditionally

Author: nyannyacha

internal/functions/deploy/bundle.go

@@ -25,7 +25,7 @@ func NewDockerBundler(fsys afero.Fs) function.EszipBundler {
 	return &dockerBundler{fsys: fsys}
 }
 
-func (b *dockerBundler) Bundle(ctx context.Context, slug, entrypoint, importMap string, staticFiles []string, output io.Writer) (function.FunctionDeployMetadata, error) {
+func (b *dockerBundler) Bundle(ctx context.Context, slug, entrypoint, importMap string, staticFiles []string, usePackageJson bool, output io.Writer) (function.FunctionDeployMetadata, error) {
 	meta := function.NewMetadata(slug, entrypoint, importMap, staticFiles)
 	fmt.Fprintln(os.Stderr, "Bundling Function:", utils.Bold(slug))
 	cwd, err := os.Getwd()
@@ -62,9 +62,18 @@ func (b *dockerBundler) Bundle(ctx context.Context, slug, entrypoint, importMap
 	cmd = append(cmd, function.BundleFlags...)
 
 	env := []string{}
+	denoNoPackageJsonValue := "1"
+	if usePackageJson {
+		denoNoPackageJsonValue = "0"
+	}
 	if custom_registry := os.Getenv("NPM_CONFIG_REGISTRY"); custom_registry != "" {
 		env = append(env, "NPM_CONFIG_REGISTRY="+custom_registry)
 	}
+	if deno_no_package_json := os.Getenv("DENO_NO_PACKAGE_JSON"); deno_no_package_json != "" {
+		env = append(env, "DENO_NO_PACKAGE_JSON="+deno_no_package_json)
+	} else {
+		env = append(env, "DENO_NO_PACKAGE_JSON="+denoNoPackageJsonValue)
+	}
 	// Run bundle
 	if err := utils.DockerRunOnceWithConfig(
 		ctx,

internal/functions/deploy/bundle_test.go

@@ -59,6 +59,7 @@ func TestDockerBundle(t *testing.T) {
 			filepath.Join("hello", "index.ts"),
 			filepath.Join("hello", "deno.json"),
 			[]string{filepath.Join("hello", "data.pdf")},
+			false,
 			&body,
 		)
 		// Check error
@@ -86,6 +87,7 @@ func TestDockerBundle(t *testing.T) {
 			"hello/index.ts",
 			"",
 			nil,
+			false,
 			nil,
 		)
 		// Check error

internal/functions/deploy/deploy.go

@@ -136,6 +136,12 @@ func GetFunctionConfig(slugs []string, importMapPath string, noVerifyJWT *bool,
 				functionsUsingDeprecatedGlobalFallback = append(functionsUsingDeprecatedGlobalFallback, name)
 			}
 		}
+		packageJsonPath := filepath.Join(functionDir, "package.json")
+		packageJsonExists := false
+		if _, err := fsys.Stat(packageJsonPath); err == nil {
+			packageJsonExists = true
+		}
+		function.UsePackageJson = len(function.ImportMap) == 0 && packageJsonExists
 		if noVerifyJWT != nil {
 			function.VerifyJWT = !*noVerifyJWT
 		}

pkg/config/config.go

@@ -200,11 +200,12 @@ type (
 	FunctionConfig map[string]function
 
 	function struct {
-		Enabled     bool   `toml:"enabled" json:"-"`
-		VerifyJWT   bool   `toml:"verify_jwt" json:"verifyJWT"`
-		ImportMap   string `toml:"import_map" json:"importMapPath,omitempty"`
-		Entrypoint  string `toml:"entrypoint" json:"entrypointPath,omitempty"`
-		StaticFiles Glob   `toml:"static_files" json:"staticFiles,omitempty"`
+		Enabled        bool   `toml:"enabled" json:"-"`
+		UsePackageJson bool   `toml:"-"`
+		VerifyJWT      bool   `toml:"verify_jwt" json:"verifyJWT"`
+		ImportMap      string `toml:"import_map" json:"importMapPath,omitempty"`
+		Entrypoint     string `toml:"entrypoint" json:"entrypointPath,omitempty"`
+		StaticFiles    Glob   `toml:"static_files" json:"staticFiles,omitempty"`
 	}
 
 	analytics struct {

pkg/function/api.go

@@ -24,7 +24,7 @@ type FunctionDeployMetadata struct {
 }
 
 type EszipBundler interface {
-	Bundle(ctx context.Context, slug, entrypoint, importMap string, staticFiles []string, output io.Writer) (FunctionDeployMetadata, error)
+	Bundle(ctx context.Context, slug, entrypoint, importMap string, staticFiles []string, usePackageJson bool, output io.Writer) (FunctionDeployMetadata, error)
 }
 
 func NewEdgeRuntimeAPI(project string, client api.ClientWithResponses, opts ...withOption) EdgeRuntimeAPI {

pkg/function/batch.go

@@ -60,7 +60,7 @@ OUTER:
 			}
 		}
 		var body bytes.Buffer
-		meta, err := s.eszip.Bundle(ctx, slug, function.Entrypoint, function.ImportMap, function.StaticFiles, &body)
+		meta, err := s.eszip.Bundle(ctx, slug, function.Entrypoint, function.ImportMap, function.StaticFiles, function.UsePackageJson, &body)
 		if errors.Is(err, ErrNoDeploy) {
 			fmt.Fprintln(os.Stderr, "Skipping undeployable Function:", slug)
 			continue

pkg/function/batch_test.go

@@ -18,7 +18,7 @@ import (
 type MockBundler struct {
 }
 
-func (b *MockBundler) Bundle(ctx context.Context, slug, entrypoint, importMap string, staticFiles []string, output io.Writer) (FunctionDeployMetadata, error) {
+func (b *MockBundler) Bundle(ctx context.Context, slug, entrypoint, importMap string, staticFiles []string, usePackageJson bool, output io.Writer) (FunctionDeployMetadata, error) {
 	if staticFiles == nil {
 		staticFiles = []string{}
 	}

pkg/function/bundle.go

@@ -48,7 +48,7 @@ var (
 	}
 )
 
-func (b *nativeBundler) Bundle(ctx context.Context, slug, entrypoint, importMap string, staticFiles []string, output io.Writer) (FunctionDeployMetadata, error) {
+func (b *nativeBundler) Bundle(ctx context.Context, slug, entrypoint, importMap string, staticFiles []string, usePackageJson bool, output io.Writer) (FunctionDeployMetadata, error) {
 	meta := NewMetadata(slug, entrypoint, importMap, staticFiles)
 	outputPath := filepath.Join(b.tempDir, slug+".eszip")
 	// TODO: make edge runtime write to stdout
@@ -65,9 +65,17 @@ func (b *nativeBundler) Bundle(ctx context.Context, slug, entrypoint, importMap
 		defer cancel() // release resources if command exits before timeout
 		ctx = timeoutCtx
 	}
+	denoNoPackageJsonValue := "1"
+	if usePackageJson {
+		denoNoPackageJsonValue = "0"
+	}
+
 	cmd := exec.CommandContext(ctx, edgeRuntimeBin, args...)
 	cmd.Stderr = os.Stderr
 	cmd.Stdout = os.Stdout
+	if deno_no_package_json := os.Getenv("DENO_NO_PACKAGE_JSON"); deno_no_package_json != "" {
+		cmd.Env = append(os.Environ(), "DENO_NO_PACKAGE_JSON="+denoNoPackageJsonValue)
+	}
 	if err := cmd.Run(); err != nil {
 		return meta, errors.Errorf("failed to bundle function: %w", err)
 	}

pkg/function/bundle_test.go

@@ -48,6 +48,7 @@ func TestBundleFunction(t *testing.T) {
 			"hello/index.ts",
 			"hello/deno.json",
 			[]string{"hello/data.pdf"},
+			true,
 			&body,
 		)
 		// Check error
@@ -78,6 +79,7 @@ func TestBundleFunction(t *testing.T) {
 			"hello/index.ts",
 			"",
 			nil,
+			true,
 			&body,
 		)
 		// Check error