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

Jump to bottom

fix(nuxt): use original escapes/quotes in page re-exports #23191

Merged
merged 2 commits into from Sep 14, 2023
Merged

fix(nuxt): use original escapes/quotes in page re-exports #23191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
269a079
fix(nuxt): use original escapes/quotes in page re-exports
danielroe Sep 13, 2023
56dbf42
test: remove nonascii component test as incompatible with webpack
danielroe Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 12 additions & 4 deletions packages/nuxt/src/pages/plugins/page-meta.ts
View file
Open in desktop
Expand Up @@ -65,8 +65,10 @@ export const PageMetaPlugin = createUnplugin((options: PageMetaPluginOptions) =>
// [vite] Re-export any script imports
const scriptImport = imports.find(i => parseMacroQuery(i.specifier).type === 'script')
if (scriptImport) {
const specifier = rewriteQuery(scriptImport.specifier)
s.overwrite(0, code.length, `export { default } from ${JSON.stringify(specifier)}`)
const reorderedQuery = rewriteQuery(scriptImport.specifier)
// Avoid using JSON.stringify which can add extra escapes to paths with non-ASCII characters
const quotedSpecifier = getQuotedSpecifier(scriptImport.code)?.replace(scriptImport.specifier, reorderedQuery) ?? JSON.stringify(reorderedQuery)
s.overwrite(0, code.length, `export { default } from ${quotedSpecifier}`)
return result()
}

Expand All @@ -77,8 +79,10 @@ export const PageMetaPlugin = createUnplugin((options: PageMetaPluginOptions) =>
continue
}

const specifier = rewriteQuery(match.specifier)
s.overwrite(0, code.length, `export { default } from ${JSON.stringify(specifier)}`)
const reorderedQuery = rewriteQuery(match.specifier)
// Avoid using JSON.stringify which can add extra escapes to paths with non-ASCII characters
const quotedSpecifier = getQuotedSpecifier(match.code)?.replace(match.specifier, reorderedQuery) ?? JSON.stringify(reorderedQuery)
s.overwrite(0, code.length, `export { default } from ${quotedSpecifier}`)
return result()
}

Expand Down Expand Up @@ -183,3 +187,7 @@ function parseMacroQuery (id: string) {
}
return query
}

function getQuotedSpecifier (id: string) {
return id.match(/(["']).*\1/)?.[0]
}
8 changes: 8 additions & 0 deletions test/fixtures/basic/pages/non-ascii/ç.vue
View file
Open in desktop
@@ -0,0 +1,8 @@
<script setup lang="ts">
</script>

<template>
<div>
<!-- -->
</div>
</template>