summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-03-02 17:00:48 -0600
committerMike Greiling <mike@pixelcog.com>2017-03-03 16:47:39 -0600
commitd0d34786e9bdda51dfecc59a419082db8c523ddc (patch)
treebfb3fa6dbadc48899d23021b83fa15a767619fd6
parentf5f0be534aafd4a2bf1acd9b9154537343fff66e (diff)
downloadgitlab-ce-d0d34786e9bdda51dfecc59a419082db8c523ddc.tar.gz
rename application entry point and change manifest to runtime
-rw-r--r--app/assets/javascripts/main.js (renamed from app/assets/javascripts/application.js)0
-rw-r--r--app/views/layouts/_head.html.haml4
-rw-r--r--config/webpack.config.js6
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/main.js
index 798553c16ac..798553c16ac 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/main.js
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml
index 8457d3fd0e2..f6d8bb08a64 100644
--- a/app/views/layouts/_head.html.haml
+++ b/app/views/layouts/_head.html.haml
@@ -28,9 +28,9 @@
= stylesheet_link_tag "application", media: "all"
= stylesheet_link_tag "print", media: "print"
- = javascript_include_tag(*webpack_asset_paths("manifest"))
+ = javascript_include_tag(*webpack_asset_paths("runtime"))
= javascript_include_tag(*webpack_asset_paths("common"))
- = javascript_include_tag(*webpack_asset_paths("application"))
+ = javascript_include_tag(*webpack_asset_paths("main"))
- if content_for?(:page_specific_javascripts)
= yield :page_specific_javascripts
diff --git a/config/webpack.config.js b/config/webpack.config.js
index eb453b5997b..d9fa70c29fb 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -20,7 +20,7 @@ var config = {
common: './commons/index.js',
common_vue: ['vue', 'vue-resource'],
common_d3: ['d3'],
- application: './application.js',
+ main: './main.js',
blob_edit: './blob_edit/blob_edit_bundle.js',
boards: './boards/boards_bundle.js',
simulate_drag: './test_utils/simulate_drag.js',
@@ -47,7 +47,7 @@ var config = {
output: {
path: path.join(ROOT_PATH, 'public/assets/webpack'),
publicPath: '/assets/webpack/',
- filename: IS_PRODUCTION ? '[name]-[chunkhash].js' : '[name].js'
+ filename: IS_PRODUCTION ? '[name].[chunkhash].bundle.js' : '[name].bundle.js'
},
devtool: 'inline-source-map',
@@ -124,7 +124,7 @@ var config = {
// create cacheable common library bundles
new webpack.optimize.CommonsChunkPlugin({
- names: ['application', 'common', 'manifest'],
+ names: ['main', 'common', 'runtime'],
}),
],