Use jquery from system for compatibility with at.js in node_modules

This commit is contained in:
Pirate Praveen 2018-02-14 20:09:31 +05:30
parent 7efefc06fb
commit 9e82ee6d91
3 changed files with 8 additions and 4 deletions

2
debian/control vendored
View file

@ -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,

View file

@ -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",

View file

@ -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'