Address remaining review comments for merge

Author: justin808

Procfile.dev-prod-assets

@@ -7,4 +7,4 @@ redis: redis-server
 # upon saving rather than when you refresh your browser page.
 # Note, if using React on Rails localization you will need to run
 # `bundle exec rake react_on_rails:locale` before you run bin/shakapacker
-rspack: sh -c 'bundle exec rake react_on_rails:locale && rm -rf public/packs/* && bin/shakapacker -w'
+rspack: sh -c 'bundle exec rake react_on_rails:locale && (rm -rf public/packs/* || true) && bin/shakapacker -w'

Procfile.dev-static

@@ -8,4 +8,4 @@ redis: redis-server
 # Note, if using React on Rails localization you will need to run
 # `bundle exec rake react_on_rails:locale` before you run bin/shakapacker
 # Sleep 5 to allow other rescript files to build
-rspack: sleep 5 && sh -c 'bundle exec rake react_on_rails:locale && rm -rf public/packs/* && bin/shakapacker -w'
+rspack: sleep 5 && sh -c 'bundle exec rake react_on_rails:locale && (rm -rf public/packs/* || true) && bin/shakapacker -w'

Procfile.dev-static-assets

@@ -7,4 +7,4 @@ redis: redis-server
 # upon saving rather than when you refresh your browser page.
 # Note, if using React on Rails localization you will need to run
 # `bundle exec rake react_on_rails:locale` before you run bin/shakapacker
-rspack: sh -c 'bundle exec rake react_on_rails:locale && rm -rf public/packs/* && bin/shakapacker -w'
+rspack: sh -c 'bundle exec rake react_on_rails:locale && (rm -rf public/packs/* || true) && bin/shakapacker -w'

README.md

@@ -197,7 +197,7 @@ assets_bundler: rspack
 ### Configuration Files
 
 All bundler configuration is in `config/webpack/`:
-- `webpack.config.js` - Main Shakapacker entry point
+- `webpackConfig.js` - Main Shakapacker entry point
 - `commonWebpackConfig.js` - Shared configuration
 - `clientWebpackConfig.js` - Client bundle settings
 - `serverWebpackConfig.js` - Server-side rendering bundle

client/__tests__/webpack/bundlerUtils.spec.js

@@ -80,12 +80,12 @@ describe('bundlerUtils', () => {
       expect(utils.isRspack()).toBe(true);
     });
 
-    it('returns true when assets_bundler is webpack', () => {
+    it('returns false when assets_bundler is webpack', () => {
       mockConfig.assets_bundler = 'webpack';
       jest.doMock('shakapacker', () => ({ config: mockConfig }));
       const utils = require('../../../config/webpack/bundlerUtils');
 
-      expect(utils.isRspack()).toBe(true);
+      expect(utils.isRspack()).toBe(false);
     });
   });
 

config/webpack/bundlerUtils.js

@@ -38,11 +38,11 @@ const getBundler = () => {
 };
 
 /**
- * Indicates this repository is standardized on Rspack.
+ * Checks whether the configured bundler is Rspack.
  *
- * @returns {boolean} Always true
+ * @returns {boolean} True when assets_bundler is rspack
  */
-const isRspack = () => true;
+const isRspack = () => config.assets_bundler === 'rspack';
 
 /**
  * Gets the CSS extraction plugin for Rspack.