From 73c638aef3f1d3b1082b0cb8c8b4b00cb99c49f5 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Wed, 22 Jun 2022 00:40:03 +0530
Subject: [PATCH] Refresh patches

---
 .../Gemfile/0010-relax-stable-libs.patch      | 60 ++++++++--------
 .../0020-remove-development-test.patch        | 12 ++--
 ...0-make-test-dependencies-conditional.patch |  2 +-
 .../patches/Gemfile/0040-relax-httparty.patch |  2 +-
 debian/patches/Gemfile/0050-relax-rdoc.patch  |  2 +-
 .../0070-embed-elasticsearch-model.patch      |  2 +-
 .../0080-embed-elasticsearch-rails.patch      |  2 +-
 .../Gemfile/0090-remove-ee-only-gems.patch    |  4 +-
 .../patches/Gemfile/0120-relax-capybara.patch |  2 +-
 .../0130-remove-capybara-screenshot.patch     |  2 +-
 .../Gemfile/0140-remove-guard-rspec.patch     |  2 +-
 .../Gemfile/0150-relax-graphlient.patch       |  2 +-
 debian/patches/Gemfile/0190-relax-rdoc.patch  |  2 +-
 .../nodejs/0020-remove-dev-dependencies.patch | 15 ++--
 .../nodejs/0040-use-packaged-modules.patch    | 69 ++++++++++---------
 .../patches/nodejs/0060-use-js-cookie-3.patch |  4 +-
 16 files changed, 94 insertions(+), 90 deletions(-)

diff --git a/debian/patches/Gemfile/0010-relax-stable-libs.patch b/debian/patches/Gemfile/0010-relax-stable-libs.patch
index 13224f5445..5454d22e8f 100644
--- a/debian/patches/Gemfile/0010-relax-stable-libs.patch
+++ b/debian/patches/Gemfile/0010-relax-stable-libs.patch
@@ -3,12 +3,12 @@ gitlab Gemfile
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -2,61 +2,61 @@
+@@ -2,62 +2,62 @@
  
  source 'https://rubygems.org'
  
--gem 'rails', '~> 6.1.4.6'
-+gem 'rails', '~> 6.1.4', '>= 6.1.4.6'
+-gem 'rails', '~> 6.1.4.7'
++gem 'rails', '~> 6.1.4', '>= 6.1.4.7'
  
 -gem 'bootsnap', '~> 1.9.1', require: false
 +gem 'bootsnap', '~> 1.9', '>= 1.9.1', require: false
@@ -61,7 +61,9 @@ gitlab Gemfile
 -gem 'omniauth-cas3', '~> 1.1.4'
 +gem 'omniauth-cas3', '~> 1.1','>= 1.1.4'
  gem 'omniauth-dingtalk-oauth2', '~> 1.0'
+-gem 'omniauth-alicloud', '~> 1.0.1'
 -gem 'omniauth-facebook', '~> 4.0.0'
++gem 'omniauth-alicloud', '~> 1.0', '>= 1.0.1'
 +gem 'omniauth-facebook', '~> 4.0'
  gem 'omniauth-github', '~> 1.4'
 -gem 'omniauth-gitlab', '~> 1.0.2'
@@ -87,7 +89,7 @@ gitlab Gemfile
  
  # Kerberos authentication. EE-only
  gem 'gssapi', group: :kerberos
-@@ -64,17 +64,17 @@
+@@ -65,17 +65,17 @@
  # Spam and anti-bot protection
  gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
  gem 'akismet', '~> 3.0'
@@ -110,7 +112,7 @@ gitlab Gemfile
  # GitLab Pages letsencrypt support
  gem 'acme-client', '~> 2.0', '>= 2.0.9'
  
-@@ -85,7 +85,7 @@
+@@ -86,7 +86,7 @@
  gem 'ohai', '~> 16.10'
  
  # GPG
@@ -119,7 +121,7 @@ gitlab Gemfile
  
  # LDAP Auth
  # GitLab fork with several improvements to original library. For full list of changes
-@@ -94,14 +94,14 @@
+@@ -95,14 +95,14 @@
  gem 'net-ldap', '~> 0.16.3'
  
  # API
@@ -138,7 +140,7 @@ gitlab Gemfile
  gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
  gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
  
-@@ -113,23 +113,23 @@
+@@ -114,23 +114,23 @@
  gem 'kaminari', '~> 1.0'
  
  # HAML
