shakapacker 9.0.0.beta.10 → 9.0.0.beta.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1157b2b32dc1e415593d4b3386abcdc6dc0e8d5b8863d34ca418c4e3333ca9f1
-  data.tar.gz: 83787074dfb2bce32284997b1312262e28b086ebc7e5bfcd11b647859268b842
+  metadata.gz: 8e0621d94ac8535638e4678fba06be1449ec6c5705dfd94877866344f9b4784f
+  data.tar.gz: 7727840c175b5b5a710e6f74d5f69b0ad6bbd4a810ec180b38218f2ab435f062
 SHA512:
-  metadata.gz: 888e0bbb28ede4eeea180a4a60885a49c073a6aec63f1f84db15c130624b7d8b79f903a66af640e996ddb7985ce022c781c6113dc1f274d4b6f60f59f6851733
-  data.tar.gz: 432465adefccd3610b99ec23b6551e89a9cc39e658b475f70664af1791587f574f2b4bcb2c833aa1dad7bc11ad06c9dff52f5892b3b914c5629a58f327e90d92
+  metadata.gz: 126010b0c2bcf735ff324f38a4bddc93435540f543b17c233112535696bfcb0f8005aef1a55563a7cf1526ac5fa4248c9dd6c7e3d04fd17d44348d7b5e9e3f34
+  data.tar.gz: cd8fa6305ed923e30421ef5e427118bfe2d6fcdd3a592c673af5e25340ac047aa34e3fa30b6fe66dfde0e6054b16cf03d48b6d2701b4830cf5164360331052f7

data/Gemfile.lock

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

data/docs/transpiler-migration.md

@@ -22,10 +22,10 @@ Set the transpiler in your `config/shakapacker.yml`:
 default: &default
   # For webpack users (babel is default, no change needed)
   javascript_transpiler: babel
-  
+
   # To opt-in to SWC for better performance
   javascript_transpiler: swc
-  
+
   # For rspack users (swc is default, no change needed)
   assets_bundler: rspack
   javascript_transpiler: swc
@@ -53,30 +53,26 @@ default: &default
 
 #### 3. Create SWC configuration (optional)
 
-If you need custom transpilation settings, create `.swcrc`:
-
-```json
-{
-  "$schema": "https://json.schemastore.org/swcrc",
-  "jsc": {
-    "parser": {
-      "syntax": "ecmascript",
-      "jsx": true,
-      "dynamicImport": true
-    },
-    "transform": {
-      "react": {
-        "runtime": "automatic"
+If you need custom transpilation settings, create `config/swc.config.js`:
+
+```javascript
+// config/swc.config.js
+// This file is merged with Shakapacker's default SWC configuration
+// See: https://swc.rs/docs/configuration/compilation
+
+module.exports = {
+  jsc: {
+    transform: {
+      react: {
+        runtime: "automatic"
       }
-    },
-    "target": "es2015"
-  },
-  "module": {
-    "type": "es6"
+    }
   }
 }
 ```
 
+**Important:** Use `config/swc.config.js` instead of `.swcrc`. The `.swcrc` file completely overrides Shakapacker's default SWC settings and can cause build failures. `config/swc.config.js` properly merges with Shakapacker's defaults.
+
 #### 4. Update React configuration (if using React)
 
 For React projects, ensure you have the correct refresh plugin:
@@ -93,11 +89,11 @@ yarn add --dev @rspack/plugin-react-refresh
 
 Typical build time improvements when migrating from Babel to SWC:
 
-| Project Size | Babel | SWC | Improvement |
-|-------------|-------|-----|-------------|
-| Small (<100 files) | 5s | 1s | 5x faster |
-| Medium (100-500 files) | 20s | 3s | 6.7x faster |
-| Large (500+ files) | 60s | 8s | 7.5x faster |
+| Project Size           | Babel | SWC | Improvement |
+| ---------------------- | ----- | --- | ----------- |
+| Small (<100 files)     | 5s    | 1s  | 5x faster   |
+| Medium (100-500 files) | 20s   | 3s  | 6.7x faster |
+| Large (500+ files)     | 60s   | 8s  | 7.5x faster |
 
 ### Compatibility Notes
 
@@ -125,7 +121,7 @@ If you encounter issues, rolling back is simple:
 ```yaml
 # config/shakapacker.yml
 default: &default
