Skip to content

Commit

Permalink
Merge pull request #18 from grafana/feature/17-update-after-move
Browse files Browse the repository at this point in the history
Feature/17 update after move
  • Loading branch information
szkiba authored Apr 25, 2024
2 parents 782640f + 3989cea commit cb10679
Show file tree
Hide file tree
Showing 8 changed files with 670 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
id: build
uses: szkiba/xk6bundler@v0
with:
with: github.com/szkiba/xk6-ts=/github/workspace
with: github.com/grafana/xk6-ts=/github/workspace
k6_version: latest
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
id: build
uses: szkiba/xk6bundler@v0
with:
with: github.com/szkiba/xk6-ts=/github/workspace
with: github.com/grafana/xk6-ts=/github/workspace
k6_version: latest

- name: Create Release
Expand Down
1 change: 1 addition & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @grafana/k6-extensions
682 changes: 661 additions & 21 deletions LICENSE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ For more build options and how to use xk6, check out the [xk6 documentation](htt
## How It Works
Under the hood, xk6-ts uses the [esbuild](https://github.com/evanw/esbuild) library for transpiling and bundling. To be precise, xk6-ts uses the [k6pack](https://github.com/szkiba/k6pack) library, which is based on esbuild.
Under the hood, xk6-ts uses the [esbuild](https://github.com/evanw/esbuild) library for transpiling and bundling. To be precise, xk6-ts uses the [k6pack](https://github.com/grafana/k6pack) library, which is based on esbuild.
Before the test run, transpilation and bundling are done on the fly.
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/szkiba/xk6-ts
module github.com/grafana/xk6-ts

go 1.21

require (
github.com/grafana/k6pack v0.1.5
github.com/sirupsen/logrus v1.9.3
github.com/szkiba/k6pack v0.1.3
go.k6.io/k6 v0.50.0
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ github.com/google/pprof v0.0.0-20230728192033-2ba5b33183c6 h1:ZgoomqkdjGbQ3+qQXC
github.com/google/pprof v0.0.0-20230728192033-2ba5b33183c6/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
github.com/grafana/k6pack v0.1.5 h1:XrOM7GQX30ISzashmegcowxKVhpFULm9fQIZe0+vJXA=
github.com/grafana/k6pack v0.1.5/go.mod h1:cltO5vmQOObJDtKbRkNVGymk3J+MRhriJyQg1JJzeEc=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
Expand Down Expand Up @@ -110,8 +112,6 @@ 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.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=
Expand Down
2 changes: 1 addition & 1 deletion loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"path/filepath"
"time"

"github.com/grafana/k6pack"
"github.com/sirupsen/logrus"
"github.com/szkiba/k6pack"
)

func init() {
Expand Down

0 comments on commit cb10679

Please sign in to comment.