Merge pull request #1824 from loadimpact/dropCoreJS

grafana · Feb 2, 2021 · 96ffb48 · 96ffb48
2 parents 5619259 + 10cb583
commit 96ffb48
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 162 deletions.
diff --git a/js/bundle.go b/js/bundle.go
@@ -35,7 +35,6 @@ import (
 
 	"github.com/loadimpact/k6/js/common"
 	"github.com/loadimpact/k6/js/compiler"
-	jslib "github.com/loadimpact/k6/js/lib"
 	"github.com/loadimpact/k6/lib"
 	"github.com/loadimpact/k6/lib/consts"
 	"github.com/loadimpact/k6/loader"
@@ -282,12 +281,6 @@ func (b *Bundle) instantiate(logger logrus.FieldLogger, rt *goja.Runtime, init *
 	rt.SetFieldNameMapper(common.FieldNameMapper{})
 	rt.SetRandSource(common.NewRandSource())
 
-	if init.compatibilityMode == lib.CompatibilityModeExtended {
-		if _, err := rt.RunProgram(jslib.GetCoreJS()); err != nil {
-			return err
-		}
-	}
-
 	exports := rt.NewObject()
 	rt.Set("exports", exports)
 	module := rt.NewObject()

diff --git a/js/bundle_test.go b/js/bundle_test.go
@@ -114,15 +114,6 @@ func TestNewBundle(t *testing.T) {
 		}
 	})
 	t.Run("CompatibilityMode", func(t *testing.T) {
-		t.Run("Extended/ok/CoreJS", func(t *testing.T) {
-			rtOpts := lib.RuntimeOptions{
-				CompatibilityMode: null.StringFrom(lib.CompatibilityModeExtended.String()),
-			}
-			_, err := getSimpleBundle(t, "/script.js",
-				`module.exports.default = function() {}; new Promise(function(resolve, reject){});`, rtOpts)
-
-			assert.NoError(t, err)
-		})
 		t.Run("Base/ok/Minimal", func(t *testing.T) {
 			rtOpts := lib.RuntimeOptions{
 				CompatibilityMode: null.StringFrom(lib.CompatibilityModeBase.String()),
@@ -153,9 +144,9 @@ func TestNewBundle(t *testing.T) {
 					`module.exports.default = function() {}; () => {};`,
 					"file:///script.js: Line 1:42 Unexpected token ) (and 1 more errors)",
 				},
-				// some ES2015 objects polyfilled by core.js are not supported
+				// Promises are not supported
 				{
-					"CoreJS", "base",
+					"Promise", "base",
 					`module.exports.default = function() {}; new Promise(function(resolve, reject){});`,
 					"ReferenceError: Promise is not defined at file:///script.js:1:45(5)",
 				},

diff --git a/js/lib/core-js/shim.min.js b/js/lib/core-js/shim.min.js
diff --git a/js/lib/lib.go b/js/lib/lib.go
diff --git a/js/lib/rice-box.go b/js/lib/rice-box.go
diff --git a/js/tc39/breaking_test_errors.json b/js/tc39/breaking_test_errors.json
diff --git a/js/tc39/tc39_test.go b/js/tc39/tc39_test.go
@@ -19,7 +19,6 @@ import (
 	"github.com/dop251/goja"
 	"github.com/dop251/goja/parser"
 	"github.com/loadimpact/k6/js/compiler"
-	jslib "github.com/loadimpact/k6/js/lib"
 	"github.com/loadimpact/k6/lib"
 	"github.com/loadimpact/k6/lib/testutils"
 	"github.com/stretchr/testify/assert"
@@ -254,9 +253,6 @@ func (ctx *tc39TestCtx) runTC39Test(t testing.TB, name, src string, meta *tc39Me
 	})
 	vm.Set("$262", _262)
 	vm.Set("print", t.Log)
-	if _, err := vm.RunProgram(jslib.GetCoreJS()); err != nil {
-		panic(err)
-	}
 	_, err := vm.RunProgram(sabStub)
 	if err != nil {
 		panic(err)