webpack_rails 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94db163f3dd7211fe8a4448cebe146d2da8444f2
-  data.tar.gz: 583bc5a7877aa766ac8be90e89ed08a32bbf71b3
+  metadata.gz: e9b1fd76152f832eb130b5c1565bcbabde788f78
+  data.tar.gz: 3c5192bb8d4e2c3d12733b08ea62932f9370c9cf
 SHA512:
-  metadata.gz: 09c5915dc7d08bf0ee20454a705668cdf763474010e6e220794d0cef5affcaeee196b8c14cc7f5c5c71971923a35067b6ebe75be55bd9bf23b5e4b6b80af4921
-  data.tar.gz: 12983a42d2d14ffc73f249d9afa7c25aaa63f6fed1d7d9172bf8311aaba3de477015202a854377339f8312b0c85dff9b96dc7caede640800006903995b276cec
+  metadata.gz: 84b22867941e1b5ca2040a30a68506499dd0379060b9ca622e8b29b0dac4325d65ba33e6a9ea2bd2d5af91f9af449ca705e4bfef5ae45ddd11b01b1f1b8b56fa
+  data.tar.gz: 5a5d175a7d84730c5187d7d8010db6eb813a8d06dcadab13ac326f853a46acb7cc29e0ee2c87238c37eff199eca674aa042ee93f1871f977a87265d80120b5f8

data/lib/webpack_rails/ErrorMessagePlugin.js

@@ -1,35 +1,50 @@
 var stripAnsi = require('strip-ansi');
 var jsStringEscape = require('js-string-escape');
 
-// expected to be installed by the gem consumer (eg. the app)
+// webpack is expected to be installed by the gem consumer (eg. the app)
 var RawSource = require('webpack/lib/RawSource');
 
