realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refresh patches

Browse source
This commit is contained in:
Pirate Praveen 2022-08-13 16:00:24 +05:30
parent 47fd4b9369
commit 066fa41e88
No known key found for this signature in database
GPG key ID: 8F53E0193B294B75
15 changed files with 115 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
debian/patches/Gemfile/0010-relax-stable-libs.patch vendored
View file

@ -3,7 +3,7 @@ gitlab Gemfile
--- a/Gemfile
+++ b/Gemfile
@@ -2,61 +2,61 @@
@@ -2,62 +2,62 @@
source 'https://rubygems.org'
@ -45,6 +45,7 @@ gitlab Gemfile
# Authentication libraries
-gem 'devise', '~> 4.7.2'
+gem 'devise', '~> 4.7','>= 4.7.2'
gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable'
gem 'bcrypt', '~> 3.1', '>= 3.1.14'
-gem 'doorkeeper', '~> 5.5.0.rc2'
-gem 'doorkeeper-openid_connect', '~> 1.7.5'
@ -67,16 +68,16 @@ gitlab Gemfile
+gem 'omniauth-alicloud', '~> 1.0', '>= 1.0.1'
+gem 'omniauth-facebook', '~> 4.0'
gem 'omniauth-github', '~> 1.4'
-gem 'omniauth-gitlab', '~> 1.0.2'
+gem 'omniauth-gitlab', '~> 1.0','>= 1.0.2'
-gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
+gem 'omniauth-gitlab', '~> 4.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
gem 'omniauth-google-oauth2', '~> 0.6.0'
gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 1.10'
-gem 'omniauth-shibboleth', '~> 1.3.0'
+gem 'omniauth-shibboleth', '~> 1.3'
gem 'omniauth-twitter', '~> 1.4'
-gem 'omniauth_crowd', '~> 2.4.0'
+gem 'omniauth_crowd', '~> 2.4'
-gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
+gem 'omniauth_crowd', '~> 2.4', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
gem 'omniauth-authentiq', '~> 0.3.3'
gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect'
-gem 'omniauth-salesforce', '~> 1.0.5'
@ -89,7 +90,7 @@ gitlab Gemfile
# Kerberos authentication. EE-only
gem 'gssapi', group: :kerberos
@@ -65,17 +65,17 @@
@@ -66,17 +66,17 @@
# Spam and anti-bot protection
gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
gem 'akismet', '~> 3.0'
@ -112,7 +113,7 @@ gitlab Gemfile
# GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0', '>= 2.0.9'
@@ -86,7 +86,7 @@
@@ -87,7 +87,7 @@
gem 'ohai', '~> 16.10'
# GPG
@ -121,7 +122,7 @@ gitlab Gemfile
# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
@@ -95,14 +95,14 @@
@@ -96,15 +96,15 @@
gem 'net-ldap', '~> 0.16.3'
# API
@ -136,11 +137,13 @@ gitlab Gemfile
+gem 'graphql', '~> 1.13', '>= 1.13.12'
gem 'graphiql-rails', '~> 1.8'
-gem 'apollo_upload_server', '~> 2.1.0'
-gem 'graphql-docs', '~> 2.1.0', group: [:development, :test]
+gem 'apollo_upload_server', '~> 2.1'
gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
+gem 'graphql-docs', '~> 2.1', group: [:development, :test]
gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
@@ -114,23 +114,23 @@
gem 'hashie'
@@ -115,23 +115,23 @@
gem 'kaminari', '~> 1.0'
# HAML
@ -168,7 +171,7 @@ gitlab Gemfile
# for Google storage
gem 'google-api-client', '~> 0.33'
@@ -139,38 +139,38 @@
@@ -140,38 +140,38 @@
gem 'unf', '~> 0.1.4'
# Seed data
@ -179,10 +182,12 @@ gitlab Gemfile
gem 'elasticsearch-model', '~> 7.2'
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
-gem 'elasticsearch-api', '7.13.3'
-gem 'aws-sdk-core', '~> 3.131.0'
+gem 'elasticsearch-api', '~> 7.13', '>= 7.13.3'
gem 'aws-sdk-core', '~> 3'
+gem 'aws-sdk-core', '~> 3.131'
gem 'aws-sdk-cloudformation', '~> 1'
gem 'aws-sdk-s3', '~> 1'
-gem 'aws-sdk-s3', '~> 1.114.0'
+gem 'aws-sdk-s3', '~> 1.114'
gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
-gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
+gem 'typhoeus', '~> 1.4' # Used with Elasticsearch to support http keep-alive connections
@ -205,8 +210,9 @@ gitlab Gemfile
+gem 'rdoc', '~> 6.3','>= 6.3.2'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
-gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 2.0.10'
+gem 'wikicloth', '~> 0.8.1'
+gem 'asciidoctor', '~> 2.0','>= 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
gem 'asciidoctor-plantuml', '~> 0.0.12'
@ -221,12 +227,12 @@ gitlab Gemfile
gem 'escape_utils', '~> 1.1'
# Calendar rendering
@@ -181,12 +181,12 @@
@@ -182,12 +182,12 @@
gem 'diff_match_patch', '~> 0.1.0'
# Application server
-gem 'rack', '~> 2.2.3.0'
+gem 'rack', '~> 2.2', '>= 2.2.3'
-gem 'rack', '~> 2.2.4'
+gem 'rack', '~> 2.2', '>= 2.2.4'
# https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually
gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base'
@ -236,7 +242,7 @@ gitlab Gemfile
gem 'puma_worker_killer', '~> 0.3.1', require: false
gem 'sd_notify', '~> 0.1.0', require: false
end
@@ -200,11 +200,11 @@
@@ -201,11 +201,11 @@
# Background jobs
gem 'sidekiq', '~> 6.4'
gem 'sidekiq-cron', '~> 1.2'
@ -250,7 +256,7 @@ gitlab Gemfile
# HTTP requests
gem 'httparty', '~> 0.16.4'
@@ -216,14 +216,14 @@
@@ -217,14 +217,14 @@
gem 'ruby-progressbar', '~> 1.10'
# GitLab settings
@ -268,7 +274,7 @@ gitlab Gemfile
# Export Ruby Regex to Javascript
gem 'js_regex', '~> 3.7'
@@ -232,24 +232,24 @@
@@ -233,24 +233,24 @@
gem 'device_detector'
# Redis
@ -297,7 +303,7 @@ gitlab Gemfile
# Hangouts Chat integration
gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
@@ -261,17 +261,17 @@
@@ -262,17 +262,17 @@
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
@ -310,7 +316,8 @@ gitlab Gemfile
+gem 'babosa', '~> 1.0','>= 1.0.4'
# Sanitizes SVG input
gem 'loofah', '~> 2.2'
-gem 'loofah', '~> 2.18.0'
+gem 'loofah', '~> 2.18'
# Working with license
-gem 'licensee', '~> 9.14.1'
@ -318,7 +325,7 @@ gitlab Gemfile
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.7'
@@ -288,32 +288,32 @@
@@ -289,32 +289,32 @@
gem 'rack-proxy', '~> 0.7.2'
@ -362,10 +369,10 @@ gitlab Gemfile
# LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.23.0'
@@ -324,11 +324,11 @@
@@ -325,11 +325,11 @@
# I18n
gem 'ruby_parser', '~> 3.15', require: false
gem 'rails-i18n', '~> 6.0'
gem 'rails-i18n', '~> 7.0'
-gem 'gettext_i18n_rails', '~> 1.8.0'
+gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
@ -376,20 +383,20 @@ gitlab Gemfile
# Perf bar
gem 'peek', '~> 1.1'
@@ -338,10 +338,10 @@
@@ -339,10 +339,10 @@
# Metrics
gem 'method_source', '~> 1.0', require: false
-gem 'webrick', '~> 1.6.1', require: false
+gem 'webrick', '~> 1.6', '>= 1.6.1', require: false
gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client'
gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client'
-gem 'warning', '~> 1.2.0'
+gem 'warning', '~> 1.2'
-gem 'warning', '~> 1.3.0'
+gem 'warning', '~> 1.3'
group :development do
gem 'lefthook', '~> 0.8.0', require: false
@@ -426,22 +426,22 @@
gem 'lefthook', '~> 1.0.0', require: false
@@ -427,22 +427,22 @@
end
group :test do
@ -404,14 +411,14 @@ gitlab Gemfile
- gem 'capybara-screenshot', '~> 1.0.22'
- gem 'selenium-webdriver', '~> 3.142'
-
- gem 'shoulda-matchers', '~> 4.0.1', require: false
- gem 'shoulda-matchers', '~> 5.1.0', require: false
- gem 'email_spec', '~> 2.2.0'
- gem 'webmock', '~> 3.9.1'
+ gem 'capybara', '~> 3.35', '~> 3.35.3'
+ gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
+ gem 'selenium-webdriver', '~> 3.1','>= 3.142'
+
+ gem 'shoulda-matchers', '~> 4.0', '>= 4.0.1', require: false
+ gem 'shoulda-matchers', '~> 5.1', require: false
+ gem 'email_spec', '~> 2.2'
+ gem 'webmock', '~> 3.9', '>= 3.9.1'
gem 'rails-controller-testing'
@ -421,7 +428,7 @@ gitlab Gemfile
gem 'rspec_junit_formatter'
gem 'guard-rspec'
@@ -458,7 +458,7 @@
@@ -459,7 +459,7 @@
gem 'email_reply_trimmer', '~> 0.1'
gem 'html2text'
@ -430,7 +437,7 @@ gitlab Gemfile
gem 'stackprof', '~> 0.2.15', require: false
gem 'rbtrace', '~> 0.4', require: false
gem 'memory_profiler', '~> 0.9', require: false
@@ -472,8 +472,8 @@
@@ -473,8 +473,8 @@
gem 'health_check', '~> 3.0'
# System information
@ -441,7 +448,13 @@ gitlab Gemfile
# NTP client
gem 'net-ntp'
@@ -490,9 +490,9 @@
@@ -486,14 +486,14 @@
gem 'spamcheck', '~> 0.1.0'
# Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 15.1.0-rc1'
+gem 'gitaly', '~> 15.1'
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.0.2'
@ -453,7 +466,7 @@ gitlab Gemfile
gem 'toml-rb', '~> 2.0'
@@ -500,7 +500,7 @@
@@ -501,7 +501,7 @@
gem 'flipper', '~> 0.21.0'
gem 'flipper-active_record', '~> 0.21.0'
gem 'flipper-active_support_cache_store', '~> 0.21.0'
@ -462,7 +475,7 @@ gitlab Gemfile
gem 'gitlab-experiment', '~> 0.7.1'
# Structured logging
@@ -513,12 +513,12 @@
@@ -514,12 +514,12 @@
# Countries list
gem 'countries', '~> 3.0'
@ -477,28 +490,28 @@ gitlab Gemfile
# Locked as long as quoted-printable encoding issues are not resolved
# Monkey-patched in `config/initializers/mail_encoding_patch.rb`
@@ -533,11 +533,11 @@
@@ -534,11 +534,11 @@
gem 'valid_email', '~> 0.1'
# JSON
-gem 'json', '~> 2.5.1'
+gem 'json', '~> 2.5', '>= 2.5.1'
gem 'json_schemer', '~> 0.2.18'
-gem 'oj', '~> 3.10.6'
-gem 'oj', '~> 3.13.19'
-gem 'multi_json', '~> 1.14.1'
-gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'
+gem 'oj', '~> 3.10', '>= 3.10.6'
+gem 'oj', '~> 3.13', '>= 3.13.19'
+gem 'multi_json', '~> 1.14', '>= 1.14.1'
+gem 'yajl-ruby', '~> 1.4', '>= 1.4.1', require: 'yajl'
gem 'webauthn', '~> 2.3'
@@ -546,6 +546,6 @@
@@ -549,7 +549,7 @@
gem 'parslet', '~> 1.8'
-gem 'ipynbdiff', '0.4.7'
+gem 'ipynbdiff', '~> 0.4.7'
gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff'
-gem 'ed25519', '~> 1.3.0'
+gem 'ed25519', '~> 1.3'
# Error Tracking OpenAPI client
# See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature

