From 0206859040fbe5c6f7c86c0952b7e028a498d46b Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 24 Dec 2020 20:32:23 +0530 Subject: [PATCH] Use link protocol only in case of permission errors --- .../patches/0740-use-packaged-modules.patch | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index 4beb02577b..749bc6c61d 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -5,8 +5,9 @@ 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 + - Use link protocol for modules with permission issues (which has a bin: entry + in package.json) + See https://github.com/yarnpkg/berry/issues/2266 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -102,25 +103,25 @@ 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,26 @@ +@@ -55,29 +49,28 @@ "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", ++ "autosize": "portal:/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", ++ "axios": "portal:/usr/share/nodejs/axios", ++ "babel-loader": "portal:/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", ++ "brace-expansion": "portal:/usr/share/nodejs/brace-expansion", ++ "cache-loader": "portal:/usr/share/nodejs/cache-loader", + "clipboard": "portal:/usr/share/nodejs/clipboard", + "codemirror": "portal:/usr/share/nodejs/codemirror", "codesandbox-api": "0.0.23", @@ -128,6 +129,8 @@ Use debian packaged node modules when available - "copy-webpack-plugin": "^5.0.5", - "core-js": "^3.6.4", + "core-js": "portal:/usr/share/nodejs/core-js", ++ "compression-webpack-plugin": "portal:/usr/share/nodejs/compression-webpack-plugin", ++ "copy-webpack-plugin": "portal:/usr/share/nodejs/copy-webpack-plugin", "cron-validator": "^1.1.1", "cropper": "^2.3.0", - "css-loader": "^2.1.1", @@ -137,16 +140,16 @@ 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", ++ "d3": "portal:/usr/share/nodejs/d3", ++ "d3-sankey": "portal:/usr/share/nodejs/d3-sankey", ++ "d3-scale": "portal:/usr/share/nodejs/d3-scale", ++ "d3-selection": "portal:/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 +76,52 @@ +@@ -85,81 +78,54 @@ "editorconfig": "^0.15.3", "emoji-regex": "^7.0.3", "emoji-unicode-version": "^0.2.1", @@ -176,14 +179,13 @@ Use debian packaged node modules when available - "katex": "^0.10.0", - "lodash": "^4.17.20", + "katex": "link:/usr/share/nodejs/katex", -+ "loader-utils": "link:/usr/share/nodejs/loader-utils", ++ "loader-utils": "portal:/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": "link:/usr/share/nodejs/miragejs", -+ "mkdirp": "link:/usr/share/nodejs/mkdirp", ++ "miragejs": "portal:/usr/share/nodejs/miragejs", "mock-apollo-client": "^0.4.0", "monaco-editor": "^0.20.0", "monaco-editor-webpack-plugin": "^1.9.0", @@ -195,7 +197,6 @@ Use debian packaged node modules when available - "prismjs": "^1.21.0", - "prosemirror-markdown": "^1.3.0", - "prosemirror-model": "^1.6.4", -+ "postcss": "link:/usr/share/nodejs/postcss", "raphael": "^2.2.7", - "raw-loader": "^4.0.0", "select2": "3.5.2-browserify", @@ -227,14 +228,17 @@ Use debian packaged node modules when available "vue-virtual-scroll-list": "^1.4.4", "vuedraggable": "^2.23.0", "vuex": "^3.5.1", -- "web-vitals": "^0.2.4", ++ "webpack": "link:/usr/share/nodejs/webpack", + "web-vitals": "^0.2.4", - "webpack": "^4.42.0", - "webpack-bundle-analyzer": "^3.6.0", - "webpack-cli": "^3.3.11", - "webpack-stats-plugin": "^0.3.1", - "worker-loader": "^2.0.0", - "xterm": "3.14.5" -+ "web-vitals": "^0.2.4" ++ "mkdirp": "link:/usr/share/nodejs/mkdirp", ++ "postcss": "portal:/usr/share/nodejs/postcss", ++ "schema-utils": "portal:/usr/share/nodejs/schema-utils" }, "devDependencies": { },