Move to using the in k6 browser code

grafana · Dec 12, 2024 · 88f765b · 88f765b
1 parent 76f6b6a
commit 88f765b
Show file tree

Hide file tree

Showing 216 changed files with 367 additions and 26,525 deletions.
diff --git a/go.mod b/go.mod
@@ -14,7 +14,6 @@ require (
 	github.com/go-sourcemap/sourcemap v2.1.4+incompatible
 	github.com/golang/protobuf v1.5.4
 	github.com/gorilla/websocket v1.5.3
-	github.com/grafana/xk6-browser v1.10.0
 	github.com/grafana/xk6-dashboard v0.7.5
 	github.com/grafana/xk6-output-opentelemetry v0.3.0
 	github.com/grafana/xk6-output-prometheus-remote v0.5.0
@@ -66,7 +65,7 @@ require (
 	github.com/bufbuild/protocompile v0.14.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/chromedp/cdproto v0.0.0-20240919203636-12af5e8a671f // indirect
+	github.com/chromedp/cdproto v0.0.0-20240919203636-12af5e8a671f
 	github.com/chromedp/sysutil v1.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -96,7 +95,7 @@ require (
 	go.opentelemetry.io/otel/metric v1.29.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.3.1 // indirect
-	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sync v0.10.0
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240822170219-fc7c04adadcd // indirect

diff --git a/go.sum b/go.sum
@@ -87,8 +87,6 @@ github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aN
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grafana/sobek v0.0.0-20241024150027-d91f02b05e9b h1:hzfIt1lf19Zx1jIYdeHvuWS266W+jL+7dxbpvH2PZMQ=
 github.com/grafana/sobek v0.0.0-20241024150027-d91f02b05e9b/go.mod h1:FmcutBFPLiGgroH42I4/HBahv7GxVjODcVWFTw1ISes=
-github.com/grafana/xk6-browser v1.10.0 h1:nj7CdQRtfEnBC8UpiFJVqfoXeWktMO+v5FV1ST44aFw=
-github.com/grafana/xk6-browser v1.10.0/go.mod h1:fCdTCgN4x154XOj5bRajxsCjvMA3dShkGQa59Br34xI=
 github.com/grafana/xk6-dashboard v0.7.5 h1:TcILyffT/Ea/XD7xG1jMA5lwtusOPRbEQsQDHmO30Mk=
 github.com/grafana/xk6-dashboard v0.7.5/go.mod h1:Y75F8xmgCraKT+pBzFH6me9AyH5PkXD+Bxo1dm6Il/M=
 github.com/grafana/xk6-output-opentelemetry v0.3.0 h1:dmclGBFtFVRJijqLncpu2dKVIIvx1GS3y6sQGg4Khl8=

diff --git a/js/jsmodules.go b/js/jsmodules.go
@@ -8,6 +8,7 @@ import (
 	"go.k6.io/k6/js/common"
 	"go.k6.io/k6/js/modules"
 	"go.k6.io/k6/js/modules/k6"
+	"go.k6.io/k6/js/modules/k6/browser/browser"
 	"go.k6.io/k6/js/modules/k6/crypto"
 	"go.k6.io/k6/js/modules/k6/crypto/x509"
 	"go.k6.io/k6/js/modules/k6/data"
@@ -23,7 +24,6 @@ import (
 	"go.k6.io/k6/js/modules/k6/timers"
 	"go.k6.io/k6/js/modules/k6/ws"
 
-	"github.com/grafana/xk6-browser/browser"
 	"github.com/grafana/xk6-redis/redis"
 	"github.com/grafana/xk6-webcrypto/webcrypto"
 	expws "github.com/grafana/xk6-websockets/websockets"

diff --git a/js/modules/k6/browser/browser/browser_context_mapping.go b/js/modules/k6/browser/browser/browser_context_mapping.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6error"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6error"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 // mapBrowserContext to the JS module.

diff --git a/js/modules/k6/browser/browser/browser_context_options_test.go b/js/modules/k6/browser/browser/browser_context_options_test.go
@@ -6,8 +6,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext/k6test"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext/k6test"
 )
 
 func TestBrowserContextOptionsPermissions(t *testing.T) {

diff --git a/js/modules/k6/browser/browser/browser_mapping.go b/js/modules/k6/browser/browser/browser_mapping.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 // mapBrowser to the JS module.

diff --git a/js/modules/k6/browser/browser/console_message_mapping.go b/js/modules/k6/browser/browser/console_message_mapping.go
@@ -1,7 +1,7 @@
 package browser
 
 import (
-	"github.com/grafana/xk6-browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/common"
 )
 
 // mapConsoleMessage to the JS module.

diff --git a/js/modules/k6/browser/browser/element_handle_mapping.go b/js/modules/k6/browser/browser/element_handle_mapping.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 // mapElementHandle to the JS module.

diff --git a/js/modules/k6/browser/browser/file_persister.go b/js/modules/k6/browser/browser/file_persister.go
@@ -6,8 +6,8 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/grafana/xk6-browser/env"
-	"github.com/grafana/xk6-browser/storage"
+	"go.k6.io/k6/js/modules/k6/browser/env"
+	"go.k6.io/k6/js/modules/k6/browser/storage"
 )
 
 type presignedURLConfig struct {

diff --git a/js/modules/k6/browser/browser/file_persister_test.go b/js/modules/k6/browser/browser/file_persister_test.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/grafana/xk6-browser/env"
-	"github.com/grafana/xk6-browser/storage"
+	"go.k6.io/k6/js/modules/k6/browser/env"
+	"go.k6.io/k6/js/modules/k6/browser/storage"
 )
 
 func Test_newScreenshotPersister(t *testing.T) {

diff --git a/js/modules/k6/browser/browser/frame_mapping.go b/js/modules/k6/browser/browser/frame_mapping.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 // mapFrame to the JS module.

diff --git a/js/modules/k6/browser/browser/helpers.go b/js/modules/k6/browser/browser/helpers.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/k6error"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/k6error"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 func panicIfFatalError(ctx context.Context, err error) {

diff --git a/js/modules/k6/browser/browser/js_handle_mapping.go b/js/modules/k6/browser/browser/js_handle_mapping.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 // mapJSHandle to the JS module.

diff --git a/js/modules/k6/browser/browser/keyboard_mapping.go b/js/modules/k6/browser/browser/keyboard_mapping.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 func mapKeyboard(vu moduleVU, kb *common.Keyboard) mapping {

diff --git a/js/modules/k6/browser/browser/locator_mapping.go b/js/modules/k6/browser/browser/locator_mapping.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 // mapLocator API to the JS module.

diff --git a/js/modules/k6/browser/browser/mapping.go b/js/modules/k6/browser/browser/mapping.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/common"
 
 	k6common "go.k6.io/k6/js/common"
 )

diff --git a/js/modules/k6/browser/browser/mapping_test.go b/js/modules/k6/browser/browser/mapping_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/grafana/sobek"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/xk6-browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/common"
 
 	k6common "go.k6.io/k6/js/common"
 	k6modulestest "go.k6.io/k6/js/modulestest"
@@ -43,7 +43,7 @@ func customMappings() map[string]string {
 		"frameAPI.evaluateWithContext": "",
 		// TODO: browser.on method is unexposed until more event
 		// types other than 'disconnect' are supported.
-		// See: https://github.com/grafana/xk6-browser/issues/913
+		// See: https://go.k6.io/k6/js/modules/k6/browser/issues/913
 		"browserAPI.on": "",
 	}
 }

diff --git a/js/modules/k6/browser/browser/metric_event_mapping.go b/js/modules/k6/browser/browser/metric_event_mapping.go
@@ -3,7 +3,7 @@ package browser
 import (
 	"fmt"
 
-	"github.com/grafana/xk6-browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/common"
 )
 
 // mapMetricEvent to the JS module.

diff --git a/js/modules/k6/browser/browser/module.go b/js/modules/k6/browser/browser/module.go
@@ -16,9 +16,9 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/env"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/env"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 
 	k6modules "go.k6.io/k6/js/modules"
 )

diff --git a/js/modules/k6/browser/browser/module_test.go b/js/modules/k6/browser/browser/module_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/xk6-browser/k6ext/k6test"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext/k6test"
 )
 
 // TestModuleNew tests registering the module.

diff --git a/js/modules/k6/browser/browser/modulevu.go b/js/modules/k6/browser/browser/modulevu.go
@@ -3,8 +3,8 @@ package browser
 import (
 	"context"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 
 	k6modules "go.k6.io/k6/js/modules"
 )

diff --git a/js/modules/k6/browser/browser/mouse_mapping.go b/js/modules/k6/browser/browser/mouse_mapping.go
@@ -3,8 +3,8 @@ package browser
 import (
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 func mapMouse(vu moduleVU, m *common.Mouse) mapping {

diff --git a/js/modules/k6/browser/browser/page_mapping.go b/js/modules/k6/browser/browser/page_mapping.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 // mapPage to the JS module.

diff --git a/js/modules/k6/browser/browser/registry.go b/js/modules/k6/browser/browser/registry.go
@@ -16,11 +16,11 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	oteltrace "go.opentelemetry.io/otel/trace"
 
-	"github.com/grafana/xk6-browser/chromium"
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/env"
-	"github.com/grafana/xk6-browser/k6ext"
-	browsertrace "github.com/grafana/xk6-browser/trace"
+	"go.k6.io/k6/js/modules/k6/browser/chromium"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/env"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
+	browsertrace "go.k6.io/k6/js/modules/k6/browser/trace"
 
 	k6event "go.k6.io/k6/event"
 	k6modules "go.k6.io/k6/js/modules"

diff --git a/js/modules/k6/browser/browser/registry_test.go b/js/modules/k6/browser/browser/registry_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/grafana/xk6-browser/env"
-	"github.com/grafana/xk6-browser/k6ext/k6test"
+	"go.k6.io/k6/js/modules/k6/browser/env"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext/k6test"
 
 	k6event "go.k6.io/k6/event"
 )

diff --git a/js/modules/k6/browser/browser/request_mapping.go b/js/modules/k6/browser/browser/request_mapping.go
@@ -3,8 +3,8 @@ package browser
 import (
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 // mapRequest to the JS module.

diff --git a/js/modules/k6/browser/browser/response_mapping.go b/js/modules/k6/browser/browser/response_mapping.go
@@ -3,8 +3,8 @@ package browser
 import (
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 // mapResponse to the JS module.

diff --git a/js/modules/k6/browser/browser/sync_browser_context_mapping.go b/js/modules/k6/browser/browser/sync_browser_context_mapping.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6error"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6error"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 // syncMapBrowserContext is like mapBrowserContext but returns synchronous functions.

diff --git a/js/modules/k6/browser/browser/sync_console_message_mapping.go b/js/modules/k6/browser/browser/sync_console_message_mapping.go
@@ -3,7 +3,7 @@ package browser
 import (
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/common"
 )
 
 // syncMapConsoleMessage is like mapConsoleMessage but returns synchronous functions.

diff --git a/js/modules/k6/browser/browser/sync_element_handle_mapping.go b/js/modules/k6/browser/browser/sync_element_handle_mapping.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 // syncMapElementHandle is like mapElementHandle but returns synchronous functions.

diff --git a/js/modules/k6/browser/browser/sync_frame_mapping.go b/js/modules/k6/browser/browser/sync_frame_mapping.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 // syncMapFrame is like mapFrame but returns synchronous functions.

diff --git a/js/modules/k6/browser/browser/sync_js_handle_mapping.go b/js/modules/k6/browser/browser/sync_js_handle_mapping.go
@@ -3,7 +3,7 @@ package browser
 import (
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/common"
 )
 
 // syncMapJSHandle is like mapJSHandle but returns synchronous functions.

diff --git a/js/modules/k6/browser/browser/sync_keyboard_mapping.go b/js/modules/k6/browser/browser/sync_keyboard_mapping.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/common"
 )
 
 func syncMapKeyboard(vu moduleVU, kb *common.Keyboard) mapping {

diff --git a/js/modules/k6/browser/browser/sync_locator_mapping.go b/js/modules/k6/browser/browser/sync_locator_mapping.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/grafana/sobek"
 
-	"github.com/grafana/xk6-browser/common"
-	"github.com/grafana/xk6-browser/k6ext"
+	"go.k6.io/k6/js/modules/k6/browser/common"
+	"go.k6.io/k6/js/modules/k6/browser/k6ext"
 )
 
 // syncMapLocator is like mapLocator but returns synchronous functions.