Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions eslint.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ export default defineConfig([
'public/',
'coverage/',
'node_modules/',
'.pnp.cjs',
'.pnp.loader.mjs',
'.yarn/',
'splinker/'
]
},
Expand Down
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"cors": "2.8.5",
"date-fns": "4.1.0",
"dotenv": "17.2.3",
"ejs": "^2.6.1",
"ejs": "5.0.2",
"express": "5.1.0",
"express-rate-limit": "8.2.1",
"express-validator": "7.3.0",
Expand All @@ -47,6 +47,7 @@
"multer": "2.0.2",
"mysql2": "3.15.3",
"nodemailer": "7.0.10",
"p-limit": "^7.3.0",
"pg": "^8.16.3",
"puppeteer": "24.28.0",
"q": "1.5.1",
Expand All @@ -58,7 +59,8 @@
"swagger-ui-express": "5.0.1",
"throttled-queue": "3.0.0",
"tsx": "4.20.6",
"uuid": "13.0.0"
"uuid": "13.0.0",
"wkx": "^0.5.0"
},
"devDependencies": {
"@babel/cli": "7.28.3",
Expand Down Expand Up @@ -89,5 +91,6 @@
"typescript": "5.9.3",
"typescript-eslint": "8.46.3",
"vitest": "4.0.7"
}
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
2 changes: 1 addition & 1 deletion src/controllers/fichas-tombos-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ export default function fichaTomboController(request, response, next) {
};

const caminhoArquivoHtml = path.resolve(__dirname, '../views/ficha-tombo.ejs');
return renderizaArquivoHtml(caminhoArquivoHtml, parametros, response)
return renderizaArquivoHtml(caminhoArquivoHtml, parametros)
.then(html => {
response.status(200).send(html);
});
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/tombos-exportacoes-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export default function exportacoes(request, response, next) {
const parametros = { colunas, tombos };

const caminhoArquivoHtml = path.resolve(__dirname, '../views/exportacao-tombos.ejs');
return renderizaArquivoHtml(caminhoArquivoHtml, parametros, response)
return renderizaArquivoHtml(caminhoArquivoHtml, parametros)
.then(html => {
response.status(200).send(html);
});
Expand Down
16 changes: 5 additions & 11 deletions src/helpers/renderiza-arquivo-html.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
import { renderFile } from 'ejs';
import { promisify } from 'util';

export default (caminho, parametros) => new Promise((resolve, reject) => {
const renderFileAsync = promisify(renderFile);

function onRenderCompleted(err, html) {
if (err) {
reject(err);
return;
}

resolve(html);
}

renderFile(caminho, parametros, {}, onRenderCompleted);
export default (caminho, parametros) => renderFileAsync(caminho, parametros, {
// Keep whitespace behavior stable across EJS major versions.
rmWhitespace: false,
});
2 changes: 1 addition & 1 deletion src/reports/controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export function reportPreview(_: Request, response: Response) {

export async function generatePreview(request: Request, response: Response) {
try {
const { fileName } = request.params
const fileName = request.params.fileName as string
const { default: ReportTemplate } = await import(path.join(__dirname, `../reports/templates/${fileName}`)) as { default: ComponentType }

const buffer = await generateReport(ReportTemplate, request.body ?? {})
Expand Down
Loading
Loading