debian-mirror-gitlab/debian/patches/0740-use-packaged-modules.patch

54 lines
1.9 KiB
Diff
Raw Normal View History

2019-08-08 15:17:34 +05:30
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
2020-01-01 14:40:56 +05:30
@@ -6,7 +6,6 @@
2019-08-08 15:17:34 +05:30
const StatsWriterPlugin = require('webpack-stats-plugin').StatsWriterPlugin;
const CompressionPlugin = require('compression-webpack-plugin');
const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
-const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
const CopyWebpackPlugin = require('copy-webpack-plugin');
2020-01-01 14:40:56 +05:30
const vendorDllHash = require('./helpers/vendor_dll_hash');
2019-08-08 15:17:34 +05:30
2020-01-01 14:40:56 +05:30
@@ -151,12 +150,12 @@
2019-08-08 15:17:34 +05:30
resolve: {
extensions: ['.js', '.gql', '.graphql'],
- modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs'],
2019-09-25 14:42:20 +05:30
+ 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'],
2019-08-08 15:17:34 +05:30
alias,
},
resolveLoader: {
- modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs'],
+ modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs','/usr/share/nodejs'],
},
module: {
2020-01-01 14:40:56 +05:30
@@ -431,19 +430,6 @@
2019-08-08 15:17:34 +05:30
// enable HMR only in webpack-dev-server
DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
- // optionally generate webpack bundle analysis
- WEBPACK_REPORT &&
- new BundleAnalyzerPlugin({
- analyzerMode: 'static',
- generateStatsFile: true,
- openAnalyzer: false,
- reportFilename: path.join(ROOT_PATH, 'webpack-report/index.html'),
- statsFilename: path.join(ROOT_PATH, 'webpack-report/stats.json'),
2019-12-21 21:33:11 +05:30
- statsOptions: {
- source: false,
- },
2019-08-08 15:17:34 +05:30
- }),
-
new webpack.DefinePlugin({
// This one is used to define window.gon.ee and other things properly in tests:
2019-12-21 21:33:11 +05:30
'process.env.IS_EE': JSON.stringify(IS_EE),
2020-01-01 14:40:56 +05:30
@@ -469,6 +455,7 @@
2019-08-08 15:17:34 +05:30
node: {
fs: 'empty', // sqljs requires fs
+ Buffer: 'mock',
setImmediate: false,
},
2019-08-08 15:17:34 +05:30
};