summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorKitson Kelly <me@kitsonkelly.com>2019-02-11 12:07:02 +1100
committerRyan Dahl <ry@tinyclouds.org>2019-02-10 20:07:02 -0500
commit90c7af27d7959e94a25f635e21b8d77cb347e135 (patch)
treeed009e6f43a55c344fc09985b62e4fd7fcc41246 /js
parent1e837f3281413c7a9a3a27bb37b6829e3d2a85fa (diff)
Rationalise startup for compiler/main (#1737)
Diffstat (limited to 'js')
-rw-r--r--js/compiler.ts11
-rw-r--r--js/main.ts2
-rw-r--r--js/os.ts2
3 files changed, 3 insertions, 12 deletions
diff --git a/js/compiler.ts b/js/compiler.ts
index 85d808520..fa865de43 100644
--- a/js/compiler.ts
+++ b/js/compiler.ts
@@ -6,7 +6,6 @@ import { Console } from "./console";
import { globalEval } from "./global_eval";
import { libdeno } from "./libdeno";
import * as os from "./os";
-import { args } from "./deno";
import { TextDecoder, TextEncoder } from "./text_encoding";
import { clearTimer, setTimeout } from "./timers";
import { postMessage, workerClose, workerMain } from "./workers";
@@ -542,13 +541,5 @@ window.compilerMain = function compilerMain() {
/* tslint:disable-next-line:no-default-export */
export default function denoMain() {
- const startResMsg = os.start("TS");
-
- os.setGlobals(startResMsg.pid(), startResMsg.noColor());
-
- for (let i = 1; i < startResMsg.argvLength(); i++) {
- args.push(startResMsg.argv(i));
- }
- log("args", args);
- Object.freeze(args);
+ os.start("TS");
}
diff --git a/js/main.ts b/js/main.ts
index 4151abe75..4a732da5f 100644
--- a/js/main.ts
+++ b/js/main.ts
@@ -39,8 +39,6 @@ export default function denoMain() {
os.exit(0);
}
- os.setGlobals(startResMsg.pid(), startResMsg.noColor());
-
const cwd = startResMsg.cwd();
log("cwd", cwd);
diff --git a/js/os.ts b/js/os.ts
index d8c3288d5..db2586112 100644
--- a/js/os.ts
+++ b/js/os.ts
@@ -192,5 +192,7 @@ export function start(source?: string): msg.StartRes {
util.setLogDebug(startResMsg.debugFlag(), source);
+ setGlobals(startResMsg.pid(), startResMsg.noColor());
+
return startResMsg;
}