diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de2ed54..bb9b001 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,9 +5,11 @@ name: CI on: push: - branches: [main, fork] + branches: + - main pull_request: - branches: [main, fork] + branches: + - main jobs: build: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 2eb3ff8..896edaf 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - fork jobs: update_release_draft: diff --git a/README.md b/README.md index 721dc5f..5fac02f 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,4 @@ A Web Serial package for updating your ESP bootloader via the browser. ## Fork -This is a fork of [Adafruit WebSerial ESPTool](https://github.com/adafruit/Adafruit_WebSerial_ESPTool). Their repository is a single-use website. This fork converts the code into a reusable package. - -The changes of this fork are part of [an open pull request](https://github.com/adafruit/Adafruit_WebSerial_ESPTool/pull/10) upstream. If accepted in a way that it's usable for our projects, we can retire this project. +This is a fork of [Adafruit WebSerial ESPTool](https://github.com/adafruit/Adafruit_WebSerial_ESPTool). At the time fo the fork, their repository was a single-use website. This fork converted the code into a reusable package and published it to NPM. diff --git a/css/style.css b/css/style.css index b45690b..c31594f 100644 --- a/css/style.css +++ b/css/style.css @@ -34,7 +34,8 @@ color: #000; } -button, .firmware { +button, +.firmware { height: 25px; font-size: 16px; border-radius: 15px; @@ -54,7 +55,10 @@ p { margin: 0; } -input, select, button, label { +input, +select, +button, +label { font-weight: 600; outline: none; } @@ -75,12 +79,6 @@ div.clear { clear: both; } -.Adafruit-Logo { - width: 115px; - height: 40px; - object-fit: contain; -} - .main { overflow-x: hidden; overflow-y: auto; @@ -125,7 +123,8 @@ div.clear { height: calc(100vh - 330px); } -#commands, #log { +#commands, +#log { transition: height 0.5s; } @@ -144,7 +143,7 @@ div.clear { font-size: 16px; overflow-x: hidden; overflow-x: auto; - transition : color 0.1s linear; + transition: color 0.1s linear; padding: 0 50px; border: 20px solid #000; -ms-overflow-style: none; @@ -310,12 +309,12 @@ div.clear { } .firmware > input { - width: 0.1px; - height: 0.1px; - opacity: 0; - overflow: hidden; - position: absolute; - z-index: -1; + width: 0.1px; + height: 0.1px; + opacity: 0; + overflow: hidden; + position: absolute; + z-index: -1; } .firmware { diff --git a/index.html b/index.html index beb79a1..60db960 100644 --- a/index.html +++ b/index.html @@ -46,9 +46,7 @@
-
- -
+
diff --git a/package-lock.json b/package-lock.json index 210812e..bfb2414 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,20 +1,22 @@ { "name": "esp-web-flasher", - "version": "2.1.1", + "version": "3.0.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "esp-web-flasher", - "version": "2.1.1", + "version": "3.0.0", "license": "MIT", "dependencies": { + "pako": "^2.0.3", "tslib": "^2.2.0" }, "devDependencies": { "@rollup/plugin-json": "^4.1.0", "@rollup/plugin-node-resolve": "^13.0.0", "@rollup/plugin-typescript": "^8.2.1", + "@types/pako": "^1.0.1", "@types/w3c-web-serial": "^1.0.1", "prettier": "^2.3.0", "rollup": "^2.48.0", @@ -119,6 +121,12 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/pako": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/pako/-/pako-1.0.1.tgz", + "integrity": "sha512-GdZbRSJ3Cv5fiwT6I0SQ3ckeN2PWNqxd26W9Z2fCK1tGrrasGy4puvNFtnddqH9UJFMQYXxEuuB7B8UK+LLwSg==", + "dev": true + }, "node_modules/@types/resolve": { "version": "1.17.1", "dev": true, @@ -780,6 +788,11 @@ "node": ">=4" } }, + "node_modules/pako": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/pako/-/pako-2.0.3.tgz", + "integrity": "sha512-WjR1hOeg+kki3ZIOjaf4b5WVcay1jaliKSYiEaB1XzwhMQZJxRdQRv0V31EKBYlxb4T7SK3hjfc/jxyU64BoSw==" + }, "node_modules/path-is-inside": { "version": "1.0.2", "dev": true, @@ -913,6 +926,9 @@ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.52.2.tgz", "integrity": "sha512-4RlFC3k2BIHlUsJ9mGd8OO+9Lm2eDF5P7+6DNQOp5sx+7N/1tFM01kELfbxlMX3MxT6owvLB1ln4S3QvvQlbUA==", "dev": true, + "dependencies": { + "fsevents": "~2.3.2" + }, "bin": { "rollup": "dist/bin/rollup" }, @@ -1316,6 +1332,12 @@ "version": "15.6.0", "dev": true }, + "@types/pako": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/pako/-/pako-1.0.1.tgz", + "integrity": "sha512-GdZbRSJ3Cv5fiwT6I0SQ3ckeN2PWNqxd26W9Z2fCK1tGrrasGy4puvNFtnddqH9UJFMQYXxEuuB7B8UK+LLwSg==", + "dev": true + }, "@types/resolve": { "version": "1.17.1", "dev": true, @@ -1777,6 +1799,11 @@ "version": "1.0.0", "dev": true }, + "pako": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/pako/-/pako-2.0.3.tgz", + "integrity": "sha512-WjR1hOeg+kki3ZIOjaf4b5WVcay1jaliKSYiEaB1XzwhMQZJxRdQRv0V31EKBYlxb4T7SK3hjfc/jxyU64BoSw==" + }, "path-is-inside": { "version": "1.0.2", "dev": true diff --git a/package.json b/package.json index ef127be..ac38312 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "esp-web-flasher", - "version": "2.1.1", + "version": "3.0.0", "description": "Flash ESP devices using WebSerial", "main": "dist/index.js", "repository": "https://github.com/nabucasa/ESP-Web-flasher",