shakapacker 7.2.0.rc.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7c6cb64c439d97ec52580010225f4b2204ea652e281926da18b21be6c7ef545
-  data.tar.gz: 33adeb8d524cd2c08206bc1b06c3183cd44f469c7c44b453466ea149baceb30d
+  metadata.gz: ae742f19f77532f469332730b57bb1e381c6f238ace6cd5eb113a95f607bde68
+  data.tar.gz: 246d1e8dba39d501d219d1e37f4665c8b9f1ab401825173f22cbe270bf95a933
 SHA512:
-  metadata.gz: 22c9e5716abf6528ab34f652a6b145cb97897769b7c9f4da09f63b9090ce3a2faea507db94cc6fcd87cdf5be8bc60be0881ffd2f9f1f7a5d218d37d759021ffc
-  data.tar.gz: c3a299a84e15d15216d9e6e8c83513b6a9d0ca805587b80779e7e6b8bafd0e8f7090686a6fd82da1eecd829d25a68bf8df25ebf7bec1f82213918edb83953f92
+  metadata.gz: d57fc47ab68b52626fa66d643d5d62ceeb62fd27b707844c5b187c5ef4e29a15cbb8296a3bbb9204740ecd3769371c05c1ea6046ac2deffc7771bbf2b0839484
+  data.tar.gz: 5af5dc61cf4d3f01b17eaca403a8f09ae8a63fe3d2adffdb3dd91969c0e71684118ae0365a893a27690ed4275c03fb1d46a20b30fcb56f8821fdae44110b212e

data/.github/workflows/dummy.yml

@@ -10,6 +10,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           persist-credentials: false
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '16'
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.1.2'

data/CHANGELOG.md

