From 0ee937f7e37332c0066465fb05237152457e6fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20SZKIBA?= Date: Thu, 18 Apr 2024 16:10:34 +0200 Subject: [PATCH 1/3] feat: upgrade to k6pack v0.1.3 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index be49cd8..7b004f6 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/sirupsen/logrus v1.9.3 - github.com/szkiba/k6pack v0.1.2 + github.com/szkiba/k6pack v0.1.3 go.k6.io/k6 v0.50.0 ) diff --git a/go.sum b/go.sum index 31e524c..89313c7 100644 --- a/go.sum +++ b/go.sum @@ -110,8 +110,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/szkiba/k6pack v0.1.2 h1:r4nrAYP4UoC7RSgORGRWvY27Fe1pDCR14vSj3ifKoYw= -github.com/szkiba/k6pack v0.1.2/go.mod h1:2yxZBwXidrURozrVZWwohqqEOjdCVyHCZPSKu77i7Bc= +github.com/szkiba/k6pack v0.1.3 h1:WtHNH2Q37695YA+3uGwPRgsOu/0wqBUcfOA5MBdedSo= +github.com/szkiba/k6pack v0.1.3/go.mod h1:2yxZBwXidrURozrVZWwohqqEOjdCVyHCZPSKu77i7Bc= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.k6.io/k6 v0.50.0 h1:2AMTXJ37QTmfUZ4ykitWNyIzVJTBQ7mBvlTbzHSmYoU= From 2c2e10439f5ffd55ea95d29c53a70d2cb5fc014a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20SZKIBA?= Date: Thu, 18 Apr 2024 16:10:51 +0200 Subject: [PATCH 2/3] test: test sourcemap --- examples/abort.ts | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 examples/abort.ts diff --git a/examples/abort.ts b/examples/abort.ts new file mode 100644 index 0000000..69d2a6e --- /dev/null +++ b/examples/abort.ts @@ -0,0 +1,5 @@ +import exec from "k6/execution"; + +export default function () { + exec.test.abort("failed"); +} From 34e503fb370d4cc3e7d34d99a3c63b437844a900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20SZKIBA?= Date: Thu, 18 Apr 2024 16:11:12 +0200 Subject: [PATCH 3/3] feat: set current directory as source root in sourcemap --- loader.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/loader.go b/loader.go index 34a99c9..829e702 100644 --- a/loader.go +++ b/loader.go @@ -56,9 +56,12 @@ func redirectStdin() { return } + cwd, _ := os.Getwd() + opts := &k6pack.Options{ - Filename: filename, - SourceMap: os.Getenv("XK6_TS_SOURCEMAP") != "false", + Filename: filename, + SourceMap: os.Getenv("XK6_TS_SOURCEMAP") != "false", + SourceRoot: cwd, } source, err := os.ReadFile(filepath.Clean(filename))