deps: skuba 7.0.1 (#194)

* deps: skuba 7.0.1

* Fix linting issues and require node 18

* Revert some changes

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Tadhg Lewis <tadhg.lewis@outlook.com>

.github/workflows/release.yml

@@ -20,10 +20,10 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up Node.js 16.x
+      - name: Set up Node.js 18.x
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
 
       - name: Install dependencies
         run: yarn install --frozen-lockfile

.github/workflows/validate.yml

@@ -16,10 +16,10 @@ jobs:
       - name: Check out repo
         uses: actions/checkout@v3
 
-      - name: Set up Node.js 16.x
+      - name: Set up Node.js 18.x
         uses: actions/setup-node@v3
         with:
-          node-version: 16.x
+          node-version: 18.x
 
       - name: Install dependencies
         run: yarn install --frozen-lockfile

.prettierignore

@@ -1,17 +1,4 @@
 # managed by skuba
-.idea/*
-.vscode/*
-
-.cdk.staging/
-.serverless/
-cdk.out/
-node_modules*/
-
-/coverage*/
-/dist*/
-/lib*/
-/tmp*/
-
 # Gantry resource files support non-standard template syntax
 /.gantry/**/*.yaml
 /.gantry/**/*.yml

package.json

@@ -38,7 +38,7 @@
     "@types/supertest": "2.0.12",
     "hot-shots": "10.0.0",
     "koa": "2.14.2",
-    "skuba": "6.2.0",
+    "skuba": "7.0.1",
     "supertest": "6.3.3"
   },
   "peerDependencies": {

src/asyncMiddleware/asyncMiddleware.test.ts

@@ -8,7 +8,7 @@ describe('asyncMiddleware', () => {
       state: {},
       method: 'GET',
       ...fields,
-    } as unknown as Koa.Context);
+    }) as unknown as Koa.Context;
 
   const next = jest.fn().mockRejectedValue(new Error('why are you here'));
 

src/errorMiddleware/errorMiddleware.ts

@@ -37,7 +37,10 @@ export class JsonResponse extends Error {
    * @param body - JavaScript value used for requests accepting
    *               `application/json`. This is encoded as JSON in the response.
    */
-  constructor(message: string, public body: unknown) {
+  constructor(
+    message: string,
+    public body: unknown,
+  ) {
     super(message);
   }
 }
@@ -90,9 +93,11 @@ export const handle: Middleware = async (ctx, next) => {
       ctx.accepts(['application/json', 'text/plain']) === 'application/json'
     ) {
       ctx.body = err.body;
-    } else {
-      ctx.body = (expose && err.message) || '';
+      return;
     }
+
+    ctx.body = (expose && err.message) || '';
+    return;
   }
 };
 

src/metricsMiddleware/metricsMiddleware.test.ts

@@ -9,7 +9,7 @@ describe('metricsMiddleware', () => {
       state: {},
       method: 'GET',
       ...fields,
-    } as unknown as Koa.Context);
+    }) as unknown as Koa.Context;
 
   it('should record metrics for a successful request', async () => {
     const mockDistribution = jest.fn();

src/tracingHeaders/tracingHeaders.test.ts

@@ -6,7 +6,7 @@ const mockCtxWithHeaders = (header: Record<string, string>): Koa.Context =>
   ({
     request: { header },
     state: {},
-  } as unknown as Koa.Context);
+  }) as unknown as Koa.Context;
 
 describe('TracingHeaders', () => {
   describe('tracingFromContext', () => {