Merge branch 'main' of https://github.com/circuitpython/web-editor into beta

Author: makermelissa

js/workflows/usb.js

@@ -53,16 +53,28 @@ class USBWorkflow extends Workflow {
 
     async onDisconnected(e, reconnect = true) {
         if (this.reader) {
-            await this.reader.cancel();
+            try {
+                await this.reader.cancel();
+            } catch (error) {
+                console.warn("Error calling reader.cancel:", error);
+            }
             this.reader = null;
         }
         if (this.writer) {
-            await this.writer.releaseLock();
+            try {
+                await this.writer.releaseLock();
+            } catch (error) {
+                console.warn("Error calling writer.releaseLock:", error);
+            }
             this.writer = null;
         }
 
         if (this._serialDevice) {
-            await this._serialDevice.close();
+            try {
+                await this._serialDevice.close();
+            } catch (error) {
+                console.warn("Error calling _serialDevice.close:", error);
+            }
             this._serialDevice = null;
         }
 
@@ -273,7 +285,11 @@ class USBWorkflow extends Workflow {
         device.addEventListener("message", this._messageCallback);
 
         let onDisconnect = async (e) => {
-            await this.onDisconnected(e, false);
+            try {
+                await this.onDisconnected(e, false);
+            } catch (error) {
+                console.warn("Error calling onDisconnected (maybe already disconnected):", error);
+            }
         };
         device.removeEventListener("disconnect", onDisconnect);
         device.addEventListener("disconnect", onDisconnect);

js/workflows/workflow.js

@@ -183,6 +183,7 @@ class Workflow {
         }
 
         this.terminalTitle.textContent = title;
+        this.terminalTitle.title = title;
     }
 
     async showConnect(documentState) {
@@ -214,7 +215,9 @@ class Workflow {
         } else {
             path = path.slice(1, -3);
             path = path.replace(/\//g, ".");
-            await (this.repl.runCode("import " + path));
+            this.repl.writeToTerminal("\r\nRunning 'import " + path + "'...\r\n");
+            this.repl.writeToTerminal(await (this.repl.runCode("import " + path)));
+            this.repl.writeToTerminal("\r\nCode done running.\r\n");
         }
     }
 

package-lock.json

@@ -9,8 +9,8 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "sass": "^1.93.2",
-    "vite": "^7.1.11",
+    "sass": "^1.93.3",
+    "vite": "^7.1.12",
     "vite-plugin-mkcert": "^1.17.9"
   },
   "dependencies": {
@@ -24,7 +24,7 @@
     "chart.js": "^4.5.1",
     "codemirror": "^6.0.2",
     "file-saver": "^2.0.5",
-    "focus-trap": "^7.6.1",
+    "focus-trap": "^7.6.6",
     "idb-keyval": "^6.2.2",
     "jszip": "^3.10.1"
   },

package.json

@@ -138,6 +138,9 @@
     flex: auto;
     overflow: hidden;
     text-overflow: ellipsis;
+    white-space: nowrap;
+    flex-shrink: 1;
+    max-width: fit-content;
 }
 
 @media (max-width: $screen-xs-max) {

sass/layout/_header.scss

@@ -60,13 +60,16 @@
 
 #editor-bar, #serial-bar {
     display: flex;
-    flex-wrap: wrap;
     align-items: center;
     padding: 0 10px;
     min-height: 60px;
     height: 4em;
 }
 
+#editor-bar {
+    flex-wrap: wrap;
+}
+
 #editor-page {
     #editor {
         flex: 1 1 0%;