From 2639ec1199381d1d88a5f153ef09dc5868f42b22 Mon Sep 17 00:00:00 2001
From: The Ghost of FOSS' Future
<163201376+sneedgroup-holder@users.noreply.github.com>
Date: Thu, 9 Jan 2025 00:24:29 +0000
Subject: [PATCH] Update qjs.c
---
qjs.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/qjs.c b/qjs.c
index 8e625a3..72ebb81 100644
--- a/qjs.c
+++ b/qjs.c
@@ -621,21 +621,7 @@ start:
/* exit on unhandled promise rejections */
JS_SetHostPromiseRejectionTracker(rt, js_std_promise_rejection_tracker, NULL);
- if (!empty_run) {
- js_std_add_helpers(ctx, argc - optind, argv + optind);
-
- /* make 'std' and 'os' visible to non module code */
- if (load_std) {
- const char *str =
- "import * as bjson from 'qjs:bjson';\n"
- "import * as std from 'qjs:std';\n"
- "import * as os from 'qjs:os';\n"
- "globalThis.bjson = bjson;\n"
- "globalThis.std = std;\n"
- "globalThis.os = os;\n";
- eval_buf(ctx, str, strlen(str), "", JS_EVAL_TYPE_MODULE);
-
- //POLYFILLS FOR QJS FILES BEGIN
+ //POLYFILLS FOR QJS FILES BEGIN
const char *pf = "globalThis.global = globalThis;\n"
"global.console.error = console.log\n"
"global.console.warn = console.log\n"
@@ -664,6 +650,20 @@ start:
"}\n";
eval_buf(ctx, pf, strlen(pf), "", JS_EVAL_TYPE_MODULE);
+
+ if (!empty_run) {
+ js_std_add_helpers(ctx, argc - optind, argv + optind);
+
+ /* make 'std' and 'os' visible to non module code */
+ if (load_std) {
+ const char *str =
+ "import * as bjson from 'qjs:bjson';\n"
+ "import * as std from 'qjs:std';\n"
+ "import * as os from 'qjs:os';\n"
+ "globalThis.bjson = bjson;\n"
+ "globalThis.std = std;\n"
+ "globalThis.os = os;\n";
+ eval_buf(ctx, str, strlen(str), "", JS_EVAL_TYPE_MODULE);
}
for(i = 0; i < include_count; i++) {