16
debian/patches/Gemfile/0020-remove-development-test.patch vendored
View file

@ -2,28 +2,28 @@ Bundler will fail when it can't find these locally
--- a/Gemfile
+++ b/Gemfile
@@ -103,7 +103,6 @@
@@ -104,7 +104,6 @@
gem 'graphql', '~> 1.13', '>= 1.13.12'
gem 'graphiql-rails', '~> 1.8'
gem 'apollo_upload_server', '~> 2.1'
-gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
-gem 'graphql-docs', '~> 2.1', group: [:development, :test]
gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
gem 'hashie'
@@ -326,7 +325,6 @@
gem 'rails-i18n', '~> 6.0'
@@ -327,7 +326,6 @@
gem 'rails-i18n', '~> 7.0'
gem 'gettext_i18n_rails', '~> 1.8'
gem 'gettext_i18n_rails_js', '~> 1.3'
-gem 'gettext', '~> 3.3', require: false, group: :development
gem 'batch-loader', '~> 2.0', '>= 2.0.1'
@@ -343,88 +341,6 @@
@@ -344,88 +342,6 @@
gem 'warning', '~> 1.2'
gem 'warning', '~> 1.3'
-group :development do
- gem 'lefthook', '~> 0.8.0', require: false
- gem 'lefthook', '~> 1.0.0', require: false
- gem 'rubocop'
- gem 'solargraph', '~> 0.44.3', require: false
-
@ -86,7 +86,7 @@ Bundler will fail when it can't find these locally
-end
-
-group :development, :test, :danger do
- gem 'gitlab-dangerfiles', '~> 3.4.0', require: false
- gem 'gitlab-dangerfiles', '~> 3.4.3', require: false
-end
-
-group :development, :test, :coverage do

