Direct SVG rendering (#12157)

Introduce 'make svg' which calls a node script that compiles svg files
to `public/img/svg`. These files are vendored to not create a dependency
on Node for the backend build.

On the frontend side, configure webpack using `raw-loader` so SVGs can
be imported as string.

Also moved our existing SVGs to web_src/svg for consistency.

Fixes: https://github.com/go-gitea/gitea/issues/11618

8 files changed, 42 insertions, 16 deletions

diff --git a/web_src/js/features/contextpopup.js b/web_src/js/features/contextpopup.js
index 377a6a8f5a..2597c18014 100644
--- a/web_src/js/features/contextpopup.js
+++ b/web_src/js/features/contextpopup.js
@@ -1,4 +1,4 @@
-import {svg} from '../utils.js';
+import {svg} from '../svg.js';
 
 const {AppSubUrl} = window.config;
 
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 15ca32cfdc..8064e59507 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -3555,12 +3555,3 @@ window.onOAuthLoginClick = function () {
     oauthNav.show();
   }, 5000);
 };
-
-// Pull SVGs via AJAX to workaround CORS issues with <use> tags
-// https://css-tricks.com/ajaxing-svg-sprite/
-$.get(`${window.config.StaticUrlPrefix}/img/svg/icons.svg`, (data) => {
-  const div = document.createElement('div');
-  div.style.display = 'none';
-  div.innerHTML = new XMLSerializer().serializeToString(data.documentElement);
-  document.body.insertBefore(div, document.body.childNodes[0]);
-});
diff --git a/web_src/js/markdown/anchors.js b/web_src/js/markdown/anchors.js
index 766fa34a7a..73c38eef32 100644
--- a/web_src/js/markdown/anchors.js
+++ b/web_src/js/markdown/anchors.js
@@ -1,4 +1,4 @@
-import {svg} from '../utils.js';
+import {svg} from '../svg.js';
 
 const headingSelector = '.markdown h1, .markdown h2, .markdown h3, .markdown h4, .markdown h5, .markdown h6';
 
