shakapacker 8.0.2 → 9.2.0

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shakapacker",
-  "version": "8.0.2",
+  "version": "9.2.0",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "homepage": "https://github.com/shakacode/shakapacker",
   "bugs": {
@@ -14,65 +14,201 @@
   "author": "David Heinemeier Hansson <david@basecamp.com>, Justin Gordon <justin@shakacode.com>",
   "main": "package/index.js",
   "types": "package/index.d.ts",
+  "exports": {
+    ".": "./package/index.js",
+    "./types": "./package/types/index.js",
+    "./webpack": "./package/webpack/index.js",
+    "./rspack": "./package/rspack/index.js",
+    "./swc": "./package/swc/index.js",
+    "./esbuild": "./package/esbuild/index.js",
+    "./configExporter": "./package/configExporter/index.js",
+    "./package.json": "./package.json",
+    "./package/babel/preset.js": "./package/babel/preset.js",
+    "./package/*": "./package/*"
+  },
   "files": [
     "package",
     "lib/install/config/shakapacker.yml"
   ],
   "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 && node scripts/remove-use-strict.js && yarn prettier --write 'package/**/*.js'",
+    "build:types": "tsc",
     "lint": "eslint .",
-    "test": "jest"
+    "lint:fast": "eslint . --ext .js,.jsx,.ts,.tsx --config .eslintrc.fast.js",
+    "test": "jest",
+    "type-check": "tsc --noEmit",
+    "prepublishOnly": "yarn build && yarn type-check"
   },
   "dependencies": {
     "js-yaml": "^4.1.0",
-    "path-complete-extname": "^1.0.0"
+    "path-complete-extname": "^1.0.0",
+    "webpack-merge": "^5.8.0"
   },
   "devDependencies": {
+    "@rspack/cli": "^1.4.11",
+    "@rspack/core": "^1.4.11",
+    "@swc/core": "^1.3.0",
+    "@types/babel__core": "^7.20.5",
+    "@types/js-yaml": "^4.0.9",
+    "@types/node": "^24.5.2",
+    "@types/path-complete-extname": "^1.0.3",
+    "@types/webpack": "^5.28.5",
+    "@types/webpack-dev-server": "^4.7.2",
+    "@types/webpack-merge": "^5.0.0",
+    "@typescript-eslint/eslint-plugin": "^8.45.0",
+    "@typescript-eslint/parser": "^8.45.0",
     "babel-loader": "^8.2.4",
     "compression-webpack-plugin": "^9.0.0",
+    "css-loader": "^7.1.2",
     "esbuild-loader": "^2.18.0",
     "eslint": "^8.0.0",
-    "eslint-config-airbnb": "^19.0.0",
+    "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest": "^27.9.0",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-react": "^7.26.0",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
+    "eslint-plugin-prettier": "^5.2.6",
+    "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "jest": "^28.1.3",
+    "husky": "^9.1.7",
+    "jest": "^29.7.0",
+    "lint-staged": "^15.2.10",
     "memory-fs": "^0.5.0",
+    "mini-css-extract-plugin": "^2.9.4",
     "prettier": "^3.2.5",
+    "rspack-manifest-plugin": "^5.0.3",
+    "sass-loader": "^16.0.5",
     "swc-loader": "^0.1.15",
     "thenify": "^3.3.1",
-    "webpack": "^5.72.0",
+    "typescript": "^5.9.2",
+    "webpack": "5.93.0",
     "webpack-assets-manifest": "^5.0.6",
-    "webpack-merge": "^5.8.0"
+    "webpack-subresource-integrity": "^5.1.0"
   },
   "peerDependencies": {
     "@babel/core": "^7.17.9",
     "@babel/plugin-transform-runtime": "^7.17.0",
     "@babel/preset-env": "^7.16.11",
     "@babel/runtime": "^7.17.9",
+    "@rspack/cli": "^1.0.0",
+    "@rspack/core": "^1.0.0",
+    "@rspack/plugin-react-refresh": "^1.0.0",
+    "@swc/core": "^1.3.0",
     "@types/babel__core": "^7.0.0",
     "@types/webpack": "^5.0.0",
-    "babel-loader": "^8.2.4 || ^9.0.0",
-    "compression-webpack-plugin": "^9.0.0 || ^10.0.0|| ^11.0.0",
+    "babel-loader": "^8.2.4 || ^9.0.0 || ^10.0.0",
+    "compression-webpack-plugin": "^9.0.0 || ^10.0.0 || ^11.0.0",
+    "css-loader": "^6.8.1 || ^7.0.0",
+    "esbuild": "^0.14.0 || ^0.15.0 || ^0.16.0 || ^0.17.0 || ^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0",
+    "esbuild-loader": "^2.0.0 || ^3.0.0 || ^4.0.0",
+    "mini-css-extract-plugin": "^2.0.0",
+    "rspack-manifest-plugin": "^5.0.0",
+    "sass": "^1.50.0",
+    "sass-loader": "^13.0.0 || ^14.0.0 || ^15.0.0 || ^16.0.0",
+    "swc-loader": "^0.1.15 || ^0.2.0",
     "terser-webpack-plugin": "^5.3.1",
-    "webpack": "^5.72.0",
-    "webpack-assets-manifest": "^5.0.6",
-    "webpack-cli": "^4.9.2 || ^5.0.0",
-    "webpack-dev-server": "^4.9.0 || ^5.0.0",
-    "webpack-merge": "^5.8.0 || ^6.0.0"
+    "webpack": "^5.76.0",
+    "webpack-assets-manifest": "^5.0.6 || ^6.0.0",
+    "webpack-cli": "^4.9.2 || ^5.0.0 || ^6.0.0",
+    "webpack-dev-server": "^4.15.2 || ^5.2.2",
+    "webpack-subresource-integrity": "^5.1.0"
   },
   "peerDependenciesMeta": {
+    "@babel/core": {
+      "optional": true
+    },
+    "@babel/plugin-transform-runtime": {
+      "optional": true
+    },
+    "@babel/preset-env": {
+      "optional": true
+    },
+    "@babel/runtime": {
+      "optional": true
+    },
+    "@rspack/core": {
+      "optional": true
+    },
+    "@rspack/cli": {
+      "optional": true
+    },
+    "@rspack/plugin-react-refresh": {
+      "optional": true
+    },
+    "@swc/core": {
+      "optional": true
+    },
     "@types/babel__core": {
       "optional": true
     },
     "@types/webpack": {
       "optional": true
+    },
+    "babel-loader": {
+      "optional": true
+    },
+    "compression-webpack-plugin": {
+      "optional": true
+    },
+    "css-loader": {
+      "optional": true
+    },
+    "esbuild": {
+      "optional": true
+    },
+    "esbuild-loader": {
+      "optional": true
+    },
+    "mini-css-extract-plugin": {
+      "optional": true
+    },
+    "rspack-manifest-plugin": {
+      "optional": true
+    },
+    "sass": {
+      "optional": true
+    },
+    "sass-loader": {
+      "optional": true
+    },
+    "swc-loader": {
+      "optional": true
+    },
+    "terser-webpack-plugin": {
+      "optional": true
+    },
+    "webpack": {
+      "optional": true
+    },
+    "webpack-assets-manifest": {
+      "optional": true
+    },
+    "webpack-cli": {
+      "optional": true
+    },
+    "webpack-dev-server": {
+      "optional": true
+    },
+    "webpack-subresource-integrity": {
+      "optional": true
     }
   },
   "packageManager": "yarn@1.22.22",
