webpacker 6.0.0.rc.3 → 6.0.0.rc.6

data/lib/install/template.rb

@@ -9,7 +9,8 @@ if Dir.exists?(Webpacker.config.source_path)
   say "The packs app source directory already exists"
 else
   say "Creating packs app source directory"
-  directory "#{__dir__}/packs", Webpacker.config.source_path
+  empty_directory "app/javascript"
+  copy_file "#{__dir__}/application.js", "app/javascript/application.js"
 end
 
 apply "#{__dir__}/binstubs.rb"
@@ -53,6 +54,14 @@ 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
+
 results = []
 
 Dir.chdir(Rails.root) do

data/lib/tasks/yarn.rake

@@ -5,28 +5,30 @@
 namespace :yarn do
   desc "Install all JavaScript dependencies as specified via Yarn"
   task :install do
-    # 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"
+    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
 
-    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
+      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
 

data/lib/webpacker/dev_server_runner.rb

@@ -65,7 +65,7 @@ module Webpacker
       def execute_cmd
         env = Webpacker::Compiler.env
         env["WEBPACKER_CONFIG"] = @webpacker_config
-        env["WEBPACK_DEV_SERVER"] = "true"
+        env["WEBPACK_SERVE"] = "true"
 
         cmd = if node_modules_bin_exist?
           ["#{@node_modules_bin_path}/webpack", "serve"]

data/lib/webpacker/railtie.rb

@@ -51,4 +51,11 @@ class Webpacker::Engine < ::Rails::Engine
       app.config.javascript_path = Webpacker.config.source_path.relative_path_from(Rails.root.join("app")).to_s
     end
   end
+
+  initializer "webpacker.remove_app_packs_from_the_autoload_paths" do
+    Rails.application.config.before_initialize do
+      source_path = Webpacker.config.source_path.to_s
+      ActiveSupport::Dependencies.autoload_paths.delete(source_path)
+    end
+  end
 end

data/lib/webpacker/version.rb

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

data/lib/webpacker/webpack_runner.rb

@@ -3,6 +3,19 @@ require "webpacker/runner"
 
 module Webpacker
   class WebpackRunner < Webpacker::Runner
+    WEBPACK_COMMANDS = [
+      "help",
+      "h",
+      "--help",
+      "-h",
+      "version",
+      "v",
+      "--version",
+      "-v",
+      "info",
+      "i"
+    ].freeze
+
     def run
       env = Webpacker::Compiler.env
       env["WEBPACKER_CONFIG"] = @webpacker_config
@@ -13,17 +26,24 @@ module Webpacker
         ["yarn", "webpack"]
       end
 
-      if @argv.include?("--debug-webpacker")
-        cmd = [ "node", "--inspect-brk"] + cmd
-        @argv.delete "--debug-webpacker"
+      if @argv.delete "--debug-webpacker"
+        cmd = ["node", "--inspect-brk"] + cmd
+      end
+
+      if @argv.delete "--trace-deprecation"
+        cmd = ["node", "--trace-deprecation"] + cmd
+      end
+
+      if @argv.delete "--no-deprecation"
+        cmd = ["node", "--no-deprecation"] + cmd
       end
 
-      if @argv.include?("--trace-deprecation")
-        cmd = [ "node", "--trace-deprecation"] + cmd
-        @argv.delete "--trace-deprecation"
+      # Webpack commands are not compatible with --config option.
+      if (@argv & WEBPACK_COMMANDS).empty?
+        cmd += ["--config", @webpack_config]
       end
 
-      cmd += ["--config", @webpack_config] + @argv
+      cmd += @argv
 
       Dir.chdir(@app_path) do
         Kernel.exec env, *cmd

data/package/__tests__/development.js

