Merge pull request #49 from avwo/dev

Release v1.2.1
avwo · Jul 13, 2024 · 9f8981c · 9f8981c
2 parents d4a228e + c17b144
commit 9f8981c
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v1.2.1
+1. feat: update whistle@2.9.78
+2. feat: update find-bar@0.91.1
+3. feat: disableUIAuth
+
 # v1.2.0
 1. feat: update whistle@2.9.77
 2. feat: add find bar

diff --git a/lib/index.js b/lib/index.js
@@ -128,7 +128,9 @@ const updateDock = () => {
     });
     setInterval(updateDock, 160);
   }
-  app.on('browser-window-created', (_, win) => setFindBar(win));
+  app.on('browser-window-created', (_, win) => {
+    process.nextTick(() => setFindBar(win));
+  });
   app.whenReady().then(() => {
     createWindow();
     forkWhistle();

diff --git a/lib/settings.js b/lib/settings.js
@@ -173,6 +173,7 @@ exports.showSettings = () => {
       spellcheck: false,
     },
   });
+  child._hasFindBar = true; // eslint-disable-line
   child.loadFile(path.join(__dirname, '../public/settings.html'));
   child.isSettingsWin = true;
   child.on('ready-to-show', () => {

diff --git a/lib/whistle.js b/lib/whistle.js
@@ -87,7 +87,7 @@ const baseOptions = {
   pluginsPath,
   projectPluginsPath: PROJECT_PLUGINS_PATH,
   specialAuth: SPECIAL_AUTH,
-  mode: 'client|disableUpdateTips',
+  mode: 'client|disableUpdateTips|disableAuthUI',
   ...newOptions,
 };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Whistle",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Whistle Web Debugging Proxy",
   "main": "./lib/index.js",
   "author": "avenwu <avwu@qq.com>",
@@ -70,11 +70,11 @@
   },
   "dependencies": {
     "electron-context-menu": "^3.6.1",
-    "find-bar": "^0.1.0",
+    "find-bar": "^0.1.2",
     "fs-extra": "^11.1.1",
     "npminstall": "^7.9.0",
     "sudo-prompt": "^9.2.1",
-    "whistle": "^2.9.77",
+    "whistle": "^2.9.78",
     "whistle.proxyauth": "^1.1.2"
   }
 }
diff --git a/public/settings.html b/public/settings.html
@@ -16,11 +16,6 @@
         background-color: #fff;
         overflow: hidden;
       }
-      @media (prefers-color-scheme: dark) {
-        html {
-          filter: invert(1) hue-rotate(-180deg);
-        }
-      }
       * {
         box-sizing: border-box;
       }
@@ -178,6 +173,35 @@
         vertical-align: middle;
         padding: 5px;
       }
+
+      @media (prefers-color-scheme: dark) {
+        html, body, .advanced-button button {
+          background: #1f1f1f;
+          color: #e3e3e3;
+          color-scheme: dark !important;
+        }
+        .advanced-button button {
+          color: #aec6f6;
+        }
+        .advanced-button button:hover {
+          color: #86abf2;
+        }
+        .proxy-port::before {
+          color: #ec5d4e;
+        }
+        .btn-primary {
+          color: #e3e3e3;
+          background-color: #2f6cbb;
+          border-color: #4180d1;
+          margin-left: 15px;
+        }
+        .btn-default {
+          color: #333;
+          background-color: #313131;
+          border-color: #404040;
+          color: #e3e3e3;
+        }
+      }
     </style>
   </head>
   <body style="overscroll-behavior-x: none;">