shakapacker 8.3.0 → 9.0.0.beta.0

data/package/utils/requireOrError.js

@@ -0,0 +1,15 @@
+/* eslint global-require: 0 */
+/* eslint import/no-dynamic-require: 0 */
+const config = require("../config")
+
+const requireOrError = (moduleName) => {
+  try {
+    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`
+    )
+  }
+}
+
+module.exports = { requireOrError }

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shakapacker",
-  "version": "8.3.0",
+  "version": "9.0.0-beta.0",
   "description": "Use webpack to manage app-like JavaScript modules in Rails",
   "homepage": "https://github.com/shakacode/shakapacker",
   "bugs": {
@@ -14,6 +14,16 @@
   "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",
+    "./webpack": "./package/webpack/index.js",
+    "./rspack": "./package/rspack/index.js",
+    "./swc": "./package/swc/index.js",
+    "./esbuild": "./package/esbuild/index.js",
+    "./package.json": "./package.json",
+    "./package/babel/preset.js": "./package/babel/preset.js",
+    "./package/*": "./package/*"
+  },
   "files": [
     "package",
     "lib/install/config/shakapacker.yml"
@@ -27,8 +37,11 @@
     "path-complete-extname": "^1.0.0"
   },
   "devDependencies": {
+    "@rspack/cli": "^1.4.11",
+    "@rspack/core": "^1.4.11",
     "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",
@@ -41,36 +54,16 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^29.7.0",
     "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.93.0",
     "webpack-assets-manifest": "^5.0.6",
-    "webpack-merge": "^5.8.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",
-    "@types/babel__core": "^7.0.0",
-    "@types/webpack": "^5.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",
-    "terser-webpack-plugin": "^5.3.1",
-    "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.9.0 || ^5.0.0",
-    "webpack-merge": "^5.8.0 || ^6.0.0"
-  },
-  "peerDependenciesMeta": {
-    "@types/babel__core": {
-      "optional": true
-    },
-    "@types/webpack": {
-      "optional": true
-    }
+    "webpack-merge": "^5.8.0",
+    "webpack-subresource-integrity": "^5.1.0"
   },
   "packageManager": "yarn@1.22.22",
   "engines": {

data/test/package/config.test.js

@@ -54,4 +54,44 @@ 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.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.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.SHAKAPACKER_CONFIG = "config/shakapacker_integrity.yml"
+    const config = require("../../package/config")
+
+    expect(config.integrity.cross_origin).toBe("use-credentials")
+  })
 })

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

@@ -79,7 +79,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/{index.test.js → webpack.test.js}

@@ -1,4 +1,4 @@
-const rules = require("../../../package/rules/index")
+const rules = require("../../../package/rules/webpack")
 
 jest.mock("../../../package/utils/helpers", () => {
   const original = jest.requireActual("../../../package/utils/helpers")