Also set "options" on the "exports" not just in the runtime

grafana · May 21, 2020 · bda6461 · bda6461
1 parent e148773
commit bda6461
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/js/bundle.go b/js/bundle.go
@@ -253,7 +253,9 @@ func (b *Bundle) Instantiate() (bi *BundleInstance, instErr error) {
 	var jsOptionsObj *goja.Object
 	if jsOptions == nil || goja.IsNull(jsOptions) || goja.IsUndefined(jsOptions) {
 		jsOptionsObj = rt.NewObject()
-		rt.Set("options", jsOptionsObj)
+		if err := exports.Set("options", jsOptionsObj); err != nil {
+			return nil, err
+		}
 	} else {
 		jsOptionsObj = jsOptions.ToObject(rt)
 	}

diff --git a/js/runner_test.go b/js/runner_test.go
@@ -147,6 +147,7 @@ func TestOptionsSettingToScript(t *testing.T) {
 		t.Run(fmt.Sprintf("Variant#%d", i), func(t *testing.T) {
 			t.Parallel()
 			data := variant + `
+					exports.options = options;
 					exports.default = function() {
 						if (!options) {
 							throw new Error("Expected options to be defined!");