4
debian/patches/Gemfile/0030-make-test-dependencies-conditional.patch vendored
View file

@ -2,9 +2,9 @@ Make test dependencies conditional so we can enable them when running autopkgtes
--- a/Gemfile
+++ b/Gemfile
@@ -341,7 +341,7 @@
@@ -342,7 +342,7 @@
gem 'warning', '~> 1.2'
gem 'warning', '~> 1.3'
-group :test do
+if ENV["INCLUDE_TEST_DEPENDS"] == "true"

2
debian/patches/Gemfile/0040-relax-httparty.patch vendored
View file

@ -2,7 +2,7 @@ Allow newer versions of httparty to satisfy dependency
--- a/Gemfile
+++ b/Gemfile
@@ -206,7 +206,7 @@
@@ -207,7 +207,7 @@
gem 'fugit', '~> 1.2','>= 1.2.1'
# HTTP requests

4
debian/patches/Gemfile/0050-relax-rdoc.patch vendored
View file

@ -2,7 +2,7 @@ Allow rdoc from ruby 2.5 to match requirement
--- a/Gemfile
+++ b/Gemfile
@@ -158,7 +158,7 @@
@@ -159,7 +159,7 @@
gem 'commonmarker', '~> 0.23.4'
gem 'kramdown', '~> 2.3','>= 2.3.1'
gem 'RedCloth', '~> 4.3','>= 4.3.2'
@ -10,4 +10,4 @@ Allow rdoc from ruby 2.5 to match requirement
+gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
gem 'wikicloth', '~> 0.8.1'

