Merge pull request #234 from wojtkowiak/v2.0.1

Fix mas build

.travis.yml

@@ -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

appveyor.yml

@@ -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
 

lib/defaultDependencies.js

@@ -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'
 };
 

lib/electronBuilder.js

@@ -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() {
@@ -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,
@@ -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();
+        }
         return new Promise((resolve, reject) => {
             shell.config.fatal = true;
 
@@ -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({

lib/index.js

@@ -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) {