shakapacker 9.0.0.beta.0 → 9.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d5eb8596c44c47d26f7d8954138ccff49880d0cfbbda9dd1669dd6d07e7c32f
-  data.tar.gz: 84aabd814e5ff1e723ff796ac4c02b37073c66f91695579dbdfe6850a44cfc6d
+  metadata.gz: 02da73fe458c789d3774f993cdc5d4ec082aec418d746bd96d279a6e636fb9dc
+  data.tar.gz: b0342e33b80c52751b7a63102492d9dbd3bcc88c485bd1b831ab902263d45404
 SHA512:
-  metadata.gz: c4158d767e170a0e18dcb1b9ad96558d2e13cd3ceed162c6e231d94cb1f99e8e62fe2da64be70fceeebf11ea1616af9c1da07c77469a9764e22ccaacb6c8da8d
-  data.tar.gz: aec89994b6c27b2109377959dd3ad1be1ca557bacadff21bf37df5c91760ac8f1e1e60eaf47f1be54997966c5b58090b70dd1154cba8431136836529bb8232ae
+  metadata.gz: 9950e533356e907aa0e68202dfe40af8ed5d96f633ba4a0aeff28ddf214daaf1b9cd02bbb7b74ba0fa8d4bcea00c2c7b1cd6fdd7d14a8e0d333932c3ece79a7a
+  data.tar.gz: aeb7b646e6d07e7ed7dd056113b98521701161c7d2909ec18a4d0771b473e970d7006ccfec4b7a4da1e789da56be0d6ecb8d95db651d0fae8c7ef7cf70be951f

data/.github/workflows/claude-code-review.yml

@@ -0,0 +1,54 @@
+name: Claude Code Review
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+    # Optional: Only run on specific file changes
+    # paths:
+    #   - "src/**/*.ts"
+    #   - "src/**/*.tsx"
+    #   - "src/**/*.js"
+    #   - "src/**/*.jsx"
+
+jobs:
+  claude-review:
+    # Optional: Filter by PR author
+    # if: |
+    #   github.event.pull_request.user.login == 'external-contributor' ||
+    #   github.event.pull_request.user.login == 'new-developer' ||
+    #   github.event.pull_request.author_association == 'FIRST_TIME_CONTRIBUTOR'
+    
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      issues: read
+      id-token: write
+    
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Run Claude Code Review
+        id: claude-review
+        uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          prompt: |
+            Please review this pull request and provide feedback on:
+            - Code quality and best practices
+            - Potential bugs or issues
+            - Performance considerations
+            - Security concerns
+            - Test coverage
+            
+            Use the repository's CLAUDE.md for guidance on style and conventions. Be constructive and helpful in your feedback.
+
+            Use `gh pr comment` with your Bash tool to leave your review as a comment on the PR.
+          
+          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
+          # or https://docs.claude.com/en/docs/claude-code/sdk#command-line for available options
+          claude_args: '--allowed-tools "Bash(gh issue view:*),Bash(gh search:*),Bash(gh issue list:*),Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*),Bash(gh pr list:*)"'
+

data/.github/workflows/claude.yml

@@ -0,0 +1,50 @@
+name: Claude Code
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+  issues:
+    types: [opened, assigned]
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  claude:
+    if: |
+      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
+      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      issues: read
+      id-token: write
+      actions: read # Required for Claude to read CI results on PRs
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Run Claude Code
+        id: claude
+        uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          
+          # This is an optional setting that allows Claude to read CI results on PRs
+          additional_permissions: |
+            actions: read
+
+          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
+          # prompt: 'Update the pull request description to include a summary of changes.'
+
+          # Optional: Add claude_args to customize behavior and configuration
+          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
+          # or https://docs.claude.com/en/docs/claude-code/sdk#command-line for available options
+          # claude_args: '--model claude-opus-4-1-20250805 --allowed-tools Bash(gh pr:*)'
+

data/.rubocop.yml

@@ -9,6 +9,7 @@ AllCops:
     - "vendor/**/*"
     - "node_modules/**/*"
     - "_actions/**/*"
+    - "spec/dummy-rspack/**/*"
 
 # Prefer &&/|| over and/or.
 Style/AndOr:

data/CHANGELOG.md

@@ -8,8 +8,12 @@
 ## [Unreleased]
 Changes since the last non-beta release.
 