+var errorTypePattern = /ModuleBuildError:[^:]*: /g;
+
 // a webpack plugin to inject js which renders a message upon error
 function ErrorMessagePlugin() {}
 ErrorMessagePlugin.prototype.apply = function(compiler) {
-  compiler.plugin('emit', function(compilation, callback) {
+  // if there are errors, replace the output of any bundles with an error message
+  compiler.plugin('emit', function(compilation, done) {
     if (compilation.errors.length > 0) {
-      var cleanedErrorMessage = cleanCompilationErrorMessages(compilation.errors);
-      var errorPageHeader = ''+
-        '<style>body { font-family: sans-serif; }</style>'+
-        '<h1>Webpack Build Error</h1>';
-
-      var errorJsCode = ''+
-        'document.body.className += " webpack-build-error";'+
-        'document.body.innerHTML = "'+errorPageHeader+'";\n'+
-        'var errorDisplay = document.createElement("pre");\n'+
-        'errorDisplay.textContent = "'+jsStringEscape(cleanedErrorMessage)+'";\n'+
-        'document.body.appendChild(errorDisplay);\n';
-
-      Object.keys(compilation.assets).forEach(function(assetName) {
-        compilation.assets[assetName] = new RawSource(errorJsCode)
-      });
+      var errorJsCode = renderErrorJsCode(compilation.errors);
+
+      Object.keys(compilation.assets)
+        .filter(isABundle) // don't mess with hot-update assets
+        .forEach(function(assetName) {
+          compilation.assets[assetName] = new RawSource(errorJsCode);
+        });
     }
-    callback();
+
+    done();
   }.bind(this));
 };
 
-var errorTypePattern = /ModuleBuildError:[^:]*: /g;
+function isABundle(assetName) {
+  return /\.bundle\./.test(assetName);
+}
+
+function renderErrorJsCode(errors) {
+  var cleanedErrorMessage = cleanCompilationErrorMessages(errors);
+  var errorPageHeader = ''+
+    '<style>body { font-family: sans-serif; }</style>'+
+    '<h1>Webpack Build Error</h1>';
+
+  var errorJsCode = ''+
+    'document.body.className += " webpack-build-error";'+
+    'document.body.innerHTML = "'+errorPageHeader+'";\n'+
+    'var errorDisplay = document.createElement("pre");\n'+
+    'errorDisplay.textContent = "'+jsStringEscape(cleanedErrorMessage)+'";\n'+
+    'document.body.appendChild(errorDisplay);\n';
+
+  return errorJsCode;
+}
+
 function cleanCompilationErrorMessages(errors) {
   return stripAnsi(errors.join('\n\n')).replace(errorTypePattern, '');
 }

data/lib/webpack_rails/log.js

@@ -0,0 +1,19 @@
+var fs = require('fs');
+
+var loggingToFile = Boolean(process.env.WEBPACK_TASK_LOGGING);
+
+function logLine(message) {
+  fs.appendFileSync('log/webpack-task.log', new Date()+' -- '+message+'\n');
+}
+
+function log(message) {
+  if (loggingToFile) logLine(message);
+}
+
+function logErr(err) {
+  logLine(err.toString()+' -- '+JSON.stringify(err.stack));
+}
+
+log.error = logErr;
+
+module.exports = log;

data/lib/webpack_rails/webpack-task-dev-server.js

@@ -1,4 +1,3 @@
-var fs = require('fs');
 var path = require('path');
 var xtend = require('xtend');
 var isArray = require('is-array');
@@ -12,10 +11,9 @@ var webpackDevMiddleware = require('webpack-dev-middleware');
 var webpackHotMiddleware = require('webpack-hot-middleware');
 var webpack = require('webpack');
 
+var log = require('./log');
 var ErrorMessagePlugin = require('./ErrorMessagePlugin');
 
-var loggingToFile = Boolean(process.env.WEBPACK_TASK_LOGGING);
-
 process.on('exit', function(code) {
   log(process.pid+' About to exit with code:', code);
 });
@@ -30,7 +28,7 @@ module.exports = function waitForServer(opts, done) {
   log('starting webpack');
   runWebpackDevServer(opts, function(err, createdServer) {
     if (err) {
-      logErr(err);
+      log.error(err);
       done(err);
     }
 
@@ -90,6 +88,7 @@ function makeDevServerConfig(opts) {
       new webpack.optimize.OccurenceOrderPlugin(),
        // https://webpack.github.io/docs/webpack-dev-server.html#hot-module-replacement
       new webpack.HotModuleReplacementPlugin(),
+      new webpack.NoErrorsPlugin(),
       new ErrorMessagePlugin(),
     ]),
   });
@@ -113,10 +112,5 @@ function makeDevServerConfig(opts) {
   return devServerConfig;
 }
 
-function log(message) {
-  if (loggingToFile) fs.appendFileSync('log/webpack-task.log', new Date()+' -- '+message+'\n');
-}
 
-function logErr(err) {
-  log(err.toString()+' -- '+JSON.stringify(err.stack));  
-}
+

data/lib/webpack_rails/webpack-task-watch.js

@@ -2,11 +2,7 @@ var webpack = require('webpack');
 var fs = require('fs');
 var path = require('path');
 
-var stdoutLogging = process.env.WEBPACK_STDOUT_LOGGING;
-var loggingToFile = true;
-function log(message) {
-  if (loggingToFile) fs.appendFile('log/webpack-task.log', message+'\n');
-}
+var log = require('./log');
 
 // TODO: add support for multiple builds using multiple webpack configs which 
 // can each be waited upon independently
@@ -22,8 +18,6 @@ var lastBuildResult = null;
 function buildComplete(buildResult) {
   lastBuildResult = buildResult;
 
-  if (stdoutLogging) console.log('rebuild complete');
-
   currentBuildCallbacks.forEach(function(callback) {
     log('async completion callback');
     callback(buildResult);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpack_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - James Friend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: node_task
@@ -48,6 +48,7 @@ files:
 - lib/webpack_rails.rb
 - lib/webpack_rails/ErrorMessagePlugin.js
 - lib/webpack_rails/engine.rb
+- lib/webpack_rails/log.js
 - lib/webpack_rails/node_modules/cors/CONTRIBUTING.md
 - lib/webpack_rails/node_modules/cors/LICENSE
 - lib/webpack_rails/node_modules/cors/README.md