Skip to content

Commit

Permalink
chore: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
MarshallOfSound committed Oct 22, 2018
1 parent c64b11c commit cddfb1f
Show file tree
Hide file tree
Showing 37 changed files with 1,119 additions and 2,555 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
}
}
],
"@babel/typescript"
"@babel/preset-typescript"
]
}
48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"scripts": {
"clean": "bolt ws exec -- rimraf dist",
"prebuild": "bolt clean && ts-node tools/link-ts.ts && ts-node tools/copy-shared-types.ts && bolt ws exec -- node_modules/.bin/tsc --emitDeclarationOnly",
"build": "bolt ws exec -- node_modules/.bin/babel src -d dist --quiet --extensions \".ts\"",
"build:quick": "bolt ws exec -- node_modules/.bin/babel src -d dist --quiet --extensions \".ts\"",
"build": "yarn build:quick",
"build:quick": "bolt ws exec -- node_modules/.bin/babel src -d dist --quiet --extensions \".ts\" --config-file ../../../.babelrc",
"postbuild": "ts-node tools/test-dist",
"commit": "git-cz",
"docs": "bolt docs:generate && bolt docs:position",
Expand All @@ -52,9 +52,9 @@
"electron-osx-sign": "^0.4.10",
"electron-packager": "^12.0.1",
"electron-rebuild": "^1.6.0",
"express": "^4.16.2",
"express": "4.16.4",
"express-ws": "^4.0.0",
"form-data": "^2.1.4",
"form-data": "2.3.3",
"fs-extra": "^7.0.0",
"glob": "^7.1.1",
"global": "^4.3.2",
Expand All @@ -63,7 +63,7 @@
"lodash.merge": "^4.6.0",
"lodash.template": "^4.4.0",
"log-symbols": "^2.0.0",
"mime-types": "^2.1.17",
"mime-types": "2.1.21",
"node-fetch": "^2.0.0",
"node-gyp": "^3.4.0",
"nugget": "^2.0.1",
Expand All @@ -86,25 +86,25 @@
"yarn-or-npm": "^2.0.2"
},
"devDependencies": {
"@babel/cli": "^7.0.0-beta.44",
"@babel/core": "^7.0.0-beta.44",
"@babel/plugin-proposal-class-properties": "^7.0.0-beta.44",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.44",
"@babel/preset-env": "^7.0.0-beta.44",
"@babel/preset-typescript": "^7.0.0-beta.44",
"@babel/register": "^7.0.0-beta.44",
"@types/chai": "^4.1.2",
"@babel/cli": "7.1.2",
"@babel/core": "7.1.2",
"@babel/plugin-proposal-class-properties": "7.1.0",
"@babel/plugin-proposal-object-rest-spread": "7.0.0",
"@babel/preset-env": "7.1.0",
"@babel/preset-typescript": "7.1.0",
"@babel/register": "7.0.0",
"@types/chai": "4.1.6",
"@types/chai-as-promised": "^7.1.0",
"@types/cross-spawn": "^6.0.0",
"@types/debug": "^0.0.30",
"@types/debug": "0.0.31",
"@types/electron-packager": "^12.0.0",
"@types/electron-winstaller": "^2.6.1",
"@types/express": "^4.11.1",
"@types/express-ws": "^3.0.0",
"@types/fetch-mock": "^6.0.1",
"@types/fetch-mock": "6.0.4",
"@types/form-data": "^2.2.1",
"@types/fs-extra": "^5.0.2",
"@types/glob": "^5.0.35",
"@types/glob": "7.1.1",
"@types/html-webpack-plugin": "^3.2.0",
"@types/inquirer": "^0.0.43",
"@types/listr": "^0.13.0",
Expand All @@ -113,22 +113,22 @@
"@types/log-symbols": "^2.0.0",
"@types/mime-types": "^2.1.0",
"@types/mocha": "^5.1.0",
"@types/node": "^10.9.4",
"@types/node": "10.12.0",
"@types/node-fetch": "^2.1.2",
"@types/opn": "^5.1.0",
"@types/ora": "^1.3.4",
"@types/pify": "^3.0.1",
"@types/pretty-ms": "^3.2.0",
"@types/proxyquire": "^1.3.28",
"@types/semver": "^5.5.0",
"@types/sinon": "^5.0.2",
"@types/webpack": "^4.1.4",
"@types/sinon": "5.0.5",
"@types/webpack": "4.4.17",
"@types/webpack-dev-middleware": "^2.0.1",
"@types/webpack-hot-middleware": "^2.16.3",
"@types/webpack-merge": "^4.1.3",
"asar": "^0.14.0",
"babel-plugin-source-map-support": "^2.0.1",
"chai": "^4.0.0",
"chai": "4.2.0",
"chai-as-promised": "^7.0.0",
"commitizen": "^2.8.6",
"coveralls": "^3.0.0",
Expand All @@ -146,11 +146,11 @@
"proxyquire": "^2.0.1",
"rimraf": "^2.6.2",
"sinon": "^6.1.5",
"ts-node": "^6.0.0",
"tslint": "^5.9.1",
"ts-node": "7.0.1",
"tslint": "5.11.0",
"tslint-config-airbnb": "^5.11.0",
"typedoc": "^0.11.1",
"typescript": "^2.8.1"
"typedoc": "0.13.0",
"typescript": "3.1.3"
},
"optionalDependencies": {
"electron-installer-debian": "^1.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/api/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"mocha": "^5.0.0"
},
"dependencies": {
Expand All @@ -31,4 +31,4 @@
"engines": {
"node": ">= 6.0"
}
}
}
4 changes: 2 additions & 2 deletions packages/api/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@electron-forge/maker-wix": "6.0.0-beta.29",
"@electron-forge/maker-zip": "6.0.0-beta.29",
"asar": "^0.14.0",
"chai": "^4.0.0",
"chai": "4.2.0",
"chai-as-promised": "^7.0.0",
"esdoc": "^1.0.1",
"esdoc-importpath-plugin": "^1.0.0",
Expand Down Expand Up @@ -67,4 +67,4 @@
"engines": {
"node": ">= 6.0"
}
}
}
2 changes: 1 addition & 1 deletion packages/api/core/src/util/config-fn.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export default <T, A>(configObject: T | ((...args: A[]) => T), ...args: A[]): T => {
if (typeof configObject === 'function') {
return configObject(...args);
return (configObject as any as ((...args: A[]) => T))(...args);
}
return configObject;
};
4 changes: 2 additions & 2 deletions packages/installer/base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"mocha": "^5.0.0"
},
"engines": {
Expand All @@ -20,4 +20,4 @@
"dependencies": {
"@electron-forge/async-ora": "6.0.0-beta.29"
}
}
}
4 changes: 2 additions & 2 deletions packages/maker/appx/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"mocha": "^5.0.0"
},
"engines": {
Expand All @@ -28,4 +28,4 @@
"optionalDependencies": {
"electron-windows-store": "^0.12.0"
}
}
}
2 changes: 1 addition & 1 deletion packages/maker/appx/typings/ambient.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
declare module 'parse-author' {
export type AuthorType = string | {
name: string
name: string;
} | undefined;
interface ParseAuthor {
(author: AuthorType): AuthorType;
Expand Down
4 changes: 2 additions & 2 deletions packages/maker/base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"mocha": "^5.0.0"
},
"engines": {
Expand All @@ -21,4 +21,4 @@
"@electron-forge/shared-types": "6.0.0-beta.29",
"fs-extra": "^7.0.0"
}
}
}
6 changes: 5 additions & 1 deletion packages/maker/base/src/Maker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ export default abstract class Maker<C> {
// TODO: Remove this, it is an eye-sore and is a nasty hack to provide forge
// v5 style functionality in the new API
prepareConfig(targetArch: ForgeArch) {
this.config = typeof this.configFetcher === 'function' ? this.configFetcher(targetArch) : this.configFetcher;
if (typeof this.configFetcher === 'function') {
this.config = (this.configFetcher as any as ((arch: ForgeArch) => C))(targetArch);
} else {
this.config = this.configFetcher as C;
}
}

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/maker/deb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"chai-as-promised": "^7.0.0",
"mocha": "^5.0.0",
"proxyquire": "^2.0.1",
Expand All @@ -27,4 +27,4 @@
"optionalDependencies": {
"electron-installer-debian": "^1.0.0"
}
}
}
4 changes: 2 additions & 2 deletions packages/maker/dmg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"chai-as-promised": "^7.0.0",
"mocha": "^5.0.0",
"proxyquire": "^2.0.1",
Expand All @@ -29,4 +29,4 @@
"optionalDependencies": {
"electron-installer-dmg": "^2.0.0"
}
}
}
4 changes: 2 additions & 2 deletions packages/maker/flatpak/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"mocha": "^5.0.0"
},
"engines": {
Expand All @@ -26,4 +26,4 @@
"optionalDependencies": {
"electron-installer-flatpak": "^0.8.0"
}
}
}
4 changes: 2 additions & 2 deletions packages/maker/pkg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"chai-as-promised": "^7.0.0",
"mocha": "^5.0.0",
"proxyquire": "^2.0.1",
Expand All @@ -25,4 +25,4 @@
"@electron-forge/shared-types": "6.0.0-beta.29",
"electron-osx-sign": "^0.4.10"
}
}
}
4 changes: 2 additions & 2 deletions packages/maker/rpm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"chai-as-promised": "^7.0.0",
"mocha": "^5.0.0",
"proxyquire": "^2.0.1",
Expand All @@ -28,4 +28,4 @@
"optionalDependencies": {
"electron-installer-redhat": "^0.5.0"
}
}
}
4 changes: 2 additions & 2 deletions packages/maker/snap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"chai-as-promised": "^7.0.0",
"mocha": "^5.0.0",
"proxyquire": "^2.0.1",
Expand All @@ -27,4 +27,4 @@
"optionalDependencies": {
"electron-installer-snap": "^3.0.0"
}
}
}
4 changes: 2 additions & 2 deletions packages/maker/squirrel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "exit 0"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"mocha": "^5.0.0"
},
"engines": {
Expand All @@ -25,4 +25,4 @@
"optionalDependencies": {
"electron-winstaller": "^2.5.0"
}
}
}
4 changes: 2 additions & 2 deletions packages/maker/wix/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "mocha --require ts-node/register test/**/*_spec.ts test/**/**/*_spec.ts --opts ../../../mocha.opts"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"mocha": "^5.0.0"
},
"engines": {
Expand All @@ -22,4 +22,4 @@
"@electron-forge/shared-types": "6.0.0-beta.29",
"electron-wix-msi": "^1.3.0"
}
}
}
2 changes: 1 addition & 1 deletion packages/maker/wix/typings/ambient.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
declare module 'parse-author' {
export type AuthorType = string | {
name: string
name: string;
} | undefined;
interface ParseAuthor {
(author: AuthorType): AuthorType;
Expand Down
4 changes: 2 additions & 2 deletions packages/maker/zip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "exit 0"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"mocha": "^5.0.0"
},
"engines": {
Expand All @@ -24,4 +24,4 @@
"fs-extra": "^7.0.0",
"pify": "^4.0.0"
}
}
}
4 changes: 2 additions & 2 deletions packages/plugin/base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "exit 0"
},
"devDependencies": {
"chai": "^4.0.0",
"chai": "4.2.0",
"mocha": "^5.0.0"
},
"engines": {
Expand All @@ -20,4 +20,4 @@
"dependencies": {
"@electron-forge/shared-types": "6.0.0-beta.29"
}
}
}
Loading

0 comments on commit cddfb1f

Please sign in to comment.