fix: make the version lookup more resilient to install strategy

electron · May 23, 2019 · 068c2f8 · 068c2f8
1 parent 49bf7a1
commit 068c2f8
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/packages/api/cli/src/electron-forge-import.ts b/packages/api/cli/src/electron-forge-import.ts
@@ -2,14 +2,15 @@ import { api } from '@electron-forge/core';
 
 import fs from 'fs-extra';
 import program from 'commander';
+import path from 'path';
 
 import './util/terminate';
 import workingDir from './util/working-dir';
 
 (async () => {
  let dir = process.cwd();
  program
- .version((await fs.readJson('../package.json')).version)
+ .version((await fs.readJson(path.resolve(__dirname, '../package.json'))).version)
  .arguments('[name]')
  .action((name) => { dir = workingDir(dir, name, false); })
  .parse(process.argv);

diff --git a/packages/api/cli/src/electron-forge-init.ts b/packages/api/cli/src/electron-forge-init.ts
@@ -2,14 +2,15 @@ import { api, InitOptions } from '@electron-forge/core';
 
 import fs from 'fs-extra';
 import program from 'commander';
+import path from 'path';
 
 import './util/terminate';
 import workingDir from './util/working-dir';
 
 (async () => {
  let dir = process.cwd();
  program
- .version((await fs.readJson('../package.json')).version)
+ .version((await fs.readJson(path.resolve(__dirname, '../package.json'))).version)
  .arguments('[name]')
  .option('-t, --template [name]', 'Name of the forge template to use')
  .option('-c, --copy-ci-files', 'Whether to copy the templated CI files (defaults to false)', false)

diff --git a/packages/api/cli/src/electron-forge-install.ts b/packages/api/cli/src/electron-forge-install.ts
@@ -3,14 +3,15 @@ import { api, InstallAsset } from '@electron-forge/core';
 import fs from 'fs-extra';
 import inquirer from 'inquirer';
 import program from 'commander';
+import path from 'path';
 
 import './util/terminate';
 
 (async () => {
  let repo!: string;
 
  program
- .version((await fs.readJson('../package.json')).version)
+ .version((await fs.readJson(path.resolve(__dirname, '../package.json'))).version)
  .arguments('[repository]')
  .option('--prerelease', 'Fetch prerelease versions')
  .action((repository) => { repo = repository; })

diff --git a/packages/api/cli/src/electron-forge-lint.ts b/packages/api/cli/src/electron-forge-lint.ts
@@ -2,14 +2,15 @@ import { api } from '@electron-forge/core';
 
 import fs from 'fs-extra';
 import program from 'commander';
+import path from 'path';
 
 import './util/terminate';
 import workingDir from './util/working-dir';
 
 (async () => {
  let dir = process.cwd();
  program
- .version((await fs.readJson('../package.json')).version)
+ .version((await fs.readJson(path.resolve(__dirname, '../package.json'))).version)
  .arguments('[cwd]')
  .action((cwd) => { dir = workingDir(dir, cwd); })
  .parse(process.argv);

diff --git a/packages/api/cli/src/electron-forge-make.ts b/packages/api/cli/src/electron-forge-make.ts
@@ -2,6 +2,7 @@ import { api, MakeOptions } from '@electron-forge/core';
 
 import fs from 'fs-extra';
 import program from 'commander';
+import path from 'path';
 
 import './util/terminate';
 import workingDir from './util/working-dir';
@@ -10,7 +11,7 @@ import workingDir from './util/working-dir';
 export async function getMakeOptions() {
  let dir = process.cwd();
  program
- .version((await fs.readJson('../package.json')).version)
+ .version((await fs.readJson(path.resolve(__dirname, '../package.json'))).version)
  .arguments('[cwd]')
  .option('--skip-package', 'Assume the app is already packaged')
  .option('-a, --arch [arch]', 'Target architecture')

diff --git a/packages/api/cli/src/electron-forge-package.ts b/packages/api/cli/src/electron-forge-package.ts
@@ -2,14 +2,15 @@ import { api, PackageOptions } from '@electron-forge/core';
 
 import fs from 'fs-extra';
 import program from 'commander';
+import path from 'path';
 
 import './util/terminate';
 import workingDir from './util/working-dir';
 
 (async () => {
  let dir: string = process.cwd();
  program
- .version((await fs.readJson('../package.json')).version)
+ .version((await fs.readJson(path.resolve(__dirname, '../package.json'))).version)
  .arguments('[cwd]')
  .option('-a, --arch [arch]', 'Target architecture')
  .option('-p, --platform [platform]', 'Target build platform')

diff --git a/packages/api/cli/src/electron-forge-publish.ts b/packages/api/cli/src/electron-forge-publish.ts
@@ -2,6 +2,7 @@ import { api, PublishOptions } from '@electron-forge/core';
 
 import fs from 'fs-extra';
 import program from 'commander';
+import path from 'path';
 
 import './util/terminate';
 import workingDir from './util/working-dir';
@@ -10,7 +11,7 @@ import { getMakeOptions } from './electron-forge-make';
 (async () => {
  let dir = process.cwd();
  program
- .version((await fs.readJson('../package.json')).version)
+ .version((await fs.readJson(path.resolve(__dirname, '../package.json'))).version)
  .arguments('[cwd]')
  .option('--target [target[,target...]]', 'The comma-separated deployment targets, defaults to "github"')
  .option('--dry-run', 'Triggers a publish dry run which saves state and doesn\'t upload anything')

diff --git a/packages/api/cli/src/electron-forge-start.ts b/packages/api/cli/src/electron-forge-start.ts
@@ -3,6 +3,7 @@ import { api, StartOptions } from '@electron-forge/core';
 import { ChildProcess } from 'child_process';
 import fs from 'fs-extra';
 import program from 'commander';
+import path from 'path';
 
 import './util/terminate';
 import workingDir from './util/working-dir';
@@ -19,7 +20,7 @@ import workingDir from './util/working-dir';
 
  let dir = process.cwd();
  program
- .version((await fs.readJson('../package.json')).version)
+ .version((await fs.readJson(path.resolve(__dirname, '../package.json'))).version)
  .arguments('[cwd]')
  .option('-p, --app-path <path>', 'Override the path to the Electron app to launch (defaults to \'.\')')
  .option('-l, --enable-logging', 'Enable advanced logging. This will log internal Electron things')