@@ -166,7 +168,7 @@ gitlab Gemfile
  
  # for Google storage
  gem 'google-api-client', '~> 0.33'
-@@ -138,37 +138,37 @@
+@@ -139,37 +139,37 @@
  gem 'unf', '~> 0.1.4'
  
  # Seed data
@@ -207,7 +209,7 @@ gitlab Gemfile
 -gem 'asciidoctor', '~> 2.0.10'
 +gem 'wikicloth', '~> 0.8.1'
 +gem 'asciidoctor', '~> 2.0','>= 2.0.10'
- gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
+ gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
  gem 'asciidoctor-plantuml', '~> 0.0.12'
  gem 'asciidoctor-kroki', '~> 0.5.0', require: false
 -gem 'rouge', '~> 3.27.0'
@@ -218,7 +220,7 @@ gitlab Gemfile
  gem 'nokogiri', '~> 1.12'
  gem 'escape_utils', '~> 1.1'
  
-@@ -180,12 +180,12 @@
+@@ -181,12 +181,12 @@
  gem 'diff_match_patch', '~> 0.1.0'
  
  # Application server
@@ -233,7 +235,7 @@ gitlab Gemfile
    gem 'puma_worker_killer', '~> 0.3.1', require: false
    gem 'sd_notify', '~> 0.1.0', require: false
  end
-@@ -199,11 +199,11 @@
+@@ -200,11 +200,11 @@
  # Background jobs
  gem 'sidekiq', '~> 6.4'
  gem 'sidekiq-cron', '~> 1.2'
@@ -247,7 +249,7 @@ gitlab Gemfile
  
  # HTTP requests
  gem 'httparty', '~> 0.16.4'
-@@ -215,14 +215,14 @@
+@@ -216,14 +216,14 @@
  gem 'ruby-progressbar', '~> 1.10'
  
  # GitLab settings
@@ -265,7 +267,7 @@ gitlab Gemfile
  
  # Export Ruby Regex to Javascript
  gem 'js_regex', '~> 3.7'
-@@ -231,24 +231,24 @@
+@@ -232,24 +232,24 @@
  gem 'device_detector'
  
  # Redis
@@ -294,7 +296,7 @@ gitlab Gemfile
  
  # Hangouts Chat integration
  gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
-@@ -260,17 +260,17 @@
+@@ -261,17 +261,17 @@
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
@@ -315,9 +317,9 @@ gitlab Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.7'
-@@ -287,32 +287,32 @@
+@@ -288,32 +288,32 @@
  
- gem 'rack-proxy', '~> 0.6.0'
+ gem 'rack-proxy', '~> 0.7.2'
  
 -gem 'sassc-rails', '~> 2.1.0'
 -gem 'autoprefixer-rails', '10.2.5.1'
@@ -358,7 +360,7 @@ gitlab Gemfile
  
  # LabKit: Tracing and Correlation
  gem 'gitlab-labkit', '~> 0.22.0'
-@@ -323,11 +323,11 @@
+@@ -324,11 +324,11 @@
  # I18n
  gem 'ruby_parser', '~> 3.15', require: false
  gem 'rails-i18n', '~> 6.0'
@@ -372,7 +374,7 @@ gitlab Gemfile
  
  # Perf bar
  gem 'peek', '~> 1.1'
-@@ -337,10 +337,10 @@
+@@ -338,10 +338,10 @@
  
  # Metrics
  gem 'method_source', '~> 1.0', require: false
@@ -385,7 +387,7 @@ gitlab Gemfile
  
  group :development do
    gem 'lefthook', '~> 0.7.0', require: false
-@@ -422,22 +422,22 @@
+@@ -423,22 +423,22 @@
  end
  
  group :test do
@@ -417,7 +419,7 @@ gitlab Gemfile
    gem 'rspec_junit_formatter'
    gem 'guard-rspec'
  
-@@ -454,7 +454,7 @@
+@@ -455,7 +455,7 @@
  gem 'email_reply_trimmer', '~> 0.1'
  gem 'html2text'
  
@@ -426,7 +428,7 @@ gitlab Gemfile
  gem 'stackprof', '~> 0.2.15', require: false
  gem 'rbtrace', '~> 0.4', require: false
  gem 'memory_profiler', '~> 0.9', require: false
