Skip to content

Commit

Permalink
chore: update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
develar committed May 26, 2020
1 parent 3ffea83 commit 7b335db
Show file tree
Hide file tree
Showing 25 changed files with 1,678 additions and 1,623 deletions.
3 changes: 3 additions & 0 deletions .eslintrc.js
Expand Up @@ -16,6 +16,9 @@ module.exports = {
delimiter: "none",
},
}],
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/no-extra-non-null-assertion": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-use-before-define": "off",
Expand Down
18 changes: 9 additions & 9 deletions .yarn/releases/yarn-sources.js

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions package.json
Expand Up @@ -18,7 +18,7 @@
"test-all": "yarn pretest && node ./test/out/helpers/runTests.js",
"test-linux": "docker run --rm -ti -v ${PWD}:/project -v ${PWD##*/}-node-modules:/project/node_modules -v ~/Library/Caches/electron:/root/.cache/electron -v ~/Library/Caches/electron-builder:/root/.cache/electron-builder electronuserland/builder:wine /bin/bash -c \"yarn && TEST_FILES=HoistedNodeModuleTest node ./test/out/helpers/runTests.js\"",
"docker-images": "docker/build.sh",
"release": "BABEL_ENV=production yarn compile && ln -f README.md packages/electron-builder/README.md && yarn workspaces foreach -p npm publish && yarn dlx -p conventional-changelog-cli conventional-changelog -p angular -i CHANGELOG.md -s",
"release": "BABEL_ENV=production yarn compile && ./scripts/publish-packages.sh && conventional-changelog-cli conventional-changelog -p angular -i CHANGELOG.md -s",
"schema": "typescript-json-schema packages/app-builder-lib/tsconfig.json Configuration --out packages/app-builder-lib/scheme.json --noExtraProps --useTypeOfKeyword --strictNullChecks --required && node ./scripts/fix-schema.js",
"jsdoc": "ts2jsdoc packages/builder-util-runtime packages/builder-util packages/app-builder-lib packages/electron-builder packages/electron-publish",
"jsdoc2md": "node scripts/jsdoc2md.js",
Expand All @@ -35,20 +35,20 @@
"@babel/core": "^7.9.6",
"@babel/plugin-transform-modules-commonjs": "^7.9.6",
"@babel/preset-env": "^7.9.6",
"@typescript-eslint/eslint-plugin": "^2.33.0",
"@typescript-eslint/parser": "^2.33.0",
"@typescript-eslint/eslint-plugin": "^3.0.1",
"@typescript-eslint/parser": "^3.0.1",
"babel-core": "^6.26.3",
"babel-preset-jest": "^26.0.0",
"bluebird-lst": "^1.0.9",
"electron-builder-tslint-config": "^1.1.0",
"eslint": "^7.0.0",
"eslint": "^7.1.0",
"fs-extra": "^9.0.0",
"globby": "^11.0.0",
"jest-cli": "^25.5.4",
"jest-cli": "^26.0.1",
"jsdoc-to-markdown": "^5.0.3",
"ts-babel": "6.1.7",
"ts-jsdoc": "^3.1.1",
"typescript": "~3.8.3",
"typescript": "~3.9.3",
"typescript-json-schema": "^0.42.0"
},
"eslintIgnore": [
Expand Down
10 changes: 5 additions & 5 deletions packages/app-builder-lib/package.json
@@ -1,7 +1,7 @@
{
"name": "app-builder-lib",
"description": "electron-builder lib",
"version": "22.6.0",
"version": "22.7.0",
"main": "out/index.js",
"files": [
"out",
Expand Down Expand Up @@ -49,14 +49,14 @@
"builder-util": "workspace:*",
"builder-util-runtime": "workspace:*",
"chromium-pickle-js": "^0.2.0",
"debug": "^4.1.1",
"ejs": "^3.1.2",
"debug": "^4.2.0",
"ejs": "^3.1.3",
"electron-publish": "workspace:*",
"fs-extra": "^9.0.0",
"hosted-git-info": "^3.0.4",
"is-ci": "^2.0.0",
"isbinaryfile": "^4.0.6",
"js-yaml": "^3.13.1",
"js-yaml": "^3.14.0",
"lazy-val": "^1.0.4",
"minimatch": "^3.0.4",
"normalize-package-data": "^2.5.0",
Expand Down Expand Up @@ -88,7 +88,7 @@
"@babel/preset-react": "^7.9.4",
"@types/debug": "^4.1.5",
"@types/ejs": "^3.0.3",
"@types/fs-extra": "^8.1.0",
"@types/fs-extra": "^9.0.1",
"@types/is-ci": "^2.0.0",
"@types/js-yaml": "^3.12.3",
"@types/normalize-package-data": "^2.4.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/app-builder-lib/src/publish/updateInfoBuilder.ts
Expand Up @@ -168,9 +168,13 @@ async function createUpdateInfo(version: string, event: ArtifactCreated, release
const sha512 = (customUpdateInfo == null ? null : customUpdateInfo.sha512) || await hashFile(event.file!)
const files = [{url, sha512}]
const result: UpdateInfo = {
// @ts-ignore
version,
// @ts-ignore
files,
// @ts-ignore
path: url /* backward compatibility, electron-updater 1.x - electron-updater 2.15.0 */,
// @ts-ignore
sha512 /* backward compatibility, electron-updater 1.x - electron-updater 2.15.0 */,
...releaseInfo as UpdateInfo,
}
Expand Down
1 change: 0 additions & 1 deletion packages/app-builder-lib/src/util/langs.ts
@@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/camelcase */
export const bundledLanguages = [
"en_US", "de_DE", "fr_FR", "es_ES", "zh_CN", "zh_TW", "ja_JP", "ko_KR", "it_IT", "nl_NL", "da_DK", "sv_SE",
"nb_NO", "fi_FI", "ru_RU", "pt_PT", "pt_BR", "pl_PL", "uk_UA", "cs_CZ", "sk_SK", "hu_HU", "ar_SA", "tr_TR",
Expand Down
1 change: 0 additions & 1 deletion packages/app-builder-lib/src/util/yarn.ts
@@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/camelcase */
import { asArray, log, spawn } from "builder-util"
import { pathExists } from "fs-extra"
import { Lazy } from "lazy-val"
Expand Down
2 changes: 1 addition & 1 deletion packages/builder-util-runtime/package.json
Expand Up @@ -14,7 +14,7 @@
"node": ">=8.2.5"
},
"dependencies": {
"debug": "^4.1.1",
"debug": "^4.2.0",
"sax": "^1.2.4"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/builder-util/package.json
@@ -1,6 +1,6 @@
{
"name": "builder-util",
"version": "22.6.0",
"version": "22.7.0",
"main": "out/util.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand All @@ -13,15 +13,15 @@
"dependencies": {
"7zip-bin": "~5.0.3",
"@types/debug": "^4.1.5",
"@types/fs-extra": "^8.1.0",
"@types/fs-extra": "^9.0.1",
"app-builder-bin": "3.5.9",
"bluebird-lst": "^1.0.9",
"builder-util-runtime": "workspace:*",
"chalk": "^4.0.0",
"debug": "^4.1.1",
"debug": "^4.2.0",
"fs-extra": "^9.0.0",
"is-ci": "^2.0.0",
"js-yaml": "^3.13.1",
"js-yaml": "^3.14.0",
"source-map-support": "^0.5.19",
"stat-mode": "^1.0.0",
"temp-file": "^3.3.7"
Expand Down
6 changes: 3 additions & 3 deletions packages/dmg-builder/package.json
@@ -1,6 +1,6 @@
{
"name": "dmg-builder",
"version": "22.6.0",
"version": "22.7.0",
"main": "out/dmgUtil.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand All @@ -17,11 +17,11 @@
"builder-util": "workspace:*",
"fs-extra": "^9.0.0",
"iconv-lite": "^0.5.1",
"js-yaml": "^3.13.1",
"js-yaml": "^3.14.0",
"sanitize-filename": "^1.6.3"
},
"devDependencies": {
"@types/fs-extra": "^8.1.0",
"@types/fs-extra": "^9.0.1",
"@types/js-yaml": "^3.12.3",
"temp-file": "^3.3.7"
},
Expand Down
1 change: 0 additions & 1 deletion packages/dmg-builder/src/dmgLicense.ts
@@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/camelcase */
import { exec, log } from "builder-util"
import { PlatformPackager } from "app-builder-lib"
import { getLicenseFiles } from "app-builder-lib/out/util/license"
Expand Down
4 changes: 2 additions & 2 deletions packages/electron-builder-squirrel-windows/package.json
@@ -1,6 +1,6 @@
{
"name": "electron-builder-squirrel-windows",
"version": "22.6.0",
"version": "22.7.0",
"main": "out/SquirrelWindowsTarget.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand All @@ -20,7 +20,7 @@
},
"devDependencies": {
"@types/archiver": "^3.1.0",
"@types/fs-extra": "^8.1.0"
"@types/fs-extra": "^9.0.1"
},
"optionalDependencies": {
"7zip-bin": "~5.0.3"
Expand Down
4 changes: 2 additions & 2 deletions packages/electron-builder/package.json
@@ -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.6.0",
"version": "22.7.0",
"main": "out/index.js",
"files": [
"out"
Expand Down Expand Up @@ -61,7 +61,7 @@
"yargs": "^15.3.1"
},
"devDependencies": {
"@types/fs-extra": "^8.1.0",
"@types/fs-extra": "^9.0.1",
"@types/is-ci": "^2.0.0"
},
"typings": "./out/index.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-forge-maker-appimage/package.json
@@ -1,6 +1,6 @@
{
"name": "electron-forge-maker-appimage",
"version": "22.6.0",
"version": "22.7.0",
"main": "main.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-forge-maker-nsis-web/package.json
@@ -1,6 +1,6 @@
{
"name": "electron-forge-maker-nsis-web",
"version": "22.6.0",
"version": "22.7.0",
"main": "main.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-forge-maker-nsis/package.json
@@ -1,6 +1,6 @@
{
"name": "electron-forge-maker-nsis",
"version": "22.6.0",
"version": "22.7.0",
"main": "main.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-forge-maker-snap/package.json
@@ -1,6 +1,6 @@
{
"name": "electron-forge-maker-snap",
"version": "22.6.0",
"version": "22.7.0",
"main": "main.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions packages/electron-publish/package.json
@@ -1,6 +1,6 @@
{
"name": "electron-publish",
"version": "22.6.0",
"version": "22.7.0",
"main": "out/publisher.js",
"author": "Vladimir Krivosheev",
"license": "MIT",
Expand All @@ -11,7 +11,7 @@
"out"
],
"dependencies": {
"@types/fs-extra": "^8.1.0",
"@types/fs-extra": "^9.0.1",
"bluebird-lst": "^1.0.9",
"builder-util": "workspace:*",
"builder-util-runtime": "workspace:*",
Expand Down
1 change: 0 additions & 1 deletion packages/electron-publish/src/gitHubPublisher.ts
Expand Up @@ -206,7 +206,6 @@ export class GitHubPublisher extends HttpPublisher {

private createRelease() {
return this.githubRequest<Release>(`/repos/${this.info.owner}/${this.info.repo}/releases`, this.token, {
// eslint-disable-next-line @typescript-eslint/camelcase
tag_name: this.tag,
name: this.version,
draft: this.releaseType === "draft",
Expand Down
6 changes: 3 additions & 3 deletions packages/electron-updater/package.json
@@ -1,6 +1,6 @@
{
"name": "electron-updater",
"version": "4.3.1",
"version": "4.3.2",
"description": "Cross platform updater for electron applications",
"main": "out/main.js",
"author": "Vladimir Krivosheev",
Expand All @@ -15,13 +15,13 @@
"@types/semver": "^7.2.0",
"builder-util-runtime": "workspace:*",
"fs-extra": "^9.0.0",
"js-yaml": "^3.13.1",
"js-yaml": "^3.14.0",
"lazy-val": "^1.0.4",
"lodash.isequal": "^4.5.0",
"semver": "^7.3.2"
},
"devDependencies": {
"@types/fs-extra": "^8.1.0",
"@types/fs-extra": "^9.0.1",
"@types/js-yaml": "^3.12.3",
"@types/lodash.isequal": "^4.5.5"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-updater/src/providers/Provider.ts
Expand Up @@ -134,7 +134,7 @@ export function getFileList(updateInfo: UpdateInfo): Array<UpdateFileInfo> {
}
}

export function resolveFiles(updateInfo: UpdateInfo, baseUrl: URL, pathTransformer: (p: string) => string = (p): string => p): Array<ResolvedUpdateFileInfo> {
export function resolveFiles(updateInfo: UpdateInfo, baseUrl: URL, pathTransformer: (p: string) => string = (p: string): string => p): Array<ResolvedUpdateFileInfo> {
const files = getFileList(updateInfo)
const result: Array<ResolvedUpdateFileInfo> = files.map(fileInfo => {
if ((fileInfo as any).sha2 == null && fileInfo.sha512 == null) {
Expand Down
10 changes: 5 additions & 5 deletions test/package.json
Expand Up @@ -7,13 +7,13 @@
"@babel/plugin-transform-typescript": "^7.9.6",
"@babel/preset-env": "^7.9.6",
"@babel/preset-typescript": "^7.9.0",
"@jest/core": "^25.5.4",
"@jest/core": "^26.0.1",
"@types/ci-info": "^2.0.0",
"@types/depcheck": "^0.9.1",
"@types/fs-extra": "^8.1.0",
"@types/fs-extra": "^9.0.1",
"@types/jest": "^25.2.2",
"@types/js-yaml": "^3.12.3",
"@types/node": "^13.13.6",
"@types/node": "^14.0.5",
"@types/semver": "^7.2.0",
"app-builder-lib": "workspace:*",
"bluebird-lst": "^1.0.9",
Expand All @@ -29,9 +29,9 @@
"electron-publish": "workspace:*",
"electron-updater": "workspace:*",
"fs-extra": "^9.0.0",
"jest": "^25.5.4",
"jest": "^26.0.1",
"jest-junit": "^10.0.0",
"js-yaml": "^3.13.1",
"js-yaml": "^3.14.0",
"path-sort": "^0.1.0",
"semver": "^7.3.2",
"stat-mode": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion test/snapshots/BuildTest.js.snap
Expand Up @@ -1181,7 +1181,7 @@ Object {
"size": 1069,
},
"index.js": Object {
"size": 5254,
"size": 5247,
},
"package.json": Object {
"size": 525,
Expand Down
2 changes: 1 addition & 1 deletion test/src/helpers/downloadElectron.ts
Expand Up @@ -53,7 +53,7 @@ export function downloadAllRequiredElectronVersions(): Promise<any> {
return executeAppBuilder(["download-electron", "--configuration", JSON.stringify(versions)])
}

if (process.mainModule === module) {
if (require.main === module) {
downloadAllRequiredElectronVersions()
.catch(error => {
console.error((error.stack || error).toString())
Expand Down

0 comments on commit 7b335db

Please sign in to comment.