@@ -11,6 +11,17 @@ _Please add entries here for your pull requests that are not yet released._
 
 ### Added
 - Experimental support for other JS package managers using `package_json` gem [PR 349](https://github.com/shakacode/shakapacker/pull/349) by [G-Rath](https://github.com/g-rath).
+- Support `hmr: only` configuration [PR 378](https://github.com/shakacode/shakapacker/pull/378) by [SimenB](https://github.com/SimenB).
+- Use `config/shakapacker.yml` as the secondary source for `asset_host` and `relative_url_root` configurations [PR 376](https://github.com/shakacode/shakapacker/pull/376) by [ahangarha](https://github.com/ahangarha).
+
+### Fixed
+- Recommend `server` option instead of deprecated `https` option when `--https` is provided [PR 380](https://github.com/shakacode/shakapacker/pull/380) by [G-Rath](https://github.com/g-rath)
+- Recompile assets on asset host change [PR 364](https://github.com/shakacode/shakapacker/pull/364) by [ahangarha](https://github.com/ahangarha).
+- Add deprecation warning for `https` option in `shakapacker.yml` (use `server: 'https'` instead) [PR 382](https://github.com/shakacode/shakapacker/pull/382) by [G-Rath](https://github.com/g-rath).
+- Disable Hot Module Replacement in `webpack-dev-server` when `hmr: false` [PR 392](https://github.com/shakacode/shakapacker/pull/392) by [thedanbob](https://github.com/thedanbob).
+
+### Deprecated
+- The usage of relative_url_root is deprecated in Shakapacker and will be removed in v8. [PR 376](https://github.com/shakacode/shakapacker/pull/376) by [ahangarha](https://github.com/ahangarha).
 
 ## [v7.1.0] - September 30, 2023
 

data/docs/v6_upgrade.md

@@ -168,5 +168,5 @@ _If you're on webpacker v5, follow [how to upgrade to webpacker v6.0.0.rc.6 from
 
 ## Examples of v5 to v6
 
-1. [React on Rails Project with HMR and SSR](https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/compare/webpacker-5.x...master)
+1. [React on Rails Project with HMR and SSR](https://github.com/shakacode/react_on_rails_tutorial_with_ssr_and_hmr_fast_refresh/compare/webpacker-5.x...61e897f2c604085f45b9ab5e23642501e430fb28)
 2. [Vue and Sass Example](https://github.com/guillaumebriday/upgrade-webpacker-5-to-6)

data/lib/install/config/shakapacker.yml

@@ -50,6 +50,11 @@ default: &default
   # https://webpack.js.org/guides/build-performance/#avoid-production-specific-tooling
   useContentHash: false
 
+  # Setting the asset host here will override Rails.application.config.asset_host.
+  # Here, you can set different asset_host per environment. Note that
+  # SHAKAPACKER_ASSET_HOST will override both configurations.
+  # asset_host: custom-path
+
 development:
   <<: *default
   compile: true
@@ -59,8 +64,6 @@ development:
   # Keys not described there are documented inline and in https://github.com/shakacode/shakapacker/
   dev_server:
     # For running dev server with https, set `server: https`.
-    # You may use `https: true` instead but notice that it is deprecated in favor of `server: https`
-    # Ensure only one of these entries is set.
     # server: https
 
     host: localhost

data/lib/shakapacker/configuration.rb

@@ -117,11 +117,19 @@ class Shakapacker::Configuration
   end
 
   def asset_host
-    ENV.fetch("SHAKAPACKER_ASSET_HOST", ActionController::Base.helpers.compute_asset_host)
+    ENV.fetch(
+      "SHAKAPACKER_ASSET_HOST",
+      fetch(:asset_host) || ActionController::Base.helpers.compute_asset_host
+    )
   end
 
   def relative_url_root
-    ENV.fetch("SHAKAPACKER_RELATIVE_URL_ROOT", ActionController::Base.relative_url_root)
+    Shakapacker.puts_deprecation_message "The usage of relative_url_root is deprecated in Shakapacker and will be removed in v8."
+
+    ENV.fetch(
+      "SHAKAPACKER_RELATIVE_URL_ROOT",
+      fetch(:relative_url_root) || ActionController::Base.relative_url_root
+    )
   end
 
   private

data/lib/shakapacker/dev_server.rb

@@ -31,7 +31,13 @@ class Shakapacker::DevServer
   end
 
   def https?
-    case fetch(:https)
+    value = fetch(:https)
+
+    unless value.nil?
+      puts "WARNING: `https: true` has been deprecated in favor of `server: 'https'`"
+    end
+
+    case value
     when true, "true", Hash
       true
     else

data/lib/shakapacker/dev_server_runner.rb

@@ -48,7 +48,7 @@ module Shakapacker
         end
 
         if @argv.include?("--https") && !@https
-          $stdout.puts "Please set https: true in shakapacker.yml to use the --https command line flag."
+          $stdout.puts "--https requires that 'server' in shakapacker.yml is set to 'https'"
           exit!
         end
       end
@@ -86,7 +86,10 @@ module Shakapacker
         cmd += ["--config", @webpack_config]
         cmd += ["--progress", "--color"] if @pretty
 
-        cmd += ["--hot"] if @hot
+        # Default behavior of webpack-dev-server is @hot = true
+        cmd += ["--hot", "only"] if @hot == "only"
+        cmd += ["--no-hot"] if !@hot
+
         cmd += @argv
 
         Dir.chdir(@app_path) do

data/lib/shakapacker/digest_strategy.rb

@@ -44,7 +44,9 @@ module Shakapacker
         end
         files = Dir[*expanded_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("/"))
+
+        asset_host = Shakapacker.config.asset_host.to_s
+        Digest::SHA1.hexdigest(file_ids.join("/").concat(asset_host))
       end
 
       def record_compilation_digest

data/lib/shakapacker/version.rb

@@ -1,4 +1,4 @@
 module Shakapacker
   # Change the version in package.json too, please!
-  VERSION = "7.2.0.rc.0".freeze
+  VERSION = "7.2.0".freeze
 end

data/package.json

@@ -1,40 +1,36 @@
 {
   "name": "shakapacker",
-  "version": "7.2.0-rc.0",
+  "version": "7.2.0",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
+  "homepage": "https://github.com/shakacode/shakapacker",
+  "bugs": {
+    "url": "https://github.com/shakacode/shakapacker/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/shakacode/shakapacker.git"
+  },
+  "license": "MIT",
+  "author": "David Heinemeier Hansson <david@basecamp.com>, Justin Gordon <justin@shakacode.com>",
   "main": "package/index.js",
   "types": "package/index.d.ts",
   "files": [
     "package",
     "lib/install/config/shakapacker.yml"
   ],
-  "engines": {
-    "node": "^12.13.0 || ^14 || >=16",
-    "yarn": ">=1 <5"
-  },
-  "peerDependencies": {
-    "@types/babel__core": "^7.0.0",
-    "@types/webpack": "^5.0.0",
-    "@babel/core": "^7.17.9",
-    "@babel/plugin-transform-runtime": "^7.17.0",
-    "@babel/preset-env": "^7.16.11",
-    "@babel/runtime": "^7.17.9",
-    "babel-loader": "^8.2.4 || ^9.0.0",
-    "compression-webpack-plugin": "^9.0.0 || ^10.0.0",
-    "terser-webpack-plugin": "^5.3.1",
-    "webpack": "^5.72.0",
-    "webpack-assets-manifest": "^5.0.6",
-    "webpack-cli": "^4.9.2 || ^5.0.0",
-    "webpack-dev-server": "^4.9.0",
-    "webpack-merge": "^5.8.0"
+  "scripts": {
+    "lint": "eslint package/",
+    "test": "jest"
   },
-  "peerDependenciesMeta": {
-    "@types/babel__core": {
-      "optional": true
-    },
-    "@types/webpack": {
-      "optional": true
-    }
+  "jest": {
+    "roots": [
+      "<rootDir>/package"
+    ],
+    "testPathIgnorePatterns": [
+      "/__fixtures__/",
+      "/__utils__/"
+    ],
+    "testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$"
   },
   "dependencies": {
     "glob": "^7.2.0",
@@ -59,31 +55,35 @@
     "webpack-assets-manifest": "^5.0.6",
     "webpack-merge": "^5.8.0"
   },
-  "jest": {
-    "testRegex": "(/__tests__/.*|(\\.|/))\\.jsx?$",
-    "testPathIgnorePatterns": [
-      "/__fixtures__/",
-      "/__utils__/"
-    ],
-    "roots": [
-      "<rootDir>/package"
-    ]
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "scripts": {
-    "test": "jest",
-    "lint": "eslint package/"
+  "peerDependencies": {
+    "@babel/core": "^7.17.9",
+    "@babel/plugin-transform-runtime": "^7.17.0",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/runtime": "^7.17.9",
+    "@types/babel__core": "^7.0.0",
+    "@types/webpack": "^5.0.0",
+    "babel-loader": "^8.2.4 || ^9.0.0",
+    "compression-webpack-plugin": "^9.0.0 || ^10.0.0",
+    "terser-webpack-plugin": "^5.3.1",
+    "webpack": "^5.72.0",
+    "webpack-assets-manifest": "^5.0.6",
+    "webpack-cli": "^4.9.2 || ^5.0.0",
+    "webpack-dev-server": "^4.9.0",
+    "webpack-merge": "^5.8.0"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/shakacode/shakapacker.git"
+  "peerDependenciesMeta": {
+    "@types/babel__core": {
+      "optional": true
+    },
+    "@types/webpack": {
+      "optional": true
+    }
   },
-  "author": "David Heinemeier Hansson <david@basecamp.com>, Justin Gordon <justin@shakacode.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/shakacode/shakapacker/issues"
+  "engines": {
+    "node": "^12.13.0 || ^14 || >=16",
+    "yarn": ">=1 <5"
   },
-  "homepage": "https://github.com/shakacode/shakapacker"
+  "publishConfig": {
+    "access": "public"
+  }
 }

data/spec/backward_compatibility_specs/dev_server_runner_spec.rb

@@ -45,19 +45,52 @@ describe "DevServerRunner" do
         verify_command(cmd, argv: (["--quiet"]))
       end
 
+      it "does not automatically pass the --https flag" do
+        cmd = package_json.manager.native_exec_command("webpack", ["serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js"])
+
+        allow(Shakapacker::DevServer).to receive(:new).and_return(
+          double(
+            host: "localhost",
+            port: "3035",
+            pretty?: false,
+            protocol: "https",
+            hmr?: true
+          )
+        )
+
+        verify_command(cmd)
+      end
+
       it "supports the https flag" do
         cmd = package_json.manager.native_exec_command("webpack", ["serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--https"])
 
-        dev_server = double()
-        allow(dev_server).to receive(:host).and_return("localhost")
-        allow(dev_server).to receive(:port).and_return("3035")
-        allow(dev_server).to receive(:pretty?).and_return(false)
-        allow(dev_server).to receive(:https?).and_return(true)
-        allow(dev_server).to receive(:hmr?).and_return(false)
+        allow(Shakapacker::DevServer).to receive(:new).and_return(
+          double(
+            host: "localhost",
+            port: "3035",
+            pretty?: false,
+            protocol: "https",
+            hmr?: true
+          )
+        )
+
+        verify_command(cmd, argv: ["--https"])
+      end
+
+      it "supports disabling hot module reloading" do
+        cmd = package_json.manager.native_exec_command("webpack", ["serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--no-hot"])
+
+        allow(Shakapacker::DevServer).to receive(:new).and_return(
+          double(
+            host: "localhost",
+            port: "3035",
+            pretty?: false,
+            protocol: "http",
+            hmr?: false
+          )
+        )
 
-        allow(Shakapacker::DevServer).to receive(:new) do
-          verify_command(cmd, argv: (["--https"]))
-        end.and_return(dev_server)
+        verify_command(cmd)
       end
 
       it "accepts environment variables" do
@@ -94,19 +127,52 @@ describe "DevServerRunner" do
       verify_command(cmd, argv: (["--quiet"]))
     end
 
+    it "does not automatically pass the --https flag" do
+      cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js"]
+
+      allow(Shakapacker::DevServer).to receive(:new).and_return(
+        double(
+          host: "localhost",
+          port: "3035",
+          pretty?: false,
+          protocol: "https",
+          hmr?: true
+        )
+      )
+
+      verify_command(cmd)
+    end
+
     it "supports the https flag" do
       cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--https"]
 
-      dev_server = double()
-      allow(dev_server).to receive(:host).and_return("localhost")
-      allow(dev_server).to receive(:port).and_return("3035")
-      allow(dev_server).to receive(:pretty?).and_return(false)
-      allow(dev_server).to receive(:https?).and_return(true)
-      allow(dev_server).to receive(:hmr?).and_return(false)
+      allow(Shakapacker::DevServer).to receive(:new).and_return(
+        double(
+          host: "localhost",
+          port: "3035",
+          pretty?: false,
+          protocol: "https",
+          hmr?: true
+        )
+      )
+
+      verify_command(cmd, argv: ["--https"])
+    end
+
+    it "supports disabling hot module reloading" do
+      cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--no-hot"]
+
+      allow(Shakapacker::DevServer).to receive(:new).and_return(
+        double(
+          host: "localhost",
+          port: "3035",
+          pretty?: false,
+          protocol: "http",
+          hmr?: false
+        )
+      )
 
-      allow(Shakapacker::DevServer).to receive(:new) do
-        verify_command(cmd, argv: (["--https"]))
-      end.and_return(dev_server)
+      verify_command(cmd)
     end
 
     it "accepts environment variables" do

data/spec/backward_compatibility_specs/digest_strategy_spec.rb

@@ -9,6 +9,7 @@ describe "DigestStrategy" do
 
   before :all do
     @digest_strategy = Webpacker::DigestStrategy.new
+    ENV["SHAKAPACKER_ASSET_HOST"] = nil
     remove_compilation_digest_path
   end
 

data/spec/backward_compatibility_specs/webpacker_test_app/config/webpacker.yml

@@ -48,7 +48,7 @@ development:
     host: localhost
     port: 3035
     public: localhost:3035
-    hmr: false
+    hmr: true
     overlay: true
     disable_host_check: true
     use_local_ip: false

data/spec/backward_compatibility_specs/webpacker_test_app/config/webpacker_other_location.yml

@@ -42,7 +42,7 @@ development:
     host: localhost
     port: 3035
     public: localhost:3035
-    hmr: false
+    hmr: true
     # If HMR is on, CSS will by inlined by delivering it as part of the script payload via style-loader. Be sure
     # that you add style-loader to your project dependencies.
     #

data/spec/dummy/Gemfile

@@ -46,8 +46,6 @@ group :test do
   gem "capybara", "~> 3.39.1"
   # gem 'capybara-webkit'
   gem "selenium-webdriver", ">= 4.9"
-  # Easy installation and use of web drivers to run system tests with browsers
-  gem "webdrivers"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

data/spec/dummy/package.json

@@ -39,6 +39,5 @@
     "fork-ts-checker-webpack-plugin": "^6.5.2",
     "react-refresh": "^0.14.0",
     "webpack-dev-server": "^4.9.2"
-  },
-  "packageManager": "yarn@3.2.1"
+  }
 }

data/spec/shakapacker/compiler_spec.rb

@@ -50,14 +50,10 @@ describe "Shakapacker::Compiler" do
     expect(Shakapacker.compiler.send(:webpack_env)["SHAKAPACKER_ASSET_HOST"]).to be nil
     expect(Shakapacker.compiler.send(:webpack_env)["SHAKAPACKER_RELATIVE_URL_ROOT"]).to be nil
 
-    custom_env_variables = {
-      "SHAKAPACKER_ASSET_HOST" => "foo.bar",
-      "SHAKAPACKER_RELATIVE_URL_ROOT" => "/baz"
-    }
-
-    with_env_variable(custom_env_variables) do
-      expect(Shakapacker.compiler.send(:webpack_env)["SHAKAPACKER_ASSET_HOST"]).to eq "foo.bar"
-      expect(Shakapacker.compiler.send(:webpack_env)["SHAKAPACKER_RELATIVE_URL_ROOT"]).to eq "/baz"
-    end
+    allow(ENV).to receive(:fetch).with("SHAKAPACKER_ASSET_HOST", nil).and_return("foo.bar")
+    allow(ENV).to receive(:fetch).with("SHAKAPACKER_RELATIVE_URL_ROOT", nil).and_return("/baz")
+
+    expect(Shakapacker.compiler.send(:webpack_env)["SHAKAPACKER_ASSET_HOST"]).to eq "foo.bar"
+    expect(Shakapacker.compiler.send(:webpack_env)["SHAKAPACKER_RELATIVE_URL_ROOT"]).to eq "/baz"
   end
 end

data/spec/shakapacker/configuration_spec.rb

@@ -341,16 +341,35 @@ describe "Shakapacker::Configuration" do
     end
 
     it "returns the value of SHAKAPACKER_ASSET_HOST if set" do
-      with_env_variable("SHAKAPACKER_ASSET_HOST" => "custom_host.abc") do
-        expect(config.asset_host).to eq "custom_host.abc"
-      end
+      expect(ENV).to receive(:fetch).with("SHAKAPACKER_ASSET_HOST", nil).and_return("custom_host.abc")
+
+      expect(config.asset_host).to eq "custom_host.abc"
     end
 
-    it "returns ActionController::Base.helpers.compute_asset_host if SHAKAPACKER_ASSET_HOST is not set" do
-      allow(ActionController::Base.helpers).to receive(:compute_asset_host).and_return("domain.abc")
+    context "without SHAKAPACKER_ASSET_HOST set" do
+      it "returns asset_host in shakapacker.yml if set" do
+        expect(config).to receive(:fetch).with(:asset_host).and_return("value-in-config-file.com")
+        expect(ENV).to receive(:fetch).with("SHAKAPACKER_ASSET_HOST", "value-in-config-file.com").and_return("value-in-config-file.com")
+
+        expect(config.asset_host).to eq "value-in-config-file.com"
+      end
+
+      context "without asset_host set in the shakapacker.yml" do
+        it "returns ActionController::Base.helpers.compute_asset_host if SHAKAPACKER_ASSET_HOST is not set" do
+          expect(config).to receive(:fetch).with(:asset_host).and_return(nil)
+          expect(ActionController::Base.helpers).to receive(:compute_asset_host).and_return("domain.abc")
+          allow(ENV).to receive(:fetch).with("SHAKAPACKER_ASSET_HOST", "domain.abc").and_return("domain.abc")
 
-      with_env_variable("SHAKAPACKER_ASSET_HOST" => nil) do
-        expect(config.asset_host).to eq "domain.abc"
+          expect(config.asset_host).to eq "domain.abc"
+        end
+
+        context "without ActionController::Base.helpers.compute_asset_host returing any value" do
+          it "returns nil" do
+            expect(ENV).to receive(:fetch).with("SHAKAPACKER_ASSET_HOST", nil).and_return(nil)
+
+            expect(config.asset_host).to be nil
+          end
+        end
       end
     end
   end
@@ -364,17 +383,39 @@ describe "Shakapacker::Configuration" do
       )
     end
 
+    it "shows deprecation message" do
+      expect { config.relative_url_root }.to output(/deprecated/).to_stdout
+    end
+
     it "returns the value of SHAKAPACKER_RELATIVE_URL_ROOT if set" do
-      with_env_variable("SHAKAPACKER_RELATIVE_URL_ROOT" => "custom_value") do
-        expect(config.relative_url_root).to eq "custom_value"
-      end
+      expect(ENV).to receive(:fetch).with("SHAKAPACKER_RELATIVE_URL_ROOT", nil).and_return("custom_value")
+
+      expect(config.relative_url_root).to eq "custom_value"
     end
 
-    it "returns ActionController::Base.helpers.compute_asset_host if SHAKAPACKER_RELATIVE_URL_ROOT is not set" do
-      allow(ActionController::Base).to receive(:relative_url_root).and_return("abcd")
+    context "without SHAKAPACKER_RELATIVE_URL_ROOT set" do
+      it "returns relative_url_root in shakapacker.yml if set" do
+        expect(config).to receive(:fetch).with(:relative_url_root).and_return("value-in-config-file")
+        expect(ENV).to receive(:fetch).with("SHAKAPACKER_RELATIVE_URL_ROOT", "value-in-config-file").and_return("value-in-config-file")
+
+        expect(config.relative_url_root).to eq "value-in-config-file"
+      end
+
+      context "without relative_url_root set in the shakapacker.yml" do
+        it "returns ActionController::Base.relative_url_root if SHAKAPACKER_RELATIVE_URL_ROOT is not set" do
+          expect(ActionController::Base).to receive(:relative_url_root).and_return("abcd")
+          expect(ENV).to receive(:fetch).with("SHAKAPACKER_RELATIVE_URL_ROOT", "abcd").and_return("abcd")
+
+          expect(config.relative_url_root).to eq "abcd"
+        end
 
-      with_env_variable("SHAKAPACKER_RELATIVE_URL_ROOT" => nil) do
-        expect(config.relative_url_root).to eq "abcd"
+        context "without ActionController::Base.relative_url_root returing any value" do
+          it "returns an empty string" do
+            expect(ENV).to receive(:fetch).with("SHAKAPACKER_RELATIVE_URL_ROOT", nil).and_return(nil)
+
+            expect(config.relative_url_root).to be nil
+          end
+        end
       end
     end
   end

data/spec/shakapacker/dev_server_runner_spec.rb

@@ -44,19 +44,52 @@ describe "DevServerRunner" do
         verify_command(cmd, argv: (["--quiet"]))
       end
 
+      it "does not automatically pass the --https flag" do
+        cmd = package_json.manager.native_exec_command("webpack", ["serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js"])
+
+        allow(Shakapacker::DevServer).to receive(:new).and_return(
+          double(
+            host: "localhost",
+            port: "3035",
+            pretty?: false,
+            protocol: "https",
+            hmr?: true
+          )
+        )
+
+        verify_command(cmd)
+      end
+
       it "supports the https flag" do
         cmd = package_json.manager.native_exec_command("webpack", ["serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--https"])
 
-        dev_server = double()
-        allow(dev_server).to receive(:host).and_return("localhost")
-        allow(dev_server).to receive(:port).and_return("3035")
-        allow(dev_server).to receive(:pretty?).and_return(false)
-        allow(dev_server).to receive(:https?).and_return(true)
-        allow(dev_server).to receive(:hmr?).and_return(false)
+        allow(Shakapacker::DevServer).to receive(:new).and_return(
+          double(
+            host: "localhost",
+            port: "3035",
+            pretty?: false,
+            protocol: "https",
+            hmr?: true
+          )
+        )
+
+        verify_command(cmd, argv: ["--https"])
+      end
+
+      it "supports disabling hot module reloading" do
+        cmd = package_json.manager.native_exec_command("webpack", ["serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--no-hot"])
+
+        allow(Shakapacker::DevServer).to receive(:new).and_return(
+          double(
+            host: "localhost",
+            port: "3035",
+            pretty?: false,
+            protocol: "http",
+            hmr?: false
+          )
+        )
 
-        allow(Shakapacker::DevServer).to receive(:new) do
-          verify_command(cmd, argv: (["--https"]))
-        end.and_return(dev_server)
+        verify_command(cmd)
       end
 
       it "accepts environment variables" do
@@ -92,19 +125,68 @@ describe "DevServerRunner" do
       verify_command(cmd, argv: (["--quiet"]))
     end
 
+    it "does not automatically pass the --https flag" do
+      cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js"]
+
+      allow(Shakapacker::DevServer).to receive(:new).and_return(
+        double(
+          host: "localhost",
+          port: "3035",
+          pretty?: false,
+          protocol: "https",
+          hmr?: true
+        )
+      )
+
+      verify_command(cmd)
+    end
+
     it "supports the https flag" do
       cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--https"]
 
-      dev_server = double()
-      allow(dev_server).to receive(:host).and_return("localhost")
-      allow(dev_server).to receive(:port).and_return("3035")
-      allow(dev_server).to receive(:pretty?).and_return(false)
-      allow(dev_server).to receive(:https?).and_return(true)
-      allow(dev_server).to receive(:hmr?).and_return(false)
+      allow(Shakapacker::DevServer).to receive(:new).and_return(
+        double(
+          host: "localhost",
+          port: "3035",
+          pretty?: false,
+          protocol: "https",
+          hmr?: true
+        )
+      )
+
+      verify_command(cmd, argv: ["--https"])
+    end
+
+    it "supports disabling hot module reloading" do
+      cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--no-hot"]
+
+      allow(Shakapacker::DevServer).to receive(:new).and_return(
+        double(
+          host: "localhost",
+          port: "3035",
+          pretty?: false,
+          protocol: "http",
+          hmr?: false
+        )
+      )
+
+      verify_command(cmd)
+    end
+
+    it "supports --hot being 'only'" do
+      cmd = ["#{test_app_path}/node_modules/.bin/webpack", "serve", "--config", "#{test_app_path}/config/webpack/webpack.config.js", "--hot", "only"]
+
+      allow(Shakapacker::DevServer).to receive(:new).and_return(
+        double(
+          host: "localhost",
+          port: "3035",
+          pretty?: false,
+          protocol: "http",
+          hmr?: "only"
+        )
+      )
 
-      allow(Shakapacker::DevServer).to receive(:new) do
-        verify_command(cmd, argv: (["--https"]))
-      end.and_return(dev_server)
+      verify_command(cmd)
     end
 
     it "accepts environment variables" do

data/spec/shakapacker/digest_strategy_spec.rb

@@ -28,7 +28,29 @@ describe "DigestStrategy" do
     expect(@digest_strategy.fresh?).to be true
   end
 
+  it "is stale when host changes" do
+    allow(ENV).to receive(:fetch).with("SHAKAPACKER_ASSET_HOST", nil).and_return("old-host")
+    # Record the digests for old-host
+    @digest_strategy.after_compile_hook
+
+    allow(ENV).to receive(:fetch).with("SHAKAPACKER_ASSET_HOST", nil).and_return("new-host")
+    expect(@digest_strategy.stale?).to be true
+    expect(@digest_strategy.fresh?).to be_falsey
+  end
+
   it "generates correct compilation_digest_path" do
+    allow(ENV).to receive(:fetch).with("SHAKAPACKER_ASSET_HOST", nil).and_return("custom-path")
+
+    actual_path = @digest_strategy.send(:compilation_digest_path).basename.to_s
+    host_hash = Digest::SHA1.hexdigest("custom-path")
+    expected_path = "last-compilation-digest-#{Shakapacker.env}"
+
+    expect(actual_path).to eq expected_path
+  end
+
+  it "generates correct compilation_digest_path without the digest of the asset host if asset host is not set" do
+    allow(ENV).to receive(:fetch).with("SHAKAPACKER_ASSET_HOST", nil).and_return(nil)
+
     actual_path = @digest_strategy.send(:compilation_digest_path).basename.to_s
     expected_path = "last-compilation-digest-#{Shakapacker.env}"
 

data/spec/shakapacker/spec_helper_initializer.rb

@@ -22,21 +22,3 @@ ensure
   Rails.env = ActiveSupport::StringInquirer.new(original)
   reloaded_config
 end
-
-# Temportarily set env variables to a custom value
-# arg: a hash with key:value for each custom env
-#      Keys could be string or symbol
-def with_env_variable(custom_env_hash)
-  original_env = {}
-  custom_env_hash.each do |key, new_value|
-    upcased_key = key.to_s.upcase
-    original_env[upcased_key] = new_value
-    ENV[upcased_key] = new_value
-  end
-
-  yield
-ensure
-  original_env.each do |key, original_value|
-    ENV[key] = original_value
-  end
-end

data/spec/shakapacker/test_app/config/shakapacker.yml

@@ -47,7 +47,7 @@ development:
     host: localhost
     port: 3035
     public: localhost:3035
-    hmr: false
+    hmr: true
     overlay: true
     disable_host_check: true
     use_local_ip: false

data/spec/shakapacker/test_app/config/shakapacker_other_location.yml

@@ -42,7 +42,7 @@ development:
     host: localhost
     port: 3035
     public: localhost:3035
-    hmr: false
+    hmr: true
     # If HMR is on, CSS will by inlined by delivering it as part of the script payload via style-loader. Be sure
     # that you add style-loader to your project dependencies.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 7.2.0.rc.0
+  version: 7.2.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-31 00:00:00.000000000 Z
+date: 2023-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -566,7 +566,7 @@ homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v7.2.0-rc.0
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v7.2.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -578,9 +578,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.12
 signing_key: