Skip to content

Commit 3eedd1f

Browse files
ota-meshiota-meshi
authored
chore: use $app/paths#resolve function for links instead of $app/paths#base (#1309)
1 parent abbcfdd commit 3eedd1f

File tree

8 files changed

+41
-51
lines changed

8 files changed

+41
-51
lines changed

‎docs-svelte-kit/package.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,56 +12,56 @@
1212
"svelte-kit": "vite"
1313
},
1414
"devDependencies": {
15-
"@babel/core": "^7.26.0",
16-
"@babel/types": "^7.26.0",
17-
"@fontsource/fira-mono": "^5.1.0",
15+
"@babel/core": "^7.28.3",
16+
"@babel/types": "^7.28.2",
17+
"@fontsource/fira-mono": "^5.2.6",
1818
"@ota-meshi/eslint-plugin": "^0.18.0",
19-
"@shikijs/markdown-it": "^3.0.0",
20-
"@shikijs/twoslash": "^3.0.0",
19+
"@shikijs/markdown-it": "^3.12.2",
20+
"@shikijs/twoslash": "^3.12.2",
2121
"@sindresorhus/slugify": "^2.2.1",
22-
"@sveltejs/adapter-static": "^3.0.6",
23-
"@sveltejs/kit": "^2.8.5",
24-
"@sveltejs/vite-plugin-svelte": "^6.0.0",
22+
"@sveltejs/adapter-static": "^3.0.9",
23+
"@sveltejs/kit": "^2.37.0",
24+
"@sveltejs/vite-plugin-svelte": "^6.1.4",
2525
"@types/babel__core": "^7.20.5",
2626
"@types/cross-spawn": "^6.0.6",
2727
"@types/escape-html": "^1.0.4",
28-
"@types/eslint-scope": "^8.0.0",
28+
"@types/eslint-scope": "^8.3.2",
2929
"@types/eslint-visitor-keys": "^3.3.2",
30-
"@types/less": "^3.0.7",
30+
"@types/less": "^3.0.8",
3131
"@types/markdown-it": "^14.1.2",
3232
"@types/markdown-it-container": "^2.0.10",
3333
"@types/markdown-it-emoji": "^3.0.1",
34-
"@types/node": "^22.10.0",
34+
"@types/node": "^22.18.0",
3535
"@types/prismjs": "^1.26.5",
3636
"@types/stylus": "^0.48.43",
37-
"@typescript/vfs": "^1.6.0",
38-
"acorn": "^8.14.0",
37+
"@typescript/vfs": "^1.6.1",
38+
"acorn": "^8.15.0",
3939
"assert": "^2.1.0",
4040
"cross-spawn": "^7.0.6",
4141
"env-cmd": "^11.0.0",
42-
"esbuild": "^0.25.0",
42+
"esbuild": "^0.25.9",
4343
"escape-html": "^1.0.3",
4444
"eslint-plugin-svelte": "workspace:^",
45-
"eslint-scope": "^8.2.0",
46-
"eslint-visitor-keys": "^4.2.0",
47-
"espree": "^10.3.0",
48-
"globals": "^16.0.0",
45+
"eslint-scope": "^8.4.0",
46+
"eslint-visitor-keys": "^4.2.1",
47+
"espree": "^10.4.0",
48+
"globals": "^16.3.0",
4949
"markdown-it-anchor": "^9.2.0",
5050
"markdown-it-container": "^4.0.0",
5151
"markdown-it-emoji": "^3.0.0",
5252
"pako": "^2.1.0",
5353
"postcss-nested": "^7.0.2",
5454
"prism-svelte": "^0.5.0",
55-
"prismjs": "^1.29.0",
56-
"sass": "^1.81.0",
55+
"prismjs": "^1.30.0",
56+
"sass": "^1.92.0",
5757
"source-map-js": "^1.2.1",
5858
"stylus": "^0.64.0",
59-
"svelte": "^5.30.1",
59+
"svelte": "^5.38.6",
6060
"svelte-adapter-ghpages": "0.2.2",
61-
"twoslash-eslint": "^0.3.0",
62-
"twoslash-protocol": "^0.3.0",
61+
"twoslash-eslint": "^0.3.4",
62+
"twoslash-protocol": "^0.3.4",
6363
"util": "^0.12.5",
64-
"vite": "^7.0.0",
65-
"vite-plugin-svelte-md": "^0.1.7"
64+
"vite": "^7.1.4",
65+
"vite-plugin-svelte-md": "^0.1.9"
6666
}
6767
}

