webpackrails 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fa2985efb84baf179b44c31c54b45b7bebb8a79
-  data.tar.gz: 90aeb67545627aeb8227b627c5507bbe056686e3
+  metadata.gz: 23a0ed3b4f87bc4f9f28188d34e0b3917f1de549
+  data.tar.gz: 7fcec1a616e7664b9e5cee82b3a0fafb9920b85c
 SHA512:
-  metadata.gz: a0172bd0f2f2e60ed678b4ec5991e5e10e8368b23d2c3412b70e66f140c35cb7942be659916ebfb8207d18af5821c5d243af52a6261b7236d46633aa887188dd
-  data.tar.gz: 18ecc798dd746604ec293e89a6c7274e543a24451c7039045135d2a9fed4356397d1b6d5b8a2c019729c4c39f4305c76d726865cf4558fc6105942091108aed2
+  metadata.gz: 95e37ac03e8379e6cb98d5a1b64dd042487f23f235ea6e5e667cd1d0f47c799c222f77042083165462064b9a13b58c218ece9bc715915b65f530a38e22dcf15b
+  data.tar.gz: d892189d8cfd6544eb9b391ce71e2a672f79a8aa8ed6caa99dcd88aab696f6bf7aa393d718b5e36a86ec00ba588d744f76870d1573ac1833e163e67e29b5083b

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org/'
+source 'https://ruby.taobao.org/'
 
 # Specify your gem's dependencies in webpack-rails.gemspec
 gemspec

data/README.md

