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

feat(asset): allow non-existent url #7306

Merged
merged 2 commits into from Mar 13, 2022
Merged

feat(asset): allow non-existent url #7306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c4a516
feat(asset): allow non-existent url
bluwy Mar 13, 2022
1fa9a0d
chore: log during build
bluwy Mar 13, 2022
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
6 changes: 6 additions & 0 deletions packages/playground/assets/__tests__/assets.spec.ts
View file
Open in desktop
Expand Up @@ -232,6 +232,12 @@ test('new URL(`${dynamic}`, import.meta.url)', async () => {
)
})

test('new URL(`non-existent`, import.meta.url)', async () => {
expect(await page.textContent('.non-existent-import-meta-url')).toMatch(
'/foo/non-existent'
)
})

if (isBuild) {
test('manifest', async () => {
const manifest = readManifest('foo')
Expand Down
8 changes: 8 additions & 0 deletions packages/playground/assets/index.html
View file
Open in desktop
Expand Up @@ -166,6 +166,11 @@ <h2>new URL(`./${dynamic}`, import.meta.url,) (with comma)</h2>
<code class="dynamic-import-meta-url-2-comma"></code>
</p>

<h2>new URL(`non-existent`, import.meta.url)</h2>
<p>
<code class="non-existent-import-meta-url"></code>
</p>

<h2>simple script tag import-expression</h2>
<code class="import-expression"></code>
<script>
Expand Down Expand Up @@ -257,6 +262,9 @@ <h3 class="foo-public">
document.querySelector('.import-meta-url-img-comma-nl').src =
metaUrlWithCommaNL

const metaUrlNonExistent = new URL('non-existent', import.meta.url).pathname
text('.non-existent-import-meta-url', metaUrlNonExistent)

/**
* don't process the code in the comment
* const url = new URL('non_existent_file.png', import.meta.url)
Expand Down
4 changes: 2 additions & 2 deletions packages/vite/src/node/plugins/asset.ts
View file
Open in desktop
Expand Up @@ -146,11 +146,11 @@ export function checkPublicFile(
}
}

export function fileToUrl(
export async function fileToUrl(
id: string,
config: ResolvedConfig,
ctx: PluginContext
): string | Promise<string> {
): Promise<string> {
bluwy marked this conversation as resolved.
Show resolved Hide resolved
if (config.command === 'serve') {
return fileToDevUrl(id, config)
} else {
Expand Down
4 changes: 3 additions & 1 deletion packages/vite/src/node/plugins/assetImportMetaUrl.ts
View file
Open in desktop
Expand Up @@ -59,7 +59,9 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {

const url = rawUrl.slice(1, -1)
const file = path.resolve(path.dirname(id), url)
const builtUrl = await fileToUrl(file, config, this)
// Get final asset URL. Catch error if the file does not exist,
// in which we can resort to the initial URL and let it resolve in runtime
const builtUrl = await fileToUrl(file, config, this).catch(() => url)
s.overwrite(
index,
index + exp.length,
Expand Down