From f892f26300e23550d429c309bd91aa3fd345daf6 Mon Sep 17 00:00:00 2001 From: pompeu Date: Fri, 10 Jun 2016 21:47:31 -0300 Subject: [PATCH 1/2] add ecs 2015 for node 6 improviments --- server.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/server.js b/server.js index d655597..8f5b71f 100644 --- a/server.js +++ b/server.js @@ -1,23 +1,25 @@ -var webpack = require('webpack') -var webpackDevMiddleware = require('webpack-dev-middleware') -var webpackHotMiddleware = require('webpack-hot-middleware') -var config = require('./webpack.config') +const webpack = require('webpack') +const webpackDevMiddleware = require('webpack-dev-middleware') +const webpackHotMiddleware = require('webpack-hot-middleware') +const config = require('./webpack.config') -var app = new (require('express'))() -var port = 3000 +const app = new require('express')() +const port = 3000 -var compiler = webpack(config) -app.use(webpackDevMiddleware(compiler, { noInfo: true, publicPath: config.output.publicPath })) +const compiler = webpack(config) +app.use(webpackDevMiddleware(compiler, { + noInfo: true, publicPath: config.output.publicPath +})) app.use(webpackHotMiddleware(compiler)) -app.get("/", function(req, res) { - res.sendFile(__dirname + '/index.html') +app.get('/', function(req, res) { + res.sendFile(`${__dirname}/index.html`) }) app.listen(port, function(error) { if (error) { console.error(error) } else { - console.info("==> 🌎 Listening on port %s. Open up http://localhost:%s/ in your browser.", port, port) + console.info(`==> 🌎 Listening on port ${port}. Open up http://localhost:${port}/ in your browser.`) } }) From 31e5176a4dab31883112e1b0be2004d7d5b3caea Mon Sep 17 00:00:00 2001 From: pompeu Date: Fri, 10 Jun 2016 21:50:19 -0300 Subject: [PATCH 2/2] add ecs 2015 for node 6 improviments --- webpack.config.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index b46099d..e8cc1c7 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,5 +1,5 @@ -var path = require('path') -var webpack = require('webpack') +const path = require('path') +const webpack = require('webpack') module.exports = { devtool: 'cheap-module-eval-source-map', @@ -34,9 +34,9 @@ module.exports = { // When inside Redux repo, prefer src to compiled version. // You can safely delete these lines in your project. -var reduxSrc = path.join(__dirname, '..', '..', 'src') -var reduxNodeModules = path.join(__dirname, '..', '..', 'node_modules') -var fs = require('fs') +const reduxSrc = path.join(__dirname, '..', '..', 'src') +const reduxNodeModules = path.join(__dirname, '..', '..', 'node_modules') +const fs = require('fs') if (fs.existsSync(reduxSrc) && fs.existsSync(reduxNodeModules)) { // Resolve Redux to source module.exports.resolve = { alias: { 'redux': reduxSrc } }