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 14, 2020
1 parent 65bb441 commit 6c0f825
Show file tree
Hide file tree
Showing 20 changed files with 556 additions and 322 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ version: 2
jobs:
build:
docker:
- image: circleci/node:12.16.2
- image: circleci/node:12.16.3
steps:
- checkout
- restore_cache:
keys:
- install-dep-cache-{{ checksum "yarn.lock" }}-{{ checksum ".yarn/releases/yarn-sources.js" }}
- restore_cache:
keys:
- v-8.2.0-electron
- v-8.2.5-electron
- run:
command: YARN_CHECKSUM_BEHAVIOR=ignore node .yarn/releases/yarn-sources.js install
- run:
Expand All @@ -25,7 +25,7 @@ jobs:
- run:
command: node .yarn/releases/yarn-sources.js node ./test/out/helpers/downloadElectron.js
- save_cache:
key: v-8.2.0-electron
key: v-8.2.5-electron
paths:
- ~/.cache/electron

Expand All @@ -43,7 +43,7 @@ jobs:
- install-dep-cache-{{ checksum "yarn.lock" }}-{{ checksum ".yarn/releases/yarn-sources.js" }}
- restore_cache:
keys:
- v-8.2.0-electron
- v-8.2.5-electron
# because in the build job we use circleci docker image and circleci restores cache to original user home
- run:
command: |
Expand Down
2 changes: 1 addition & 1 deletion docker/node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM electronuserland/builder:base

ENV NODE_VERSION 12.16.1
ENV NODE_VERSION 12.16.3

