webpacker 4.0.0.pre.pre.2 → 4.0.0.pre.3

data/lib/install/typescript.rb

@@ -31,10 +31,10 @@ say "Copying tsconfig.json to the Rails root directory for typescript"
 copy_file "#{__dir__}/examples/#{example_source}/tsconfig.json", "tsconfig.json"
 
 say "Updating webpack paths to include .ts file extension"
-insert_into_file Webpacker.config.config_path, "    - .ts\n", after: /extensions:\n/
+insert_into_file Webpacker.config.config_path, "- .ts\n".indent(4), after: /extensions:\n/
 
 say "Updating webpack paths to include .tsx file extension"
-insert_into_file Webpacker.config.config_path, "    - .tsx\n", after: /extensions:\n/
+insert_into_file Webpacker.config.config_path, "- .tsx\n".indent(4), after: /extensions:\n/
 
 say "Copying the example entry file to #{Webpacker.config.source_entry_path}"
 copy_file "#{__dir__}/examples/typescript/hello_typescript.ts",

data/lib/install/vue.rb

@@ -22,7 +22,7 @@ insert_into_file Rails.root.join("config/webpack/environment.js").to_s,
   before: "module.exports"
 
 say "Updating webpack paths to include .vue file extension"
-insert_into_file Webpacker.config.config_path, "    - .vue\n", after: /extensions:\n/
+insert_into_file Webpacker.config.config_path, "- .vue\n".indent(4), after: /extensions:\n/
 
 say "Copying the example entry file to #{Webpacker.config.source_entry_path}"
 copy_file "#{__dir__}/examples/vue/hello_vue.js",
@@ -40,9 +40,9 @@ if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR > 1
   say "This can be done in Rails 5.2+ for development environment in the CSP initializer", :yellow
   say "config/initializers/content_security_policy.rb with a snippet like this:", :yellow
   say "if Rails.env.development?", :yellow
-  say "  p.script_src :self, :https, :unsafe_eval", :yellow
+  say "  policy.script_src :self, :https, :unsafe_eval", :yellow
   say "else", :yellow
-  say "  p.script_src :self, :https", :yellow
+  say "  policy.script_src :self, :https", :yellow
   say "end", :yellow
 end
 

data/lib/tasks/installers.rake

@@ -13,6 +13,8 @@ dependencies = {
   "Angular": [:typescript]
 }
 
+bin_path = ENV["BUNDLE_BIN"] || "./bin"
+
 namespace :webpacker do
   namespace :install do
     installers.each do |name, task_name|
@@ -21,9 +23,9 @@ namespace :webpacker do
         template = File.expand_path("../install/#{task_name}.rb", __dir__)
         base_path =
           if Rails::VERSION::MAJOR >= 5
-            "#{RbConfig.ruby} ./bin/rails app:template"
+            "#{RbConfig.ruby} #{bin_path}/rails app:template"
           else
-            "#{RbConfig.ruby} ./bin/rake rails:template"
+            "#{RbConfig.ruby} #{bin_path}/rake rails:template"
           end
 
         dependencies[name] ||= []

data/lib/tasks/webpacker.rake