4
debian/patches/Gemfile/0090-remove-ee-only-gems.patch vendored
View file

@ -2,7 +2,7 @@ This gem is used only in gitlab Enterprise Edition
--- a/Gemfile
+++ b/Gemfile
@@ -59,7 +59,6 @@
@@ -60,7 +60,6 @@
gem 'jwt', '~> 2.1'
# Kerberos authentication. EE-only
@ -10,7 +10,7 @@ This gem is used only in gitlab Enterprise Edition
gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos
# Spam and anti-bot protection
@@ -297,8 +296,6 @@
@@ -298,8 +297,6 @@
gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0'

2
debian/patches/Gemfile/0120-relax-capybara.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -345,7 +345,7 @@
@@ -346,7 +346,7 @@
gem 'rspec-benchmark', '~> 0.6.0'
gem 'rspec-parameterized', require: false

4
debian/patches/Gemfile/0130-remove-capybara-screenshot.patch vendored
View file

@ -1,10 +1,10 @@
--- a/Gemfile
+++ b/Gemfile
@@ -346,7 +346,6 @@
@@ -347,7 +347,6 @@
gem 'rspec-parameterized', require: false
gem 'capybara', '~> 3.12'
- gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
gem 'selenium-webdriver', '~> 3.1','>= 3.142'
gem 'shoulda-matchers', '~> 4.0', '>= 4.0.1', require: false
gem 'shoulda-matchers', '~> 5.1', require: false