-  javascript_transpiler: babel  # Revert to babel
+  javascript_transpiler: babel # Revert to babel
 ```
 
 Then rebuild your application:
@@ -165,20 +161,21 @@ yarn add --dev @swc/core swc-loader
 # Webpack
 yarn add --dev @pmmmwh/react-refresh-webpack-plugin
 
-# Rspack  
+# Rspack
 yarn add --dev @rspack/plugin-react-refresh
 ```
 
 ### Issue: Decorators not working
 
-**Solution**: Enable decorator support in `.swcrc`:
+**Solution**: Enable decorator support in `config/swc.config.js`:
 
-```json
-{
-  "jsc": {
-    "parser": {
-      "decorators": true,
-      "decoratorsBeforeExport": true
+```javascript
+// config/swc.config.js
+module.exports = {
+  jsc: {
+    parser: {
+      decorators: true,
+      decoratorsBeforeExport: true
     }
   }
 }
@@ -188,4 +185,4 @@ yarn add --dev @rspack/plugin-react-refresh
 
 - [SWC Documentation](https://swc.rs/docs/getting-started)
 - [Babel to SWC Migration Guide](https://swc.rs/docs/migrating-from-babel)
-- [Rspack Configuration](https://www.rspack.dev/config/index)
+- [Rspack Configuration](https://www.rspack.dev/config/index)

data/lib/shakapacker/doctor.rb

@@ -442,18 +442,17 @@ module Shakapacker
 
       def check_swc_config_conflicts
         swcrc_path = root_path.join(".swcrc")
-        return unless swcrc_path.exist?
+        swc_config_path = root_path.join("config/swc.config.js")
 
-        begin
-          swcrc = JSON.parse(File.read(swcrc_path))
-          # Check for conflicting jsc.target and env settings
-          if swcrc.dig("jsc", "target") && swcrc["env"]
-            @issues << "SWC configuration conflict: .swcrc contains both 'jsc.target' and 'env' settings, which are mutually exclusive. Remove 'jsc.target' from .swcrc"
-          elsif swcrc.dig("jsc", "target")
-            @warnings << "SWC configuration: .swcrc contains 'jsc.target' which may conflict with the loader's 'env' setting. Consider removing 'jsc.target' from .swcrc to avoid build errors"
-          end
-        rescue JSON::ParserError
-          @warnings << "SWC configuration: .swcrc exists but contains invalid JSON"
+        if swcrc_path.exist?
+          @warnings << "SWC configuration: .swcrc file detected. This file completely overrides Shakapacker's default SWC settings and may cause build failures. " \
+                      "Please migrate to config/swc.config.js which properly merges with Shakapacker defaults. " \
+                      "To migrate: Move your custom settings from .swcrc to config/swc.config.js (see docs for format). " \
+                      "See: https://github.com/shakacode/shakapacker/blob/main/docs/using_swc_loader.md"
+        end
+
+        if swc_config_path.exist?
+          @info << "SWC configuration: Using config/swc.config.js (recommended). This config is merged with Shakapacker's defaults."
         end
       end
 

data/lib/shakapacker/swc_migrator.rb

@@ -8,8 +8,9 @@ module Shakapacker
   class SwcMigrator
     attr_reader :root_path, :logger
 
+    # Babel packages safe to remove when migrating to SWC
+    # Note: @babel/core and @babel/eslint-parser are excluded as they may be needed for ESLint
     BABEL_PACKAGES = [
-      "@babel/core",
       "@babel/plugin-proposal-class-properties",
       "@babel/plugin-proposal-object-rest-spread",
       "@babel/plugin-syntax-dynamic-import",
@@ -25,6 +26,12 @@ module Shakapacker
       "babel-plugin-transform-react-remove-prop-types"
     ].freeze
 
+    # Babel packages that may be needed for ESLint - only remove if user explicitly confirms
+    ESLINT_BABEL_PACKAGES = [
+      "@babel/core",
+      "@babel/eslint-parser"
+    ].freeze
+
     SWC_PACKAGES = {
       "@swc/core" => "^1.7.39",
       "swc-loader" => "^0.2.6"
@@ -39,23 +46,21 @@ module Shakapacker
       .eslintrc.json
     ].freeze
 
-    DEFAULT_SWCRC_CONFIG = {
-      "jsc" => {
-        "parser" => {
-          "syntax" => "ecmascript",
-          "jsx" => true,
-          "dynamicImport" => true
-        },
-        "transform" => {
-          "react" => {
-            "runtime" => "automatic"
+    DEFAULT_SWC_CONFIG = <<~JS.freeze
+      // config/swc.config.js
+      // This file is merged with Shakapacker's default SWC configuration
+      // See: https://swc.rs/docs/configuration/compilation
+
+      module.exports = {
+        jsc: {
+          transform: {
+            react: {
+              runtime: "automatic"
+            }
           }
         }
-      },
-      "module" => {
-        "type" => "es6"
       }
-    }.freeze
+    JS
 
     def initialize(root_path, logger: nil)
       @root_path = Pathname.new(root_path)
@@ -68,7 +73,7 @@ module Shakapacker
       results = {
         config_updated: update_shakapacker_config,
         packages_installed: install_swc_packages,
-        swcrc_created: create_swcrc,
+        swc_config_created: create_swc_config,
         babel_packages_found: find_babel_packages
       }
 
@@ -76,9 +81,9 @@ module Shakapacker
       logger.info "   Note: SWC is approximately 20x faster than Babel for transpilation."
       logger.info "   Please test your application thoroughly after migration."
       logger.info "\n📝 Configuration Info:"
-      logger.info "   - .swcrc provides base configuration for all environments"
-      logger.info "   - The SWC loader adds automatic environment targeting (via 'env' setting)"
-      logger.info "   - You can customize .swcrc, but avoid setting 'jsc.target' as it conflicts with 'env'"
+      logger.info "   - config/swc.config.js is merged with Shakapacker's default SWC configuration"
+      logger.info "   - You can customize config/swc.config.js to add additional options"
+      logger.info "   - Avoid using .swcrc as it overrides Shakapacker defaults completely"
 
       # Show cleanup recommendations if babel packages found
       if results[:babel_packages_found].any?
@@ -108,20 +113,21 @@ module Shakapacker
       package_json_path = root_path.join("package.json")
       unless package_json_path.exist?
         logger.error "❌ No package.json found"
-        return { removed_packages: [], config_files_deleted: [] }
+        return { removed_packages: [], config_files_deleted: [], preserved_packages: [] }
       end
 
       # Check if ESLint uses Babel parser
+      preserved_for_eslint = []
       if eslint_uses_babel?
-        logger.info "\n⚠️  WARNING: ESLint configuration detected that may use Babel"
-        logger.info "   If you use @babel/eslint-parser or babel-eslint, you may need to:"
-        logger.info "   1. Keep @babel/core and related Babel packages for ESLint"
-        logger.info "   2. Or switch to @typescript-eslint/parser for TypeScript files"
-        logger.info "   3. Or use espree (ESLint's default parser) for JavaScript files"
-        logger.info "\n   Proceeding with Babel package removal. Check your ESLint config after."
+        logger.info "\n⚠️  ESLint configuration detected that uses Babel parser"
+        logger.info "   Preserving @babel/core and @babel/eslint-parser for ESLint compatibility"
+        logger.info "   To switch ESLint parser:"
+        logger.info "   1. For TypeScript: use @typescript-eslint/parser"
+        logger.info "   2. For JavaScript: use espree (ESLint's default parser)"
+        preserved_for_eslint = ESLINT_BABEL_PACKAGES
       end
 
-      removed_packages = remove_babel_from_package_json(package_json_path)
+      removed_packages = remove_babel_from_package_json(package_json_path, preserve: preserved_for_eslint)
       deleted_files = delete_babel_config_files
 
       if removed_packages.any?
@@ -131,7 +137,7 @@ module Shakapacker
         logger.info "ℹ️  No Babel packages found to remove"
       end
 
-      { removed_packages: removed_packages, config_files_deleted: deleted_files }
+      { removed_packages: removed_packages, config_files_deleted: deleted_files, preserved_packages: preserved_for_eslint }
     end
 
     def find_babel_packages
@@ -144,7 +150,9 @@ module Shakapacker
         dev_dependencies = package_json["devDependencies"] || {}
         all_deps = dependencies.merge(dev_dependencies)
 
-        found_packages = BABEL_PACKAGES.select { |pkg| all_deps.key?(pkg) }
+        # Find all babel packages (including ESLint-related ones for display)
+        all_babel_packages = BABEL_PACKAGES + ESLINT_BABEL_PACKAGES
+        found_packages = all_babel_packages.select { |pkg| all_deps.key?(pkg) }
         found_packages
       rescue JSON::ParserError => e
         logger.error "Failed to parse package.json: #{e.message}"
@@ -174,6 +182,11 @@ module Shakapacker
           begin
             package_json = JSON.parse(File.read(package_json_path))
             if package_json["eslintConfig"]
+              # Check parser field explicitly
+              parser = package_json["eslintConfig"]["parser"]
+              return true if parser && parser.match?(/@babel\/eslint-parser|babel-eslint/)
+
+              # Also check entire config for babel parser references (catches nested configs)
               return true if package_json["eslintConfig"].to_json.match?(/@babel\/eslint-parser|babel-eslint/)
             end
 
@@ -254,29 +267,35 @@ module Shakapacker
         {}
       end
 
-      def create_swcrc
-        swcrc_path = root_path.join(".swcrc")
-        if swcrc_path.exist?
-          logger.info "ℹ️  .swcrc already exists"
+      def create_swc_config
+        config_dir = root_path.join("config")
+        swc_config_path = config_dir.join("swc.config.js")
+
+        if swc_config_path.exist?
+          logger.info "ℹ️  config/swc.config.js already exists"
           return false
         end
 
-        logger.info "📄 Creating .swcrc configuration..."
-        File.write(swcrc_path, JSON.pretty_generate(DEFAULT_SWCRC_CONFIG) + "\n")
-        logger.info "✅ .swcrc created"
+        FileUtils.mkdir_p(config_dir) unless config_dir.exist?
+
+        logger.info "📄 Creating config/swc.config.js..."
+        File.write(swc_config_path, DEFAULT_SWC_CONFIG)
+        logger.info "✅ config/swc.config.js created"
         true
       rescue StandardError => e
-        logger.error "Failed to create .swcrc: #{e.message}"
+        logger.error "Failed to create config/swc.config.js: #{e.message}"
         false
       end
 
-      def remove_babel_from_package_json(package_json_path)
+      def remove_babel_from_package_json(package_json_path, preserve: [])
         package_json = JSON.parse(File.read(package_json_path))
         dependencies = package_json["dependencies"] || {}
         dev_dependencies = package_json["devDependencies"] || {}
         removed_packages = []
 
         BABEL_PACKAGES.each do |package|
+          next if preserve.include?(package)
+
           if dependencies.delete(package)
             removed_packages << package
             logger.info "  - Removed #{package} from dependencies"
@@ -287,6 +306,13 @@ module Shakapacker
           end
         end
 
+        # Log preserved packages
+        preserve.each do |package|
+          if dependencies[package] || dev_dependencies[package]
+            logger.info "  - Preserved #{package} (needed for ESLint)"
+          end
+        end
+
         if removed_packages.any?
           package_json["dependencies"] = dependencies
           package_json["devDependencies"] = dev_dependencies

data/lib/shakapacker/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shakapacker",
-  "version": "9.0.0-beta.10",
+  "version": "9.0.0-beta.11",
   "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.0.0.beta.10
+  version: 9.0.0.beta.11
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -347,7 +347,7 @@ homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v9.0.0.beta.10
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v9.0.0.beta.11
 rdoc_options: []
 require_paths:
 - lib