From 986be72bc16c721705e74ad74b62020087d78cfd Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Thu, 21 Jan 2021 16:21:25 +0530
Subject: [PATCH] Update path for katex fonts and fix type in path for babel
 modules

---
 .../patches/0740-use-packaged-modules.patch   | 67 ++++++++++++++-----
 1 file changed, 52 insertions(+), 15 deletions(-)

diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch
index 8eb159dcc3..85c7c7d04d 100644
--- a/debian/patches/0740-use-packaged-modules.patch
+++ b/debian/patches/0740-use-packaged-modules.patch
@@ -69,6 +69,15 @@ Use debian packaged node modules when available
          loader: 'babel-loader',
          options: {
            cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
+@@ -259,7 +264,7 @@
+       },
+       {
+         test: /\.(eot|ttf|woff|woff2)$/,
+-        include: /node_modules\/(katex\/dist\/fonts|monaco-editor)/,
++        include: /(node_modules\/monaco-editor|\/usr\/share\/fonts\/truetype\/katex)/,
+         loader: 'file-loader',
+         options: {
+           name: '[name].[contenthash:8].[ext]',
 @@ -526,19 +531,6 @@
      // enable HMR only in webpack-dev-server
      DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
@@ -109,16 +118,33 @@ Use debian packaged node modules when available
 -    "@babel/plugin-proposal-private-methods": "^7.10.1",
 -    "@babel/plugin-syntax-import-meta": "^7.10.1",
 -    "@babel/preset-env": "^7.10.1",
-+    "@babel/core": "link:/usrshare/nodejs/@babel/core",
-+    "@babel/plugin-proposal-class-properties": "link:/usrshare/nodejs/@babel/plugin-proposal-class-properties",
-+    "@babel/plugin-proposal-json-strings": "link:/usrshare/nodejs/@babel/plugin-proposal-json-strings",
-+    "@babel/plugin-proposal-private-methods": "link:/usrshare/nodejs/@babel/plugin-proposal-private-methods",
-+    "@babel/plugin-syntax-import-meta": "link:/usrshare/nodejs/@babel/plugin-syntax-import-meta",
-+    "@babel/preset-env": "link:/usrshare/nodejs/@babel/preset-env",
++    "@babel/core": "link:/usr/share/nodejs/@babel/core",
++    "@babel/plugin-proposal-class-properties": "link:/usr/share/nodejs/@babel/plugin-proposal-class-properties",
++    "@babel/plugin-proposal-json-strings": "link:/usr/share/nodejs/@babel/plugin-proposal-json-strings",
++    "@babel/plugin-proposal-private-methods": "link:/usr/share/nodejs/@babel/plugin-proposal-private-methods",
++    "@babel/plugin-syntax-import-meta": "link:/usr/share/nodejs/@babel/plugin-syntax-import-meta",
++    "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
      "@gitlab/at.js": "1.5.5",
      "@gitlab/svgs": "1.171.0",
      "@gitlab/ui": "21.33.0",
-@@ -68,14 +68,14 @@
+@@ -55,29 +55,29 @@
+     "apollo-link": "^1.2.14",
+     "apollo-link-batch-http": "^1.2.14",
+     "apollo-upload-client": "^13.0.0",
+-    "autosize": "^4.0.2",
++    "autosize": "link:/usr/share/nodejs/autosize",
+     "aws-sdk": "^2.637.0",
+-    "axios": "^0.20.0",
++    "axios": "link:/usr/share/nodejs/axios",
+     "babel-loader": "^8.0.6",
+     "babel-plugin-lodash": "^3.3.4",
+     "bootstrap": "4.4.1",
+     "brace-expansion": "^1.1.8",
+     "cache-loader": "^4.1.0",
+-    "clipboard": "^1.7.1",
+-    "codemirror": "^5.48.4",
++    "clipboard": "link:/usr/share/nodejs/clipboard",
++    "codemirror": "link:/usr/share/nodejs/codemirror",
      "codesandbox-api": "0.0.23",
      "compression-webpack-plugin": "^3.0.1",
      "copy-webpack-plugin": "^5.0.5",
@@ -131,14 +157,18 @@ Use debian packaged node modules when available
 -    "d3-sankey": "^0.12.3",
 -    "d3-scale": "^2.2.2",
 -    "d3-selection": "^1.2.0",
+-    "dateformat": "^3.0.3",
+-    "deckar01-task_list": "^2.3.1",
 +    "d3": "link:/usr/share/nodejs/d3",
 +    "d3-sankey": "link:/usr/share/nodejs/d3-sankey",
 +    "d3-scale": "link:/usr/share/nodejs/d3-scale",
 +    "d3-selection": "link:/usr/share/nodejs/d3-selection",
-     "dateformat": "^3.0.3",
-     "deckar01-task_list": "^2.3.1",
++    "dateformat": "link:/usr/share/nodejs/dateformat",
++    "deckar01-task_list": "link:/usr/share/nodejs/deckar01-task_list",
      "diff": "^3.4.0",
-@@ -87,9 +87,9 @@
+     "document-register-element": "1.14.3",
+     "dompurify": "^2.1.1",
+@@ -87,41 +87,41 @@
      "emoji-unicode-version": "^0.2.1",
      "exports-loader": "^0.7.0",
      "file-loader": "^5.1.0",
@@ -150,18 +180,25 @@ Use debian packaged node modules when available
      "graphql": "^14.7.0",
      "graphql-tag": "^2.10.1",
      "immer": "^7.0.7",
-@@ -100,28 +100,28 @@
-     "jquery": "^3.5.0",
+     "imports-loader": "^0.8.0",
+     "ipaddr.js": "^1.9.1",
+-    "jed": "^1.1.1",
++    "jed": "link:/usr/share/nodejs/jed",
+     "jest-transform-graphql": "^2.1.0",
+-    "jquery": "^3.5.0",
++    "jquery": "link:/usr/share/nodejs/jquery",
      "jquery.caret": "^0.3.1",
      "jquery.waitforimages": "^2.2.0",
 -    "js-cookie": "^2.2.1",
-+    "js-cookie": "link:/usr/share/nodejs/js-cookie",
-     "js-yaml": "^3.13.1",
+-    "js-yaml": "^3.13.1",
 -    "jszip": "^3.1.3",
 -    "jszip-utils": "^0.0.2",
+-    "katex": "^0.10.0",
++    "js-cookie": "link:/usr/share/nodejs/js-cookie",
++    "js-yaml": "link:/usr/share/nodejs/js-yaml",
 +    "jszip": "link:/usr/share/nodejs/jszip",
 +    "jszip-utils": "link:/usr/share/nodejs/jszip",
-     "katex": "^0.10.0",
++    "katex": "link:/usr/share/nodejs/katex",
      "lodash": "^4.17.20",
      "marked": "^0.3.12",
 -    "mermaid": "^8.5.2",