diff --git a/.github/workflows/desktop.release.reuse.yml b/.github/workflows/desktop.release.reuse.yml index dc75fcd66..c20d01e12 100644 --- a/.github/workflows/desktop.release.reuse.yml +++ b/.github/workflows/desktop.release.reuse.yml @@ -79,9 +79,6 @@ jobs: - run: yarn install --immutable - - name: Rebuild Electron Native Modules - run: yarn workspace @standardnotes/desktop rebuild:home-server - - run: yarn build:desktop - run: echo APP_VERSION=$(node -p "require('./../web/package.json').version") >> $GITHUB_ENV @@ -118,12 +115,24 @@ jobs: env: npm_config_target_arch: 'arm64' - - name: Snap + - name: Install Snapcraft run: | sudo snap install snapcraft --classic + + - name: Setup LXD + uses: canonical/setup-lxd@v0.1.1 + + - name: Install Review Tools + run: sudo snap install review-tools + + - name: Package Snap + run: | yarn run webpack --config desktop.webpack.prod.js --env snap yarn run electron-builder --linux --x64 -c.linux.target=snap --publish=never --c.extraMetadata.version=${{ env.APP_VERSION }} + - name: Review Snap + run: review-tools.snap-review dist/standard-notes-${{ env.APP_VERSION }}-linux-amd64.snap + - name: Upload uses: actions/upload-artifact@v3.0.0 with: diff --git a/.yarn/cache/7zip-bin-npm-5.1.1-802410de68-1e58ba3742.zip b/.yarn/cache/7zip-bin-npm-5.2.0-965f95d0fd-85d3102275.zip similarity index 76% rename from .yarn/cache/7zip-bin-npm-5.1.1-802410de68-1e58ba3742.zip rename to .yarn/cache/7zip-bin-npm-5.2.0-965f95d0fd-85d3102275.zip index 0cfdabbd4..6cd42bfdc 100644 Binary files a/.yarn/cache/7zip-bin-npm-5.1.1-802410de68-1e58ba3742.zip and b/.yarn/cache/7zip-bin-npm-5.2.0-965f95d0fd-85d3102275.zip differ diff --git a/.yarn/cache/@electron-asar-npm-3.2.8-a4f72433db-878d3b9ad2.zip b/.yarn/cache/@electron-asar-npm-3.2.8-a4f72433db-878d3b9ad2.zip new file mode 100644 index 000000000..a31aa5e42 Binary files /dev/null and b/.yarn/cache/@electron-asar-npm-3.2.8-a4f72433db-878d3b9ad2.zip differ diff --git a/.yarn/cache/@electron-osx-sign-npm-1.0.5-22146fb2fe-6c662e8bb4.zip b/.yarn/cache/@electron-osx-sign-npm-1.0.5-22146fb2fe-6c662e8bb4.zip new file mode 100644 index 000000000..8d160ae81 Binary files /dev/null and b/.yarn/cache/@electron-osx-sign-npm-1.0.5-22146fb2fe-6c662e8bb4.zip differ diff --git a/.yarn/cache/@electron-universal-npm-1.2.1-5c5ca95c40-9a7d98cf2b.zip b/.yarn/cache/@electron-universal-npm-1.2.1-5c5ca95c40-9a7d98cf2b.zip deleted file mode 100644 index d08ca8441..000000000 Binary files a/.yarn/cache/@electron-universal-npm-1.2.1-5c5ca95c40-9a7d98cf2b.zip and /dev/null differ diff --git a/.yarn/cache/@electron-universal-npm-1.4.1-4989028044-257f3a25a4.zip b/.yarn/cache/@electron-universal-npm-1.4.1-4989028044-257f3a25a4.zip new file mode 100644 index 000000000..12383a62d Binary files /dev/null and b/.yarn/cache/@electron-universal-npm-1.4.1-4989028044-257f3a25a4.zip differ diff --git a/.yarn/cache/app-builder-lib-npm-23.6.0-cb887be781-da3cc9f24e.zip b/.yarn/cache/app-builder-lib-npm-24.9.3-7396f9933a-30478fa08f.zip similarity index 51% rename from .yarn/cache/app-builder-lib-npm-23.6.0-cb887be781-da3cc9f24e.zip rename to .yarn/cache/app-builder-lib-npm-24.9.3-7396f9933a-30478fa08f.zip index 2cd45b06b..181b18724 100644 Binary files a/.yarn/cache/app-builder-lib-npm-23.6.0-cb887be781-da3cc9f24e.zip and b/.yarn/cache/app-builder-lib-npm-24.9.3-7396f9933a-30478fa08f.zip differ diff --git a/.yarn/cache/asar-npm-3.2.0-ce87ce2b73-f7d30b4597.zip b/.yarn/cache/asar-npm-3.2.0-ce87ce2b73-f7d30b4597.zip deleted file mode 100644 index b5891d939..000000000 Binary files a/.yarn/cache/asar-npm-3.2.0-ce87ce2b73-f7d30b4597.zip and /dev/null differ diff --git a/.yarn/cache/buffer-alloc-npm-1.2.0-388beee0c7-560cd27f3c.zip b/.yarn/cache/buffer-alloc-npm-1.2.0-388beee0c7-560cd27f3c.zip deleted file mode 100644 index ef6f1d41c..000000000 Binary files a/.yarn/cache/buffer-alloc-npm-1.2.0-388beee0c7-560cd27f3c.zip and /dev/null differ diff --git a/.yarn/cache/buffer-alloc-unsafe-npm-1.1.0-b5d7ccb44c-c5e18bf51f.zip b/.yarn/cache/buffer-alloc-unsafe-npm-1.1.0-b5d7ccb44c-c5e18bf51f.zip deleted file mode 100644 index d5c8f1123..000000000 Binary files a/.yarn/cache/buffer-alloc-unsafe-npm-1.1.0-b5d7ccb44c-c5e18bf51f.zip and /dev/null differ diff --git a/.yarn/cache/buffer-equal-npm-1.0.0-f497e443d4-c63a62d25f.zip b/.yarn/cache/buffer-equal-npm-1.0.0-f497e443d4-c63a62d25f.zip deleted file mode 100644 index 0fbf26f04..000000000 Binary files a/.yarn/cache/buffer-equal-npm-1.0.0-f497e443d4-c63a62d25f.zip and /dev/null differ diff --git a/.yarn/cache/buffer-equal-npm-1.0.1-eca4aa6d0d-6ead0f9767.zip b/.yarn/cache/buffer-equal-npm-1.0.1-eca4aa6d0d-6ead0f9767.zip new file mode 100644 index 000000000..1413a00af Binary files /dev/null and b/.yarn/cache/buffer-equal-npm-1.0.1-eca4aa6d0d-6ead0f9767.zip differ diff --git a/.yarn/cache/buffer-fill-npm-1.0.0-915809118a-c29b4723dd.zip b/.yarn/cache/buffer-fill-npm-1.0.0-915809118a-c29b4723dd.zip deleted file mode 100644 index e4bc0cfb2..000000000 Binary files a/.yarn/cache/buffer-fill-npm-1.0.0-915809118a-c29b4723dd.zip and /dev/null differ diff --git a/.yarn/cache/builder-util-npm-23.6.0-2b87d7882d-138fb9abed.zip b/.yarn/cache/builder-util-npm-23.6.0-2b87d7882d-138fb9abed.zip deleted file mode 100644 index 6e024f963..000000000 Binary files a/.yarn/cache/builder-util-npm-23.6.0-2b87d7882d-138fb9abed.zip and /dev/null differ diff --git a/.yarn/cache/builder-util-npm-24.8.1-fc3e50de3b-20555ebd25.zip b/.yarn/cache/builder-util-npm-24.8.1-fc3e50de3b-20555ebd25.zip new file mode 100644 index 000000000..6302f07d3 Binary files /dev/null and b/.yarn/cache/builder-util-npm-24.8.1-fc3e50de3b-20555ebd25.zip differ diff --git a/.yarn/cache/builder-util-runtime-npm-9.1.1-b7fce9788a-3458f9c8ac.zip b/.yarn/cache/builder-util-runtime-npm-9.1.1-b7fce9788a-3458f9c8ac.zip deleted file mode 100644 index 9037d816a..000000000 Binary files a/.yarn/cache/builder-util-runtime-npm-9.1.1-b7fce9788a-3458f9c8ac.zip and /dev/null differ diff --git a/.yarn/cache/builder-util-runtime-npm-9.2.3-3905baa738-f25d6f1235.zip b/.yarn/cache/builder-util-runtime-npm-9.2.3-3905baa738-f25d6f1235.zip new file mode 100644 index 000000000..cd74cc0b1 Binary files /dev/null and b/.yarn/cache/builder-util-runtime-npm-9.2.3-3905baa738-f25d6f1235.zip differ diff --git a/.yarn/cache/colors-npm-1.0.3-6c5d583ab3-234e8d3ab7.zip b/.yarn/cache/colors-npm-1.0.3-6c5d583ab3-234e8d3ab7.zip deleted file mode 100644 index ff9794571..000000000 Binary files a/.yarn/cache/colors-npm-1.0.3-6c5d583ab3-234e8d3ab7.zip and /dev/null differ diff --git a/.yarn/cache/config-file-ts-npm-0.2.4-97788fbb47-c7032064c0.zip b/.yarn/cache/config-file-ts-npm-0.2.4-97788fbb47-c7032064c0.zip new file mode 100644 index 000000000..006407ada Binary files /dev/null and b/.yarn/cache/config-file-ts-npm-0.2.4-97788fbb47-c7032064c0.zip differ diff --git a/.yarn/cache/dir-compare-npm-2.4.0-52c615bfd0-16710bcb64.zip b/.yarn/cache/dir-compare-npm-2.4.0-52c615bfd0-16710bcb64.zip deleted file mode 100644 index 6ac652354..000000000 Binary files a/.yarn/cache/dir-compare-npm-2.4.0-52c615bfd0-16710bcb64.zip and /dev/null differ diff --git a/.yarn/cache/dir-compare-npm-3.3.0-f1b755cdf8-05e7381509.zip b/.yarn/cache/dir-compare-npm-3.3.0-f1b755cdf8-05e7381509.zip new file mode 100644 index 000000000..3601b8695 Binary files /dev/null and b/.yarn/cache/dir-compare-npm-3.3.0-f1b755cdf8-05e7381509.zip differ diff --git a/.yarn/cache/dmg-builder-npm-23.6.0-d0da405dda-3e37a4b191.zip b/.yarn/cache/dmg-builder-npm-24.9.3-e8d550d2d7-704d463c12.zip similarity index 66% rename from .yarn/cache/dmg-builder-npm-23.6.0-d0da405dda-3e37a4b191.zip rename to .yarn/cache/dmg-builder-npm-24.9.3-e8d550d2d7-704d463c12.zip index 2a38e01dc..2aa197592 100644 Binary files a/.yarn/cache/dmg-builder-npm-23.6.0-d0da405dda-3e37a4b191.zip and b/.yarn/cache/dmg-builder-npm-24.9.3-e8d550d2d7-704d463c12.zip differ diff --git a/.yarn/cache/electron-builder-npm-23.6.0-f3b297a10e-227f8fb9c9.zip b/.yarn/cache/electron-builder-npm-23.6.0-f3b297a10e-227f8fb9c9.zip deleted file mode 100644 index b8ce00156..000000000 Binary files a/.yarn/cache/electron-builder-npm-23.6.0-f3b297a10e-227f8fb9c9.zip and /dev/null differ diff --git a/.yarn/cache/electron-builder-npm-24.9.3-8f4ca84302-e57fd4b8bb.zip b/.yarn/cache/electron-builder-npm-24.9.3-8f4ca84302-e57fd4b8bb.zip new file mode 100644 index 000000000..60400a52e Binary files /dev/null and b/.yarn/cache/electron-builder-npm-24.9.3-8f4ca84302-e57fd4b8bb.zip differ diff --git a/.yarn/cache/electron-osx-sign-npm-0.6.0-7bb99331fd-b688f9efb0.zip b/.yarn/cache/electron-osx-sign-npm-0.6.0-7bb99331fd-b688f9efb0.zip deleted file mode 100644 index f18c11d54..000000000 Binary files a/.yarn/cache/electron-osx-sign-npm-0.6.0-7bb99331fd-b688f9efb0.zip and /dev/null differ diff --git a/.yarn/cache/electron-publish-npm-23.6.0-a8579f7683-70473d800f.zip b/.yarn/cache/electron-publish-npm-23.6.0-a8579f7683-70473d800f.zip deleted file mode 100644 index 0fb4ec142..000000000 Binary files a/.yarn/cache/electron-publish-npm-23.6.0-a8579f7683-70473d800f.zip and /dev/null differ diff --git a/.yarn/cache/electron-publish-npm-24.8.1-066e04ea46-848cabcb9f.zip b/.yarn/cache/electron-publish-npm-24.8.1-066e04ea46-848cabcb9f.zip new file mode 100644 index 000000000..a05f32580 Binary files /dev/null and b/.yarn/cache/electron-publish-npm-24.8.1-066e04ea46-848cabcb9f.zip differ diff --git a/.yarn/cache/isbinaryfile-npm-3.0.3-c33e7ec0eb-9a55578685.zip b/.yarn/cache/isbinaryfile-npm-3.0.3-c33e7ec0eb-9a55578685.zip deleted file mode 100644 index 9c4e8511b..000000000 Binary files a/.yarn/cache/isbinaryfile-npm-3.0.3-c33e7ec0eb-9a55578685.zip and /dev/null differ diff --git a/.yarn/cache/isbinaryfile-npm-5.0.0-e98524e7a5-25cc27388d.zip b/.yarn/cache/isbinaryfile-npm-5.0.0-e98524e7a5-25cc27388d.zip new file mode 100644 index 000000000..212be4fa8 Binary files /dev/null and b/.yarn/cache/isbinaryfile-npm-5.0.0-e98524e7a5-25cc27388d.zip differ diff --git a/.yarn/cache/minimatch-npm-3.0.4-6e76f51c23-66ac295f8a.zip b/.yarn/cache/minimatch-npm-3.0.4-6e76f51c23-66ac295f8a.zip deleted file mode 100644 index 746542f9e..000000000 Binary files a/.yarn/cache/minimatch-npm-3.0.4-6e76f51c23-66ac295f8a.zip and /dev/null differ diff --git a/.yarn/cache/read-config-file-npm-6.2.0-7cf83ede19-51e30db822.zip b/.yarn/cache/read-config-file-npm-6.2.0-7cf83ede19-51e30db822.zip deleted file mode 100644 index cb8601812..000000000 Binary files a/.yarn/cache/read-config-file-npm-6.2.0-7cf83ede19-51e30db822.zip and /dev/null differ diff --git a/.yarn/cache/read-config-file-npm-6.3.2-f725eb295c-bb4862851b.zip b/.yarn/cache/read-config-file-npm-6.3.2-f725eb295c-bb4862851b.zip new file mode 100644 index 000000000..698f7ddac Binary files /dev/null and b/.yarn/cache/read-config-file-npm-6.3.2-f725eb295c-bb4862851b.zip differ diff --git a/.yarn/cache/semver-npm-7.0.0-218e8c00ca-272c11bf8d.zip b/.yarn/cache/semver-npm-7.0.0-218e8c00ca-272c11bf8d.zip deleted file mode 100644 index 74b3f93cf..000000000 Binary files a/.yarn/cache/semver-npm-7.0.0-218e8c00ca-272c11bf8d.zip and /dev/null differ diff --git a/.yarn/cache/simple-update-notifier-npm-1.1.0-92878518a3-1012e9b6c5.zip b/.yarn/cache/simple-update-notifier-npm-2.0.0-4d6e5dba61-9ba00d38ce.zip similarity index 58% rename from .yarn/cache/simple-update-notifier-npm-1.1.0-92878518a3-1012e9b6c5.zip rename to .yarn/cache/simple-update-notifier-npm-2.0.0-4d6e5dba61-9ba00d38ce.zip index 2a36e6d63..3d37f4e5d 100644 Binary files a/.yarn/cache/simple-update-notifier-npm-1.1.0-92878518a3-1012e9b6c5.zip and b/.yarn/cache/simple-update-notifier-npm-2.0.0-4d6e5dba61-9ba00d38ce.zip differ diff --git a/.yarn/cache/typescript-npm-4.9.5-6427b65ee6-ee000bc268.zip b/.yarn/cache/typescript-npm-4.9.5-6427b65ee6-ee000bc268.zip new file mode 100644 index 000000000..5434f6e63 Binary files /dev/null and b/.yarn/cache/typescript-npm-4.9.5-6427b65ee6-ee000bc268.zip differ diff --git a/.yarn/cache/typescript-patch-02b1b19504-2eee5c37ca.zip b/.yarn/cache/typescript-patch-02b1b19504-2eee5c37ca.zip new file mode 100644 index 000000000..69957d28e Binary files /dev/null and b/.yarn/cache/typescript-patch-02b1b19504-2eee5c37ca.zip differ diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 0444bb321..f48893c9f 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -64,7 +64,7 @@ "ava": "^5.1.0", "babel-loader": "^9.1.0", "copy-webpack-plugin": "^11.0.0", - "electron-builder": "23.6.0", + "electron-builder": "^24.9.1", "electron-rebuild": "^3.2.9", "eslint": "*", "eslint-config-prettier": "^8.9.0", @@ -142,9 +142,20 @@ ] }, "snap": { + "base": "core22", + "buildPackages": [ + "python3", + "libpython3.10" + ], + "stagePackages": [ + "default", + "python3", + "libpython3.10" + ], "plugs": [ "default", - "password-manager-service" + "password-manager-service", + "network-bind" ] } }, diff --git a/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.spec.ts b/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.spec.ts index 818bbe8a7..b8ad3d3f5 100644 --- a/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.spec.ts +++ b/packages/ui-services/src/Import/EvernoteConverter/EvernoteConverter.spec.ts @@ -93,11 +93,11 @@ describe('EvernoteConverter', () => { expect(result?.length).toBe(3) expect(result?.[0].content_type).toBe(ContentType.TYPES.Note) expect((result?.[0] as DecryptedTransferPayload).content.text).toBe( - '
This is a test.
h e ', + '

This is a test.

    h e ', ) expect(result?.[1].content_type).toBe(ContentType.TYPES.Note) expect((result?.[1] as DecryptedTransferPayload).content.text).toBe( - '
    Lorem ipsum dolor sit amet, consectetur adipiscing elit.
    ', + '

    Lorem ipsum dolor sit amet, consectetur adipiscing elit.

    ', ) expect(result?.[2].content_type).toBe(ContentType.TYPES.Tag) expect((result?.[2] as DecryptedTransferPayload).content.title).toBe('distant reading') diff --git a/yarn.lock b/yarn.lock index 03b7e592d..a7899484e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,10 +5,10 @@ __metadata: version: 6 cacheKey: 8 -"7zip-bin@npm:~5.1.1": - version: 5.1.1 - resolution: "7zip-bin@npm:5.1.1" - checksum: 1e58ba3742ac86daa84d2e60c46fd545f235c9f60a00cd36a87a70bf824cc0c821fdc418994f1745081b17e7bc83d155e1e82bd44b06996e7cab0a491ce644c1 +"7zip-bin@npm:~5.2.0": + version: 5.2.0 + resolution: "7zip-bin@npm:5.2.0" + checksum: 85d3102275342f1f4ba7d17e778e526dee3dbec0f57d29be7afaa6e3c26687d40a6eccf520e9140143f85a51f3353f6b545f760eff3f776c6ffb30dc5252fb7c languageName: node linkType: hard @@ -2857,6 +2857,19 @@ __metadata: languageName: node linkType: hard +"@electron/asar@npm:^3.2.1": + version: 3.2.8 + resolution: "@electron/asar@npm:3.2.8" + dependencies: + commander: ^5.0.0 + glob: ^7.1.6 + minimatch: ^3.0.4 + bin: + asar: bin/asar.js + checksum: 878d3b9ad232e4e8bb179ed50ed81244481c5dfe667952545a841f3afd782479c1d7e353f8fdedac771e029927b0f31b0a05a41f34cfc7c3099a064733c6d50a + languageName: node + linkType: hard + "@electron/get@npm:^2.0.0": version: 2.0.2 resolution: "@electron/get@npm:2.0.2" @@ -2876,7 +2889,7 @@ __metadata: languageName: node linkType: hard -"@electron/notarize@npm:^2.1.0": +"@electron/notarize@npm:2.1.0, @electron/notarize@npm:^2.1.0": version: 2.1.0 resolution: "@electron/notarize@npm:2.1.0" dependencies: @@ -2887,6 +2900,23 @@ __metadata: languageName: node linkType: hard +"@electron/osx-sign@npm:1.0.5": + version: 1.0.5 + resolution: "@electron/osx-sign@npm:1.0.5" + dependencies: + compare-version: ^0.1.2 + debug: ^4.3.4 + fs-extra: ^10.0.0 + isbinaryfile: ^4.0.8 + minimist: ^1.2.6 + plist: ^3.0.5 + bin: + electron-osx-flat: bin/electron-osx-flat.js + electron-osx-sign: bin/electron-osx-sign.js + checksum: 6c662e8bb4322b83f0147ddb4f5815770aca980a2cefc58a8423d502ccee4428168e11fa3c50f9660d29a74e3397f96c4f6ebddf1695ed28366aac0b92a49029 + languageName: node + linkType: hard + "@electron/remote@npm:^2.0.12": version: 2.0.12 resolution: "@electron/remote@npm:2.0.12" @@ -2896,18 +2926,18 @@ __metadata: languageName: node linkType: hard -"@electron/universal@npm:1.2.1": - version: 1.2.1 - resolution: "@electron/universal@npm:1.2.1" +"@electron/universal@npm:1.4.1": + version: 1.4.1 + resolution: "@electron/universal@npm:1.4.1" dependencies: + "@electron/asar": ^3.2.1 "@malept/cross-spawn-promise": ^1.1.0 - asar: ^3.1.0 debug: ^4.3.1 - dir-compare: ^2.4.0 + dir-compare: ^3.0.0 fs-extra: ^9.0.1 minimatch: ^3.0.4 plist: ^3.0.4 - checksum: 9a7d98cf2b8414ff0274384fef1b72b5a545a0feb7ce03163d2e2ee1b13e4f7064dfe7147cdd652708a1314d1b5e68acdd907847a1747866ec8d2d3e757ec1f7 + checksum: 257f3a25a4f940ccbe601a0f3a2a925a28657bc3c5fc46018980b771825834665d184e5ce75cfa0b8639525a0bdbb7f0bc02e69e2d4fb044add64638db4d48a4 languageName: node linkType: hard @@ -6537,7 +6567,7 @@ __metadata: decrypt: "github:standardnotes/decrypt#master" dotenv: ^16.3.1 electron: 27.0.0 - electron-builder: 23.6.0 + electron-builder: ^24.9.1 electron-log: ^4.4.8 electron-rebuild: ^3.2.9 electron-updater: ^6.1.4 @@ -7947,6 +7977,15 @@ __metadata: languageName: node linkType: hard +"@types/fs-extra@npm:9.0.13, @types/fs-extra@npm:^9.0.11": + version: 9.0.13 + resolution: "@types/fs-extra@npm:9.0.13" + dependencies: + "@types/node": "*" + checksum: add79e212acd5ac76b97b9045834e03a7996aef60a814185e0459088fd290519a3c1620865d588fa36c4498bf614210d2a703af5cf80aa1dbc125db78f6edac3 + languageName: node + linkType: hard + "@types/fs-extra@npm:^11.0.1": version: 11.0.1 resolution: "@types/fs-extra@npm:11.0.1" @@ -7957,15 +7996,6 @@ __metadata: languageName: node linkType: hard -"@types/fs-extra@npm:^9.0.11": - version: 9.0.13 - resolution: "@types/fs-extra@npm:9.0.13" - dependencies: - "@types/node": "*" - checksum: add79e212acd5ac76b97b9045834e03a7996aef60a814185e0459088fd290519a3c1620865d588fa36c4498bf614210d2a703af5cf80aa1dbc125db78f6edac3 - languageName: node - linkType: hard - "@types/glob@npm:^7.1.1": version: 7.2.0 resolution: "@types/glob@npm:7.2.0" @@ -8453,7 +8483,7 @@ __metadata: languageName: node linkType: hard -"@types/yargs@npm:^17.0.1, @types/yargs@npm:^17.0.8": +"@types/yargs@npm:^17.0.8": version: 17.0.24 resolution: "@types/yargs@npm:17.0.24" dependencies: @@ -9357,37 +9387,39 @@ __metadata: languageName: node linkType: hard -"app-builder-lib@npm:23.6.0": - version: 23.6.0 - resolution: "app-builder-lib@npm:23.6.0" +"app-builder-lib@npm:24.9.3": + version: 24.9.3 + resolution: "app-builder-lib@npm:24.9.3" dependencies: - 7zip-bin: ~5.1.1 + 7zip-bin: ~5.2.0 "@develar/schema-utils": ~2.6.5 - "@electron/universal": 1.2.1 + "@electron/notarize": 2.1.0 + "@electron/osx-sign": 1.0.5 + "@electron/universal": 1.4.1 "@malept/flatpak-bundler": ^0.4.0 + "@types/fs-extra": 9.0.13 async-exit-hook: ^2.0.1 bluebird-lst: ^1.0.9 - builder-util: 23.6.0 - builder-util-runtime: 9.1.1 + builder-util: 24.8.1 + builder-util-runtime: 9.2.3 chromium-pickle-js: ^0.2.0 debug: ^4.3.4 - ejs: ^3.1.7 - electron-osx-sign: ^0.6.0 - electron-publish: 23.6.0 + ejs: ^3.1.8 + electron-publish: 24.8.1 form-data: ^4.0.0 fs-extra: ^10.1.0 hosted-git-info: ^4.1.0 is-ci: ^3.0.0 - isbinaryfile: ^4.0.10 + isbinaryfile: ^5.0.0 js-yaml: ^4.1.0 lazy-val: ^1.0.5 - minimatch: ^3.1.2 - read-config-file: 6.2.0 + minimatch: ^5.1.1 + read-config-file: 6.3.2 sanitize-filename: ^1.6.3 - semver: ^7.3.7 - tar: ^6.1.11 + semver: ^7.3.8 + tar: ^6.1.12 temp-file: ^3.4.0 - checksum: da3cc9f24e127add651197076c5fa2f68bc7979bcd6a441df7f69629e96bf3aca3118d61c63a85d382a824748f8056a7639464f07b1ded09db53ff1c4b3101be + checksum: 30478fa08f51246bc645051dcf52585f82c480b77fd41738471da128fd46983e6e16657af3b43539739e6e22b10af417aacfbae7e88a87b9a0e9854c3fd58d3e languageName: node linkType: hard @@ -9681,24 +9713,6 @@ __metadata: languageName: node linkType: hard -"asar@npm:^3.1.0": - version: 3.2.0 - resolution: "asar@npm:3.2.0" - dependencies: - "@types/glob": ^7.1.1 - chromium-pickle-js: ^0.2.0 - commander: ^5.0.0 - glob: ^7.1.6 - minimatch: ^3.0.4 - dependenciesMeta: - "@types/glob": - optional: true - bin: - asar: bin/asar.js - checksum: f7d30b45970b053252ac124230bf319459d0728d7f6dedbe2f765cd2a83792d5a716d2c3f2861ceda69372b401f335e1f46460335169eadd0e91a0904a4f5a15 - languageName: node - linkType: hard - "asn1@npm:~0.2.3": version: 0.2.6 resolution: "asn1@npm:0.2.6" @@ -10265,7 +10279,7 @@ __metadata: languageName: node linkType: hard -"bluebird@npm:^3.5.0, bluebird@npm:^3.5.4, bluebird@npm:^3.5.5, bluebird@npm:~3.7": +"bluebird@npm:^3.5.4, bluebird@npm:^3.5.5, bluebird@npm:~3.7": version: 3.7.2 resolution: "bluebird@npm:3.7.2" checksum: 869417503c722e7dc54ca46715f70e15f4d9c602a423a02c825570862d12935be59ed9c7ba34a9b31f186c017c23cac6b54e35446f8353059c101da73eac22ef @@ -10460,23 +10474,6 @@ __metadata: languageName: node linkType: hard -"buffer-alloc-unsafe@npm:^1.1.0": - version: 1.1.0 - resolution: "buffer-alloc-unsafe@npm:1.1.0" - checksum: c5e18bf51f67754ec843c9af3d4c005051aac5008a3992938dda1344e5cfec77c4b02b4ca303644d1e9a6e281765155ce6356d85c6f5ccc5cd21afc868def396 - languageName: node - linkType: hard - -"buffer-alloc@npm:^1.2.0": - version: 1.2.0 - resolution: "buffer-alloc@npm:1.2.0" - dependencies: - buffer-alloc-unsafe: ^1.1.0 - buffer-fill: ^1.0.0 - checksum: 560cd27f3cbe73c614867da373407d4506309c62fe18de45a1ce191f3785ec6ca2488d802ff82065798542422980ca25f903db078c57822218182c37c3576df5 - languageName: node - linkType: hard - "buffer-crc32@npm:~0.2.3": version: 0.2.13 resolution: "buffer-crc32@npm:0.2.13" @@ -10491,17 +10488,10 @@ __metadata: languageName: node linkType: hard -"buffer-equal@npm:1.0.0": - version: 1.0.0 - resolution: "buffer-equal@npm:1.0.0" - checksum: c63a62d25ffc6f3a7064a86dd0d92d93a32d03b14f22d17374790bc10e94bca2312302895fdd28a2b0060999d4385cf90cbf6ad1a6678065156c664016d3be45 - languageName: node - linkType: hard - -"buffer-fill@npm:^1.0.0": - version: 1.0.0 - resolution: "buffer-fill@npm:1.0.0" - checksum: c29b4723ddeab01e74b5d3b982a0c6828f2ded49cef049ddca3dac661c874ecdbcecb5dd8380cf0f4adbeb8cff90a7de724126750a1f1e5ebd4eb6c59a1315b1 +"buffer-equal@npm:^1.0.0": + version: 1.0.1 + resolution: "buffer-equal@npm:1.0.1" + checksum: 6ead0f976726c4e2fb6f2e82419983f4a99cbf2cca1f1e107e16c23c4d91d9046c732dd29b63fc6ac194354f74fa107e8e94946ef2527812d83cde1d5a006309 languageName: node linkType: hard @@ -10544,16 +10534,6 @@ __metadata: languageName: node linkType: hard -"builder-util-runtime@npm:9.1.1": - version: 9.1.1 - resolution: "builder-util-runtime@npm:9.1.1" - dependencies: - debug: ^4.3.4 - sax: ^1.2.4 - checksum: 3458f9c8accad6e934c841cffa93f5d4b342c22b10b9c1a2eb3fd44ca96ea2c662b1048f9a075da9b8a4fada17206887b7e92ebdca331b1071520916e013e245 - languageName: node - linkType: hard - "builder-util-runtime@npm:9.2.1": version: 9.2.1 resolution: "builder-util-runtime@npm:9.2.1" @@ -10564,28 +10544,37 @@ __metadata: languageName: node linkType: hard -"builder-util@npm:23.6.0": - version: 23.6.0 - resolution: "builder-util@npm:23.6.0" +"builder-util-runtime@npm:9.2.3": + version: 9.2.3 + resolution: "builder-util-runtime@npm:9.2.3" dependencies: - 7zip-bin: ~5.1.1 + debug: ^4.3.4 + sax: ^1.2.4 + checksum: f25d6f12352be946785f0c6b8000902f3d8bd22921b7b0c7c9256829a4e3a6cf0c81d88e85cb73ffa00c7293b60573cacb533383d8ffce5b9b734b93d83553a8 + languageName: node + linkType: hard + +"builder-util@npm:24.8.1": + version: 24.8.1 + resolution: "builder-util@npm:24.8.1" + dependencies: + 7zip-bin: ~5.2.0 "@types/debug": ^4.1.6 - "@types/fs-extra": ^9.0.11 app-builder-bin: 4.0.0 bluebird-lst: ^1.0.9 - builder-util-runtime: 9.1.1 - chalk: ^4.1.1 + builder-util-runtime: 9.2.3 + chalk: ^4.1.2 cross-spawn: ^7.0.3 debug: ^4.3.4 - fs-extra: ^10.0.0 + fs-extra: ^10.1.0 http-proxy-agent: ^5.0.0 - https-proxy-agent: ^5.0.0 + https-proxy-agent: ^5.0.1 is-ci: ^3.0.0 js-yaml: ^4.1.0 source-map-support: ^0.5.19 stat-mode: ^1.0.0 temp-file: ^3.4.0 - checksum: 138fb9abed01ea2e5ac895e6a6ed75310ca6c89e0050483c81801b052f61b42ae5a042f457088b6e205ec8b4403b1ff3a325955f110255afb4da2310e3cf14ad + checksum: 20555ebd25bf94fc1136dedb9cdb11b8996ac1884a34f44f9c5e6fc1d7f34ae769ab021645d0db9f6c386844b5f9cd8f3947bb65e9a3505771f37580bce2faaf languageName: node linkType: hard @@ -11515,13 +11504,6 @@ __metadata: languageName: node linkType: hard -"colors@npm:1.0.3": - version: 1.0.3 - resolution: "colors@npm:1.0.3" - checksum: 234e8d3ab7e4003851cdd6a1f02eaa16dabc502ee5f4dc576ad7959c64b7477b15bd21177bab4055a4c0a66aa3d919753958030445f87c39a253d73b7a3637f5 - languageName: node - linkType: hard - "colors@npm:1.4.0": version: 1.4.0 resolution: "colors@npm:1.4.0" @@ -11770,6 +11752,16 @@ __metadata: languageName: node linkType: hard +"config-file-ts@npm:^0.2.4": + version: 0.2.4 + resolution: "config-file-ts@npm:0.2.4" + dependencies: + glob: ^7.1.6 + typescript: ^4.0.2 + checksum: c7032064c0b00d7a3c429ea4dad477cc32a66370a0a2c39440feea0568158e662781cb905a54319be50f0345a63045ecbd7cc9a9ccbf0cc15744f874deea8029 + languageName: node + linkType: hard + "configstore@npm:^6.0.0": version: 6.0.0 resolution: "configstore@npm:6.0.0" @@ -12380,7 +12372,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.8, debug@npm:^2.6.9": +"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.9": version: 2.6.9 resolution: "debug@npm:2.6.9" dependencies: @@ -12803,17 +12795,13 @@ __metadata: languageName: node linkType: hard -"dir-compare@npm:^2.4.0": - version: 2.4.0 - resolution: "dir-compare@npm:2.4.0" +"dir-compare@npm:^3.0.0": + version: 3.3.0 + resolution: "dir-compare@npm:3.3.0" dependencies: - buffer-equal: 1.0.0 - colors: 1.0.3 - commander: 2.9.0 - minimatch: 3.0.4 - bin: - dircompare: src/cli/dircompare.js - checksum: 16710bcb640b0edb753c6ecf10440c20a073588d797f624288601c52bca64a1f8c4dcd474d1fb7fda3595361b7cf528dee856140d83ecdaa19ba5695112d1209 + buffer-equal: ^1.0.0 + minimatch: ^3.0.4 + checksum: 05e7381509b17cb4e6791bd9569c12ce4267f44b1ee36594946ed895ed7ad24da9285130dc42af3a60707d58c76307bb3a1cbae2acd0a9cce8c74664e6a26828 languageName: node linkType: hard @@ -12842,21 +12830,21 @@ __metadata: languageName: node linkType: hard -"dmg-builder@npm:23.6.0": - version: 23.6.0 - resolution: "dmg-builder@npm:23.6.0" +"dmg-builder@npm:24.9.3": + version: 24.9.3 + resolution: "dmg-builder@npm:24.9.3" dependencies: - app-builder-lib: 23.6.0 - builder-util: 23.6.0 - builder-util-runtime: 9.1.1 + app-builder-lib: 24.9.3 + builder-util: 24.8.1 + builder-util-runtime: 9.2.3 dmg-license: ^1.0.11 - fs-extra: ^10.0.0 + fs-extra: ^10.1.0 iconv-lite: ^0.6.2 js-yaml: ^4.1.0 dependenciesMeta: dmg-license: optional: true - checksum: 3e37a4b191cf40c9c7b97d07408c2bf58e7632d78de0dc49a142fb7c68670fd2a7123f31ee8803b3cd100f38feea7b785c28698dfaace508254659d81ecc0b80 + checksum: 704d463c121298c4de1e2cb05c702c889926887e50e5121ef886c25abeca7aec8a4ef55b9e613359c9fb5168d3ded95562fa352dd4fcf0f4d2ad034d794748d4 languageName: node linkType: hard @@ -13137,7 +13125,7 @@ __metadata: languageName: node linkType: hard -"ejs@npm:^3.1.7": +"ejs@npm:^3.1.8": version: 3.1.9 resolution: "ejs@npm:3.1.9" dependencies: @@ -13148,26 +13136,25 @@ __metadata: languageName: node linkType: hard -"electron-builder@npm:23.6.0": - version: 23.6.0 - resolution: "electron-builder@npm:23.6.0" +"electron-builder@npm:^24.9.1": + version: 24.9.3 + resolution: "electron-builder@npm:24.9.3" dependencies: - "@types/yargs": ^17.0.1 - app-builder-lib: 23.6.0 - builder-util: 23.6.0 - builder-util-runtime: 9.1.1 - chalk: ^4.1.1 - dmg-builder: 23.6.0 - fs-extra: ^10.0.0 + app-builder-lib: 24.9.3 + builder-util: 24.8.1 + builder-util-runtime: 9.2.3 + chalk: ^4.1.2 + dmg-builder: 24.9.3 + fs-extra: ^10.1.0 is-ci: ^3.0.0 lazy-val: ^1.0.5 - read-config-file: 6.2.0 - simple-update-notifier: ^1.0.7 - yargs: ^17.5.1 + read-config-file: 6.3.2 + simple-update-notifier: 2.0.0 + yargs: ^17.6.2 bin: electron-builder: cli.js install-app-deps: install-app-deps.js - checksum: 227f8fb9c9bb11a11d999f2ade6a5cd1afb720d6ff5053c88b4be62d1265b6268c8f6b4b3b8ad6d0a7261d57ea5acd6619ef301b843865f260b616c474cf8cbd + checksum: e57fd4b8bb57d9f9761769b6e6c5b0c24381d2fea1212e7c5816f01ca7b80b7b80be440674e80ce67310bbf352d3579220baa5d524c3ee1f145134f982d10768 languageName: node linkType: hard @@ -13178,35 +13165,18 @@ __metadata: languageName: node linkType: hard -"electron-osx-sign@npm:^0.6.0": - version: 0.6.0 - resolution: "electron-osx-sign@npm:0.6.0" - dependencies: - bluebird: ^3.5.0 - compare-version: ^0.1.2 - debug: ^2.6.8 - isbinaryfile: ^3.0.2 - minimist: ^1.2.0 - plist: ^3.0.1 - bin: - electron-osx-flat: bin/electron-osx-flat.js - electron-osx-sign: bin/electron-osx-sign.js - checksum: b688f9efb013670b4226cff7c38101e7b1384ea44e1ab203259995f1eefc019c63aa18e936217a76d33b5a5a452b987ab3d86a56a961294582ce42acbb950de6 - languageName: node - linkType: hard - -"electron-publish@npm:23.6.0": - version: 23.6.0 - resolution: "electron-publish@npm:23.6.0" +"electron-publish@npm:24.8.1": + version: 24.8.1 + resolution: "electron-publish@npm:24.8.1" dependencies: "@types/fs-extra": ^9.0.11 - builder-util: 23.6.0 - builder-util-runtime: 9.1.1 - chalk: ^4.1.1 - fs-extra: ^10.0.0 + builder-util: 24.8.1 + builder-util-runtime: 9.2.3 + chalk: ^4.1.2 + fs-extra: ^10.1.0 lazy-val: ^1.0.5 mime: ^2.5.2 - checksum: 70473d800f0607b5ffc32473e87004079fe3e5f133242bb498dcff0be89bfaa4ce967860809e12b97ce216b1e907649a8a916b7483daf7a00ea28db3d665878e + checksum: 848cabcb9f8f973235d24a4efb1cb6dd24d90fa017846876e8c808174f7344b8218c1acb3361752ad35bdb858586456e0cb9e1b1d97213a791704dd9d7cd6c43 languageName: node linkType: hard @@ -17160,22 +17130,20 @@ __metadata: languageName: node linkType: hard -"isbinaryfile@npm:^3.0.2": - version: 3.0.3 - resolution: "isbinaryfile@npm:3.0.3" - dependencies: - buffer-alloc: ^1.2.0 - checksum: 9a555786857c66fe36024d15a54e0ca371c02275622b007356d6afca2b3bca179cb0bd97e1adf5d3922b3325c0fe22813645c7f7eafb4c4bdab1da9d635133c2 - languageName: node - linkType: hard - -"isbinaryfile@npm:^4.0.10": +"isbinaryfile@npm:^4.0.8": version: 4.0.10 resolution: "isbinaryfile@npm:4.0.10" checksum: a6b28db7e23ac7a77d3707567cac81356ea18bd602a4f21f424f862a31d0e7ab4f250759c98a559ece35ffe4d99f0d339f1ab884ffa9795172f632ab8f88e686 languageName: node linkType: hard +"isbinaryfile@npm:^5.0.0": + version: 5.0.0 + resolution: "isbinaryfile@npm:5.0.0" + checksum: 25cc27388d51b8322c103f5894f9e72ec04e017734e57c4b70be2666501ec7e7f6cbb4a5fcfd15260a7cac979bd1ddb7f5231f5a3098c0695c4e7c049513dfaf + languageName: node + linkType: hard + "isexe@npm:^1.1.1": version: 1.1.2 resolution: "isexe@npm:1.1.2" @@ -19811,15 +19779,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:3.0.4": - version: 3.0.4 - resolution: "minimatch@npm:3.0.4" - dependencies: - brace-expansion: ^1.1.7 - checksum: 66ac295f8a7b59788000ea3749938b0970344c841750abd96694f80269b926ebcafad3deeb3f1da2522978b119e6ae3a5869b63b13a7859a456b3408bd18a078 - languageName: node - linkType: hard - "minimatch@npm:^5.0.1, minimatch@npm:^5.1.1": version: 5.1.6 resolution: "minimatch@npm:5.1.6" @@ -21942,7 +21901,7 @@ __metadata: languageName: node linkType: hard -"plist@npm:^3.0.1, plist@npm:^3.0.4, plist@npm:^3.0.5": +"plist@npm:^3.0.4, plist@npm:^3.0.5": version: 3.1.0 resolution: "plist@npm:3.1.0" dependencies: @@ -22993,16 +22952,17 @@ __metadata: languageName: node linkType: hard -"read-config-file@npm:6.2.0": - version: 6.2.0 - resolution: "read-config-file@npm:6.2.0" +"read-config-file@npm:6.3.2": + version: 6.3.2 + resolution: "read-config-file@npm:6.3.2" dependencies: + config-file-ts: ^0.2.4 dotenv: ^9.0.2 dotenv-expand: ^5.1.0 js-yaml: ^4.1.0 json5: ^2.2.0 lazy-val: ^1.0.4 - checksum: 51e30db82244b8ceea19143207a52c5210fa17f5282ec43e9485cf7da87ac4ee3a0fb961cccc5c7af319b06d004baa0154349e09ca8ca7235ae7e5ac7c14c3f3 + checksum: bb4862851b616f905219a474fe92e37f2a65e07cda896cd3a89b3b357d38f9bfc3fd3d443e2f9c5fdd85b5166d5d09d49088dd8933cd82fd606c017a20703007 languageName: node linkType: hard @@ -23992,15 +23952,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:~7.0.0": - version: 7.0.0 - resolution: "semver@npm:7.0.0" - bin: - semver: bin/semver.js - checksum: 272c11bf8d083274ef79fe40a81c55c184dff84dd58e3c325299d0927ba48cece1f020793d138382b85f89bab5002a35a5ba59a3a68a7eebbb597eb733838778 - languageName: node - linkType: hard - "send@npm:0.18.0": version: 0.18.0 resolution: "send@npm:0.18.0" @@ -24290,12 +24241,12 @@ __metadata: languageName: node linkType: hard -"simple-update-notifier@npm:^1.0.7": - version: 1.1.0 - resolution: "simple-update-notifier@npm:1.1.0" +"simple-update-notifier@npm:2.0.0": + version: 2.0.0 + resolution: "simple-update-notifier@npm:2.0.0" dependencies: - semver: ~7.0.0 - checksum: 1012e9b6c504e559a948078177b3eedbb9d7e4d15878e2bda56314d08db609ca5da485be4ac9f838759faae8057935ee0246fcdf63f1233c86bd9fecb2a5544b + semver: ^7.5.3 + checksum: 9ba00d38ce6a29682f64a46213834e4eb01634c2f52c813a9a7b8873ca49cdbb703696f3290f3b27dc067de6d9418b0b84bef22c3eb074acf352529b2d6c27fd languageName: node linkType: hard @@ -25376,7 +25327,7 @@ __metadata: languageName: node linkType: hard -"tar@npm:^6.0.5": +"tar@npm:^6.0.5, tar@npm:^6.1.12": version: 6.2.0 resolution: "tar@npm:6.2.0" dependencies: @@ -26255,6 +26206,16 @@ __metadata: languageName: node linkType: hard +"typescript@npm:^4.0.2": + version: 4.9.5 + resolution: "typescript@npm:4.9.5" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db + languageName: node + linkType: hard + "typescript@patch:typescript@*#~builtin, typescript@patch:typescript@^4.6.4 || ^5.0.0#~builtin": version: 5.1.6 resolution: "typescript@patch:typescript@npm%3A5.1.6#~builtin::version=5.1.6&hash=7ad353" @@ -26275,6 +26236,16 @@ __metadata: languageName: node linkType: hard +"typescript@patch:typescript@^4.0.2#~builtin": + version: 4.9.5 + resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin::version=4.9.5&hash=7ad353" + bin: + tsc: bin/tsc + tsserver: bin/tsserver + checksum: 2eee5c37cad4390385db5db5a8e81470e42e8f1401b0358d7390095d6f681b410f2c4a0c496c6ff9ebd775423c7785cdace7bcdad76c7bee283df3d9718c0f20 + languageName: node + linkType: hard + "ua-parser-js@npm:^1.0.35": version: 1.0.37 resolution: "ua-parser-js@npm:1.0.37" @@ -27599,7 +27570,7 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^17.0.0, yargs@npm:^17.0.1, yargs@npm:^17.2.1, yargs@npm:^17.3.1, yargs@npm:^17.5.1, yargs@npm:^17.6.2, yargs@npm:^17.7.1, yargs@npm:^17.7.2": +"yargs@npm:^17.0.0, yargs@npm:^17.0.1, yargs@npm:^17.2.1, yargs@npm:^17.3.1, yargs@npm:^17.6.2, yargs@npm:^17.7.1, yargs@npm:^17.7.2": version: 17.7.2 resolution: "yargs@npm:17.7.2" dependencies: