diff --git a/debian/control b/debian/control index 3044f8c651..c8c127bf5c 100644 --- a/debian/control +++ b/debian/control @@ -391,6 +391,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, node-popper.js, node-prismjs (>= 1.6~), node-prosemirror-model, + node-prosemirror-markdown, node-raven-js, # node-raw-loader (>= 1.0~), node-three-orbit-controls (>= 82.1~), diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index a5b30796b8..2b0855e55c 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -21,7 +21,7 @@ Use debian packaged node modules when available - extensions: ['.js', '.gql', '.graphql'], - modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs'], + extensions: ['.js', '.gql', '.graphql', '.json'], -+ modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/vendor/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/share/gitlab/node_modules/markdown-it/node_modules/', '/usr/lib/nodejs', '/usr/share/nodejs'], ++ modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/vendor/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/share/nodejs/markdown-it/node_modules/', '/usr/lib/nodejs', '/usr/share/nodejs'], alias, }, @@ -145,7 +145,7 @@ Use debian packaged node modules when available "marked": "^0.3.12", "mermaid": "^8.5.2", "mersenne-twister": "1.1.0", -@@ -111,13 +79,9 @@ +@@ -111,13 +79,8 @@ "monaco-editor": "^0.20.0", "monaco-editor-webpack-plugin": "^1.9.0", "monaco-yaml": "^2.4.0", @@ -154,18 +154,18 @@ Use debian packaged node modules when available "pikaday": "^1.8.0", - "popper.js": "^1.16.1", - "prismjs": "^1.6.0", - "prosemirror-markdown": "^1.3.0", +- "prosemirror-markdown": "^1.3.0", - "prosemirror-model": "^1.6.4", "raphael": "^2.2.7", "raw-loader": "^4.0.0", "sanitize-html": "^1.22.0", -@@ -130,30 +94,20 @@ +@@ -130,30 +93,19 @@ "style-loader": "^1.1.3", "swagger-ui-dist": "^3.26.2", "three": "^0.84.0", - "three-orbit-controls": "^82.1.0", - "three-stl-loader": "^1.0.4", - "timeago.js": "^4.0.2", +- "timeago.js": "^4.0.2", "tiptap": "^1.8.0", "tiptap-commands": "^1.4.0", "tiptap-extensions": "^1.8.0",