pinokiod 2.1.16 → 2.1.18

package/kernel/bin/index.js

@@ -112,6 +112,7 @@ class Bin {
   merge_env(existing, merge) {
     // merge 'merge' into 'existing'
     for(let key in merge) {
+      // Array => like PATH
       if (Array.isArray(merge[key])) {
         if (typeof existing[key] === 'undefined') {
           existing[key] = merge[key]
@@ -134,10 +135,17 @@ class Bin {
 
     // 1. get the module envs
     let envs = this.mods.map((mod) => {
-      if (mod.mod.env) {
-        return mod.mod.env(this.kernel)
-      } else {
+      if (mod.name === "vs") {
+        // don't include vs now
+        // instead, include it after conda activation, since this should be top priority and even higher priority than conda activated environment variables
+        this.vs_env = mod.mod.env(this.kernel)
         return null
+      } else {
+        if (mod.mod.env) {
+          return mod.mod.env(this.kernel)
+        } else {
+          return null
+        }
       }
     }).filter(x => x)
 

package/kernel/shell.js

@@ -511,6 +511,7 @@ class Shell {
 
 
     // 2. conda_activation
+
     let conda_activation = []
     if (conda_path) {
       let env_path = path.resolve(params.path, conda_path)
@@ -570,6 +571,14 @@ class Shell {
       conda_activation = []
     }
 
+    // Visual Studio Build Tools (Exception)
+    const vs_env = this.kernel.bin.vs_env
+    console.log({ vs_env })
+    if (vs_env) {
+      const vs = `conda env config vars set ${vs_env}:%PATH%`
+      console.log({ vs })
+      conda_activation.push(vs)
+    }
 
 
     // Update env setting

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "2.1.16",
+  "version": "2.1.18",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/views/editor.ejs

@@ -39,6 +39,15 @@ body.frozen {
   flex-direction: column;
   height: 100%;
 }
+.terminal-container {
+  flex-grow: none !important;
+}
+.xterm {
+  height: 100%;
+}
+.containers .terminal-container {
+  height: auto !important;
+}
 #table > table {
   border-left: 2px solid black;
   padding-left: 5px;
@@ -229,6 +238,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         await this.socket.close()
 //        document.querySelector(".terminal-container").classList.add("hidden")
         let query = Object.fromEntries(new URLSearchParams(location.search))
+        document.querySelector(".containers").classList.add("running")
 
 
         this.socket.run({
@@ -806,7 +816,7 @@ const reloadMemory = async () => {
         </div>
       </div>
     <% } else { %>
-      <div class='containers'>
+      <div class='containers running'>
         <main>
           <!--
           <pre id='response'></pre>