diff options
author | Ruben Davila <rdavila84@gmail.com> | 2017-04-20 15:31:15 -0500 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2017-04-20 15:31:15 -0500 |
commit | 086700fa5b8438ea04cab6f3fccc5da181bb16e8 (patch) | |
tree | abd0926d3d74394d4c27d3f65fc3a067a791d330 /config | |
parent | 7ceb0efc6c6016e055ec6862759ff5f442551c4a (diff) | |
parent | 7d16537cac7eb808d8d18cd0b89475db4e4eeaaa (diff) | |
download | gitlab-ce-086700fa5b8438ea04cab6f3fccc5da181bb16e8.tar.gz |
Merge branch 'js-translations' into 28433-internationalise-cycle-analytics-page
Conflicts:
config/webpack.config.js
Diffstat (limited to 'config')
-rw-r--r-- | config/webpack.config.js | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index cb0a57a3a41..b6fe8c6f565 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -35,6 +35,7 @@ var config = { groups_list: './groups_list.js', issuable: './issuable/issuable_bundle.js', issue_show: './issue_show/index.js', + locale: './locale/index.js', main: './main.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', merge_request_widget: './merge_request_widget/ci_bundle.js', @@ -82,6 +83,10 @@ var config = { exclude: /node_modules/, loader: 'file-loader', }, + { + test: /locale\/[a-z]+\/(.*)\.js$/, + loader: 'exports-loader?locales', + }, ] }, @@ -146,6 +151,14 @@ var config = { new webpack.optimize.CommonsChunkPlugin({ names: ['main', 'common', 'runtime'], }), + + // locale common library + new webpack.optimize.CommonsChunkPlugin({ + name: 'locale', + chunks: [ + 'cycle_analytics', + ], + }), ], resolve: { |