shakapacker 9.3.0.beta.5 → 9.3.0.beta.7

data/package/configExporter/yamlSerializer.ts

@@ -147,6 +147,22 @@ export class YamlSerializer {
 
     arr.forEach((item, index) => {
       const itemPath = `${keyPath}[${index}]`
+
+      // Check if this is a plugin object and add its name as a comment
+      const pluginName = this.getConstructorName(item)
+      const isPlugin = pluginName && /(^|\.)plugins\[\d+\]/.test(itemPath)
+      const isEmpty =
+        typeof item === "object" &&
+        item !== null &&
+        !Array.isArray(item) &&
+        Object.keys(item).length === 0
+
+      // For non-empty plugins, add comment before the plugin
+      // For empty plugins, the name will be shown inline
+      if (isPlugin && !isEmpty) {
+        lines.push(`${itemIndent}# ${pluginName}`)
+      }
+
       const serialized = this.serializeValue(item, indent + 4, itemPath)
 
       // Add documentation for array items if available
@@ -200,7 +216,13 @@ export class YamlSerializer {
 
   private serializeObject(obj: any, indent: number, keyPath: string): string {
     const keys = Object.keys(obj)
+    const constructorName = this.getConstructorName(obj)
+
+    // For empty objects, show constructor name if available
     if (keys.length === 0) {
+      if (constructorName) {
+        return `{} # ${constructorName}`
+      }
       return "{}"
     }
 
@@ -277,4 +299,18 @@ export class YamlSerializer {
 
     return "./" + rel
   }
+
+  /**
+   * Extracts the constructor name from an object
+   * Returns null for plain objects (Object constructor)
+   */
+  private getConstructorName(obj: any): string | null {
+    if (!obj || typeof obj !== "object") return null
+    if (Array.isArray(obj)) return null
+
+    const constructorName = obj.constructor?.name
+    if (!constructorName || constructorName === "Object") return null
+
+    return constructorName
+  }
 }

data/package/plugins/webpack.ts

@@ -3,7 +3,7 @@ const { requireOrError } = require("../utils/requireOrError")
 const WebpackAssetsManifest = requireOrError("webpack-assets-manifest")
 const webpack = requireOrError("webpack")
 const config = require("../config")
-const { isProduction } = require("../env")
+const { isProduction, isDevelopment } = require("../env")
 const { moduleExists } = require("../utils/helpers")
 
 const getPlugins = (): unknown[] => {
@@ -15,6 +15,7 @@ const getPlugins = (): unknown[] => {
   const plugins = [
     new webpack.EnvironmentPlugin(process.env),
     new WebpackAssetsManifestConstructor({
+      merge: isDevelopment,
       entrypoints: true,
       writeToDisk: true,
       output: config.manifestPath,

data/package/utils/errorCodes.ts

@@ -165,6 +165,7 @@ export const ErrorMessages: Record<ErrorCode, string> = {
  */
 export class ShakapackerError extends Error {
   public readonly code: ErrorCode
+
   public readonly details?: Record<string, any>
 
   constructor(

data/package/utils/errorHelpers.ts

@@ -36,12 +36,14 @@ export function createFileOperationError(
   filePath: string,
   details?: string
 ): ShakapackerError {
-  const errorCode =
-    operation === "read"
-      ? ErrorCode.FILE_READ_ERROR
-      : operation === "write"
-        ? ErrorCode.FILE_WRITE_ERROR
-        : ErrorCode.FILE_NOT_FOUND
+  let errorCode: ErrorCode
+  if (operation === "read") {
+    errorCode = ErrorCode.FILE_READ_ERROR
+  } else if (operation === "write") {
+    errorCode = ErrorCode.FILE_WRITE_ERROR
+  } else {
+    errorCode = ErrorCode.FILE_NOT_FOUND
+  }
 
   return new ShakapackerError(errorCode, {
     path: filePath,
@@ -60,12 +62,14 @@ export function createFileOperationErrorLegacy(
 ): Error {
   const baseMessage = `Failed to ${operation} file at path '${filePath}'`
   const errorDetails = details ? ` - ${details}` : ""
-  const suggestion =
-    operation === "read"
-      ? " (check if file exists and permissions are correct)"
-      : operation === "write"
-        ? " (check write permissions and disk space)"
-        : " (check permissions)"
+  let suggestion: string
+  if (operation === "read") {
+    suggestion = " (check if file exists and permissions are correct)"
+  } else if (operation === "write") {
+    suggestion = " (check write permissions and disk space)"
+  } else {
+    suggestion = " (check permissions)"
+  }
   return new Error(`${baseMessage}${errorDetails}${suggestion}`)
 }
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shakapacker",
-  "version": "9.3.0-beta.5",
+  "version": "9.3.0-beta.7",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "homepage": "https://github.com/shakacode/shakapacker",
   "bugs": {
@@ -32,7 +32,7 @@
   ],
   "scripts": {
     "clean:ts": "find package -name '*.ts' -not -name '*.d.ts' | sed 's/\\.ts$//' | xargs -I {} rm -f {}.js {}.d.ts {}.d.ts.map {}.js.map",
-    "build": "tsc && cp package/index.d.ts.template package/index.d.ts && node scripts/remove-use-strict.js && yarn prettier --write 'package/**/*.js'",
+    "build": "tsc && cp package/index.d.ts.template package/index.d.ts && node scripts/remove-use-strict.js && yarn prettier --write 'package/**/*.js' 'package/**/*.ts'",
     "build:types": "tsc",
     "knip": "knip",
     "knip:production": "knip --production",

data/test/configExporter/integration.test.js

@@ -127,21 +127,21 @@ builds:
 
       // Should have 3 files (one per build)
       expect(files).toHaveLength(3)
-      expect(files).toContain("webpack-dev-hmr-client.yaml")
-      expect(files).toContain("webpack-dev-client.yaml")
-      expect(files).toContain("webpack-prod-client.yaml")
+      expect(files).toContain("webpack-dev-hmr-client.yml")
+      expect(files).toContain("webpack-dev-client.yml")
+      expect(files).toContain("webpack-prod-client.yml")
 
       // Verify files have different content (proving environment isolation)
       const devHmrContent = require("fs").readFileSync(
-        join(outputDir, "webpack-dev-hmr-client.yaml"),
+        join(outputDir, "webpack-dev-hmr-client.yml"),
         "utf8"
       )
       const devContent = require("fs").readFileSync(
-        join(outputDir, "webpack-dev-client.yaml"),
+        join(outputDir, "webpack-dev-client.yml"),
         "utf8"
       )
       const prodContent = require("fs").readFileSync(
-        join(outputDir, "webpack-prod-client.yaml"),
+        join(outputDir, "webpack-prod-client.yml"),
         "utf8"
       )
 
@@ -195,8 +195,8 @@ builds:
       // Verify files
       expect(existsSync(outputDir)).toBe(true)
       const files = readdirSync(outputDir)
-      expect(files).toContain("webpack-custom-dev-client.yaml")
-      expect(files).toContain("webpack-custom-prod-client.yaml")
+      expect(files).toContain("webpack-custom-dev-client.yml")
+      expect(files).toContain("webpack-custom-prod-client.yml")
     })
 
     it("should use fallback builds when no config file exists", () => {

data/test/package/configExporter.test.js

@@ -23,7 +23,7 @@ describe("configExporter", () => {
         "client",
         "yaml"
       )
-      expect(filename).toBe("webpack-development-client.yaml")
+      expect(filename).toBe("webpack-development-client.yml")
     })
 
     test("generates correct filename for server config", () => {
@@ -34,7 +34,7 @@ describe("configExporter", () => {
         "server",
         "yaml"
       )
-      expect(filename).toBe("webpack-production-server.yaml")
+      expect(filename).toBe("webpack-production-server.yml")
     })
 
     test("generates correct filename for client-hmr config", () => {
@@ -45,7 +45,7 @@ describe("configExporter", () => {
         "client-hmr",
         "yaml"
       )
-      expect(filename).toBe("webpack-development-client-hmr.yaml")
+      expect(filename).toBe("webpack-development-client-hmr.yml")
     })
 
     test("generates correct filename for json format", () => {
@@ -58,6 +58,51 @@ describe("configExporter", () => {
       )
       expect(filename).toBe("rspack-production-client.json")
     })
+
+    test("generates correct filename for custom output name client-modern", () => {
+      const { FileWriter } = require("../../package/configExporter/fileWriter")
+      const filename = FileWriter.generateFilename(
+        "webpack",
+        "development",
+        "client-modern",
+        "yaml"
+      )
+      expect(filename).toBe("webpack-development-client-modern.yml")
+    })
+
+    test("generates correct filename for custom output name client-legacy", () => {
+      const { FileWriter } = require("../../package/configExporter/fileWriter")
+      const filename = FileWriter.generateFilename(
+        "webpack",
+        "production",
+        "client-legacy",
+        "yaml"
+      )
+      expect(filename).toBe("webpack-production-client-legacy.yml")
+    })
+
+    test("generates correct filename for custom output name server-bundle", () => {
+      const { FileWriter } = require("../../package/configExporter/fileWriter")
+      const filename = FileWriter.generateFilename(
+        "rspack",
+        "development",
+        "server-bundle",
+        "yaml"
+      )
+      expect(filename).toBe("rspack-development-server-bundle.yml")
+    })
+
+    test("generates correct filename with buildName override", () => {
+      const { FileWriter } = require("../../package/configExporter/fileWriter")
+      const filename = FileWriter.generateFilename(
+        "webpack",
+        "development",
+        "client-modern",
+        "yaml",
+        "dev-hmr"
+      )
+      expect(filename).toBe("webpack-dev-hmr-client-modern.yml")
+    })
   })
 
   describe("environment variable preservation in runDoctorMode", () => {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shakapacker
 version: !ruby/object:Gem::Version
-  version: 9.3.0.beta.5
+  version: 9.3.0.beta.7
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -181,7 +181,7 @@ files:
 - docs/deployment.md
 - docs/developing_shakapacker.md
 - docs/early_hints.md
-- docs/early_hints_new_api.md
+- docs/early_hints_manual_api.md
 - docs/feature_testing.md
 - docs/optional-peer-dependencies.md
 - docs/peer-dependencies.md
@@ -273,7 +273,6 @@ files:
 - lib/tasks/shakapacker/switch_bundler.rake
 - lib/tasks/shakapacker/verify_config.rake
 - lib/tasks/shakapacker/verify_install.rake
-- package-lock.json
 - package.json
 - package/.npmignore
 - package/babel/preset.ts
@@ -385,7 +384,7 @@ homepage: https://github.com/shakacode/shakapacker
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/shakacode/shakapacker/tree/v9.3.0.beta.5
+  source_code_uri: https://github.com/shakacode/shakapacker/tree/v9.3.0.beta.7
 rdoc_options: []
 require_paths:
 - lib