-- Rspack support as an alternative bundler to webpack. Configure `bundler: 'rspack'` in `shakapacker.yml` to use Rspack's faster Rust-based bundling with webpack-compatible
-  APIs, built-in SWC loader, and CSS extraction. Automatic bundler detection in `bin/shakapacker` with fallback support for webpack configurations.
+### Added
+- Rspack support as an alternative assets bundler to webpack. Configure `assets_bundler: 'rspack'` in `shakapacker.yml` to use Rspack's faster Rust-based bundling with webpack-compatible APIs, built-in SWC loader, and CSS extraction. Automatic assets bundler detection in `bin/shakapacker` with fallback support for webpack configurations.
+
+### Changed
+- Configuration option renamed from `bundler` to `assets_bundler` to avoid confusion with Ruby's Bundler gem manager. The old `bundler` option is deprecated but still supported with a warning (not a breaking change).
+- BREAKING CHANGE: Configuration option renamed from `webpack_loader` to `javascript_transpiler` to better reflect its purpose of configuring JavaScript transpilation regardless of the bundler used. The old `webpack_loader` option is deprecated but still supported with a warning.
 
 ## [v8.4.0] - September 8, 2025
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shakapacker (9.0.0.beta.0)
+    shakapacker (9.0.0.beta.2)
       activesupport (>= 5.2)
       package_json
       rack-proxy (>= 0.6.1)

data/Rakefile

@@ -24,6 +24,23 @@ namespace :run_spec do
         "bundle install",
         "yalc link shakapacker",
         "yarn install",
+        "NODE_ENV=test RAILS_ENV=test yarn run webpack --config config/webpack/webpack.config.js",
+        "bundle exec rspec"
+      ])
+    end
+  end
+
+  desc "Run specs in the dummy-rspack app"
+  task :dummy_rspack do
+    puts "Running dummy-rspack app specs"
+    spec_dummy_dir = Pathname.new(File.join("spec", "dummy-rspack")).realpath
+    Bundler.with_unbundled_env do
+      sh_in_dir(".", "yalc publish")
+      sh_in_dir(spec_dummy_dir, [
+        "bundle install",
+        "yalc link shakapacker",
+        "yarn install",
+        "NODE_ENV=test RAILS_ENV=test yarn run rspack build --config config/webpack/webpack.config.js",
         "bundle exec rspec"
       ])
     end
@@ -35,7 +52,7 @@ namespace :run_spec do
   end
 
   desc "Run all specs"
-  task all_specs: %i[gem dummy generator] do
+  task all_specs: %i[gem dummy dummy_rspack generator] do
     puts "Completed all RSpec tests"
   end
 end

data/docs/rspack.md

@@ -1,6 +1,6 @@
 # Rspack Integration
 
