Refactor js modules system in js/modules package and use it #2991
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #2991 +/- ##
==========================================
- Coverage 75.20% 73.52% -1.69%
==========================================
Files 236 239 +3
Lines 17722 18244 +522
==========================================
+ Hits 13328 13414 +86
- Misses 3536 3959 +423
- Partials 858 871 +13
Flags with carried forward coverage won't be shown. Click here to find out more.
|
na--
previously approved these changes
Apr 3, 2023
mstoykov
force-pushed
the
moveModuleResolution
branch
from
bae7d2b
to
6680534
Compare
mstoykov
changed the title
mstoykov
force-pushed
the
moveModuleResolution
branch
from
6680534
to
7ed9300
Compare
imiric
suggested changes
Apr 28, 2023
Comment on lines
-62
to
+69
| m := new(RootModule).NewModuleInstance(ts.VU) | ||
|
|
||
| rt := ts.VU.Runtime() | ||
| require.NoError(t, rt.Set("instrumentHTTP", m.Exports().Named["instrumentHTTP"])) | ||
|
|
||
| export := http.New().NewModuleInstance(ts.VU).Exports().Default | ||
| require.NoError(t, rt.Set("require", func(module string) *goja.Object { | ||
| require.Equal(t, "k6/http", module) | ||
| return rt.ToValue(export).ToObject(rt) | ||
| })) | ||
| err := ts.SetupModuleSystem(map[string]interface{}{ | ||
| "k6/http": http.New(), | ||
| "k6/experimental/tracing": new(RootModule), | ||
| }, nil, compiler.New(ts.VU.InitEnvField.Logger)) | ||
| require.NoError(t, err) | ||
|
|
||
| _, err = ts.VU.Runtime().RunString("var instrumentHTTP = require('k6/experimental/tracing').instrumentHTTP") | ||
| require.NoError(t, err) |
olegbespalov
approved these changes
May 26, 2023
mstoykov
force-pushed
the
moveModuleResolution
branch
from
e9a1e2f
to
51ee021
Compare
This is mostly a stepping stone to let it be used in tests but also to make the js package smaller
This is the main place where the module system being available and working the same in tests as it does when k6 runs is really important for the test itself.
|
Sorry @olegbespalov it take me a while to rebase and squash the fixes in the correct commits as you can see in https://github.com/grafana/k6/compare/e9a1e2f4ec5f0150b7908d637d1eb24f3d4f61e7..51ee0214bbfe7d8b00664ce776ed917aa804eeca I also forcepushed to rebase on master to fix the go-tip tests 😬 |
mstoykov
force-pushed
the
moveModuleResolution
branch
from
51ee021
to
9392a59
Compare
imiric
approved these changes
May 29, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is mostly a stepping stone to let it be used in tests but also to make the js package smaller.
This also has a separate commit that uses it in
k6/experimental/tracingwhere this actually matters.