diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index edb6bf5f59..1b85e75b32 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -89,7 +89,7 @@ Use debian packaged node modules when available "@gitlab/at.js": "1.5.5", "@gitlab/svgs": "1.164.0", "@gitlab/ui": "21.3.1", -@@ -55,29 +49,14 @@ +@@ -55,29 +49,13 @@ "apollo-link": "^1.2.14", "apollo-link-batch-http": "^1.2.14", "apollo-upload-client": "^13.0.0", @@ -109,7 +109,7 @@ Use debian packaged node modules when available - "core-js": "^3.6.4", "cron-validator": "^1.1.1", "cropper": "^2.3.0", - "css-loader": "^2.1.1", +- "css-loader": "^2.1.1", - "d3": "^5.16.0", - "d3-sankey": "^0.12.3", - "d3-scale": "^2.2.2", @@ -119,7 +119,7 @@ Use debian packaged node modules when available "diff": "^3.4.0", "document-register-element": "1.14.3", "dompurify": "^2.0.11", -@@ -85,29 +64,19 @@ +@@ -85,29 +63,19 @@ "editorconfig": "^0.15.3", "emoji-regex": "^7.0.3", "emoji-unicode-version": "^0.2.1", @@ -149,7 +149,7 @@ Use debian packaged node modules when available "marked": "^0.3.12", "mermaid": "^8.5.2", "mersenne-twister": "1.1.0", -@@ -117,13 +86,8 @@ +@@ -117,13 +85,8 @@ "monaco-editor": "^0.20.0", "monaco-editor-webpack-plugin": "^1.9.0", "monaco-yaml": "^2.4.1", @@ -163,7 +163,7 @@ Use debian packaged node modules when available "raphael": "^2.2.7", "raw-loader": "^4.0.0", "select2": "3.5.2-browserify", -@@ -135,31 +99,20 @@ +@@ -135,31 +98,20 @@ "style-loader": "^1.1.3", "swagger-ui-dist": "^3.32.4", "three": "^0.84.0", diff --git a/debian/patches/0780-css-loader-3.patch b/debian/patches/0780-css-loader-3.patch new file mode 100644 index 0000000000..85f4a8e49e --- /dev/null +++ b/debian/patches/0780-css-loader-3.patch @@ -0,0 +1,26 @@ +From 8eb81d27554c5b361e93d7aa2593623caac9c016 Mon Sep 17 00:00:00 2001 +From: Pirate Praveen +Date: Wed, 21 Oct 2020 10:26:53 +0000 +Subject: [PATCH] Update css-loader node module 2.1.1 -> 3.2.1 + +--- + config/webpack.config.js | 6 ++- + package.json | 2 +- + yarn.lock | 107 +++++++++++++++++++++++++++------------ + 3 files changed, 79 insertions(+), 36 deletions(-) + +--- a/config/webpack.config.js ++++ b/config/webpack.config.js +@@ -252,8 +252,10 @@ + { + loader: 'css-loader', + options: { +- modules: 'global', +- localIdentName: '[name].[contenthash:8].[ext]', ++ modules: { ++ mode: 'global', ++ localIdentName: '[name].[contenthash:8].[ext]', ++ }, + }, + }, + ], diff --git a/debian/patches/series b/debian/patches/series index 750cec36fc..86eb4240a1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -29,3 +29,4 @@ 0760-remove-simplecov-cobertura.patch 0770-remove-rubocop-rspec.patch 0770-remove-capybara-screenshot-rspec.patch +0780-css-loader-3.patch