From 12fc656f15c0f199c64951ae2b04efb6da0d3cf8 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Tue, 28 Feb 2023 11:05:28 -0500
Subject: [PATCH] Bump esptool-js to 0.2.1 (#340)

* Bump esptool-js to 0.2.1

* 9.2.1
---
 package-lock.json                  | 19 +++++++++----------
 package.json                       |  7 +++----
 patches/0001-not-change-baud.patch | 11 -----------
 src/flash.ts                       |  7 +------
 4 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 patches/0001-not-change-baud.patch

diff --git a/package-lock.json b/package-lock.json
index 531b493..07418f2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,13 +1,12 @@
 {
   "name": "esp-web-tools",
-  "version": "9.2.0",
+  "version": "9.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "esp-web-tools",
-      "version": "9.2.0",
-      "hasInstallScript": true,
+      "version": "9.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@material/mwc-button": "^0.27.0",
@@ -17,7 +16,7 @@
         "@material/mwc-formfield": "^0.27.0",
         "@material/mwc-icon-button": "^0.27.0",
         "@material/mwc-textfield": "^0.27.0",
-        "esptool-js": "^0.2.0",
+        "esptool-js": "^0.2.1",
         "improv-wifi-serial-sdk": "^2.4.0",
         "lit": "^2.5.0",
         "pako": "^2.1.0",
@@ -1922,9 +1921,9 @@
       }
     },
     "node_modules/esptool-js": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/esptool-js/-/esptool-js-0.2.0.tgz",
-      "integrity": "sha512-TZehTn14FJ6YLfKc+YJlZxhcs5XZasE+85LFbju+TGtb/vb7bXUEkioCkVRUfSnmGBP3uZqAmd2/m7jpoSwOPg==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/esptool-js/-/esptool-js-0.2.1.tgz",
+      "integrity": "sha512-M2UteDiWrllJOBWLHwNRGaEAkDEHAG6FH6LdsTxJPUFLxbH/xwFMQEudiVH+REZc0FGfvY0YntVMes+HkZBeKw==",
       "dependencies": {
         "pako": "^2.1.0",
         "tslib": "^2.4.1"
@@ -4433,9 +4432,9 @@
       "dev": true
     },
     "esptool-js": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/esptool-js/-/esptool-js-0.2.0.tgz",
-      "integrity": "sha512-TZehTn14FJ6YLfKc+YJlZxhcs5XZasE+85LFbju+TGtb/vb7bXUEkioCkVRUfSnmGBP3uZqAmd2/m7jpoSwOPg==",
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/esptool-js/-/esptool-js-0.2.1.tgz",
+      "integrity": "sha512-M2UteDiWrllJOBWLHwNRGaEAkDEHAG6FH6LdsTxJPUFLxbH/xwFMQEudiVH+REZc0FGfvY0YntVMes+HkZBeKw==",
       "requires": {
         "pako": "^2.1.0",
         "tslib": "^2.4.1"
diff --git a/package.json b/package.json
index b1cd48e..7e206dc 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,13 @@
 {
   "name": "esp-web-tools",
-  "version": "9.2.0",
+  "version": "9.2.1",
   "description": "Web tools for ESP devices",
   "main": "dist/install-button.js",
   "repository": "https://github.com/esphome/esp-web-tools",
   "author": "ESPHome maintainers",
   "license": "Apache-2.0",
   "scripts": {
-    "prepublishOnly": "script/build",
-    "postinstall": "patch -Ntu node_modules/esptool-js/lib/esploader.js -i patches/0001-not-change-baud.patch || true"
+    "prepublishOnly": "script/build"
   },
   "devDependencies": {
     "@babel/plugin-proposal-class-properties": "^7.18.6",
@@ -31,7 +30,7 @@
     "@material/mwc-formfield": "^0.27.0",
     "@material/mwc-icon-button": "^0.27.0",
     "@material/mwc-textfield": "^0.27.0",
-    "esptool-js": "^0.2.0",
+    "esptool-js": "^0.2.1",
     "improv-wifi-serial-sdk": "^2.4.0",
     "lit": "^2.5.0",
     "pako": "^2.1.0",
diff --git a/patches/0001-not-change-baud.patch b/patches/0001-not-change-baud.patch
deleted file mode 100644
index ba13049..0000000
--- a/patches/0001-not-change-baud.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- node_modules/esptool-js/lib/esploader.js	2023-01-18 15:30:02
-+++ node_modules/esptool-js/lib/esploader.fixed.js	2023-01-18 15:31:47
-@@ -677,7 +677,7 @@
-             await this.chip._post_connect(this);
-         }
-         await this.run_stub();
--        await this.change_baud();
-+        // await this.change_baud();
-         return chip;
-     }
-     parse_flash_size_arg(flsz) {
diff --git a/src/flash.ts b/src/flash.ts
index 284afd1..10b3072 100644
--- a/src/flash.ts
+++ b/src/flash.ts
@@ -38,12 +38,7 @@ export const flash = async (
     });
 
   const transport = new Transport(port);
-  const esploader = new ESPLoader(
-    transport,
-    115200,
-    // Wrong type, fixed in https://github.com/espressif/esptool-js/pull/75/files
-    undefined as any
-  );
+  const esploader = new ESPLoader(transport, 115200, undefined);
 
   // For debugging
   (window as any).esploader = esploader;