Merge branch 'master' into dependabot/npm_and_yarn/path-to-regexp-6.3.0

seek-oss · Jan 14, 2025 · 94ae955 · 94ae955
2 parents 15625c2 + f89e890
commit 94ae955
Show file tree

Hide file tree

Showing 9 changed files with 1,293 additions and 1,079 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.js b/.eslintrc.js
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,4 +32,4 @@ jobs:
         run: yarn release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.SEEK_OSS_CI_NPM_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1 @@
+module.exports = require('eslint-config-skuba');
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "@types/supertest": "6.0.2",
     "hot-shots": "10.0.0",
     "koa": "2.15.3",
-    "skuba": "8.2.1",
+    "skuba": "9.1.0",
     "supertest": "7.0.0"
   },
   "peerDependencies": {
@@ -52,13 +52,14 @@
       "optional": true
     }
   },
+  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e",
   "engines": {
     "node": ">=14.17"
   },
   "skuba": {
     "entryPoint": "src/index.ts",
     "template": null,
     "type": "package",
-    "version": "8.1.0"
+    "version": "9.1.0"
   }
 }
diff --git a/src/errorMiddleware/errorMiddleware.test.ts b/src/errorMiddleware/errorMiddleware.test.ts
@@ -123,7 +123,6 @@ describe('errorMiddleware', () => {
 
   it('handles null error', async () => {
     mockNext.mockImplementation(() => {
-      /* eslint-disable-next-line no-throw-literal */
       throw null;
     });
 
@@ -132,7 +131,6 @@ describe('errorMiddleware', () => {
 
   it('handles string error', async () => {
     mockNext.mockImplementation(() => {
-      /* eslint-disable-next-line no-throw-literal */
       throw 'bad';
     });
 

diff --git a/src/requestLogging/requestLogging.test.ts b/src/requestLogging/requestLogging.test.ts
@@ -196,7 +196,7 @@ describe('RequestLogging', () => {
       const errorHandler = jest.fn(async (ctx: Context, next: Next) => {
         try {
           await next();
-        } catch (err) {
+        } catch {
           // Nonsense status code; the caller sees this but not the middleware
           ctx.status = 418;
         }

diff --git a/src/requestLogging/requestLogging.ts b/src/requestLogging/requestLogging.ts
@@ -152,6 +152,7 @@ export const createMiddleware = <StateT extends State, CustomT>(
         {
           ...(typeof err !== 'undefined' && {
             err,
+            // eslint-disable-next-line @typescript-eslint/no-base-to-string
             internalErrorString: String(err),
           }),
           latency,

diff --git a/yarn.lock b/yarn.lock
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require('eslint-config-skuba');