From 63298a3ec16a647a7d750b8420df8355edca8814 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Sat, 11 Apr 2020 19:47:36 +0530
Subject: [PATCH 1/3] Remove --max-old-path option to webpack (correctly passed
 in NODE_OPTIONS)

---
 debian/rake-tasks.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index 52f6f06a5c..350e4cc981 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -49,4 +49,4 @@ runuser -u ${gitlab_user} -- sh -c 'cd /usr/share/gitlab/public/assets && \
 
 echo "Webpacking..."
 # Workaround for webpack crashing with nodejs 10 - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=956211
-runuser -u ${gitlab_user} -- sh -c 'NODE_OPTIONS="--max-old-space-size=2048" webpack --max-old-space-size=16384 --config config/webpack.config.js'
+runuser -u ${gitlab_user} -- sh -c 'NODE_OPTIONS="--max-old-space-size=2048" webpack --config config/webpack.config.js'

From f2c54b11234273019a8601c2a017fc47dc655077 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Sat, 11 Apr 2020 19:51:50 +0530
Subject: [PATCH 2/3] Exclude packaged modules from transpiling
 (webpack/babel-loader)

---
 debian/patches/0740-use-packaged-modules.patch | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch
index 1c2e32762b..7a4c1721db 100644
--- a/debian/patches/0740-use-packaged-modules.patch
+++ b/debian/patches/0740-use-packaged-modules.patch
@@ -25,7 +25,7 @@
    },
  
    module: {
-@@ -166,9 +165,12 @@
+@@ -166,9 +165,13 @@
        },
        {
          test: /\.js$/,
@@ -33,13 +33,14 @@
 +        exclude: [ path =>
            /node_modules\/(?!tributejs)|node_modules|vendor[\\/]assets/.test(path) &&
            !/\.vue\.js/.test(path),
-+          /\bcore-js\b/,
-+	  /\bwebpack\/buildin\b/
++          /\/usr\/share\/nodejs/,
++          /\/usr\/lib\/nodejs/,
++          /\/usr\/share\/javascript/
 +	],
          loader: 'babel-loader',
          options: {
            cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
-@@ -475,19 +477,6 @@
+@@ -475,19 +478,6 @@
      // enable HMR only in webpack-dev-server
      DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
  
@@ -59,7 +60,7 @@
      new webpack.DefinePlugin({
        // This one is used to define window.gon.ee and other things properly in tests:
        'process.env.IS_EE': JSON.stringify(IS_EE),
-@@ -513,6 +502,7 @@
+@@ -513,6 +503,7 @@
  
    node: {
      fs: 'empty', // sqljs requires fs

From 5a0901da9673fe4a1124baee53856f003bed62af Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Sat, 11 Apr 2020 19:54:41 +0530
Subject: [PATCH 3/3] Upload to experimental

---
 debian/changelog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 064351c6ba..12f240d541 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gitlab (12.9.2-4) experimental; urgency=medium
+
+  * Remove --max-old-path option to webpack (correctly passed in NODE_OPTIONS)
+  * Exclude packaged modules from transpiling (webpack/babel-loader)
+    (Closes: #956449)
+
+ -- Pirate Praveen <praveen@debian.org>  Sat, 11 Apr 2020 19:53:38 +0530
+
 gitlab (12.9.2-3) experimental; urgency=medium
 
   * Tighten dependency on gitlab-common