diff --git a/.yarn/cache/@electron-node-gyp-https-d0f303c37e-60e9690cbd.zip b/.yarn/cache/@electron-node-gyp-https-d0f303c37e-60e9690cbd.zip new file mode 100644 index 000000000..3a545dff9 Binary files /dev/null and b/.yarn/cache/@electron-node-gyp-https-d0f303c37e-60e9690cbd.zip differ diff --git a/.yarn/cache/@electron-rebuild-npm-3.6.0-81cf7c7220-0dbf320b71.zip b/.yarn/cache/@electron-rebuild-npm-3.6.0-81cf7c7220-0dbf320b71.zip deleted file mode 100644 index ea6512cce..000000000 Binary files a/.yarn/cache/@electron-rebuild-npm-3.6.0-81cf7c7220-0dbf320b71.zip and /dev/null differ diff --git a/.yarn/cache/@electron-rebuild-npm-3.7.1-bdcacf1271-8789c02bd5.zip b/.yarn/cache/@electron-rebuild-npm-3.7.1-bdcacf1271-8789c02bd5.zip new file mode 100644 index 000000000..f0b762582 Binary files /dev/null and b/.yarn/cache/@electron-rebuild-npm-3.7.1-bdcacf1271-8789c02bd5.zip differ diff --git a/.yarn/cache/@npmcli-fs-npm-2.1.2-08d434e77b-405074965e.zip b/.yarn/cache/@npmcli-fs-npm-2.1.2-08d434e77b-405074965e.zip new file mode 100644 index 000000000..2d9040ce5 Binary files /dev/null and b/.yarn/cache/@npmcli-fs-npm-2.1.2-08d434e77b-405074965e.zip differ diff --git a/.yarn/cache/@npmcli-move-file-npm-2.0.1-b593d8f741-52dc02259d.zip b/.yarn/cache/@npmcli-move-file-npm-2.0.1-b593d8f741-52dc02259d.zip new file mode 100644 index 000000000..f6a649e34 Binary files /dev/null and b/.yarn/cache/@npmcli-move-file-npm-2.0.1-b593d8f741-52dc02259d.zip differ diff --git a/.yarn/cache/cacache-npm-16.1.3-4e2088ed0d-d91409e6e5.zip b/.yarn/cache/cacache-npm-16.1.3-4e2088ed0d-d91409e6e5.zip new file mode 100644 index 000000000..2bba5de79 Binary files /dev/null and b/.yarn/cache/cacache-npm-16.1.3-4e2088ed0d-d91409e6e5.zip differ diff --git a/.yarn/cache/electron-npm-32.2.7-017558c004-bdd1230f6f.zip b/.yarn/cache/electron-npm-32.2.7-017558c004-bdd1230f6f.zip new file mode 100644 index 000000000..0a61c58a4 Binary files /dev/null and b/.yarn/cache/electron-npm-32.2.7-017558c004-bdd1230f6f.zip differ diff --git a/.yarn/cache/electron-npm-33.2.1-7d0242d71d-c5b7d5fe56.zip b/.yarn/cache/electron-npm-33.2.1-7d0242d71d-c5b7d5fe56.zip deleted file mode 100644 index c5218398b..000000000 Binary files a/.yarn/cache/electron-npm-33.2.1-7d0242d71d-c5b7d5fe56.zip and /dev/null differ diff --git a/.yarn/cache/make-fetch-happen-npm-10.2.1-f1cc7cd2df-2332eb9a8e.zip b/.yarn/cache/make-fetch-happen-npm-10.2.1-f1cc7cd2df-2332eb9a8e.zip new file mode 100644 index 000000000..f257e35c7 Binary files /dev/null and b/.yarn/cache/make-fetch-happen-npm-10.2.1-f1cc7cd2df-2332eb9a8e.zip differ diff --git a/.yarn/cache/minipass-fetch-npm-2.1.2-9b21a5c930-3f216be791.zip b/.yarn/cache/minipass-fetch-npm-2.1.2-9b21a5c930-3f216be791.zip new file mode 100644 index 000000000..59a89f1b1 Binary files /dev/null and b/.yarn/cache/minipass-fetch-npm-2.1.2-9b21a5c930-3f216be791.zip differ diff --git a/.yarn/cache/proc-log-npm-2.0.1-0593660460-f6f23564ff.zip b/.yarn/cache/proc-log-npm-2.0.1-0593660460-f6f23564ff.zip new file mode 100644 index 000000000..a6c041d11 Binary files /dev/null and b/.yarn/cache/proc-log-npm-2.0.1-0593660460-f6f23564ff.zip differ diff --git a/.yarn/cache/ssri-npm-9.0.1-33ce27f4f8-fb58f5e46b.zip b/.yarn/cache/ssri-npm-9.0.1-33ce27f4f8-fb58f5e46b.zip new file mode 100644 index 000000000..4af584ce2 Binary files /dev/null and b/.yarn/cache/ssri-npm-9.0.1-33ce27f4f8-fb58f5e46b.zip differ diff --git a/.yarn/cache/tar-npm-6.2.1-237800bb20-f1322768c9.zip b/.yarn/cache/tar-npm-6.2.1-237800bb20-f1322768c9.zip new file mode 100644 index 000000000..40ff59da9 Binary files /dev/null and b/.yarn/cache/tar-npm-6.2.1-237800bb20-f1322768c9.zip differ diff --git a/.yarn/cache/unique-filename-npm-2.0.1-183c6c7c2b-807acf3381.zip b/.yarn/cache/unique-filename-npm-2.0.1-183c6c7c2b-807acf3381.zip new file mode 100644 index 000000000..1d4f41956 Binary files /dev/null and b/.yarn/cache/unique-filename-npm-2.0.1-183c6c7c2b-807acf3381.zip differ diff --git a/.yarn/cache/unique-slug-npm-3.0.0-0b82e51577-49f8d915ba.zip b/.yarn/cache/unique-slug-npm-3.0.0-0b82e51577-49f8d915ba.zip new file mode 100644 index 000000000..9e3f7f2f6 Binary files /dev/null and b/.yarn/cache/unique-slug-npm-3.0.0-0b82e51577-49f8d915ba.zip differ diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 3da8daa8c..b0e3bf977 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -43,7 +43,7 @@ "compare-versions": "^6.1.0", "decrypt": "github:standardnotes/decrypt#master", "dotenv": "^16.3.1", - "electron": "33.2.1", + "electron": "32.2.7", "electron-log": "^4.4.8", "electron-updater": "^6.1.4", "fs-extra": "^11.1.1", @@ -55,7 +55,7 @@ "@babel/core": "*", "@babel/preset-env": "*", "@electron/notarize": "^2.1.0", - "@electron/rebuild": "^3.6.0", + "@electron/rebuild": "^3.7.1", "@types/fs-extra": "^11.0.1", "@types/lodash": "^4.14.189", "@types/mime-types": "^2.1.1", diff --git a/packages/web/package.json b/packages/web/package.json index 97735dc89..bb4ac266f 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -3,7 +3,7 @@ "version": "3.195.15", "license": "AGPL-3.0", "main": "dist/app.js", - "author": "Standard Notes", + "author": "Standard Notes.", "private": true, "files": [ "dist" diff --git a/yarn.lock b/yarn.lock index 45a11a7b5..9c0e36ba5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3314,6 +3314,26 @@ __metadata: languageName: node linkType: hard +"@electron/node-gyp@git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2": + version: 10.2.0-electron.1 + resolution: "@electron/node-gyp@https://github.com/electron/node-gyp.git#commit=06b29aafb7708acef8b3669835c8a7857ebc92d2" + dependencies: + env-paths: ^2.2.0 + exponential-backoff: ^3.1.1 + glob: ^8.1.0 + graceful-fs: ^4.2.6 + make-fetch-happen: ^10.2.1 + nopt: ^6.0.0 + proc-log: ^2.0.1 + semver: ^7.3.5 + tar: ^6.2.1 + which: ^2.0.2 + bin: + node-gyp: ./bin/node-gyp.js + checksum: 60e9690cbdf6c595032db6718ab025a8a092041e307f17f9927849113035232cb75d7ec97950c70bb7e099ad88e013b85576154877858be404f0ecba1f1a0bb9 + languageName: node + linkType: hard + "@electron/notarize@npm:2.1.0, @electron/notarize@npm:^2.1.0": version: 2.1.0 resolution: "@electron/notarize@npm:2.1.0" @@ -3342,10 +3362,11 @@ __metadata: languageName: node linkType: hard -"@electron/rebuild@npm:^3.6.0": - version: 3.6.0 - resolution: "@electron/rebuild@npm:3.6.0" +"@electron/rebuild@npm:^3.7.1": + version: 3.7.1 + resolution: "@electron/rebuild@npm:3.7.1" dependencies: + "@electron/node-gyp": "git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2" "@malept/cross-spawn-promise": ^2.0.0 chalk: ^4.0.0 debug: ^4.1.1 @@ -3354,7 +3375,7 @@ __metadata: got: ^11.7.0 node-abi: ^3.45.0 node-api-version: ^0.2.0 - node-gyp: ^9.0.0 + node-gyp: latest ora: ^5.1.0 read-binary-file-arch: ^1.0.6 semver: ^7.3.5 @@ -3362,7 +3383,7 @@ __metadata: yargs: ^17.0.1 bin: electron-rebuild: lib/cli.js - checksum: 0dbf320b71ba5bc31ff7e0f46b157a16d56a7ee2b2d503ad60b46fe4673f9ba63c5b270a00e44856564e6a9fd5da216034a26eb3321679c40b681156ab6289a2 + checksum: 8789c02bd5ee91372988c2698d9b476f6732daf801ae62e92818077e3bdf6de1ffd4e363cfcad66de8be4077fd41e8369a7a67191a9dd1bfbe3b39c184289683 languageName: node linkType: hard @@ -3469,7 +3490,7 @@ __metadata: languageName: node linkType: hard -"@gar/promisify@npm:^1.0.1": +"@gar/promisify@npm:^1.0.1, @gar/promisify@npm:^1.1.3": version: 1.1.3 resolution: "@gar/promisify@npm:1.1.3" checksum: 4059f790e2d07bf3c3ff3e0fec0daa8144fe35c1f6e0111c9921bd32106adaa97a4ab096ad7dab1e28ee6a9060083c4d1a4ada42a7f5f3f7a96b8812e2b757c1 @@ -4753,6 +4774,16 @@ __metadata: languageName: node linkType: hard +"@npmcli/fs@npm:^2.1.0": + version: 2.1.2 + resolution: "@npmcli/fs@npm:2.1.2" + dependencies: + "@gar/promisify": ^1.1.3 + semver: ^7.3.5 + checksum: 405074965e72d4c9d728931b64d2d38e6ea12066d4fad651ac253d175e413c06fe4350970c783db0d749181da8fe49c42d3880bd1cbc12cd68e3a7964d820225 + languageName: node + linkType: hard + "@npmcli/fs@npm:^3.1.0": version: 3.1.0 resolution: "@npmcli/fs@npm:3.1.0" @@ -4824,6 +4855,16 @@ __metadata: languageName: node linkType: hard +"@npmcli/move-file@npm:^2.0.0": + version: 2.0.1 + resolution: "@npmcli/move-file@npm:2.0.1" + dependencies: + mkdirp: ^1.0.4 + rimraf: ^3.0.2 + checksum: 52dc02259d98da517fae4cb3a0a3850227bdae4939dda1980b788a7670636ca2b4a01b58df03dd5f65c1e3cb70c50fa8ce5762b582b3f499ec30ee5ce1fd9380 + languageName: node + linkType: hard + "@npmcli/name-from-folder@npm:^2.0.0": version: 2.0.0 resolution: "@npmcli/name-from-folder@npm:2.0.0" @@ -7383,7 +7424,7 @@ __metadata: "@babel/core": "*" "@babel/preset-env": "*" "@electron/notarize": ^2.1.0 - "@electron/rebuild": ^3.6.0 + "@electron/rebuild": ^3.7.1 "@electron/remote": ^2.1.2 "@standardnotes/domain-core": ^1.40.0 "@standardnotes/electron-clear-data": 1.1.1 @@ -7401,7 +7442,7 @@ __metadata: copy-webpack-plugin: ^11.0.0 decrypt: "github:standardnotes/decrypt#master" dotenv: ^16.3.1 - electron: 33.2.1 + electron: 32.2.7 electron-builder: ^24.9.1 electron-log: ^4.4.8 electron-updater: ^6.1.4 @@ -11614,6 +11655,32 @@ __metadata: languageName: node linkType: hard +"cacache@npm:^16.1.0": + version: 16.1.3 + resolution: "cacache@npm:16.1.3" + dependencies: + "@npmcli/fs": ^2.1.0 + "@npmcli/move-file": ^2.0.0 + chownr: ^2.0.0 + fs-minipass: ^2.1.0 + glob: ^8.0.1 + infer-owner: ^1.0.4 + lru-cache: ^7.7.1 + minipass: ^3.1.6 + minipass-collect: ^1.0.2 + minipass-flush: ^1.0.5 + minipass-pipeline: ^1.2.4 + mkdirp: ^1.0.4 + p-map: ^4.0.0 + promise-inflight: ^1.0.1 + rimraf: ^3.0.2 + ssri: ^9.0.0 + tar: ^6.1.11 + unique-filename: ^2.0.0 + checksum: d91409e6e57d7d9a3a25e5dcc589c84e75b178ae8ea7de05cbf6b783f77a5fae938f6e8fda6f5257ed70000be27a681e1e44829251bfffe4c10216002f8f14e6 + languageName: node + linkType: hard + "cacache@npm:^17.0.0, cacache@npm:^17.0.4": version: 17.1.3 resolution: "cacache@npm:17.1.3" @@ -14183,16 +14250,16 @@ __metadata: languageName: node linkType: hard -"electron@npm:33.2.1": - version: 33.2.1 - resolution: "electron@npm:33.2.1" +"electron@npm:32.2.7": + version: 32.2.7 + resolution: "electron@npm:32.2.7" dependencies: "@electron/get": ^2.0.0 "@types/node": ^20.9.0 extract-zip: ^2.0.1 bin: electron: cli.js - checksum: c5b7d5fe56f831da5d14be9d24d0a29fdb392d5b4e593b31200a9c01e6260d87bba1216c4cc17297b2f4838e0893428464b9e2ca71c3eaff499dbff1981c0670 + checksum: bdd1230f6fcef7c5064d15de22fea816310335d36641e7daf58de47bfaab09c90918bbc2bf8177ba37c74b5762b343b90eab0b82b45d89a99dfeb9c0e19cdda7 languageName: node linkType: hard @@ -15935,7 +16002,7 @@ __metadata: languageName: node linkType: hard -"fs-minipass@npm:^2.0.0": +"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" dependencies: @@ -16389,7 +16456,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.3, glob@npm:^8.1.0": +"glob@npm:^8.0.1, glob@npm:^8.0.3, glob@npm:^8.1.0": version: 8.1.0 resolution: "glob@npm:8.1.0" dependencies: @@ -20028,6 +20095,30 @@ __metadata: languageName: node linkType: hard +"make-fetch-happen@npm:^10.2.1": + version: 10.2.1 + resolution: "make-fetch-happen@npm:10.2.1" + dependencies: + agentkeepalive: ^4.2.1 + cacache: ^16.1.0 + http-cache-semantics: ^4.1.0 + http-proxy-agent: ^5.0.0 + https-proxy-agent: ^5.0.0 + is-lambda: ^1.0.1 + lru-cache: ^7.7.1 + minipass: ^3.1.6 + minipass-collect: ^1.0.2 + minipass-fetch: ^2.0.3 + minipass-flush: ^1.0.5 + minipass-pipeline: ^1.2.4 + negotiator: ^0.6.3 + promise-retry: ^2.0.1 + socks-proxy-agent: ^7.0.0 + ssri: ^9.0.0 + checksum: 2332eb9a8ec96f1ffeeea56ccefabcb4193693597b132cd110734d50f2928842e22b84cfa1508e921b8385cdfd06dda9ad68645fed62b50fff629a580f5fb72c + languageName: node + linkType: hard + "make-fetch-happen@npm:^11.0.0, make-fetch-happen@npm:^11.0.1, make-fetch-happen@npm:^11.0.3, make-fetch-happen@npm:^11.1.1": version: 11.1.1 resolution: "make-fetch-happen@npm:11.1.1" @@ -20726,6 +20817,21 @@ __metadata: languageName: node linkType: hard +"minipass-fetch@npm:^2.0.3": + version: 2.1.2 + resolution: "minipass-fetch@npm:2.1.2" + dependencies: + encoding: ^0.1.13 + minipass: ^3.1.6 + minipass-sized: ^1.0.3 + minizlib: ^2.1.2 + dependenciesMeta: + encoding: + optional: true + checksum: 3f216be79164e915fc91210cea1850e488793c740534985da017a4cbc7a5ff50506956d0f73bb0cb60e4fe91be08b6b61ef35101706d3ef5da2c8709b5f08f91 + languageName: node + linkType: hard + "minipass-fetch@npm:^3.0.0": version: 3.0.3 resolution: "minipass-fetch@npm:3.0.3" @@ -20778,7 +20884,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^3.0.0, minipass@npm:^3.1.0, minipass@npm:^3.1.1, minipass@npm:^3.1.3": +"minipass@npm:^3.0.0, minipass@npm:^3.1.0, minipass@npm:^3.1.1, minipass@npm:^3.1.3, minipass@npm:^3.1.6": version: 3.3.6 resolution: "minipass@npm:3.3.6" dependencies: @@ -23135,6 +23241,13 @@ __metadata: languageName: node linkType: hard +"proc-log@npm:^2.0.1": + version: 2.0.1 + resolution: "proc-log@npm:2.0.1" + checksum: f6f23564ff759097db37443e6e2765af84979a703d2c52c1b9df506ee9f87caa101ba49d8fdc115c1a313ec78e37e8134704e9069e6a870f3499d98bb24c436f + languageName: node + linkType: hard + "proc-log@npm:^3.0.0": version: 3.0.0 resolution: "proc-log@npm:3.0.0" @@ -25580,6 +25693,15 @@ __metadata: languageName: node linkType: hard +"ssri@npm:^9.0.0": + version: 9.0.1 + resolution: "ssri@npm:9.0.1" + dependencies: + minipass: ^3.1.1 + checksum: fb58f5e46b6923ae67b87ad5ef1c5ab6d427a17db0bead84570c2df3cd50b4ceb880ebdba2d60726588272890bae842a744e1ecce5bd2a2a582fccd5068309eb + languageName: node + linkType: hard + "stable@npm:^0.1.8": version: 0.1.8 resolution: "stable@npm:0.1.8" @@ -26188,6 +26310,20 @@ __metadata: languageName: node linkType: hard +"tar@npm:^6.2.1": + version: 6.2.1 + resolution: "tar@npm:6.2.1" + dependencies: + chownr: ^2.0.0 + fs-minipass: ^2.0.0 + minipass: ^5.0.0 + minizlib: ^2.1.1 + mkdirp: ^1.0.3 + yallist: ^4.0.0 + checksum: f1322768c9741a25356c11373bce918483f40fa9a25c69c59410c8a1247632487edef5fe76c5f12ac51a6356d2f1829e96d2bc34098668a2fc34d76050ac2b6c + languageName: node + linkType: hard + "telnet-client@npm:1.2.8": version: 1.2.8 resolution: "telnet-client@npm:1.2.8" @@ -27196,6 +27332,15 @@ __metadata: languageName: node linkType: hard +"unique-filename@npm:^2.0.0": + version: 2.0.1 + resolution: "unique-filename@npm:2.0.1" + dependencies: + unique-slug: ^3.0.0 + checksum: 807acf3381aff319086b64dc7125a9a37c09c44af7620bd4f7f3247fcd5565660ac12d8b80534dcbfd067e6fe88a67e621386dd796a8af828d1337a8420a255f + languageName: node + linkType: hard + "unique-filename@npm:^3.0.0": version: 3.0.0 resolution: "unique-filename@npm:3.0.0" @@ -27214,6 +27359,15 @@ __metadata: languageName: node linkType: hard +"unique-slug@npm:^3.0.0": + version: 3.0.0 + resolution: "unique-slug@npm:3.0.0" + dependencies: + imurmurhash: ^0.1.4 + checksum: 49f8d915ba7f0101801b922062ee46b7953256c93ceca74303bd8e6413ae10aa7e8216556b54dc5382895e8221d04f1efaf75f945c2e4a515b4139f77aa6640c + languageName: node + linkType: hard + "unique-slug@npm:^4.0.0": version: 4.0.0 resolution: "unique-slug@npm:4.0.0"