Skip to content

Commit

Permalink
refactor(core): use electron-installer-common to read package.json fr…
Browse files Browse the repository at this point in the history
…om packaged app (#1798)
  • Loading branch information
malept committed Jun 27, 2020
1 parent 3cc007f commit 5279272
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 13 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -116,14 +116,14 @@
"@types/webpack-merge": "^4.1.5",
"@typescript-eslint/eslint-plugin": "^3.0.0",
"@typescript-eslint/parser": "^3.0.0",
"asar": "^3.0.1",
"babel-plugin-source-map-support": "^2.1.2",
"chai": "4.2.0",
"chai-as-promised": "^7.0.0",
"codecov": "^3.6.1",
"commitizen": "^4.0.4",
"cross-env": "^7.0.2",
"cz-customizable": "^6.2.0",
"electron-installer-common": "^0.10.2",
"eslint": "^7.0.0",
"eslint-config-airbnb-base": "^14.2.0",
"eslint-plugin-import": "^2.21.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/api/core/package.json
Expand Up @@ -18,9 +18,9 @@
"@electron-forge/maker-wix": "6.0.0-beta.51",
"@electron-forge/maker-zip": "6.0.0-beta.51",
"@electron-forge/test-utils": "6.0.0-beta.51",
"asar": "^3.0.1",
"chai": "4.2.0",
"chai-as-promised": "^7.0.0",
"electron-installer-common": "^0.10.2",
"fetch-mock": "^9.10.3",
"mocha": "^8.0.1",
"proxyquire": "^2.1.3",
Expand Down
15 changes: 5 additions & 10 deletions packages/api/core/test/slow/api_spec_slow.ts
@@ -1,11 +1,11 @@
import * as asar from 'asar';
import { createDefaultCertificate } from '@electron-forge/maker-appx';
import { ensureTestDirIsNonexistent, expectProjectPathExists } from '@electron-forge/test-utils';
import { execSync } from 'child_process';
import { expect } from 'chai';
import fs from 'fs-extra';
import path from 'path';
import proxyquire from 'proxyquire';
import { readMetadata } from 'electron-installer-common';

import installDeps from '../../src/util/install-dependencies';
import { readRawPackageJson } from '../../src/util/read-package-json';
Expand Down Expand Up @@ -247,16 +247,11 @@ describe(`electron-forge API (with installer=${nodeInstaller})`, () => {
});

describe('after package', () => {
let resourcesPath = 'Test-App.app/Contents/Resources';
if (process.platform !== 'darwin') {
resourcesPath = 'resources';
}

it('should have deleted the forge config from the packaged app', async () => {
const cleanPackageJSON = JSON.parse(asar.extractFile(
path.resolve(dir, 'out', `Test-App-${process.platform}-${process.arch}`, resourcesPath, 'app.asar'),
'package.json',
).toString());
const cleanPackageJSON = await readMetadata({
src: path.resolve(dir, 'out', `Test-App-${process.platform}-${process.arch}`),
logger: console.error,
});
expect(cleanPackageJSON).to.not.have.nested.property('config.forge');
});

Expand Down
19 changes: 18 additions & 1 deletion yarn.lock
Expand Up @@ -1919,7 +1919,7 @@ asar@^2.0.1:
optionalDependencies:
"@types/glob" "^7.1.1"

asar@^3.0.1:
asar@^3.0.0:
version "3.0.3"
resolved "https://registry.yarnpkg.com/asar/-/asar-3.0.3.tgz#1fef03c2d6d2de0cbad138788e4f7ae03b129c7b"
integrity sha512-k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw==
Expand Down Expand Up @@ -3481,6 +3481,23 @@ electron-installer-common@^0.10.0, electron-installer-common@^0.10.1:
semver "^7.1.1"
tmp-promise "^2.0.1"

electron-installer-common@^0.10.2:
version "0.10.2"
resolved "https://registry.yarnpkg.com/electron-installer-common/-/electron-installer-common-0.10.2.tgz#93afd2af392d33ab3f02b036c63ea855369b043a"
integrity sha512-jwKps+hE+Q4NnjqfkBl5XgtrAZUaQiMaNkDGQ9MC0rnoGCq2mzrhY+sh7nhh0YaVqIu8lSaxWC+sCL0qfNshpA==
dependencies:
"@malept/cross-spawn-promise" "^1.0.0"
asar "^3.0.0"
debug "^4.1.1"
fs-extra "^9.0.0"
glob "^7.1.4"
lodash "^4.17.15"
parse-author "^2.0.0"
semver "^7.1.1"
tmp-promise "^3.0.2"
optionalDependencies:
"@types/fs-extra" "^9.0.1"

electron-installer-debian@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/electron-installer-debian/-/electron-installer-debian-3.0.0.tgz#abd76db8e89bc1ba1e5366975a941461dda06e6d"
Expand Down

0 comments on commit 5279272

Please sign in to comment.