Merge branch 'release/0.3.5'

Author: Glorian

conf/webpack.js

@@ -10,6 +10,7 @@ const
     AutoPrefixer = require('autoprefixer'),
     WebpackNotifierPlugin = require('webpack-notifier'),
     BowerWebpackPlugin = require('bower-webpack-plugin'),
+    ProgressBarPlugin = require('progress-bar-webpack-plugin'),
     ExtractTextPlugin = require('extract-text-webpack-plugin');
 
 // Built-in modules
@@ -135,8 +136,7 @@ if (config.production) {
             chunks: false,
             chunkModules: false,
             modules: false,
-            children: true,
-            version: true,
+            children: false,
             cached: false,
             cachedAssets: false,
             reasons: false,
@@ -166,14 +166,7 @@ if (!config.production) {
     webpack_config.devtool = 'cheap-module-eval-source-map';
 
     webpack_config.plugins.push(
-        // Progress
-        new webpack.ProgressPlugin((percentage, msg) => {
-            percentage = Math.round(percentage * 100);
-
-            elixir.Log.message(
-                `${$.util.colors.green(`${percentage}%`)} ---> ${$.util.colors.blue(msg)}`
-            );
-        })
+        new ProgressBarPlugin()
     );
 }
 

index.js

@@ -15,24 +15,23 @@ const
  */
 const
     $ = elixir.Plugins,
-    config = elixir.config,
     taskName = 'webpack';
 
 /**
  * Built-in modules
  */
 const
-    prepGulpPaths = require('./lib/GulpPaths'),
+    {GulpPaths, versionPath} = require('./lib/GulpPaths'),
     isVersioning = require('./lib/IsVersioning'),
     prepareEntry = require('./lib/EntryPaths'),
-    saveFiles = require('./lib/SaveFiles'),
     isWatch = require('./lib/IsWatch');
 
 /**
  * Webpack spec
  */
 elixir.extend(taskName, function (src, options, globalVars) {
-    let paths = prepGulpPaths(src),
+    let paths = GulpPaths(src),
+        globalConfig = Object.assign({}, webpack_config),
         entry = prepareEntry(src);
 
     /**
@@ -45,7 +44,7 @@ elixir.extend(taskName, function (src, options, globalVars) {
 
     // Merge options
     options = _.mergeWith(
-        webpack_config,
+        globalConfig,
         options,
         {entry, watch: isWatch()},
         (objValue, srcValue) => {
@@ -56,23 +55,14 @@ elixir.extend(taskName, function (src, options, globalVars) {
     );
 
     if (isVersioning()) {
-        options.output.publicPath = options.output.publicPath
-
-            // Add leading slash if missing
-            .replace(/^\/?/, '/')
-
-            // insert build folder before js output
-            .replace(
-                new RegExp(config.js.outputFolder),
-                `${config.versioning.buildFolder}/${config.js.outputFolder}`
-            );
+        options.output.publicPath = versionPath(options.output.publicPath);
     }
 
     /**
      * Webpack task
      */
     new elixir.Task(taskName, function () {
-        this.log(paths.src, saveFiles(src, paths));
+        this.recordStep('Building js files');
 
         webpack(options, (err, stats) => {
             if (err) {
@@ -81,7 +71,7 @@ elixir.extend(taskName, function (src, options, globalVars) {
 
             $.util.log(stats.toString(webpack_config.stats));
         });
-    });
+    }, paths);
 
     /**
      * If watch task is triggered, then we should start webpack task only once

lib/GulpPaths.js

@@ -2,7 +2,8 @@
 
 const
     _ = require('lodash'),
-    elixir = require('laravel-elixir');
+    elixir = require('laravel-elixir'),
+    isVersioning = require('../lib/IsVersioning');
 
 const config = elixir.config;
 
@@ -13,15 +14,28 @@ const config = elixir.config;
  * @param {string|null}  baseDir
  * @param {string|null}  output
  */
-module.exports = (src, baseDir, output) => {
+module.exports.GulpPaths = (src, baseDir, output) => {
     baseDir = baseDir || config.get('assets.js.folder');
     output = output || config.get('public.js.outputFolder');
 
     if (_.isObject(src)) {
         src = _.values(src);
     }
 
+    if (isVersioning()) {
+        output = this.versionPath(output);
+    }
+
     return new elixir.GulpPaths()
         .src(src, baseDir)
-        .output(output, 'app.js');
-};
+        .output(output);
+};
+
+module.exports.versionPath = outputPath => outputPath
+    // Add leading slash if missing
+    .replace(/^\/?/, '/')
+    // insert build folder before js output
+    .replace(
+        new RegExp(config.js.outputFolder),
+        `${config.versioning.buildFolder}/${config.js.outputFolder}`
+    );

lib/SaveFiles.js

@@ -1,6 +1,6 @@
 {
   "name": "laravel-elixir-webpack-advanced",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Laravel Elixir Webpack Extension (improved)",
   "main": "index.js",
   "scripts": {
@@ -29,9 +29,10 @@
     "bower-webpack-plugin": "^0.1.9",
     "css-loader": "^0.23.0",
     "extract-text-webpack-plugin": "^1.0.0",
-    "file-loader": "^0.8.5",
+    "file-loader": "^0.9.0",
     "lodash": "^4.0.0",
     "postcss-loader": "^0.9.1",
+    "progress-bar-webpack-plugin": "^1.8.0",
     "resolve-url-loader": "^1.4.2",
     "rimraf": "^2.4.4",
     "sass-loader": "^3.1.2",