# this package is used for snapcraft and we should not clear apt list - to avoid apt-get update during snap build
RUN curl -L https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar xz -C /usr/local --strip-components=1 && \
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@
"///": "All dependencies for all packages (hoisted)",
"////": "All typings are added into root `package.json` to avoid duplication errors in the IDE compiler (several `node.d.ts` files).",
"dependencies": {
"@babel/core": "^7.9.0",
"@babel/plugin-transform-modules-commonjs": "^7.9.0",
"@babel/preset-env": "^7.9.5",
"@typescript-eslint/eslint-plugin": "^2.30.0",
"@typescript-eslint/parser": "^2.30.0",
"@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",
"babel-core": "^6.26.3",
"babel-preset-jest": "^25.5.0",
"babel-preset-jest": "^26.0.0",
"bluebird-lst": "^1.0.9",
"electron-builder-tslint-config": "^1.1.0",
"eslint": "^6.8.0",
"eslint": "^7.0.0",
"fs-extra": "^9.0.0",
"globby": "^11.0.0",
"jest-cli": "^25.5.0",
"jest-cli": "^25.5.4",
"jsdoc-to-markdown": "^5.0.3",
"ts-babel": "6.1.7",
"ts-jsdoc": "^3.1.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/app-builder-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
},
"///": "babel in devDependencies for proton tests",
"devDependencies": {
"@babel/core": "^7.9.0",
"@babel/core": "^7.9.6",
"@babel/plugin-proposal-class-properties": "^7.8.3",
"@babel/plugin-proposal-decorators": "^7.8.3",
"@babel/plugin-proposal-do-expressions": "^7.8.3",
Expand All @@ -84,15 +84,15 @@
"@babel/plugin-proposal-throw-expressions": "^7.8.3",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-import-meta": "^7.8.3",
"@babel/preset-env": "^7.9.5",
"@babel/preset-env": "^7.9.6",
"@babel/preset-react": "^7.9.4",
"@types/debug": "^4.1.5",
"@types/ejs": "^3.0.3",
"@types/fs-extra": "^8.1.0",
"@types/is-ci": "^2.0.0",
"@types/js-yaml": "^3.12.3",
"@types/normalize-package-data": "^2.4.0",
"@types/semver": "^7.1.0",
"@types/semver": "^7.2.0",
"dmg-builder": "workspace:*",
"electron-builder-squirrel-windows": "workspace:*"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/builder-util-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"out"
],
"engines": {
"node": ">=8.2.0"
"node": ">=8.2.5"
},
"dependencies": {
"debug": "^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/builder-util/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"7zip-bin": "~5.0.3",
"@types/debug": "^4.1.5",
"@types/fs-extra": "^8.1.0",
"app-builder-bin": "3.5.8",
"app-builder-bin": "3.5.9",
"bluebird-lst": "^1.0.9",
"builder-util-runtime": "workspace:*",
"chalk": "^4.0.0",
Expand Down
3 changes: 0 additions & 3 deletions packages/builder-util/src/log.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@ export class Logger {
else if (Array.isArray(fieldValue)) {
fieldValue = JSON.stringify(fieldValue)
}
else if (Array.isArray(fieldValue)) {
fieldValue = JSON.stringify(fieldValue)
}
else if (typeof fieldValue === "object") {
// fieldValue = safeStringifyJson(fieldValue)
}
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"bugs": "https://github.com/electron-userland/electron-builder/issues",
"homepage": "https://github.com/electron-userland/electron-builder",
"dependencies": {
"@types/yargs": "^15.0.4",
"@types/yargs": "^15.0.5",
"app-builder-lib": "workspace:*",
"bluebird-lst": "^1.0.9",
"builder-util": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-publish/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"chalk": "^4.0.0",
"fs-extra": "^9.0.0",
"lazy-val": "^1.0.4",
"mime": "^2.4.4"
"mime": "^2.4.5"
},
"typings": "./out/publisher.d.ts"
}
2 changes: 1 addition & 1 deletion packages/electron-updater/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"out"
],
"dependencies": {
"@types/semver": "^7.1.0",
"@types/semver": "^7.2.0",
"builder-util-runtime": "workspace:*",
"fs-extra": "^9.0.0",
"js-yaml": "^3.13.1",
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/test-app-build-sub/electron-builder.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
electronVersion: 8.2.0
electronVersion: 8.2.5
appId: org.electron-builder.testApp
compression: store
npmRebuild: false
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/test-app-one/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"author": "Foo Bar <[email protected]>",
"license": "MIT",
"build": {
"electronVersion": "8.2.0",
"electronVersion": "8.2.5",
"appId": "org.electron-builder.testApp",
"compression": "store",
"npmRebuild": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"author": "Foo Bar <[email protected]>",
"license": "MIT",
"build": {
"electronVersion": "8.2.0",
"electronVersion": "8.2.5",
"appId": "org.electron-builder.testApp",
"compression": "store",
"npmRebuild": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"author": "Foo Bar <[email protected]>",
"license": "MIT",
"build": {
"electronVersion": "8.2.0",
"electronVersion": "8.2.5",
"appId": "org.electron-builder.testApp",
"compression": "store",
"npmRebuild": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"author": "Foo Bar <[email protected]>",
"license": "MIT",
"build": {
"electronVersion": "8.2.0",
"electronVersion": "8.2.5",
"appId": "org.electron-builder.testApp",
"compression": "store",
"npmRebuild": false,
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/test-app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"build": {
"electronVersion": "8.2.0",
"electronVersion": "8.2.5",
"appId": "org.electron-builder.testApp",
"compression": "store",
"npmRebuild": false,
Expand Down
16 changes: 8 additions & 8 deletions test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
"private": true,
"dependencies": {
"7zip-bin": "~5.0.3",
"@babel/core": "^7.9.0",
"@babel/plugin-transform-typescript": "^7.9.4",
"@babel/preset-env": "^7.9.5",
"@babel/core": "^7.9.6",
"@babel/plugin-transform-typescript": "^7.9.6",
"@babel/preset-env": "^7.9.6",
"@babel/preset-typescript": "^7.9.0",
"@jest/core": "^25.5.0",
"@jest/core": "^25.5.4",
"@types/ci-info": "^2.0.0",
"@types/depcheck": "^0.9.1",
"@types/fs-extra": "^8.1.0",
"@types/jest": "^25.2.1",
"@types/jest": "^25.2.2",
"@types/js-yaml": "^3.12.3",
"@types/node": "^13.13.4",
"@types/semver": "^7.1.0",
"@types/node": "^13.13.6",
"@types/semver": "^7.2.0",
"app-builder-lib": "workspace:*",
"bluebird-lst": "^1.0.9",
"builder-util": "workspace:*",
Expand All @@ -29,7 +29,7 @@
"electron-publish": "workspace:*",
"electron-updater": "workspace:*",
"fs-extra": "^9.0.0",
"jest": "^25.5.0",
"jest": "^25.5.4",
"jest-junit": "^10.0.0",
"js-yaml": "^3.13.1",
"path-sort": "^0.1.0",
Expand Down
14 changes: 4 additions & 10 deletions test/snapshots/BuildTest.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -608,9 +608,6 @@ Object {
"Makefile": Object {
"size": 100,
},
"Readme.md": Object {
"size": 1768,
},
"index.js": Object {
"size": 2065,
},
Expand Down Expand Up @@ -988,7 +985,7 @@ Object {
"mkdirp-classic": Object {
"files": Object {
"LICENSE": Object {
"size": 1079,
"size": 1118,
},
"index.js": Object {
"size": 2630,
Expand Down Expand Up @@ -1199,9 +1196,6 @@ Object {
"Makefile": Object {
"size": 119,
},
"Readme.md": Object {
"size": 585,
},
"lib": Object {
"files": Object {
"index.js": Object {
Expand Down Expand Up @@ -1470,10 +1464,10 @@ Object {
"size": 1081,
},
"index.js": Object {
"size": 1585,
"size": 1670,
},
"package.json": Object {
"size": 500,
"size": 774,
},
},
},
Expand Down Expand Up @@ -1618,7 +1612,7 @@ Object {
"size": 1078,
},
"index.js": Object {
"size": 9455,
"size": 9523,
},
"package.json": Object {
"size": 590,
Expand Down
2 changes: 1 addition & 1 deletion test/src/helpers/testConfig.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as os from "os"
import * as path from "path"

export const ELECTRON_VERSION = "8.2.0"
export const ELECTRON_VERSION = "8.2.5"

export function getElectronCacheDir() {
if (process.platform === "win32") {
Expand Down
Loading

0 comments on commit 6c0f825

Please sign in to comment.