Switch to using a common runtime chunk rather than locales

This commit is contained in:
Claire 2023-06-10 17:43:13 +02:00
parent 8c26d49cbd
commit 34efd1a24c
6 changed files with 5 additions and 28 deletions

View file

@ -1,22 +0,0 @@
let theLocale;
export function setLocale(locale) {
theLocale = locale;
}
export function getLocale() {
return theLocale;
}
export function onProviderError(error) {
// Silent the error, like upstream does
if(process.env.NODE_ENV === 'production') return;
// This browser does not advertise Intl support for this locale, we only print a warning
// As-per the spec, the browser should select the best matching locale
if(typeof error === "object" && error.message.match("MISSING_DATA")) {
console.warn(error.message);
}
console.error(error);
}

View file

@ -26,7 +26,7 @@
%title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
= javascript_pack_tag "locales", crossorigin: 'anonymous'
= javascript_pack_tag "common", crossorigin: 'anonymous'
- if @theme
- if @theme[:supported_locales].include? I18n.locale.to_s
= preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"

View file

@ -12,7 +12,7 @@
%link{ rel: 'dns-prefetch', href: storage_host }/
= render_initial_state
= javascript_pack_tag 'locales', crossorigin: 'anonymous'
= javascript_pack_tag 'common', crossorigin: 'anonymous'
- if @theme
- if @theme[:supported_locales].include? I18n.locale.to_s
= preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"

View file

@ -5,7 +5,7 @@
%meta{ charset: 'utf-8' }/
%title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
%meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
= javascript_pack_tag "locales", crossorigin: 'anonymous'
= javascript_pack_tag "common", crossorigin: 'anonymous'
= render partial: 'layouts/theme', object: (@core || { pack: 'common' })
= render partial: 'layouts/theme', object: (@theme || { pack: 'error', flavour: 'glitch', common: { pack: 'common', flavour: 'glitch', skin: 'default' } })
%body.error

View file

@ -1,6 +1,6 @@
- content_for :header_tags do
= render_initial_state
= javascript_pack_tag 'locales', crossorigin: 'anonymous'
= javascript_pack_tag 'common', crossorigin: 'anonymous'
- if @theme
- if @theme[:supported_locales].include? I18n.locale.to_s
= preload_pack_asset "locales/#{@theme[:flavour]}/#{I18n.locale}-json.js"

View file

@ -47,7 +47,6 @@ function reducePacks (data, into = {}) {
}
const entries = Object.assign(
{ locales: resolve('app', 'javascript', 'locales') },
reducePacks(core),
Object.values(flavours).reduce((map, data) => reducePacks(data, map), {}),
);
@ -67,7 +66,7 @@ module.exports = {
optimization: {
runtimeChunk: {
name: 'locales',
name: 'common',
},
splitChunks: {
cacheGroups: {