+  "lint-staged": {
+    "*.{js,jsx}": [
+      "eslint --fix",
+      "prettier --write"
+    ],
+    "*.{ts,tsx}": [
+      "eslint --fix",
+      "prettier --write",
+      "node scripts/type-check-no-emit.js"
+    ],
+    "*.{json,yml,yaml,md}": [
+      "prettier --write"
+    ]
+  },
   "engines": {
     "node": ">= 14",
     "yarn": ">=1 <5"

data/scripts/remove-use-strict.js

@@ -0,0 +1,45 @@
+#!/usr/bin/env node
+const fs = require("fs")
+const path = require("path")
+
+// Recursively find all .js files in a directory
+function findJsFiles(dir) {
+  const files = []
+  const items = fs.readdirSync(dir, { withFileTypes: true })
+
+  items.forEach((item) => {
+    const fullPath = path.join(dir, item.name)
+    if (item.isDirectory()) {
+      files.push(...findJsFiles(fullPath))
+    } else if (item.isFile() && item.name.endsWith(".js")) {
+      files.push(fullPath)
+    }
+  })
+
+  return files
+}
+
+// Find all .js files in package directory
+const files = findJsFiles("package")
+
+files.forEach((file) => {
+  let content = fs.readFileSync(file, "utf8")
+
+  // Remove "use strict" directive with various quote styles and formatting
+  // Handles: optional whitespace, single/double/unicode quotes, optional semicolon,
+  // and any trailing whitespace/newline sequences
+  content = content.replace(
+    /^\s*["'\u2018\u2019\u201C\u201D]use\s+strict["'\u2018\u2019\u201C\u201D]\s*;?\s*[\r\n]*/,
+    ""
+  )
+
+  // Ensure file ends with exactly one newline
+  if (!content.endsWith("\n")) {
+    content += "\n"
+  }
+
+  fs.writeFileSync(file, content, "utf8")
+})
+
+// eslint-disable-next-line no-console
+console.log(`Removed "use strict" from ${files.length} files`)

data/scripts/type-check-no-emit.js

@@ -0,0 +1,27 @@
+#!/usr/bin/env node
+
+/**
+ * Type-check script for lint-staged
+ *
+ * This script runs TypeScript type checking without emitting files.
+ * It ignores any arguments passed by lint-staged to ensure tsc uses
+ * the project's tsconfig.json rather than trying to compile individual files.
+ *
+ * Without this wrapper, lint-staged would pass staged file paths as arguments
+ * to tsc, causing it to ignore tsconfig.json and fail type checking.
+ */
+
+const { execSync } = require("child_process")
+
+try {
+  // Run tsc with no arguments (ignoring any passed by lint-staged)
+  // This ensures it uses tsconfig.json properly
+  execSync("npx tsc --noEmit", {
+    stdio: "inherit",
+    cwd: process.cwd()
+  })
+  process.exit(0)
+} catch (error) {
+  // Type checking failed
+  process.exit(1)
+}

data/test/helpers.js

@@ -9,7 +9,7 @@ const createTrackLoader = () => {
     filesTracked,
     (source) => {
       filesTracked[source.resource] = true
-      return source
+      return "" // Fix #567
     }
   ]
 }

data/test/package/config.test.js

@@ -54,4 +54,47 @@ describe("Config", () => {
       resolve("app/javascript/manifest.json")
     )
   })
