Merge pull request #227 from KoenLav/electron-5

electron-5: Added support for Electron 5

.babelrc

@@ -2,7 +2,7 @@
     "presets": [
         ["@babel/env", {
             "targets": {
-                "node": "4"
+                "node": "12"
             }
         }]
     ],

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   test:
     docker:
-      - image: circleci/node:8.11.3-jessie-browsers
+      - image: circleci/node:10.16.0-jessie-browsers
     steps:
       - checkout
       - run:
@@ -24,7 +24,7 @@ jobs:
           command: npm run test
   test-integration:
     docker:
-      - image: circleci/node:8.11.3-jessie-browsers
+      - image: circleci/node:10.16.0-jessie-browsers
     steps:
       - checkout
       - run:
@@ -58,7 +58,7 @@ jobs:
           name: install Meteor
           command: |
             # only install meteor if bin isn't found
-            command -v meteor >/dev/null 2>&1 || curl https://install.meteor.com/?release=1.5.4.1 | /bin/sh
+            command -v meteor >/dev/null 2>&1 || curl https://install.meteor.com/?release=1.8.1 | /bin/sh
       - run:
           name: copy meteor bin to build cache
           command: |

.gitignore

@@ -11,3 +11,8 @@ coverage
 *.lcov
 version
 port.cfg
+
+.reify-cache
+tests/.__tmp/autoupdate/Downloading
+tests/.__tmp/autoupdate/autoupdate.json
+tests/.__tmp/meteorProject

.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
@@ -26,7 +26,7 @@ before_install:
             then
                 meteor --version;
             else
-                curl https://install.meteor.com/?release=1.5.4.1 | /bin/sh;
+                curl https://install.meteor.com/?release=1.8.1 | /bin/sh;
             fi;
       fi
 

appveyor.yml

@@ -6,16 +6,16 @@ skip_tags: true
 
 environment:
   matrix:
-    - nodejs_version: "8"
+    - nodejs_version: "10"
       test: "normal"
       platform: x64
-    - nodejs_version: "8"
+    - nodejs_version: "10"
       test: "integration"
       platform: x64
-    - nodejs_version: "9"
+    - nodejs_version: "10"
       test: "integration"
       platform: x64
-    - nodejs_version: "9"
+    - nodejs_version: "10"
       test: "normal"
       platform: x64
 
@@ -36,7 +36,7 @@ install:
   - ps: >-
       if ($env:test -eq "integration") {
         if ((Get-Command "meteor" -ErrorAction SilentlyContinue) -eq $null) {
-          choco install meteor --params "'/RELEASE:1.5.4.1'"
+          choco install meteor --params "'/RELEASE:1.8.1'"
         }
       }
   - ps: refreshenv

devEnvSetup.js

@@ -116,7 +116,7 @@ question('Do you want to use another path (yes/no)? ')
             });
         }
         console.log('\nCreating meteor-desktop-test-app');
-        exec('meteor create meteor-desktop-test-app --release=METEOR@1.4.2.7');
+        exec('meteor create meteor-desktop-test-app --release=METEOR@1.6');
 
         console.log('Installing deps in meteor-desktop...\n');
         return spawn(npm, ['install'], path.join(resolvedPath, 'meteor-desktop'));

lib/defaultDependencies.js

@@ -1,6 +1,5 @@
 module.exports = {
-    electron: '2.0.10',
-    'electron-builder': '20.28.4',
-    'electron-packager': '12.1.2'
+    electron: '6.0.1',
+    'electron-builder': '21.2.0',
+    'electron-packager': '14.0.4'
 };
-

lib/electronApp.js

@@ -842,7 +842,7 @@ export default class ElectronApp {
 
         const uglifyingEnabled = 'uglify' in settings && !!settings.uglify;
 
-        const preset = presetEnv(undefined, { targets: { node: '8' } });
+        const preset = presetEnv({ assertVersion: () => { } }, { targets: { node: '12' } });
 
         const { data: files } = await this.$.utils.readDir(this.$.env.paths.desktopTmp.root);
 

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.resolve();
+        }
         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) {