Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mas build #214

Merged
merged 1 commit into from
Nov 28, 2019
Merged

Fix mas build #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ os:

env:
- TEST=normal NODE_VERSION=8
- TEST=normal NODE_VERSION=9
- TEST=normal NODE_VERSION=10
- TEST=integration NODE_VERSION=8
- TEST=integration NODE_VERSION=9
- TEST=integration NODE_VERSION=10

before_install:
- nvm install $NODE_VERSION
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ environment:
- nodejs_version: "8"
test: "integration"
platform: x64
- nodejs_version: "9"
- nodejs_version: "10"
test: "integration"
platform: x64
- nodejs_version: "9"
- nodejs_version: "10"
test: "normal"
platform: x64

Expand Down
6 changes: 3 additions & 3 deletions lib/defaultDependencies.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
electron: '2.0.10',
'electron-builder': '20.28.4',
'electron-packager': '12.1.2'
electron: '2.0.16',
'electron-builder': '20.38.4',
'electron-packager': '12.2.0'
};

15 changes: 14 additions & 1 deletion lib/electronBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export default class InstallerBuilder {
this.lastRebuild = {};
this.currentContext = null;
this.installerDir = path.join(this.$.env.options.output, this.$.env.paths.installerDir);
this.platforms = [];
}

async init() {
Expand All @@ -66,7 +67,8 @@ export default class InstallerBuilder {
* @returns {Object}
*/
prepareLastRebuildObject(arch, platform = process.platform) {
const productionDeps = this.packageDependencies.createLazyProductionDeps(this.$.env.paths.electronApp.root);
const productionDeps = this.packageDependencies
.createLazyProductionDeps(this.$.env.paths.electronApp.root);
this.lastRebuild = {
frameworkInfo: { version: this.$.getElectronVersion(), useCustomDist: true },
platform,
Expand Down Expand Up @@ -142,6 +144,11 @@ export default class InstallerBuilder {
* @returns {Promise}
*/
afterPack(context) {
this.platforms = this.platforms
.filter(platform => platform !== context.electronPlatformName);
if (this.platforms.length !== 0) {
return Promise.resovle();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return Promise.resovle();
return Promise.resolve();

😉

}
return new Promise((resolve, reject) => {
shell.config.fatal = true;

Expand Down Expand Up @@ -329,6 +336,12 @@ export default class InstallerBuilder {
output: path.join(this.$.env.options.output, this.$.env.paths.installerDir)
};

if ('mac' in builderOptions && 'target' in builderOptions.mac) {
if (builderOptions.mac.target.includes('mas')) {
this.platforms = ['darwin', 'mas'];
}
}

try {
this.log.debug('calling build from electron-builder');
await this.builder.dependency.build(Object.assign({
Expand Down
2 changes: 1 addition & 1 deletion lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ class MeteorDesktop {
const { dependencies = {}, devDependencies = {} } = JSON.parse(
fs.readFileSync(path.join(this.env.paths.meteorApp.root, 'package.json'), 'UTF-8')
);
if (!( name in dependencies ) && !( name in devDependencies )) {
if (!(name in dependencies) && !(name in devDependencies)) {
await this.meteorApp.runNpm(['i', '-D', '-E', '--only=dev', `${name}@${version}`], 'inherit');
}
} catch (e) {
Expand Down