@@ -11,27 +11,20 @@ describe('Development environment', () => {
   describe('webpackConfig', () => {
     beforeEach(() => jest.resetModules())
 
-    test('should use development config and environment including devServer if WEBPACK_DEV_SERVER', () => {
+    test('should use development config and environment including devServer if WEBPACK_SERVE', () => {
       process.env.RAILS_ENV = 'development'
       process.env.NODE_ENV = 'development'
-      process.env.WEBPACK_DEV_SERVER = 'true'
+      process.env.WEBPACK_SERVE = 'true'
       const { webpackConfig } = require('../index')
 
       expect(webpackConfig.output.path).toEqual(resolve('public', 'packs'))
       expect(webpackConfig.output.publicPath).toEqual('/packs/')
-      expect(webpackConfig).toMatchObject({
-        devServer: {
-          host: 'localhost',
-          port: 3035,
-          hot: false
-        }
-      })
     })
 
-    test('should use development config and environment if WEBPACK_DEV_SERVER', () => {
+    test('should use development config and environment if WEBPACK_SERVE', () => {
       process.env.RAILS_ENV = 'development'
       process.env.NODE_ENV = 'development'
-      process.env.WEBPACK_DEV_SERVER = undefined
+      process.env.WEBPACK_SERVE = undefined
       const { webpackConfig } = require('../index')
 
       expect(webpackConfig.output.path).toEqual(resolve('public', 'packs'))

data/package/env.js

@@ -16,10 +16,7 @@ const config = load(readFileSync(configPath), 'utf8')
 const availableEnvironments = Object.keys(config).join('|')
 const regex = new RegExp(`^(${availableEnvironments})$`, 'g')
 
-// v4 of webpack-dev-server will switch to WEBPACK_DEV_SERVE
-// https://github.com/rails/webpacker/issues/3057
-const runningWebpackDevServer = process.env.WEBPACK_DEV_SERVER === 'true' ||
-  process.env.WEBPACK_DEV_SERVE === 'true'
+const runningWebpackDevServer = process.env.WEBPACK_SERVE === 'true'
 
 module.exports = {
   railsEnv: railsEnv && railsEnv.match(regex) ? railsEnv : DEFAULT,

data/package/environments/base.js

@@ -16,7 +16,7 @@ const getEntryObject = () => {
   const entries = {}
   const rootPath = join(config.source_path, config.source_entry_path)
 
-  globSync(`${rootPath}/**/*.*`).forEach((path) => {
+  globSync(`${rootPath}/*.*`).forEach((path) => {
     const namespace = relative(join(rootPath), dirname(path))
     const name = join(namespace, basename(path, extname(path)))
     let assetPaths = resolve(path)

data/package/environments/development.js

@@ -12,11 +12,7 @@ let devConfig = {
 }
 
 if (runningWebpackDevServer) {
-  if (devServer.hmr) {
-    devConfig = merge(devConfig, {
-      output: { filename: '[name]-[hash].js' }
-    })
-  }
+  const liveReload = devServer.live_reload !== undefined ? devServer.live_reload : !devServer.hmr
 
   const devServerConfig = {
     devMiddleware: {
@@ -28,7 +24,7 @@ if (runningWebpackDevServer) {
     port: devServer.port,
     https: devServer.https,
     hot: devServer.hmr,
-    liveReload: !devServer.hmr,
+    liveReload,
     historyApiFallback: { disableDotRule: true },
     headers: devServer.headers,
     static: {

data/package/rules/file.js

@@ -18,6 +18,6 @@ module.exports = {
   exclude: [/\.(js|mjs|jsx|ts|tsx)$/],
   type: 'asset/resource',
   generator: {
-    filename: 'static/[hash][ext][query]'
+    filename: 'static/[name]-[hash][ext][query]'
   }
 }

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rails/webpacker",
-  "version": "6.0.0-rc.3",
+  "version": "6.0.0-rc.6",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "main": "package/index.js",
   "files": [
@@ -12,32 +12,32 @@
     "yarn": ">=1 <4"
   },
   "dependencies": {
-    "@babel/core": "^7.15.0",
+    "@babel/core": "^7.15.5",
     "@babel/plugin-proposal-class-properties": "^7.14.5",
     "@babel/plugin-transform-runtime": "^7.15.0",
-    "@babel/preset-env": "^7.15.0",
-    "@babel/runtime": "^7.15.3",
+    "@babel/preset-env": "^7.15.6",
+    "@babel/runtime": "^7.15.4",
     "babel-loader": "^8.2.2",
-    "compression-webpack-plugin": "^8.0.1",
-    "glob": "^7.1.7",
+    "compression-webpack-plugin": "^9.0.0",
+    "glob": "^7.2.0",
     "js-yaml": "^4.1.0",
     "path-complete-extname": "^1.0.0",
     "pnp-webpack-plugin": "^1.7.0",
-    "terser-webpack-plugin": "^5.1.4",
-    "webpack": "^5.51.1",
+    "terser-webpack-plugin": "^5.2.4",
+    "webpack": "^5.53.0",
     "webpack-assets-manifest": "^5.0.6",
     "webpack-cli": "^4.8.0",
     "webpack-merge": "^5.8.0",
-    "webpack-sources": "^3.2.0"
+    "webpack-sources": "^3.2.1"
   },
   "devDependencies": {
     "eslint": "^7.32.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.24.1",
+    "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.24.0",
-    "jest": "^27.0.6"
+    "eslint-plugin-react": "^7.26.0",
+    "jest": "^27.2.1"
   },
   "jest": {
     "testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$",

data/test/dev_server_runner_test.rb

@@ -50,7 +50,7 @@ class DevServerRunnerTest < Webpacker::Test
     cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/development.js"]
     env = Webpacker::Compiler.env.dup
     ENV["WEBPACKER_CONFIG"] = env["WEBPACKER_CONFIG"] = "#{test_app_path}/config/webpacker_other_location.yml"
-    env["WEBPACK_DEV_SERVER"] = "true"
+    env["WEBPACK_SERVE"] = "true"
     verify_command(cmd, env: env)
   end
 

data/test/test_app/config/initializers/inspect_autoload_paths.rb

@@ -0,0 +1 @@
+$test_app_autoload_paths_in_initializer = ActiveSupport::Dependencies.autoload_paths

data/test/webpacker_test.rb

@@ -27,4 +27,8 @@ class WebpackerTest < Webpacker::Test
       assert Webpacker.inlining_css?
     end
   end
+
+  def test_app_autoload_paths_cleanup
+    assert_empty $test_app_autoload_paths_in_initializer
+  end
 end

data/webpacker.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
     "changelog_uri"   => "https://github.com/rails/webpacker/blob/v#{Webpacker::VERSION}/CHANGELOG.md"
   }
 
-  s.required_ruby_version = ">= 2.4.0"
+  s.required_ruby_version = ">= 2.7.0"
 
   s.add_dependency "activesupport", ">= 5.2"
   s.add_dependency "railties",      ">= 5.2"