Address Rspack v2 review follow-ups

Author: justin808

lib/shakapacker/bundler_switcher.rb

@@ -19,7 +19,8 @@ class BundlerSwitcher
       prod: %w[webpack-merge]
     }.freeze
 
-    # Default dependencies for each bundler (package names only, no versions)
+    # Default dependencies for each bundler. Rspack entries include install-time
+    # version ranges; package_names strips them before removal and display.
     # Note: Excludes independent/optional dependencies like @swc/core, swc-loader (user-configured
     # transpilers)
     DEFAULT_RSPACK_DEPS = {

lib/shakapacker/doctor.rb

@@ -325,7 +325,7 @@ def check_rspack_peer_deps(deps)
         }
 
         essential_rspack.each do |package, version|
-          unless deps[package]
+          unless deps[package] || installed_package_version(package)
             @issues << "Missing essential rspack dependency: #{package} (#{version})"
           end
         end
@@ -347,9 +347,13 @@ def check_rspack_peer_deps(deps)
                      "Upgrade #{unsupported_packages.join(' and ')} to ^2.0.0."
         end
 
-        if deps["rspack-manifest-plugin"] && package_version_below?("rspack-manifest-plugin", "5.2.2")
+        manifest_status = package_version_status("rspack-manifest-plugin", "5.2.2")
+        if deps["rspack-manifest-plugin"] && manifest_status[:installed_below]
           @issues << "Unsupported rspack-manifest-plugin version: Shakapacker requires rspack-manifest-plugin " \
                      "^5.2.2 for Rspack v2."
+        elsif deps["rspack-manifest-plugin"] && manifest_status[:declared_below]
+          @issues << "Declared rspack-manifest-plugin range allows unsupported versions. " \
+                     "Update package.json to require rspack-manifest-plugin ^5.2.2 for Rspack v2."
         end
       end
 
@@ -1035,12 +1039,15 @@ def package_json_dependency_version(name)
         declared_package_dependencies(read_package_json)[name]
       end
 
-      def package_version_below?(package_name, minimum_version)
+      def package_version_status(package_name, minimum_version)
         minimum = Gem::Version.new(minimum_version)
         declared = package_version_from_specifier(package_json_dependency_version(package_name))
         installed = installed_package_version(package_name)
 
-        [declared, installed].compact.any? { |version| version < minimum }
+        {
+          declared_below: declared && declared < minimum,
+          installed_below: installed && installed < minimum
+        }
       end
 
       def package_version_from_specifier(version)
@@ -1132,9 +1139,7 @@ def check_optional_dependency(package_name, warnings_array, description)
       def package_installed?(package_name)
         return false unless package_json_exists?
 
-        package_json = read_package_json
-        dependencies = (package_json["dependencies"] || {}).merge(package_json["devDependencies"] || {})
-        dependencies.key?(package_name)
+        declared_package_dependencies(read_package_json).key?(package_name)
       end
 
       def package_json_exists?

package/environments/development.ts

@@ -3,6 +3,7 @@
  * @module environments/development
  */
 
