Merge pull request #22395 from nextcloud/fix/settings-chunks

nextcloud · Sep 10, 2020 · be9dde8 · be9dde8
2 parents 92cde8b + b8c3ee5
commit be9dde8
Show file tree

Hide file tree

Showing 29 changed files with 32 additions and 34 deletions.
diff --git a/apps/settings/js/vue-0.js.map b/apps/settings/js/vue-0.js.map
diff --git a/apps/settings/js/vue-5.js b/apps/settings/js/vue-5.js
diff --git a/apps/settings/js/vue-5.js.map b/apps/settings/js/vue-5.js.map
diff --git a/apps/settings/js/vue-6.js.map b/apps/settings/js/vue-6.js.map
diff --git a/apps/settings/js/vue-7.js.map b/apps/settings/js/vue-7.js.map
diff --git a/apps/settings/js/vue-8.js.map b/apps/settings/js/vue-8.js.map
diff --git a/apps/settings/js/vue-9.js.map b/apps/settings/js/vue-9.js.map
diff --git a/apps/settings/js/vue-settings-admin-security.js b/apps/settings/js/vue-settings-admin-security.js
diff --git a/apps/settings/js/vue-settings-admin-security.js.map b/apps/settings/js/vue-settings-admin-security.js.map
diff --git a/apps/settings/js/vue-6.js → ...vue-settings-apps-61204aaf4b4d6b6e7940.js b/apps/settings/js/vue-6.js → ...vue-settings-apps-61204aaf4b4d6b6e7940.js
diff --git a/apps/settings/js/vue-settings-apps-61204aaf4b4d6b6e7940.js.map b/apps/settings/js/vue-settings-apps-61204aaf4b4d6b6e7940.js.map
diff --git a/apps/settings/js/vue-settings-apps-users-management.js b/apps/settings/js/vue-settings-apps-users-management.js
diff --git a/apps/settings/js/vue-settings-apps-users-management.js.map b/apps/settings/js/vue-settings-apps-users-management.js.map
diff --git a/apps/settings/js/vue-settings-nextcloud-pdf.js b/apps/settings/js/vue-settings-nextcloud-pdf.js
diff --git a/apps/settings/js/vue-settings-nextcloud-pdf.js.map b/apps/settings/js/vue-settings-nextcloud-pdf.js.map
diff --git a/apps/settings/js/vue-settings-personal-security.js b/apps/settings/js/vue-settings-personal-security.js
diff --git a/apps/settings/js/vue-settings-personal-security.js.map b/apps/settings/js/vue-settings-personal-security.js.map
diff --git a/apps/settings/js/vue-settings-personal-webauthn.js b/apps/settings/js/vue-settings-personal-webauthn.js
diff --git a/apps/settings/js/vue-settings-personal-webauthn.js.map b/apps/settings/js/vue-settings-personal-webauthn.js.map
diff --git a/apps/settings/js/vue-7.js → ...ue-settings-users-06b858deaf48603ce7c5.js b/apps/settings/js/vue-7.js → ...ue-settings-users-06b858deaf48603ce7c5.js
diff --git a/apps/settings/js/vue-settings-users-06b858deaf48603ce7c5.js.map b/apps/settings/js/vue-settings-users-06b858deaf48603ce7c5.js.map
diff --git a/apps/settings/js/vue-9.js → ...ors-settings-apps-c6e9416bc06c5686fddf.js b/apps/settings/js/vue-9.js → ...ors-settings-apps-c6e9416bc06c5686fddf.js
diff --git a/apps/settings/js/vue-vendors-settings-apps-c6e9416bc06c5686fddf.js.map b/apps/settings/js/vue-vendors-settings-apps-c6e9416bc06c5686fddf.js.map
diff --git a/apps/settings/js/vue-0.js → ...ps-settings-users-7b6984d3f3d3a3aa83a6.js b/apps/settings/js/vue-0.js → ...ps-settings-users-7b6984d3f3d3a3aa83a6.js
diff --git a/apps/settings/js/vue-vendors-settings-apps-settings-users-7b6984d3f3d3a3aa83a6.js.map b/apps/settings/js/vue-vendors-settings-apps-settings-users-7b6984d3f3d3a3aa83a6.js.map
diff --git a/apps/settings/js/vue-8.js → ...rs-settings-users-8b96ce996f010432adcb.js b/apps/settings/js/vue-8.js → ...rs-settings-users-8b96ce996f010432adcb.js
diff --git a/apps/settings/js/vue-vendors-settings-users-8b96ce996f010432adcb.js.map b/apps/settings/js/vue-vendors-settings-users-8b96ce996f010432adcb.js.map
diff --git a/apps/settings/src/router.js b/apps/settings/src/router.js
@@ -1,4 +1,4 @@
-/*
+/**
  * @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
  *
  * @author John Molakvoæ <skjnldsv@protonmail.com>
@@ -26,8 +26,8 @@ import Router from 'vue-router'
 import { generateUrl } from '@nextcloud/router'
 
 // Dynamic loading
-const Users = () => import('./views/Users')
-const Apps = () => import('./views/Apps')
+const Users = () => import(/* webpackChunkName: 'settings-users' */'./views/Users')
+const Apps = () => import(/* webpackChunkName: 'settings-apps' */'./views/Apps')
 
 Vue.use(Router)
 

diff --git a/apps/settings/webpack.js b/apps/settings/webpack.js
@@ -11,12 +11,13 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
-		filename: 'vue-[name].js?v=[chunkhash]',
-		jsonpFunction: 'webpackJsonpSettings'
+		filename: 'vue-[name].js?v=[contenthash]',
+		chunkFilename: 'vue-[name]-[chunkhash].js?v=[contenthash]',
+		jsonpFunction: 'webpackJsonpSettings',
 	},
 	optimization: {
 		splitChunks: {
 			automaticNameDelimiter: '-',
-		}
-	}
+		},
+	},
 }