Skip to content

Commit

Permalink
chore: update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
develar committed Sep 17, 2020
1 parent c554f25 commit b8c9cd0
Show file tree
Hide file tree
Showing 17 changed files with 1,535 additions and 2,214 deletions.
18 changes: 9 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@ version: 2
jobs:
build:
docker:
- image: circleci/node:12.18.2
- image: circleci/node:12.18.4
steps:
- checkout
- restore_cache:
keys:
- install-dep-cache-{{ checksum "yarn.lock" }}-{{ checksum ".yarn/releases/yarn-2.1.1.js" }}
- install-dep-cache-{{ checksum "yarn.lock" }}-{{ checksum ".yarn/releases/yarn-2.2.2.cjs" }}
- restore_cache:
keys:
- v-8.2.5-electron
- run:
command: YARN_CHECKSUM_BEHAVIOR=ignore node .yarn/releases/yarn-2.1.1.js install
command: YARN_CHECKSUM_BEHAVIOR=ignore node .yarn/releases/yarn-2.2.2.cjs install
- run:
command: node .yarn/releases/yarn-2.1.1.js pretest
command: node .yarn/releases/yarn-2.2.2.cjs pretest
- run:
command: cp .pnp.js .yarn/.pnp.js
- save_cache:
key: install-dep-cache-{{ checksum "yarn.lock" }}-{{ checksum ".yarn/releases/yarn-2.1.1.js" }}
key: install-dep-cache-{{ checksum "yarn.lock" }}-{{ checksum ".yarn/releases/yarn-2.2.2.cjs" }}
paths:
- .yarn
- run:
command: node .yarn/releases/yarn-2.1.1.js node ./test/out/helpers/downloadElectron.js
command: node .yarn/releases/yarn-2.2.2.cjs node ./test/out/helpers/downloadElectron.js
- save_cache:
key: v-8.2.5-electron
paths:
Expand All @@ -40,7 +40,7 @@ jobs:
- checkout
- restore_cache:
keys:
- install-dep-cache-{{ checksum "yarn.lock" }}-{{ checksum ".yarn/releases/yarn-2.1.1.js" }}
- install-dep-cache-{{ checksum "yarn.lock" }}-{{ checksum ".yarn/releases/yarn-2.2.2.cjs" }}
- restore_cache:
keys:
- v-8.2.5-electron
Expand All @@ -55,8 +55,8 @@ jobs:
- run:
# do not use yarn test because lint is done in the build job
command: |
node .yarn/releases/yarn-2.1.1.js compile
node .yarn/releases/yarn-2.1.1.js node ./test/out/helpers/runTests.js
node .yarn/releases/yarn-2.2.2.cjs compile
node .yarn/releases/yarn-2.2.2.cjs node ./test/out/helpers/runTests.js
- store_test_results:
path: /tmp/test-reports

Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
osx_image: xcode11.3
osx_image: xcode12
language: node_js

env:
Expand Down Expand Up @@ -28,11 +28,11 @@ cache:
- /tmp/jest-electron-builder-tests

install:
- YARN_CHECKSUM_BEHAVIOR=ignore node .yarn/releases/yarn-2.1.1.js install
- YARN_CHECKSUM_BEHAVIOR=ignore node .yarn/releases/yarn-2.2.2.cjs install

script:
- node .yarn/releases/yarn-2.1.1.js pretest
- node .yarn/releases/yarn-2.1.1.js node ./test/out/helpers/runTests.js
- node .yarn/releases/yarn-2.2.2.cjs pretest
- node .yarn/releases/yarn-2.2.2.cjs node ./test/out/helpers/runTests.js

branches:
except:
Expand Down
38 changes: 38 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

86 changes: 0 additions & 86 deletions .yarn/releases/yarn-2.1.1.js

This file was deleted.

55 changes: 55 additions & 0 deletions .yarn/releases/yarn-2.2.2.cjs

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.js
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
- path: .yarn/plugins/@yarnpkg/plugin-version.js
spec: "@yarnpkg/plugin-version"
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.js
spec: "@yarnpkg/plugin-workspace-tools"

yarnPath: .yarn/releases/yarn-2.1.1.js
yarnPath: .yarn/releases/yarn-2.2.2.cjs
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ environment:
install:
- ps: Install-Product node 12 x64
- set YARN_CHECKSUM_BEHAVIOR=ignore
- node .yarn/releases/yarn-2.1.1.js install
- node .yarn/releases/yarn-2.2.2.cjs install

build: off