-@@ -468,8 +468,8 @@
+@@ -469,8 +469,8 @@
  gem 'health_check', '~> 3.0'
  
  # System information
@@ -437,12 +439,12 @@ gitlab Gemfile
  
  # NTP client
  gem 'net-ntp'
-@@ -481,14 +481,14 @@
+@@ -482,14 +482,14 @@
  gem 'spamcheck', '~> 0.1.0'
  
  # Gitaly GRPC protocol definitions
--gem 'gitaly', '~> 14.9.0.pre.rc4'
-+gem 'gitaly', '~> 14.9'
+-gem 'gitaly', '~> 14.10.0-rc1'
++gem 'gitaly', '~> 14.10'
  
  # KAS GRPC protocol definitions
  gem 'kas-grpc', '~> 0.0.2'
@@ -455,16 +457,16 @@ gitlab Gemfile
  
  gem 'toml-rb', '~> 2.0'
  
-@@ -496,7 +496,7 @@
+@@ -497,7 +497,7 @@
  gem 'flipper', '~> 0.21.0'
  gem 'flipper-active_record', '~> 0.21.0'
  gem 'flipper-active_support_cache_store', '~> 0.21.0'
 -gem 'unleash', '~> 3.2.2'
 +gem 'unleash', '~> 3.2', '>= 3.2.2'
- gem 'gitlab-experiment', '~> 0.7.0'
+ gem 'gitlab-experiment', '~> 0.7.1'
  
  # Structured logging
-@@ -509,12 +509,12 @@
+@@ -510,12 +510,12 @@
  # Countries list
  gem 'countries', '~> 3.0'
  
@@ -479,7 +481,7 @@ gitlab Gemfile
  
  # Locked as long as quoted-printable encoding issues are not resolved
  # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
-@@ -529,11 +529,11 @@
+@@ -530,11 +530,11 @@
  gem 'valid_email', '~> 0.1'
  
  # JSON
@@ -495,7 +497,7 @@ gitlab Gemfile
  
  gem 'webauthn', '~> 2.3'
  
-@@ -542,4 +542,4 @@
+@@ -543,4 +543,4 @@
  
  gem 'parslet', '~> 1.8'
  
diff --git a/debian/patches/Gemfile/0020-remove-development-test.patch b/debian/patches/Gemfile/0020-remove-development-test.patch
index f57dde31ac..91da8f1adc 100644
--- a/debian/patches/Gemfile/0020-remove-development-test.patch
+++ b/debian/patches/Gemfile/0020-remove-development-test.patch
@@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -102,7 +102,6 @@
+@@ -103,7 +103,6 @@
  gem 'graphql', '~> 1.11', '>= 1.11.10'
  gem 'graphiql-rails', '~> 1.8'
  gem 'apollo_upload_server', '~> 2.1'
@@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
  gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
  
  gem 'hashie'
-@@ -325,7 +324,6 @@
+@@ -326,7 +325,6 @@
  gem 'rails-i18n', '~> 6.0'
  gem 'gettext_i18n_rails', '~> 1.8'
  gem 'gettext_i18n_rails_js', '~> 1.3'
@@ -18,13 +18,13 @@ Bundler will fail when it can't find these locally
  
  gem 'batch-loader', '~> 2.0', '>= 2.0.1'
  
-@@ -342,85 +340,6 @@
+@@ -343,85 +341,6 @@
  
  gem 'warning', '~> 1.2'
  
 -group :development do
 -  gem 'lefthook', '~> 0.7.0', require: false
--  gem 'solargraph', '~> 0.43', require: false
+-  gem 'solargraph', '~> 0.44.3', require: false
 -
 -  gem 'letter_opener_web', '~> 2.0.0'
 -
@@ -69,7 +69,7 @@ Bundler will fail when it can't find these locally
 -  gem 'knapsack', '~> 1.21.1'
 -  gem 'crystalball', '~> 0.7.0', require: false
 -
--  gem 'simple_po_parser', '~> 1.1.2', require: false
+-  gem 'simple_po_parser', '~> 1.1.6', require: false
 -
 -  gem 'timecop', '~> 0.9.1'
 -
@@ -83,7 +83,7 @@ Bundler will fail when it can't find these locally
 -end
 -
 -group :development, :test, :danger do
--  gem 'gitlab-dangerfiles', '~> 2.11.0', require: false
+-  gem 'gitlab-dangerfiles', '~> 3.0', require: false
 -end
 -
 -group :development, :test, :coverage do