@@ -4,6 +4,8 @@ This gem make [Webpack](http://webpack.github.io) works with [Rails](http://gith
 
 ## Installation
 
+*Rails: >= 3*
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -24,7 +26,8 @@ Create `package.json` in your Rails root:
 {
   "name": "app",
   "dependencies": {
-    "webpack": "^1.11.0"
+    "webpack": "^1.11.0",
+    "railshot-webpack-plugin": "*"
   }
 }
 ```
@@ -36,7 +39,25 @@ Run `npm i` to install the dependencies.
 Make sure you have a `webpack.config.js` file in your Rails root dir, or specific your
 webpack config file within `application.rb`
 
-`config.webpack_rails.config_file = "path_to_the_config_file"`
+`config.webpackrails.config_file = "path_to_the_config_file"`
+
+### Watch file for changes
+
+Use webpack plugin `railshot-webpack-plugin` in your `webpack.config.js`.
+If you haven't install the plugin yet, run `npm install railshot-webpack-plugin`.
+
+```js
+// webpack.config.js
+
+var railshotPlugin = require('railshot-webpack-plugin');
+
+// no entry here.
+module.exports = {
+  plugins: [
+    railshotPlugin()
+  ]
+}
+```
 
 ### Config
 

data/lib/webpackrails/railtie.rb

@@ -2,22 +2,29 @@
 
 module WebpackRails
   class Railtie < Rails::Engine
-    config.webpack_rails = ActiveSupport::OrderedOptions.new 
+    config.webpackrails = ActiveSupport::OrderedOptions.new 
 
     # Webpack config file location
-    config.webpack_rails.config_file = ''
+    config.webpackrails.config_file = ''
 
     # Process every file?
-    config.webpack_rails.force = false
+    config.webpackrails.force = false
 
     # paths to be parse
-    config.webpack_rails.paths = [lambda { |p| p.start_with?(Rails.root.join("app").to_s) },
+    config.webpackrails.paths = [lambda { |p| p.start_with?(Rails.root.join("app").to_s) },
                                   lambda { |p| p.start_with?(Rails.root.join('node_modules').to_s) }]
 
-    config.webpack_rails.node_bin = "node_modules/.bin/"
+    config.webpackrails.node_bin = "node_modules/.bin/"
+
+    # ignore node_modules
+    config.webpackrails.ignore_node_modules = true
 
     initializer :setup_webpack do |app|
       app.assets.register_postprocessor "application/javascript", WebpackRails::WebpackProcessor
     end
+
+    rake_tasks do 
+      Dir[File.join(File.dirname(__FILE__), "tasks/*.rake")].each { |f| load f }
+    end
   end
 end

data/lib/webpackrails/tasks/npm.rake

@@ -0,0 +1,20 @@
+namespace :npm do
+  desc "Run npm install"
+  task :install do
+    sh "npm install && npm --save install railshot-webpack-plugin" do |ok, res|
+      fail "Error running npm install." unless ok
+    end
+  end
+
+  desc "Clean npm node_modules"
+  task :clean do
+    sh "rm -rf ./node_modules" do |ok, res|
+      fail "Error cleaning npm node_modules." unless ok
+    end
+  end
+
+  namespace :install do
+    desc "Run a clean npm install"
+    task :clean => ['npm:clean', 'npm:install']
+  end
+end

data/lib/webpackrails/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module WebpackRails
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/webpackrails/webpack_processor.rb

@@ -11,7 +11,7 @@ module WebpackRails
     attr_accessor :config
 
     def initialize(template)
-      self.config = Rails.application.config.webpack_rails
+      self.config = Rails.application.config.webpackrails
       super(template)
     end
 
@@ -25,14 +25,20 @@ module WebpackRails
       # return if there is nothing to do
       return data unless should_webpack?
 
-      run_webpack(context.pathname || context.logical_path)
+      evaluated = run_webpack(context.pathname || context.logical_path)
+
+      evaluate_dependencies(context.environment.paths).each do |path|
+        context.depend_on(path.to_s)
+      end
+
+      evaluated
     end
 
     private 
 
     # Set the temp path
     def tmp_path
-      @tmp_path ||= Rails.root.join('tmp', 'cache', 'webpack-rails').freeze
+      @tmp_path ||= Rails.root.join('tmp', 'cache', 'webpackrails').freeze
     end
 
     # return the webpack command path
@@ -43,6 +49,42 @@ module WebpackRails
     # make sure the temp dir exists
     def ensure_tmp_dir_exists!
       FileUtils.mkdir_p(rails_path(tmp_path))
+      @deps_path = File.join(tmp_path, '_$webpackrails_dependencies');
+    end
+
+    # Filter out node_module/ files
+    def evaluate_dependencies(asset_paths) 
+      return dependencies if !config.ignore_node_modules
+
+      dependencies.select do |path|
+        path.start_with?(*asset_paths)
+      end
+    end
+
+    # return array
+    def dependencies
+      ret ||= begin
+        if !File.exists?(@deps_path)
+          return []
+        end
+
+        output = ''
+        begin
+          file = File.open(@deps_path, 'r')
+          output = file.read
+          file.close
+        rescue
+          output = ''
+        end
+
+        if !output
+          return []
+        end
+
+        output.lines.map(&:strip).select do |path|
+          File.exists?(path)
+        end
+      end
     end
 
     # make sure the webpack config file exists
@@ -93,6 +135,8 @@ module WebpackRails
       env_hash = {}
       env_hash["NODE_PATH"] = asset_paths unless uses_exorcist
       env_hash["NODE_ENV"] = config.node_env || Rails.env
+      env_hash["WR_TMP_FILE"] = @deps_path;
+      env_hash['RAILS_ROOT'] = Rails.root.to_s
       env_hash
     end
 
@@ -116,7 +160,12 @@ module WebpackRails
         raise WebpackRails::WebpackError.new("Error while running `#{command}`:\n\n#{stderr}")
       end
 
-      output_file.read
+      output = output_file.read
+
+      output_file.close 
+      output_file.unlink
+
+      output
     end
 
     def rails_path(*paths)

data/webpackrails.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "railties", "~> 3.2", "<= 5.0.0"
+  spec.add_runtime_dependency "railties", ">= 3.0"
   spec.add_runtime_dependency "sprockets", "~> 2.0"
 
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: webpackrails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - towry
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <=
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <=
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +125,7 @@ files:
 - bin/setup
 - lib/webpackrails.rb
 - lib/webpackrails/railtie.rb
+- lib/webpackrails/tasks/npm.rake
 - lib/webpackrails/version.rb
 - lib/webpackrails/webpack_error.rb
 - lib/webpackrails/webpack_logger.rb
@@ -162,3 +157,4 @@ signing_key:
 specification_version: 4
 summary: Make Webpack work with Rails for you
 test_files: []
+has_rdoc: