Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-06 14:50:20 -05:00
Code Issues Activity

Merge pull request #127 from tokens-studio/fix-sass-pipe-break

Browse source 
Dont break pipe when sass has an error
This commit is contained in:
Florian Schrödl 2024-05-22 15:00:05 +02:00 committed by GitHub
commit 1a144192a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
frontend/scripts/watch.js
View file

@ -11,12 +11,14 @@ let sass = null;
async function compileSassAll() {
const start = process.hrtime();
log.info("init: compile styles")
sass = await h.compileSassAll(worker);
let output = await h.concatSass(sass);
await fs.writeFile("./resources/public/css/main.css", output);
log.info("init: compile styles");
try {
sass = await h.compileSassAll(worker);
let output = await h.concatSass(sass);
await fs.writeFile("./resources/public/css/main.css", output);
} catch (error) {
log.error("Error during compileSassAll: ", error);
}
const end = process.hrtime(start);
log.info("done: compile styles", `(${ppt(end)})`);
}
@ -24,24 +26,27 @@ 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;
try {
const result = await h.compileSass(worker, path, { modules: true });
sass.index[result.outputPath] = result.css;
const output = h.concatSass(sass);
await fs.writeFile("./resources/public/css/main.css", output);
const output = h.concatSass(sass);
await fs.writeFile("./resources/public/css/main.css", output);
} catch (error) {
log.error("Error during compileSass: ", error);
}
const end = process.hrtime(start);
log.info("done:", `(${ppt(end)})`);
}
await compileSassAll();
await h.copyAssets()
await h.compileSvgSprites()
await h.copyAssets();
await h.compileSvgSprites();
await h.compileTemplates();
await h.compilePolyfills();
log.info("watch: scss src (~)")
log.info("watch: scss src (~)");
h.watch("src", h.isSassFile, async function (path) {
if (path.includes("common")) {
@ -51,19 +56,19 @@ h.watch("src", h.isSassFile, async function (path) {
}
});
log.info("watch: scss: resources (~)")
log.info("watch: scss: resources (~)");
h.watch("resources/styles", h.isSassFile, async function (path) {
log.info("changed:", path);
await compileSassAll()
await compileSassAll();
});
log.info("watch: templates (~)")
log.info("watch: templates (~)");
h.watch("resources/templates", null, async function (path) {
log.info("changed:", path);
await h.compileTemplates();
});
log.info("watch: assets (~)")
log.info("watch: assets (~)");
h.watch(["resources/images", "resources/fonts", "resources/plugins-runtime"], null, async function (path) {
log.info("changed:", path);
await h.compileSvgSprites();
@ -71,4 +76,6 @@ h.watch(["resources/images", "resources/fonts", "resources/plugins-runtime"], nu
await h.compileTemplates();
});
worker.terminate();
process.on("exit", () => {
worker.terminate();
});