diff --git a/packages/ui-default/backendlib/builder.ts b/packages/ui-default/backendlib/builder.ts index cba4b3ce5..f79137b0d 100644 --- a/packages/ui-default/backendlib/builder.ts +++ b/packages/ui-default/backendlib/builder.ts @@ -104,11 +104,11 @@ export async function buildUI() { } const entry = await build([ `window.lazyloadMetadata = ${JSON.stringify(hashes)};`, + `window.LANGS=${JSON.stringify(SettingModel.langs)};`, ...entryPoints.map((i) => `import '${relative(tmp, i).replace(/\\/g, '\\\\')}';`), ].join('\n')); - const pages = entry.outputFiles.map((i) => i.text); - const str = `window.LANGS=${JSON.stringify(SettingModel.langs)};window._hydroLoad=()=>{ ${pages.join('\n')} };`; - addFile('entry.js', str); + const pages = entry.outputFiles.filter((i) => i.path.endsWith('.js')).map((i) => i.text); + addFile('entry.js', `window._hydroLoad=()=>{ ${pages.join('\n')} };`); UiContextBase.constantVersion = hashes['entry.js']; for (const key in vfs) { if (newFiles.includes(key)) continue; diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 900f51081..9490db1c1 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.51.3", + "version": "4.51.4", "author": "undefined ", "license": "AGPL-3.0", "main": "index.ts", diff --git a/packages/ui-default/templates/layout/html5.html b/packages/ui-default/templates/layout/html5.html index dedd6f572..88e1d2bfc 100644 --- a/packages/ui-default/templates/layout/html5.html +++ b/packages/ui-default/templates/layout/html5.html @@ -46,17 +46,15 @@ - {% endif %} - - - {% if not isIE(handler.request.headers['user-agent']) and not handler.session.legacy %} - - {% set UiContext = Object.create(UiContext) %} - {% set UserContext = Object.create(UserContext) %} + {% endif %} + {% set UiContext = Object.create(UiContext) %} + {% set UserContext = Object.create(UserContext) %} + + + {% if not isIE(handler.request.headers['user-agent']) and not handler.session.legacy %}