Merge remote-tracking branch 'origin/main'

.github/workflows/build-macos.yml

@@ -57,8 +57,6 @@ jobs:
           yarn install
           cp resources/verror-types node_modules/@types/verror/index.d.ts
           cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js
-          rm -r node_modules/pouchdb-node/node_modules/leveldown
-          rm -r node_modules/pouchdb-adapter-leveldb/node_modules/leveldown
 
       - name: Build the DMG
         env:

package.json

@@ -59,7 +59,6 @@
     "jimp": "^0.16.1",
     "lastfmapi": "^0.1.1",
     "level": "^8.0.0",
-    "leveldown": "^6.1.1",
     "mdns-js": "git+https://github.com/ciderapp/node-mdns-js.git",
     "mpris-service": "^2.1.2",
     "music-metadata": "7.12.6",
@@ -228,5 +227,11 @@
         "NSUserNotificationAlertStyle": "alert"
       }
     }
+  },
+  "resolutions": {
+    "leveldown": "^6.1.1"
+  },
+  "overrides": {
+    "leveldown": "^6.1.1"
   }
 }