Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update dependency typescript to v5.5.3 #8323

Merged
merged 5 commits into from
Jul 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/famous-cycles-walk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"app-builder-lib": patch
"electron-updater": patch
---

chore(deps): update dependency typescript to v5.5.3
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"lint": "eslint packages --ext .ts",
"lint-staged": "lint-staged",
"lint-deps": "node ./test/out/helpers/checkDeps.js",
"pretest": "pnpm lint && pnpm lint-deps",
"pretest": "pnpm lint-deps && pnpm lint",
"prettier": "prettier 'packages/**/*.{ts, js}' 'test/src/**/*.ts' --write",
"///": "Please see https://github.com/electron-userland/electron-builder/blob/master/CONTRIBUTING.md#run-test-using-cli how to run particular test instead full (and very slow) run",
"test": "node ./test/out/helpers/runTests.js skipArtifactPublisher",
Expand Down Expand Up @@ -68,7 +68,7 @@
"replace-in-file": "6.2.0",
"source-map-support": "0.5.21",
"ts-jsdoc": "3.2.2",
"typescript": "5.4.2",
"typescript": "5.5.3",
"typescript-json-schema": "0.63.0",
"v8-compile-cache": "2.3.0"
},
Expand Down
6 changes: 5 additions & 1 deletion packages/app-builder-lib/src/codeSign/macCodeSign.ts
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,11 @@ export async function createKeychain({ tmpDir, cscLink, cscKeyPassword, cscILink
BluebirdPromise.map(certLinks, (link, i) => importCertificate(link, tmpDir, currentDir).then(it => (certPaths[i] = it))),
BluebirdPromise.mapSeries(securityCommands, it => exec("/usr/bin/security", it)),
])
return await importCerts(keychainFile, certPaths, [cscKeyPassword, cscIKeyPassword].filter(it => it != null) as Array<string>)
const cscPasswords: Array<string> = [cscKeyPassword]
if (cscIKeyPassword) {
cscPasswords.push(cscIKeyPassword)
}
return await importCerts(keychainFile, certPaths, cscPasswords)
}

async function importCerts(keychainFile: string, paths: Array<string>, keyPasswords: Array<string>): Promise<CodeSigningInfo> {
Expand Down
10 changes: 5 additions & 5 deletions packages/app-builder-lib/src/util/normalizePackageData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -298,13 +298,13 @@ function depObjectify(deps: any): any {
.filter(function (d) {
return typeof d === "string"
})
.forEach(function (d) {
d = d.trim().split(/(:?[@\s><=])/)
const dn = d.shift()
let dv = d.join("")
.forEach(function (d: string) {
const arr: string[] = d.trim().split(/(:?[@\s><=])/)
const dn = arr.shift()
let dv = arr.join("")
dv = dv.trim()
dv = dv.replace(/^@/, "")
o[dn] = dv
o[dn!] = dv
})
return o
}
Expand Down
10 changes: 1 addition & 9 deletions packages/electron-updater/src/RpmUpdater.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,7 @@ export class RpmUpdater extends BaseUpdater {
const packageManager = this.spawnSyncLog("which dnf || which yum")
cmd = [packageManager, "-y", "install", upgradePath]
} else {
cmd = [
packageManager,
"--no-refresh",
"install",
"--allow-unsigned-rpm",
"-y",
"-f",
upgradePath,
]
cmd = [packageManager, "--no-refresh", "install", "--allow-unsigned-rpm", "-y", "-f", upgradePath]
}
this.spawnSyncLog(sudo, [`${wrapper}/bin/bash`, "-c", `'${cmd.join(" ")}'${wrapper}`])
if (options.isForceRunAfter) {
Expand Down
102 changes: 47 additions & 55 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading