From 7d7a86b690cc940b51034a0b4920794da0d85c76 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 9 Apr 2020 18:43:07 +0530 Subject: [PATCH] Add special handling for webpack to find .json file --- debian/patches/0740-use-packaged-modules.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index b82881e0b2..1c2e32762b 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -8,12 +8,14 @@ const CopyWebpackPlugin = require('copy-webpack-plugin'); const vendorDllHash = require('./helpers/vendor_dll_hash'); -@@ -148,12 +147,12 @@ +@@ -147,13 +146,13 @@ + }, resolve: { - extensions: ['.js', '.gql', '.graphql'], +- extensions: ['.js', '.gql', '.graphql'], - modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs'], -+ modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/vendor/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs', '/usr/share/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'], alias, },