Merge pull request #22942 from nextcloud/backport/22395/stable18

[stable18] Fix settings chunk loading
This commit is contained in:
Roeland Jago Douma 2020-10-01 10:52:00 +02:00 committed by GitHub
commit 301deeeb0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 30 additions and 29 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -914,4 +914,4 @@ function(t){if(Number(t.version.split(".")[0])>=2)t.mixin({beforeCreate:n});else
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
o.default.use(h.a);var v={setEnforced:function(t,e){o.default.set(t,"enforced",e)},setEnforcedGroups:function(t,e){o.default.set(t,"enforcedGroups",e)},setExcludedGroups:function(t,e){o.default.set(t,"excludedGroups",e)}},m=new h.a.Store({strict:!1,state:{enforced:!1,enforcedGroups:[],excludedGroups:[]},mutations:v});r.nc=btoa(OC.requestToken),o.default.prototype.t=t,window.OC=window.OC||{},window.OC.Settings=window.OC.Settings||{},m.replaceState(Object(i.loadState)("settings","mandatory2FAState")),new(o.default.extend(p))({store:m}).$mount("#two-factor-auth-settings")}]);
//# sourceMappingURL=vue-settings-admin-security.js.map?v=48b42e10486ea31f56b7
//# sourceMappingURL=vue-settings-admin-security.js.map?v=ebb2b45d0a38b4e4ca0a

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -942,4 +942,4 @@ function w(){throw new Error("Dynamic requires are not currently supported by ro
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
r.nc=btoa(OC.requestToken),o.default.use(s.a),o.default.use(c.a,{defaultHtml:!1}),o.default.prototype.t=t,new(o.default.extend(D))({propsData:{tokens:Object(i.loadState)("settings","app_tokens"),canCreateToken:Object(i.loadState)("settings","can_create_app_token")}}).$mount("#security-authtokens")}]);
//# sourceMappingURL=vue-settings-personal-security.js.map?v=2be0fafe5bed5a7762d4
//# sourceMappingURL=vue-settings-personal-security.js.map?v=e46907f58c390bda2f89

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -1,4 +1,4 @@
/*
/**
* @copyright Copyright (c) 2018 John Molakvoæ <skjnldsv@protonmail.com>
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
@ -25,8 +25,8 @@ import Vue from 'vue'
import Router from 'vue-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)

View file

@ -9,12 +9,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: '-',
}
}
},
},
}