webpack_rails 1.3.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80a7e3a77159d1eee39c12eb365ee2e6fc9eb08c
-  data.tar.gz: 7621ed395e73ad84e7ad24c9f533584474be324d
+  metadata.gz: 24eb2d5b3f17a410dd75aaefd6e0e4203df63f30
+  data.tar.gz: a2c3d47d9286ffee33128a6489d68e48ffb5427d
 SHA512:
-  metadata.gz: aa258967efb81ba2d2e7ea2daf80ba5dce03dc2b780631aa5075a59a38408af1b24f5abadef411feb9d6ffbe8749302dc6434f058229d752ceed4d456b8800f9
-  data.tar.gz: 7acef91df5da7c2f8bb50dbe643f3bf75369e82bea4f69c078934bfe9811d7005c1659980ee3ae332e01ef642871ab8e069a872163d2ae0a829fc0f7909608ff
+  metadata.gz: e125bf7ef05f97af37333b81bafcccf0c9f3dc136668d2fbf16222efea388ba0b9475c83197178459879a7a774b9c245389e84db965abea20eebf7125fee456f
+  data.tar.gz: 1c11739dc521a5c47b1d60e489ef1cc3b3770f0bd5a596a74f57d8c52bb045e15df0c8c2ef585a8330a200e56356e3831d30b58639ae78224c0744a26cf3cf20

data/lib/webpack_rails/engine.rb

@@ -7,14 +7,11 @@ module WebpackRails
     config.webpack_rails = ActiveSupport::OrderedOptions.new
 
     initializer :setup_webpack_rails, after: 'sprockets.environment', group: :all do |app|
-      WebpackRails::SprocketsEnvironment.enhance!(app.assets, app.config.webpack_rails)
+      app.config.assets.configure do |env|
+        WebpackRails::SprocketsEnvironment.enhance!(env, app.config.webpack_rails)
 
-      # where [name].bundle.js files should be
-      app.assets.append_path Rails.root.join('tmp/webpack/bundles')
-
-      # stop sprockets from ruining inline sourcemaps in dev
-      if Rails.env.development?
-        app.assets.unregister_postprocessor 'application/javascript', ::Sprockets::SafetyColons
+        # where [name].bundle.js files should be
+        env.append_path Rails.root.join('tmp/webpack/bundles')
       end
     end
 

