webpack_rails 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4eefc65be79a7423acbb4aee442f794dda650b0a
-  data.tar.gz: fc8ff00a8a7ffb4048e783756c0d35041f7c81f7
+  metadata.gz: ddb9eeee4bbff9584582e6b7c92e4a654e2a9af8
+  data.tar.gz: f12e3aceb14f4a508f49fef60caca7b2e54f8ba7
 SHA512:
-  metadata.gz: c12944c42e4f37cf0ad6d559a6389553067ce9034590aa93f25929767656542795ae622657f0cda43c9f3a5217f9440a1feca69dfe68e7ff693e72e8c5f37e85
-  data.tar.gz: b737ff3f47506b20307bc35af43cb94e25bea7e61f3cd15473987fcfa3823873e194b297eaf5b3d0831fc1edddc66a4def50ecfd52e6d1fd6a46f84637c56cc6
+  metadata.gz: 4b93a1aa955ebe77fa38091d5c6b895d4cca14a287ee941a4ac540ce9633099f53376be84cdff4b14576b07d6294bac3e4b95742f9b6a57c15988d78022b9248
+  data.tar.gz: c9bf05d74228ddcac831458a5b1166c44dd7dfdd08a9656c925b22742c3ceee85bd91a922f4d33abe22d7edd02ac0249d9307d76a019e7a2216169622917e5a0

data/lib/webpack_rails/engine.rb

@@ -2,11 +2,17 @@ require_relative './processor'
 
 module WebpackRails
   class Engine < ::Rails::Engine
+    engine_name "webpack"
+
     initializer :setup_webpack_rails, :after => "sprockets.environment", :group => :all do |app|
       # where [name].bundle.js files should be
       app.assets.append_path Rails.root.join('tmp/webpack/bundles')
       # process 
       app.assets.register_preprocessor('application/javascript', WebpackRails::Processor)
     end
+
+    rake_tasks do
+      load 'webpack_rails/webpack.rake'
+    end
   end
 end

data/lib/webpack_rails/processor.rb

@@ -21,4 +21,4 @@ module WebpackRails
       bundle_contents.gsub(/['"]\$asset_path\/([^'"]+?)['"]/) {|s| "'#{context.asset_path($1)}'" }
     end
   end
-end
+end

data/lib/webpack_rails/task.rb

@@ -47,14 +47,26 @@ module WebpackRails
         return_value
       end
 
+      def build_result
+        begin
+          JSON.parse(File.open(File.join(working_dir, 'webpack-build-result.json')).read)
+        rescue Errno::ENOENT => e
+          {modules: []}
+        end
+      end
+
       def run_webpack(opts = nil)
         result = nil
+        if ENV['DISABLE_WEBPACK']
+          return build_result
+        end
 
         task_duration = Benchmark.realtime do
           result = with_app_node_path do
             begin
               task = self.new
               task.run(opts)
+              build_result
             rescue NodeTask::Error => e
               raise self::Error.new(e)
             end

data/lib/webpack_rails/webpack-task.js

@@ -2,9 +2,10 @@ var webpack = require('webpack');
 var fs = require('fs');
 var path = require('path');
 
-var logging = true;
+var stdoutLogging = process.env.WEBPACK_STDOUT_LOGGING;
+var loggingToFile = true;
 function log(message) {
-  if (logging) fs.appendFile('log/webpack-task.log', message+'\n');
+  if (loggingToFile) fs.appendFile('log/webpack-task.log', message+'\n');
 }
 
 // TODO: add support for multiple builds using multiple webpack configs which 
@@ -21,6 +22,8 @@ var lastBuildResult = null;
 function buildComplete(buildResult) {
   lastBuildResult = buildResult;
 
+  if (stdoutLogging) console.log('rebuild complete');
+
   currentBuildCallbacks.forEach(function(callback) {
     log('async completion callback');
     callback(buildResult);
@@ -77,8 +80,6 @@ module.exports = function waitForBuild(opts, done) {
     else done(null, buildResult);
   }
 
-  log('watcher.running: '+JSON.stringify(watcher.running));
-
   if (!watcher.running) {
     sendResults(lastBuildResult);
   } else {

data/lib/webpack_rails/webpack.rake

@@ -0,0 +1,19 @@
+require_relative './task'
+
+namespace :webpack do
+  task :watch do
+    puts 'watching for webpack changes'
+    WebpackRails::Task.with_app_node_path do
+      system "WEBPACK_STDOUT_LOGGING=yes #{WebpackRails::Task.node_command} #{WebpackRails::Task.webpack_task_script}"
+    end
+  end
+
+  task :before_assets_precompile do
+    # with production config, sprockets index isn't updated correctly by the
+    # find_asset monkey patch. instead, we just run it before precompiling assets
+    WebpackRails::Task.run_webpack
+  end
+end
+
+# runs before every 'rake assets:precompile'
+Rake::Task['assets:precompile'].enhance(['webpack:before_assets_precompile'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpack_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Friend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: node_task
@@ -57,6 +57,7 @@ files:
 - lib/webpack_rails/sprockets_index_webpack.rb
 - lib/webpack_rails/task.rb
 - lib/webpack_rails/webpack-task.js
+- lib/webpack_rails/webpack.rake
 homepage: https://rubygems.org/gems/webpack_rails
 licenses:
 - MIT