2
debian/patches/Gemfile/0140-remove-guard-rspec.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -355,7 +355,6 @@
@@ -356,7 +356,6 @@
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 1.0', '>= 1.0.7'
gem 'rspec_junit_formatter'

2
debian/patches/Gemfile/0160-relax-rexml.patch vendored
View file

@ -2,7 +2,7 @@ libruby2.7 has rexml 3.2.3.1 which has latest security fixes
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,7 @@
@@ -34,7 +34,7 @@
gem 'bcrypt', '~> 3.1', '>= 3.1.14'
gem 'doorkeeper', '~> 5.5'
gem 'doorkeeper-openid_connect', '~> 1.7','>= 1.7.5'

4
debian/patches/Gemfile/0190-relax-rdoc.patch vendored
View file

@ -1,6 +1,6 @@
--- a/Gemfile
+++ b/Gemfile
@@ -160,7 +160,7 @@
@@ -161,7 +161,7 @@
gem 'commonmarker', '~> 0.23.4'
gem 'kramdown', '~> 2.3','>= 2.3.1'
gem 'RedCloth', '~> 4.3','>= 4.3.2'
@ -8,4 +8,4 @@
+gem 'rdoc'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
gem 'wikicloth', '~> 0.8.1'

8
debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch vendored
View file

@ -2,10 +2,10 @@ Rakefile need this gem
--- a/Gemfile
+++ b/Gemfile
@@ -463,3 +463,6 @@
gem 'ipynbdiff', '~> 0.4.7'
gem 'ed25519', '~> 1.3'
@@ -468,3 +468,6 @@
# Error Tracking OpenAPI client
# See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature
gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api'
+
+# This is required for Rakefile
+gem 'gitlab-dangerfiles'

14
debian/patches/nodejs/0020-remove-dev-dependencies.patch vendored
View file

