Skip to content

Fix path to relative ftl file imports #49

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

Merged
merged 6 commits into from
Mar 23, 2023
Merged

Fix path to relative ftl file imports #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7f9a67c
Extract HMR code to a separate function
Demivan Mar 23, 2023
b0ebe5c
Extract code for importing ftl files
Demivan Mar 23, 2023
596deca
Fix path to ftl file
Demivan Mar 23, 2023
275f932
Improve HMR
Demivan Mar 23, 2023
78dda46
Update snapshots
Demivan Mar 23, 2023
457c482
Improve build of example projects
Demivan Mar 23, 2023
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
Binary file modified __tests__/frameworks/vite/__snapshots__/external.spec.ts.snap
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion scripts/build-examples.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ async function buildExamples () {

for (const example of examples) {
console.log(`building ${example.folder}...`)
await execa('pnpm', ['add', `file:../../`], { stdio: 'inherit', cwd: example.folder })
await execa('pnpm', ['add', `link:../../`], { stdio: 'inherit', cwd: example.folder })
await execa('pnpm', ['i'], { stdio: 'inherit', cwd: example.folder })
await execa('pnpm', ['build'], { stdio: 'inherit', cwd: example.folder })
}
Expand Down
61 changes: 38 additions & 23 deletions src/plugins/external-plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,46 @@ export const unplugin = createUnplugin((options: ExternalPluginOptions, meta) =>
}
}

const insertFtlImports = (magic: MagicString, translations: Dependency[]) => {
for (const dep of translations)
magic.prepend(`import ${dep.importVariable} from '${dep.relativeFtlPath}';\n`)
}

const insertHotCode = (magic: MagicString, translations: Dependency[], target: string, insertPos: number) => {
const __HOT_API__ = meta.framework === 'webpack' ? 'import.meta.webpackHot' : 'import.meta.hot'

magic.appendLeft(insertPos, `
if (${__HOT_API__}) {
${__HOT_API__}.accept([${translations.map(dep => `'${dep.relativeFtlPath}'`).join(', ')}], (mods) => {
${translations.map(({ locale, importVariable }) => `${target}.fluent['${locale}'] = ${importVariable}`).join('\n')}

if (mods) {
${translations.map(({ locale }, index) => `if (mods['${index}']) ${target}.fluent['${locale}'] = mods['${index}'].default`).join('\n')}
}

delete ${target}._fluent
if (typeof __VUE_HMR_RUNTIME__ !== 'undefined') {
// Vue 3
__VUE_HMR_RUNTIME__.reload(${target}.__hmrId, ${target})
} else {
// Vue 2
// There is no proper api to access HMR for component from custom block
// so use this magic
delete ${target}._Ctor
}
})
}
`)
}

const getTranslationsForFile = async (id: string) => {
const dependencies: Dependency[] = []
for (const locale of options.locales) {
const ftlPath = normalizePath(resolvedOptions.getFtlPath(locale, id))
const ftlExists = await fileExists(ftlPath)
const relativeFtlPath = normalizePath(relative(dirname(id), ftlPath))
let relativeFtlPath = normalizePath(relative(dirname(id), ftlPath))
if (!relativeFtlPath.startsWith('.'))
relativeFtlPath = `./${relativeFtlPath}`

if (ftlExists) {
dependencies.push({
Expand Down Expand Up @@ -141,32 +175,13 @@ export const unplugin = createUnplugin((options: ExternalPluginOptions, meta) =>
for (const { ftlPath } of translations)
this.addWatchFile(ftlPath)

for (const dep of translations)
magic.prepend(`import ${dep.importVariable} from '${dep.relativeFtlPath}';\n`)
insertFtlImports(magic, translations)

magic.appendLeft(insertPos, `${target}.fluent = ${target}.fluent || {};\n`)
for (const dep of translations)
magic.appendLeft(insertPos, `${target}.fluent['${dep.locale}'] = ${dep.importVariable}\n`)

const __HOT_API__ = meta.framework === 'webpack' ? 'import.meta.webpackHot' : 'import.meta.hot'

magic.appendLeft(insertPos, `
if (${__HOT_API__}) {
${__HOT_API__}.accept([${translations.map(dep => `'${dep.relativeFtlPath}'`).join(', ')}], () => {
${translations.map(({ locale, importVariable }) => `${target}.fluent['${locale}'] = ${importVariable}`).join('\n')}

delete ${target}._fluent
if (typeof __VUE_HMR_RUNTIME__ !== 'undefined') {
// Vue 3
__VUE_HMR_RUNTIME__.reload(${target}.__hmrId, ${target})
} else {
// Vue 2
// There is no proper api to access HMR for component from custom block
// so use this magic
delete ${target}._Ctor
}
})
}
`)
insertHotCode(magic, translations, target, insertPos)

return {
code: magic.toString(),
Expand Down