shakapacker 9.3.2 → 9.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0516b9d770d17a8e04f5b51e49f854823339760856dfd93a281586ea975513db
-  data.tar.gz: e0951145646eaeca52df5fc65aba8217e60de0ad0ea10de21271d6e7e62f7b6f
+  metadata.gz: af5e0a15e65b57c5625993f56d28f207200c780c2ec98970231d45873455cc85
+  data.tar.gz: a709f45129e88ccf0069bb3ba5a32bec9f6a936bce82316250b4ce3db4315a24
 SHA512:
-  metadata.gz: 32963185a3ef79ffe8da898d800d9c014acc34854ad17dadb30243b5c46a6ae7caa74be034d1c9971048fab0809ba2caefae3ad82faa86d5684ed2dd46782a6c
-  data.tar.gz: 80f01b964e5df32104861c13a3e1924e497fa57f0201f4522417c407bc52bcf89e26315146d1e441fa5cd4a092994438aa2449ee95a07ba9c5c51eb6f48f830e
+  metadata.gz: 75a99bee03e05b0639464f592e9ec057efad0f8ecc3ff7ee2056252af216df6aacf4dd15649e8480bec9e1eb9de84faa68925e8d904083deef666d207530fd3b
+  data.tar.gz: 166ca698ec3b50396e70f35af4c927b871407ebb66b2e4b9649d2a2b5fa302f241fd41de35bf3e21652568324d6bca43c07d3fe7d9300872d9a3be1054776329

data/CHANGELOG.md

@@ -11,9 +11,21 @@
 
 Changes since the last non-beta release.
 
+## [v9.3.2] - November 10, 2025
+
 ### Fixed
 
