diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /config/webpack.config.js | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'config/webpack.config.js')
-rw-r--r-- | config/webpack.config.js | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 8e51ce537c5..a5b5d0f987d 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -79,6 +79,7 @@ function generateEntries() { const manualEntries = { default: defaultEntries, sentry: './sentry/index.js', + chrome_84_icon_fix: './lib/chrome_84_icon_fix.js', }; return Object.assign(manualEntries, autoEntries); @@ -118,6 +119,15 @@ if (IS_EE) { }); } +if (!IS_PRODUCTION) { + const fixtureDir = IS_EE ? 'fixtures-ee' : 'fixtures'; + + Object.assign(alias, { + test_fixtures: path.join(ROOT_PATH, `tmp/tests/frontend/${fixtureDir}`), + test_helpers: path.join(ROOT_PATH, 'spec/frontend_integration/test_helpers'), + }); +} + let dll; if (VENDOR_DLL && !IS_PRODUCTION) { @@ -257,6 +267,8 @@ module.exports = { runtimeChunk: 'single', splitChunks: { maxInitialRequests: 20, + // In order to prevent firewalls tripping up: https://gitlab.com/gitlab-org/gitlab/-/issues/22648 + automaticNameDelimiter: '-', cacheGroups: { default: false, common: () => ({ @@ -268,7 +280,7 @@ module.exports = { monaco: { priority: 15, name: 'monaco', - chunks: 'initial', + chunks: 'all', test: /[\\/]node_modules[\\/]monaco-editor[\\/]/, minChunks: 2, reuseExistingChunk: true, |