webpackrails 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac83e262268d1816d547247a9eec0480285bf520
-  data.tar.gz: 080011e89f3fd26a3072928c7da610f99f59d05f
+  metadata.gz: cbba3cde0af91cb39ec6bbb53d0ca0fadf6b1dae
+  data.tar.gz: fcc9d57ef318cb5a002bedd665af6cf6e48e2705
 SHA512:
-  metadata.gz: 5e15a9b6c124910906e1c328149608f34ad0900e5858d283defbcd1334af3b7fe1cdf8ed762258e8c3ae480fdddf1a1d7051c3a77965da2d8b6124ec007a9706
-  data.tar.gz: 4165a1f61212555c4768b45da71627a39d7c97ee9569ac8b486347a036ad0f7a71c0c5848a1d256aa5996e844c9aa07a7b78b6de683debd5906371cc66424cdb
+  metadata.gz: 030c57346ad4ad4db817b8464aa5340aaac7408ef4d193582ca70f98c7bb53a3b007c5a4158f7b4676c14f94003d502322af658436d5dff2449b84622f0c58da
+  data.tar.gz: b57c2071bec71224024d03d81066816d36229a1ed922ccc8d21cfc7a3911c6b5b8fa9856b0c8c923eff115f11ac1bff3835b58a1d30d352a4a6d96b254b59040

data/README.md

@@ -63,10 +63,18 @@ module.exports = {
 
 [Wiki troubleshooting](https://github.com/towry/webpackrails/wiki/Troubleshooting)
 
-### Config
+
+## Feature
+
+* Support embedding erb in javascript, see [troubleshooting](https://github.com/towry/webpackrails/wiki/Troubleshooting) page.  **Aug 16, 2015**
+* Support es6 (just use webpack babel loader)
+* Support react jsx syntax (just use webpack babel loader)
+
+## Config
 
 See [source](https://raw.githubusercontent.com/towry/webpackrails/master/lib/webpackrails/railtie.rb)
 
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/webpackrails/railtie.rb

@@ -19,12 +19,15 @@ module WebpackRails
     # ignore node_modules
     config.webpackrails.ignore_node_modules = true
 
+    # embed erb
+    config.webpackrails.embed_erb = false
+
     # array of string to test if the file need to be process by this gem.
     # see `commonjs_module?` method
     config.webpackrails.force_condition = []
 
     initializer :setup_webpack do |app|
-      app.assets.register_preprocessor "application/javascript", WebpackRails::WebpackProcessor
+      app.assets.register_postprocessor "application/javascript", WebpackRails::WebpackProcessor
     end
 
     rake_tasks do 

data/lib/webpackrails/version.rb

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

data/lib/webpackrails/webpack_processor.rb

@@ -5,6 +5,7 @@ require 'open3'
 require 'tempfile'
 require 'fileutils'
 require 'shellwords'
+require 'digest/sha1'
 
 module WebpackRails
   class WebpackProcessor < Tilt::Template
@@ -25,17 +26,51 @@ module WebpackRails
       # return if there is nothing to do
       return data unless should_webpack?
 
-      evaluated = run_webpack(context.pathname || context.logical_path)
+      if config.embed_erb
+        run_webpack(context.pathname || context.logical_path, false)
 
-      evaluate_dependencies(context.environment.paths).each do |path|
-        context.depend_on(path.to_s)
-      end
+        evaluate_dependencies(context.environment.paths).each do |path|
+          context.depend_on(path.to_s)
+        end
+
+        if !@erb_deps.empty?
+          evaluate_erb_deps(context, locals)
+        end
 
+        evaluated = run_webpack(context.pathname || context.logical_path)
+      else
+        evaluated = run_webpack(context.pathname || context.logical_path)
+        evaluate_dependencies(context.environment.paths).each do |path|
+          context.depend_on(path.to_s)
+        end
+      end
+      
       evaluated
     end
 
     private 
 
+    def evaluate_erb_deps(context, locals)
+      return if @erb_deps.empty?
+
+      # dep is a path
+      @erb_deps.each do |dep|
+        begin 
+          shaname = sha1(dep)
+          tmpfile = File.join(@erb_deps_root, shaname)
+          template = Tilt::ERBTemplate.new(dep)
+          template = template.render(context, locals)
+          file = File.open(tmpfile, 'w')
+          file.write(template)
+          file.close()
+        end
+      end
+    end
+
+    def sha1(content)
+      Digest::SHA1.hexdigest content
+    end
+
     # Set the temp path
     def tmp_path
       @tmp_path ||= Rails.root.join('tmp', 'cache', 'webpackrails').freeze
@@ -50,13 +85,20 @@ module WebpackRails
     def ensure_tmp_dir_exists!
       FileUtils.mkdir_p(rails_path(tmp_path))
       @deps_path ||= File.join(tmp_path, '_$webpackrails_dependencies');
+      @erb_deps_root ||= rails_path('tmp/cache/webpackrails/erbs').freeze
+
+      FileUtils.mkdir_p(@erb_deps_root)
     end
 
-    # Filter out node_module/ files
+    # Filter out node_module/ files and erb files.
     def evaluate_dependencies(asset_paths) 
-      return dependencies if !config.ignore_node_modules
+      return dependencies if !config.ignore_node_modules and !config.embed_erb
 
-      dependencies.select do |path|
+      @erb_deps = []
+      deps = dependencies.select do |path|
+        if File.extname(path) == '.erb'
+          @erb_deps << path 
+        end
         path.start_with?(*asset_paths)
       end
     end
@@ -150,8 +192,13 @@ module WebpackRails
       false 
     end
 
-    def run_webpack(logical_path=nil)
-      command_options = "--colors --config #{@config_file} #{logical_path} --bail --output-filename"
+    def run_webpack(logical_path=nil, bail= true)
+      if bail
+        command_options = "--colors --config #{@config_file} #{logical_path} --bail --output-filename"
+      else 
+        command_options = "--colors --config #{@config_file} #{logical_path} --output-filename"
+      end
+      
       output_file = Tempfile.new("output", rails_path(tmp_path))
       command_options << " #{output_file.path.inspect}"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webpackrails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - towry
@@ -14,98 +14,98 @@ dependencies:
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Webpack + Rails ≠ CommonJS Heaven
@@ -115,7 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -142,12 +142,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []