From 632e36e758b832e6f9b76dd49b4dacb9f0da0a3f Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Fri, 15 Mar 2019 22:06:39 +0530
Subject: [PATCH] Remove dependency on npm and use yarnpkg directly instead
---
debian/control | 6 +++---
debian/copyright | 2 +-
debian/rake-tasks.sh | 5 +----
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/debian/control b/debian/control
index 643bb83357..e613650d3c 100644
--- a/debian/control
+++ b/debian/control
@@ -224,8 +224,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
#
ruby-webpack-rails (>= 0.9.10~),
# Many node modules are still in NEW, some are yet to be packaged
-# so we use npm to downlod those and hence gitlab is in contrib
- npm,
+# so we use yarn to downlod those and hence gitlab is in contrib
+ yarnpkg,
ruby-rack-proxy (>= 0.6~),
#
ruby-sass-rails (>= 5.0.6~),
@@ -359,7 +359,7 @@ Description: git powered software platform to collaborate on code (non-omnibus)
Unlike the official package from GitLab Inc., this package does not use
omnibus.
.
- Note: Currently this package is in contrib because it uses npm to install
+ Note: Currently this package is in contrib because it uses yarn to install
front end dependencies.
Package: gitlab-common
diff --git a/debian/copyright b/debian/copyright
index fbc2bd811f..30c4db0bb2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: gitlab-ce
Source: https://gitlab.com/gitlab-org/gitlab-ce
Files-Excluded:
Comment: This package installs front end dependencies (nodejs modules) using
- npm/yarm package managers from outside debian. This can go to main when all
+ yarn package manager from outside debian. This can go to main when all
those nodejs modules are packaged in main.
Files: *
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index 613af5360b..93a1b8be95 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -31,10 +31,7 @@ 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 'install -d /var/lib/gitlab/yarn'
-runuser -u ${gitlab_user} -- sh -c 'cd /var/lib/gitlab/yarn; npm install yarn'
-runuser -u ${gitlab_user} -- sh -c '/var/lib/gitlab/yarn/node_modules/.bin/yarn --frozen-lockfile install'
-export PATH=$PATH:/var/lib/gitlab/yarn/node_modules/.bin
+runuser -u ${gitlab_user} -- sh -c 'yarnpkg --frozen-lockfile install'
# Remove write permissions of .yarn-metadata.json files
runuser -u ${gitlab_user} -- sh -c 'find /var/lib/gitlab/.cache/yarn/v4/ -name .yarn-metadata.json -perm -a=w -exec chmod 644 {} \;'