Skip to content

Commit 7f0d7cf

Browse files
committed
Merge branch 'dev' into main
2 parents 269a966 + fa9149c commit 7f0d7cf

File tree

8 files changed

+22
-42
lines changed

8 files changed

+22
-42
lines changed

apps/client/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
"zod": "3.19.1"
9393
},
9494
"devDependencies": {
95-
"@electron/notarize": "^2.1.0",
9695
"@intlify/vite-plugin-vue-i18n": "3.4.0",
9796
"@quasar/app-vite": "^1.4.3",
9897
"@types/argon2-browser": "^1.18.1",

apps/client/quasar.config.js

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,11 @@ module.exports = configure(function (ctx) {
333333
entitlements: 'src-capacitor/ios/App/App/entitlements.mac.plist',
334334
entitlementsInherit:
335335
'src-capacitor/ios/App/App/entitlements.mac.plist',
336+
337+
notarize: {
338+
appBundleId: 'app.deepnotes',
339+
teamId: 'NK86B84G2A',
340+
},
336341
},
337342
dmg: {
338343
sign: false,
@@ -342,9 +347,23 @@ module.exports = configure(function (ctx) {
342347
target: 'AppImage',
343348
},
344349

345-
win: {
346-
target: 'appx',
347-
},
350+
...(true // true for NSIS, false for AppX
351+
? {
352+
win: {
353+
target: 'nsis',
354+
355+
certificateSubjectName: 'Open Source Developer, Gustavo Toyota',
356+
certificateSha1: 'CB1E09666FC60FB06D09E9FEAD2D41F1B0626B30',
357+
},
358+
}
359+
: {
360+
win: {
361+
target: 'appx',
362+
363+
// Don't need to sign the AppX package
364+
},
365+
}),
366+
348367
appx: {
349368
applicationId: 'app.deepnotes',
350369

@@ -354,8 +373,6 @@ module.exports = configure(function (ctx) {
354373
publisher: 'CN=07D378F2-6F19-4C16-B6BE-146DA7696C3F',
355374
publisherDisplayName: 'DeepNotes',
356375
},
357-
358-
afterSign: 'src-electron/notarize.js',
359376
},
360377
},
361378

18.6 KB
Loading
13.3 KB
Loading
17 KB
Loading
16.3 KB
Loading

apps/client/src-electron/notarize.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

pnpm-lock.yaml

Lines changed: 0 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)