Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: add Vite compatibility when lazy loading #1084

Merged
merged 14 commits into from
Mar 4, 2021
Merged

refactor: add Vite compatibility when lazy loading #1084

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
134c69b
fix: refactor lazy imports to make and support vite
farnabaz Mar 3, 2021
c85391b
fix for webpack?
rchl Mar 3, 2021
847fc15
a little cleaner
rchl Mar 3, 2021
af4d9b2
refactor: move ASYNC_LOCALES to options
pi0 Mar 3, 2021
b990089
fix: resolve langDir
pi0 Mar 3, 2021
ef197bd
fix: use relativeToBuld for partable template paths
pi0 Mar 3, 2021
eb38251
revert fixture update
pi0 Mar 3, 2021
2d981f0
refactor: update ASYNC_LOCALES
pi0 Mar 3, 2021
5e50315
update loadLanguageAsync
pi0 Mar 3, 2021
f6c6e74
revert filter for wrong locales (to be done)
pi0 Mar 3, 2021
3b87b4f
don't care about eslint in this file
rchl Mar 3, 2021
10db80d
use file as locale key
pi0 Mar 3, 2021
f56bfc9
filter out identical values
rchl Mar 3, 2021
e68bb6e
use Set
rchl Mar 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use file as locale key
  • Loading branch information
@pi0
pi0 committed Mar 3, 2021
commit 10db80d387957c165ff1e611bf03a0a71ed052e0
2 changes: 1 addition & 1 deletion src/templates/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ for (const [key, value] of Object.entries(options)) {

<% if (options.langDir) { %>
export const ASYNC_LOCALES = {
<%= options.locales.map(l => `'${l.code}': () => import('../${relativeToBuild(options.langDir, l.file)}' /* webpackChunkName: "lang-${l.file}" */)`).join(',\n ') %>
<%= options.locales.map(l => `'${l.file}': () => import('../${relativeToBuild(options.langDir, l.file)}' /* webpackChunkName: "lang-${l.file}" */)`).join(',\n ') %>
rchl marked this conversation as resolved.
Show resolved Hide resolved
}
<% } %>
2 changes: 1 addition & 1 deletion src/templates/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export async function loadLanguageAsync (context, locale) {
}
if (!messages) {
try {
const getter = await ASYNC_LOCALES[locale]().then(m => m.default || m)
const getter = await ASYNC_LOCALES[file]().then(m => m.default || m)
messages = typeof getter === 'function' ? await Promise.resolve(getter(context, locale)) : getter
} catch (error) {
// eslint-disable-next-line no-console
Expand Down