Merge branch '3.x'

.github/workflows/run-tests.yml

@@ -1,7 +1,10 @@
 name: Run tests
 
 concurrency:
-  group: ${{ github.ref }}   # `github.ref` references the git branch name
+  # the group name is composed of two elements:
+  #   1. this workflow name "run-tests"
+  #   2. the branch name retrieved via the "github.ref" variable
+  group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 on:
@@ -23,7 +26,7 @@ jobs:
 
     steps:
     - name: Git checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v3
@@ -63,7 +66,7 @@ jobs:
 
   #   steps:
   #   - name: Git checkout
-  #     uses: actions/checkout@v3
+  #     uses: actions/checkout@v4
 
   #   - name: Use Node.js ${{ matrix.node-version }}
   #     uses: actions/setup-node@v3

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [3.20.4](https://github.com/supercharge/framework/compare/v3.20.3...v3.20.4) - 2023-10-15
+
+### Updated
+- `@supercharge/hashing`
+    - remove exports for `BcryptDriver` and `ScryptDriver` from the package’s main entrypoint to avoid requiring the `bcrypt` package immediately, eventhough the bcrypt driver will not be used
+
+### Potentially Breaking Change
+This release removes exports for the `BcryptDriver` and `ScryptDriver` hashing drivers from the package’s main entrypoint. The driver exports shouldn’t be used standalone. The export was a convenience for testing and interested people. If you imported the drivers from the packge, please update your code to "deep imports" or "deep requires". Thank you!
+
+
+## [3.20.3](https://github.com/supercharge/framework/compare/v3.20.2...v3.20.3) - 2023-10-14
+
+### Updated
+- bump dependencies
+- `@supercharge/hashing`
+    - require `BcryptDriver` inside the `createBcryptDriver` method to only import dependencies when needed. This will support Supercharge to use Bun (the new runtime) because it doesn’t reference a bcrypt_napi bridge
+
+
 ## [3.20.2](https://github.com/supercharge/framework/compare/v3.20.1...v3.20.2) - 2023-08-24
 
 ### Updated

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.20.2",
+  "version": "3.20.4",
   "packages": [
     "packages/*"
   ],

package.json

@@ -9,11 +9,11 @@
   "devDependencies": {
     "@supercharge/eslint-config-typescript": "~3.0.1",
     "@supercharge/tsconfig": "~4.0.0",
-    "@types/node": "~18.17.9",
+    "@types/node": "~20.8.6",
     "cross-env": "~7.0.3",
-    "eslint": "~8.47.0",
-    "lerna": "~7.1.5",
-    "nx": "16.7.4"
+    "eslint": "~8.51.0",
+    "lerna": "~7.3.1",
+    "nx": "16.10.0"
   },
   "engines": {
     "node": ">=16"
@@ -41,7 +41,8 @@
     "dev": "lerna run dev",
     "fresh": "npm run clean && npm install",
     "lint": "lerna run lint",
-    "publish": "npm run build && lerna publish --force-publish",
+    "publish": "npm run release",
+    "release": "npm run build && lerna publish --force-publish",
     "test": "lerna run test",
     "test:nocache": "npm test -- --skip-nx-cache",
     "watch": "npm run dev"

packages/application/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@supercharge/application",
   "description": "The Supercharge application package",
-  "version": "3.20.2",
+  "version": "3.20.4",
   "author": "Marcus Pöhls <[email protected]>",
   "bugs": {
     "url": "https://github.com/supercharge/framework/issues"
@@ -15,12 +15,12 @@
     "@supercharge/arrays": "~4.3.0",
     "@supercharge/classes": "~2.0.0",
     "@supercharge/collections": "~5.0.1",
-    "@supercharge/config": "^3.20.2",
-    "@supercharge/container": "^3.20.2",
-    "@supercharge/contracts": "^3.20.2",
-    "@supercharge/env": "^3.20.2",
+    "@supercharge/config": "^3.20.4",
+    "@supercharge/container": "^3.20.4",
+    "@supercharge/contracts": "^3.20.4",
+    "@supercharge/env": "^3.20.4",
     "@supercharge/goodies": "~1.11.1",
-    "@supercharge/logging": "^3.20.2",
+    "@supercharge/logging": "^3.20.4",
     "@supercharge/map": "~1.5.0",
     "@supercharge/strings": "~2.0.0",
     "normalize-path": "~3.0.0"
@@ -31,8 +31,8 @@
     "@japa/spec-reporter": "~1.3.3",
     "@types/normalize-path": "~3.0.0",
     "c8": "~8.0.1",
-    "expect": "~29.6.3",
-    "typescript": "~5.1.6"
+    "expect": "~29.7.0",
+    "typescript": "~5.2.2"
   },
   "engines": {
     "node": ">=16"

packages/config/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@supercharge/config",
     "description": "The Supercharge config package",
-    "version": "3.20.2",
+    "version": "3.20.4",
     "author": "Marcus Pöhls <[email protected]>",
     "bugs": {
         "url": "https://github.com/supercharge/framework/issues"
@@ -12,14 +12,14 @@
     "main": "dist",
     "types": "dist",
     "dependencies": {
-        "@supercharge/contracts": "^3.20.2",
+        "@supercharge/contracts": "^3.20.4",
         "lodash": "~4.17.21"
     },
     "devDependencies": {
-        "@types/lodash": "~4.14.197",
+        "@types/lodash": "~4.14.199",
         "c8": "~8.0.1",
-        "expect": "~29.6.3",
-        "typescript": "~5.1.6",
+        "expect": "~29.7.0",
+        "typescript": "~5.2.2",
         "uvu": "~0.5.6"
     },
     "engines": {

packages/console/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@supercharge/console",
   "description": "The Supercharge console package",
-  "version": "3.20.2",
+  "version": "3.20.4",
   "author": "Marcus Pöhls <[email protected]>",
   "bugs": {
     "url": "https://github.com/supercharge/framework/issues"
   },
   "dependencies": {
     "@supercharge/cedar": "~2.0.0",
-    "@supercharge/contracts": "^3.20.2"
+    "@supercharge/contracts": "^3.20.4"
   },
   "devDependencies": {
     "c8": "~8.0.1",
-    "expect": "~29.6.3",
-    "typescript": "~5.1.6",
+    "expect": "~29.7.0",
+    "typescript": "~5.2.2",
     "uvu": "~0.5.6"
   },
   "engines": {

packages/container/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@supercharge/container",
   "description": "The Supercharge container package",
-  "version": "3.20.2",
+  "version": "3.20.4",
   "author": "Marcus Pöhls <[email protected]>",
   "bugs": {
     "url": "https://github.com/supercharge/framework/issues"
@@ -13,15 +13,15 @@
   "types": "dist",
   "dependencies": {
     "@supercharge/classes": "~2.0.0",
-    "@supercharge/contracts": "^3.20.2",
+    "@supercharge/contracts": "^3.20.4",
     "@supercharge/goodies": "~1.11.1",
     "@supercharge/map": "~1.5.0",
     "@supercharge/strings": "~2.0.0"
   },
   "devDependencies": {
     "c8": "~8.0.1",
-    "expect": "~29.6.3",
-    "typescript": "~5.1.6",
+    "expect": "~29.7.0",
+    "typescript": "~5.2.2",
     "uvu": "~0.5.6"
   },
   "engines": {

packages/contracts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@supercharge/contracts",
   "description": "The Supercharge contracts package",
-  "version": "3.20.2",
+  "version": "3.20.4",
   "author": "Marcus Pöhls <[email protected]>",
   "homepage": "https://superchargejs.com",
   "keywords": [
@@ -25,13 +25,13 @@
   },
   "dependencies": {
     "@supercharge/macroable": "~2.0.1",
-    "@types/koa__router": "~12.0.0",
-    "@types/node": "~18.17.9",
+    "@types/koa__router": "~12.0.1",
+    "@types/node": "~20.8.6",
     "handlebars": "~4.7.8",
     "knex": "~2.5.1"
   },
   "devDependencies": {
-    "typescript": "~5.1.6"
+    "typescript": "~5.2.2"
   },
   "scripts": {
     "build": "tsc --build tsconfig.json --force",

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@supercharge/core",
   "description": "The Supercharge foundation package",
-  "version": "3.20.2",
+  "version": "3.20.4",
   "author": "Marcus Pöhls <[email protected]>",
   "bugs": {
     "url": "https://github.com/supercharge/framework/issues"
@@ -12,28 +12,28 @@
   "main": "dist",
   "types": "dist",
   "dependencies": {
-    "@supercharge/application": "^3.20.2",
+    "@supercharge/application": "^3.20.4",
     "@supercharge/collections": "~5.0.1",
-    "@supercharge/console": "^3.20.2",
-    "@supercharge/contracts": "^3.20.2",
+    "@supercharge/console": "^3.20.4",
+    "@supercharge/contracts": "^3.20.4",
     "@supercharge/errors": "~2.0.1",
     "@supercharge/fs": "~3.4.0",
     "@supercharge/goodies": "~1.11.1",
-    "@supercharge/http": "^3.20.2",
+    "@supercharge/http": "^3.20.4",
     "@supercharge/set": "~2.2.1",
-    "@supercharge/support": "^3.20.2",
+    "@supercharge/support": "^3.20.4",
     "dotenv": "~16.3.1",
-    "youch": "~3.2.3",
-    "youch-terminal": "~2.2.2"
+    "youch": "~3.3.2",
+    "youch-terminal": "~2.2.3"
   },
   "devDependencies": {
-    "@supercharge/view": "^3.20.2",
+    "@supercharge/view": "^3.20.4",
     "c8": "~8.0.1",
-    "expect": "~29.6.3",
+    "expect": "~29.7.0",
     "mocked-env": "~1.3.5",
     "sinon": "~15.2.0",
     "supertest": "~6.3.3",
-    "typescript": "~5.1.6",
+    "typescript": "~5.2.2",
     "uvu": "~0.5.6"
   },
   "engines": {

packages/core/src/errors/handler.ts

@@ -299,7 +299,7 @@ export class ErrorHandler implements ErrorHandlerContract {
    */
   async renderYouchResponse ({ request, response }: HttpContext, error: HttpError): Promise<void> {
     response.payload(
-      await new Youch(error, request.req()).toHTML()
+      await new Youch(error, request.req()).toHTML({})
     ).status(error.status)
   }
 }

packages/database/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@supercharge/database",
   "description": "The Supercharge database package",
-  "version": "3.20.2",
+  "version": "3.20.4",
   "author": "Marcus Pöhls <[email protected]>",
   "bugs": {
     "url": "https://github.com/supercharge/framework/issues"
@@ -12,18 +12,18 @@
     "dist"
   ],
   "dependencies": {
-    "@supercharge/contracts": "^3.20.2",
-    "@supercharge/manager": "^3.20.2",
-    "@supercharge/support": "^3.20.2",
+    "@supercharge/contracts": "^3.20.4",
+    "@supercharge/manager": "^3.20.4",
+    "@supercharge/support": "^3.20.4",
     "knex": "~2.5.1",
-    "objection": "~3.1.1",
+    "objection": "~3.1.2",
     "sqlite3": "~5.1.6"
   },
   "devDependencies": {
-    "@supercharge/core": "^3.20.2",
+    "@supercharge/core": "^3.20.4",
     "c8": "~8.0.1",
-    "expect": "~29.6.3",
-    "typescript": "~5.1.6",
+    "expect": "~29.7.0",
+    "typescript": "~5.2.2",
     "uvu": "~0.5.6"
   },
   "engines": {

packages/encryption/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@supercharge/encryption",
   "description": "The Supercharge encryption package",
-  "version": "3.20.2",
+  "version": "3.20.4",
   "author": "Marcus Pöhls <[email protected]>",
   "bugs": {
     "url": "https://github.com/supercharge/framework/issues"
@@ -12,19 +12,19 @@
   "main": "dist",
   "types": "dist",
   "dependencies": {
-    "@supercharge/contracts": "^3.20.2",
+    "@supercharge/contracts": "^3.20.4",
     "@supercharge/json": "~2.0.0",
     "@supercharge/strings": "~2.0.0",
-    "@supercharge/support": "^3.20.2"
+    "@supercharge/support": "^3.20.4"
   },
   "devDependencies": {
     "@japa/run-failed-tests": "~1.1.1",
     "@japa/runner": "~2.5.1",
     "@japa/spec-reporter": "~1.3.3",
-    "@supercharge/application": "^3.20.2",
+    "@supercharge/application": "^3.20.4",
     "c8": "~8.0.1",
-    "expect": "~29.6.3",
-    "typescript": "~5.1.6"
+    "expect": "~29.7.0",
+    "typescript": "~5.2.2"
   },
   "engines": {
     "node": ">=16"

packages/env/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@supercharge/env",
   "description": "The Supercharge environment package",
-  "version": "3.20.2",
+  "version": "3.20.4",
   "author": "Marcus Pöhls <[email protected]>",
   "bugs": {
     "url": "https://github.com/supercharge/framework/issues"
@@ -12,17 +12,17 @@
   "main": "dist",
   "types": "dist",
   "dependencies": {
-    "@supercharge/contracts": "^3.20.2",
+    "@supercharge/contracts": "^3.20.4",
     "@supercharge/fs": "~3.4.0",
     "@supercharge/strings": "~2.0.0",
     "dotenv": "~16.3.1"
   },
   "devDependencies": {
-    "@types/lodash": "~4.14.197",
+    "@types/lodash": "~4.14.199",
     "c8": "~8.0.1",
     "cross-env": "~7.0.3",
-    "expect": "~29.6.3",
-    "typescript": "~5.1.6",
+    "expect": "~29.7.0",
+    "typescript": "~5.2.2",
     "uvu": "~0.5.6"
   },
   "engines": {