Merge pull request #16977 from nextcloud/bugfix/noid/webpack-jsonp

Use different jsonpFunction for entry points

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'
 	}
 }

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'

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'
 	}
 }

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'
 	}
 }

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'
 	}
 }

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'
 	}
 }

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'
 	}
 }

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'
 	}
 }

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'
 	}
 }

apps/workflowengine/webpack.js

@@ -6,6 +6,7 @@ module.exports = {
 		path: path.resolve(__dirname, './js'),
 		publicPath: '/js/',
 		filename: 'workflowengine.js',
+		jsonpFunction: 'webpackJsonpWorkflowengine'
 	},
 	module: {
 		rules: [

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: [

settings/js/vue-settings-apps-users-management.js

@@ -1,4 +1,4 @@
-!function(t){function e(e){for(var n,o,i=e[0],a=e[1],s=0,c=[];s<i.length;s++)o=i[s],Object.prototype.hasOwnProperty.call(r,o)&&r[o]&&c.push(r[o][0]),r[o]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(t[n]=a[n]);for(u&&u(e);c.length;)c.shift()()}var n={},r={2:0};function o(e){if(n[e])return n[e].exports;var r=n[e]={i:e,l:!1,exports:{}};return t[e].call(r.exports,r,r.exports,o),r.l=!0,r.exports}o.e=function(t){var e=[],n=r[t];if(0!==n)if(n)e.push(n[2]);else{var i=new Promise(function(e,o){n=r[t]=[e,o]});e.push(n[2]=i);var a,s=document.createElement("script");s.charset="utf-8",s.timeout=120,o.nc&&s.setAttribute("nonce",o.nc),s.src=function(t){return o.p+"vue-"+({}[t]||t)+".js?v="+{0:"97f5efc1ba60c58ddf4c",4:"f63a4356b41a1c894249",5:"27f6ed816d8aef1ce0a1",6:"3c3af2f130d397f5a19a"}[t]}(t);var u=new Error;a=function(e){s.onerror=s.onload=null,clearTimeout(c);var n=r[t];if(0!==n){if(n){var o=e&&("load"===e.type?"missing":e.type),i=e&&e.target&&e.target.src;u.message="Loading chunk "+t+" failed.\n("+o+": "+i+")",u.name="ChunkLoadError",u.type=o,u.request=i,n[1](u)}r[t]=void 0}};var c=setTimeout(function(){a({type:"timeout",target:s})},12e4);s.onerror=s.onload=a,document.head.appendChild(s)}return Promise.all(e)},o.m=t,o.c=n,o.d=function(t,e,n){o.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},o.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},o.t=function(t,e){if(1&e&&(t=o(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var n=Object.create(null);if(o.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)o.d(n,r,function(e){return t[e]}.bind(null,r));return n},o.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(e,"a",e),e},o.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},o.p="/",o.oe=function(t){throw console.error(t),t};var i=window.webpackJsonp=window.webpackJsonp||[],a=i.push.bind(i);i.push=e,i=i.slice();for(var s=0;s<i.length;s++)e(i[s]);var u=a;o(o.s=63)}([function(t,e,n){"use strict";var r=n(4),o=n.n(r),i=n(17),a=n.n(i),s=function(t){return t.replace(/\/$/,"")};e.a={requireAdmin:function(){return a()()},get:function(t){return o.a.get(s(t))},post:function(t,e){return o.a.post(s(t),e)},patch:function(t,e){return o.a.patch(s(t),e)},put:function(t,e){return o.a.put(s(t),e)},delete:function(t,e){return o.a.delete(s(t),{data:e})}}},function(t,e,n){"use strict";var r=n(7),o=n(26),i=Object.prototype.toString;function a(t){return"[object Array]"===i.call(t)}function s(t){return null!==t&&"object"==typeof t}function u(t){return"[object Function]"===i.call(t)}function c(t,e){if(null!=t)if("object"!=typeof t&&(t=[t]),a(t))for(var n=0,r=t.length;n<r;n++)e.call(null,t[n],n,t);else for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(null,t[o],o,t)}t.exports={isArray:a,isArrayBuffer:function(t){return"[object ArrayBuffer]"===i.call(t)},isBuffer:o,isFormData:function(t){return"undefined"!=typeof FormData&&t instanceof FormData},isArrayBufferView:function(t){return"undefined"!=typeof ArrayBuffer&&ArrayBuffer.isView?ArrayBuffer.isView(t):t&&t.buffer&&t.buffer instanceof ArrayBuffer},isString:function(t){return"string"==typeof t},isNumber:function(t){return"number"==typeof t},isObject:s,isUndefined:function(t){return void 0===t},isDate:function(t){return"[object Date]"===i.call(t)},isFile:function(t){return"[object File]"===i.call(t)},isBlob:function(t){return"[object Blob]"===i.call(t)},isFunction:u,isStream:function(t){return s(t)&&u(t.pipe)},isURLSearchParams:function(t){return"undefined"!=typeof URLSearchParams&&t instanceof URLSearchParams},isStandardBrowserEnv:function(){return("undefined"==typeof navigator||"ReactNative"!==navigator.product&&"NativeScript"!==navigator.product&&"NS"!==navigator.product)&&("undefined"!=typeof window&&"undefined"!=typeof document)},forEach:c,merge:function t(){var e={};function n(n,r){"object"==typeof e[r]&&"object"==typeof n?e[r]=t(e[r],n):e[r]=n}for(var r=0,o=arguments.length;r<o;r++)c(arguments[r],n);return e},deepMerge:function t(){var e={};function n(n,r){"object"==typeof e[r]&&"object"==typeof n?e[r]=t(e[r],n):e[r]="object"==typeof n?t({},n):n}for(var r=0,o=arguments.length;r<o;r++)c(arguments[r],n);return e},extend:function(t,e,n){return c(e,function(e,o){t[o]=n&&"function"==typeof e?r(e,n):e}),t},trim:function(t){return t.replace(/^\s*/,"").replace(/\s*$/,"")}}},function(t,e,n){"use strict";n.r(e),function(t,n){
+!function(t){function e(e){for(var n,o,i=e[0],a=e[1],s=0,c=[];s<i.length;s++)o=i[s],Object.prototype.hasOwnProperty.call(r,o)&&r[o]&&c.push(r[o][0]),r[o]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(t[n]=a[n]);for(u&&u(e);c.length;)c.shift()()}var n={},r={2:0};function o(e){if(n[e])return n[e].exports;var r=n[e]={i:e,l:!1,exports:{}};return t[e].call(r.exports,r,r.exports,o),r.l=!0,r.exports}o.e=function(t){var e=[],n=r[t];if(0!==n)if(n)e.push(n[2]);else{var i=new Promise(function(e,o){n=r[t]=[e,o]});e.push(n[2]=i);var a,s=document.createElement("script");s.charset="utf-8",s.timeout=120,o.nc&&s.setAttribute("nonce",o.nc),s.src=function(t){return o.p+"vue-"+({}[t]||t)+".js?v="+{0:"14b2b9892bf5f19e614e",4:"2c0a81c8ef3636b59450",5:"6c7e09e324cca666c5fa",6:"08dec60eb8e3ad920568"}[t]}(t);var u=new Error;a=function(e){s.onerror=s.onload=null,clearTimeout(c);var n=r[t];if(0!==n){if(n){var o=e&&("load"===e.type?"missing":e.type),i=e&&e.target&&e.target.src;u.message="Loading chunk "+t+" failed.\n("+o+": "+i+")",u.name="ChunkLoadError",u.type=o,u.request=i,n[1](u)}r[t]=void 0}};var c=setTimeout(function(){a({type:"timeout",target:s})},12e4);s.onerror=s.onload=a,document.head.appendChild(s)}return Promise.all(e)},o.m=t,o.c=n,o.d=function(t,e,n){o.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},o.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},o.t=function(t,e){if(1&e&&(t=o(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var n=Object.create(null);if(o.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)o.d(n,r,function(e){return t[e]}.bind(null,r));return n},o.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(e,"a",e),e},o.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},o.p="/",o.oe=function(t){throw console.error(t),t};var i=window.webpackJsonpSettings=window.webpackJsonpSettings||[],a=i.push.bind(i);i.push=e,i=i.slice();for(var s=0;s<i.length;s++)e(i[s]);var u=a;o(o.s=63)}([function(t,e,n){"use strict";var r=n(4),o=n.n(r),i=n(17),a=n.n(i),s=function(t){return t.replace(/\/$/,"")};e.a={requireAdmin:function(){return a()()},get:function(t){return o.a.get(s(t))},post:function(t,e){return o.a.post(s(t),e)},patch:function(t,e){return o.a.patch(s(t),e)},put:function(t,e){return o.a.put(s(t),e)},delete:function(t,e){return o.a.delete(s(t),{data:e})}}},function(t,e,n){"use strict";var r=n(7),o=n(26),i=Object.prototype.toString;function a(t){return"[object Array]"===i.call(t)}function s(t){return null!==t&&"object"==typeof t}function u(t){return"[object Function]"===i.call(t)}function c(t,e){if(null!=t)if("object"!=typeof t&&(t=[t]),a(t))for(var n=0,r=t.length;n<r;n++)e.call(null,t[n],n,t);else for(var o in t)Object.prototype.hasOwnProperty.call(t,o)&&e.call(null,t[o],o,t)}t.exports={isArray:a,isArrayBuffer:function(t){return"[object ArrayBuffer]"===i.call(t)},isBuffer:o,isFormData:function(t){return"undefined"!=typeof FormData&&t instanceof FormData},isArrayBufferView:function(t){return"undefined"!=typeof ArrayBuffer&&ArrayBuffer.isView?ArrayBuffer.isView(t):t&&t.buffer&&t.buffer instanceof ArrayBuffer},isString:function(t){return"string"==typeof t},isNumber:function(t){return"number"==typeof t},isObject:s,isUndefined:function(t){return void 0===t},isDate:function(t){return"[object Date]"===i.call(t)},isFile:function(t){return"[object File]"===i.call(t)},isBlob:function(t){return"[object Blob]"===i.call(t)},isFunction:u,isStream:function(t){return s(t)&&u(t.pipe)},isURLSearchParams:function(t){return"undefined"!=typeof URLSearchParams&&t instanceof URLSearchParams},isStandardBrowserEnv:function(){return("undefined"==typeof navigator||"ReactNative"!==navigator.product&&"NativeScript"!==navigator.product&&"NS"!==navigator.product)&&("undefined"!=typeof window&&"undefined"!=typeof document)},forEach:c,merge:function t(){var e={};function n(n,r){"object"==typeof e[r]&&"object"==typeof n?e[r]=t(e[r],n):e[r]=n}for(var r=0,o=arguments.length;r<o;r++)c(arguments[r],n);return e},deepMerge:function t(){var e={};function n(n,r){"object"==typeof e[r]&&"object"==typeof n?e[r]=t(e[r],n):e[r]="object"==typeof n?t({},n):n}for(var r=0,o=arguments.length;r<o;r++)c(arguments[r],n);return e},extend:function(t,e,n){return c(e,function(e,o){t[o]=n&&"function"==typeof e?r(e,n):e}),t},trim:function(t){return t.replace(/^\s*/,"").replace(/\s*$/,"")}}},function(t,e,n){"use strict";n.r(e),function(t,n){
 /*!
  * Vue.js v2.6.10
  * (c) 2014-2019 Evan You
@@ -110,4 +110,4 @@ o.default.use(Jt.a);var ie={API_FAILURE:function(e,n){try{var r=n.error.response
  *
  */
 o.default.use(i.a,{defaultHtml:!1}),Object(a.sync)(ae,Yt),r.nc=btoa(OC.requestToken),r.p=OC.linkTo("settings","js/"),o.default.prototype.t=t,o.default.prototype.OC=OC,o.default.prototype.OCA=OCA,o.default.prototype.oc_userconfig=oc_userconfig;var se=new o.default({router:Yt,store:ae,render:function(t){return t(c)}}).$mount("#content")}]);
-//# sourceMappingURL=vue-settings-apps-users-management.js.map?v=a806ba0e53d07bea9acb
+//# sourceMappingURL=vue-settings-apps-users-management.js.map?v=4a1b8d9927a4550e7022

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: {