diff options
author | Phil Hughes <me@iamphill.com> | 2017-04-20 14:15:39 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-04-20 14:15:39 +0100 |
commit | b7b5bd4a49a212f41f08be98997c25c0ce530f97 (patch) | |
tree | 72e7b32423adf742a9d8dcbfe2608fec86be0378 /config/webpack.config.js | |
parent | 7d16537cac7eb808d8d18cd0b89475db4e4eeaaa (diff) | |
parent | 7ceb0efc6c6016e055ec6862759ff5f442551c4a (diff) | |
download | gitlab-ce-b7b5bd4a49a212f41f08be98997c25c0ce530f97.tar.gz |
Merge remote-tracking branch 'origin/28433-internationalise-cycle-analytics-page' into js-translations
Diffstat (limited to 'config/webpack.config.js')
-rw-r--r-- | config/webpack.config.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index f93f4d6cd5e..dc9c7786475 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -19,12 +19,11 @@ var WEBPACK_REPORT = process.env.WEBPACK_REPORT; var config = { context: path.join(ROOT_PATH, 'app/assets/javascripts'), entry: { + blob: './blob_edit/blob_bundle.js', + boards: './boards/boards_bundle.js', common: './commons/index.js', common_vue: ['vue', './vue_shared/common_vue.js'], common_d3: ['d3'], - main: './main.js', - blob: './blob_edit/blob_bundle.js', - boards: './boards/boards_bundle.js', cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', commit_pipelines: './commit/pipelines/pipelines_bundle.js', diff_notes: './diff_notes/diff_notes_bundle.js', @@ -32,27 +31,28 @@ var config = { environments_folder: './environments/folder/environments_folder_bundle.js', filtered_search: './filtered_search/filtered_search_bundle.js', graphs: './graphs/graphs_bundle.js', + group: './group.js', groups_list: './groups_list.js', issuable: './issuable/issuable_bundle.js', locale: './locale/index.js', + issue_show: './issue_show/index.js', + main: './main.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', merge_request_widget: './merge_request_widget/ci_bundle.js', monitoring: './monitoring/monitoring_bundle.js', network: './network/network_bundle.js', notebook_viewer: './blob/notebook_viewer.js', - sketch_viewer: './blob/sketch_viewer.js', pdf_viewer: './blob/pdf_viewer.js', + pipelines: './pipelines/index.js', profile: './profile/profile_bundle.js', protected_branches: './protected_branches/protected_branches_bundle.js', protected_tags: './protected_tags', snippet: './snippet/snippet_bundle.js', + sketch_viewer: './blob/sketch_viewer.js', stl_viewer: './blob/stl_viewer.js', terminal: './terminal/terminal_bundle.js', u2f: ['vendor/u2f'], users: './users/users_bundle.js', - vue_pipelines: './vue_pipelines_index/index.js', - issue_show: './issue_show/index.js', - group: './group.js', }, output: { @@ -126,10 +126,11 @@ var config = { 'environments', 'environments_folder', 'issuable', + 'issue_show', 'merge_conflicts', 'notebook_viewer', 'pdf_viewer', - 'vue_pipelines', + 'pipelines', ], minChunks: function(module, count) { return module.resource && (/vue_shared/).test(module.resource); |