Merge remote-tracking branch 'origin/main' into HEAD

* origin/main: (22 commits)
  docs: add Dependabot configuration guide (#1094)
  Sync address-review prompt with upstream PR #16 (#1098)
  Supersede #910: entry shape test with lint unblock (#919)
  fix: align rspack v2 peer deps and installer defaults (#1091)
  docs: update README and guides for Shakapacker v10 (#1092)
  Release 10.0.0
  Update CHANGELOG.md for v10.0.0 (#1089)
  Release 10.0.0-rc.1
  Update CHANGELOG.md for v10.0.0-rc.1 (#1087)
  Supersede #961 by using pack-config-diff (#973)
  Add final summary output to rake release (#1041)
  Add bin/setup to install development deps (#1039)
  Release 10.0.0-rc.0
  Use npx release-it to avoid mise shim failures (#1040)
  Fix Nokogiri build failure on Ruby 3.4.6 (#1038)
  Update CHANGELOG.md for v10.0.0-rc.0 (#1037)
  Update rspack dev deps to 2.0.0-rc.0 (#1036)
  Fix stale and broken documentation across Shakapacker guides (#1023)
  Allow webpack-cli v7 in peer dependencies (#1021)
  refactor: simplify resolving js peer versions when installing (#1034)
  ...

# Conflicts:
#	package.json

Author: justin808

.github/workflows/dummy.yml

@@ -30,7 +30,7 @@ jobs:
           persist-credentials: false
       - uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "20.x"
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "3.2"
@@ -40,7 +40,6 @@ jobs:
           bundle install
           yarn install --frozen-lockfile --production=false
           npm install -g yalc
-          cd spec/dummy && npm install
 
       - name: Build TypeScript
         run: yarn build

.github/workflows/node.yml

@@ -139,7 +139,8 @@ jobs:
           cd /tmp/test-types
           npx tsc --noEmit \
             --skipLibCheck \
-            --moduleResolution node \
+            --moduleResolution bundler \
+            --types node \
             *.d.ts
   test:
     name: Testing

.github/workflows/test-bundlers.yml

@@ -56,7 +56,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          yalc link shakapacker
+          yarn install
+          yalc add shakapacker
           yarn install
 
       - name: Switch to Webpack
@@ -109,7 +110,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          yalc link shakapacker
+          yarn install
+          yalc add shakapacker
           yarn install
 
       - name: Switch to RSpack
@@ -162,7 +164,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          yalc link shakapacker
+          yarn install
+          yalc add shakapacker
           yarn install
 
       - name: Test switching between bundlers

.github/workflows/trigger-docs-site.yml

@@ -3,7 +3,7 @@ name: Trigger docs site rebuild
 on:
   push:
     branches: [main]
-    paths: ['docs/**']
+    paths: ["docs/**"]
 
 jobs:
   notify-docs-site:

.gitignore

@@ -26,6 +26,9 @@ yalc.lock
 # Config exporter output directory
 shakapacker-config-exports/
 
+# Webpack build output
+public/packs/
+
 # TypeScript generated files
 package/**/*.d.ts
 package/**/*.d.ts.map

.prettierignore

@@ -5,3 +5,4 @@ lib/install/config/**/*.js
 # Temporarily ignore workflow files that cannot be modified in PRs due to claude-review validation
 .github/workflows/claude.yml
 .github/workflows/claude-code-review.yml
+.context/

CHANGELOG.md

@@ -9,9 +9,35 @@
 
 ## [Unreleased]
 
+### Changed
+
+- **Changed `shakapacker:install` to default fresh Rspack installs to v2 (`^2.0.0-0`)**. [PR #1091](https://github.com/shakacode/shakapacker/pull/1091) by [ihabadham](https://github.com/ihabadham). `lib/install/package.json` now declares `@rspack/core` and `@rspack/cli` as `^1.0.0 || ^2.0.0-0`; fresh installs pick the v2 range. Existing apps are unaffected. Note: Rspack v2 requires Node.js 20.19.0+.
+
+### Fixed
+
+- **Widened `@rspack/plugin-react-refresh` peer range to `^1.0.0 || ^2.0.0-0`**. [PR #1091](https://github.com/shakacode/shakapacker/pull/1091) by [ihabadham](https://github.com/ihabadham). Fixes the `ERESOLVE` conflict when installing `@rspack/plugin-react-refresh@^2.0.0` alongside `shakapacker@10.0.0`.
+
+## [v10.0.0] - April 8, 2026
+
 ### Added
 
+- **Added `bin/diff-bundler-config` CLI for semantic bundler configuration diffs**. [PR #973](https://github.com/shakacode/shakapacker/pull/973) by [justin808](https://github.com/justin808). Wraps the extracted [`pack-config-diff`](https://github.com/shakacode/pack-config-diff) package to provide semantic diffing of webpack/rspack configurations with normalized exit codes. Supersedes [#961](https://github.com/shakacode/shakapacker/pull/961).
 - **Added `bin/shakapacker-watch` binstub for clean Ctrl-C shutdown in Procfile-based workflows**. [PR #1026](https://github.com/shakacode/shakapacker/pull/1026) by [justin808](https://github.com/justin808). The new wrapper script traps INT/TERM signals and forwards TERM to the underlying `bin/shakapacker --watch` process, preventing Ruby interrupt backtraces when stopping `bin/dev`. Use `bin/shakapacker-watch --watch` in Procfiles instead of `bin/shakapacker --watch`.
+- **Allowed `webpack-cli` v7 (`^7.0.0`) in peer dependencies**. [PR #1021](https://github.com/shakacode/shakapacker/pull/1021) by [justin808](https://github.com/justin808). Fixes [#1020](https://github.com/shakacode/shakapacker/issues/1020). Note: `webpack-cli` v7 requires Node.js >= 20.9.0.
+
+### ⚠️ Breaking Changes
+
+- **Breaking: bumped the minimum `webpack` version to `^5.101.0`**. [PR #1021](https://github.com/shakacode/shakapacker/pull/1021) by [justin808](https://github.com/justin808). The previous minimum was `^5.76.0`.
+- **Breaking: required `webpack-dev-server` `^5.2.2` and dropped support for v4**. [PR #1021](https://github.com/shakacode/shakapacker/pull/1021) by [justin808](https://github.com/justin808). The removed v4 range was `^4.15.2`.
+
+### Changed
+
+- **Changed `shakapacker:install` to default `webpack-cli` installs to the latest v6 range**. [PR #1021](https://github.com/shakacode/shakapacker/pull/1021) by [justin808](https://github.com/justin808). This keeps installs compatible with Node.js `20.0-20.8`; v7 remains supported via peer dependencies for Node.js >= 20.9.0.
+- **Changed dev server config handling to warn on deprecated middleware hooks and ignore them for webpack-dev-server v5**. [PR #1021](https://github.com/shakacode/shakapacker/pull/1021) by [justin808](https://github.com/justin808). Use `setup_middlewares` instead of `on_before_setup_middleware` and `on_after_setup_middleware`.
+
+### Fixed
+
+- **Ensured `shakapacker:install` installs the latest `compression-webpack-plugin`**. [PR #1035](https://github.com/shakacode/shakapacker/pull/1035) by [G-Rath](https://github.com/G-Rath).
 
 ## [v9.7.0] - March 15, 2026
 
@@ -891,7 +917,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.7.0...main
+[Unreleased]: https://github.com/shakacode/shakapacker/compare/v10.0.0...main
+[v10.0.0]: https://github.com/shakacode/shakapacker/compare/v9.7.0...v10.0.0
 [v9.7.0]: https://github.com/shakacode/shakapacker/compare/v9.6.1...v9.7.0
 [v9.6.1]: https://github.com/shakacode/shakapacker/compare/v9.6.0...v9.6.1
 [v9.6.0]: https://github.com/shakacode/shakapacker/compare/v9.5.0...v9.6.0

CLAUDE.md

@@ -22,7 +22,7 @@ See the sections below for full detail and examples.
 
 - Run corresponding RSpec tests when changing source files
 - For example, when changing `lib/shakapacker/foo.rb`, run `spec/shakapacker/foo_spec.rb`
-- Run the full test suite with `bundle exec rspec` before pushing
+- Run the full test suite with `bundle exec rake test` before pushing
 - **Use explicit RSpec spy assertions** - prefer `have_received`/`not_to have_received` over indirect counter patterns
   - Good: `expect(Open3).to have_received(:capture3).with(anything, hook_command, anything)`
   - Good: `expect(Open3).not_to have_received(:capture3).with(anything, hook_command, anything)`
@@ -48,7 +48,7 @@ See the sections below for full detail and examples.
 - **Do NOT add entries for**: linting, formatting, refactoring, tests, or documentation fixes
 - **Format**: `[PR #123](https://github.com/shakacode/shakapacker/pull/123) by [username](https://github.com/username)` (Shakapacker uses `#` in PR links)
 - **Use `/update-changelog` command** for guided changelog updates with automatic formatting
-- **Version management**: Run `bundle exec rake update_changelog` after releases to update version headers
+- **Version management**: Use the `/update-changelog` command to stamp version headers during release prep
 - **Examples**: Run `grep -A 3 "^### " CHANGELOG.md | head -30` to see real formatting examples
 
 ## Open Source Maintainability

CONTRIBUTING.md

@@ -8,7 +8,7 @@ Thank you for your interest in contributing to Shakapacker! We welcome all contr
 - [Submitting Pull Requests](#submitting-pull-requests)
 - [Setting Up a Development Environment](#setting-up-a-development-environment)
 - [Making sure your changes pass all tests](#making-sure-your-changes-pass-all-tests)
-- [Testing the generator](#testing-the-generator)
+- [Testing the installer](#46-testing-the-installer)
 
 ## Reporting Issues
 
@@ -44,8 +44,8 @@ This project includes configuration for git hooks via `husky` and `lint-staged`,
 To enable pre-commit hooks locally:
 
 ```bash
-npx husky install
-npx husky add .husky/pre-commit "npx lint-staged"
+yarn install
+npx husky
 ```
 
 ---
@@ -174,11 +174,16 @@ yarn lint --cache
      yalc push # or yalc publish --push
      ```
 
-3. Run the following commands to set up the development environment.
+3. Run `bin/setup` to install development dependencies.
+   ```bash
+   bin/setup
+   # Optional: enable local pre-commit hooks
+   npx husky
    ```
+   Manual equivalent:
+   ```bash
    bundle install
    yarn install
-   yarn prepare:husky  # Set up pre-commit hooks for linting
    ```
 
 ## Understanding Optional Peer Dependencies

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shakapacker (9.7.0)
+    shakapacker (10.0.0)
       activesupport (>= 5.2)
       package_json
       rack-proxy (>= 0.6.1)
@@ -126,7 +126,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.7)
+    nokogiri (1.19.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     package_json (0.1.0)