RubyGems - webpacker - Versions diffs - 5.4.4 → 6.0.0.rc.6 - Mend

webpacker 5.4.4 → 6.0.0.rc.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (189) hide show

checksums.yaml +4 -4
data/.eslintrc.js +1 -1
data/.github/workflows/jest.yml +7 -15
data/.github/workflows/js-lint.yml +7 -15
data/.github/workflows/rubocop.yml +1 -1
data/.github/workflows/ruby.yml +18 -16
data/.gitignore +2 -0
data/.node-version +1 -1
data/.rubocop.yml +5 -7
data/CHANGELOG.md +30 -12
data/CONTRIBUTING.md +20 -1
data/Gemfile.lock +83 -83
data/README.md +389 -179
data/config/README.md +3 -0
data/config/webpacker.yml +1 -0
data/docs/deployment.md +9 -11
data/docs/developing_webpacker.md +29 -0
data/docs/troubleshooting.md +61 -25
data/docs/v6_upgrade.md +113 -0
data/gemfiles/Gemfile-rails.6.1.x +12 -0
data/lib/install/{javascript/packs/application.js → application.js} +2 -5
data/lib/install/bin/webpack +4 -7
data/lib/install/bin/yarn +18 -0
data/lib/install/config/webpack/base.js +3 -0
data/lib/install/config/webpack/development.js +2 -2
data/lib/install/config/webpack/production.js +2 -2
data/lib/install/config/webpack/test.js +2 -2
data/lib/install/config/webpacker.yml +21 -49
data/lib/install/package.json +15 -0
data/lib/install/template.rb +64 -29
data/lib/tasks/webpacker/binstubs.rake +6 -4
data/lib/tasks/webpacker/check_binstubs.rake +4 -4
data/lib/tasks/webpacker/check_node.rake +3 -0
data/lib/tasks/webpacker/check_yarn.rake +3 -0
data/lib/tasks/webpacker/clobber.rake +1 -1
data/lib/tasks/webpacker/compile.rake +4 -2
data/lib/tasks/webpacker/info.rake +12 -10
data/lib/tasks/webpacker/install.rake +6 -4
data/lib/tasks/webpacker/verify_config.rake +14 -0
data/lib/tasks/webpacker/verify_install.rake +1 -10
data/lib/tasks/webpacker/yarn_install.rake +9 -7
data/lib/tasks/webpacker.rake +2 -11
data/lib/tasks/yarn.rake +38 -0
data/lib/webpacker/commands.rb +21 -16
data/lib/webpacker/compiler.rb +16 -9
data/lib/webpacker/configuration.rb +8 -32
data/lib/webpacker/dev_server.rb +6 -0
data/lib/webpacker/dev_server_runner.rb +28 -4
data/lib/webpacker/helper.rb +47 -81
data/lib/webpacker/instance.rb +4 -0
data/lib/webpacker/manifest.rb +2 -3
data/lib/webpacker/railtie.rb +8 -2
data/lib/webpacker/runner.rb +1 -1
data/lib/webpacker/version.rb +1 -1
data/lib/webpacker/webpack_runner.rb +29 -3
data/lib/webpacker.rb +1 -1
data/package/__tests__/config.js +5 -37
data/package/__tests__/development.js +13 -21
data/package/__tests__/env.js +16 -4
data/package/__tests__/index.js +9 -0
data/package/__tests__/production.js +6 -6
data/package/__tests__/staging.js +7 -6
data/package/__tests__/test.js +4 -5
data/package/babel/preset.js +54 -0
data/package/config.js +6 -14
data/package/env.js +13 -4
data/package/environments/__tests__/base.js +20 -52
data/package/environments/base.js +68 -128
data/package/environments/development.js +49 -47
data/package/environments/production.js +66 -64
data/package/environments/test.js +2 -2
data/package/index.js +15 -8
data/package/inliningCss.js +7 -0
data/package/rules/babel.js +10 -8
data/package/rules/coffee.js +6 -0
data/package/rules/erb.js +15 -0
data/package/rules/file.js +21 -19
data/package/rules/index.js +16 -18
data/package/rules/less.js +22 -0
data/package/rules/raw.js +5 -0
data/package/rules/sass.js +9 -10
data/package/rules/stylus.js +26 -0
data/package/utils/get_style_rule.js +28 -36
data/package/utils/helpers.js +28 -35
data/package.json +18 -38
data/test/command_test.rb +76 -0
data/test/compiler_test.rb +0 -12
data/test/configuration_test.rb +4 -35
data/test/dev_server_runner_test.rb +36 -6
data/test/engine_rake_tasks_test.rb +39 -0
data/test/helper_test.rb +79 -77
data/test/manifest_test.rb +16 -0
data/test/mounted_app/Rakefile +4 -0
data/test/mounted_app/test/dummy/Rakefile +3 -0
data/test/mounted_app/test/dummy/bin/rails +3 -0
data/test/mounted_app/test/dummy/bin/rake +3 -0
data/test/mounted_app/test/dummy/config/application.rb +10 -0
data/test/mounted_app/test/dummy/config/environment.rb +3 -0
data/test/mounted_app/test/dummy/config/webpacker.yml +75 -0
data/test/mounted_app/test/dummy/config.ru +5 -0
data/test/mounted_app/test/dummy/package.json +7 -0
data/test/rake_tasks_test.rb +1 -10
data/test/test_app/app/{javascript/packs → packs/entrypoints}/application.js +1 -1
data/test/test_app/config/initializers/inspect_autoload_paths.rb +1 -0
data/test/test_app/config/webpacker.yml +5 -31
data/test/test_app/config/webpacker_other_location.yml +79 -0
data/test/test_app/config/webpacker_public_root.yml +0 -1
data/test/test_app/public/packs/manifest.json +36 -18
data/test/test_app/some.config.js +0 -0
data/test/webpack_runner_test.rb +9 -3
data/test/webpacker_test.rb +21 -0
data/webpacker.gemspec +2 -2
data/yarn.lock +1277 -4620
metadata +63 -92
data/docs/assets.md +0 -119
data/docs/cloud9.md +0 -310
data/docs/css.md +0 -308
data/docs/docker.md +0 -68
data/docs/engines.md +0 -213
data/docs/env.md +0 -63
data/docs/es6.md +0 -72
data/docs/folder-structure.md +0 -66
data/docs/integrations.md +0 -220
data/docs/misc.md +0 -23
data/docs/props.md +0 -223
data/docs/target.md +0 -22
data/docs/testing.md +0 -136
data/docs/typescript.md +0 -190
data/docs/v4-upgrade.md +0 -142
data/docs/webpack-dev-server.md +0 -92
data/docs/webpack.md +0 -364
data/docs/yarn.md +0 -23
data/lib/install/angular.rb +0 -23
data/lib/install/coffee.rb +0 -25
data/lib/install/config/.browserslistrc +0 -1
data/lib/install/config/babel.config.js +0 -82
data/lib/install/config/postcss.config.js +0 -12
data/lib/install/config/webpack/environment.js +0 -3
data/lib/install/elm.rb +0 -39
data/lib/install/erb.rb +0 -25
data/lib/install/examples/angular/hello_angular/app/app.component.ts +0 -9
data/lib/install/examples/angular/hello_angular/app/app.module.ts +0 -16
data/lib/install/examples/angular/hello_angular/index.ts +0 -8
data/lib/install/examples/angular/hello_angular/polyfills.ts +0 -73
data/lib/install/examples/angular/hello_angular.js +0 -7
data/lib/install/examples/coffee/hello_coffee.coffee +0 -4
data/lib/install/examples/elm/Main.elm +0 -55
data/lib/install/examples/elm/hello_elm.js +0 -16
data/lib/install/examples/erb/hello_erb.js.erb +0 -6
data/lib/install/examples/react/babel.config.js +0 -99
data/lib/install/examples/react/hello_react.jsx +0 -26
data/lib/install/examples/react/tsconfig.json +0 -21
data/lib/install/examples/stimulus/application.js +0 -1
data/lib/install/examples/stimulus/controllers/hello_controller.js +0 -18
data/lib/install/examples/stimulus/controllers/index.js +0 -9
data/lib/install/examples/svelte/app.svelte +0 -11
data/lib/install/examples/svelte/hello_svelte.js +0 -20
data/lib/install/examples/typescript/hello_typescript.ts +0 -4
data/lib/install/examples/typescript/tsconfig.json +0 -24
data/lib/install/examples/vue/app.vue +0 -22
data/lib/install/examples/vue/hello_vue.js +0 -72
data/lib/install/loaders/coffee.js +0 -6
data/lib/install/loaders/elm.js +0 -25
data/lib/install/loaders/erb.js +0 -11
data/lib/install/loaders/svelte.js +0 -9
data/lib/install/loaders/vue.js +0 -6
data/lib/install/react.rb +0 -18
data/lib/install/stimulus.rb +0 -12
data/lib/install/svelte.rb +0 -29
data/lib/install/typescript.rb +0 -39
data/lib/install/vue.rb +0 -49
data/lib/tasks/installers.rake +0 -42
data/package/config_types/__tests__/config_list.js +0 -118
data/package/config_types/__tests__/config_object.js +0 -43
data/package/config_types/config_list.js +0 -75
data/package/config_types/config_object.js +0 -55
data/package/config_types/index.js +0 -7
data/package/rules/module.css.js +0 -3
data/package/rules/module.sass.js +0 -8
data/package/rules/node_modules.js +0 -22
data/package/utils/__tests__/deep_assign.js +0 -32
data/package/utils/__tests__/deep_merge.js +0 -10
data/package/utils/__tests__/get_style_rule.js +0 -65
data/package/utils/__tests__/objectify.js +0 -9
data/package/utils/deep_assign.js +0 -22
data/package/utils/deep_merge.js +0 -22
data/package/utils/objectify.js +0 -3
/data/test/test_app/app/{javascript/packs → packs/entrypoints}/multi_entry.css +0 -0
/data/test/test_app/app/{javascript/packs → packs/entrypoints}/multi_entry.js +0 -0