test_script:
- node .yarn/releases/yarn-2.1.1.js pretest
- node .yarn/releases/yarn-2.1.1.js node ./test/out/helpers/runTests.js
- node .yarn/releases/yarn-2.2.2.cjs pretest
- node .yarn/releases/yarn-2.2.2.cjs node ./test/out/helpers/runTests.js
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,24 @@
"///": "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.10.5",
"@babel/core": "^7.11.6",
"@babel/plugin-transform-modules-commonjs": "^7.10.4",
"@babel/preset-env": "^7.10.4",
"@typescript-eslint/eslint-plugin": "^3.7.1",
"@typescript-eslint/parser": "^3.7.1",
"@babel/preset-env": "^7.11.5",
"@typescript-eslint/eslint-plugin": "^4.1.1",
"@typescript-eslint/parser": "^4.1.1",
"babel-core": "^6.26.3",
"babel-preset-jest": "^26.1.0",
"babel-preset-jest": "^26.3.0",
"bluebird-lst": "^1.0.9",
"electron-builder-tslint-config": "^1.1.0",
"eslint": "^7.5.0",
"eslint": "^7.9.0",
"fs-extra": "^9.0.1",
"globby": "^11.0.1",
"jest-cli": "^26.1.0",
"jest-cli": "^26.4.2",
"jsdoc-to-markdown": "^6.0.1",
"ts-babel": "6.1.7",
"ts-jsdoc": "^3.1.1",
"typescript": "~3.9.7",
"typescript-json-schema": "^0.42.0"
"typescript": "~4.0.2",
"typescript-json-schema": "^0.43.0"
},
"eslintIgnore": [
"*.d.ts",
Expand Down
14 changes: 7 additions & 7 deletions packages/app-builder-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"builder-util-runtime": "workspace:*",
"chromium-pickle-js": "^0.2.0",
"debug": "^4.2.0",
"ejs": "^3.1.3",
"ejs": "^3.1.5",
"electron-publish": "workspace:*",
"fs-extra": "^9.0.1",
"hosted-git-info": "^3.0.5",
Expand All @@ -67,32 +67,32 @@
},
"///": "babel in devDependencies for proton tests",
"devDependencies": {
"@babel/core": "^7.10.5",
"@babel/core": "^7.11.6",
"@babel/plugin-proposal-class-properties": "^7.10.4",
"@babel/plugin-proposal-decorators": "^7.10.5",
"@babel/plugin-proposal-do-expressions": "^7.10.4",
"@babel/plugin-proposal-export-default-from": "^7.10.4",
"@babel/plugin-proposal-export-namespace-from": "^7.10.4",
"@babel/plugin-proposal-function-bind": "^7.10.5",
"@babel/plugin-proposal-function-bind": "^7.11.5",
"@babel/plugin-proposal-function-sent": "^7.10.4",
"@babel/plugin-proposal-json-strings": "^7.10.4",
"@babel/plugin-proposal-logical-assignment-operators": "^7.10.4",
"@babel/plugin-proposal-logical-assignment-operators": "^7.11.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
"@babel/plugin-proposal-numeric-separator": "^7.10.4",
"@babel/plugin-proposal-optional-chaining": "^7.10.4",
"@babel/plugin-proposal-optional-chaining": "^7.11.0",
"@babel/plugin-proposal-pipeline-operator": "^7.10.5",
"@babel/plugin-proposal-throw-expressions": "^7.10.4",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-import-meta": "^7.10.4",
"@babel/preset-env": "^7.10.4",
"@babel/preset-env": "^7.11.5",
"@babel/preset-react": "^7.10.4",
"@types/debug": "^4.1.5",
"@types/ejs": "^3.0.4",
"@types/fs-extra": "^9.0.1",
"@types/is-ci": "^2.0.0",
"@types/js-yaml": "^3.12.5",
"@types/normalize-package-data": "^2.4.0",
"@types/semver": "^7.3.1",
"@types/semver": "^7.3.4",
"dmg-builder": "workspace:*",
"electron-builder-squirrel-windows": "workspace:*"
},
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 @@ -29,6 +29,6 @@
"typings": "./out/util.d.ts",
"devDependencies": {
"@types/js-yaml": "^3.12.5",
"@types/source-map-support": "^0.5.2"
"@types/source-map-support": "^0.5.3"
}
}
2 changes: 1 addition & 1 deletion packages/electron-builder-squirrel-windows/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
],
"dependencies": {
"app-builder-lib": "workspace:*",
"archiver": "^5.0.0",
"archiver": "^5.0.2",
"bluebird-lst": "^1.0.9",
"builder-util": "workspace:*",
"fs-extra": "^9.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/electron-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"lazy-val": "^1.0.4",
"read-config-file": "6.0.0",
"sanitize-filename": "^1.6.3",
"update-notifier": "^4.1.0",
"yargs": "^15.4.1"
"update-notifier": "^4.1.1",
"yargs": "^16.0.3"
},
"devDependencies": {
"@types/fs-extra": "^9.0.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/electron-updater/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electron-updater",
"version": "4.3.4",
"version": "4.3.5",
"description": "Cross platform updater for electron applications",
"main": "out/main.js",
"author": "Vladimir Krivosheev",
Expand All @@ -12,7 +12,7 @@
"out"
],
"dependencies": {
"@types/semver": "^7.3.1",
"@types/semver": "^7.3.4",
"builder-util-runtime": "workspace:*",
"fs-extra": "^9.0.1",
"js-yaml": "^3.14.0",
Expand Down
21 changes: 10 additions & 11 deletions test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,39 @@
"private": true,
"dependencies": {
"7zip-bin": "~5.0.3",
"@babel/core": "^7.10.5",
"@babel/plugin-transform-typescript": "^7.10.5",
"@babel/preset-env": "^7.10.4",
"@babel/core": "^7.11.6",
"@babel/plugin-transform-typescript": "^7.11.0",
"@babel/preset-env": "^7.11.5",
"@babel/preset-typescript": "^7.10.4",
"@jest/core": "^26.1.0",
"@jest/core": "^26.4.2",
"@types/ci-info": "^2.0.0",
"@types/depcheck": "^0.9.1",
"@types/fs-extra": "^9.0.1",
"@types/jest": "^26.0.7",
"@types/jest": "^26.0.14",
"@types/js-yaml": "^3.12.5",
"@types/node": "^14.0.26",
"@types/semver": "^7.3.1",
"@types/node": "^14.10.3",
"@types/semver": "^7.3.4",
"app-builder-lib": "workspace:*",
"bluebird-lst": "^1.0.9",
"builder-util": "workspace:*",
"builder-util-runtime": "workspace:*",
"chalk": "^4.1.0",
"ci-info": "^2.0.0",
"decompress-zip": "^0.2.2",
"depcheck": "^1.0.0",
"depcheck": "^1.2.0",
"dmg-builder": "workspace:*",
"electron-builder": "workspace:*",
"electron-builder-squirrel-windows": "workspace:*",
"electron-publish": "workspace:*",
"electron-updater": "workspace:*",
"fs-extra": "^9.0.1",
"jest": "^26.1.0",
"jest": "^26.4.2",
"jest-junit": "^11.1.0",
"js-yaml": "^3.14.0",
"path-sort": "^0.1.0",
"semver": "^7.3.2",
"stat-mode": "^1.0.0",
"temp-file": "^3.3.7",
"yargs": "^15.4.1"
"yargs": "^16.0.3"
},
"jest": {
"snapshotResolver": "<rootDir>/snapshotResolver.js",
Expand Down
27 changes: 24 additions & 3 deletions test/snapshots/BuildTest.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ Object {
"bl": Object {
"files": Object {
"BufferList.js": Object {
"size": 9187,
"size": 9520,
},
"LICENSE.md": Object {
"size": 1216,
Expand Down Expand Up @@ -1117,6 +1117,17 @@ Object {
},
"node-abi": Object {
"files": Object {
".github": Object {
"files": Object {
"workflows": Object {
"files": Object {
"update-abi.yml": Object {
"size": 1309,
},
},
},
},
},
"CODE_OF_CONDUCT.md": Object {
"size": 3194,
},
Expand All @@ -1126,8 +1137,11 @@ Object {
"LICENSE": Object {
"size": 1069,
},
"abi_registry.json": Object {
"size": 1450,
},
"index.js": Object {
"size": 5320,
"size": 5712,
},
"node_modules": Object {
"files": Object {
Expand Down Expand Up @@ -1158,7 +1172,14 @@ Object {
},
},
"package.json": Object {
"size": 525,
"size": 547,
},
"scripts": Object {
"files": Object {
"update-abi-registry.js": Object {
"size": 2912,
},
},
},
},
},
Expand Down
4 changes: 2 additions & 2 deletions test/src/updater/nsisUpdaterTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ test("file url github", async () => {
updater.updateConfigPath = await writeUpdateConfig(options)
updater.signals.updateDownloaded(info => {
expect(info.downloadedFile).not.toBeNull()
delete info.downloadedFile
delete (info as any).downloadedFile
expect(info).toMatchSnapshot()
})
await validateDownload(updater)
Expand All @@ -215,7 +215,7 @@ test("file url github pre-release and fullChangelog", async () => {
updater.updateConfigPath = await writeUpdateConfig(options)
updater.signals.updateDownloaded(info => {
expect(info.downloadedFile).not.toBeNull()
delete info.downloadedFile
delete (info as any).downloadedFile
expect(info).toMatchSnapshot()
})
const updateCheckResult = await validateDownload(updater)
Expand Down
Loading

0 comments on commit b8c9cd0

Please sign in to comment.