refactor(api): 🍻 update to node 20

api/.eslintrc.json

@@ -0,0 +1,14 @@
+{
+    "extends": ["standard-with-typescript"],
+    "env": {
+        "node": true
+    },
+    "rules": {
+        "@typescript-eslint/indent": ["error", 4],
+        "@typescript-eslint/semi": ["error", "always"],
+        "@typescript-eslint/strict-boolean-expressions": "off"
+    },
+    "parserOptions": {
+        "project": "./tsconfig.json"
+    }
+}

api/package.json

@@ -3,6 +3,10 @@
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
+  "type": "module",
+  "engines": {
+    "node": ">=16"
+  },
   "scripts": {
     "lint": "eslint --ext .js,.ts ./src",
     "serve": "ts-node-dev --inspect --respawn --transpile-only ./src/index.ts",

api/src/database.ts

@@ -1,11 +1,11 @@
 import 'reflect-metadata';
-import { join } from 'path';
+import { fileURLToPath } from 'node:url';
 import { Sequelize } from 'sequelize-typescript';
-import { Container, Page } from './models';
+import { Container, Page } from './models/index.js';
 
 const sequelize = new Sequelize({
     dialect: 'sqlite',
-    storage: join(__dirname, '../data/database.sqlite'),
+    storage: fileURLToPath(new URL('../data/database.sqlite', import.meta.url)),
     logging: false
 });
 

api/src/index.ts

@@ -1,23 +1,27 @@
 import { join } from 'path';
-import { existsSync } from 'fs';
+import { fileURLToPath } from 'node:url';
+import { existsSync, readFileSync } from 'fs';
 
 // eslint-disable-next-line import/no-duplicates
-import * as express from 'express';
+import express from 'express';
 // eslint-disable-next-line import/no-duplicates
 import { type Request, type Response, type NextFunction } from 'express';
 
-import * as bodyParser from 'body-parser';
-import * as morgan from 'morgan';
-import * as cors from 'cors';
-import * as cookieParser from 'cookie-parser';
-import * as compression from 'compression';
+import bodyParser from 'body-parser';
+import morgan from 'morgan';
+import cors from 'cors';
+import cookieParser from 'cookie-parser';
+import compression from 'compression';
 
-import v1Router from './v1';
+import v1Router from './v1/index.js';
 
-import './database';
-import { getSitemap } from './utils/sitemap';
-import { wrapAsync } from './utils/express';
-import { Page } from './models';
+import './database.js';
+import { getSitemap } from './utils/sitemap.js';
+import { wrapAsync } from './utils/express.js';
+import { Page } from './models/index.js';
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const __dirname = fileURLToPath(new URL('.', import.meta.url));
 
 const app = express();
 
@@ -65,7 +69,7 @@ app.get('/sitemap.xml', wrapAsync(async (req, res) => {
 // frontend
 if (existsSync(join(__dirname, '../frontend'))) {
     // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const assetsManifest: Record<string, string> = require(join(__dirname, '../frontend', 'assets-manifest.json'));
+    const assetsManifest: Record<string, string> = JSON.parse(readFileSync(join(__dirname, '../frontend', 'assets-manifest.json'), { encoding: 'utf-8' }));
 
     const cacheHeaders: Record<string, string | undefined> = {};
 

api/src/models/container.model.ts

@@ -14,7 +14,7 @@ import {
     AfterDestroy
 } from 'sequelize-typescript';
 
-import { Page } from '.';
+import { Page } from './index.js';
 
 @Table({
     paranoid: true

api/src/models/index.ts

@@ -1,4 +1,4 @@
-import Page from './page.model';
-import Container from './container.model';
+import Page from './page.model.js';
+import Container from './container.model.js';
 
 export { Page, Container };

api/src/models/page.model.ts

@@ -9,7 +9,7 @@ import {
     HasMany
 } from 'sequelize-typescript';
 
-import { Container } from '.';
+import { Container } from './index.js';
 
 @DefaultScope({
     include: [

api/src/utils/EventsService.ts

@@ -1,4 +1,4 @@
-import * as equals from 'fast-deep-equal';
+import equals from 'fast-deep-equal';
 import fetch from 'node-fetch';
 
 export interface ArmaEvent {

api/src/utils/express.ts

@@ -1,6 +1,6 @@
 import { type Request, type Response, type NextFunction, type RequestHandler } from 'express';
 import { validationResult } from 'express-validator';
-import ResponseError from './ResponseError';
+import ResponseError from './ResponseError.js';
 
 type AsyncRequestHandler = (...params: Parameters<RequestHandler>) => Promise<ReturnType<RequestHandler>>;
 

api/src/utils/sitemap.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import { SitemapStream, streamToPromise } from 'sitemap';
 import { createGzip } from 'zlib';
-import { Page } from '../models';
+import { Page } from '../models/index.js';
 
 let cachedSitemap: Buffer;
 

api/src/utils/sso.ts

@@ -1,11 +1,12 @@
-import { type Request, type Response, type NextFunction } from 'express/index';
+import { type Request, type Response, type NextFunction } from 'express';
 
+import { fileURLToPath } from 'node:url';
+import { readFileSync } from 'node:fs';
 import fetch from 'node-fetch';
-import { globalErrorHandler } from './express';
-import ResponseError from './ResponseError';
+import { globalErrorHandler } from './express.js';
+import ResponseError from './ResponseError.js';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const config = require('../../config/config.json');
+const config = JSON.parse(readFileSync(fileURLToPath(new URL('../../config/config.json', import.meta.url)), { encoding: 'utf-8' }));
 
 interface SSOUser {
     admin: boolean

api/src/v1/index.ts

@@ -1,9 +1,9 @@
 import { Router } from 'express';
-import { globalErrorHandler } from '../utils/express';
-import pageRouter from './routes/page.router';
-import containerRouter from './routes/container.router';
-import uploadRouter from './routes/upload.router';
-import eventsRouter from './routes/events.router';
+import { globalErrorHandler } from '../utils/express.js';
+import pageRouter from './routes/page.router.js';
+import containerRouter from './routes/container.router.js';
+import uploadRouter from './routes/upload.router.js';
+import eventsRouter from './routes/events.router.js';
 
 const v1Router = Router();
 

api/src/v1/routes/container.router.ts

@@ -1,9 +1,9 @@
 import { Router } from 'express';
-import { wrapAsync, globalErrorHandler, return422 } from '../../utils/express';
+import { wrapAsync, globalErrorHandler, return422 } from '../../utils/express.js';
 import { param, body, matchedData } from 'express-validator';
-import { Container } from '../../models';
-import { ssoCheckAuthorized } from '../../utils/sso';
-import ResponseError from '../../utils/ResponseError';
+import { Container } from '../../models/index.js';
+import { ssoCheckAuthorized } from '../../utils/sso.js';
+import ResponseError from '../../utils/ResponseError.js';
 
 const defaultContainerRules = [
     body('heading').optional().isString(),

api/src/v1/routes/events.router.ts

@@ -1,6 +1,6 @@
 import { Router } from 'express';
-import { globalErrorHandler, wrapAsync } from '../../utils/express';
-import { ArmaEventsService } from '../../utils/EventsService';
+import { globalErrorHandler, wrapAsync } from '../../utils/express.js';
+import { ArmaEventsService } from '../../utils/EventsService.js';
 
 const armaEventService = ArmaEventsService.getInstance();
 

api/src/v1/routes/page.router.ts

@@ -1,9 +1,9 @@
 import { Router } from 'express';
-import { wrapAsync, globalErrorHandler, return422 } from '../../utils/express';
-import { Page } from '../../models';
+import { wrapAsync, globalErrorHandler, return422 } from '../../utils/express.js';
+import { Page } from '../../models/index.js';
 import { body, matchedData } from 'express-validator';
-import { ssoCheckAuthorized } from '../../utils/sso';
-import ResponseError from '../../utils/ResponseError';
+import { ssoCheckAuthorized } from '../../utils/sso.js';
+import ResponseError from '../../utils/ResponseError.js';
 
 const pageRouter = Router();
 

api/src/v1/routes/upload.router.ts

@@ -1,9 +1,9 @@
 import { Router } from 'express';
-import { globalErrorHandler, wrapAsync } from '../../utils/express';
-import { UploadService } from '../../utils/UploadService';
-import { ssoCheckAuthorized } from '../../utils/sso';
-import ResponseError from '../../utils/ResponseError';
-import * as bodyParser from 'body-parser';
+import { globalErrorHandler, wrapAsync } from '../../utils/express.js';
+import { UploadService } from '../../utils/UploadService.js';
+import { ssoCheckAuthorized } from '../../utils/sso.js';
+import ResponseError from '../../utils/ResponseError.js';
+import bodyParser from 'body-parser';
 
 const uploadService = UploadService.getInstance();
 

api/tsconfig.json

@@ -3,8 +3,9 @@
         "experimentalDecorators": true,
         "emitDecoratorMetadata": true,
         "allowSyntheticDefaultImports": true,
-        "module": "commonjs",
-        "target": "es6",
+        "module": "Node16",
+        "moduleResolution": "Node16",
+        "target": "es2016",
         "sourceMap": true,
         "outDir": "./build",
         "strictNullChecks": true