diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
| commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
| tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /config/webpack.config.js | |
| parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) | |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index f334e17bbaf..7eaa11d9346 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -163,6 +163,9 @@ const alias = { // the following resolves files which are different between CE and JH jh_else_ce: path.join(ROOT_PATH, 'app/assets/javascripts'), + // the following resolves files which are different between CE/EE/JH + any_else_ce: path.join(ROOT_PATH, 'app/assets/javascripts'), + // override loader path for icons.svg so we do not duplicate this asset '@gitlab/svgs/dist/icons.svg': path.join( ROOT_PATH, @@ -179,6 +182,8 @@ if (IS_EE) { ee_images: path.join(ROOT_PATH, 'ee/app/assets/images'), ee_jest: path.join(ROOT_PATH, 'ee/spec/frontend'), ee_else_ce: path.join(ROOT_PATH, 'ee/app/assets/javascripts'), + jh_else_ee: path.join(ROOT_PATH, 'ee/app/assets/javascripts'), + any_else_ce: path.join(ROOT_PATH, 'ee/app/assets/javascripts'), }); } @@ -190,7 +195,10 @@ if (IS_JH) { jh_icons: path.join(ROOT_PATH, 'jh/app/views/shared/icons'), jh_images: path.join(ROOT_PATH, 'jh/app/assets/images'), jh_jest: path.join(ROOT_PATH, 'jh/spec/frontend'), + // jh path alias https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74305#note_732793956 jh_else_ce: path.join(ROOT_PATH, 'jh/app/assets/javascripts'), + jh_else_ee: path.join(ROOT_PATH, 'jh/app/assets/javascripts'), + any_else_ce: path.join(ROOT_PATH, 'jh/app/assets/javascripts'), }); } |