+import type { RuleSetUseItem } from "webpack"
 import type {
   WebpackConfigWithDevServer,
   RspackConfigWithDevServer
@@ -16,6 +17,21 @@ const webpackDevServerConfig = require("../webpackDevServerConfig")
 const { runningWebpackDevServer } = require("../env")
 const { moduleExists } = require("../utils/helpers")
 
+let rspackReactRefreshTransformEnabled = false
+
+type SwcLoaderUse = {
+  loader?: string
+  options?: {
+    jsc?: {
+      transform?: {
+        react?: {
+          refresh?: boolean
+        }
+      }
+    }
+  }
+}
+
 /**
  * Base development configuration shared between webpack and rspack
  */
@@ -85,6 +101,7 @@ const rspackDevConfig = (): RspackConfigWithDevServer => {
         "[SHAKAPACKER WARNING] Could not resolve a constructor from @rspack/plugin-react-refresh; React Refresh will be skipped in development."
       )
     } else {
+      rspackReactRefreshTransformEnabled = true
       rspackConfig.plugins = [
         ...(rspackConfig.plugins || []),
         new ReactRefreshRspackPlugin()
@@ -95,7 +112,39 @@ const rspackDevConfig = (): RspackConfigWithDevServer => {
   return rspackConfig
 }
 
+const enableRspackReactRefreshTransform = (
+  environmentConfig: RspackConfigWithDevServer
+) => {
+  const rules = environmentConfig.module?.rules
+  if (!Array.isArray(rules)) return
+
+  rules.forEach((rule) => {
+    if (!rule || typeof rule !== "object" || !("use" in rule)) return
+
+    const ruleWithUse = rule as { use?: RuleSetUseItem | RuleSetUseItem[] }
+    const loaders = Array.isArray(ruleWithUse.use)
+      ? ruleWithUse.use
+      : [ruleWithUse.use]
+
+    loaders.forEach((loader) => {
+      if (!loader || typeof loader !== "object" || !("loader" in loader)) return
+
+      const loaderConfig = loader as SwcLoaderUse
+      if (loaderConfig.loader === "builtin:swc-loader") {
+        const reactTransform = loaderConfig.options?.jsc?.transform?.react
+        if (reactTransform) reactTransform.refresh = true
+      }
+    })
+  })
+}
+
 const bundlerConfig =
   config.assets_bundler === "rspack" ? rspackDevConfig() : webpackDevConfig()
 
-module.exports = merge(baseConfig, bundlerConfig)
+const environmentConfig = merge(baseConfig, bundlerConfig)
+
+if (config.assets_bundler === "rspack" && rspackReactRefreshTransformEnabled) {
+  enableRspackReactRefreshTransform(environmentConfig)
+}
+
+module.exports = environmentConfig

spec/shakapacker/doctor_spec.rb

@@ -533,6 +533,18 @@ def capture_stdout
             "Missing essential rspack dependency: @rspack/dev-server (^2.0.0)"
           )
         end
+
+        it "does not add a missing issue when dev-server is installed" do
+          dev_server_pkg = root_path.join("node_modules/@rspack/dev-server/package.json")
+          FileUtils.mkdir_p(dev_server_pkg.dirname)
+          File.write(dev_server_pkg, JSON.generate({ "name" => "@rspack/dev-server", "version" => "2.0.0" }))
+
+          doctor.send(:check_peer_dependencies)
+
+          expect(doctor.issues).not_to include(
+            "Missing essential rspack dependency: @rspack/dev-server (^2.0.0)"
+          )
+        end
       end
 
       context "with essential rspack dependencies declared as peers" do
@@ -591,7 +603,7 @@ def capture_stdout
 
         it "adds an unsupported manifest plugin version issue" do
           doctor.send(:check_peer_dependencies)
-          expect(doctor.issues).to include(match(/rspack-manifest-plugin \^5\.2\.2/))
+          expect(doctor.issues).to include(match(/Declared rspack-manifest-plugin range.*\^5\.2\.2/))
         end
       end
 
@@ -619,7 +631,8 @@ def capture_stdout
         it "reports the stale declared ranges" do
           doctor.send(:check_peer_dependencies)
           expect(doctor.issues).to include(match(/Shakapacker supports Rspack v2 only/))
-          expect(doctor.issues).to include(match(/rspack-manifest-plugin \^5\.2\.2/))
+          expect(doctor.issues).to include(match(/Declared rspack-manifest-plugin range.*\^5\.2\.2/))
+          expect(doctor.issues).not_to include(match(/Unsupported rspack-manifest-plugin version/))
         end
       end
     end
@@ -2264,6 +2277,36 @@ def expect_paths_to_agree
       end
     end
 
+    context "with package in peerDependencies" do
+      before do
+        package_json = {
+          "peerDependencies" => {
+            "webpack" => "^5.0.0"
+          }
+        }
+        File.write(package_json_path, JSON.generate(package_json))
+      end
+
+      it "returns true" do
+        expect(doctor.send(:package_installed?, "webpack")).to be true
+      end
+    end
+
+    context "with package in optionalDependencies" do
+      before do
+        package_json = {
+          "optionalDependencies" => {
+            "webpack" => "^5.0.0"
+          }
+        }
+        File.write(package_json_path, JSON.generate(package_json))
+      end
+
+      it "returns true" do
+        expect(doctor.send(:package_installed?, "webpack")).to be true
+      end
+    end
+
     context "with package not installed" do
       before do
         File.write(package_json_path, JSON.generate({}))

test/package/environments/development-rspack-react-refresh.test.js

@@ -47,6 +47,12 @@ const hasReactRefreshPluginInstance = (environmentConfig) => {
   )
 }
 
+const swcReactTransforms = (environmentConfig) =>
+  (environmentConfig.module?.rules || [])
+    .flatMap((rule) => (Array.isArray(rule.use) ? rule.use : []))
+    .filter((loader) => loader.loader === "builtin:swc-loader")
+    .map((loader) => loader.options.jsc.transform.react)
+
 describe("Rspack React refresh development config", () => {
   afterEach(() => {
     jest.restoreAllMocks()
@@ -72,6 +78,17 @@ describe("Rspack React refresh development config", () => {
     ).toBe(true)
   })
 
+  test("enables the SWC React refresh transform when the plugin is loaded", () => {
+    const environmentConfig = loadRspackDevelopmentConfig()
+
+    expect(swcReactTransforms(environmentConfig)).toStrictEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ refresh: true }),
+        expect.objectContaining({ refresh: true })
+      ])
+    )
+  })
+
   test("skips the legacy direct CommonJS export shape", () => {
     const warn = jest.spyOn(console, "warn").mockImplementation(() => {})
     function ReactRefreshRspackPlugin() {}