Merge remote-tracking branch 'origin/main'

This commit is contained in:
Core 2022-08-25 16:52:51 +01:00
commit 4eb4516978
No known key found for this signature in database
GPG key ID: 2AB8327FBA02D1C0
2 changed files with 6 additions and 3 deletions

View file

@ -57,8 +57,6 @@ jobs:
yarn install yarn install
cp resources/verror-types node_modules/@types/verror/index.d.ts cp resources/verror-types node_modules/@types/verror/index.d.ts
cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js 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 - name: Build the DMG
env: env:

View file

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