diff --git a/debian/patches/Gemfile/0030-make-test-dependencies-conditional.patch b/debian/patches/Gemfile/0030-make-test-dependencies-conditional.patch
index 7c3e7a7a79..e3e5802a89 100644
--- a/debian/patches/Gemfile/0030-make-test-dependencies-conditional.patch
+++ b/debian/patches/Gemfile/0030-make-test-dependencies-conditional.patch
@@ -2,7 +2,7 @@ Make test dependencies conditional so we can enable them when running autopkgtes
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -340,7 +340,7 @@
+@@ -341,7 +341,7 @@
  
  gem 'warning', '~> 1.2'
  
diff --git a/debian/patches/Gemfile/0040-relax-httparty.patch b/debian/patches/Gemfile/0040-relax-httparty.patch
index 9c18a98adb..bea8911076 100644
--- a/debian/patches/Gemfile/0040-relax-httparty.patch
+++ b/debian/patches/Gemfile/0040-relax-httparty.patch
@@ -2,7 +2,7 @@ Allow newer versions of httparty to satisfy dependency
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -205,7 +205,7 @@
+@@ -206,7 +206,7 @@
  gem 'fugit', '~> 1.2','>= 1.2.1'
  
  # HTTP requests
diff --git a/debian/patches/Gemfile/0050-relax-rdoc.patch b/debian/patches/Gemfile/0050-relax-rdoc.patch
index e4f127fb79..7405093b23 100644
--- a/debian/patches/Gemfile/0050-relax-rdoc.patch
+++ b/debian/patches/Gemfile/0050-relax-rdoc.patch
@@ -2,7 +2,7 @@ Allow rdoc from ruby 2.5 to match requirement
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -157,7 +157,7 @@
+@@ -158,7 +158,7 @@
  gem 'commonmarker', '~> 0.23.4'
  gem 'kramdown', '~> 2.3','>= 2.3.1'
  gem 'RedCloth', '~> 4.3','>= 4.3.2'
diff --git a/debian/patches/Gemfile/0070-embed-elasticsearch-model.patch b/debian/patches/Gemfile/0070-embed-elasticsearch-model.patch
index 65ca2bf5c0..6f726562da 100644
--- a/debian/patches/Gemfile/0070-embed-elasticsearch-model.patch
+++ b/debian/patches/Gemfile/0070-embed-elasticsearch-model.patch
@@ -2,7 +2,7 @@ Embed this gem until gitlab moved to 7.x version
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -140,7 +140,7 @@
+@@ -141,7 +141,7 @@
  gem 'seed-fu', '~> 2.3','>= 2.3.7'
  
  # Search
diff --git a/debian/patches/Gemfile/0080-embed-elasticsearch-rails.patch b/debian/patches/Gemfile/0080-embed-elasticsearch-rails.patch
index bb64e6fce1..39f5ea40a7 100644
--- a/debian/patches/Gemfile/0080-embed-elasticsearch-rails.patch
+++ b/debian/patches/Gemfile/0080-embed-elasticsearch-rails.patch
@@ -2,7 +2,7 @@ Embed this gem until gitlab moved to 7.x version
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -141,7 +141,7 @@
+@@ -142,7 +142,7 @@
  
  # Search
  gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'
diff --git a/debian/patches/Gemfile/0090-remove-ee-only-gems.patch b/debian/patches/Gemfile/0090-remove-ee-only-gems.patch
index c6c7cbf52f..2390da6c15 100644
--- a/debian/patches/Gemfile/0090-remove-ee-only-gems.patch
+++ b/debian/patches/Gemfile/0090-remove-ee-only-gems.patch
@@ -2,7 +2,7 @@ This gem is used only in gitlab Enterprise Edition
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -58,9 +58,6 @@
+@@ -59,9 +59,6 @@
  gem 'rack-oauth2', '~> 1.16'
  gem 'jwt', '~> 2.1'
  
@@ -12,7 +12,7 @@ This gem is used only in gitlab Enterprise Edition
  # Spam and anti-bot protection
  gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
  gem 'akismet', '~> 3.0'
-@@ -295,8 +292,6 @@
+@@ -297,8 +294,6 @@
  gem 'request_store', '~> 1.5'
  gem 'base32', '~> 0.3.0'
  
