From 470ac18cba0937f67ebaaab8f04522b4d8aa222b Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 17 May 2025 10:03:37 +0300
Subject: [PATCH] feat(client): integrate normalize.css

---
 apps/client/package.json                    | 1 +
 apps/client/src/share.ts                    | 1 +
 apps/server/package.json                    | 1 -
 apps/server/src/assets/views/share/page.ejs | 1 -
 apps/server/src/routes/assets.ts            | 2 --
 apps/server/webpack.config.cjs              | 1 -
 pnpm-lock.yaml                              | 6 +++---
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/apps/client/package.json b/apps/client/package.json
index bbd6883e2..485e81e28 100644
--- a/apps/client/package.json
+++ b/apps/client/package.json
@@ -47,6 +47,7 @@
     "marked": "15.0.11",
     "mermaid": "11.6.0",
     "mind-elixir": "4.5.2",
+    "normalize.css": "8.0.1",
     "panzoom": "9.4.3",
     "react": "19.1.0",
     "react-dom": "19.1.0",
diff --git a/apps/client/src/share.ts b/apps/client/src/share.ts
index 0281e6ed4..60615b686 100644
--- a/apps/client/src/share.ts
+++ b/apps/client/src/share.ts
@@ -1,4 +1,5 @@
 import "./stylesheets/bootstrap.scss";
+import "normalize.css";
 
 /**
  * Fetch note with given ID from backend
diff --git a/apps/server/package.json b/apps/server/package.json
index 819312d1e..8a60d6fa6 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -44,7 +44,6 @@
     "express-http-proxy": "2.1.1",
     "jquery": "3.7.1",
     "katex": "0.16.22",
-    "normalize.css": "8.0.1",
     "@anthropic-ai/sdk": "0.51.0",
     "@braintree/sanitize-url": "7.1.1",
     "@triliumnext/commons": "workspace:*",
diff --git a/apps/server/src/assets/views/share/page.ejs b/apps/server/src/assets/views/share/page.ejs
index 35d01cd2c..84b8b6e60 100644
--- a/apps/server/src/assets/views/share/page.ejs
+++ b/apps/server/src/assets/views/share/page.ejs
@@ -14,7 +14,6 @@
     <% } %>
     <script src="../<%= appPath %>/share.js"></script>
     <% if (!note.isLabelTruthy("shareOmitDefaultCss")) { %>
-        <link href="../<%= assetPath %>/node_modules/normalize.css/normalize.css" rel="stylesheet">
         <link href="../<%= assetPath %>/stylesheets/share.css" rel="stylesheet">
     <% } %>
     <% if (note.type === 'text' || note.type === 'book') { %>
diff --git a/apps/server/src/routes/assets.ts b/apps/server/src/routes/assets.ts
index 5bdd63ad1..3a09fb0d0 100644
--- a/apps/server/src/routes/assets.ts
+++ b/apps/server/src/routes/assets.ts
@@ -62,8 +62,6 @@ async function register(app: express.Application) {
 
     app.use(`/${assetPath}/node_modules/jquery-hotkeys/`, persistentCacheStatic(path.join(nodeModulesDir, "jquery-hotkeys/")));
 
-    app.use(`/${assetPath}/node_modules/normalize.css/`, persistentCacheStatic(path.join(nodeModulesDir, "normalize.css/")));
-
     app.use(`/${assetPath}/node_modules/jquery.fancytree/dist/`, persistentCacheStatic(path.join(nodeModulesDir, "jquery.fancytree/dist/")));
 }
 
diff --git a/apps/server/webpack.config.cjs b/apps/server/webpack.config.cjs
index efe52d9c6..509446bd3 100644
--- a/apps/server/webpack.config.cjs
+++ b/apps/server/webpack.config.cjs
@@ -17,7 +17,6 @@ function buildFilesToCopy() {
     "katex/dist",
     "jquery/dist",
     "jquery-hotkeys",
-    "normalize.css/normalize.css",
     "jquery.fancytree/dist",
 
     // Required as they are native dependencies and cannot be well bundled.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 59179e12e..61d5fb7d3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -278,6 +278,9 @@ importers:
       mind-elixir:
         specifier: 4.5.2
         version: 4.5.2
+      normalize.css:
+        specifier: 8.0.1
+        version: 8.0.1
       panzoom:
         specifier: 9.4.3
         version: 9.4.3
@@ -737,9 +740,6 @@ importers:
       normalize-strings:
         specifier: 1.1.1
         version: 1.1.1
-      normalize.css:
-        specifier: 8.0.1
-        version: 8.0.1
       ollama:
         specifier: 0.5.15
         version: 0.5.15