webpacker 1.1 → 1.2

data/lib/tasks/webpacker/compile.rake

@@ -1,3 +1,4 @@
+require "webpacker/env"
 require "webpacker/configuration"
 REGEX_MAP = /\A.*\.map\z/
 
@@ -5,16 +6,28 @@ namespace :webpacker do
   desc "Compile javascript packs using webpack for production with digests"
   task compile: ["webpacker:verify_install", :environment] do
     puts "Compiling webpacker assets 🎉"
-    result = `NODE_ENV=production ./bin/webpack`
+    asset_host = Rails.application.config.action_controller.asset_host
+    result = `ASSET_HOST=#{asset_host} NODE_ENV=#{Webpacker::Env.current} ./bin/webpack --json`
 
     unless $?.success?
       puts JSON.parse(result)["errors"]
       exit! $?.exitstatus
     end
 
-    puts "Compiled digests for all packs in #{Webpacker::Configuration.output_path}: "
+    puts "Compiled digests for all packs in #{Webpacker::Configuration.packs_path}: "
     puts JSON.parse(File.read(Webpacker::Configuration.manifest_path))
   end
+
+  desc "Compile javascript packs using webpack for test with digests"
+  task compile_before_test: ["webpacker:compile"] do
+    Webpacker::Manifest.load(Webpacker::Manifest.file_path)
+  end
+end
+
+# Compile packs prior to system and controller tests running
+if Rake::Task.task_defined?("test:system")
+  Rake::Task["test:system"].enhance(["webpacker:compile_before_test"])
+  Rake::Task["test:controllers"].enhance(["webpacker:compile_before_test"])
 end
 
 # Compile packs after we've compiled all other assets during precompilation

data/lib/tasks/webpacker/install.rake

