Skip to content

Commit

Permalink
fix(nsis): Building NSIS installers broken after switching from 22.10…
Browse files Browse the repository at this point in the history
….5 to 22.11.1 (#5873)

Close #5863
  • Loading branch information
develar committed May 11, 2021
1 parent ea315aa commit 3e6c10f
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 64 deletions.
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"docs": "tsc -p ./scripts/renderer/tsconfig.json && pnpm jsdoc && pnpm jsdoc2md",
"deploy-docs": "mkdocs build --clean && netlifyctl deploy --publish-directory site",
"////": "pip3 install mkdocs-material mkdocs pymdown-extensions markdown-include Pygments --upgrade",
"prepare": "husky install"
"prepare": "husky install",
"update-deps": "pnpm update -i -r --latest"
},
"//": "repository must be specified otherwise conventional-changelog will use forked repo (currently cloned)",
"repository": "https://github.com/electron-userland/electron-builder",
Expand All @@ -46,12 +47,12 @@
"eslint-plugin-prettier": "^3.4.0",
"fs-extra": "^10.0.0",
"globby": "^11.0.3",
"husky": "5.1.3",
"husky": "5.2.0",
"jest-cli": "^26.6.3",
"jsdoc-to-markdown": "^7.0.1",
"lint-staged": "^11.0.0",
"prettier": "^2.3.0",
"ts-jsdoc": "^3.2.0",
"ts-jsdoc": "^3.2.1",
"typescript": "~4.2.4",
"typescript-json-schema": "^0.50.0",
"v8-compile-cache": "^2.3.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/app-builder-lib/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "app-builder-lib",
"description": "electron-builder lib",
"version": "22.11.2",
"version": "22.11.3",
"main": "out/index.js",
"files": [
"out",
Expand Down Expand Up @@ -62,10 +62,10 @@
"js-yaml": "^4.1.0",
"lazy-val": "^1.0.4",
"minimatch": "^3.0.4",
"read-config-file": "6.1.0",
"read-config-file": "6.2.0",
"sanitize-filename": "^1.6.3",
"semver": "^7.3.5",
"temp-file": "^3.3.7"
"temp-file": "^3.4.0"
},
"///": "babel in devDependencies for proton tests",
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/app-builder-lib/src/targets/nsis/nsisUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { unlink } from "fs-extra"
import * as path from "path"
import { getTemplatePath } from "../../util/pathManager"
import { NsisTarget } from "./NsisTarget"
import fs from "fs"
import zlib from "zlib"
import * as fs from "fs"
import * as zlib from "zlib"

export const nsisTemplatesDir = getTemplatePath("nsis")

Expand Down
2 changes: 1 addition & 1 deletion packages/builder-util-runtime/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "builder-util-runtime",
"version": "8.7.4",
"version": "8.7.5",
"main": "out/index.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/builder-util/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "builder-util",
"version": "22.11.2",
"version": "22.11.3",
"main": "out/util.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand All @@ -24,7 +24,7 @@
"js-yaml": "^4.1.0",
"source-map-support": "^0.5.19",
"stat-mode": "^1.0.0",
"temp-file": "^3.3.7"
"temp-file": "^3.4.0"
},
"typings": "./out/util.d.ts",
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/dmg-builder/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dmg-builder",
"version": "22.11.2",
"version": "22.11.3",
"main": "out/dmgUtil.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand All @@ -26,7 +26,7 @@
"devDependencies": {
"@types/fs-extra": "^9.0.11",
"@types/js-yaml": "^4.0.1",
"temp-file": "^3.3.7"
"temp-file": "^3.4.0"
},
"typings": "./out/dmg.d.ts"
}
4 changes: 2 additions & 2 deletions packages/electron-builder/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "electron-builder",
"description": "A complete solution to package and build a ready for distribution Electron app for MacOS, Windows and Linux with “auto update” support out of the box",
"version": "22.11.2",
"version": "22.11.3",
"main": "out/index.js",
"files": [
"out"
Expand Down Expand Up @@ -55,7 +55,7 @@
"fs-extra": "^10.0.0",
"is-ci": "^3.0.0",
"lazy-val": "^1.0.4",
"read-config-file": "6.1.0",
"read-config-file": "6.2.0",
"update-notifier": "^5.1.0",
"yargs": "^17.0.1"
},
Expand Down
83 changes: 36 additions & 47 deletions pnpm-lock.yaml

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

0 comments on commit 3e6c10f

Please sign in to comment.