webpacker 3.0.2 → 3.1.0

data/gemfiles/Gemfile-rails-edge

@@ -0,0 +1,13 @@
+source "https://rubygems.org"
+
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gem "webpacker", path: ".."
+
+gem "rails", github: "rails/rails"
+gem "arel", github: "rails/arel"
+gem "rake", ">= 11.1"
+gem "rubocop", ">= 0.49", require: false
+gem "rack-proxy", require: false
+gem "minitest", "~> 5.0"
+gem "byebug"

data/gemfiles/Gemfile-rails.4.2.x

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gem "webpacker", path: ".."
+
+gem "rails", "~> 4.2"
+gem "rake", ">= 11.1"
+gem "rubocop", ">= 0.49", require: false
+gem "rack-proxy", require: false
+gem "minitest", "~> 5.0"
+gem "byebug"

data/gemfiles/Gemfile-rails.5.0.x

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gem "webpacker", path: ".."
+
+gem "rails", "~> 5.0"
+gem "rake", ">= 11.1"
+gem "rubocop", ">= 0.49", require: false
+gem "rack-proxy", require: false
+gem "minitest", "~> 5.0"
+gem "byebug"

data/gemfiles/Gemfile-rails.5.1.x

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gem "webpacker", path: ".."
+
+gem "rails", "~> 5.1"
+gem "rake", ">= 11.1"
+gem "rubocop", ">= 0.49", require: false
+gem "rack-proxy", require: false
+gem "minitest", "~> 5.0"
+gem "byebug"

data/lib/install/angular.rb

@@ -1,15 +1,15 @@
 require "webpacker/configuration"
 
-puts "Copying angular example entry file to #{Webpacker.config.source_entry_path}"
+say "Copying angular example entry file to #{Webpacker.config.source_entry_path}"
 copy_file "#{__dir__}/examples/angular/hello_angular.js", "#{Webpacker.config.source_entry_path}/hello_angular.js"
 
-puts "Copying hello_angular app to #{Webpacker.config.source_path}"
+say "Copying hello_angular app to #{Webpacker.config.source_path}"
 directory "#{__dir__}/examples/angular/hello_angular", "#{Webpacker.config.source_path}/hello_angular"
 
-puts "Copying tsconfig.json to the Rails root directory for typescript"
+say "Copying tsconfig.json to the Rails root directory for typescript"
 copy_file "#{__dir__}/examples/angular/tsconfig.json", "tsconfig.json"
 
-puts "Installing all angular dependencies"
+say "Installing all angular dependencies"
 run "yarn add typescript ts-loader core-js zone.js rxjs @angular/core @angular/common @angular/compiler @angular/platform-browser @angular/platform-browser-dynamic"
 
-puts "Webpacker now supports angular and typescript 🎉"
+say "Webpacker now supports angular and typescript 🎉", :green

data/lib/install/config/webpacker.yml

@@ -43,8 +43,15 @@ development:
     # Inline should be set to true if using HMR
     inline: true
     overlay: true
+    compress: true
     disable_host_check: true
     use_local_ip: false
+    quiet: false
+    headers:
+      'Access-Control-Allow-Origin': '*'
+    watch_options:
+      ignored: /node_modules/
+
 
 test:
   <<: *default

data/lib/install/elm.rb

@@ -1,26 +1,26 @@
 require "webpacker/configuration"
 
-puts "Copying Elm example entry file to #{Webpacker.config.source_entry_path}"
+say "Copying Elm example entry file to #{Webpacker.config.source_entry_path}"
 copy_file "#{__dir__}/examples/elm/hello_elm.js",
   "#{Webpacker.config.source_entry_path}/hello_elm.js"
 
-puts "Copying Elm app file to #{Webpacker.config.source_path}"
+say "Copying Elm app file to #{Webpacker.config.source_path}"
 copy_file "#{__dir__}/examples/elm/Main.elm",
   "#{Webpacker.config.source_path}/Main.elm"
 
-puts "Installing all Elm dependencies"
+say "Installing all Elm dependencies"
 run "yarn add elm elm-webpack-loader"
 run "yarn add --dev elm-hot-loader"
 run "yarn run elm package install -- --yes"
 
-puts "Updating Webpack paths to include Elm file extension"
+say "Updating webpack paths to include Elm file extension"
 insert_into_file Webpacker.config.config_path, "    - .elm\n", after: /extensions:\n/
 
-puts "Updating Elm source location"
+say "Updating Elm source location"
 gsub_file "elm-package.json", /\"\.\"\n/,
   %("#{Webpacker.config.source_path.relative_path_from(Rails.root)}"\n)
 
-puts "Updating .gitignore to include elm-stuff folder"
+say "Updating .gitignore to include elm-stuff folder"
 insert_into_file ".gitignore", "/elm-stuff\n", before: "/node_modules\n"
 
