From 40811e74cb258ea0466f98e6000f2de86dea75c2 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 22 Feb 2024 22:15:26 +0100 Subject: [PATCH 1/4] Upgrade and adapt to fabric 6 Fixes: https://github.com/go-gitea/gitea/issues/29326 --- Makefile | 2 +- assets/logo.svg | 2 +- build/generate-images.js | 29 +++++++++++------------------ public/assets/img/favicon.svg | 2 +- public/assets/img/logo.svg | 2 +- 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 7fa819380073b..63851a7eacc9a 100644 --- a/Makefile +++ b/Makefile @@ -969,7 +969,7 @@ generate-gitignore: .PHONY: generate-images generate-images: | node_modules - npm install --no-save --no-package-lock fabric@5 imagemin-zopfli@7 + npm install --no-save --no-package-lock --progress fabric@6.0.0-beta19 imagemin-zopfli@7 node build/generate-images.js $(TAGS) .PHONY: generate-manpage diff --git a/assets/logo.svg b/assets/logo.svg index 9df6b83b564bd..10b79a30de449 100644 --- a/assets/logo.svg +++ b/assets/logo.svg @@ -28,4 +28,4 @@ - + \ No newline at end of file diff --git a/build/generate-images.js b/build/generate-images.js index 09e3e068afdaa..db31d19e2a491 100755 --- a/build/generate-images.js +++ b/build/generate-images.js @@ -1,20 +1,13 @@ #!/usr/bin/env node import imageminZopfli from 'imagemin-zopfli'; import {optimize} from 'svgo'; -import {fabric} from 'fabric'; +import {loadSVGFromString, Canvas, Rect, util} from 'fabric/node'; import {readFile, writeFile} from 'node:fs/promises'; +import {argv, exit} from 'node:process'; -function exit(err) { +function doExit(err) { if (err) console.error(err); - process.exit(err ? 1 : 0); -} - -function loadSvg(svg) { - return new Promise((resolve) => { - fabric.loadSVGFromString(svg, (objects, options) => { - resolve({objects, options}); - }); - }); + exit(err ? 1 : 0); } async function generate(svg, path, {size, bg}) { @@ -35,14 +28,14 @@ async function generate(svg, path, {size, bg}) { return; } - const {objects, options} = await loadSvg(svg); - const canvas = new fabric.Canvas(); + const {objects, options} = await loadSVGFromString(svg); + const canvas = new Canvas(); canvas.setDimensions({width: size, height: size}); const ctx = canvas.getContext('2d'); ctx.scale(options.width ? (size / options.width) : 1, options.height ? (size / options.height) : 1); if (bg) { - canvas.add(new fabric.Rect({ + canvas.add(new Rect({ left: 0, top: 0, height: size * (1 / (size / options.height)), @@ -51,7 +44,7 @@ async function generate(svg, path, {size, bg}) { })); } - canvas.add(fabric.util.groupSVGElements(objects, options)); + canvas.add(util.groupSVGElements(objects, options)); canvas.renderAll(); let png = Buffer.from([]); @@ -64,7 +57,7 @@ async function generate(svg, path, {size, bg}) { } async function main() { - const gitea = process.argv.slice(2).includes('gitea'); + const gitea = argv.slice(2).includes('gitea'); const logoSvg = await readFile(new URL('../assets/logo.svg', import.meta.url), 'utf8'); const faviconSvg = await readFile(new URL('../assets/favicon.svg', import.meta.url), 'utf8'); @@ -80,7 +73,7 @@ async function main() { } try { - exit(await main()); + doExit(await main()); } catch (err) { - exit(err); + doExit(err); } diff --git a/public/assets/img/favicon.svg b/public/assets/img/favicon.svg index afeeacb77cc8a..43291345dfe0f 100644 --- a/public/assets/img/favicon.svg +++ b/public/assets/img/favicon.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/public/assets/img/logo.svg b/public/assets/img/logo.svg index afeeacb77cc8a..43291345dfe0f 100644 --- a/public/assets/img/logo.svg +++ b/public/assets/img/logo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From fa308c8541cd4825c306f72b86c0ccd5e1f90d60 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 22 Feb 2024 23:44:02 +0100 Subject: [PATCH 2/4] revert changes in logo.svg --- assets/logo.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/logo.svg b/assets/logo.svg index 10b79a30de449..9df6b83b564bd 100644 --- a/assets/logo.svg +++ b/assets/logo.svg @@ -28,4 +28,4 @@ - \ No newline at end of file + From 0c27a9e5e5f79585dcbc829bbb76319beecea91b Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 22 Feb 2024 23:49:04 +0100 Subject: [PATCH 3/4] speed up install by letting npm use package-lock --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 63851a7eacc9a..8884cddcb994f 100644 --- a/Makefile +++ b/Makefile @@ -969,7 +969,7 @@ generate-gitignore: .PHONY: generate-images generate-images: | node_modules - npm install --no-save --no-package-lock --progress fabric@6.0.0-beta19 imagemin-zopfli@7 + npm install --no-save --progress fabric@6.0.0-beta19 imagemin-zopfli@7 node build/generate-images.js $(TAGS) .PHONY: generate-manpage From 129bc9c3771cfdcb230a4ebb153f568807639f3e Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 22 Feb 2024 23:50:26 +0100 Subject: [PATCH 4/4] remove progress as it is the default --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8884cddcb994f..4ef02c6c5472a 100644 --- a/Makefile +++ b/Makefile @@ -969,7 +969,7 @@ generate-gitignore: .PHONY: generate-images generate-images: | node_modules - npm install --no-save --progress fabric@6.0.0-beta19 imagemin-zopfli@7 + npm install --no-save fabric@6.0.0-beta19 imagemin-zopfli@7 node build/generate-images.js $(TAGS) .PHONY: generate-manpage