@@ -1,4 +1,5 @@
 tasks = {
+  "webpacker:info"                    => "Provides information on Webpacker's environment",
   "webpacker:install"                 => "Installs and setup webpack with Yarn",
   "webpacker:compile"                 => "Compiles webpack bundles based on environment",
   "webpacker:clobber"                 => "Removes the webpack compiled output directory",

data/lib/tasks/webpacker/binstubs.rake

@@ -1,12 +1,13 @@
 binstubs_template_path = File.expand_path("../../install/binstubs.rb", __dir__).freeze
+bin_path = ENV["BUNDLE_BIN"] || "./bin"
 
 namespace :webpacker do
   desc "Installs Webpacker binstubs in this application"
   task binstubs: [:check_node, :check_yarn] do
     if Rails::VERSION::MAJOR >= 5
-      exec "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{binstubs_template_path}"
+      exec "#{RbConfig.ruby} #{bin_path}/rails app:template LOCATION=#{binstubs_template_path}"
     else
-      exec "#{RbConfig.ruby} ./bin/rake rails:template LOCATION=#{binstubs_template_path}"
+      exec "#{RbConfig.ruby} #{bin_path}/rake rails:template LOCATION=#{binstubs_template_path}"
     end
   end
 end

data/lib/tasks/webpacker/info.rake

@@ -0,0 +1,19 @@
+require "webpacker/version"
+
+namespace :webpacker do
+  desc "Provide information on Webpacker's environment"
+  task :info do
+    $stdout.puts "Ruby: #{`ruby --version`}"
+    $stdout.puts "Rails: #{Rails.version}"
+    $stdout.puts "Webpacker: #{Webpacker::VERSION}"
+    $stdout.puts "Node: #{`node --version`}"
+    $stdout.puts "Yarn: #{`yarn --version`}"
+
+    $stdout.puts "\n"
+    $stdout.puts "@rails/webpacker: \n#{`npm list @rails/webpacker version`}"
+
+    $stdout.puts "Is bin/webpack present?: #{File.exist? 'bin/webpack'}"
+    $stdout.puts "Is bin/webpack-dev-server present?: #{File.exist? 'bin/webpack-dev-server'}"
+    $stdout.puts "Is bin/yarn present?: #{File.exist? 'bin/yarn'}"
+  end
+end

data/lib/tasks/webpacker/install.rake

@@ -1,12 +1,13 @@
 install_template_path = File.expand_path("../../install/template.rb", __dir__).freeze
+bin_path = ENV["BUNDLE_BIN"] || "./bin"
 
 namespace :webpacker do
   desc "Install Webpacker in this application"
   task install: [:check_node, :check_yarn] do
     if Rails::VERSION::MAJOR >= 5
-      exec "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{install_template_path}"
+      exec "#{RbConfig.ruby} #{bin_path}/rails app:template LOCATION=#{install_template_path}"
     else
-      exec "#{RbConfig.ruby} ./bin/rake rails:template LOCATION=#{install_template_path}"
+      exec "#{RbConfig.ruby} #{bin_path}/rake rails:template LOCATION=#{install_template_path}"
     end
   end
 end

data/lib/tasks/webpacker/verify_install.rake

@@ -3,10 +3,7 @@ require "webpacker/configuration"
 namespace :webpacker do
   desc "Verifies if Webpacker is installed"
   task verify_install: [:check_node, :check_yarn, :check_binstubs] do
-    if Webpacker.config.config_path.exist?
-      $stdout.puts "Webpacker is installed 🎉 🍰"
-      $stdout.puts "Using #{Webpacker.config.config_path} file for setting up webpack paths"
-    else
+    unless Webpacker.config.config_path.exist?
       $stderr.puts "Configuration config/webpacker.yml file not found. \n"\
            "Make sure webpacker:install is run successfully before " \
            "running dependent tasks"

data/lib/webpacker.rb

@@ -1,4 +1,5 @@
 require "active_support/core_ext/module/attribute_accessors"
+require "active_support/core_ext/string/inquiry"
 require "active_support/logger"
 require "active_support/tagged_logging"
 

data/lib/webpacker/commands.rb

@@ -11,7 +11,6 @@ class Webpacker::Commands
   end
 
   def bootstrap
-    config.refresh
     manifest.refresh
   end
 

data/lib/webpacker/compiler.rb

@@ -40,11 +40,17 @@ class Webpacker::Compiler
   private
     def last_compilation_digest
       compilation_digest_path.read if compilation_digest_path.exist? && config.public_manifest_path.exist?
+    rescue Errno::ENOENT, Errno::ENOTDIR
     end
 
     def watched_files_digest
       files = Dir[*default_watched_paths, *watched_paths].reject { |f| File.directory?(f) }
-      Digest::SHA1.hexdigest(files.map { |f| "#{File.basename(f)}/#{File.mtime(f).utc.to_i}" }.join("/"))
+      file_ids = if ENV["CI"]
+        files.sort.map { |f| "#{File.basename(f)}/#{Digest::SHA1.file(f).hexdigest}" }
+      else
+        files.map { |f| "#{File.basename(f)}/#{File.mtime(f).utc.to_i}" }
+      end
+      Digest::SHA1.hexdigest(file_ids.join("/"))
     end
 
     def record_compilation_digest
@@ -54,12 +60,13 @@ class Webpacker::Compiler
 
     def remove_compilation_digest
       compilation_digest_path.delete if compilation_digest_path.exist?
+    rescue Errno::ENOENT, Errno::ENOTDIR
     end
 
     def run_webpack
       logger.info "Compiling…"
 
-      sterr, stdout, status = Open3.capture3(webpack_env, "#{RbConfig.ruby} ./bin/webpack")
+      stdout, sterr , status = Open3.capture3(webpack_env, "#{RbConfig.ruby} #{@webpacker.root_path}/bin/webpack")
 
       if status.success?
         logger.info "Compiled all packs in #{config.public_output_path}"
@@ -80,7 +87,7 @@ class Webpacker::Compiler
     end
 
     def compilation_digest_path
-      config.cache_path.join(".last-compilation-digest-#{Webpacker.env}")
+      config.cache_path.join("last-compilation-digest-#{Webpacker.env}")
     end
 
     def webpack_env

data/lib/webpacker/configuration.rb

@@ -1,12 +1,14 @@
-class Webpacker::Configuration
-  delegate :root_path, :config_path, :env, to: :@webpacker
+require "yaml"
+require "active_support/core_ext/hash/keys"
+require "active_support/core_ext/hash/indifferent_access"
 
-  def initialize(webpacker)
-    @webpacker = webpacker
-  end
+class Webpacker::Configuration
+  attr_reader :root_path, :config_path, :env
 
-  def refresh
-    @data = load
+  def initialize(root_path:, config_path:, env:)
+    @root_path = root_path
+    @config_path = config_path
+    @env = env
   end
 
   def dev_server
@@ -57,6 +59,14 @@ class Webpacker::Configuration
     fetch(:extensions)
   end
 
+  def check_yarn_integrity=(value)
+    data[:check_yarn_integrity] = value
+  end
+
+  def check_yarn_integrity?
+    fetch(:check_yarn_integrity)
+  end
+
   private
     def fetch(key)
       data.fetch(key, defaults[key])

data/lib/webpacker/dev_server.rb

@@ -3,10 +3,10 @@ class Webpacker::DevServer
   # Webpacker.dev_server.connect_timeout = 1
   cattr_accessor(:connect_timeout) { 0.01 }
 
-  delegate :config, to: :@webpacker
+  attr_reader :config
 
-  def initialize(webpacker)
-    @webpacker = webpacker
+  def initialize(config)
+    @config = config
   end
 
   def running?
@@ -54,12 +54,16 @@ class Webpacker::DevServer
     "#{host}:#{port}"
   end
 
+  def pretty?
+    fetch(:pretty)
+  end
+
   private
     def fetch(key)
       ENV["WEBPACKER_DEV_SERVER_#{key.upcase}"] || config.dev_server.fetch(key, defaults[key])
     end
 
     def defaults
-      config.send(:defaults)[:dev_server]
+      config.send(:defaults)[:dev_server] || {}
     end
 end

data/lib/webpacker/dev_server_proxy.rb

@@ -11,6 +11,10 @@ class Webpacker::DevServerProxy < Rack::Proxy
   def perform_request(env)
     if env["PATH_INFO"].start_with?("/#{public_output_uri_path}") && Webpacker.dev_server.running?
       env["HTTP_HOST"] = env["HTTP_X_FORWARDED_HOST"] = env["HTTP_X_FORWARDED_SERVER"] = Webpacker.dev_server.host_with_port
+      env["HTTP_X_FORWARDED_PROTO"] = env["HTTP_X_FORWARDED_SCHEME"] = Webpacker.dev_server.protocol
+      unless Webpacker.dev_server.https?
+        env["HTTPS"] = env["HTTP_X_FORWARDED_SSL"] = "off"
+      end
       env["SCRIPT_NAME"] = ""
 
       super(env)

data/lib/webpacker/dev_server_runner.rb

@@ -1,6 +1,7 @@
 require "shellwords"
-require "yaml"
 require "socket"
+require "webpacker/configuration"
+require "webpacker/dev_server"
 require "webpacker/runner"
 
 module Webpacker
@@ -13,15 +14,22 @@ module Webpacker
 
     private
       def load_config
-        @config_file = File.join(@app_path, "config/webpacker.yml")
-        dev_server = YAML.load_file(@config_file)[ENV["RAILS_ENV"]]["dev_server"]
+        app_root = Pathname.new(@app_path)
 
-        @hostname          = dev_server["host"]
-        @port              = dev_server["port"]
-        @pretty            = dev_server.fetch("pretty", true)
+        config = Configuration.new(
+          root_path: app_root,
+          config_path: app_root.join("config/webpacker.yml"),
+          env: ENV["RAILS_ENV"]
+        )
+
+        dev_server = DevServer.new(config)
+
+        @hostname          = dev_server.host
+        @port              = dev_server.port
+        @pretty            = dev_server.pretty?
 
       rescue Errno::ENOENT, NoMethodError
-        $stdout.puts "webpack dev_server configuration not found in #{@config_file}[#{ENV["RAILS_ENV"]}]."
+        $stdout.puts "webpack dev_server configuration not found in #{config.config_path}[#{ENV["RAILS_ENV"]}]."
         $stdout.puts "Please run bundle exec rails webpacker:install to install Webpacker"
         exit!
       end
@@ -36,9 +44,9 @@ module Webpacker
       end
 
       def execute_cmd
-        env = { "NODE_PATH" => @node_modules_path.shellescape }
+        env = Webpacker::Compiler.env
         cmd = [
-          "#{@node_modules_path}/.bin/webpack-dev-server",
+          "#{@node_modules_bin_path}/webpack-dev-server",
           "--config", @webpack_config
         ]
         cmd += ["--progress", "--color"] if @pretty

data/lib/webpacker/env.rb

@@ -13,7 +13,7 @@ class Webpacker::Env
 
   def inquire
     fallback_env_warning unless current
-    (current || DEFAULT).inquiry
+    current || DEFAULT.inquiry
   end
 
   private

data/lib/webpacker/instance.rb

@@ -12,7 +12,11 @@ class Webpacker::Instance
   end
 
   def config
-    @config ||= Webpacker::Configuration.new self
+    @config ||= Webpacker::Configuration.new(
+      root_path: root_path,
+      config_path: config_path,
+      env: env
+    )
   end
 
   def compiler
@@ -20,7 +24,7 @@ class Webpacker::Instance
   end
 
   def dev_server
-    @dev_server ||= Webpacker::DevServer.new self
+    @dev_server ||= Webpacker::DevServer.new config
   end
 
   def manifest

data/lib/webpacker/railtie.rb

@@ -6,7 +6,12 @@ require "webpacker/dev_server_proxy"
 class Webpacker::Engine < ::Rails::Engine
   # Allows Webpacker config values to be set via Rails env config files
   config.webpacker = ActiveSupport::OrderedOptions.new
-  config.webpacker.check_yarn_integrity = false
+
+  initializer "webpacker.set_configs" do |app|
+    if app.config.webpacker.key?(:check_yarn_integrity)
+      Webpacker.config.check_yarn_integrity = app.config.webpacker.check_yarn_integrity
+    end
+  end
 
   # ================================
   # Check Yarn Integrity Initializer
@@ -24,7 +29,7 @@ class Webpacker::Engine < ::Rails::Engine
   #     - edit config/environments/production.rb
   #     - add `config.webpacker.check_yarn_integrity = true`
   initializer "webpacker.yarn_check" do |app|
-    if File.exist?("yarn.lock") && app.config.webpacker.check_yarn_integrity
+    if File.exist?("yarn.lock") && Webpacker.config.config_path.exist? && Webpacker.config.check_yarn_integrity?
       output = `yarn check --integrity 2>&1`
 
       unless $?.success?
@@ -34,8 +39,8 @@ class Webpacker::Engine < ::Rails::Engine
         $stderr.puts "  Please run `yarn install` to update."
         $stderr.puts "========================================"
         $stderr.puts "\n\n"
-        $stderr.puts "To disable this check, please add `config.webpacker.check_yarn_integrity = false`"
-        $stderr.puts "to your Rails development config file (config/environments/development.rb)."
+        $stderr.puts "To disable this check, please change `check_yarn_integrity`"
+        $stderr.puts "to `false` in your webpacker config file (config/webpacker.yml)."
         $stderr.puts "\n\n"
         $stderr.puts output
         $stderr.puts "\n\n"
@@ -46,7 +51,8 @@ class Webpacker::Engine < ::Rails::Engine
   end
 
   initializer "webpacker.proxy" do |app|
-    if Rails.env.development?
+    insert_middleware = Webpacker.config.dev_server.present? rescue nil
+    if insert_middleware
       app.middleware.insert_before 0,
         Rails::VERSION::MAJOR >= 5 ?
           Webpacker::DevServerProxy : "Webpacker::DevServerProxy", ssl_verify_none: true
@@ -76,7 +82,10 @@ class Webpacker::Engine < ::Rails::Engine
   initializer "webpacker.bootstrap" do
     if defined?(Rails::Server) || defined?(Rails::Console)
       Webpacker.bootstrap
-      Spring.after_fork { Webpacker.bootstrap } if defined?(Spring)
+      if defined?(Spring)
+        Spring.after_fork { Webpacker.bootstrap }
+        Spring.watch(Webpacker.config.config_path)
+      end
     end
   end
 end

data/lib/webpacker/runner.rb

@@ -9,9 +9,9 @@ module Webpacker
     def initialize(argv)
       @argv = argv
 
-      @app_path          = File.expand_path(".", Dir.pwd)
-      @node_modules_path = File.join(@app_path, "node_modules")
-      @webpack_config    = File.join(@app_path, "config/webpack/#{ENV["NODE_ENV"]}.js")
+      @app_path              = File.expand_path(".", Dir.pwd)
+      @node_modules_bin_path = ENV["WEBPACKER_NODE_MODULES_BIN_PATH"] || `yarn bin`.chomp
+      @webpack_config        = File.join(@app_path, "config/webpack/#{ENV["NODE_ENV"]}.js")
 
       unless File.exist?(@webpack_config)
         $stderr.puts "webpack config #{@webpack_config} not found, please run 'bundle exec rails webpacker:install' to install Webpacker with default configs or add the missing config file for your custom environment."

data/lib/webpacker/version.rb

@@ -1,4 +1,4 @@
 module Webpacker
   # Change the version in package.json too, please!
-  VERSION = "4.0.0-pre.2".freeze
+  VERSION = "4.0.0.pre.3".freeze
 end

data/lib/webpacker/webpack_runner.rb

@@ -4,8 +4,8 @@ require "webpacker/runner"
 module Webpacker
   class WebpackRunner < Webpacker::Runner
     def run
-      env = { "NODE_PATH" => @node_modules_path.shellescape }
-      cmd = [ "#{@node_modules_path}/.bin/webpack", "--config", @webpack_config ] + @argv
+      env = Webpacker::Compiler.env
+      cmd = [ "#{@node_modules_bin_path}/webpack", "--config", @webpack_config ] + @argv
 
       Dir.chdir(@app_path) do
         exec env, *cmd

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/webpacker",
-  "version": "4.0.0-pre.2",
+  "version": "4.0.0-pre.3",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "main": "package/index.js",
   "files": [
@@ -8,43 +8,50 @@
     "lib/install/config/webpacker.yml"
   ],
   "engines": {
-    "node": ">=6.0.0",
-    "yarn": ">=0.25.2"
+    "node": ">=6.14.0",
+    "yarn": ">=1.0.0"
   },
   "dependencies": {
-    "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.3",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.6.1",
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+    "@babel/plugin-transform-destructuring": "^7.0.0",
+    "@babel/plugin-transform-regenerator": "^7.0.0",
+    "@babel/plugin-transform-runtime": "^7.0.0",
+    "@babel/polyfill": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/runtime": "^7.0.0",
+    "babel-core": "^7.0.0-bridge",
+    "babel-loader": "^8.0.0",
     "case-sensitive-paths-webpack-plugin": "^2.1.2",
-    "compression-webpack-plugin": "^1.1.11",
-    "css-loader": "^0.28.11",
-    "file-loader": "^1.1.11",
-    "glob": "^7.1.2",
-    "js-yaml": "^3.11.0",
-    "mini-css-extract-plugin": "^0.4.0",
-    "node-sass": "^4.8.3",
+    "compression-webpack-plugin": "^1.1.12",
+    "css-loader": "^1.0.0",
+    "file-loader": "^2.0.0",
+    "glob": "^7.1.3",
+    "js-yaml": "^3.12.0",
+    "mini-css-extract-plugin": "^0.4.2",
+    "node-sass": "^4.9.3",
+    "optimize-css-assets-webpack-plugin": "^5.0.1",
     "path-complete-extname": "^1.0.0",
-    "postcss-cssnext": "^3.1.0",
-    "postcss-import": "^11.1.0",
-    "postcss-loader": "^2.1.3",
-    "sass-loader": "^6.0.7",
-    "style-loader": "^0.20.3",
-    "uglifyjs-webpack-plugin": "^1.2.4",
-    "webpack": "^4.4.1",
-    "webpack-assets-manifest": "^3.0.1",
-    "webpack-cli": "^2.0.13"
+    "postcss-import": "^12.0.0",
+    "postcss-loader": "^3.0.0",
+    "postcss-preset-env": "^5.3.0",
+    "sass-loader": "^7.1.0",
+    "style-loader": "^0.23.0",
+    "uglifyjs-webpack-plugin": "^1.3.0",
+    "webpack": "^4.17.1",
+    "webpack-assets-manifest": "^3.0.2",
+    "webpack-cli": "^3.1.0",
+    "webpack-sources": "^1.2.0"
   },
   "devDependencies": {
-    "eslint": "^4.18.2",
-    "eslint-config-airbnb": "^16.1.0",
-    "eslint-plugin-import": "^2.9.0",
-    "eslint-plugin-jsx-a11y": "^6.0.3",
-    "eslint-plugin-react": "^7.7.0",
-    "jest": "^22.4.2"
+    "eslint": "^5.4.0",
+    "eslint-config-airbnb": "^17.1.0",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-jsx-a11y": "^6.1.1",
+    "eslint-plugin-react": "^7.11.1",
+    "jest": "^23.5.0"
   },
   "jest": {
     "testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$",
@@ -54,7 +61,7 @@
   },
   "scripts": {
     "test": "jest",
-    "lint": "eslint {package,lib}/"
+    "lint": "eslint package/"
   },
   "repository": {
     "type": "git",