data/lib/install/template.rb CHANGED Viewed

@@ -1,29 +1,23 @@
 # Install Webpacker
 copy_file "#{__dir__}/config/webpacker.yml", "config/webpacker.yml"
+copy_file "#{__dir__}/package.json", "package.json"
 say "Copying webpack core config"
 directory "#{__dir__}/config/webpack", "config/webpack"
-say "Copying postcss.config.js to app root directory"
-copy_file "#{__dir__}/config/postcss.config.js", "postcss.config.js"
-say "Copying babel.config.js to app root directory"
-copy_file "#{__dir__}/config/babel.config.js", "babel.config.js"
-say "Copying .browserslistrc to app root directory"
-copy_file "#{__dir__}/config/.browserslistrc", ".browserslistrc"
-if Dir.exist?(Webpacker.config.source_path)
-  say "The JavaScript app source directory already exists"
+if Dir.exists?(Webpacker.config.source_path)
+  say "The packs app source directory already exists"
 else
-  say "Creating JavaScript app source directory"
-  directory "#{__dir__}/javascript", Webpacker.config.source_path
+  say "Creating packs app source directory"
+  empty_directory "app/javascript"
+  copy_file "#{__dir__}/application.js", "app/javascript/application.js"
 end
 apply "#{__dir__}/binstubs.rb"
