From 9e82ee6d916c80e3c8e94d7783cfa7b43eb5e66b Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Wed, 14 Feb 2018 20:09:31 +0530
Subject: [PATCH] Use jquery from system for compatibility with at.js in
 node_modules

---
 debian/control                            | 2 ++
 debian/patches/0420-use-system-libs.patch | 8 ++++----
 debian/rake-tasks.sh                      | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 2023119944..81e9b69730 100644
--- a/debian/control
+++ b/debian/control
@@ -315,7 +315,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  node-file-loader,
  node-imports-loader,
  node-jed,
+ node-jquery,
  node-jszip,
+ node-js-cookie,
  node-marked,
  node-mousetrap,
  node-raw-loader,
diff --git a/debian/patches/0420-use-system-libs.patch b/debian/patches/0420-use-system-libs.patch
index 292fdf01fe..f2600b423d 100644
--- a/debian/patches/0420-use-system-libs.patch
+++ b/debian/patches/0420-use-system-libs.patch
@@ -17,7 +17,7 @@
      "cropper": "^2.3.0",
      "css-loader": "^0.28.0",
      "d3": "^3.5.11",
-@@ -30,25 +22,16 @@
+@@ -30,25 +22,14 @@
      "document-register-element": "^1.3.0",
      "dropzone": "^4.2.0",
      "emoji-unicode-version": "^0.2.1",
@@ -26,9 +26,9 @@
 -    "file-loader": "^0.11.1",
 -    "imports-loader": "^0.7.1",
 -    "jed": "^1.1.1",
-     "jquery": "^2.2.1",
+-    "jquery": "^2.2.1",
      "jquery-ujs": "^1.2.1",
-     "js-cookie": "^2.1.3",
+-    "js-cookie": "^2.1.3",
 -    "jszip": "^3.1.3",
      "jszip-utils": "^0.0.2",
 -    "marked": "^0.3.6",
@@ -43,7 +43,7 @@
      "react-dev-utils": "^0.5.2",
      "select2": "3.5.2-browserify",
      "sql.js": "^0.4.0",
-@@ -56,14 +39,11 @@
+@@ -56,14 +37,11 @@
      "three-orbit-controls": "^82.1.0",
      "three-stl-loader": "^1.0.4",
      "timeago.js": "^2.0.5",
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index 0aadeebdfc..1b31cbd40c 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -30,12 +30,14 @@ chmod 0700 ${gitlab_data_dir}/.gitlab_shell_secret
 
 echo "Installing node modules"
 runuser -u ${gitlab_user} -- sh -c 'install -d /var/lib/gitlab/node_modules'
+runuser -u ${gitlab_user} -- sh -c 'rm -rf node_modules/jquery'
 runuser -u ${gitlab_user} -- sh -c 'npm install npm'
 runuser -u ${gitlab_user} -- sh -c 'node_modules/.bin/npm install'
 # workaround for broken libjs-jquery-atwho #890391
 # npm i at.js won't work as it needs jquery@^1.7.0 as peer dependency
 runuser -u ${gitlab_user} -- sh -c 'wget  -O /tmp/at.js.tar.gz `npm view at.js dist.tarball`'
 runuser -u ${gitlab_user} -- sh -c 'tar -C node_modules --transform "s/package/at.js/" -zxf /tmp/at.js.tar.gz'
+runuser -u ${gitlab_user} -- sh -c 'npm i document-register-element@1.3.0'
 runuser -u ${gitlab_user} -- sh -c 'rm -rf node_modules/webpack'
 runuser -u ${gitlab_user} -- sh -c 'NODE_PATH=/usr/share/gitlab/node_modules webpack --config config/webpack.config.js'