sys:es,nodeJs: move node vars to fantom.js boot

fantom-lang · Nov 20, 2024 · a4d13e7 · a4d13e7
1 parent f09108a
commit a4d13e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/nodeJs/res/fantomTemplate.js b/src/nodeJs/res/fantomTemplate.js
@@ -50,6 +50,11 @@ const boot = async function(opts={}) {
   Env.cur().__homeDir = File.os(fan_home);
   Env.cur().__workDir = File.os(fan_home);
   Env.cur().__tempDir = File.os(toDir(path.resolve(fan_home, "temp")));
+  Env.cur().__loadVars({
+    "node.version": process.versions.node,
+    "node.path": path.resolve(url.fileURLToPath(import.meta.url), "../..")
+  });
+
   await checkPathEnv();
 
   // handle polyfills

diff --git a/src/sys/es/fan/BootEnv.js b/src/sys/es/fan/BootEnv.js
@@ -35,13 +35,8 @@ class BootEnv extends Env {
 
     // set some pre-defined vars
     if (Env.__isNode()) {
-      let path = Env.__node("path");
-      let url = Env.__node("url");
       this.#vars.set("os.name", this.os());
       this.#vars.set("os.version", Env.__node()?.os?.version());
-      this.#vars.set("node.version", process.versions.node);
-      // this assumes that sys.js is in {node.path}/<some_dir>/sys.js
-      this.#vars.set("node.path", path.resolve(url.fileURLToPath(import.meta.url), "../.."));
     }
 
     for (let i=0; i<keys.length; ++i) {