-puts "Webpacker now supports Elm 🎉"
+say "Webpacker now supports Elm 🎉", :green

data/lib/install/examples/vue/hello_vue.js

@@ -1,7 +1,7 @@
 /* eslint no-console: 0 */
 // Run this example by adding <%= javascript_pack_tag 'hello_vue' %> (and
-// <%= stylesheet_pack_tag 'hello_vue' %> if you set extractStyles to true
-// in config/webpack/loaders/vue.js) to the head of your layout file,
+// <%= stylesheet_pack_tag 'hello_vue' %> if you have styles in your component)
+// to the head of your layout file,
 // like app/views/layouts/application.html.erb.
 // All it does is render <div>Hello Vue</div> at the bottom of the page.
 
@@ -10,7 +10,9 @@ import App from '../app.vue'
 
 document.addEventListener('DOMContentLoaded', () => {
   document.body.appendChild(document.createElement('hello'))
-  const app = new Vue(App).$mount('hello')
+  const app = new Vue({
+    render: h => h(App)
+  }).$mount('hello')
 
   console.log(app)
 })
@@ -31,7 +33,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
 
 // import Vue from 'vue/dist/vue.esm'
-// import App from './app.vue'
+// import App from '../app.vue'
 //
 // document.addEventListener('DOMContentLoaded', () => {
 //   const app = new Vue({
