Refresh webpack patches
This commit is contained in:
parent
afed34ba3b
commit
5bf2c35883
3 changed files with 6 additions and 35 deletions
|
@ -8,14 +8,14 @@
|
||||||
alias: {
|
alias: {
|
||||||
'~': path.join(ROOT_PATH, 'app/assets/javascripts'),
|
'~': path.join(ROOT_PATH, 'app/assets/javascripts'),
|
||||||
emojis: path.join(ROOT_PATH, 'fixtures/emojis'),
|
emojis: path.join(ROOT_PATH, 'fixtures/emojis'),
|
||||||
@@ -290,6 +291,10 @@
|
@@ -97,6 +98,10 @@
|
||||||
|
},
|
||||||
devtool: NO_SOURCEMAPS ? false : devtool,
|
},
|
||||||
|
|
||||||
+ resolveLoader: {
|
+ resolveLoader: {
|
||||||
+ modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs'],
|
+ modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs'],
|
||||||
+ },
|
+ },
|
||||||
+
|
+
|
||||||
// sqljs requires fs
|
module: {
|
||||||
node: { fs: 'empty' },
|
strictExportPresence: true,
|
||||||
};
|
rules: [
|
||||||
|
|
28
debian/patches/0530-remove-bundle-analyzer.patch
vendored
28
debian/patches/0530-remove-bundle-analyzer.patch
vendored
|
@ -1,28 +0,0 @@
|
||||||
--- a/config/webpack.config.js
|
|
||||||
+++ b/config/webpack.config.js
|
|
||||||
@@ -5,7 +5,6 @@
|
|
||||||
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 ROOT_PATH = '/usr/share/gitlab';
|
|
||||||
const CACHE_PATH = path.join(ROOT_PATH, 'tmp/cache');
|
|
||||||
@@ -265,17 +264,6 @@
|
|
||||||
// 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'),
|
|
||||||
- }),
|
|
||||||
- ].filter(Boolean),
|
|
||||||
-
|
|
||||||
devServer: {
|
|
||||||
host: DEV_SERVER_HOST,
|
|
||||||
port: DEV_SERVER_PORT,
|
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -11,7 +11,6 @@
|
||||||
0500-set-webpack-root.patch
|
0500-set-webpack-root.patch
|
||||||
0510-remove-dev-dependencies.patch
|
0510-remove-dev-dependencies.patch
|
||||||
0520-add-system-lib-path-for-webpack.patch
|
0520-add-system-lib-path-for-webpack.patch
|
||||||
0530-remove-bundle-analyzer.patch
|
|
||||||
0610-source-init-functions.patch
|
0610-source-init-functions.patch
|
||||||
0620-pid-log-paths.patch
|
0620-pid-log-paths.patch
|
||||||
0630-fix-mail-room-path.patch
|
0630-fix-mail-room-path.patch
|
||||||
|
|
Loading…
Add table
Reference in a new issue