dependencies

- fix pdf output - fix eslint imports
cityssm · Oct 28, 2024 · 4b8b483 · 4b8b483
1 parent 055f708
commit 4b8b483
Show file tree

Hide file tree

Showing 7 changed files with 7,501 additions and 1,540 deletions.
diff --git a/eslint.config.js b/eslint.config.js
@@ -1,5 +1,4 @@
-import { configWebApp } from 'eslint-config-cityssm';
-import tseslint from 'typescript-eslint';
+import { configWebApp, tseslint } from 'eslint-config-cityssm';
 export const config = tseslint.config(...configWebApp, {
     languageOptions: {
         parserOptions: {

diff --git a/eslint.config.ts b/eslint.config.ts
@@ -1,5 +1,4 @@
-import { configWebApp } from 'eslint-config-cityssm'
-import tseslint from 'typescript-eslint'
+import { configWebApp, tseslint } from 'eslint-config-cityssm'
 
 export const config = tseslint.config(...configWebApp, {
   languageOptions: {

diff --git a/handlers/print-get/pdf.d.ts b/handlers/print-get/pdf.d.ts
@@ -1,4 +1,3 @@
-/// <reference types="cookie-parser" />
 import type { NextFunction, Request, Response } from 'express';
 export declare function handler(request: Request, response: Response, next: NextFunction): Promise<void>;
 export default handler;
diff --git a/handlers/print-get/pdf.js b/handlers/print-get/pdf.js
@@ -25,7 +25,8 @@ export async function handler(request, response, next) {
         response.send(pdf);
     }
     async function ejsCallbackFunction(ejsError, ejsData) {
-        if (ejsError) {
+        // eslint-disable-next-line unicorn/no-null
+        if (ejsError != null) {
             next(ejsError);
             return;
         }
@@ -34,7 +35,7 @@ export async function handler(request, response, next) {
             printBackground: true,
             preferCSSPageSize: true
         });
-        pdfCallbackFunction(pdf);
+        pdfCallbackFunction(Buffer.from(pdf));
     }
     await renderEjsFile(reportPath, reportData, {}, ejsCallbackFunction);
 }

diff --git a/handlers/print-get/pdf.ts b/handlers/print-get/pdf.ts
@@ -63,10 +63,11 @@ export async function handler(
   }
 
   async function ejsCallbackFunction(
-    ejsError: Error,
+    ejsError: Error | null,
     ejsData: string
   ): Promise<void> {
-    if (ejsError) {
+    // eslint-disable-next-line unicorn/no-null
+    if (ejsError != null) {
       next(ejsError)
       return
     }
@@ -77,7 +78,7 @@ export async function handler(
       preferCSSPageSize: true
     })
 
-    pdfCallbackFunction(pdf)
+    pdfCallbackFunction(Buffer.from(pdf))
   }
 
   await renderEjsFile(reportPath, reportData, {}, ejsCallbackFunction)