‎docs-svelte-kit/src/lib/footer/Footer.svelte

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script>
22
import { page } from '$app/stores';
33
import { markdownPath, menuItems, isActive } from '../utils.js';
4-
import { base as baseUrl } from '$app/paths';
4+
import { resolve } from '$app/paths';
55
export let fileInfo = {};
66
export let frontmatter = {};
77
@@ -76,10 +76,10 @@
7676
</div>
7777
<div class="footer-move">
7878
{#if prev}
79-
<span class="prev">←<a href="{baseUrl}{prev.path}">{prev.title}</a></span>
79+
<span class="prev">←<a href={resolve(prev.path)}>{prev.title}</a></span>
8080
{/if}
8181
{#if next}
82-
<span class="next"><a href="{baseUrl}{next.path}">{next.title}</a>→ </span>
82+
<span class="next"><a href={resolve(next.path)}>{next.title}</a>→ </span>
8383
{/if}
8484
</div>
8585
<div class="footer-text">

‎docs-svelte-kit/src/lib/header/Header.svelte

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import { isActive } from '../utils.js';
44
import { page } from '$app/stores';
55
import logo from './logo.svg';
6-
import { base as baseUrl } from '$app/paths';
6+
import { resolve } from '$app/paths';
77
88
const dispatch = createEventDispatcher();
99
@@ -34,7 +34,7 @@
3434
/>
3535
</svg>
3636
</div>
37-
<a href="{baseUrl}/" class="home-link">
37+
<a href={resolve('/')} class="home-link">
3838
<img src={logo} alt="Logo" />
3939
</a>
4040
</div>
@@ -45,13 +45,13 @@
4545
</svg>
4646
<ul>
4747
<li class:active={isActive('/', $page)}>
48-
<a href="{baseUrl}/">Home</a>
48+
<a href={resolve('/')}>Home</a>
4949
</li>
5050
<li class:active={isActive('/user-guide/', $page)}>
51-
<a href="{baseUrl}/user-guide/">User Guide</a>
51+
<a href={resolve('/user-guide/')}>User Guide</a>
5252
</li>
5353
<li class:active={isActive('/rules/', $page)}>
54-
<a href="{baseUrl}/rules/">Rules</a>
54+
<a href={resolve('/rules/')}>Rules</a>
5555
</li>
5656
<li>
5757
<a
@@ -64,7 +64,7 @@
6464
</li>
6565
</ul>
6666
<div class="nav-title">
67-
<a href="{baseUrl}/"> <img src={logo} alt="Logo" />eslint-plugin-svelte</a>
67+
<a href={resolve('/')}> <img src={logo} alt="Logo" />eslint-plugin-svelte</a>
6868
</div>
6969
<svg viewBox="0 0 2 3" aria-hidden="true">
7070
<path d="M0,0 L0,3 C0.5,3 0.5,3 1,2 L2,0 Z" />

‎docs-svelte-kit/src/lib/sidemenu/UlMenu.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script>
22
import { page } from '$app/stores';
33
import { isActive, stripBaseUrl } from '../utils.js';
4-
import { base as baseUrl } from '$app/paths';
4+
import { resolve } from '$app/paths';
55
export let children;
66
export let level = 1;
77
</script>
@@ -16,7 +16,7 @@
1616
<a
1717
class="sidebar-menu-item-title"
1818
class:active={item.active || (item.path && isActive(item.path, $page))}
19-
href="{baseUrl}{item.path || `${stripBaseUrl($page.url.pathname)}#${item.id}`}"
19+
href={resolve(item.path || `${stripBaseUrl($page.url.pathname)}#${item.id}`)}
2020
>
2121
{item.title}
2222
</a>

‎docs-svelte-kit/src/routes/+error.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<script>
2-
import { base as baseUrl } from '$app/paths';
2+
import { resolve } from '$app/paths';
33
import { page } from '$app/stores';
44
</script>
55

66
<h1>{$page.status}</h1>
77
<blockquote>
88
<p>{$page.error.message}</p>
9-
<p>Take me <a href="{baseUrl}/">home</a></p>
9+
<p>Take me <a href={resolve('/')}>home</a></p>
1010
</blockquote>

‎docs-svelte-kit/src/routes/404/+page.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<script>
2-
import { base as baseUrl } from '$app/paths';
2+
import { resolve } from '$app/paths';
33
</script>
44

55
<h1>404</h1>
66
<blockquote>
77
<p>Not Found</p>
8-
<p>Take me <a href="{baseUrl}/">home</a></p>
8+
<p>Take me <a href={resolve('/')}>home</a></p>
99
</blockquote>
1010

1111
<style>

‎docs-svelte-kit/statics/favicon.png renamed to ‎docs-svelte-kit/static/favicon.png

File renamed without changes.

‎docs-svelte-kit/svelte.config.js

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,7 @@ const config = {
2525
// default options are shown
2626
pages: outDir,
2727
assets: outDir
28-
}),
29-
files: {
30-
routes: path.join(dirname, './src/routes'),
31-
appTemplate: path.join(dirname, './src/app.html'),
32-
hooks: {
33-
server: path.join(dirname, './src/hooks/server'),
34-
client: path.join(dirname, './src/hooks/client')
35-
},
36-
lib: path.join(dirname, './src/lib'),
37-
assets: path.join(dirname, './statics')
38-
}
28+
})
3929
}
4030
};
4131
export default config;

0 commit comments

Comments
 (0)