@@ -42,3 +44,27 @@ document.addEventListener('DOMContentLoaded', () => {
 //     components: { App }
 //   })
 // })
+//
+//
+//
+// If the using turbolinks, install 'vue-turbolinks':
+//
+// yarn add 'vue-turbolinks'
+//
+// Then uncomment the code block below:
+//
+// import TurbolinksAdapter from 'vue-turbolinks';
+// import Vue from 'vue/dist/vue.esm'
+// import App from '../app.vue'
+//
+// Vue.use(TurbolinksAdapter)
+//
+// document.addEventListener('turbolinks:load', () => {
+//   const app = new Vue({
+//     el: '#hello',
+//     data: {
+//       message: "Can you say hello?"
+//     },
+//     components: { App }
+//   })
+// })

data/lib/install/react.rb

@@ -8,21 +8,21 @@ if File.exist?(babelrc)
 
   unless react_babelrc["presets"].include?("react")
     react_babelrc["presets"].push("react")
-    puts "Copying react preset to your .babelrc file"
+    say "Copying react preset to your .babelrc file"
 
     File.open(babelrc, "w") do |f|
       f.puts JSON.pretty_generate(react_babelrc)
     end
   end
 else
-  puts "Copying .babelrc to app root directory"
+  say "Copying .babelrc to app root directory"
   copy_file "#{__dir__}/examples/react/.babelrc", ".babelrc"
 end
 
-puts "Copying react example entry file to #{Webpacker.config.source_entry_path}"
+say "Copying react example entry file to #{Webpacker.config.source_entry_path}"
 copy_file "#{__dir__}/examples/react/hello_react.jsx", "#{Webpacker.config.source_entry_path}/hello_react.jsx"
 
-puts "Installing all react dependencies"
+say "Installing all react dependencies"
 run "yarn add react react-dom babel-preset-react prop-types"
 
-puts "Webpacker now supports react.js 🎉"
+say "Webpacker now supports react.js 🎉", :green

data/lib/install/template.rb

@@ -1,21 +1,31 @@
-# Install webpacker
+# Install Webpacker
 copy_file "#{__dir__}/config/webpacker.yml", "config/webpacker.yml"
 
-puts "Copying webpack core config and loaders"
+puts "Copying webpack core config"
 directory "#{__dir__}/config/webpack", "config/webpack"
 
-puts "Copying .postcssrc.yml to app root directory"
+say "Copying .postcssrc.yml to app root directory"
 copy_file "#{__dir__}/config/.postcssrc.yml", ".postcssrc.yml"
 
-puts "Copying .babelrc to app root directory"
+say "Copying .babelrc to app root directory"
 copy_file "#{__dir__}/config/.babelrc", ".babelrc"
 
-puts "Creating javascript app source directory"
+say "Creating JavaScript app source directory"
 directory "#{__dir__}/javascript", Webpacker.config.source_path
 
-puts "Installing binstubs"
+say "Installing binstubs"
 run "bundle binstubs webpacker"
 
+say "Adding configurations"
+environment <<CONFIG, env: :development
+  # Verifies that versions and hashed value of the package contents in the project's package.json
+  config.webpacker.check_yarn_integrity = true
+CONFIG
+environment <<CONFIG, env: :production
+  # Verifies that versions and hashed value of the package contents in the project's package.json
+  config.webpacker.check_yarn_integrity = false
+CONFIG
+
 if File.exists?(".gitignore")
   append_to_file ".gitignore", <<-EOS
 /public/packs
@@ -24,10 +34,10 @@ if File.exists?(".gitignore")
 EOS
 end
 
-puts "Installing all JavaScript dependencies"
+say "Installing all JavaScript dependencies"
 run "yarn add @rails/webpacker coffeescript@1.12.7"
 
-puts "Installing dev server for live reloading"
+say "Installing dev server for live reloading"
 run "yarn add --dev webpack-dev-server"
 
-puts "Webpacker successfully installed 🎉 🍰"
+say "Webpacker successfully installed 🎉 🍰", :green

data/lib/install/vue.rb

@@ -1,14 +1,14 @@
 require "webpacker/configuration"
 
-puts "Copying the example entry file to #{Webpacker.config.source_entry_path}"
+say "Copying the example entry file to #{Webpacker.config.source_entry_path}"
 copy_file "#{__dir__}/examples/vue/hello_vue.js",
   "#{Webpacker.config.source_entry_path}/hello_vue.js"
 
-puts "Copying Vue app file to #{Webpacker.config.source_entry_path}"
+say "Copying Vue app file to #{Webpacker.config.source_entry_path}"
 copy_file "#{__dir__}/examples/vue/app.vue",
   "#{Webpacker.config.source_path}/app.vue"
 
-puts "Installing all Vue dependencies"
+say "Installing all Vue dependencies"
 run "yarn add vue vue-loader vue-template-compiler"
 
-puts "Webpacker now supports Vue.js 🎉"
+say "Webpacker now supports Vue.js 🎉", :green

data/lib/tasks/installers.rake

@@ -1,4 +1,4 @@
-INSTALLERS = {
+installers = {
   "Angular": :angular,
   "Elm": :elm,
   "React": :react,
@@ -7,7 +7,7 @@ INSTALLERS = {
 
 namespace :webpacker do
   namespace :install do
-    INSTALLERS.each do |name, task_name|
+    installers.each do |name, task_name|
       desc "Install everything needed for #{name}"
       task task_name => ["webpacker:verify_install"] do
         template = File.expand_path("../install/#{task_name}.rb", __dir__)

data/lib/tasks/webpacker.rake

@@ -1,10 +1,11 @@
 tasks = {
-  "webpacker:install"                 => "Installs and setup webpack with yarn",
+  "webpacker:install"                 => "Installs and setup webpack with Yarn",
   "webpacker:compile"                 => "Compiles webpack bundles based on environment",
+  "webpacker:clobber"                 => "Removes the webpack compiled output directory",
   "webpacker:check_node"              => "Verifies if Node.js is installed",
-  "webpacker:check_yarn"              => "Verifies if yarn is installed",
-  "webpacker:check_binstubs"          => "Verifies that bin/webpack & bin/webpack-dev-server are present",
-  "webpacker:verify_install"          => "Verifies if webpacker is installed",
+  "webpacker:check_yarn"              => "Verifies if Yarn is installed",
+  "webpacker:check_binstubs"          => "Verifies that webpack & webpack-dev-server are present",
+  "webpacker:verify_install"          => "Verifies if Webpacker is installed",
   "webpacker:yarn_install"            => "Support for older Rails versions. Install all JavaScript dependencies as specified via Yarn",
   "webpacker:install:react"           => "Installs and setup example React component",
   "webpacker:install:vue"             => "Installs and setup example Vue component",
@@ -12,8 +13,8 @@ tasks = {
   "webpacker:install:elm"             => "Installs and setup example Elm component"
 }.freeze
 
-desc "Lists all available tasks in webpacker"
+desc "Lists all available tasks in Webpacker"
 task :webpacker do
-  puts "Available webpacker tasks are:"
+  puts "Available Webpacker tasks are:"
   tasks.each { |task, message| puts task.ljust(30) + message }
 end

data/lib/tasks/webpacker/check_binstubs.rake

@@ -1,8 +1,8 @@
 namespace :webpacker do
-  desc "Verifies that bin/webpack & bin/webpack-dev-server are present."
+  desc "Verifies that webpack & webpack-dev-server are present."
   task :check_binstubs do
-    unless File.exist?("bin/webpack") && File.exist?("bin/webpack-dev-server")
-      $stderr.puts "Webpack binstubs not found.\n"\
+    unless Bundler.which("webpack")
+      $stderr.puts "webpack binstubs not found.\n"\
            "Have you run rails webpacker:install ?\n"\
            "Make sure the bin directory or binstubs are not included in .gitignore\n"\
            "Exiting!"

data/lib/tasks/webpacker/compile.rake

@@ -8,8 +8,18 @@ ensure
   Webpacker.logger = old_logger
 end
 
+def enhance_assets_precompile
+  Rake::Task["assets:precompile"].enhance do
+    unless Rake::Task.task_defined?("yarn:install")
+      # For Rails < 5.1
+      Rake::Task["webpacker:yarn_install"].invoke
+    end
+    Rake::Task["webpacker:compile"].invoke
+  end
+end
+
 namespace :webpacker do
-  desc "Compile javascript packs using webpack for production with digests"
+  desc "Compile JavaScript packs using webpack for production with digests"
   task compile: ["webpacker:verify_install", :environment] do
     ensure_log_goes_to_stdout do
       if Webpacker.compile
@@ -24,11 +34,8 @@ end
 
 # Compile packs after we've compiled all other assets during precompilation
 if Rake::Task.task_defined?("assets:precompile")
-  Rake::Task["assets:precompile"].enhance do
-    unless Rake::Task.task_defined?("yarn:install")
-      # For Rails < 5.1
-      Rake::Task["webpacker:yarn_install"].invoke
-    end
-    Rake::Task["webpacker:compile"].invoke
-  end
+  skip_webpacker_precompile = %w(no false n f).include?(ENV["WEBPACKER_PRECOMPILE"])
+  enhance_assets_precompile unless skip_webpacker_precompile
+else
+  Rake::Task.define_task("assets:precompile" => ["webpacker:compile"])
 end

data/lib/tasks/webpacker/install.rake

@@ -1,12 +1,12 @@
-WEBPACKER_APP_TEMPLATE_PATH = File.expand_path("../../install/template.rb", __dir__)
+install_template_path = File.expand_path("../../install/template.rb", __dir__).freeze
 
 namespace :webpacker do
-  desc "Install webpacker in this application"
+  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=#{WEBPACKER_APP_TEMPLATE_PATH}"
+      exec "#{RbConfig.ruby} ./bin/rails app:template LOCATION=#{install_template_path}"
     else
-      exec "#{RbConfig.ruby} ./bin/rake rails:template LOCATION=#{WEBPACKER_APP_TEMPLATE_PATH}"
+      exec "#{RbConfig.ruby} ./bin/rake rails:template LOCATION=#{install_template_path}"
     end
   end
 end

data/lib/tasks/webpacker/verify_install.rake

@@ -1,7 +1,7 @@
 require "webpacker/configuration"
 
 namespace :webpacker do
-  desc "Verifies if webpacker is installed"
+  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 🎉 🍰"

data/lib/webpacker/compiler.rb

@@ -3,12 +3,12 @@ require "digest/sha1"
 
 class Webpacker::Compiler
   # Additional paths that test compiler needs to watch
-  # Webpacker::Compiler.watched_paths << 'bower_components'
-  mattr_accessor(:watched_paths) { [] }
+  # Webpacker::Compiler.watched_paths << 'bower_components'
+  cattr_accessor(:watched_paths) { [] }
 
   # Additional environment variables that the compiler is being run with
   # Webpacker::Compiler.env['FRONTEND_API_KEY'] = 'your_secret_key'
-  mattr_accessor(:env) { {} }
+  cattr_accessor(:env) { {} }
 
   delegate :config, :logger, to: :@webpacker
 
@@ -53,7 +53,7 @@ class Webpacker::Compiler
     def run_webpack
       logger.info "Compiling…"
 
-      sterr, stdout, status = Open3.capture3(webpack_env, "#{RbConfig.ruby} ./bin/webpack")
+      sterr, stdout, status = Open3.capture3(webpack_env, "bundle exec webpack")
 
       if status.success?
         logger.info "Compiled all packs in #{config.public_output_path}"
@@ -69,10 +69,10 @@ class Webpacker::Compiler
     end
 
     def compilation_digest_path
-      config.cache_path.join(".last-compilation-digest")
+      config.cache_path.join(".last-compilation-digest-#{Webpacker.env}")
     end
 
     def webpack_env
-      env.merge("NODE_ENV" => @webpacker.env, "ASSET_HOST" => ActionController::Base.helpers.compute_asset_host)
+      env.merge("NODE_ENV" => @webpacker.env, "WEBPACKER_ASSET_HOST" => ActionController::Base.helpers.compute_asset_host)
     end
 end

data/lib/webpacker/dev_server.rb

@@ -1,7 +1,7 @@
 class Webpacker::DevServer
   # Configure dev server connection timeout (in seconds), default: 0.01
-  # Webpacker.dev_server.connect_timeout = 1
-  mattr_accessor(:connect_timeout) { 0.01 }
+  # Webpacker.dev_server.connect_timeout = 1
+  cattr_accessor(:connect_timeout) { 0.01 }
 
   delegate :config, to: :@webpacker