webpackrails 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23a0ed3b4f87bc4f9f28188d34e0b3917f1de549
-  data.tar.gz: 7fcec1a616e7664b9e5cee82b3a0fafb9920b85c
+  metadata.gz: 8c0081116fb0874979c577700157e819ea57cdcc
+  data.tar.gz: 3994b6732d8ff2083721aac8250ecc6352c00020
 SHA512:
-  metadata.gz: 95e37ac03e8379e6cb98d5a1b64dd042487f23f235ea6e5e667cd1d0f47c799c222f77042083165462064b9a13b58c218ece9bc715915b65f530a38e22dcf15b
-  data.tar.gz: d892189d8cfd6544eb9b391ce71e2a672f79a8aa8ed6caa99dcd88aab696f6bf7aa393d718b5e36a86ec00ba588d744f76870d1573ac1833e163e67e29b5083b
+  metadata.gz: 788ec74d3e1238cf985917bdbb2145728b4cfc3583fceaacd3c4480497edca7b5f8fd09523633079a7e692153d65d3aa45ccffd6b2b63fb89d17d65a36482238
+  data.tar.gz: 6ce1a1504900ae41d1f66aae578498ab222423351c2a4a95952c5e228a8af78d98bdbf1671b6938f3fd1aaaf2512a22f977656f7505f3e8ce220c523278ca83a

data/README.md

@@ -32,7 +32,8 @@ Create `package.json` in your Rails root:
 }
 ```
 
-Run `npm i` to install the dependencies.
+Run `npm i` to install the dependencies. **Make sure the `railshot-webpack-plugin` is
+in the dependencies instead of `devDependencies`**.
 
 ## Usage
 
@@ -41,7 +42,7 @@ webpack config file within `application.rb`
 
 `config.webpackrails.config_file = "path_to_the_config_file"`
 
-### Watch file for changes
+#### 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`.
@@ -59,6 +60,10 @@ module.exports = {
 }
 ```
 
+#### Troubleshooting
+
+[Wiki troubleshooting](https://github.com/towry/webpackrails/wiki/Troubleshooting)
+
 ### Config
 
 See [source](https://raw.githubusercontent.com/towry/webpackrails/master/lib/webpackrails/railtie.rb)

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "webpack-rails"
+require "webpackrails"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/webpackrails/railtie.rb

@@ -19,6 +19,10 @@ module WebpackRails
     # ignore node_modules
     config.webpackrails.ignore_node_modules = true
 
+    # 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_postprocessor "application/javascript", WebpackRails::WebpackProcessor
     end

data/lib/webpackrails/version.rb

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

data/lib/webpackrails/webpack_processor.rb

@@ -49,7 +49,7 @@ 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');
+      @deps_path ||= File.join(tmp_path, '_$webpackrails_dependencies');
     end
 
     # Filter out node_module/ files
@@ -124,7 +124,12 @@ module WebpackRails
     end
     
     def commonjs_module?
-      data.to_s.include?("module.exports") || data.present? && data.to_s.include?("require") || data.present? && data.to_s.include?("import")
+      return false if !data.present?
+
+      condition = ["module.exports", "require", "import", "export", "exports", "export default", "React"]
+      data_s = data.to_s
+
+      (condition + config.force_condition).uniq.any? { |c| data_s.include?(c) }
     end
 
     def asset_paths
@@ -154,6 +159,10 @@ module WebpackRails
       base_directory = File.dirname(file)
 
       Logger::log "\nWebpack: #{command}"
+
+      mut_env = ENV.to_hash
+      mut_env.merge!(env)
+      ENV.replace(mut_env)
       stdout, stderr, status = Open3.capture3(env, command, stdin_data: data, chdir: base_directory)
 
       if !status.success?

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: webpackrails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - towry
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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,19 +142,18 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Make Webpack work with Rails for you
 test_files: []
-has_rdoc: