Use different jsonpFunction

This avoids issues when multiple entrypoints try to asynchronously load chunks on the same page

Signed-off-by: Julius Härtl <jus@bitgrid.net>

12 files changed, 23 insertions, 11 deletions

diff --git a/apps/accessibility/webpack.js b/apps/accessibility/webpack.js
index ddcb85d3441..0d7b782f9d5 100644
--- a/apps/accessibility/webpack.js
+++ b/apps/accessibility/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
-		filename: 'accessibility.js'
+		filename: 'accessibility.js',
+		jsonpFunction: 'webpackJsonpAccessibility'
 	}
 }
diff --git a/apps/comments/webpack.js b/apps/comments/webpack.js
index b2413d148aa..8244389aeac 100644
--- a/apps/comments/webpack.js
+++ b/apps/comments/webpack.js
@@ -5,7 +5,8 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
-		filename: 'comments.js'
+		filename: 'comments.js',
+		jsonpFunction: 'webpackJsonpComments'
 	},
 	externals: {
 		jquery: 'jQuery'
diff --git a/apps/files_sharing/webpack.js b/apps/files_sharing/webpack.js
index a8b94432683..3fc0628b202 100644
--- a/apps/files_sharing/webpack.js
+++ b/apps/files_sharing/webpack.js
@@ -10,6 +10,7 @@ module.exports = {
 		path: path.resolve(__dirname, './js/dist/'),
 		publicPath: '/js/',
 		filename: '[name].js',
-		chunkFilename: 'files_sharing.[id].js?v=[chunkhash]'
+		chunkFilename: 'files_sharing.[id].js?v=[chunkhash]',
+		jsonpFunction: 'webpackJsonpFilesSharing'
 	}
 }
diff --git a/apps/files_trashbin/webpack.js b/apps/files_trashbin/webpack.js
index fbf378933ba..1856c08ae80 100644
--- a/apps/files_trashbin/webpack.js
+++ b/apps/files_trashbin/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
-		filename: 'files_trashbin.js'
+		filename: 'files_trashbin.js',
+		jsonpFunction: 'webpackJsonpFilesTrashbin'
 	}
 }
diff --git a/apps/files_versions/webpack.js b/apps/files_versions/webpack.js
index d8e9f413351..8d02db2d73e 100644
--- a/apps/files_versions/webpack.js
+++ b/apps/files_versions/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, 'js'),
 		publicPath: '/js/',
-		filename: 'files_versions.js'
+		filename: 'files_versions.js',
+		jsonpFunction: 'webpackJsonpFilesVersions'
 	}
 }
diff --git a/apps/oauth2/webpack.js b/apps/oauth2/webpack.js
index dfaf0324eed..23b9b76b31b 100644
--- a/apps/oauth2/webpack.js
+++ b/apps/oauth2/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js',
-		filename: 'oauth2.js'
+		filename: 'oauth2.js',
+		jsonpFunction: 'webpackJsonpOauth'
 	}
 }
diff --git a/apps/systemtags/webpack.js b/apps/systemtags/webpack.js
index b4da5026997..b22e0b7e52a 100644
--- a/apps/systemtags/webpack.js
+++ b/apps/systemtags/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
-		filename: 'systemtags.js'
+		filename: 'systemtags.js',
+		jsonpFunction: 'webpackJsonpSystemtags'
 	}
 }
diff --git a/apps/twofactor_backupcodes/webpack.js b/apps/twofactor_backupcodes/webpack.js
index ab0888f67c7..88d04e34091 100644
--- a/apps/twofactor_backupcodes/webpack.js
+++ b/apps/twofactor_backupcodes/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, 'js'),
 		publicPath: '/js',
-		filename: 'settings.js'
+		filename: 'settings.js',
+		jsonpFunction: 'webpackJsonpTwofactorBackupcodes'
 	}
 }
diff --git a/apps/updatenotification/webpack.js b/apps/updatenotification/webpack.js
index a13e823e169..b90777108c7 100644
--- a/apps/updatenotification/webpack.js
+++ b/apps/updatenotification/webpack.js
@@ -5,6 +5,7 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
-		filename: 'updatenotification.js'
+		filename: 'updatenotification.js',
+		jsonpFunction: 'webpackJsonpUpdatenotification'
 	}
 }
diff --git a/apps/workflowengine/webpack.js b/apps/workflowengine/webpack.js
index 80ec96da675..76e46261f93 100644
--- a/apps/workflowengine/webpack.js
+++ b/apps/workflowengine/webpack.js
@@ -6,6 +6,7 @@ module.exports = {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
 		filename: 'workflowengine.js',
+		jsonpFunction: 'webpackJsonpWorkflowengine'
 	},
 	module: {
 		rules: [
diff --git a/core/webpack.js b/core/webpack.js
index 1cbd381aa4a..b421e12a567 100644
--- a/core/webpack.js
+++ b/core/webpack.js
@@ -10,7 +10,8 @@ module.exports = [
 		},
 		output: {
 			filename: '[name].js',
-			path: path.resolve(__dirname, 'js/dist')
+			path: path.resolve(__dirname, 'js/dist'),
+			jsonpFunction: 'webpackJsonpCore'
 		},
 		module: {
 			rules: [
diff --git a/settings/webpack.js b/settings/webpack.js
index d606df22631..cee22bded8d 100644
--- a/settings/webpack.js
+++ b/settings/webpack.js
@@ -9,7 +9,8 @@ module.exports = {
 	output: {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/',
-		filename: 'vue-[name].js?v=[chunkhash]'
+		filename: 'vue-[name].js?v=[chunkhash]',
+		jsonpFunction: 'webpackJsonpSettings'
 	},
 	optimization: {
 		splitChunks: {