@ -2,13 +2,13 @@ These are not required in production
--- a/package.json
+++ b/package.json
@@ -200,62 +200,7 @@
@@ -199,62 +199,7 @@
"yaml": "^2.0.0-10"
},
"devDependencies": {
- "@gitlab/eslint-plugin": "12.1.0",
- "@gitlab/stylelint-config": "4.0.0",
- "@graphql-eslint/eslint-plugin": "3.10.4",
- "@gitlab/eslint-plugin": "13.1.0",
- "@gitlab/stylelint-config": "4.1.0",
- "@graphql-eslint/eslint-plugin": "3.10.6",
- "@testing-library/dom": "^7.16.2",
- "@types/jest": "^26.0.24",
- "@vue/test-utils": "1.3.0",
@ -53,11 +53,11 @@ These are not required in production
- "prosemirror-test-builder": "^1.0.6",
- "purgecss": "^4.0.3",
- "purgecss-from-html": "^4.0.3",
- "sass": "^1.32.12",
- "stylelint": "^14.3.0",
- "sass": "^1.49.9",
- "stylelint": "^14.9.1",
- "timezone-mock": "^1.0.8",
- "vue-jest": "4.0.1",
- "webpack-dev-server": "4.9.2",
- "webpack-dev-server": "4.9.3",
- "xhr-mock": "^2.5.1",
- "yarn-check-webpack-plugin": "^1.2.0",
- "yarn-deduplicate": "^5.0.0"

38
debian/patches/nodejs/0040-use-packaged-modules.patch vendored
View file

@ -27,7 +27,7 @@ Use debian packaged node modules when available
const { StatsWriterPlugin } = require('webpack-stats-plugin');
const WEBPACK_VERSION = require('webpack/package.json').version;
@@ -237,6 +236,8 @@
@@ -242,6 +241,8 @@
entry: generateEntries,
@ -36,7 +36,7 @@ Use debian packaged node modules when available
output: {
path: WEBPACK_OUTPUT_PATH,
publicPath: WEBPACK_PUBLIC_PATH,
@@ -246,10 +247,15 @@
@@ -251,10 +252,15 @@
},
resolve: {
@ -53,7 +53,7 @@ Use debian packaged node modules when available
module: {
strictExportPresence: true,
rules: [
@@ -348,7 +354,7 @@
@@ -353,7 +359,7 @@
},
{
test: /\.(eot|ttf|woff|woff2)$/,
@ -62,7 +62,7 @@ Use debian packaged node modules when available
loader: 'file-loader',
options: {
name: '[name].[contenthash:8].[ext]',
@@ -659,19 +665,6 @@
@@ -664,19 +670,6 @@
},
},
@ -82,7 +82,7 @@ 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),
@@ -739,6 +732,7 @@
@@ -744,6 +737,7 @@
node: {
fs: 'empty', // editorconfig requires 'fs'
@ -102,7 +102,7 @@ Use debian packaged node modules when available
--- a/package.json
+++ b/package.json
@@ -48,14 +48,18 @@
@@ -47,14 +47,18 @@
},
"dependencies": {
"@apollo/client": "^3.5.10",
@ -116,15 +116,15 @@ 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.21.0",
"@gitlab/ui": "41.10.0",
"@gitlab/svgs": "2.28.0",
"@gitlab/ui": "42.22.0",
"@gitlab/visual-review-tools": "1.7.3",
- "@rails/actioncable": "6.1.4-7",
+ "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
"@rails/ujs": "6.1.4-7",
"@sentry/browser": "5.30.0",
"@sourcegraph/code-host-integration": "0.0.60",
@@ -94,24 +98,24 @@
@@ -93,24 +97,24 @@
"aws-sdk": "^2.637.0",
"axios": "^0.24.0",
"babel-loader": "^8.2.5",
@ -140,7 +140,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.23.1",
"core-js": "^3.23.5",
- "cron-validator": "^1.1.1",
+ "cron-validator": "link:/usr/share/nodejs/cron-validator",
"cronstrue": "^1.122.0",
@ -156,8 +156,8 @@ Use debian packaged node modules when available
+ "dateformat": "link:/usr/share/nodejs/dateformat",
"deckar01-task_list": "^2.3.1",
"diff": "^3.4.0",
"dompurify": "^2.3.8",
@@ -130,32 +134,32 @@
"dompurify": "^2.3.9",
@@ -128,35 +132,35 @@
"jed": "^1.1.1",
"jquery": "^3.6.0",
"jquery.caret": "^0.3.1",
@ -172,10 +172,11 @@ Use debian packaged node modules when available
+ "jszip-utils": "link:/usr/share/nodejs/jszip-utils",
+ "katex": "link:/usr/share/nodejs/katex",
+ "lodash": "link:/usr/share/nodejs/lodash",
"lowlight": "^2.5.0",
"lowlight": "^2.6.1",
"marked": "^0.3.12",
"mathjax": "3",
"mermaid": "^9.1.1",
"micromatch": "^4.0.5",
- "minimatch": "^3.0.4",
+ "minimatch": "link:/usr/share/nodejs/minimatch",
"monaco-editor": "^0.25.2",
@ -190,7 +191,7 @@ Use debian packaged node modules when available
- "popper.js": "^1.16.1",
+ "popper.js": "link:/usr/share/nodejs/popper.js",
"portal-vue": "^2.1.7",
- "postcss": "8.4.5",
- "postcss": "8.4.14",
+ "postcss": "link:/usr/share/nodejs/postcss",
"prismjs": "^1.21.0",
- "prosemirror-markdown": "1.8.0",
@ -200,11 +201,14 @@ Use debian packaged node modules when available
+ "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.13",
- "prosemirror-view": "^1.23.13",
+ "prosemirror-view": "link:/usr/share/nodejs/prosemirror-view",
"raphael": "^2.2.7",
@@ -172,27 +176,26 @@
"raw-loader": "^4.0.2",
"rehype-raw": "^6.1.1",
@@ -171,27 +175,26 @@
"style-loader": "^2.0.0",
"swagger-ui-dist": "4.8.0",
"swagger-ui-dist": "4.12.0",
"three": "^0.84.0",
- "three-orbit-controls": "^82.1.0",
+ "three-orbit-controls": "link:/usr/share/nodejs/three-orbit-controls",

4
debian/patches/nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch vendored
View file

@ -2,8 +2,8 @@
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
"mermaid": "^9.1.1",
@@ -145,7 +145,7 @@
"micromatch": "^4.0.5",
"minimatch": "link:/usr/share/nodejs/minimatch",
"monaco-editor": "^0.25.2",
- "monaco-editor-webpack-plugin": "^4.0.0",