diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index 17c8c2e673..8eb159dcc3 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -16,6 +16,7 @@ Use debian packaged node modules when available - babel-loader, cache-loader needs loader-utils 1.x and we already have 2.x and no compat patch - brace-expansion is a major version ahead in the archive + - xterm build is broken (#980406) --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -98,7 +99,31 @@ Use debian packaged node modules when available }; --- a/package.json +++ b/package.json -@@ -72,10 +72,10 @@ +@@ -35,12 +35,12 @@ + "webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js" + }, + "dependencies": { +- "@babel/core": "^7.10.1", +- "@babel/plugin-proposal-class-properties": "^7.10.1", +- "@babel/plugin-proposal-json-strings": "^7.10.1", +- "@babel/plugin-proposal-private-methods": "^7.10.1", +- "@babel/plugin-syntax-import-meta": "^7.10.1", +- "@babel/preset-env": "^7.10.1", ++ "@babel/core": "link:/usrshare/nodejs/@babel/core", ++ "@babel/plugin-proposal-class-properties": "link:/usrshare/nodejs/@babel/plugin-proposal-class-properties", ++ "@babel/plugin-proposal-json-strings": "link:/usrshare/nodejs/@babel/plugin-proposal-json-strings", ++ "@babel/plugin-proposal-private-methods": "link:/usrshare/nodejs/@babel/plugin-proposal-private-methods", ++ "@babel/plugin-syntax-import-meta": "link:/usrshare/nodejs/@babel/plugin-syntax-import-meta", ++ "@babel/preset-env": "link:/usrshare/nodejs/@babel/preset-env", + "@gitlab/at.js": "1.5.5", + "@gitlab/svgs": "1.171.0", + "@gitlab/ui": "21.33.0", +@@ -68,14 +68,14 @@ + "codesandbox-api": "0.0.23", + "compression-webpack-plugin": "^3.0.1", + "copy-webpack-plugin": "^5.0.5", +- "core-js": "^3.6.4", ++ "core-js": "link:/usr/share/nodejs/core-js", "cron-validator": "^1.1.1", "cropper": "^2.3.0", "css-loader": "^2.1.1", @@ -113,16 +138,89 @@ Use debian packaged node modules when available "dateformat": "^3.0.3", "deckar01-task_list": "^2.3.1", "diff": "^3.4.0", -@@ -107,7 +107,7 @@ +@@ -87,9 +87,9 @@ + "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", ++ "glob": "link:/usr/share/nodejs/glob", + "graphql": "^14.7.0", + "graphql-tag": "^2.10.1", + "immer": "^7.0.7", +@@ -100,28 +100,28 @@ + "jquery": "^3.5.0", + "jquery.caret": "^0.3.1", + "jquery.waitforimages": "^2.2.0", +- "js-cookie": "^2.2.1", ++ "js-cookie": "link:/usr/share/nodejs/js-cookie", + "js-yaml": "^3.13.1", +- "jszip": "^3.1.3", +- "jszip-utils": "^0.0.2", ++ "jszip": "link:/usr/share/nodejs/jszip", ++ "jszip-utils": "link:/usr/share/nodejs/jszip", "katex": "^0.10.0", "lodash": "^4.17.20", "marked": "^0.3.12", - "mermaid": "^8.5.2", + "mermaid": "link:/usr/share/nodejs/mermaid", "mersenne-twister": "1.1.0", - "minimatch": "^3.0.4", +- "minimatch": "^3.0.4", ++ "minimatch": "link:/usr/share/nodejs/minimatch", "miragejs": "^0.1.40", -@@ -160,6 +160,64 @@ + "mock-apollo-client": "^0.4.0", + "monaco-editor": "^0.20.0", + "monaco-editor-webpack-plugin": "^1.9.0", + "monaco-yaml": "^2.4.1", + "mousetrap": "1.6.5", +- "pdfjs-dist": "^2.0.943", ++ "pdfjs-dist": "link:/usr/share/nodejs/pdfjs-dist", + "pikaday": "^1.8.0", +- "popper.js": "^1.16.1", ++ "popper.js": "link:/usr/share/nodejs/popper.js", + "prismjs": "^1.21.0", +- "prosemirror-markdown": "^1.3.0", +- "prosemirror-model": "^1.6.4", ++ "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown", ++ "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model", + "raphael": "^2.2.7", + "raw-loader": "^4.0.0", + "select2": "3.5.2-browserify", +@@ -133,33 +133,90 @@ + "style-loader": "^1.1.3", + "swagger-ui-dist": "^3.32.4", + "three": "^0.84.0", +- "three-orbit-controls": "^82.1.0", ++ "three-orbit-controls": "link:/usr/share/nodejs/three-orbit-controls", + "three-stl-loader": "^1.0.4", +- "timeago.js": "^4.0.2", ++ "timeago.js": "link:/usr/share/nodejs/timeago.js", + "tiptap": "^1.8.0", + "tiptap-commands": "^1.4.0", + "tiptap-extensions": "^1.8.0", + "tributejs": "5.1.3", + "url-loader": "^3.0.0", +- "uuid": "8.1.0", ++ "uuid": "link:/usr/share/nodejs/uuid", + "visibilityjs": "^1.2.4", +- "vue": "^2.6.12", ++ "vue": "link:/usr/share/nodejs/vue", + "vue-apollo": "^3.0.3", + "vue-loader": "^15.9.3", + "vue-router": "3.4.5", +- "vue-template-compiler": "^2.6.12", ++ "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", + "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" }, "devDependencies": {