+
+  test("should have integrity disabled by default", () => {
+    const config = require("../../package/config")
+    expect(config.integrity.enabled).toBe(false)
+  })
+
+  test("should have sha384 as default hash function", () => {
+    const config = require("../../package/config")
+    expect(config.integrity.hash_functions).toStrictEqual(["sha384"])
+  })
+
+  test("should have anonymous as default crossorigin", () => {
+    const config = require("../../package/config")
+    expect(config.integrity.cross_origin).toBe("anonymous")
+  })
+
+  test("should allow enabling integrity", () => {
+    process.env.RAILS_ENV = "production"
+    process.env.SHAKAPACKER_CONFIG = "config/shakapacker_integrity.yml"
+    const config = require("../../package/config")
+
+    expect(config.integrity.enabled).toBe(true)
+  })
+
+  test("should allow configuring hash functions", () => {
+    process.env.RAILS_ENV = "production"
+    process.env.SHAKAPACKER_CONFIG = "config/shakapacker_integrity.yml"
+    const config = require("../../package/config")
+
+    expect(config.integrity.hash_functions).toStrictEqual([
+      "sha384",
+      "sha256",
+      "sha512"
+    ])
+  })
+
+  test("should allow configuring crossorigin", () => {
+    process.env.RAILS_ENV = "production"
+    process.env.SHAKAPACKER_CONFIG = "config/shakapacker_integrity.yml"
+    const config = require("../../package/config")
+
+    expect(config.integrity.cross_origin).toBe("use-credentials")
+  })
 })

data/test/package/env.test.js