-if File.exist?(".gitignore")
-  append_to_file ".gitignore" do
+git_ignore_path = Rails.root.join(".gitignore")
+if File.exists?(git_ignore_path)
+  append_to_file git_ignore_path do
     "\n"                   +
     "/public/packs\n"      +
     "/public/packs-test\n" +
@@ -34,24 +28,62 @@ if File.exist?(".gitignore")
   end
 end
-if Webpacker::VERSION.match?(/^[0-9]+\.[0-9]+\.[0-9]+$/)
-  say "Installing all JavaScript dependencies [#{Webpacker::VERSION}]"
-  run "yarn add @rails/webpacker@#{Webpacker::VERSION}"
+if (app_layout_path = Rails.root.join("app/views/layouts/application.html.erb")).exist?
+  say "Add JavaScript include tag in application layout"
+  insert_into_file app_layout_path.to_s, %(\n    <%= javascript_pack_tag "application" %>), before: /\s*<\/head>/
 else
-  say "Installing all JavaScript dependencies [from prerelease rails/webpacker]"
-  run "yarn add @rails/webpacker@next"
+  say "Default application.html.erb is missing!", :red
+  say %(        Add <%= javascript_pack_tag "application" %> within the <head> tag in your custom layout.)
+end
+if (setup_path = Rails.root.join("bin/setup")).exist?
+  say "Run bin/yarn during bin/setup"
+  insert_into_file setup_path.to_s, <<-RUBY, after: %(  system("bundle check") || system!("bundle install")\n)
+  # Install JavaScript dependencies
+  system! "bin/yarn"
+RUBY
+end
+if (asset_config_path = Rails.root.join("config/initializers/assets.rb")).exist?
+  say "Add node_modules to the asset load path"
+  append_to_file asset_config_path, <<-RUBY
+# Add node_modules folder to the asset load path.
+Rails.application.config.assets.paths << Rails.root.join("node_modules")
+RUBY
+end
+if (csp_config_path = Rails.root.join("config/initializers/content_security_policy.rb")).exist?
+  say "Make note of webpack-dev-server exemption needed to csp"
+  insert_into_file csp_config_path, <<-RUBY, after: %(# Rails.application.config.content_security_policy do |policy|)
+  #   # If you are using webpack-dev-server then specify webpack-dev-server host
+  #   policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
+RUBY
 end
-package_json = File.read("#{__dir__}/../../package.json")
-webpack_version = package_json.match(/"webpack": "(.*)"/)[1]
-webpack_cli_version = package_json.match(/"webpack-cli": "(.*)"/)[1]
+results = []
+Dir.chdir(Rails.root) do
+  if Webpacker::VERSION.match?(/^[0-9]+\.[0-9]+\.[0-9]+$/)
+    say "Installing all JavaScript dependencies [#{Webpacker::VERSION}]"
+    results << run("yarn add @rails/webpacker@#{Webpacker::VERSION}")
+  else
+    say "Installing all JavaScript dependencies [from prerelease rails/webpacker]"
+    results << run("yarn add @rails/webpacker@next")
+  end
+  package_json = File.read("#{__dir__}/../../package.json")
+  webpack_version = package_json.match(/"webpack": "(.*)"/)[1]
+  webpack_cli_version = package_json.match(/"webpack-cli": "(.*)"/)[1]
-# needed for experimental Yarn 2 support and should not harm Yarn 1
-say "Installing webpack and webpack-cli as direct dependencies"
-run "yarn add webpack@#{webpack_version} webpack-cli@#{webpack_cli_version}"
+  # needed for experimental Yarn 2 support and should not harm Yarn 1
+  say "Installing webpack and webpack-cli as direct dependencies"
+  results << run("yarn add webpack@#{webpack_version} webpack-cli@#{webpack_cli_version}")
-say "Installing dev server for live reloading"
-run "yarn add --dev webpack-dev-server@^3"
+  say "Installing dev server for live reloading"
+  results << run("yarn add --dev webpack-dev-server @webpack-cli/serve")
+end
 if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR > 1
   say "You need to allow webpack-dev-server host as allowed origin for connect-src.", :yellow
@@ -60,4 +92,7 @@ if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR > 1
   say "policy.connect_src :self, :https, \"http://localhost:3035\", \"ws://localhost:3035\" if Rails.env.development?", :yellow
 end
-say "Webpacker successfully installed 🎉 🍰", :green
+unless results.all?
+  say "Webpacker installation failed 😭 See above for details.", :red
+  exit 1
+end

data/lib/tasks/webpacker/binstubs.rake CHANGED Viewed

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

data/lib/tasks/webpacker/check_binstubs.rake CHANGED Viewed

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

data/lib/tasks/webpacker/check_node.rake CHANGED Viewed

@@ -3,6 +3,9 @@ namespace :webpacker do
   desc "Verifies if Node.js is installed"
   task :check_node do
     begin
+      which_command = Gem.win_platform? ? "where" : "which"
+      raise Errno::ENOENT if `#{which_command} node || #{which_command} nodejs`.strip.empty?
       node_version = `node -v || nodejs -v`.strip
       raise Errno::ENOENT if node_version.blank?

data/lib/tasks/webpacker/check_yarn.rake CHANGED Viewed

@@ -3,6 +3,9 @@ namespace :webpacker do
   desc "Verifies if Yarn is installed"
   task :check_yarn do
     begin
+      which_command = Gem.win_platform? ? "where" : "which"
+      raise Errno::ENOENT if `#{which_command} yarn`.strip.empty?
       yarn_version = `yarn --version`.strip
       raise Errno::ENOENT if yarn_version.blank?

data/lib/tasks/webpacker/clobber.rake CHANGED Viewed

@@ -2,7 +2,7 @@ require "webpacker/configuration"
 namespace :webpacker do
   desc "Remove the webpack compiled output directory"
-  task clobber: ["webpacker:verify_install", :environment] do
+  task clobber: ["webpacker:verify_config", :environment] do
     Webpacker.clobber
     $stdout.puts "Removed webpack output path directory #{Webpacker.config.public_output_path}"
   end

data/lib/tasks/webpacker/compile.rake CHANGED Viewed

@@ -10,8 +10,10 @@ end
 def enhance_assets_precompile
   # yarn:install was added in Rails 5.1
   deps = yarn_install_available? ? [] : ["webpacker:yarn_install"]
-  Rake::Task["assets:precompile"].enhance(deps) do
-    Rake::Task["webpacker:compile"].invoke
+  Rake::Task["assets:precompile"].enhance(deps) do |task|
+    prefix = task.name.split(/#|assets:precompile/).first
+    Rake::Task["#{prefix}webpacker:compile"].invoke
   end
 end

data/lib/tasks/webpacker/info.rake CHANGED Viewed

@@ -3,17 +3,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`}"
+    Dir.chdir(Rails.root) 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 "\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'}"
+      $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
 end

data/lib/tasks/webpacker/install.rake CHANGED Viewed

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

data/lib/tasks/webpacker/verify_config.rake ADDED Viewed

@@ -0,0 +1,14 @@
+require "webpacker/configuration"
+namespace :webpacker do
+  desc "Verifies if the Webpacker config is present"
+  task :verify_config do
+    unless Webpacker.config.config_path.exist?
+      path = Webpacker.config.config_path.relative_path_from(Pathname.new(pwd)).to_s
+      $stderr.puts "Configuration #{path} file not found. \n"\
+           "Make sure webpacker:install is run successfully before " \
+           "running dependent tasks"
+      exit!
+    end
+  end
+end

data/lib/tasks/webpacker/verify_install.rake CHANGED Viewed

@@ -1,13 +1,4 @@
-require "webpacker/configuration"
 namespace :webpacker do
   desc "Verifies if Webpacker is installed"
-  task verify_install: [:check_node, :check_yarn, :check_binstubs] do
-    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"
-      exit!
-    end
-  end
+  task verify_install: [:verify_config, :check_node, :check_yarn, :check_binstubs]
 end

data/lib/tasks/webpacker/yarn_install.rake CHANGED Viewed

@@ -5,12 +5,14 @@ namespace :webpacker do
     node_env = ENV.fetch("NODE_ENV") do
       valid_node_envs.include?(Rails.env) ? Rails.env : "production"
     end
-    yarn_flags =
-      if `yarn --version`.start_with?("1")
-        "--no-progress --frozen-lockfile"
-      else
-        "--immutable"
-      end
-    system({ "NODE_ENV" => node_env }, "yarn install #{yarn_flags}")
+    Dir.chdir(Rails.root) do
+      yarn_flags =
+        if `yarn --version`.start_with?("1")
+          "--no-progress --frozen-lockfile"
+        else
+          "--immutable"
+        end
+      system({ "NODE_ENV" => node_env }, "yarn install #{yarn_flags}")
+    end
   end
 end

data/lib/tasks/webpacker.rake CHANGED Viewed

@@ -6,19 +6,10 @@ tasks = {
   "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 webpack & webpack-dev-server are present",
+  "webpacker:check_binstubs"          => "Verifies that bin/webpack is present",
   "webpacker:binstubs"                => "Installs Webpacker binstubs in this application",
   "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",
-  "webpacker:install:angular"         => "Installs and setup example Angular component",
-  "webpacker:install:elm"             => "Installs and setup example Elm component",
-  "webpacker:install:svelte"          => "Installs and setup example Svelte component",
-  "webpacker:install:stimulus"        => "Installs and setup example Stimulus component",
-  "webpacker:install:erb"             => "Installs Erb loader with an example",
-  "webpacker:install:coffee"          => "Installs CoffeeScript loader with an example",
-  "webpacker:install:typescript"      => "Installs Typescript loader with an example"
+  "webpacker:yarn_install"            => "Support for older Rails versions. Install all JavaScript dependencies as specified via Yarn"
 }.freeze
 desc "Lists all available tasks in Webpacker"

data/lib/tasks/yarn.rake ADDED Viewed

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+# Duplicate of the yarn tasks still present in Rails until Webpacker <5 have been deprecated
+namespace :yarn do
+  desc "Install all JavaScript dependencies as specified via Yarn"
+  task :install do
+    begin
+      # Install only production deps when for not usual envs.
+      valid_node_envs = %w[test development production]
+      node_env = ENV.fetch("NODE_ENV") do
+        valid_node_envs.include?(Rails.env) ? Rails.env : "production"
+      end
+      yarn_flags =
+        if `#{RbConfig.ruby} "#{Rails.root}/bin/yarn" --version`.start_with?("1")
+          "--no-progress --frozen-lockfile"
+        else
+          "--immutable"
+        end
+      system(
+        { "NODE_ENV" => node_env },
+        "#{RbConfig.ruby} \"#{Rails.root}/bin/yarn\" install #{yarn_flags}",
+        exception: true
+      )
+    rescue Errno::ENOENT
+      $stderr.puts "bin/yarn was not found."
+      $stderr.puts "Please run `bundle exec rails app:update:bin` to create it."
+      exit 1
+    end
+  end
+end
+# Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use.
+if Rake::Task.task_defined?("assets:precompile") && File.exist?(Rails.root.join("bin", "yarn"))
+  Rake::Task["assets:precompile"].enhance [ "yarn:install" ]
+end

data/lib/webpacker/commands.rb CHANGED Viewed

@@ -17,20 +17,21 @@ class Webpacker::Commands
   #
   def clean(count = 2, age = 3600)
     if config.public_output_path.exist? && config.public_manifest_path.exist?
-      versions
-        .sort
-        .reverse
-        .each_with_index
-        .drop_while do |(mtime, _), index|
-          max_age = [0, Time.now - Time.at(mtime)].max
-          max_age < age || index < count
+      packs
+        .map do |paths|
+          paths.map { |path| [Time.now - File.mtime(path), path] }
+          .sort
+          .reject.with_index do |(file_age, _), index|
+            file_age < age || index < count
+          end
+          .map { |_, path| path }
         end
-        .each do |(_, files), index|
-          files.each do |file|
-            if File.file?(file)
-              File.delete(file)
-              logger.info "Removed #{file}"
-            end
+        .flatten
+        .compact
+        .each do |file|
+          if File.file?(file)
+            File.delete(file)
+            logger.info "Removed #{file}"
           end
         end
     end
@@ -54,17 +55,21 @@ class Webpacker::Commands
   end
   private
-    def versions
+    def packs
       all_files       = Dir.glob("#{config.public_output_path}/**/*")
       manifest_config = Dir.glob("#{config.public_manifest_path}*")
       packs = all_files - manifest_config - current_version
-      packs.reject { |file| File.directory?(file) }.group_by { |file| File.mtime(file).utc.to_i }
+      packs.reject { |file| File.directory?(file) }.group_by do |path|
+        base, _, ext = File.basename(path).scan(/(.*)(-[\da-f]+)(\.\w+)/).flatten
+        "#{File.dirname(path)}/#{base}#{ext}"
+      end.values
     end
     def current_version
       packs = manifest.refresh.values.map do |value|
-        next if value.is_a?(Hash)
+        value = value["src"] if value.is_a?(Hash)
+        next unless value.is_a?(String)
         File.join(config.root_path, "public", "#{value}*")
       end.compact

data/lib/webpacker/compiler.rb CHANGED Viewed

@@ -28,14 +28,14 @@ class Webpacker::Compiler
         record_compilation_digest
       end
     else
-      logger.info "Everything's up-to-date. Nothing to do"
+      logger.debug "Everything's up-to-date. Nothing to do"
       true
     end
   end
   # Returns true if all the compiled packs are up to date with the underlying asset files.
   def fresh?
-    watched_files_digest == last_compilation_digest
+    last_compilation_digest&.== watched_files_digest
   end
   # Returns true if the compiled packs are out of date with the underlying asset files.
@@ -53,10 +53,11 @@ class Webpacker::Compiler
     def watched_files_digest
       warn "Webpacker::Compiler.watched_paths has been deprecated. Set additional_paths in webpacker.yml instead." unless watched_paths.empty?
-      files = Dir[*default_watched_paths, *watched_paths].reject { |f| File.directory?(f) }
-      file_ids = files.sort.map { |f| "#{File.basename(f)}/#{Digest::SHA1.file(f).hexdigest}" }
-      Digest::SHA1.hexdigest(file_ids.join("/"))
+      Dir.chdir File.expand_path(config.root_path) do
+        files = Dir[*default_watched_paths, *watched_paths].reject { |f| File.directory?(f) }
+        file_ids = files.sort.map { |f| "#{File.basename(f)}/#{Digest::SHA1.file(f).hexdigest}" }
+        Digest::SHA1.hexdigest(file_ids.join("/"))
+      end
     end
     def record_compilation_digest
@@ -64,12 +65,18 @@ class Webpacker::Compiler
       compilation_digest_path.write(watched_files_digest)
     end
+    def optionalRubyRunner
+      bin_webpack_path = config.root_path.join("bin/webpack")
+      first_line = File.readlines(bin_webpack_path).first.chomp
+      /ruby/.match?(first_line) ? RbConfig.ruby : ""
+    end
     def run_webpack
       logger.info "Compiling..."
       stdout, stderr, status = Open3.capture3(
         webpack_env,
-        "#{RbConfig.ruby} ./bin/webpack",
+        "#{optionalRubyRunner} ./bin/webpack",
         chdir: File.expand_path(config.root_path)
       )
@@ -90,8 +97,8 @@ class Webpacker::Compiler
     def default_watched_paths
       [
-        *config.additional_paths_globbed,
-        config.source_path_globbed,
+        *config.additional_paths,
+        "#{config.source_path}/**/*",
         "yarn.lock", "package.json",
         "config/webpack/**/*"
       ].freeze

data/lib/webpacker/configuration.rb CHANGED Viewed

@@ -23,16 +23,8 @@ class Webpacker::Configuration
     root_path.join(fetch(:source_path))
   end
-  def source_path_globbed
-    globbed_path_with_extensions(source_path.relative_path_from(root_path))
-  end
   def additional_paths
-    fetch(:additional_paths) + resolved_paths
-  end
-  def additional_paths_globbed
-    additional_paths.map { |p| globbed_path_with_extensions(p) }
+    fetch(:additional_paths)
   end
   def source_entry_path
@@ -59,35 +51,23 @@ class Webpacker::Configuration
     root_path.join(fetch(:cache_path))
   end
-  def extensions
-    fetch(:extensions)
-  end
   def check_yarn_integrity=(value)
-    warn "Webpacker::Configuration#check_yarn_integrity=(value) has been deprecated. The integrity check has been removed from Webpacker so changing this setting will have no effect."
+    warn <<~EOS
+      Webpacker::Configuration#check_yarn_integrity=(value) is obsolete. The integrity
+      check has been removed from Webpacker (https://github.com/rails/webpacker/pull/2518)
+      so changing this setting will have no effect.
+    EOS
   end
   def webpack_compile_output?
     fetch(:webpack_compile_output)
   end
-  def extract_css?
-    fetch(:extract_css)
+  def fetch(key)
+    data.fetch(key, defaults[key])
   end
   private
-    def resolved_paths
-      paths = data.fetch(:resolved_paths, [])
-      warn "The resolved_paths option has been deprecated. Use additional_paths instead." unless paths.empty?
-      paths
-    end
-    def fetch(key)
-      data.fetch(key, defaults[key])
-    end
     def data
       @data ||= load
     end
@@ -121,8 +101,4 @@ class Webpacker::Configuration
         HashWithIndifferentAccess.new(config[env])
       end
     end
-    def globbed_path_with_extensions(path)
-      "#{path}/**/*{#{extensions.join(',')}}"
-    end
 end

data/lib/webpacker/dev_server.rb CHANGED Viewed

@@ -51,12 +51,18 @@ class Webpacker::DevServer
     fetch(:pretty)
   end
+  def hmr?
+    fetch(:hmr)
+  end
   def env_prefix
     config.dev_server.fetch(:env_prefix, DEFAULT_ENV_PREFIX)
   end
   private
     def fetch(key)
+      return nil unless config.dev_server.present?
       ENV["#{env_prefix}_#{key.upcase}"] || config.dev_server.fetch(key, defaults[key])
     end