fixing release

skevy · Sep 5, 2015 · 65d03a4 · 65d03a4
1 parent 119b076
commit 65d03a4
Show file tree

Hide file tree

Showing 4 changed files with 120 additions and 108 deletions.
diff --git a/app/components/App.js b/app/components/App.js
@@ -2,7 +2,7 @@
 import _ from 'lodash';
 import React from 'react';
 import fetch from 'isomorphic-fetch';
-import GraphiQL from 'graphiql/dist/index';
+import GraphiQL from 'graphiql/dist';
 import Modal from 'react-modal/lib/index';
 
 Modal.setAppElement(document.getElementById('react-root'));

diff --git a/package.js b/package.js
@@ -1,17 +1,18 @@
-var os = require('os')
-var webpack = require('webpack')
-var cfg = require('./webpack/webpack.config.production.js')
-var packager = require('electron-packager')
-var assign = require('object-assign')
-var del = require('del')
-var latest = require('github-latest-release')
-var argv = require('minimist')(process.argv.slice(2))
-var devDeps = Object.keys(require('./package.json').devDependencies)
+/* eslint no-shadow: 0, func-names: 0, no-unused-vars: 0, no-console: 0 */
+var os = require('os');
+var webpack = require('webpack');
+var cfg = require('./webpack/webpack.config.production.js');
+var packager = require('electron-packager');
+var assign = require('object-assign');
+var del = require('del');
+var latest = require('github-latest-release');
+var argv = require('minimist')(process.argv.slice(2));
+var devDeps = Object.keys(require('./package.json').devDependencies);
 
 
-var appName = argv.name || argv.n || 'ElectronReact'
-var shouldUseAsar = argv.asar || argv.a || false
-var shouldBuildAll = argv.all || false
+var appName = argv.name || argv.n || 'ElectronReact';
+var shouldUseAsar = argv.asar || argv.a || false;
+var shouldBuildAll = argv.all || false;
 
 
 var DEFAULT_OPTS = {
@@ -22,73 +23,76 @@ var DEFAULT_OPTS = {
     '/test($|/)',
     '/tools($|/)',
     '/release($|/)'
-  ].concat(devDeps.map(function(name) { return '/node_modules/' + name + '($|/)' }))
-}
+  ].concat(devDeps.map(function(name) { return '/node_modules/' + name + '($|/)'; }))
+};
 
-var icon = argv.icon || argv.i || 'app/app.icns'
+var icon = argv.icon || argv.i || 'app/app.icns';
 
 if (icon) {
-  DEFAULT_OPTS.icon = icon
+  DEFAULT_OPTS.icon = icon;
 }
 
-var version = argv.version || argv.v
+var version = argv.version || argv.v;
 
 if (version) {
-  DEFAULT_OPTS.version = version
-  startPack()
+  DEFAULT_OPTS.version = version;
+  startPack();
 } else {
   latest('atom', 'electron', function(err, res) {
     if (err) {
-      DEFAULT_OPTS.version = '0.28.3'
+      DEFAULT_OPTS.version = '0.28.3';
     } else {
-      DEFAULT_OPTS.version = res.name.split('v')[1]
+      DEFAULT_OPTS.version = res.name.split('v')[1];
     }
-    startPack()
-  })
+    startPack();
+  });
 }
 
 
 function startPack() {
-  console.log('start pack...')
-  webpack(cfg, function(err, stats) {
-    if (err) return console.error(err)
-    del('release', function(err, paths) {
-      if (err) return console.error(err)
+  console.log('start pack...');
+  webpack(cfg, function runWebpackBuild(err, stats) {
+    if (err) return console.error(err);
+    del('release')
+    .then(function(paths) {
       if (shouldBuildAll) {
         // build for all platforms
-        var archs = ['ia32', 'x64']
-        var platforms = ['linux', 'win32', 'darwin']
-
-        platforms.forEach(function (plat) {
-          archs.forEach(function (arch) {
-            pack(plat, arch, log(plat, arch))
-          })
-        })
+        var archs = ['ia32', 'x64'];
+        var platforms = ['linux', 'win32', 'darwin'];
+
+        platforms.forEach(function(plat) {
+          archs.forEach(function(arch) {
+            pack(plat, arch, log(plat, arch));
+          });
+        });
       } else {
         // build for current platform only
-        pack(os.platform(), os.arch(), log(os.platform(), os.arch()))
+        pack(os.platform(), os.arch(), log(os.platform(), os.arch()));
       }
     })
-  })
+    .catch(function(err) {
+      console.error(err);
+    });
+  });
 }
 
 function pack(plat, arch, cb) {
   // there is no darwin ia32 electron
-  if (plat === 'darwin' && arch === 'ia32') return
+  if (plat === 'darwin' && arch === 'ia32') return;
 
   var opts = assign({}, DEFAULT_OPTS, {
     platform: plat,
     arch: arch,
     out: 'release/' + plat + '-' + arch
-  })
+  });
 
-  packager(opts, cb)
+  packager(opts, cb);
 }
 
 
 function log(plat, arch) {
   return function(err, filepath) {
-    if (err) return console.error(err)
-    console.log(plat + '-' + arch + ' finished!')
-  }
+    if (err) return console.error(err);
+    console.log(plat + '-' + arch + ' finished!');
+  };
 }
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "babel-loader": "^5.3.2",
     "babel-runtime": "^5.8.20",
     "css-loader": "^0.16.0",
-    "del": "^1.2.1",
+    "del": "^2.0.1",
     "electron-packager": "^5.0.2",
     "electron-prebuilt": "^0.31.0",
     "electron-rebuild": "^0.2.5",
@@ -45,13 +45,15 @@
     "github-latest-release": "^0.1.1",
     "html-loader": "^0.3.0",
     "json-loader": "^0.5.2",
+    "loaders-by-extension": "^1.0.0",
     "minimist": "^1.2.0",
     "raw-loader": "^0.5.1",
     "react-hot-loader": "^1.2.9",
     "stats-webpack-plugin": "^0.2.1",
     "style-loader": "^0.12.3",
     "url-loader": "^0.5.6",
     "webpack": "^1.12.0",
-    "webpack-dev-server": "^1.10.1"
+    "webpack-dev-server": "^1.10.1",
+    "webpack-target-electron-renderer": "^0.1.0"
   }
 }