data/lib/webpack_rails/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack_rails",
-  "version": "1.3.1",
+  "version": "2.0.0",
   "description": "",
   "main": "webpack-dev-server.js",
   "scripts": {

data/lib/webpack_rails/require_directive_processor.rb

@@ -1,7 +1,9 @@
-require 'tilt'
+require 'json'
+require_relative './version'
+require 'sprockets/directive_processor'
 
 module WebpackRails
-  class RequireDirectiveProcessor < Tilt::Template
+  class RequireDirectiveProcessor
     DIRECTIVE_PATTERN = /^.*?=\s*webpack_require\s+(.*?)\s*$/
 
     def self.configure(webpack_task_config)
@@ -11,6 +13,8 @@ module WebpackRails
     end
 
     def self.config=(new_config)
+      @cache_key = nil
+      @instance = nil
       @config = new_config
     end
 
@@ -18,7 +22,17 @@ module WebpackRails
       @config
     end
 
-    def prepare
+    def self.cache_key
+      config_serialized = @config ? @config.to_json : '{}'
+      @cache_key ||= "RequireDirectiveProcessor:#{::WebpackRails::VERSION}:#{config_serialized}".freeze
+    end
+
+    def self.instance
+      @instance ||= new
+    end
+
+    def self.call(input)
+      instance.call(input)
     end
 
     def config
@@ -29,23 +43,30 @@ module WebpackRails
       "#{config[:protocol]}://#{config[:host]}:#{config[:port]}"
     end
 
-    def process_require(context, locals, bundle_filename)
+    def process_require(context, bundle_filename)
       if config[:dev_server]
         if bundle_filename.end_with? '.js'
+          # emit a script tag pointing at the dev server js url
           return %{document.write('<script src="#{dev_server_base_url}/#{bundle_filename}"></script>');}
         end
-        return ''
+        # probably a css file, contents will be included in js instead to enable hot module replacement
+        return "\n"
       end
 
       # will be handled by normal sprockets require
       context.require_asset(bundle_filename)
-      return ''
+      return "\n"
     end
 
-    def evaluate(context, locals)
-      data.gsub(DIRECTIVE_PATTERN) do |match_text|
-        process_require(context, locals, $1)
+    def call(input)
+      data     = input[:data]
+      context  = input[:environment].context_class.new(input)
+
+      output = data.gsub(DIRECTIVE_PATTERN) do |match_text|
+        process_require(context, $1)
       end
+
+      context.metadata.merge(data: output)
     end
   end
 end

data/lib/webpack_rails/sprockets_cached_environment.rb

@@ -0,0 +1,15 @@
+require 'sprockets'
+require 'sprockets/cached_environment'
+
+module WebpackRails
+  class SprocketsCachedEnvironment < ::Sprockets::CachedEnvironment
+    def initialize(environment)
+      if environment.webpack_task_config[:dev_server] || environment.webpack_task_config[:watch]
+        # ensure webpack-dev-server is running or watcher has finished building
+        WebpackRails::Task.run_webpack(environment.webpack_task_config)
+      end
+
+      super
+    end
+  end
+end

data/lib/webpack_rails/sprockets_environment.rb

@@ -1,5 +1,5 @@
 require 'sprockets'
-require 'sprockets/webpack_index'
+require 'webpack_rails/sprockets_cached_environment'
 require 'webpack_rails/require_directive_processor'
 require 'webpack_rails/processor'
 
@@ -31,8 +31,13 @@ module WebpackRails
         register_preprocessor 'text/css', require_directive_processor
       end
 
+      def cached
+        WebpackRails::SprocketsCachedEnvironment.new(self)
+      end
+
+      # sprockets 2.x compat
       def index
-        Sprockets::WebpackIndex.new(self)
+        cached
       end
     end
 

data/lib/webpack_rails/version.rb

@@ -0,0 +1,5 @@
+require 'json'
+
+module WebpackRails
+  VERSION = JSON.load(File.new(File.expand_path('../package.json', __FILE__)))['version']
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpack_rails
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0
 platform: ruby
 authors:
 - James Friend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: node_task
@@ -25,40 +25,31 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.5
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Much longer explanation of the webpack_rails!
+        version: '3'
+description: |-
+  Integrates Webpack with Rails/Sprockets.
+
+  The main goal of this gem is to keep things working relatively seamlessly and
+  automatically alongside existing Sprockets-based code, meeting the
+  developer-experience expectations of Rails developers, while working towards
+  the ultimate goal of transitioning off of Sprockets entirely.
 email: james@jsdf.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/sprockets/webpack_index.rb
 - lib/webpack_rails.rb
 - lib/webpack_rails/ErrorMessagePlugin.js
 - lib/webpack_rails/engine.rb
@@ -404,8 +395,10 @@ files:
 - lib/webpack_rails/package.json
 - lib/webpack_rails/processor.rb
 - lib/webpack_rails/require_directive_processor.rb
+- lib/webpack_rails/sprockets_cached_environment.rb
 - lib/webpack_rails/sprockets_environment.rb
 - lib/webpack_rails/task.rb
+- lib/webpack_rails/version.rb
 - lib/webpack_rails/webpack-task-dev-server.js
 - lib/webpack_rails/webpack-task-watch.js
 - lib/webpack_rails/webpack.rake
@@ -432,5 +425,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: This is an webpack_rails!
+summary: Integrates Webpack with Rails/Sprockets
 test_files: []

data/lib/sprockets/webpack_index.rb

@@ -1,15 +0,0 @@
-require 'sprockets'
-require 'sprockets/index'
-
-module Sprockets
-  class WebpackIndex < Index
-    def find_asset(*args)
-      if @environment.webpack_task_config[:dev_server] || @environment.webpack_task_config[:watch]
-        # ensure webpack-dev-server is running or watcher has finished building
-        WebpackRails::Task.run_webpack(@environment.webpack_task_config)
-      end
-
-      super
-    end
-  end
-end