diff --git a/debian/patches/Gemfile/0120-relax-capybara.patch b/debian/patches/Gemfile/0120-relax-capybara.patch
index a34c6c06cf..b5f3f6be36 100644
--- a/debian/patches/Gemfile/0120-relax-capybara.patch
+++ b/debian/patches/Gemfile/0120-relax-capybara.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -341,7 +341,7 @@
+@@ -343,7 +343,7 @@
    gem 'rspec-benchmark', '~> 0.6.0'
    gem 'rspec-parameterized', require: false
  
diff --git a/debian/patches/Gemfile/0130-remove-capybara-screenshot.patch b/debian/patches/Gemfile/0130-remove-capybara-screenshot.patch
index 1d0949ae42..8cd081cbc0 100644
--- a/debian/patches/Gemfile/0130-remove-capybara-screenshot.patch
+++ b/debian/patches/Gemfile/0130-remove-capybara-screenshot.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -342,7 +342,6 @@
+@@ -344,7 +344,6 @@
    gem 'rspec-parameterized', require: false
  
    gem 'capybara', '~> 3.12'
diff --git a/debian/patches/Gemfile/0140-remove-guard-rspec.patch b/debian/patches/Gemfile/0140-remove-guard-rspec.patch
index 5a006074bf..604301015c 100644
--- a/debian/patches/Gemfile/0140-remove-guard-rspec.patch
+++ b/debian/patches/Gemfile/0140-remove-guard-rspec.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -351,7 +351,6 @@
+@@ -353,7 +353,6 @@
    gem 'concurrent-ruby', '~> 1.1'
    gem 'test-prof', '~> 1.0', '>= 1.0.7'
    gem 'rspec_junit_formatter'
diff --git a/debian/patches/Gemfile/0150-relax-graphlient.patch b/debian/patches/Gemfile/0150-relax-graphlient.patch
index 0b1ddbab13..7dd09bf28b 100644
--- a/debian/patches/Gemfile/0150-relax-graphlient.patch
+++ b/debian/patches/Gemfile/0150-relax-graphlient.patch
@@ -2,7 +2,7 @@ newer version is in the archive
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -99,7 +99,7 @@
+@@ -100,7 +100,7 @@
  gem 'graphql', '~> 1.11', '>= 1.11.10'
  gem 'graphiql-rails', '~> 1.8'
  gem 'apollo_upload_server', '~> 2.1'
diff --git a/debian/patches/Gemfile/0190-relax-rdoc.patch b/debian/patches/Gemfile/0190-relax-rdoc.patch
index 12a8ddd950..5233923d61 100644
--- a/debian/patches/Gemfile/0190-relax-rdoc.patch
+++ b/debian/patches/Gemfile/0190-relax-rdoc.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -156,7 +156,7 @@
+@@ -158,7 +158,7 @@
  gem 'commonmarker', '~> 0.23.4'
  gem 'kramdown', '~> 2.3','>= 2.3.1'
  gem 'RedCloth', '~> 4.3','>= 4.3.2'
diff --git a/debian/patches/nodejs/0020-remove-dev-dependencies.patch b/debian/patches/nodejs/0020-remove-dev-dependencies.patch
index 33c164fb87..82c6775eb7 100644
--- a/debian/patches/nodejs/0020-remove-dev-dependencies.patch
+++ b/debian/patches/nodejs/0020-remove-dev-dependencies.patch
@@ -2,17 +2,20 @@ These are not required in production
 
 --- a/package.json
 +++ b/package.json
