Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-22 13:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(vite): don't terminate with escaped delimiters (#5409)

Browse Source
This commit is contained in:
Daniel Roe 2022-06-10 16:17:11 +01:00 committed by GitHub
parent fbcbac01d6
commit 8831e4a4b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/vite/src/plugins/dynamic-base.ts
View File

@ -89,7 +89,7 @@ export const DynamicBasePlugin = createUnplugin(function (options: DynamicBasePl
s.replace(/from *['"]\/__NUXT_BASE__(\/[^'"]*)['"]/g, 'from "$1"') s.replace(/from *['"]\/__NUXT_BASE__(\/[^'"]*)['"]/g, 'from "$1"')
// Dynamically compute string URLs featuring baseURL // Dynamically compute string URLs featuring baseURL
const delimiterRE = /(?<!(const base = |from *))(`([^`]*)\/__NUXT_BASE__\/([^`]*)`|'([^\n']*)\/__NUXT_BASE__\/([^\n']*)'|"([^\n"]*)\/__NUXT_BASE__\/([^\n"]*)")/g const delimiterRE = /(?<!(const base = |from *))((?<!\\)`([^`]*)\/__NUXT_BASE__\/([^`]*)(?<!\\)`|(?<!\\)'([^\n']*)\/__NUXT_BASE__\/([^\n']*)(?<!\\)'|(?<!\\)"([^\n"]*)\/__NUXT_BASE__\/([^\n"]*)(?<!\\)")/g
/* eslint-disable-next-line no-template-curly-in-string */ /* eslint-disable-next-line no-template-curly-in-string */
s.replace(delimiterRE, r => '`' + r.replace(/\/__NUXT_BASE__\//g, '${__publicAssetsURL()}').slice(1, -1) + '`') s.replace(delimiterRE, r => '`' + r.replace(/\/__NUXT_BASE__\//g, '${__publicAssetsURL()}').slice(1, -1) + '`')

2
test/basic.test.ts
View File

@ -349,6 +349,8 @@ describe('dynamic paths', () => {
[ [
"./logo.svg", "./logo.svg",
"../public.svg", "../public.svg",
"../public.svg",
"../public.svg",
] ]
`) `)
}) })

6
test/fixtures/basic/pages/assets.vue vendored
View File

@ -13,8 +13,14 @@ import logo from '~/assets/logo.svg'
<style> <style>
#__nuxt { #__nuxt {
background-image: url('~/assets/logo.svg'); background-image: url('~/assets/logo.svg');
@font-face {
src: url("/public.svg") format("woff2");
}
} }
body { body {
background-image: url('/public.svg'); background-image: url('/public.svg');
@font-face {
src: url('/public.svg') format('woff2');
}
} }
</style> </style>