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

data/package/optimization/rspack.js

@@ -1,6 +1,7 @@
 const { requireOrError } = require("../utils/requireOrError")
+const { error: logError } = require("../utils/debug")
 
-const { rspack } = requireOrError("@rspack/core")
+const rspack = requireOrError("@rspack/core")
 
 const getOptimization = () => {
   // Use Rspack's built-in minification instead of terser-webpack-plugin
@@ -11,10 +12,13 @@ const getOptimization = () => {
       new rspack.LightningCssMinimizerRspackPlugin()
     ]
   } catch (error) {
-    // eslint-disable-next-line no-console
-    console.warn(
-      "[SHAKAPACKER]: Warning: Could not configure Rspack minimizers:",
-      error.message
+    // Log full error with stack trace
+    logError(
+      `Failed to configure Rspack minimizers: ${error.message}\n${error.stack}`
+    )
+    // Re-throw the error to properly propagate it
+    throw new Error(
+      `Could not configure Rspack minimizers: ${error.message}. Please check that @rspack/core is properly installed.`
     )
   }
   return result

data/package/plugins/rspack.js

@@ -1,4 +1,3 @@
-const { existsSync, readFileSync } = require("fs")
 const { requireOrError } = require("../utils/requireOrError")
 
 const { RspackManifestPlugin } = requireOrError("rspack-manifest-plugin")
@@ -16,27 +15,7 @@ const getPlugins = () => {
       writeToFileEmit: true,
       // rspack-manifest-plugin uses different option names than webpack-assets-manifest
       generate: (seed, files, entrypoints) => {
-        let manifest = seed || {}
-
-        // Load existing manifest if it exists to handle concurrent builds
-        try {
-          if (existsSync(config.manifestPath)) {
-            const existingContent = readFileSync(config.manifestPath, "utf8")
-            const parsed = JSON.parse(existingContent)
-            if (parsed && typeof parsed === "object") {
-              manifest = {
-                ...manifest,
-                ...parsed
-              }
-            }
-          }
-        } catch (error) {
-          // eslint-disable-next-line no-console
-          console.warn(
-            "[SHAKAPACKER]: Warning: Could not read existing manifest.json:",
-            String(error)
-          )
-        }
+        const manifest = seed || {}
 
         // Add files mapping first
         files.forEach((file) => {
@@ -47,12 +26,17 @@ const getPlugins = () => {
         const entrypointsManifest = {}
         Object.entries(entrypoints).forEach(
           ([entrypointName, entrypointFiles]) => {
-            const jsFiles = entrypointFiles.filter((file) =>
-              file.endsWith(".js")
-            )
-            const cssFiles = entrypointFiles.filter((file) =>
-              file.endsWith(".css")
-            )
+            const jsFiles = entrypointFiles
+              .filter(
+                (file) => file.endsWith(".js") && !file.includes(".hot-update.")
+              )
+              .map((file) => config.publicPathWithoutCDN + file)
+            const cssFiles = entrypointFiles
+              .filter(
+                (file) =>
+                  file.endsWith(".css") && !file.includes(".hot-update.")
+              )
+              .map((file) => config.publicPathWithoutCDN + file)
 
             entrypointsManifest[entrypointName] = {
               assets: {

data/package/rspack/index.js

@@ -0,0 +1,57 @@
+/* eslint global-require: 0 */
+/* eslint import/no-dynamic-require: 0 */
+
+const webpackMerge = require("webpack-merge")
+const { resolve } = require("path")
+const { existsSync } = require("fs")
+const config = require("../config")
+const baseConfig = require("../environments/base")
+
+const rulesPath = resolve(__dirname, "../rules", "rspack.js")
+const rules = require(rulesPath)
+const devServer = require("../dev_server")
+const env = require("../env")
+const { moduleExists, canProcess } = require("../utils/helpers")
+const inliningCss = require("../utils/inliningCss")
+const { getPlugins } = require("../plugins/rspack")
+const { getOptimization } = require("../optimization/rspack")
+const { validateRspackDependencies } = require("../utils/validateDependencies")
+
+const generateRspackConfig = (extraConfig = {}, ...extraArgs) => {
+  // Validate required dependencies first
+  validateRspackDependencies()
+  if (extraArgs.length > 0) {
+    throw new Error(
+      "Only one extra config may be passed here - use webpack-merge to merge configs before passing them to Shakapacker"
+    )
+  }
+
+  const { nodeEnv } = env
+  const path = resolve(__dirname, "../environments", `${nodeEnv}.js`)
+  const environmentConfig = existsSync(path) ? require(path) : baseConfig
+
+  // Create base rspack config
+  const rspackConfig = {
+    ...environmentConfig,
+    module: {
+      rules
+    },
+    plugins: getPlugins(),
+    optimization: getOptimization()
+  }
+
+  return webpackMerge.merge({}, rspackConfig, extraConfig)
+}
+
+module.exports = {
+  config, // shakapacker.yml
+  devServer,
+  generateRspackConfig,
+  baseConfig,
+  env,
+  rules,
+  moduleExists,
+  canProcess,
+  inliningCss,
+  ...webpackMerge
+}

data/package/rules/babel.js

@@ -1,9 +1,9 @@
 const { loaderMatches } = require("../utils/helpers")
-const { webpack_loader: webpackLoader } = require("../config")
+const { javascript_transpiler: javascriptTranspiler } = require("../config")
 const { isProduction } = require("../env")
 const jscommon = require("./jscommon")
 
-module.exports = loaderMatches(webpackLoader, "babel", () => ({
+module.exports = loaderMatches(javascriptTranspiler, "babel", () => ({
   test: /\.(js|jsx|mjs|ts|tsx|coffee)?(\.erb)?$/,
   ...jscommon,
   use: [

data/package/rules/esbuild.js

@@ -1,9 +1,9 @@
 const { loaderMatches } = require("../utils/helpers")
 const { getEsbuildLoaderConfig } = require("../esbuild")
-const { webpack_loader: webpackLoader } = require("../config")
+const { javascript_transpiler: javascriptTranspiler } = require("../config")
 const jscommon = require("./jscommon")
 
-module.exports = loaderMatches(webpackLoader, "esbuild", () => ({
+module.exports = loaderMatches(javascriptTranspiler, "esbuild", () => ({
   test: /\.(ts|tsx|js|jsx|mjs|coffee)?(\.erb)?$/,
   ...jscommon,
   use: ({ resource }) => getEsbuildLoaderConfig(resource)

data/package/rules/raw.js

@@ -1,15 +1,15 @@
 const config = require("../config")
 
-const rspackRawConfig = {
+const rspackRawConfig = () => ({
   resourceQuery: /raw/,
   type: "asset/source"
-}
+})
 
-const webpackRawConfig = {
+const webpackRawConfig = () => ({
   test: /\.html$/,
   exclude: /\.(js|mjs|jsx|ts|tsx)$/,
   type: "asset/source"
-}
+})
 
 module.exports =
-  config.bundler === "rspack" ? rspackRawConfig : webpackRawConfig
+  config.assets_bundler === "rspack" ? rspackRawConfig() : webpackRawConfig()

data/package/rules/rspack.js

@@ -1,10 +1,14 @@
 /* eslint global-require: 0 */
 
 const { moduleExists } = require("../utils/helpers")
+const { debug, info, warn } = require("../utils/debug")
+
+debug("Loading Rspack rules configuration...")
 
 const rules = []
 
 // Use Rspack's built-in SWC loader for JavaScript files
+debug("Adding JavaScript rule with builtin:swc-loader")
 rules.push({
   test: /\.(js|jsx|mjs)$/,
   exclude: /node_modules/,
@@ -30,6 +34,7 @@ rules.push({
 })
 
 // Use Rspack's built-in SWC loader for TypeScript files
+debug("Adding TypeScript rule with builtin:swc-loader")
 rules.push({
   test: /\.(ts|tsx)$/,
   exclude: /node_modules/,
@@ -55,42 +60,103 @@ rules.push({
 })
 
 // CSS rules using Rspack's built-in CSS handling
+debug("Checking for CSS loader...")
 if (moduleExists("css-loader")) {
+  debug("css-loader found, loading CSS rule configuration...")
   const css = require("./css")
-  rules.push(css)
+  if (css) {
+    debug("Successfully added CSS rule")
+    rules.push(css)
+  } else {
+    warn("css-loader found but rule configuration returned null")
+  }
+} else {
+  info("Skipping CSS support - css-loader not installed")
 }
 
 // Sass rules
+debug("Checking for Sass loader...")
 if (moduleExists("sass") && moduleExists("sass-loader")) {
+  debug("sass and sass-loader found, loading Sass rule configuration...")
   const sass = require("./sass")
-  rules.push(sass)
+  if (sass) {
+    debug("Successfully added Sass rule")
+    rules.push(sass)
+  } else {
+    warn("sass and sass-loader found but rule configuration returned null")
+  }
+} else if (!moduleExists("sass")) {
+  info("Skipping Sass support - sass not installed")
+} else if (!moduleExists("sass-loader")) {
+  info("Skipping Sass support - sass-loader not installed")
 }
 
 // Less rules
+debug("Checking for Less loader...")
 if (moduleExists("less") && moduleExists("less-loader")) {
+  debug("less and less-loader found, loading Less rule configuration...")
   const less = require("./less")
-  rules.push(less)
+  if (less) {
+    debug("Successfully added Less rule")
+    rules.push(less)
+  } else {
+    warn("less and less-loader found but rule configuration returned null")
+  }
+} else if (!moduleExists("less")) {
+  info("Skipping Less support - less not installed")
+} else if (!moduleExists("less-loader")) {
+  info("Skipping Less support - less-loader not installed")
 }
 
 // Stylus rules
+debug("Checking for Stylus loader...")
 if (moduleExists("stylus") && moduleExists("stylus-loader")) {
+  debug("stylus and stylus-loader found, loading Stylus rule configuration...")
   const stylus = require("./stylus")
-  rules.push(stylus)
+  if (stylus) {
+    debug("Successfully added Stylus rule")
+    rules.push(stylus)
+  } else {
+    warn("stylus and stylus-loader found but rule configuration returned null")
+  }
+} else if (!moduleExists("stylus")) {
+  info("Skipping Stylus support - stylus not installed")
+} else if (!moduleExists("stylus-loader")) {
+  info("Skipping Stylus support - stylus-loader not installed")
 }
 
 // ERB template support
+debug("Checking for ERB template support...")
 const erb = require("./erb")
 
-rules.push(erb)
+if (erb) {
+  debug("Successfully added ERB rule")
+  rules.push(erb)
+} else {
+  info("Skipping ERB support - rails-erb-loader not installed")
+}
 
 // File/asset handling using Rspack's built-in asset modules
+debug("Adding file/asset handling rule...")
 const file = require("./file")
 
-rules.push(file)
+if (file) {
+  debug("Successfully added file/asset rule")
+  rules.push(file)
+} else {
+  warn("file rule configuration returned null")
+}
 
 // Raw file loading
+debug("Adding raw file loading rule...")
 const raw = require("./raw")
 
-rules.push(raw)
+if (raw) {
+  debug("Successfully added raw file rule")
+  rules.push(raw)
+} else {
+  warn("raw rule configuration returned null")
+}
 
+debug(`Rspack rules configuration complete. Total rules: ${rules.length}`)
 module.exports = rules

data/package/rules/swc.js

@@ -1,9 +1,9 @@
 const { loaderMatches } = require("../utils/helpers")
 const { getSwcLoaderConfig } = require("../swc")
-const { webpack_loader: webpackLoader } = require("../config")
+const { javascript_transpiler: javascriptTranspiler } = require("../config")
 const jscommon = require("./jscommon")
 
-module.exports = loaderMatches(webpackLoader, "swc", () => ({
+module.exports = loaderMatches(javascriptTranspiler, "swc", () => ({
   test: /\.(ts|tsx|js|jsx|mjs|coffee)?(\.erb)?$/,
   ...jscommon,
   use: ({ resource }) => getSwcLoaderConfig(resource)

data/package/utils/debug.js

@@ -0,0 +1,49 @@
+/**
+ * Debug utility for Shakapacker
+ * Provides conditional logging based on environment variables
+ */
+
+const isDebugMode = () => {
+  // Explicitly check for debug mode being disabled
+  if (process.env.SHAKAPACKER_DEBUG === "false") {
+    return false
+  }
+
+  // Support both SHAKAPACKER_DEBUG (new) and DEBUG_SHAKAPACKER (legacy) for backwards compatibility
+  return (
+    process.env.SHAKAPACKER_DEBUG === "true" ||
+    process.env.DEBUG_SHAKAPACKER === "true"
+  )
+}
+
+const debug = (message, ...args) => {
+  if (isDebugMode()) {
+    // eslint-disable-next-line no-console
+    console.log(`[Shakapacker] ${message}`, ...args)
+  }
+}
+
+const warn = (message, ...args) => {
+  // eslint-disable-next-line no-console
+  console.warn(`[Shakapacker] WARNING: ${message}`, ...args)
+}
+
+const error = (message, ...args) => {
+  // eslint-disable-next-line no-console
+  console.error(`[Shakapacker] ERROR: ${message}`, ...args)
+}
+
+const info = (message, ...args) => {
+  if (isDebugMode()) {
+    // eslint-disable-next-line no-console
+    console.info(`[Shakapacker] INFO: ${message}`, ...args)
+  }
+}
+
+module.exports = {
+  debug,
+  warn,
+  error,
+  info,
+  isDebugMode
+}

data/package/utils/getStyleRule.js

@@ -15,7 +15,7 @@ const getStyleRule = (test, preprocessors = []) => {
     // style-loader is required when using css modules with HMR on the webpack-dev-server
 
     const extractionPlugin =
-      config.bundle === "rspack"
+      config.assets_bundler === "rspack"
         ? requireOrError("@rspack/core").CssExtractRspackPlugin.loader
         : requireOrError("mini-css-extract-plugin").loader
 
@@ -40,8 +40,8 @@ const getStyleRule = (test, preprocessors = []) => {
       use
     }
 
-    if (config.bundle === "rspack") {
-      result.type = "javascript/auto" // Required for rspack CSS extraction
+    if (config.assets_bundler === "rspack") {
+      result.type = "javascript/auto"
     }
 
     return result

data/package/utils/requireOrError.js

@@ -7,7 +7,7 @@ const requireOrError = (moduleName) => {
     return require(moduleName)
   } catch (error) {
     throw new Error(
-      `[SHAKAPACKER]: ${moduleName} is required for ${config.bundler} but is not installed. View Shakapacker's documented dependencies at https://github.com/shakacode/shakapacker/tree/main/docs/peer-dependencies.md`
+      `[SHAKAPACKER]: ${moduleName} is required for ${config.assets_bundler} but is not installed. View Shakapacker's documented dependencies at https://github.com/shakacode/shakapacker/tree/main/docs/peer-dependencies.md`
     )
   }
 }

data/package/utils/validateDependencies.js

@@ -0,0 +1,61 @@
+/**
+ * Validates that required dependencies are installed for the selected bundler
+ */
+
+const { moduleExists } = require("./helpers")
+const { error } = require("./debug")
+
+const validateRspackDependencies = () => {
+  const requiredDependencies = ["@rspack/core", "rspack-manifest-plugin"]
+
+  const missingDependencies = requiredDependencies.filter(
+    (dep) => !moduleExists(dep)
+  )
+
+  if (missingDependencies.length > 0) {
+    error(
+      `Missing required dependencies for RSpack:\n${missingDependencies
+        .map((dep) => `  - ${dep}`)
+        .join(
+          "\n"
+        )}\n\nPlease install them with:\n  npm install ${missingDependencies.join(
+        " "
+      )}`
+    )
+    throw new Error(
+      `Missing RSpack dependencies: ${missingDependencies.join(", ")}`
+    )
+  }
+}
+
+const validateWebpackDependencies = () => {
+  const requiredDependencies = [
+    "webpack",
+    "webpack-cli",
+    "webpack-assets-manifest"
+  ]
+
+  const missingDependencies = requiredDependencies.filter(
+    (dep) => !moduleExists(dep)
+  )
+
+  if (missingDependencies.length > 0) {
+    error(
+      `Missing required dependencies for Webpack:\n${missingDependencies
+        .map((dep) => `  - ${dep}`)
+        .join(
+          "\n"
+        )}\n\nPlease install them with:\n  npm install ${missingDependencies.join(
+        " "
+      )}`
+    )
+    throw new Error(
+      `Missing Webpack dependencies: ${missingDependencies.join(", ")}`
+    )
+  }
+}
+
+module.exports = {
+  validateRspackDependencies,
+  validateWebpackDependencies
+}

data/package/webpackDevServerConfig.js

@@ -39,6 +39,7 @@ function createDevServerConfig() {
     devMiddleware: {
       publicPath
     },
+    hot: devServerYamlConfig.hmr,
     liveReload,
     historyApiFallback: {
       disableDotRule: true
@@ -47,6 +48,7 @@ function createDevServerConfig() {
       publicPath: contentBase
     }
   }
+  delete devServerYamlConfig.hmr
 
   if (devServerYamlConfig.static) {
     config.static = { ...config.static, ...devServerYamlConfig.static }

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shakapacker",
-  "version": "9.0.0-beta.0",
+  "version": "9.0.0-beta.2",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "homepage": "https://github.com/shakacode/shakapacker",
   "bugs": {

data/test/package/rules/esbuild.test.js

@@ -11,7 +11,7 @@ jest.mock("../../../package/config", () => {
   const original = jest.requireActual("../../../package/config")
   return {
     ...original,
-    webpack_loader: "esbuild",
+    javascript_transpiler: "esbuild",
     additional_paths: [...original.additional_paths, "node_modules/included"]
   }
 })

data/test/package/rules/swc.test.js

@@ -11,7 +11,7 @@ jest.mock("../../../package/config", () => {
   const original = jest.requireActual("../../../package/config")
   return {
     ...original,
-    webpack_loader: "swc",
+    javascript_transpiler: "swc",
     additional_paths: [...original.additional_paths, "node_modules/included"]
   }
 })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 9.0.0.beta.0
+  version: 9.0.0.beta.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -138,6 +138,8 @@ files:
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/STATUS.md"
+- ".github/workflows/claude-code-review.yml"
+- ".github/workflows/claude.yml"
 - ".github/workflows/dummy.yml"
 - ".github/workflows/generator.yml"
 - ".github/workflows/node.yml"
@@ -165,6 +167,7 @@ files:
 - docs/peer-dependencies.md
 - docs/react.md
 - docs/rspack.md
+- docs/rspack_migration_guide.md
 - docs/sprockets.md
 - docs/style_loader_vs_mini_css.md
 - docs/subresource_integrity.md
@@ -185,7 +188,6 @@ files:
 - lib/install/application.js
 - lib/install/bin/shakapacker
 - lib/install/bin/shakapacker-dev-server
-- lib/install/bin/shakapacker-rspack
 - lib/install/binstubs.rb
 - lib/install/config/rspack/rspack.config.js
 - lib/install/config/shakapacker.yml
@@ -245,6 +247,7 @@ files:
 - package/optimization/webpack.js
 - package/plugins/rspack.js
 - package/plugins/webpack.js
+- package/rspack/index.js
 - package/rules/babel.js
 - package/rules/coffee.js
 - package/rules/css.js
@@ -261,12 +264,14 @@ files:
 - package/rules/webpack.js
 - package/swc/index.js
 - package/utils/configPath.js
+- package/utils/debug.js
 - package/utils/defaultConfigPath.js
 - package/utils/getStyleRule.js
 - package/utils/helpers.js
 - package/utils/inliningCss.js
 - package/utils/requireOrError.js
 - package/utils/snakeToCamelCase.js
+- package/utils/validateDependencies.js
 - package/webpackDevServerConfig.js
 - prettier.config.js
 - shakapacker.gemspec
@@ -297,7 +302,7 @@ homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v9.0.0.beta.0
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v9.0.0.beta.2
 rdoc_options: []
 require_paths:
 - lib

data/lib/install/bin/shakapacker-rspack

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-ENV["RAILS_ENV"] ||= "development"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require "bundler/setup"
-require "shakapacker"
-require "shakapacker/rspack_runner"
-
-APP_ROOT = File.expand_path("..", __dir__)
-Dir.chdir(APP_ROOT) do
-  Shakapacker::RspackRunner.run(ARGV)
-end