Skip to content

Commit 8cafb9e

Browse files
fix: Scripts without k6/execution import cannot be run in Validator (#946)
1 parent 22355f1 commit 8cafb9e

21 files changed

+192
-645
lines changed

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,7 @@ resources/win/x86_64/k6.exe
109109
.env.sentry-build-plugin
110110

111111
# Shims
112-
resources/shims
113-
resources/browser
112+
resources/browser
113+
114+
# Entry script
115+
resources/entrypoint.js

forge.config.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,9 @@ const config: ForgeConfig = {
5858
asar: true,
5959
extraResource: [
6060
'.vite/build/extension',
61-
'./resources/shims',
6261
'./resources/browser',
6362
'./resources/json_output.py',
64-
'./resources/group_snippet.js',
65-
'./resources/checks_snippet.js',
63+
'./resources/entrypoint.js',
6664
'./resources/splashscreen.html',
6765
'./resources/logo-splashscreen-dark.svg',
6866
'./resources/logo-splashscreen.svg',
@@ -133,8 +131,8 @@ const config: ForgeConfig = {
133131
},
134132
{
135133
// Entry doesn't really matter here.
136-
entry: 'src/main/runner/shims/browser/index.ts',
137-
config: 'vite.shims.config.ts',
134+
entry: 'src/main/runner/entrypoint.ts',
135+
config: 'vite.script.config.ts',
138136
},
139137
],
140138
renderer: [

resources/group_snippet.js

Lines changed: 0 additions & 72 deletions
This file was deleted.

src/main/runner/__snapshots__/script/browser-options/with-browser-import.js

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/main/runner/__snapshots__/script/browser-options/without-browser-import.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/main/runner/__snapshots__/script/checks-shim/handle-summary-was-exported.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/main/runner/__snapshots__/script/checks-shim/handle-summary-was-not-exported.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/main/runner/__snapshots__/script/groups-shim/with-different-alias-for-execution-import.js

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/main/runner/__snapshots__/script/groups-shim/with-http-import.js

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/main/runner/__snapshots__/script/groups-shim/without-http-import.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)