-@@ -199,62 +199,7 @@
+@@ -202,64 +202,6 @@
      "yaml": "^2.0.0-10"
    },
    "devDependencies": {
 -    "@babel/plugin-transform-modules-commonjs": "^7.10.1",
--    "@gitlab/eslint-plugin": "11.0.0",
+-    "@gitlab/eslint-plugin": "12.0.1",
 -    "@gitlab/stylelint-config": "4.0.0",
 -    "@graphql-eslint/eslint-plugin": "3.0.0",
 -    "@testing-library/dom": "^7.16.2",
+-    "@types/jest": "^26.0.24",
 -    "@vue/test-utils": "1.3.0",
 -    "acorn": "^6.3.0",
+-    "ajv": "^8.10.0",
+-    "ajv-formats": "^2.1.1",
 -    "axios-mock-adapter": "^1.15.0",
 -    "babel-jest": "^26.5.2",
 -    "babel-plugin-dynamic-import-node": "^2.3.3",
@@ -57,12 +60,10 @@ These are not required in production
 -    "stylelint": "^14.3.0",
 -    "timezone-mock": "^1.0.8",
 -    "vue-jest": "4.0.1",
--    "webpack-dev-server": "4.7.4",
+-    "webpack-dev-server": "4.8.1",
 -    "xhr-mock": "^2.5.1",
 -    "yarn-check-webpack-plugin": "^1.2.0",
--    "yarn-deduplicate": "^3.1.0"
--  },
-+     },
+-    "yarn-deduplicate": "^4.0.0"
+   },
    "blockedDependencies": {
      "bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
-   },
diff --git a/debian/patches/nodejs/0040-use-packaged-modules.patch b/debian/patches/nodejs/0040-use-packaged-modules.patch
index c54a558086..08c060b60d 100644
--- a/debian/patches/nodejs/0040-use-packaged-modules.patch
+++ b/debian/patches/nodejs/0040-use-packaged-modules.patch
@@ -82,20 +82,40 @@ Use debian packaged node modules when available
      new webpack.DefinePlugin({
        // These are used to define window.gon.ee, window.gon.jh and other things properly in tests:
        'process.env.IS_EE': JSON.stringify(IS_EE),
-@@ -736,6 +729,7 @@
+@@ -739,6 +732,7 @@
  
    node: {
-     fs: 'empty', // sqljs requires fs
+     fs: 'empty', // editorconfig requires 'fs'
 +    Buffer: 'mock',
      setImmediate: false,
    },
  };
+--- a/babel.config.js
++++ b/babel.config.js
+@@ -14,6 +14,7 @@
+ // include stage 3 proposals
+ const plugins = [
+   '@babel/plugin-syntax-import-meta',
++  '@babel/plugin-syntax-dynamic-import',
+   '@babel/plugin-proposal-class-properties',
+   '@babel/plugin-proposal-json-strings',
+   '@babel/plugin-proposal-private-methods',
+--- a/app/assets/javascripts/pdf/index.vue
++++ b/app/assets/javascripts/pdf/index.vue
+@@ -1,6 +1,6 @@
+ <script>
+ import pdfjsLib from 'pdfjs-dist/build/pdf';
+-import workerSrc from 'pdfjs-dist/build/pdf.worker.min';
++import workerSrc from 'pdfjs-dist/build/pdf.worker';
+ 
+ import page from './page/index.vue';
+ 
 --- a/package.json
 +++ b/package.json
 @@ -48,18 +48,18 @@
    },
    "dependencies": {
-     "@apollo/client": "^3.3.11",
+     "@apollo/client": "^3.5.10",
 -    "@babel/core": "^7.10.1",
 -    "@babel/plugin-proposal-class-properties": "^7.10.1",
 -    "@babel/plugin-proposal-json-strings": "^7.10.1",
@@ -110,18 +130,18 @@ Use debian packaged node modules when available
 +    "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
      "@gitlab/at.js": "1.5.7",
      "@gitlab/favicon-overlay": "2.0.0",
-     "@gitlab/svgs": "2.6.0",
-     "@gitlab/ui": "37.3.0",
+     "@gitlab/svgs": "2.8.0",
+     "@gitlab/ui": "38.8.1",
      "@gitlab/visual-review-tools": "1.6.1",
--    "@rails/actioncable": "6.1.4-6",
+-    "@rails/actioncable": "6.1.4-7",
 +    "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
-     "@rails/ujs": "6.1.4-6",
+     "@rails/ujs": "6.1.4-7",
      "@sentry/browser": "5.30.0",
      "@sourcegraph/code-host-integration": "0.0.60",
 @@ -100,24 +100,24 @@
      "aws-sdk": "^2.637.0",
      "axios": "^0.24.0",
-     "babel-loader": "^8.2.2",
+     "babel-loader": "^8.2.4",
 -    "babel-plugin-lodash": "^3.3.4",
 +    "babel-plugin-lodash": "link:/usr/share/nodejs/babel-plugin-lodash",
      "bootstrap": "4.5.3",
@@ -134,7 +154,7 @@ Use debian packaged node modules when available
      "codesandbox-api": "0.0.23",
      "compression-webpack-plugin": "^5.0.2",
      "copy-webpack-plugin": "^6.4.1",
-     "core-js": "^3.21.1",
+     "core-js": "^3.22.0",
 -    "cron-validator": "^1.1.1",
 +    "cron-validator": "link:/usr/share/nodejs/cron-validator",
      "cronstrue": "^1.122.0",
@@ -187,19 +207,19 @@ Use debian packaged node modules when available
 -    "postcss": "8.4.5",
 +    "postcss": "link:/usr/share/nodejs/postcss",
      "prismjs": "^1.21.0",
--    "prosemirror-markdown": "1.7.1",
+-    "prosemirror-markdown": "1.8.0",
 -    "prosemirror-model": "^1.16.1",
 -    "prosemirror-state": "^1.3.4",
 +    "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown",
 +    "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model",
 +    "prosemirror-state": "link:/usr/share/nodejs/prosemirror-state",
      "prosemirror-tables": "^1.1.1",
--    "prosemirror-view": "^1.23.7",
+-    "prosemirror-view": "^1.23.10",
 +    "prosemirror-view": "link:/usr/share/nodejs/prosemirror-view",
      "raphael": "^2.2.7",
      "raw-loader": "^4.0.2",
-     "scrollparent": "^2.0.1",
-@@ -173,25 +173,24 @@
+     "rehype-raw": "^6.1.1",
+@@ -175,26 +175,25 @@
      "style-loader": "^2.0.0",
      "swagger-ui-dist": "4.8.0",
      "three": "^0.84.0",
@@ -208,6 +228,7 @@ Use debian packaged node modules when available
      "three-stl-loader": "^1.0.4",
 -    "timeago.js": "^4.0.2",
 +    "timeago.js": "link:/usr/share/nodejs/timeago.js",
+     "unified": "^10.1.2",
      "url-loader": "^4.1.1",
 -    "uuid": "8.1.0",
 +    "uuid": "link:/usr/share/nodejs/uuid",
@@ -226,27 +247,7 @@ Use debian packaged node modules when available
      "vuex": "^3.6.0",
      "web-vitals": "^0.2.4",
      "webpack": "^4.46.0",
--    "webpack-bundle-analyzer": "^4.4.2",
+-    "webpack-bundle-analyzer": "^4.5.0",
      "webpack-cli": "^4.9.2",
      "webpack-stats-plugin": "^0.3.1",
      "worker-loader": "^2.0.0",
---- a/babel.config.js
-+++ b/babel.config.js
-@@ -14,6 +14,7 @@
- // include stage 3 proposals
- const plugins = [
-   '@babel/plugin-syntax-import-meta',
-+  '@babel/plugin-syntax-dynamic-import',
-   '@babel/plugin-proposal-class-properties',
-   '@babel/plugin-proposal-json-strings',
-   '@babel/plugin-proposal-private-methods',
---- a/app/assets/javascripts/pdf/index.vue
-+++ b/app/assets/javascripts/pdf/index.vue
-@@ -1,6 +1,6 @@
- <script>
- import pdfjsLib from 'pdfjs-dist/build/pdf';
--import workerSrc from 'pdfjs-dist/build/pdf.worker.min';
-+import workerSrc from 'pdfjs-dist/build/pdf.worker';
- 
- import page from './page/index.vue';
- 
diff --git a/debian/patches/nodejs/0060-use-js-cookie-3.patch b/debian/patches/nodejs/0060-use-js-cookie-3.patch
index c200d450eb..062dd069cf 100644
--- a/debian/patches/nodejs/0060-use-js-cookie-3.patch
+++ b/debian/patches/nodejs/0060-use-js-cookie-3.patch
@@ -65,7 +65,7 @@ Subject: [PATCH] Update node module js-cookies from ^2.2.1 to ^3.0.0
  
  // bootstrap webpack, common libs, polyfills, and behaviors
  import './webpack';
-@@ -177,9 +176,6 @@
+@@ -178,9 +177,6 @@
  initLayoutNav();
  initAlertHandler();
  
@@ -204,7 +204,7 @@ Subject: [PATCH] Update node module js-cookies from ^2.2.1 to ^3.0.0
  import IssuableSidebarRoot from '~/vue_shared/issuable/sidebar/components/issuable_sidebar_root.vue';
 --- a/yarn.lock
 +++ b/yarn.lock
-@@ -7581,10 +7581,10 @@
+@@ -7754,10 +7754,10 @@
      mkdirp "~1.0.3"
      nopt "^4.0.3"