Update npm modules; tweak webpack.config.js a little

Author: koistya

package.json

@@ -24,7 +24,7 @@
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-runtime": "^6.9.0",
     "babel-preset-es2015": "^6.9.0",
-    "babel-preset-react": "^6.11.0",
+    "babel-preset-react": "^6.11.1",
     "babel-preset-stage-1": "^6.5.0",
     "babel-register": "^6.9.0",
     "babel-runtime": "^6.9.2",
@@ -41,7 +41,7 @@
     "extend": "^3.0.0",
     "file-loader": "^0.9.0",
     "front-matter": "^2.1.0",
-    "highlight.js": "^9.4.0",
+    "highlight.js": "^9.5.0",
     "json-loader": "^0.5.4",
     "markdown-it": "^7.0.0",
     "mkdirp": "^0.5.1",
@@ -67,7 +67,7 @@
     "stylelint": "^6.7.1",
     "stylelint-config-standard": "^9.0.0",
     "url-loader": "^0.5.7",
-    "webpack": "^2.1.0-beta.14",
+    "webpack": "^2.1.0-beta.15",
     "webpack-dev-middleware": "^1.6.1",
     "webpack-hot-middleware": "^2.11.0"
   },

run.js

@@ -14,6 +14,7 @@ const del = require('del');
 const cpy = require('cpy');
 const mkdirp = require('mkdirp');
 const webpack = require('webpack');
+const cp = require('child_process');
 const browserSync = require('browser-sync');
 const webpackDevMiddleware = require('webpack-dev-middleware');
 const webpackHotMiddleware = require('webpack-hot-middleware');
@@ -22,24 +23,31 @@ const tasks = new Map();
 const config = require('./webpack.config');
 const routes = require('./routes.json');
 
-// Execute a task
+/* eslint-disable no-console, global-require */
+
 function run(task) {
   const start = new Date();
-  console.log(`Starting '${task}'...`); // eslint-disable-line no-console
+  console.log(`Starting '${task}'...`);
   return Promise.resolve().then(() => tasks.get(task)()).then(() => {
     const end = new Date();
     const time = end.getTime() - start.getTime();
-    console.log(`Finished '${task}' after ${time}ms`); // eslint-disable-line no-console
-  }, err => console.error(err.stack)); // eslint-disable-line no-console
+    console.log(`Finished '${task}' after ${time}ms`);
+  }, err => console.error(err.stack));
 }
 
+//
 // Clean up the output directory
+// -----------------------------------------------------------------------------
 tasks.set('clean', () => del(['build/*', '!build/.git'], { dot: true }));
 
+//
 // Copy static files into the output directory
+// -----------------------------------------------------------------------------
 tasks.set('copy', () => cpy(['static/**/*.*'], 'build'));
 
+//
 // Generate static HTML pages based on routes.json
+// -----------------------------------------------------------------------------
 tasks.set('pages', () => {
   const assets = JSON.parse(fs.readFileSync('./build/assets.json', 'utf8'));
   const html = fs.readFileSync('./static/index.html', 'utf8')
@@ -63,34 +71,39 @@ tasks.set('bundle', () =>
       if (err) {
         reject(err);
       } else {
-        console.log(stats.toString(config.stats)); // eslint-disable-line no-console
+        console.log(stats.toString(config.stats));
         resolve();
       }
     });
   })
 );
 
+//
 // Build website into a distributable format
+// -----------------------------------------------------------------------------
 tasks.set('build', () => Promise.resolve()
   .then(() => run('clean'))
   .then(() => run('copy'))
   .then(() => run('bundle'))
   .then(() => run('pages'))
 );
 
+//
 // Build and publish the website
+// -----------------------------------------------------------------------------
 tasks.set('publish', () => run('publish:gh'));
 
+//
 // Build and publish the website to GitHub Pages
+// -----------------------------------------------------------------------------
 tasks.set('publish:gh', () => {
   const remote = {
     url: 'https://github.com/<owner>/<repo>.git', // TODO: Update deployment URL
     branch: 'gh-pages',
   };
-  const { spawn } = require('child_process'); // eslint-disable-line global-require
   const opts = { cwd: path.resolve(__dirname, './build'), stdio: ['ignore', 'inherit', 'inherit'] };
   const git = (...args) => new Promise((resolve, reject) => {
-    spawn('git', args, opts).on('close', code => {
+    cp.spawn('git', args, opts).on('close', code => {
       if (code === 0) {
         resolve();
       } else {
@@ -121,9 +134,11 @@ tasks.set('publish:gh', () => {
     .then(() => git('push', 'origin', `HEAD:${remote.branch}`, '--force', '--set-upstream'));
 });
 
+//
 // Build and publish the website to Amazon S3
+// -----------------------------------------------------------------------------
 tasks.set('publish:s3', () => {
-  const s3 = require('s3'); // eslint-disable-line global-require
+  const s3 = require('s3');
   return run('build').then(() => new Promise((resolve, reject) => {
     const client = s3.createClient({
       s3Options: {
@@ -141,7 +156,9 @@ tasks.set('publish:s3', () => {
   }));
 });
 
+//
 // Build website and launch it in a browser for testing (default)
+// -----------------------------------------------------------------------------
 tasks.set('start', () =>
   new Promise(resolve => {
     // Hot Module Replacement (HMR) + React Hot Reload

webpack.config.js

@@ -19,10 +19,13 @@ const pkg = require('./package.json');
 const isDebug = !(process.argv.includes('--release') || process.argv.includes('-r'));
 const isVerbose = process.argv.includes('--verbose') || process.argv.includes('-v');
 
-// Webpack configuration (core/main.js => build/bundle.js)
+// Webpack configuration (main.js => build/main.{hash}.js)
 // http://webpack.github.io/docs/configuration.html
 const config = {
 
+  // The base directory for resolving the entry option
+  context: __dirname,
+
   // The entry point for the bundle
   entry: [
     './main.js',
@@ -33,7 +36,7 @@ const config = {
     path: path.resolve(__dirname, './build'),
     publicPath: '/',
     filename: isDebug ? '[name].js?[hash]' : '[name].[hash].js',
-    chunkFilename: isDebug ? '[id].js?[hash]' : '[id].[hash].js',
+    chunkFilename: isDebug ? '[id].js?[chunkhash]' : '[id].[chunkhash].js',
     sourcePrefix: '  ',
   },