Merge pull request #286 from FoamyGuy/fix_extra_empty_lines_usb_repl

makermelissa · web-flow · commit 289b59745f71 · 2025-01-23T13:26:35.000-08:00
remove \r from file contents when read via USB repl
diff --git a/js/common/repl-file-transfer.js b/js/common/repl-file-transfer.js
@@ -35,7 +35,7 @@ class FileTransferClient {
         if (contents === null) {
             return raw ? null : "";
         }
-        return contents;
+        return contents.replaceAll("\r\n", "\n");
     }
 
     async writeFile(path, offset, contents, modificationTime, raw = false) {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class FileTransferClient {`
`35`	`35`	`if (contents === null) {`
`36`	`36`	`return raw ? null : "";`
`37`	`37`	`}`
`38`		`- return contents;`
	`38`	`+ return contents.replaceAll("\r\n", "\n");`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`async writeFile(path, offset, contents, modificationTime, raw = false) {`