-Shakapacker supports [Rspack](https://rspack.rs) as an alternative bundler to Webpack. Rspack is a fast Rust-based web bundler with webpack-compatible API that can significantly speed up your build times.
+Shakapacker supports [Rspack](https://rspack.rs) as an alternative assets bundler to Webpack. Rspack is a fast Rust-based web bundler with webpack-compatible API that can significantly speed up your build times.
 
 ## Installation
 
@@ -25,10 +25,10 @@ To enable Rspack, update your `config/shakapacker.yml`:
 ```yaml
 default: &default
   # ... other config options
-  bundler: 'rspack'  # Change from 'webpack' to 'rspack'
+  assets_bundler: 'rspack'  # Change from 'webpack' to 'rspack'
 ```
 
-## Configuration
+### Configuration Files
 
 Rspack uses its own configuration directory to keep things organized. Create your Rspack configuration file at `config/rspack/rspack.config.js`:
 
@@ -73,7 +73,7 @@ const { generateRspackConfig } = require('shakapacker/rspack')
 module.exports = generateRspackConfig()
 ```
 
-> **Note:** Shakapacker will show a deprecation warning if you use `config/webpack/webpack.config.js` with `bundler: 'rspack'`. Please migrate to `config/rspack/rspack.config.js`.
+> **Note:** Shakapacker will show a deprecation warning if you use `config/webpack/webpack.config.js` with `assets_bundler: 'rspack'`. Please migrate to `config/rspack/rspack.config.js`.
 
 ## Key Differences from Webpack
 
@@ -119,10 +119,10 @@ optimization: {
 All existing Shakapacker commands work the same way and automatically use Rspack when configured:
 
 ```bash
-# Build (automatically uses rspack when bundler: 'rspack')
+# Build (automatically uses rspack when assets_bundler: 'rspack')
 ./bin/shakapacker
 
-# Development server (automatically uses rspack when bundler: 'rspack')  
+# Development server (automatically uses rspack when assets_bundler: 'rspack')
 ./bin/shakapacker-dev-server
 
 # Watch mode
@@ -151,7 +151,7 @@ Rspack typically provides:
    ```yaml
    # config/shakapacker.yml
    default: &default
-     bundler: 'rspack'
+     assets_bundler: 'rspack'
    ```
 
 3. **Create Rspack config:**

data/docs/rspack_migration_guide.md

@@ -0,0 +1,202 @@
+# Rspack Migration Guide for Shakapacker
+
+## Overview
+This guide documents the differences between webpack and Rspack configurations in Shakapacker, and provides migration guidance for users switching to Rspack.
+
+## Key Differences from Webpack
+
+### 1. Built-in Loaders
+Rspack provides built-in loaders for better performance:
+
+**JavaScript/TypeScript:**
+- Use `builtin:swc-loader` instead of `babel-loader` or `ts-loader`
+- 20x faster than Babel on single thread, 70x on multiple cores
+- Configuration example:
+```javascript
+{
+  test: /\.(js|jsx|ts|tsx)$/,
+  loader: 'builtin:swc-loader',
+  options: {
+    jsc: {
+      parser: {
+        syntax: 'typescript', // or 'ecmascript'
+        tsx: true, // for TSX files
+        jsx: true  // for JSX files
+      },
+      transform: {
+        react: {
+          runtime: 'automatic'
+        }
+      }
+    }
+  }
+}
+```
+
+### 2. Plugin Replacements
+
+#### Built-in Rspack Alternatives
+| Webpack Plugin | Rspack Alternative | Status |
+|---------------|-------------------|---------|
+| `copy-webpack-plugin` | `rspack.CopyRspackPlugin` | ✅ Built-in |
+| `mini-css-extract-plugin` | `rspack.CssExtractRspackPlugin` | ✅ Built-in |
+| `terser-webpack-plugin` | `rspack.SwcJsMinimizerRspackPlugin` | ✅ Built-in |
+| `css-minimizer-webpack-plugin` | `rspack.LightningCssMinimizerRspackPlugin` | ✅ Built-in |
+
+#### Community Alternatives
+| Webpack Plugin | Rspack Alternative | Package |
+|---------------|-------------------|----------|
+| `fork-ts-checker-webpack-plugin` | `ts-checker-rspack-plugin` | `npm i -D ts-checker-rspack-plugin` |
+| `@pmmmwh/react-refresh-webpack-plugin` | `@rspack/plugin-react-refresh` | `npm i -D @rspack/plugin-react-refresh` |
+| `eslint-webpack-plugin` | `eslint-rspack-plugin` | `npm i -D eslint-rspack-plugin` |
+
+#### Incompatible Plugins
+The following webpack plugins are NOT compatible with Rspack:
+- `webpack.optimize.LimitChunkCountPlugin` - Use `optimization.splitChunks` configuration instead
+- `webpack-manifest-plugin` - Use `rspack-manifest-plugin` instead
+- Git revision plugins - Use alternative approaches
+
+### 3. Asset Module Types
+Replace file loaders with asset modules:
+- `file-loader` → `type: 'asset/resource'`
+- `url-loader` → `type: 'asset/inline'`
+- `raw-loader` → `type: 'asset/source'`
+
+### 4. Configuration Differences
+
+#### TypeScript Configuration
+**Required:** Add `isolatedModules: true` to your `tsconfig.json`:
+```json
+{
+  "compilerOptions": {
+    "isolatedModules": true
+  }
+}
+```
+
+#### React Fast Refresh
+```javascript
+// Development configuration
+const ReactRefreshPlugin = require('@rspack/plugin-react-refresh');
+
+module.exports = {
+  plugins: [
+    new ReactRefreshPlugin(),
+    new rspack.HotModuleReplacementPlugin()
+  ]
+};
+```
+
+### 5. Optimization Differences
+
+#### Code Splitting
+Rspack's `splitChunks` configuration is similar to webpack but with some differences:
+```javascript
+optimization: {
+  splitChunks: {
+    chunks: 'all',
+    cacheGroups: {
+      vendor: {
+        test: /[\\/]node_modules[\\/]/,
+        priority: -10,
+        reuseExistingChunk: true
+      }
+    }
+  }
+}
+```
+
+#### Minimization
+```javascript
+optimization: {
+  minimize: true,
+  minimizer: [
+    new rspack.SwcJsMinimizerRspackPlugin(),
+    new rspack.LightningCssMinimizerRspackPlugin()
+  ]
+}
+```
+
+### 6. Development Server
+Rspack uses its own dev server with some configuration differences:
+```javascript
+devServer: {
+  // Rspack-specific: Force writing assets to disk
+  devMiddleware: {
+    writeToDisk: true
+  }
+}
+```
+
+## Migration Checklist
+
+### Step 1: Update Dependencies
+```bash
+# Remove webpack dependencies
+npm uninstall webpack webpack-cli webpack-dev-server
+
+# Install Rspack
+npm install --save-dev @rspack/core @rspack/cli
+```
+
+### Step 2: Update Configuration Files
+1. Create `config/rspack/rspack.config.js` based on your webpack config
+2. Update `config/shakapacker.yml`:
+```yaml
+assets_bundler: 'rspack'
+```
+
+### Step 3: Replace Loaders
+- Replace `babel-loader` with `builtin:swc-loader`
+- Remove `file-loader`, `url-loader`, `raw-loader` - use asset modules
+- Update CSS loaders to use Rspack's built-in support
+
+### Step 4: Update Plugins
+- Replace plugins with Rspack alternatives (see table above)
+- Remove incompatible plugins
+- Add Rspack-specific plugins as needed
+
+### Step 5: TypeScript Setup
+1. Add `isolatedModules: true` to `tsconfig.json`
+2. Optional: Add `ts-checker-rspack-plugin` for type checking
+
+### Step 6: Test Your Build
+```bash
+# Development build
+bin/shakapacker
+
+# Production build
+bin/shakapacker --mode production
+```
+
+## Common Issues and Solutions
+
+### Issue: LimitChunkCountPlugin Error
+**Error:** `Cannot read properties of undefined (reading 'tap')`
+**Solution:** Remove `webpack.optimize.LimitChunkCountPlugin` and use `splitChunks` configuration instead.
+
+### Issue: Missing Loaders
+**Error:** Module parse errors
+**Solution:** Check console logs for skipped loaders and install missing dependencies.
+
+### Issue: CSS Extraction
+**Error:** CSS not being extracted properly
+**Solution:** Use `rspack.CssExtractRspackPlugin` instead of `mini-css-extract-plugin`.
+
+### Issue: TypeScript Errors
+**Error:** TypeScript compilation errors
+**Solution:** Ensure `isolatedModules: true` is set in `tsconfig.json`.
+
+## Performance Tips
+
+1. **Use Built-in Loaders:** Always prefer Rspack's built-in loaders for better performance
+2. **Minimize Plugins:** Use only necessary plugins as each adds overhead
+3. **Enable Caching:** Rspack has built-in persistent caching
+4. **Use SWC:** The built-in SWC loader is significantly faster than Babel
+
+## Resources
+
+- [Rspack Documentation](https://rspack.rs)
+- [Rspack Examples](https://github.com/rspack-contrib/rspack-examples)
+- [Awesome Rspack](https://github.com/rspack-contrib/awesome-rspack)
+- [Migration Guide](https://rspack.rs/guide/migration/webpack)

data/docs/using_esbuild_loader.md

@@ -27,7 +27,7 @@ To use esbuild as your transpiler today. You need to do two things:
 npm install esbuild esbuild-loader
 ```
 
-2. Add or change `webpack_loader` value in your default `shakapacker.yml` config to `esbuild`
+2. Add or change `javascript_transpiler` value in your default `shakapacker.yml` config to `esbuild`
 The default configuration of babel is done by using `package.json` to use the file within the `shakapacker` package.
 
 ```yml
@@ -46,8 +46,8 @@ default: &default
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
 
-  # Select loader to use, available options are 'babel' (default), 'swc' or 'esbuild'
-  webpack_loader: 'esbuild'
+  # Select JavaScript transpiler to use, available options are 'babel' (default), 'swc' or 'esbuild'
+  javascript_transpiler: 'esbuild'
 ```
 
 ### (Optional) Replace minification with esbuild

data/docs/using_swc_loader.md

@@ -12,6 +12,8 @@ It supports all ECMAScript features and it's designed to be a drop-in replacemen
 
 For comparison between SWC and Babel, see the docs at https://swc.rs/docs/migrating-from-babel.
 
+> **Note:** SWC is also natively built into RSpack bundler, providing even faster compilation speeds. When using RSpack (`assets_bundler: 'rspack'`), SWC is used automatically regardless of the `javascript_transpiler` setting.
+
 ## Switching your Shakapacker project to SWC
 
 In order to use SWC as your compiler today. You need to do two things:
@@ -22,7 +24,7 @@ In order to use SWC as your compiler today. You need to do two things:
 npm install @swc/core swc-loader
 ```
 
-2. Add or change `webpack_loader` value in your default `shakapacker.yml` config to `swc`
+2. Add or change `javascript_transpiler` value in your default `shakapacker.yml` config to `swc`
 The default configuration of babel is done by using `package.json` to use the file within the `shakapacker` package.
 
 ```yml
@@ -41,8 +43,8 @@ default: &default
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
 
-  # Select loader to use, available options are 'babel' (default) or 'swc'
-  webpack_loader: 'swc'
+  # Select JavaScript transpiler to use, available options are 'babel' (default) or 'swc'
+  javascript_transpiler: 'swc'
 ```
 
 ## Usage

data/lib/install/bin/shakapacker

@@ -2,24 +2,10 @@
 
 ENV["RAILS_ENV"] ||= "development"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+ENV["APP_ROOT"] ||= File.expand_path("..", __dir__)
 
 require "bundler/setup"
-require "pathname"
 require "shakapacker"
+require "shakapacker/runner"
 
-APP_ROOT = File.expand_path("..", __dir__)
-Dir.chdir(APP_ROOT) do
-  config = Shakapacker::Configuration.new(
-    root_path: Pathname.new(APP_ROOT),
-    config_path: Pathname.new(File.join(APP_ROOT, "config/shakapacker.yml")),
-    env: ENV["RAILS_ENV"] || ENV["NODE_ENV"] || "development"
-  )
-
-  if config.rspack?
-    require "shakapacker/rspack_runner"
-    Shakapacker::RspackRunner.run(ARGV)
-  else
-    require "shakapacker/webpack_runner"
-    Shakapacker::WebpackRunner.run(ARGV)
-  end
-end
+Shakapacker::Runner.run(ARGV)

data/lib/install/config/shakapacker.yml

@@ -36,11 +36,12 @@ default: &default
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
 
-  # Select loader to use, available options are 'babel' (default), 'swc' or 'esbuild'
-  webpack_loader: 'babel'
+  # Select JavaScript transpiler to use, available options are 'babel' (default), 'swc' or 'esbuild'
+  javascript_transpiler: 'babel'
 
-  # Select bundler to use, available options are 'webpack' (default) or 'rspack'
-  bundler: 'webpack'
+  # Select assets bundler to use
+  # Available options: 'webpack' (default) or 'rspack'
+  assets_bundler: 'webpack'
 
   # Raises an error if there is a mismatch in the shakapacker gem and npm package being used
   ensure_consistent_versioning: true

data/lib/shakapacker/configuration.rb

@@ -88,18 +88,51 @@ class Shakapacker::Configuration
     fetch(:compiler_strategy)
   end
 
+  def assets_bundler
+    # Show deprecation warning if using old 'bundler' key
+    if data.has_key?(:bundler) && !data.has_key?(:assets_bundler)
+      $stderr.puts "⚠️  DEPRECATION WARNING: The 'bundler' configuration option is deprecated. Please use 'assets_bundler' instead to avoid confusion with Ruby's Bundler gem manager."
+    end
+    ENV["SHAKAPACKER_ASSETS_BUNDLER"] || fetch(:assets_bundler) || fetch(:bundler) || "webpack"
+  end
+
+  # Deprecated: Use assets_bundler instead
   def bundler
-    fetch(:bundler) || "webpack"
+    assets_bundler
   end
 
   def rspack?
-    bundler == "rspack"
+    assets_bundler == "rspack"
   end
 
   def webpack?
-    bundler == "webpack"
+    assets_bundler == "webpack"
+  end
+
+  def javascript_transpiler
+    # Show deprecation warning if using old 'webpack_loader' key
+    if data.has_key?(:webpack_loader) && !data.has_key?(:javascript_transpiler)
+      $stderr.puts "⚠️  DEPRECATION WARNING: The 'webpack_loader' configuration option is deprecated. Please use 'javascript_transpiler' instead as it better reflects its purpose of configuring JavaScript transpilation regardless of the bundler used."
+    end
+
+    # Use explicit config if set, otherwise default based on bundler
+    fetch(:javascript_transpiler) || fetch(:webpack_loader) || default_javascript_transpiler
   end
 
+  # Deprecated: Use javascript_transpiler instead
+  def webpack_loader
+    javascript_transpiler
+  end
+
+  private
+
+    def default_javascript_transpiler
+      # RSpack has built-in SWC support, use it by default
+      rspack? ? "swc" : "babel"
+    end
+
+  public
+
   def fetch(key)
     data.fetch(key, defaults[key])
   end

data/lib/shakapacker/dev_server_runner.rb

@@ -7,6 +7,10 @@ require_relative "runner"
 
 module Shakapacker
   class DevServerRunner < Shakapacker::Runner
+    def self.run(argv)
+      new(argv).run
+    end
+
     def run
       load_config
       detect_unsupported_switches!
@@ -75,17 +79,16 @@ module Shakapacker
           env["NODE_OPTIONS"] = "#{env["NODE_OPTIONS"]} --inspect-brk --trace-warnings"
         end
 
-        # Add bundler-specific flags and config
-        bundler = get_bundler_type
-        if bundler == "webpack"
-          cmd += ["--config", @webpack_config]
+        # Add config file
+        cmd += ["--config", @webpack_config]
+
+        # Add assets bundler-specific flags
+        if webpack?
           cmd += ["--progress", "--color"] if @pretty
           # Default behavior of webpack-dev-server is @hot = true
           cmd += ["--hot", "only"] if @hot == "only"
           cmd += ["--no-hot"] if !@hot
-        elsif bundler == "rspack"
-          # Only add config for rspack if it's not a rspack-specific command
-          cmd += ["--config", @webpack_config]
+        elsif rspack?
           # Rspack supports --hot but not --no-hot or --progress/--color
           cmd += ["--hot"] if @hot && @hot != false
         end
@@ -98,9 +101,16 @@ module Shakapacker
       end
 
       def build_cmd
-        bundler = get_bundler_type
-        command = bundler == "rspack" ? "rspack" : "webpack"
+        command = @config.rspack? ? "rspack" : "webpack"
         package_json.manager.native_exec_command(command, ["serve"])
       end
+
+      def webpack?
+        @config.webpack?
+      end
+
+      def rspack?
+        @config.rspack?
+      end
   end
 end

data/lib/shakapacker/manifest.rb

@@ -108,16 +108,17 @@ class Shakapacker::Manifest
     end
 
     def missing_file_from_manifest_error(bundle_name)
+      bundler_name = config.assets_bundler
       <<-MSG
 Shakapacker can't find #{bundle_name} in #{config.manifest_path}. Possible causes:
 1. You forgot to install javascript packages or are running an incompatible javascript runtime version
 2. Your app has code with a non-standard extension (like a `.jsx` file) but the extension is not in the `extensions` config in `config/shakapacker.yml`
 3. You have set compile: false (see `config/shakapacker.yml`) for this environment
    (unless you are using the `bin/shakapacker -w` or the `bin/shakapacker-dev-server`, in which case maybe you aren't running the dev server in the background?)
-4. Your bundler (webpack/rspack) has not yet FINISHED running to reflect updates.
+4. Your #{bundler_name} has not yet FINISHED running to reflect updates.
 5. You have misconfigured Shakapacker's `config/shakapacker.yml` file.
-6. Your bundler configuration is not creating a manifest with the expected structure.
-7. There's a mismatch between your bundler choice (webpack vs rspack) and the manifest format.
+6. Your #{bundler_name} configuration is not creating a manifest with the expected structure.
+7. Ensure the 'assets_bundler' in config/shakapacker.yml is set correctly (currently: #{bundler_name}).
 
 Your manifest contains:
 #{JSON.pretty_generate(@data)}