use node 4 es2015 syntax

chenrb · Dec 1, 2015 · 98e7c12 · 98e7c12
1 parent d53efec
commit 98e7c12
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 81 deletions.
diff --git a/main.js b/main.js
@@ -1,33 +1,36 @@
-/* eslint no-path-concat: 0, func-names:0 */
-var electron = require('electron');
-var app = electron.app;
-var BrowserWindow = electron.BrowserWindow;
-var Menu = electron.Menu;
-var crashReporter = electron.crashReporter;
-var shell = electron.shell;
-var menu;
-var template;
+/* eslint strict: 0 */
+'use strict';
+
+const electron = require('electron');
+const app = electron.app;
+const BrowserWindow = electron.BrowserWindow;
+const Menu = electron.Menu;
+const crashReporter = electron.crashReporter;
+const shell = electron.shell;
+let menu;
+let template;
+let mainWindow = null;
+
 
 require('electron-debug')();
 crashReporter.start();
 
-var mainWindow = null;
 
-app.on('window-all-closed', function() {
+app.on('window-all-closed', () => {
   if (process.platform !== 'darwin') app.quit();
 });
 
 
-app.on('ready', function() {
+app.on('ready', () => {
   mainWindow = new BrowserWindow({ width: 1024, height: 728 });
 
   if (process.env.HOT) {
-    mainWindow.loadURL('file://' + __dirname + '/app/hot-dev-app.html');
+    mainWindow.loadURL(`file://${__dirname}/app/hot-dev-app.html`);
   } else {
-    mainWindow.loadURL('file://' + __dirname + '/app/app.html');
+    mainWindow.loadURL(`file://${__dirname}/app/app.html`);
   }
 
-  mainWindow.on('closed', function() {
+  mainWindow.on('closed', () => {
     mainWindow = null;
   });
 
@@ -64,7 +67,7 @@ app.on('ready', function() {
       }, {
         label: 'Quit',
         accelerator: 'Command+Q',
-        click: function() {
+        click() {
           app.quit();
         }
       }]
@@ -102,19 +105,19 @@ app.on('ready', function() {
       submenu: [{
         label: 'Reload',
         accelerator: 'Command+R',
-        click: function() {
+        click() {
           mainWindow.restart();
         }
       }, {
         label: 'Toggle Full Screen',
         accelerator: 'Ctrl+Command+F',
-        click: function() {
+        click() {
           mainWindow.setFullScreen(!mainWindow.isFullScreen());
         }
       }, {
         label: 'Toggle Developer Tools',
         accelerator: 'Alt+Command+I',
-        click: function() {
+        click() {
           mainWindow.toggleDevTools();
         }
       }]
@@ -138,22 +141,22 @@ app.on('ready', function() {
       label: 'Help',
       submenu: [{
         label: 'Learn More',
-        click: function() {
+        click() {
           shell.openExternal('http://electron.atom.io');
         }
       }, {
         label: 'Documentation',
-        click: function() {
+        click() {
           shell.openExternal('https://github.com/atom/electron/tree/master/docs#readme');
         }
       }, {
         label: 'Community Discussions',
-        click: function() {
+        click() {
           shell.openExternal('https://discuss.atom.io/c/electron');
         }
       }, {
         label: 'Search Issues',
-        click: function() {
+        click() {
           shell.openExternal('https://github.com/atom/electron/issues');
         }
       }]
@@ -170,7 +173,7 @@ app.on('ready', function() {
       }, {
         label: '&Close',
         accelerator: 'Ctrl+W',
-        click: function() {
+        click() {
           mainWindow.close();
         }
       }]
@@ -179,42 +182,42 @@ app.on('ready', function() {
       submenu: [{
         label: '&Reload',
         accelerator: 'Ctrl+R',
-        click: function() {
+        click() {
           mainWindow.restart();
         }
       }, {
         label: 'Toggle &Full Screen',
         accelerator: 'F11',
-        click: function() {
+        click() {
           mainWindow.setFullScreen(!mainWindow.isFullScreen());
         }
       }, {
         label: 'Toggle &Developer Tools',
         accelerator: 'Alt+Ctrl+I',
-        click: function() {
+        click() {
           mainWindow.toggleDevTools();
         }
       }]
     }, {
       label: 'Help',
       submenu: [{
         label: 'Learn More',
-        click: function() {
+        click() {
           shell.openExternal('http://electron.atom.io');
         }
       }, {
         label: 'Documentation',
-        click: function() {
+        click() {
           shell.openExternal('https://github.com/atom/electron/tree/master/docs#readme');
         }
       }, {
         label: 'Community Discussions',
-        click: function() {
+        click() {
           shell.openExternal('https://discuss.atom.io/c/electron');
         }
       }, {
         label: 'Search Issues',
-        click: function() {
+        click() {
           shell.openExternal('https://github.com/atom/electron/issues');
         }
       }]

diff --git a/package.js b/package.js
@@ -1,45 +1,46 @@
-/* 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.config.production.js');
-var packager = require('electron-packager');
-var assign = require('object-assign');
-var del = require('del');
-var exec = require('child_process').exec;
-var argv = require('minimist')(process.argv.slice(2));
-var devDeps = Object.keys(require('./package.json').devDependencies);
+/* eslint strict: 0, no-shadow: 0, no-unused-vars: 0, no-console: 0 */
+'use strict';
 
+const os = require('os');
+const webpack = require('webpack');
+const cfg = require('./webpack.config.production.js');
+const packager = require('electron-packager');
+const del = require('del');
+const exec = require('child_process').exec;
+const argv = require('minimist')(process.argv.slice(2));
+const 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;
 
+const appName = argv.name || argv.n || 'ElectronReact';
+const shouldUseAsar = argv.asar || argv.a || false;
+const shouldBuildAll = argv.all || false;
 
-var DEFAULT_OPTS = {
+
+const DEFAULT_OPTS = {
   dir: './',
   name: appName,
   asar: shouldUseAsar,
   ignore: [
     '/test($|/)',
     '/tools($|/)',
     '/release($|/)'
-  ].concat(devDeps.map(function(name) { return '/node_modules/' + name + '($|/)'; }))
+  ].concat(devDeps.map(name => `/node_modules/${name}($|/)`))
 };
 
-var icon = argv.icon || argv.i || 'app/app.icns';
+const icon = argv.icon || argv.i || 'app/app.icns';
 
 if (icon) {
   DEFAULT_OPTS.icon = icon;
 }
 
-var version = argv.version || argv.v;
+const version = argv.version || argv.v;
 
 if (version) {
   DEFAULT_OPTS.version = version;
   startPack();
 } else {
   // use the same version as the currently-installed electron-prebuilt
-  exec('npm list | grep electron-prebuilt', function(err, stdout, stderr) {
+  exec('npm list | grep electron-prebuilt', (err, stdout, stderr) => {
     if (err) {
       DEFAULT_OPTS.version = '0.35.2';
     } else {
@@ -52,17 +53,17 @@ if (version) {
 
 function startPack() {
   console.log('start pack...');
-  webpack(cfg, function runWebpackBuild(err, stats) {
+  webpack(cfg, (err, stats) => {
     if (err) return console.error(err);
     del('release')
-    .then(function(paths) {
+    .then(paths => {
       if (shouldBuildAll) {
         // build for all platforms
-        var archs = ['ia32', 'x64'];
-        var platforms = ['linux', 'win32', 'darwin'];
+        const archs = ['ia32', 'x64'];
+        const platforms = ['linux', 'win32', 'darwin'];
 
-        platforms.forEach(function(plat) {
-          archs.forEach(function(arch) {
+        platforms.forEach(plat => {
+          archs.forEach(arch => {
             pack(plat, arch, log(plat, arch));
           });
         });
@@ -71,7 +72,7 @@ function startPack() {
         pack(os.platform(), os.arch(), log(os.platform(), os.arch()));
       }
     })
-    .catch(function(err) {
+    .catch(err => {
       console.error(err);
     });
   });
@@ -81,20 +82,20 @@ function pack(plat, arch, cb) {
   // there is no darwin ia32 electron
   if (plat === 'darwin' && arch === 'ia32') return;
 
-  var opts = assign({}, DEFAULT_OPTS, {
+  const opts = Object.assign({}, DEFAULT_OPTS, {
     platform: plat,
     arch: arch,
     prune: true,
-    out: 'release/' + plat + '-' + arch
+    out: `release/${plat}-${arch}`
   });
 
   packager(opts, cb);
 }
 
 
 function log(plat, arch) {
-  return function(err, filepath) {
+  return (err, filepath) => {
     if (err) return console.error(err);
-    console.log(plat + '-' + arch + ' finished!');
+    console.log(`${plat}-${arch} finished!`);
   };
 }
diff --git a/package.json b/package.json
@@ -67,13 +67,11 @@
     "minimist": "^1.2.0",
     "mocha": "^2.3.0",
     "node-libs-browser": ">= 0.4.0 <=0.6.0",
-    "object-assign": "^4.0.1",
     "postcss": "^5.0.11",
     "postcss-modules-extract-imports": "^1.0.0",
     "postcss-modules-local-by-default": "^1.0.0",
     "postcss-modules-scope": "^1.0.0",
     "postcss-modules-values": "^1.1.1",
-    "proxyquire": "^1.7.1",
     "react-addons-test-utils": "^0.14.2",
     "react-transform-catch-errors": "^1.0.0",
     "react-transform-hmr": "^1.0.1",
@@ -101,5 +99,8 @@
     "redux": "^3.0.4",
     "redux-promise": "^0.5.0",
     "redux-thunk": "^1.0.0"
+  },
+  "devEngines": {
+    "node": "4.x"
   }
 }
diff --git a/server.js b/server.js
@@ -1,10 +1,15 @@
-var path = require('path');
-var express = require('express');
-var webpack = require('webpack');
-var config = require('./webpack.config.development');
+/* eslint strict: 0, no-console: 0 */
+'use strict';
 
-var app = express();
-var compiler = webpack(config);
+const path = require('path');
+const express = require('express');
+const webpack = require('webpack');
+const config = require('./webpack.config.development');
+
+const app = express();
+const compiler = webpack(config);
+
+const PORT = 3000;
 
 app.use(require('webpack-dev-middleware')(compiler, {
   publicPath: config.output.publicPath,
@@ -15,15 +20,15 @@ app.use(require('webpack-dev-middleware')(compiler, {
 
 app.use(require('webpack-hot-middleware')(compiler));
 
-app.get('*', function(req, res) {
+app.get('*', (req, res) => {
   res.sendFile(path.join(__dirname, 'app', 'hot-dev-app.html'));
 });
 
-app.listen(3000, 'localhost', function(err) {
+app.listen(PORT, 'localhost', err => {
   if (err) {
     console.log(err);
     return;
   }
 
-  console.log('Listening at http://localhost:3000');
+  console.log(`Listening at http://localhost:${PORT}`);
 });
diff --git a/webpack.config.base.js b/webpack.config.base.js
@@ -1,4 +1,7 @@
-var path = require('path');
+/* eslint strict: 0 */
+'use strict';
+
+const path = require('path');
 
 module.exports = {
   module: {

diff --git a/webpack.config.development.js b/webpack.config.development.js
@@ -1,12 +1,12 @@
 /* eslint strict: 0 */
 'use strict';
 
-var webpack = require('webpack');
-var webpackTargetElectronRenderer = require('webpack-target-electron-renderer');
-var baseConfig = require('./webpack.config.base');
+const webpack = require('webpack');
+const webpackTargetElectronRenderer = require('webpack-target-electron-renderer');
+const baseConfig = require('./webpack.config.base');
 
 
-var config = Object.create(baseConfig);
+const config = Object.create(baseConfig);
 
 config.debug = true;