Prevent panic when 'options' value is nil (#3947)

* Prevent panic when 'options' value is nil * Add test case
grafana · Sep 12, 2024 · 535a5bb · 535a5bb
1 parent 547fc08
commit 535a5bb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/js/bundle.go b/js/bundle.go
@@ -197,7 +197,7 @@ func (b *Bundle) populateExports(updateOptions bool, bi *BundleInstance) error {
 			}
 			switch k {
 			case consts.Options:
-				if !updateOptions {
+				if !updateOptions || v == nil {
 					continue
 				}
 				var data []byte

diff --git a/js/bundle_test.go b/js/bundle_test.go
@@ -214,6 +214,16 @@ func TestNewBundle(t *testing.T) {
 			`)
 			require.NoError(t, err)
 		})
+		t.Run("Null", func(t *testing.T) {
+			t.Parallel()
+			fs := fsext.NewMemMapFs()
+			require.NoError(t, fsext.WriteFile(fs, "/options.js", []byte("module.exports={}"), 0o644))
+			_, err := getSimpleBundle(t, "/script.js", `
+				export {options} from "./options.js";
+				export default function() {};
+			`, fs)
+			require.NoError(t, err)
+		})
 		t.Run("Invalid", func(t *testing.T) {
 			t.Parallel()
 			invalidOptions := map[string]struct {