Skip to content

Commit 4c48e79

Browse files
committed
Return to electron-packager 17
This partially reverts commit cf48bcd.
1 parent cf48bcd commit 4c48e79

3 files changed

Lines changed: 393 additions & 182 deletions

File tree

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
},
6363
"resolutions": {
6464
"@types/react-css-transition-replace/@types/react": "^16.14.62",
65+
"yauzl": "3.3.1",
6566
"wrap-ansi": "7.0.0"
6667
},
6768
"dependencies": {
@@ -158,9 +159,9 @@
158159
"@types/webpack-bundle-analyzer": "^4.7.0",
159160
"@types/webpack-hot-middleware": "^2.25.9",
160161
"diff": "^8.0.3",
161-
"@electron/packager": "20.0.1",
162162
"electron": "42.4.0",
163163
"electron-builder": "^25.1.8",
164+
"electron-packager": "^17.1.1",
164165
"electron-winstaller": "^5.0.0",
165166
"eslint-plugin-github": "^5.1.5",
166167
"markdownlint-cli": "^0.32.2",

script/build.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
/// <reference path="./globals.d.ts" />
33

44
import * as cp from 'child_process'
5-
import { packager } from '@electron/packager'
6-
import { NotaryToolCredentials } from '@electron/notarize'
7-
5+
import packager, { OsxNotarizeOptions } from 'electron-packager'
86
import frontMatter from 'front-matter'
97
import * as path from 'path'
108
import { getPrintenvzPath } from 'printenvz'
@@ -631,14 +629,14 @@ ${licenseText}`
631629
rmSync(chooseALicense, { recursive: true, force: true })
632630
}
633631

634-
function getNotarizationOptions(): NotaryToolCredentials | undefined {
632+
function getNotarizationOptions(): OsxNotarizeOptions | undefined {
635633
const {
636634
APPLE_ID: appleId,
637635
APPLE_ID_PASSWORD: appleIdPassword,
638636
APPLE_TEAM_ID: teamId,
639637
} = process.env
640638

641639
return appleId && appleIdPassword && teamId
642-
? { appleId, appleIdPassword, teamId }
640+
? { tool: 'notarytool', appleId, appleIdPassword, teamId }
643641
: undefined
644642
}

0 commit comments

Comments
 (0)