-- Use `@ts-ignore` to suppress potential import error in public types when `webpack` is not installed. [PR #828](https://github.com/shakacode/shakapacker/pull/828) by [G-Rath]
+- **Fixed TypeScript import error in public types when webpack is not installed**. [PR #828](https://github.com/shakacode/shakapacker/pull/828) by [G-Rath](https://github.com/G-Rath). Uses `@ts-ignore` instead of `@ts-expect-error` to suppress potential import error when webpack is not installed.
+- **Fixed bundler switch task to add missing `assets_bundler` config**. [PR #833](https://github.com/shakacode/shakapacker/pull/833) by [justin808](https://github.com/justin808). The `rake shakapacker:switch_bundler` task now automatically adds the `assets_bundler` key to `shakapacker.yml` if it's missing, preventing silent failures when switching bundlers.
+- **Fixed rake tasks to use `bundle exec rake` instead of `bundle exec rails`**. [PR #830](https://github.com/shakacode/shakapacker/pull/830) by [Judahmeek](https://github.com/Judahmeek). Rake tasks should be invoked with `bundle exec rake` to support command-line flags properly, as Rails commands don't support flags.
+
+### Added
+
+- **Support for esbuild 0.26 and 0.27**. [PR #832](https://github.com/shakacode/shakapacker/pull/832) by [justin808](https://github.com/justin808). Extended peer dependency range to support newer esbuild versions.
+
+### Changed
+
+- **Simplified `switch_bundler` task to only support rake command**. [PR #831](https://github.com/shakacode/shakapacker/pull/831) by [justin808](https://github.com/justin808). The `rake shakapacker:switch_bundler` task now only works with `bundle exec rake`, not `bundle exec rails`. Use `bundle exec rake shakapacker:switch_bundler [bundler] -- [options]` for clearer command-line flag support.
 
 ## [v9.3.1] - November 9, 2025
 
@@ -734,7 +746,8 @@ Note: [Rubygem is 6.3.0.pre.rc.1](https://rubygems.org/gems/shakapacker/versions
 
 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/v9.3.1...main
+[Unreleased]: https://github.com/shakacode/shakapacker/compare/v9.3.2...main
+[v9.3.2]: https://github.com/shakacode/shakapacker/compare/v9.3.1...v9.3.2
 [v9.3.1]: https://github.com/shakacode/shakapacker/compare/v9.3.0...v9.3.1
 [v9.3.0]: https://github.com/shakacode/shakapacker/compare/v9.2.0...v9.3.0
 [v9.2.0]: https://github.com/shakacode/shakapacker/compare/v9.1.0...v9.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shakapacker (9.3.2)
+    shakapacker (9.3.3)
       activesupport (>= 5.2)
       package_json
       rack-proxy (>= 0.6.1)

data/lib/shakapacker/bundler_switcher.rb

@@ -12,15 +12,24 @@ module Shakapacker
     # Regex pattern to detect assets_bundler key in config (only matches uncommented lines)
     ASSETS_BUNDLER_PATTERN = /^[ \t]*assets_bundler:/
 
+    # Shared dependencies used by both webpack and rspack
+    # These should not be removed when switching bundlers
+    SHARED_DEPS = {
+      dev: %w[],
+      prod: %w[webpack-merge]
+    }.freeze
+
     # Default dependencies for each bundler (package names only, no versions)
+    # Note: Excludes independent/optional dependencies like @swc/core, swc-loader (user-configured
+    # transpilers)
     DEFAULT_RSPACK_DEPS = {
       dev: %w[@rspack/cli @rspack/plugin-react-refresh],
       prod: %w[@rspack/core rspack-manifest-plugin]
     }.freeze
 
     DEFAULT_WEBPACK_DEPS = {
-      dev: %w[webpack webpack-cli webpack-dev-server @pmmmwh/react-refresh-webpack-plugin @swc/core swc-loader],
-      prod: %w[webpack-assets-manifest webpack-merge]
+      dev: %w[webpack webpack-cli webpack-dev-server @pmmmwh/react-refresh-webpack-plugin],
+      prod: %w[webpack-assets-manifest]
     }.freeze
 
     attr_reader :root_path
@@ -148,16 +157,24 @@ module Shakapacker
             raise
           end
           rspack_deps = {
-            dev: custom.dig("rspack", "devDependencies") || DEFAULT_RSPACK_DEPS[:dev],
-            prod: custom.dig("rspack", "dependencies") || DEFAULT_RSPACK_DEPS[:prod]
+            dev: (custom.dig("rspack", "devDependencies") || DEFAULT_RSPACK_DEPS[:dev]) + SHARED_DEPS[:dev],
+            prod: (custom.dig("rspack", "dependencies") || DEFAULT_RSPACK_DEPS[:prod]) + SHARED_DEPS[:prod]
           }
           webpack_deps = {
-            dev: custom.dig("webpack", "devDependencies") || DEFAULT_WEBPACK_DEPS[:dev],
-            prod: custom.dig("webpack", "dependencies") || DEFAULT_WEBPACK_DEPS[:prod]
+            dev: (custom.dig("webpack", "devDependencies") || DEFAULT_WEBPACK_DEPS[:dev]) + SHARED_DEPS[:dev],
+            prod: (custom.dig("webpack", "dependencies") || DEFAULT_WEBPACK_DEPS[:prod]) + SHARED_DEPS[:prod]
           }
           [rspack_deps, webpack_deps]
         else
-          [DEFAULT_RSPACK_DEPS, DEFAULT_WEBPACK_DEPS]
+          rspack_with_shared = {
+            dev: DEFAULT_RSPACK_DEPS[:dev] + SHARED_DEPS[:dev],
+            prod: DEFAULT_RSPACK_DEPS[:prod] + SHARED_DEPS[:prod]
+          }
+          webpack_with_shared = {
+            dev: DEFAULT_WEBPACK_DEPS[:dev] + SHARED_DEPS[:dev],
+            prod: DEFAULT_WEBPACK_DEPS[:prod] + SHARED_DEPS[:prod]
+          }
+          [rspack_with_shared, webpack_with_shared]
         end
       end
 
@@ -234,7 +251,13 @@ module Shakapacker
       def manage_dependencies(bundler, install_deps, switching: true, no_uninstall: false)
         rspack_deps, webpack_deps = load_dependencies
         deps_to_install = bundler == "rspack" ? rspack_deps : webpack_deps
-        deps_to_remove = bundler == "rspack" ? webpack_deps : rspack_deps
+        old_bundler_deps = bundler == "rspack" ? webpack_deps : rspack_deps
+
+        # Remove shared dependencies from removal list
+        deps_to_remove = {
+          dev: old_bundler_deps[:dev] - SHARED_DEPS[:dev],
+          prod: old_bundler_deps[:prod] - SHARED_DEPS[:prod]
+        }
 
         if install_deps
           puts ""

data/lib/shakapacker/version.rb

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

data/package.json

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 9.3.2
+  version: 9.3.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -389,7 +389,7 @@ homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v9.3.2
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v9.3.3
 rdoc_options: []
 require_paths:
 - lib