From e1c9691567e0de1d26faa9f9c93fb724947b1c8e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 25 Nov 2024 12:44:10 +0100 Subject: [PATCH] :sparkles: Improve scss compilation error handling Don't stop watch scss process on compilation error --- frontend/scripts/_helpers.js | 1 + frontend/scripts/watch.js | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/frontend/scripts/_helpers.js b/frontend/scripts/_helpers.js index c7671a361..12ab0552c 100644 --- a/frontend/scripts/_helpers.js +++ b/frontend/scripts/_helpers.js @@ -508,6 +508,7 @@ export async function compileStyles() { const start = process.hrtime(); log.info("init: compile styles"); + let result = await compileSassAll(worker); result = concatSass(result); diff --git a/frontend/scripts/watch.js b/frontend/scripts/watch.js index 99ced7b70..0e1d68f43 100644 --- a/frontend/scripts/watch.js +++ b/frontend/scripts/watch.js @@ -24,15 +24,22 @@ async function compileSassAll() { async function compileSass(path) { const start = process.hrtime(); log.info("changed:", path); - const result = await h.compileSass(worker, path, { modules: true }); - sass.index[result.outputPath] = result.css; - const output = h.concatSass(sass); + try { + const result = await h.compileSass(worker, path, { modules: true }); + sass.index[result.outputPath] = result.css; - await fs.writeFile("./resources/public/css/main.css", output); + const output = h.concatSass(sass); - const end = process.hrtime(start); - log.info("done:", `(${ppt(end)})`); + await fs.writeFile("./resources/public/css/main.css", output); + + const end = process.hrtime(start); + log.info("done:", `(${ppt(end)})`); + } catch (cause) { + console.error(cause); + const end = process.hrtime(start); + log.error("error:", `(${ppt(end)})`); + } } await fs.mkdir("./resources/public/css/", { recursive: true });