ff-stream-web

commit f3efa29f261f8ca8614d02b9dfa7edacebdc9c40
parent 9204f2661ebee15dcb0b2feed4ae1d2137a8d213
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Tue, 20 Oct 2015 12:39:15 +0300

Rename config.js to webpack.config.js

Diffstat:
M
tools/bundle.js
 | 
8
++++----
M
tools/start.js
 | 
2
+-
R
tools/config.js -> tools/webpack.config.js
 | 
0

3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/bundle.js b/tools/bundle.js
@@ -9,14 +9,14 @@
 
 import webpack from 'webpack';
 import task from './lib/task';
-import config from './config';
+import webpackConfig from './webpack.config';
 
 /**
  * Bundles JavaScript, CSS and images into one or more packages
  * ready to be used in a browser.
  */
 export default task('bundle', async () => new Promise((resolve, reject) => {
-  const bundler = webpack(config);
+  const bundler = webpack(webpackConfig);
   let bundlerRunCount = 0;
 
   function bundle(err, stats) {
@@ -24,9 +24,9 @@ export default task('bundle', async () => new Promise((resolve, reject) => {
       return reject(err);
     }
 
-    console.log(stats.toString(config[0].stats));
+    console.log(stats.toString(webpackConfig[0].stats));
 
-    if (++bundlerRunCount === (global.WATCH ? config.length : 1)) {
+    if (++bundlerRunCount === (global.WATCH ? webpackConfig.length : 1)) {
       return resolve();
     }
   }
diff --git a/tools/start.js b/tools/start.js
@@ -14,7 +14,7 @@ import webpackHotMiddleware from 'webpack-hot-middleware';
 import task from './lib/task';
 
 global.WATCH = true;
-const webpackConfig = require('./config')[0]; // Client-side bundle configuration
+const webpackConfig = require('./webpack.config')[0]; // Client-side bundle configuration
 const bundler = webpack(webpackConfig);
 
 /**
diff --git a/tools/config.js b/tools/webpack.config.js