Migrate to @import statements

These are available in later versions of TypeScript and they're a lot
neater/easier to understand. Let's use them.

main.js

@@ -1,8 +1,6 @@
 /**
- * @typedef {import("express").Application} Application
- * @typedef {import("./typings/n-express").Callback} Callback
- * @typedef {import("./typings/n-express").AppOptions} AppOptions
- * @typedef {import("./typings/n-express").AppContainer} AppContainer
+ * @import {Application} from 'express'
+ * @import {AppContainer, AppOptions, Callback} from './typings/n-express'
  */
 
 require('isomorphic-fetch');

src/lib/guess-app-details.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import("../../typings/n-express").AppMeta} AppMeta
+ * @import {AppMeta} from '../../typings/n-express'
  */
 
 const normalizeName = require('./normalize-name');

src/lib/health-checks.js

@@ -1,6 +1,6 @@
 /**
- * @typedef {import("express").Application} ExpressApp
- * @typedef {import("../../typings/n-express").AppOptions} AppOptions
+ * @import {Application as ExpressApp} from 'express'
+ * @import {AppOptions} from '../../typings/n-express'
  */
 
 const logger = require('@dotcom-reliability-kit/logger');

src/middleware/anon.js

@@ -1,7 +1,5 @@
 /**
- * @typedef {import("../../typings/n-express").Callback} Callback
- * @typedef {import("../../typings/n-express").Request} Request
- * @typedef {import("../../typings/n-express").Response} Response
+ * @import {Callback, Request, Response} from '../../typings/n-express'
  */
 
 /**

src/middleware/backend-authentication.js

@@ -1,6 +1,5 @@
 /**
- * @typedef {import("express")} Express
- * @typedef {import("../../typings/n-express").Callback} Callback
+ * @import Express from 'express'
  */
 
 const logger = require('@dotcom-reliability-kit/logger');
@@ -39,7 +38,7 @@ module.exports = (app) => {
 
 	// @ts-ignore
 	app.use(
-		/** @type {Callback} */ (req, res, next) => {
+		/** @type {Express.Handler} */ (req, res, next) => {
 			// allow static assets, healthchecks, etc., through
 			if (req.path.indexOf('/__') === 0) {
 				next();

src/middleware/cache.js

@@ -1,6 +1,9 @@
 /**
- * @typedef {import("../../typings/n-express").Callback} Callback
- * @typedef {[key: keyof import("../../typings/n-express").CacheHeaders, val: string]} CacheHeader
+ * @import {Callback, CacheHeaders} from '../../typings/n-express'
+ */
+
+/**
+ * @typedef {[key: keyof CacheHeaders, val: string]} CacheHeader
  */
 
 const cacheHeaders = {

src/middleware/consent.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import("../../typings/n-express").Callback} Callback
+ * @import {Callback} from '../../typings/n-express'
  */
 
 /**

src/middleware/log-vary.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import("../../typings/n-express").Callback} Callback
+ * @import {Callback} from '../../typings/n-express'
  */
 
 const logger = require('@dotcom-reliability-kit/logger');

src/middleware/robots.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import("../../typings/n-express").Callback} Callback
+ * @import {Callback} from '../../typings/n-express'
  */
 
 const fs = require('fs');

src/middleware/security.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import("../../typings/n-express").Callback} Callback
+ * @import {Callback} from '../../typings/n-express'
  */
 
 /**

src/middleware/vary.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import("../../typings/n-express").Callback} Callback
+ * @import {Callback} from '../../typings/n-express'
  */
 
 /**

src/middleware/via.js

@@ -1,5 +1,5 @@
 /**
- * @typedef {import("../../typings/n-express").Callback} Callback
+ * @import {Callback} from '../../typings/n-express'
  */
 
 /**