@stamhoofd/backend-backup 2.119.0 → 2.120.1

package/package.json

@@ -1,6 +1,7 @@
 {
     "name": "@stamhoofd/backend-backup",
-    "version": "2.119.0",
+    "version": "2.120.1",
+    "type": "module",
     "main": "./dist/index.js",
     "exports": {
         ".": {
@@ -10,9 +11,9 @@
     "license": "UNLICENCED",
     "scripts": {
         "dev:full": "wait-on ../../shared/middleware/dist/index.js && concurrently -r 'yarn -s build --watch --preserveWatchOutput' \"wait-on ./dist/index.js && nodemon --quiet --inspect=5858 --watch dist --watch '../../../shared/*/dist/' --watch '../../shared/*/dist/' --ext .ts,.json,.sql,.js --watch .env.json --delay 1000ms --exec 'node --enable-source-maps ./dist/index.js' --signal SIGTERM\"",
-        "build": "tsc -b",
+        "build": "tsc --build tsconfig.build.json",
         "build:full": "yarn -s clear && yarn -s build",
-        "clear": "rm -rf ./dist",
+        "clear": "rm -rf ./dist && rm -f *.tsbuildinfo",
         "start": "yarn -s build && node --enable-source-maps ./dist/index.js",
         "lint": "eslint"
     },
@@ -24,15 +25,15 @@
     },
     "dependencies": {
         "@aws-sdk/client-s3": "^3.839.0",
-        "@simonbackx/simple-endpoints": "1.20.1",
+        "@simonbackx/simple-endpoints": "1.21.0",
         "@simonbackx/simple-logging": "^1.0.1",
         "formidable": "3.5.4",
         "luxon": "3.4.4",
         "mockdate": "^3.0.2",
-        "mysql2": "^3.14.1"
+        "mysql2": "^3.20.0"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "7bcbadd31fcc4f3109efc67c4034d1382a1d0439"
+    "gitHead": "00f65fc28d68feb86c30789784181a8954d638d7"
 }

package/src/boot.ts

@@ -22,7 +22,7 @@ const start = async () => {
     console.log('Started Backup.');
     loadLogger();
     const router = new Router();
-    await router.loadEndpoints(__dirname + '/endpoints');
+    await router.loadEndpoints(import.meta.dirname + '/endpoints');
     router.endpoints.push(new CORSPreflightEndpoint());
 
     const routerServer = new RouterServer(router);

package/src/endpoints/BackupEndpoint.ts

@@ -1,5 +1,6 @@
 import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { SimpleError } from '@simonbackx/simple-errors';
 import { backup } from '../helpers/backup.js';
 

package/src/endpoints/HealthEndpoint.ts

@@ -1,4 +1,5 @@
-import { DecodedRequest, Endpoint, Request, Response } from '@simonbackx/simple-endpoints';
+import type { DecodedRequest, Request} from '@simonbackx/simple-endpoints';
+import { Endpoint, Response } from '@simonbackx/simple-endpoints';
 import { BackupHealth, getHealth } from '../helpers/backup.js';
 import { AutoEncoder, field, StringDecoder } from '@simonbackx/simple-encoding';
 import { SimpleError } from '@simonbackx/simple-errors';

package/src/helpers/backup.ts

@@ -375,7 +375,7 @@ export async function backup() {
         const tmpFile = `${localBackupFolder}${getBackupBaseFileName(new Date())}`;
         const compressedFile = tmpFile + '.gz';
 
-        const cmd = 'mysqldump -u ' + escapeShellArg(STAMHOOFD.DB_USER) + ' -p' + escapeShellArg(STAMHOOFD.DB_PASS) + ' --flush-logs --single-transaction --quick --hex-blob --default-character-set=utf8mb4 --skip-extended-insert --max_allowed_packet=1G --triggers --routines --events --lock-tables=false ' + escapeShellArg(STAMHOOFD.DB_DATABASE) + ' > ' + escapeShellArg(tmpFile);
+        const cmd = 'mysqldump -u ' + escapeShellArg(STAMHOOFD.DB_USER) + ' -p' + escapeShellArg(STAMHOOFD.DB_PASS) + ' --flush-logs --single-transaction --quick --hex-blob --default-character-set=utf8mb4 --max_allowed_packet=1G --triggers --routines --events --lock-tables=false ' + escapeShellArg(STAMHOOFD.DB_DATABASE) + ' > ' + escapeShellArg(tmpFile);
 
         console.log('Creating MySQL dump...');
         await execPromise(cmd);

package/stamhoofd.d.ts

@@ -1,3 +1,5 @@
+import '../../../environment.d.ts';
+
 export {};
 
 /**

package/tsconfig.build.json

@@ -0,0 +1,17 @@
+{
+    "extends": "../../../tsconfig.base.json",
+    "compilerOptions": {
+        "rootDir": ".",
+        "outDir": "dist"
+    },
+    "include": [
+        "./index.ts",
+        "./migrations.ts",
+        "./src",
+        "./stamhoofd.d.ts"
+    ],
+    "exclude": [
+        "./src/**/*.spec.ts", 
+        "./src/**/*.test.ts"
+    ]
+}

package/tsconfig.json

@@ -1,34 +1,12 @@
 {
-    "compilerOptions": {
-        "target": "es2022", // needs to be es2019 to support optional chaining. Node.js doesn't support optional chaining yet, so we need the transpiling
-        "module": "commonjs",
-        "jsx": "preserve",
-        "importHelpers": true,
-        "moduleResolution": "node",
-        "experimentalDecorators": true,
-        "esModuleInterop": true,
-        "allowSyntheticDefaultImports": true,
-        "sourceMap": true,
-        "strictNullChecks": true,
-        "declaration": true,
-        "declarationMap": true,
-        "outDir": "dist",
-        "lib": [
-            "es2022",
-            "dom" // for puppeteer
-        ],
-        "types": [
-            "node",
-            "jest",
-            "@stamhoofd/backend-i18n",
-        ]
-    },
-    "include": [
-        "**/*.ts",
-        "../../../*.d.ts"
-    ],
-    "exclude": [
-        "node_modules",
-        "dist"
+    "extends": "../../../tsconfig.base.json",
+    "files": [],
+    "references": [
+        {
+            "path": "./tsconfig.build.json"
+        },
+        {
+            "path": "./tsconfig.test.json"
+        }
     ]
 }

package/tsconfig.test.json

@@ -0,0 +1,17 @@
+{
+    "extends": "../../../tsconfig.test.json",
+    "compilerOptions": {
+        "rootDir": ".",
+        "outDir": "dist"
+    },
+    "references": [
+        { "path": "./tsconfig.build.json" }
+    ],
+    "include": [
+        "./stamhoofd.d.ts",
+        "../../../jest-extended.d.ts",
+        "./src/**/*.spec.ts", 
+        "./src/**/*.test.ts",
+        "./tests"
+    ]
+}

package/eslint.config.mjs

@@ -1,5 +0,0 @@
-import stamhoofdEslint from 'eslint-plugin-stamhoofd';
-
-export default [
-    ...stamhoofdEslint.configs.backend,
-];