diff --git a/web_src/js/svg.js b/web_src/js/svg.js
new file mode 100644
index 0000000000..5e66a4dd1a
--- /dev/null
+++ b/web_src/js/svg.js
@@ -0,0 +1,30 @@
+import octiconGitMerge from '../../public/img/svg/octicon-git-merge.svg';
+import octiconGitPullRequest from '../../public/img/svg/octicon-git-pull-request.svg';
+import octiconIssueClosed from '../../public/img/svg/octicon-issue-closed.svg';
+import octiconIssueOpened from '../../public/img/svg/octicon-issue-opened.svg';
+import octiconLink from '../../public/img/svg/octicon-link.svg';
+
+const svgs = {
+  'octicon-git-merge': octiconGitMerge,
+  'octicon-git-pull-request': octiconGitPullRequest,
+  'octicon-issue-closed': octiconIssueClosed,
+  'octicon-issue-opened': octiconIssueOpened,
+  'octicon-link': octiconLink,
+};
+
+const parser = new DOMParser();
+const serializer = new XMLSerializer();
+
+// retrieve a HTML string for given SVG icon name and size in pixels
+export function svg(name, size = 16) {
+  if (name in svgs) {
+    if (size === 16) return svgs[name];
+
+    const document = parser.parseFromString(svgs[name], 'image/svg+xml');
+    const svgNode = document.firstChild;
+    svgNode.setAttribute('width', String(size));
+    svgNode.setAttribute('height', String(size));
+    return serializer.serializeToString(svgNode);
+  }
+  return '';
+}
diff --git a/web_src/js/utils.js b/web_src/js/utils.js
index b16b05a1b7..229f4d6304 100644
--- a/web_src/js/utils.js
+++ b/web_src/js/utils.js
@@ -1,8 +1,3 @@
-// retrieve a HTML string for given SVG icon name and size in pixels
-export function svg(name, size) {
-  return `<svg class="svg ${name}" width="${size}" height="${size}" aria-hidden="true"><use xlink:href="#${name}"/></svg>`;
-}
-
 // transform /path/to/file.ext to file.ext
 export function basename(path = '') {
   return path ? path.replace(/^.*\//, '') : '';
diff --git a/web_src/svg/gitea-lock-cog.svg b/web_src/svg/gitea-lock-cog.svg
new file mode 100644
index 0000000000..13e374a9d1
--- /dev/null
+++ b/web_src/svg/gitea-lock-cog.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16">
+  <path d="M12.5 7h-.75V4.75C11.75 2.131 9.619 0 7 0S2.25 2.131 2.25 4.75V7H1.5A1.5 1.5 0 000 8.5v6A1.5 1.5 0 001.5 16h11a1.5 1.5 0 001.5-1.5v-6A1.5 1.5 0 0012.5 7zM9.25 7h-4.5V4.75C4.75 3.51 5.76 2.5 7 2.5s2.25 1.01 2.25 2.25z"/>
+  <path d="M6.433 10.244q-.508.237-.7.765-.192.527.045 1.036.237.508.764.7.528.192 1.036-.045.509-.237.7-.765.193-.527-.044-1.036-.237-.508-.765-.7-.528-.192-1.036.045zM4.765 8.032l1.065-.497q.057-.027.128-.013.07.014.107.067l.548.825q.302-.03.524-.017.162-.28.423-.822.035-.074.097-.103.063-.03.13-.009.239.047.74.234.502.186.551.292.027.057.015.145l-.21.903q.21.16.386.352.689-.228.958-.277.15-.03.214.11l.497 1.065q.031.067.014.136-.017.07-.077.103l-.82.546q.032.271.023.515l.83.437q.065.027.098.1.032.067.003.144-.265.86-.436 1.167-.033.056-.095.085-.058.027-.128.013-.135-.025-.433-.096-.3-.07-.46-.1-.179.24-.382.417l.28.938q.019.067-.014.13-.032.061-.094.09l-1.065.497q-.058.026-.128.013-.071-.014-.105-.062l-.55-.83q-.253.036-.53.019-.183.32-.422.822-.035.074-.093.101-.048.023-.13.009-.231-.045-.736-.233-.505-.187-.554-.293-.03-.062-.01-.147l.204-.901q-.209-.16-.386-.352-.688.228-.957.277-.15.03-.215-.11l-.496-1.065q-.032-.067-.014-.136.017-.07.077-.104l.82-.545q-.033-.271-.024-.515l-.83-.442q-.064-.023-.098-.095-.029-.062-.008-.142.283-.885.447-1.172.023-.051.09-.082.057-.027.128-.014.134.026.433.096.299.071.459.102.182-.237.378-.416l-.275-.94q-.02-.067.013-.13.033-.061.095-.09z" fill="#fff" fill-rule="evenodd" stroke-width=".2"/>
+</svg>
\ No newline at end of file
diff --git a/web_src/svg/gitea-lock.svg b/web_src/svg/gitea-lock.svg
new file mode 100644
index 0000000000..2511b94331
--- /dev/null
+++ b/web_src/svg/gitea-lock.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16">
+  <path d="M12.5 7h-.75V4.75A4.756 4.756 0 007 0a4.756 4.756 0 00-4.75 4.75V7H1.5A1.5 1.5 0 000 8.5v6A1.5 1.5 0 001.5 16h11a1.5 1.5 0 001.5-1.5v-6A1.5 1.5 0 0012.5 7zM9.25 7h-4.5V4.75C4.75 3.51 5.76 2.5 7 2.5s2.25 1.01 2.25 2.25z"/>
+</svg>
\ No newline at end of file
diff --git a/web_src/svg/gitea-unlock.svg b/web_src/svg/gitea-unlock.svg
new file mode 100644
index 0000000000..afaa9f03de
--- /dev/null
+++ b/web_src/svg/gitea-unlock.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="16" viewBox="0 0 14 16">
+  <path d="M12.5 8H4.75V4.778c0-1.237.99-2.265 2.228-2.278A2.253 2.253 0 019.25 4.75v.5c0 .416.334.75.75.75h1c.416 0 .75-.334.75-.75v-.5c0-2.625-2.14-4.76-4.766-4.75C4.36.01 2.25 2.172 2.25 4.797V8H1.5A1.5 1.5 0 000 9.5v5A1.5 1.5 0 001.5 16h11a1.5 1.5 0 001.5-1.5v-5A1.5 1.5 0 0012.5 8z"/>
+</svg>
\ No newline at end of file