Skip to content
Merged

debug #15546

Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/kit/src/runtime/app/paths/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { get_hooks } from '__SERVER__/internal.js';
/** @type {import('./client.js').asset} */
export function asset(file) {
// @ts-expect-error we use the `resolve` mechanism, but with the 'wrong' input
return assets ? assets + file : resolve(file);
return assets && assets !== base ? assets + file : resolve(file);
}

/** @type {import('./client.js').resolve} */
Expand Down
8 changes: 4 additions & 4 deletions packages/kit/test/apps/options-2/src/routes/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<script>
import { base, assets } from '$app/paths';
import { resolve, asset } from '$app/paths';
</script>

<h1>Hello</h1>

<p data-testid="base">base: {base}</p>
<p data-testid="assets">assets: {assets}</p>
<p data-testid="base">base: {resolve('/')}</p>
<p data-testid="assets">assets: {asset('/')}</p>

<a href="{base}/hello" data-testid="link">Go to /hello</a>
<a href={resolve('/hello')} data-testid="link">Go to /hello</a>

<style>
a {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<script>
import { base, assets } from '$app/paths';
import { resolve, asset } from '$app/paths';
</script>

<h1>Hello</h1>

<p data-testid="base">base: {base}</p>
<p data-testid="assets">assets: {assets}</p>
<p data-testid="base">base: {resolve('/')}</p>
<p data-testid="assets">assets: {asset('/')}</p>

<style>
p {
Expand Down
5 changes: 5 additions & 0 deletions packages/kit/test/apps/options-2/svelte.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/** @type {import('@sveltejs/kit').Config} */
const config = {
compilerOptions: {
experimental: {
async: true
}
},
kit: {
paths: {
base: '/basepath',
Expand Down
4 changes: 2 additions & 2 deletions packages/kit/test/apps/options-2/test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ test.describe('paths', () => {
test('uses relative paths during SSR', async ({ page, javaScriptEnabled }) => {
await page.goto('/basepath');

let base = javaScriptEnabled ? '/basepath' : '.';
let base = javaScriptEnabled ? '/basepath/' : './';
expect(await page.textContent('[data-testid="base"]')).toBe(`base: ${base}`);
expect(await page.textContent('[data-testid="assets"]')).toBe(`assets: ${base}`);

await page.goto('/basepath/deeply/nested/page');

base = javaScriptEnabled ? '/basepath' : '../..';
base = javaScriptEnabled ? '/basepath/' : '../../';
expect(await page.textContent('[data-testid="base"]')).toBe(`base: ${base}`);
expect(await page.textContent('[data-testid="assets"]')).toBe(`assets: ${base}`);
});
Expand Down
Loading