@@ -24,6 +24,18 @@ describe("Env", () => {
     delete process.env.NODE_ENV
     expect(require("../../package/env")).toStrictEqual({
       railsEnv: "development",
+      nodeEnv: "development",
+      isProduction: false,
+      isDevelopment: true,
+      runningWebpackDevServer: false
+    })
+  })
+
+  test("with undefined NODE_ENV and RAILS_ENV set to production", () => {
+    process.env.RAILS_ENV = "production"
+    delete process.env.NODE_ENV
+    expect(require("../../package/env")).toStrictEqual({
+      railsEnv: "production",
       nodeEnv: "production",
       isProduction: true,
       isDevelopment: false,
@@ -35,10 +47,10 @@ describe("Env", () => {
     delete process.env.NODE_ENV
     delete process.env.RAILS_ENV
     expect(require("../../package/env")).toStrictEqual({
-      railsEnv: "production",
-      nodeEnv: "production",
-      isProduction: true,
-      isDevelopment: false,
+      railsEnv: "development",
+      nodeEnv: "development",
+      isProduction: false,
+      isDevelopment: true,
       runningWebpackDevServer: false
     })
   })
@@ -48,10 +60,33 @@ describe("Env", () => {
     process.env.NODE_ENV = "staging"
     expect(require("../../package/env")).toStrictEqual({
       railsEnv: "staging",
-      nodeEnv: "production",
-      isProduction: true,
-      isDevelopment: false,
+      nodeEnv: "development",
+      isProduction: false,
+      isDevelopment: true,
+      runningWebpackDevServer: false
+    })
+  })
+
+  test("rejects malicious NODE_ENV values and uses default", () => {
+    process.env.RAILS_ENV = "development"
+    process.env.NODE_ENV = "../../../etc/passwd"
+    expect(require("../../package/env")).toStrictEqual({
+      railsEnv: "development",
+      nodeEnv: "development",
+      isProduction: false,
+      isDevelopment: true,
       runningWebpackDevServer: false
     })
   })
+
+  test("warns when NODE_ENV is invalid", () => {
+    const consoleSpy = jest.spyOn(console, "warn").mockImplementation()
+    process.env.NODE_ENV = "invalid"
+    delete process.env.RAILS_ENV
+    require("../../package/env")
+    expect(consoleSpy).toHaveBeenCalledWith(
+      expect.stringContaining("Invalid NODE_ENV value: invalid")
+    )
+    consoleSpy.mockRestore()
+  })
 })

data/test/package/environments/base.test.js

@@ -7,6 +7,10 @@ const { chdirTestApp, resetEnv } = require("../../helpers")
 const rootPath = process.cwd()
 chdirTestApp()
 
+// Set NODE_ENV before requiring modules to ensure contenthash is enabled
+// Base config tests expect production-like behavior with contenthash
+process.env.NODE_ENV = "production"
+
 const baseConfig = require("../../../package/environments/base")
 const config = require("../../../package/config")
 
@@ -79,7 +83,7 @@ describe("Base config", () => {
     })
 
     test("should return default loader rules for each file in config/loaders", () => {
-      const rules = require("../../../package/rules")
+      const rules = require("../../../package/rules/webpack")
 
       const defaultRules = Object.keys(rules)
       const configRules = baseConfig.module.rules

data/test/package/rules/babel.test.js

@@ -11,6 +11,7 @@ jest.mock("../../../package/config", () => {
   const original = jest.requireActual("../../../package/config")
   return {
     ...original,
+    javascript_transpiler: "babel", // Force babel for this test
     additional_paths: [...original.additional_paths, "node_modules/included"]
   }
 })
@@ -32,6 +33,21 @@ const createWebpackConfig = (file, use) => ({
 })
 
 describe("babel", () => {
+  // Mock validateBabelDependencies to avoid actual dependency checking in tests
+  beforeAll(() => {
+    jest.mock("../../../package/utils/helpers", () => {
+      const original = jest.requireActual("../../../package/utils/helpers")
+      return {
+        ...original,
+        validateBabelDependencies: jest.fn() // Mock to do nothing
+      }
+    })
+  })
+
+  afterAll(() => {
+    jest.unmock("../../../package/utils/helpers")
+  })
+
   test("process source path", async () => {
     const normalPath = `${pathToAppJavascript}/a.js`
     const [tracked, loader] = createTrackLoader()

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/raw.test.js

@@ -1,12 +1,45 @@
-const raw = require("../../../package/rules/raw")
-
 describe("raw", () => {
-  test("expected file types", () => {
-    expect(raw.test.test(".html")).toBe(true)
+  describe("rspack bundler", () => {
+    beforeEach(() => {
+      jest.resetModules()
+      jest.doMock("../../../package/config", () => ({
+        assets_bundler: "rspack"
+      }))
+    })
+
+    afterEach(() => {
+      jest.dontMock("../../../package/config")
+    })
+
+    test("uses resourceQuery for any file with ?raw", () => {
+      const raw = require("../../../package/rules/raw")
+      expect(raw.resourceQuery).toStrictEqual(/raw/)
+      expect(raw.type).toBe("asset/source")
+    })
   })
 
-  test("exclude expected file types", () => {
-    const types = [".js", ".mjs", ".jsx", ".ts", ".tsx"]
-    types.forEach((type) => expect(raw.exclude.test(type)).toBe(true))
+  describe("webpack bundler", () => {
+    beforeEach(() => {
+      jest.resetModules()
+      jest.doMock("../../../package/config", () => ({
+        assets_bundler: "webpack"
+      }))
+    })
+
+    afterEach(() => {
+      jest.dontMock("../../../package/config")
+    })
+
+    test("supports ?raw query and .html fallback with oneOf", () => {
+      const raw = require("../../../package/rules/raw")
+      expect(raw.oneOf).toHaveLength(2)
+      // First rule: any file with ?raw
+      expect(raw.oneOf[0].resourceQuery).toStrictEqual(/raw/)
+      expect(raw.oneOf[0].type).toBe("asset/source")
+      // Second rule: .html files without query
+      expect(raw.oneOf[1].test.test(".html")).toBe(true)
+      expect(raw.oneOf[1].exclude.test(".js")).toBe(true)
+      expect(raw.oneOf[1].type).toBe("asset/source")
+    })
   })
 })

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"]
   }
 })

data/test/package/rules/webpack.test.js

@@ -0,0 +1,35 @@
+const rules = require("../../../package/rules/webpack")
+
+jest.mock("../../../package/utils/helpers", () => {
+  const original = jest.requireActual("../../../package/utils/helpers")
+  const moduleExists = () => false
+  return {
+    ...original,
+    moduleExists
+  }
+})
+
+describe("index", () => {
+  test("rule tests are regexes or oneOf arrays", () => {
+    const rulesWithTest = rules.filter((rule) => !rule.oneOf)
+    const rulesWithOneOf = rules.filter((rule) => rule.oneOf)
+
+    // Verify all non-oneOf rules have test property
+    rulesWithTest.forEach((rule) => {
+      expect(rule.test).toBeInstanceOf(RegExp)
+    })
+
+    // Verify all oneOf rules are properly structured
+    rulesWithOneOf.forEach((rule) => {
+      expect(Array.isArray(rule.oneOf)).toBe(true)
+      rule.oneOf.forEach((subRule) => {
+        // Each subRule must have either a test or resourceQuery property (RegExp)
+        const matchers = [
+          subRule.test instanceof RegExp,
+          subRule.resourceQuery instanceof RegExp
+        ]
+        expect(matchers.some(Boolean)).toBe(true)
+      })
+    })
+  })
+})

data/test/package/staging.test.js

@@ -19,7 +19,7 @@ describe("Custom environment", () => {
   describe("generateWebpackConfig", () => {
     beforeEach(() => jest.resetModules())
 
-    test("should use staging config and default production environment", () => {
+    test("should use staging config and default development environment", () => {
       process.env.RAILS_ENV = "staging"
       delete process.env.NODE_ENV
 
@@ -31,9 +31,10 @@ describe("Custom environment", () => {
         resolve("public", "packs-staging")
       )
       expect(webpackConfig.output.publicPath).toBe("/packs-staging/")
+      // With the NODE_ENV fix, staging now defaults to development environment
+      // instead of production, providing better DX for staging environments
       expect(webpackConfig).toMatchObject({
-        devtool: "source-map",
-        stats: "normal"
+        devtool: "cheap-module-source-map"
       })
     })
   })