shakapacker 7.2.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae742f19f77532f469332730b57bb1e381c6f238ace6cd5eb113a95f607bde68
-  data.tar.gz: 246d1e8dba39d501d219d1e37f4665c8b9f1ab401825173f22cbe270bf95a933
+  metadata.gz: 1e486b8d36133595f767f26dd8461b1b57fbea6daeba86eaa79b2f3ffcf7dbd2
+  data.tar.gz: 94b19f6397652a9abbfc3e80ef51ead55d0aec78191ab7bd36383e3ae37f5fce
 SHA512:
-  metadata.gz: d57fc47ab68b52626fa66d643d5d62ceeb62fd27b707844c5b187c5ef4e29a15cbb8296a3bbb9204740ecd3769371c05c1ea6046ac2deffc7771bbf2b0839484
-  data.tar.gz: 5af5dc61cf4d3f01b17eaca403a8f09ae8a63fe3d2adffdb3dd91969c0e71684118ae0365a893a27690ed4275c03fb1d46a20b30fcb56f8821fdae44110b212e
+  metadata.gz: 328d290b9d5bf040aea4239675196975569fb0606e1d93c49bdaf73b0b87d5d2267b3f1069ff26297991016e1c6aad5a8d9fad782bfa17a4898cac95cf421d6d
+  data.tar.gz: d3067ddec4711898c5a0dcc63b854372917600ecb2019b57c4153bd2a16bf24ce56ec015de3023f46980f7a660ee25e610623339a5b49b1f0e342cbb7dfbead4

data/.github/workflows/dummy.yml

@@ -1,6 +1,10 @@
 name: Dummy specs
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
 
 jobs:
   test:

data/.github/workflows/generator.yml

@@ -1,6 +1,10 @@
 name: Generator specs
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
 
 jobs:
   test:
@@ -35,6 +39,11 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+      # Bundler 2.5.0 dropped support for Ruby 2.6 and 2.7
+      - name: Use Bundler 2.4.22
+        run: |
+          gem install bundler -v '2.4.22'
+          bundle config --local path vendor/bundle
       - name: Install dependencies
         run: bundle install
       - run: bundle exec rake run_spec:generator

data/.github/workflows/jest.yml

@@ -1,6 +1,10 @@
 name: Jest specs
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
 
 jobs:
   jest:

data/.github/workflows/js-lint.yml

@@ -1,6 +1,10 @@
 name: JS lint
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
 
 jobs:
   lint:

data/.github/workflows/rubocop.yml

@@ -1,6 +1,10 @@
 name: Rubocop
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
 
 jobs:
   rubocop:

data/.github/workflows/ruby-backward-compatibility.yml

@@ -1,6 +1,10 @@
 name: Ruby specs - Backward compatibility
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
 
 jobs:
   test:

data/.github/workflows/ruby.yml

@@ -1,6 +1,10 @@
 name: Ruby specs
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
 
 jobs:
   test:

data/CHANGELOG.md

@@ -9,19 +9,26 @@ Changes since the last non-beta release.
 
 _Please add entries here for your pull requests that are not yet released._
 
+## [v7.2.1] - December 30, 2023
+
+### Fixed
+- Show deprecation message for `relative_url_root` only if it is set. [PR 400](https://github.com/shakacode/shakapacker/pull/400) by [ahangarha](https://github.com/ahangarha).
+
+## [v7.2.0] - December 28, 2023
+
 ### 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)
+- Recommend `server` option instead of the 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).
+- 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
 
@@ -290,7 +297,9 @@ Note: [Rubygem is 6.3.0.pre.rc.1](https://rubygems.org/gems/shakapacker/versions
 ## v5.4.3 and prior changes from rails/webpacker
 See [CHANGELOG.md in rails/webpacker (up to v5.4.3)](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
 
-[Unreleased]: https://github.com/shakacode/shakapacker/compare/v7.1.0...master
+[Unreleased]: https://github.com/shakacode/shakapacker/compare/v7.2.1...master
+[v7.2.1]: https://github.com/shakacode/shakapacker/compare/v7.2.0...v7.2.1
+[v7.2.0]: https://github.com/shakacode/shakapacker/compare/v7.1.0...v7.2.0
 [v7.1.0]: https://github.com/shakacode/shakapacker/compare/v7.0.3...v7.1.0
 [v7.0.3]: https://github.com/shakacode/shakapacker/compare/v7.0.2...v7.0.3
 [v7.0.2]: https://github.com/shakacode/shakapacker/compare/v7.0.1...v7.0.2

data/lib/shakapacker/configuration.rb

@@ -124,12 +124,16 @@ class Shakapacker::Configuration
   end
 
   def 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(
+    result = ENV.fetch(
       "SHAKAPACKER_RELATIVE_URL_ROOT",
       fetch(:relative_url_root) || ActionController::Base.relative_url_root
     )
+
+    if result
+      Shakapacker.puts_deprecation_message("The usage of relative_url_root is deprecated in Shakapacker and will be removed in v8.")
+    end
+
+    result
   end
 
   private

data/lib/shakapacker/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shakapacker",
-  "version": "7.2.0",
+  "version": "7.2.1",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "homepage": "https://github.com/shakacode/shakapacker",
   "bugs": {

data/spec/shakapacker/configuration_spec.rb

@@ -383,14 +383,17 @@ 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
-      expect(ENV).to receive(:fetch).with("SHAKAPACKER_RELATIVE_URL_ROOT", nil).and_return("custom_value")
+    context "with SHAKAPACKER_RELATIVE_URL_ROOT set" do
+      before do
+        expect(ENV).to receive(:fetch).with("SHAKAPACKER_RELATIVE_URL_ROOT", nil).and_return("custom_value")
+      end
+      it "shows deprecation message" do
+        expect { config.relative_url_root }.to output(/deprecated/).to_stdout
+      end
 
-      expect(config.relative_url_root).to eq "custom_value"
+      it "returns the value of SHAKAPACKER_RELATIVE_URL_ROOT" do
+        expect(config.relative_url_root).to eq "custom_value"
+      end
     end
 
     context "without SHAKAPACKER_RELATIVE_URL_ROOT set" do
@@ -415,6 +418,10 @@ describe "Shakapacker::Configuration" do
 
             expect(config.relative_url_root).to be nil
           end
+
+          it "doesn't shows deprecation message" do
+            expect { config.relative_url_root }.to_not output(/deprecated/).to_stdout
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.2.1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-29 00:00:00.000000000 Z
+date: 2024-01-01 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
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v7.2.1
 post_install_message:
 rdoc_options: []
 require_paths: