diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index 43d12468a0..4beb02577b 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -5,6 +5,8 @@ Use debian packaged node modules when available - Add more plugins to babel.config.js - Add mkdirp 1.0 and loader-utils 2.0 to ensure compatibility for packaged modules (See #976310) + - Use link protocol for modules with permission issues and dependencies + - Use portal protocol for modules without dependencies --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -100,24 +102,32 @@ 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,12 @@ +@@ -55,29 +49,26 @@ "apollo-link": "^1.2.14", "apollo-link-batch-http": "^1.2.14", "apollo-upload-client": "^13.0.0", - "autosize": "^4.0.2", ++ "autosize": "link:/usr/share/nodejs/autosize", "aws-sdk": "^2.637.0", - "axios": "^0.20.0", - "babel-loader": "^8.0.6", ++ "axios": "link:/usr/share/nodejs/axios", ++ "babel-loader": "link:/usr/share/nodejs/babel-loader", "babel-plugin-lodash": "^3.3.4", "bootstrap": "4.4.1", - "brace-expansion": "^1.1.8", - "cache-loader": "^4.1.0", - "clipboard": "^1.7.1", - "codemirror": "^5.48.4", ++ "brace-expansion": "link:/usr/share/nodejs/brace-expansion", ++ "cache-loader": "link:/usr/share/nodejs/cache-loader", ++ "clipboard": "portal:/usr/share/nodejs/clipboard", ++ "codemirror": "portal:/usr/share/nodejs/codemirror", "codesandbox-api": "0.0.23", - "compression-webpack-plugin": "^3.0.1", - "copy-webpack-plugin": "^5.0.5", - "core-js": "^3.6.4", ++ "core-js": "portal:/usr/share/nodejs/core-js", "cron-validator": "^1.1.1", "cropper": "^2.3.0", - "css-loader": "^2.1.1", @@ -127,16 +137,23 @@ Use debian packaged node modules when available - "d3-selection": "^1.2.0", - "dateformat": "^3.0.3", - "deckar01-task_list": "^2.3.1", ++ "d3": "link:/usr/share/nodejs/d3", ++ "d3-sankey": "link:/usr/share/nodejs/d3-sankey", ++ "d3-scale": "link:/usr/share/nodejs/d3-scale", ++ "d3-selection": "link:/usr/share/nodejs/d3-selection", ++ "dateformat": "portal:/usr/share/nodejs/dateformat", ++ "deckar01-task_list": "portal:/usr/share/nodejs/deckar01-task_list", "diff": "^3.4.0", "document-register-element": "1.14.3", "dompurify": "^2.0.11", -@@ -85,81 +62,47 @@ +@@ -85,81 +76,52 @@ "editorconfig": "^0.15.3", "emoji-regex": "^7.0.3", "emoji-unicode-version": "^0.2.1", - "exports-loader": "^0.7.0", - "file-loader": "^5.1.0", - "font-awesome": "4.7.0", ++ "font-awesome": "link:/usr/share/nodejs/font-awesome", "fuzzaldrin-plus": "^0.6.0", - "glob": "^7.1.6", "graphql": "^14.7.0", @@ -149,6 +166,7 @@ Use debian packaged node modules when available "jest-transform-graphql": "^2.1.0", - "jquery": "^3.5.0", - "jquery-ujs": "1.2.2", ++ "jquery": "portal:/usr/share/nodejs/jquery", "jquery.caret": "^0.3.1", "jquery.waitforimages": "^2.2.0", - "js-cookie": "^2.2.1", @@ -157,14 +175,15 @@ Use debian packaged node modules when available - "jszip-utils": "^0.0.2", - "katex": "^0.10.0", - "lodash": "^4.17.20", -+ "loader-utils": "^2.0.0", ++ "katex": "link:/usr/share/nodejs/katex", ++ "loader-utils": "link:/usr/share/nodejs/loader-utils", "marked": "^0.3.12", - "mermaid": "^8.5.2", "mersenne-twister": "1.1.0", - "minimatch": "^3.0.4", - "miragejs": "^0.1.40", -+ "miragejs": "portal:/usr/share/nodejs/miragejs", -+ "mkdirp": "^1.0.4", ++ "miragejs": "link:/usr/share/nodejs/miragejs", ++ "mkdirp": "link:/usr/share/nodejs/mkdirp", "mock-apollo-client": "^0.4.0", "monaco-editor": "^0.20.0", "monaco-editor-webpack-plugin": "^1.9.0", @@ -176,7 +195,7 @@ Use debian packaged node modules when available - "prismjs": "^1.21.0", - "prosemirror-markdown": "^1.3.0", - "prosemirror-model": "^1.6.4", -+ "postcss": "8.2.1", ++ "postcss": "link:/usr/share/nodejs/postcss", "raphael": "^2.2.7", - "raw-loader": "^4.0.0", "select2": "3.5.2-browserify", @@ -199,10 +218,12 @@ Use debian packaged node modules when available - "uuid": "8.1.0", "visibilityjs": "^1.2.4", - "vue": "^2.6.10", ++ "vue": "link:/usr/share/nodejs/vue", "vue-apollo": "^3.0.3", "vue-loader": "^15.9.0", "vue-router": "^3.4.3", - "vue-template-compiler": "^2.6.10", ++ "vue-template-compiler": "link:/usr/share/nodejs/vue-template-compiler", "vue-virtual-scroll-list": "^1.4.4", "vuedraggable": "^2.23.0", "vuex": "^3.5.1",