@@ -2,11 +2,11 @@ WEBPACKER_APP_TEMPLATE_PATH = File.expand_path("../../install/template.rb", __di
 
 namespace :webpacker do
   desc "Install webpacker in this application"
-  task :install do
+  task install: [:check_node, :check_yarn] do
     if Rails::VERSION::MAJOR >= 5
-      exec "./bin/rails app:template LOCATION=#{WEBPACKER_APP_TEMPLATE_PATH}"
+      exec "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{WEBPACKER_APP_TEMPLATE_PATH}"
     else
-      exec "./bin/rake rails:template LOCATION=#{WEBPACKER_APP_TEMPLATE_PATH}"
+      exec "#{RbConfig.ruby} ./bin/rake rails:template LOCATION=#{WEBPACKER_APP_TEMPLATE_PATH}"
     end
   end
 end

data/lib/tasks/webpacker/verify_install.rake

@@ -2,7 +2,7 @@ require "webpacker/configuration"
 
 namespace :webpacker do
   desc "Verifies if webpacker is installed"
-  task :verify_install do
+  task verify_install: [:check_node, :check_yarn] do
     if File.exist?(Webpacker::Configuration.file_path)
       puts "Webpacker is installed 🎉 🍰"
       puts "Using #{Webpacker::Configuration.file_path} file for setting up webpack paths"

data/lib/webpacker.rb

@@ -1,4 +1,9 @@
 module Webpacker
+  def self.bootstrap
+    Webpacker::Env.load
+    Webpacker::Configuration.load
+    Webpacker::Manifest.load
+  end
 end
 
 require "webpacker/railtie" if defined?(Rails)

data/lib/webpacker/configuration.rb

@@ -1,5 +1,6 @@
 # Loads webpacker configuration from config/webpack/paths.yml
 require "webpacker/file_loader"
+require "webpacker/env"
 
 class Webpacker::Configuration < Webpacker::FileLoader
   class << self
@@ -16,27 +17,35 @@ class Webpacker::Configuration < Webpacker::FileLoader
     end
 
     def manifest_path
-      Rails.root.join(output_path, "manifest.json")
+      Rails.root.join(packs_path, paths.fetch(:manifest, "manifest.json"))
     end
 
-    def output_path
-      Rails.root.join(paths.fetch(:output, "public"), paths.fetch(:entry, "packs"))
+    def packs_path
+      Rails.root.join(output_path, paths.fetch(:entry, "packs"))
     end
 
     def paths
-      load if Rails.env.development?
+      load if Webpacker::Env.development?
       raise Webpacker::FileLoader::FileLoaderError.new("Webpacker::Configuration.load must be called first") unless instance
       instance.data
     end
 
+    def output_path
+      Rails.root.join(paths.fetch(:output, "public"))
+    end
+
+    def source
+      paths.fetch(:source, "app/javascript")
+    end
+
     def source_path
-      Rails.root.join(paths.fetch(:source, "app/javascript"))
+      Rails.root.join(source)
     end
   end
 
   private
     def load
       return super unless File.exist?(@path)
-      HashWithIndifferentAccess.new(YAML.load(File.read(@path)))
+      HashWithIndifferentAccess.new(YAML.load(File.read(@path))[Webpacker::Env.current])
     end
 end

data/lib/webpacker/env.rb

@@ -0,0 +1,27 @@
+# Singleton registry for determining NODE_ENV from config/webpack/paths.yml
+require "webpacker/file_loader"
+
+class Webpacker::Env < Webpacker::FileLoader
+  class << self
+    def current
+      raise Webpacker::FileLoader::FileLoaderError.new("Webpacker::Env.load must be called first") unless instance
+      instance.data
+    end
+
+    def development?
+      current == "development"
+    end
+
+    def file_path
+      Rails.root.join("config", "webpack", "paths.yml")
+    end
+  end
+
+  private
+    def load
+      environments = File.exist?(@path) ? YAML.load(File.read(@path)).keys : [].freeze
+      return ENV["NODE_ENV"] if environments.include?(ENV["NODE_ENV"])
+      return Rails.env if environments.include?(Rails.env)
+      "production"
+    end
+end

data/lib/webpacker/manifest.rb

@@ -6,6 +6,7 @@
 # "/packs/calendar-1016838bab065ae1e314.css" for long-term caching
 
 require "webpacker/file_loader"
+require "webpacker/env"
 require "webpacker/configuration"
 
 class Webpacker::Manifest < Webpacker::FileLoader
@@ -15,10 +16,14 @@ class Webpacker::Manifest < Webpacker::FileLoader
     end
 
     def lookup(name)
-      load if Rails.env.development?
+      load if Webpacker::Env.development?
       raise Webpacker::FileLoader::FileLoaderError.new("Webpacker::Manifest.load must be called first") unless instance
       instance.data[name.to_s] || raise(Webpacker::FileLoader::NotFoundError.new("Can't find #{name} in #{file_path}. Is webpack still compiling?"))
     end
+
+    def lookup_path(name)
+      Rails.root.join(File.join(Webpacker::Configuration.output_path, lookup(name)))
+    end
   end
 
   private

data/lib/webpacker/railtie.rb

@@ -8,9 +8,11 @@ class Webpacker::Engine < ::Rails::Engine
       ActionController::Base.helper Webpacker::Helper
     end
 
-    # Loads webpacker config data from config/webpack/paths.yml
-    Webpacker::Configuration.load
-    # Loads manifest data from public/packs/manifest.json
-    Webpacker::Manifest.load
+    ActiveSupport.on_load :action_view do
+      include Webpacker::Helper
+    end
+
+    Webpacker.bootstrap
+    Spring.after_fork { Webpacker.bootstrap } if defined?(Spring)
   end
 end

data/lib/webpacker/version.rb

@@ -1,3 +1,3 @@
 module Webpacker
-  VERSION = "1.1".freeze
+  VERSION = "1.2".freeze
 end

data/package.json

@@ -3,6 +3,9 @@
   "version": "1.0.0",
   "description": "Webpacker makes it easy to use the JavaScript preprocessor and bundler [Webpack](https://webpack.github.io) to manage application-like JavaScript in Rails. It coexists with the asset pipeline, as the purpose is only to use Webpack for app-like JavaScript, not images, css, or even JavaScript Sprinkles (that all continues to live in app/assets).",
   "main": "index.js",
+  "engines": {
+    "node": ">= 6.4.0"
+  },
   "dependencies": {},
   "devDependencies": {
     "eslint": "^3.16.1",
@@ -24,5 +27,5 @@
   "bugs": {
     "url": "https://github.com/rails/webpacker/issues"
   },
-  "homepage": "https://github.com/rails/webpacker#readme"
+  "homepage": "https://github.com/rails/webpacker"
 }

data/test/env_test.rb

@@ -0,0 +1,16 @@
+require "webpacker_test"
+
+class EnvTest < Minitest::Test
+  def test_current_env
+    assert_equal Webpacker::Env.current, "production"
+  end
+
+  def test_env_is_development?
+    refute_predicate Webpacker::Env, :development?
+  end
+
+  def test_file_path
+    correct_path = File.join(File.dirname(__FILE__), "config", "webpack", "paths.yml").to_s
+    assert_equal Webpacker::Env.file_path.to_s, correct_path
+  end
+end

data/test/webpacker_test.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "minitest/autorun"
+require "rails"
+require "rails/test_help"
+require "webpacker"
+
+module TestApp
+  class Application < ::Rails::Application
+    config.root = File.dirname(__FILE__)
+  end
+end
+
+TestApp::Application.initialize!

data/webpacker.gemspec

@@ -4,8 +4,8 @@ require "webpacker/version"
 Gem::Specification.new do |s|
   s.name     = "webpacker"
   s.version  = Webpacker::VERSION
-  s.authors  = "David Heinemeier Hansson"
-  s.email    = "david@basecamp.com"
+  s.authors  = [ "David Heinemeier Hansson", "Gaurav Tiwari" ]
+  s.email    = [ "david@basecamp.com", "gaurav@gauravtiwari.co.uk" ]
   s.summary  = "Use Webpack to manage app-like JavaScript modules in Rails"
   s.homepage = "https://github.com/rails/webpacker"
   s.license  = "MIT"

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: webpacker
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: '1.2'
 platform: ruby
 authors:
 - David Heinemeier Hansson
+- Gaurav Tiwari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -67,7 +68,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.12'
 description: 
-email: david@basecamp.com
+email:
+- david@basecamp.com
+- gaurav@gauravtiwari.co.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -76,6 +79,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -83,9 +87,9 @@ files:
 - Rakefile
 - lib/install/angular.rb
 - lib/install/bin/webpack-dev-server.tt
-- lib/install/bin/webpack-watcher.tt
 - lib/install/bin/webpack.tt
 - lib/install/bin/yarn.tt
+- lib/install/config/.babelrc
 - lib/install/config/.postcssrc.yml
 - lib/install/config/loaders/core/assets.js
 - lib/install/config/loaders/core/babel.js
@@ -102,6 +106,7 @@ files:
 - lib/install/config/webpack/paths.yml
 - lib/install/config/webpack/production.js
 - lib/install/config/webpack/shared.js
+- lib/install/config/webpack/test.js
 - lib/install/examples/angular/hello_angular.js
 - lib/install/examples/angular/hello_angular/app/app.component.ts
 - lib/install/examples/angular/hello_angular/app/app.module.ts
@@ -118,18 +123,24 @@ files:
 - lib/install/vue.rb
 - lib/tasks/installers.rake
 - lib/tasks/webpacker.rake
+- lib/tasks/webpacker/check_node.rake
+- lib/tasks/webpacker/check_yarn.rake
+- lib/tasks/webpacker/clobber.rake
 - lib/tasks/webpacker/compile.rake
 - lib/tasks/webpacker/install.rake
 - lib/tasks/webpacker/verify_install.rake
 - lib/tasks/webpacker/yarn_install.rake
 - lib/webpacker.rb
 - lib/webpacker/configuration.rb
+- lib/webpacker/env.rb
 - lib/webpacker/file_loader.rb
 - lib/webpacker/helper.rb
 - lib/webpacker/manifest.rb
 - lib/webpacker/railtie.rb
 - lib/webpacker/version.rb
 - package.json
+- test/env_test.rb
+- test/webpacker_test.rb
 - webpacker.gemspec
 - yarn.lock
 homepage: https://github.com/rails/webpacker
@@ -156,4 +167,6 @@ rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Use Webpack to manage app-like JavaScript modules in Rails
-test_files: []
+test_files:
+- test/env_test.rb
+- test/webpacker_test.rb

data/lib/install/bin/webpack-watcher.tt

@@ -1,10 +0,0 @@
-<%= shebang %>
-
-ENV['RAILS_ENV'] ||= 'development'
-ENV['NODE_ENV'] ||= ENV['RAILS_ENV']
-
-BIN_PATH = File.expand_path('.', __dir__)
-
-Dir.chdir(BIN_PATH) do
-  exec "./webpack --watch --progress --color #{ARGV.join(" ")}"
-end