Skip to content

Commit

Permalink
fix: bump @electron/get from 1.5.0 to 1.7.0 & always enable proxy sup…
Browse files Browse the repository at this point in the history
…port in CLI (#1264)

* chore(deps): bump @electron/get from 1.5.0 to 1.6.0

Bumps [@electron/get](https://github.com/electron/get) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/electron/get/releases)
- [Changelog](https://github.com/electron/get/blob/master/.releaserc.json)
- [Commits](electron/get@v1.5.0...v1.6.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Finish upgrading via bolt

* chore(deps): upgrade @electron/get to 1.7.0

* fix(cli): always run initializeProxy() during package, make, & publish subcommands
  • Loading branch information
dependabot-preview[bot] authored and malept committed Nov 20, 2019
1 parent 38c32ca commit d65f33e
Show file tree
Hide file tree
Showing 7 changed files with 153 additions and 16 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"postinstall": "rimraf node_modules/.bin/*.ps1 && ts-node tools/link-ts.ts"
},
"dependencies": {
"@electron/get": "^1.3.1",
"@electron/get": "^1.6.0",
"@octokit/rest": "^16.34.0",
"@types/which": "^1.3.2",
"aws-sdk": "^2.472.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/api/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"dependencies": {
"@electron-forge/async-ora": "6.0.0-beta.45",
"@electron-forge/core": "6.0.0-beta.45",
"@electron/get": "^1.6.0",
"colors": "^1.4.0",
"commander": "^3.0.2",
"debug": "^4.1.0",
Expand All @@ -27,4 +28,4 @@
"engines": {
"node": ">= 8.0"
}
}
}
3 changes: 3 additions & 0 deletions packages/api/cli/src/electron-forge-make.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { api, MakeOptions } from '@electron-forge/core';

import fs from 'fs-extra';
import { initializeProxy } from '@electron/get';
import program from 'commander';
import path from 'path';

Expand Down Expand Up @@ -38,6 +39,8 @@ if (process.mainModule === module || (global as any).__LINKED_FORGE__) {
(async () => {
const makeOpts = await getMakeOptions();

initializeProxy();

await api.make(makeOpts);
})();
}
3 changes: 3 additions & 0 deletions packages/api/cli/src/electron-forge-package.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { api, PackageOptions } from '@electron-forge/core';

import fs from 'fs-extra';
import { initializeProxy } from '@electron/get';
import program from 'commander';
import path from 'path';

Expand All @@ -17,6 +18,8 @@ import workingDir from './util/working-dir';
.action((cwd) => { dir = workingDir(dir, cwd); })
.parse(process.argv);

initializeProxy();

const packageOpts: PackageOptions = {
dir,
interactive: true,
Expand Down
3 changes: 3 additions & 0 deletions packages/api/cli/src/electron-forge-publish.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { api, PublishOptions } from '@electron-forge/core';

import fs from 'fs-extra';
import { initializeProxy } from '@electron/get';
import program from 'commander';
import path from 'path';

Expand All @@ -20,6 +21,8 @@ import { getMakeOptions } from './electron-forge-make';
.action((cwd) => { dir = workingDir(dir, cwd); })
.parse(process.argv);

initializeProxy();

const publishOpts: PublishOptions = {
dir,
interactive: true,
Expand Down
2 changes: 1 addition & 1 deletion packages/api/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@electron-forge/publisher-base": "6.0.0-beta.45",
"@electron-forge/shared-types": "6.0.0-beta.45",
"@electron-forge/template-webpack": "6.0.0-beta.45",
"@electron/get": "^1.3.1",
"@electron/get": "^1.6.0",
"colors": "^1.4.0",
"cross-spawn-promise": "^0.10.1",
"debug": "^4.1.0",
Expand Down
Loading

0 comments on commit d65f33e

Please sign in to comment.