Skip to content

Commit 89c9141

Browse files
eniehackeniehack
authored
Merge pull request #67 from until-tsukuba/chore/security-20260310
chore: セキュリティ脆弱性を含むライブラリの一部を更新 etc.
2 parents bedad2a + 435575b commit 89c9141

10 files changed

Lines changed: 402 additions & 618 deletions

File tree

‎eslint.config.js‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import tseslint from 'typescript-eslint';
44
import svelte from 'eslint-plugin-svelte';
55
import prettierConfig from 'eslint-config-prettier';
66
import svelteConfig from './svelte.config.js';
7-
import * as espree from 'espree';
87

98
export default [
109
js.configs.recommended,
@@ -32,21 +31,12 @@ export default [
3231
extraFileExtensions: ['.svelte'],
3332
projectService: true,
3433
parser: {
35-
ts: tseslint.parser,
36-
js: espree
34+
ts: tseslint.parser
3735
},
3836
svelteConfig
3937
}
4038
}
4139
},
42-
{
43-
files: ['**/*.js', '**/*.mjs'],
44-
languageOptions: {
45-
parserOptions: {
46-
parser: espree
47-
}
48-
}
49-
},
5040
{
5141
files: ['*.config.js'],
5242
...tseslint.configs.disableTypeChecked

‎package.json‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,25 @@
1313
},
1414
"devDependencies": {
1515
"@eslint/js": "^9.15.0",
16-
"@sveltejs/adapter-cloudflare": "^7.0.1",
16+
"@sveltejs/adapter-cloudflare": "^7.2.8",
1717
"@sveltejs/kit": "^2.53.4",
1818
"@sveltejs/vite-plugin-svelte": "^6.2.4",
1919
"@tailwindcss/typography": "^0.5.15",
2020
"@tailwindcss/vite": "^4.2.1",
2121
"@types/geojson": "^7946.0.16",
22-
"eslint": "~9.15.0",
22+
"eslint": "~10.0.3",
2323
"eslint-config-prettier": "^10.1.1",
24-
"eslint-plugin-svelte": "^2.46.1",
25-
"espree": "^10.3.0",
24+
"eslint-plugin-svelte": "^3.15.2",
2625
"globals": "^15.12.0",
2726
"maplibre-gl": "^4.7.1",
2827
"prettier": "^3.3.3",
2928
"prettier-plugin-svelte": "^3.3.2",
30-
"svelte": "^5.2.7",
29+
"svelte": "^5.53.9",
3130
"svelte-check": "^4.1.0",
3231
"tailwindcss": "^4.2.1",
3332
"typescript": "^5.7.2",
34-
"typescript-eslint": "^8.29.0",
35-
"valibot": "^0.36.0",
33+
"typescript-eslint": "^8.57.0",
34+
"valibot": "^1.2.0",
3635
"vite": "^7.3.1"
3736
},
3837
"type": "module",

‎pnpm-lock.yaml‎

Lines changed: 377 additions & 583 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/lib/DarkmodeControl.svelte‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<script lang="ts">
22
import { isDarkmode } from './store';
3-
$inspect($isDarkmode);
43
</script>
54

65
<button

‎src/lib/Header.svelte‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<script lang="ts">
2+
import { resolve } from '$app/paths';
3+
24
let is_navbar_toggled = $state(false);
35
</script>
46

57
<header>
68
<nav class="dark:bg-slate-800 bg-sky-50 relative w-full p-2 z-30" aria-label="main navigation">
79
<div class="flex items-center justify-between">
810
<div class="flex-auto">
9-
<a class="item-center dark:text-neutral-200" href="/"> 筑波大自販機Map </a>
11+
<a class="item-center dark:text-neutral-200" href={resolve('/')}> 筑波大自販機Map </a>
1012
</div>
1113
<div class="md:hidden flex-none">
1214
<button
@@ -48,17 +50,17 @@
4850
</button>
4951
</div>
5052
<div class="hidden md:flex">
51-
<a href="/about" class="p-2 dark:text-neutral-200">about</a>
52-
<a href="/contribute" class="p-2 dark:text-neutral-200">このサイトに貢献する</a>
53+
<a href={resolve('/about')} class="p-2 dark:text-neutral-200">about</a>
54+
<a href={resolve('/contribute')} class="p-2 dark:text-neutral-200">このサイトに貢献する</a>
5355
<a href="https://github.com/eniehack/itf-vendingmachine" class="p-2 dark:text-neutral-200"
5456
>GitHub</a
5557
>
5658
</div>
5759
</div>
5860
{#if is_navbar_toggled}
5961
<div id="navbar-content" class="md:hidden flex flex-col block">
60-
<a href="/about" class="p-2 dark:text-neutral-200">about</a>
61-
<a href="/contribute" class="p-2 dark:text-neutral-200">このサイトに貢献する</a>
62+
<a href={resolve('/about')} class="p-2 dark:text-neutral-200">about</a>
63+
<a href={resolve('/contribute')} class="p-2 dark:text-neutral-200">このサイトに貢献する</a>
6264
<a href="https://github.com/eniehack/itf-vendingmachine" class="p-2 dark:text-neutral-200"
6365
>GitHub</a
6466
>

‎src/lib/Map.svelte‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import { osm, dark } from '$lib/style';
55
import 'maplibre-gl/dist/maplibre-gl.css';
66
import { VendingMachine } from './vendingMachine';
7-
import { base } from '$app/paths';
7+
import { asset } from '$app/paths';
88
import { VENDING, SOURCE_ID, LAYER, DARKMODE } from '$lib/const';
99
import SearchMenu from './SearchMenu.svelte';
1010
import { darkmodeControl } from './darkmodeControl';
@@ -113,13 +113,13 @@
113113
});
114114
map.on('load', () => {
115115
if (typeof map === 'undefined') return;
116-
map.loadImage(`${base}/${VENDING.DRINKS.icon.file}`).then((img) => {
116+
map.loadImage(asset(`/${VENDING.DRINKS.icon.file}`)).then((img) => {
117117
map?.addImage(VENDING.DRINKS.icon.id, img.data, { sdf: true });
118118
});
119-
map.loadImage(`${base}/${VENDING.BREAD.icon.file}`).then((img) => {
119+
map.loadImage(asset(`/${VENDING.BREAD.icon.file}`)).then((img) => {
120120
map?.addImage(VENDING.BREAD.icon.id, img.data, { sdf: true });
121121
});
122-
map.loadImage(`${base}/${VENDING.ICE_CREAM.icon.file}`).then((img) => {
122+
map.loadImage(asset(`/${VENDING.ICE_CREAM.icon.file}`)).then((img) => {
123123
map?.addImage(VENDING.ICE_CREAM.icon.id, img.data, { sdf: true });
124124
});
125125
map.addControl(

‎src/lib/VendingSelector.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<label for="vending">欲しいものは？</label>
1919
<select name="vending" id="vending-selector" bind:value={vending}>
2020
<option value="">指定なし</option>
21-
{#each Object.values(VENDING) as v}
21+
{#each Object.values(VENDING) as v (v.value)}
2222
<option value={v.value}>{v.title}</option>
2323
{/each}
2424
</select>

‎src/routes/+page.svelte‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//import { VERCEL_URL } from "$env/static/private";
33
import { here } from '$lib/geo';
44
//import BottleImage from "$lib/assets/bottle.png";
5-
import { base } from '$app/paths';
5+
import { resolve } from '$app/paths';
66
import ogpImage from '$lib/assets/ogp.jpg';
77
import type { PageData } from './$types';
88
import Map from '$lib/Map.svelte';
@@ -18,7 +18,7 @@
1818
<title>筑波大学 自販機 Map</title>
1919
<meta name="og:title" content="筑波大学 自販機 Map" />
2020
<meta name="og:type" content="website" />
21-
<meta name="og:url" content={base} />
21+
<meta name="og:url" content={resolve('/')} />
2222
<meta name="og:locale" content="ja-JP" />
2323
<meta name="og:images" content={ogpImage} />
2424
<meta name="og:description" content="筑波大学構内の自動販売機の場所を一覧できるサイト" />

‎src/routes/about/+page.svelte‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts">
2-
import { base } from '$app/paths';
2+
import { resolve } from '$app/paths';
33
import ogpImage from '$lib/assets/ogp.jpg';
44
</script>
55

@@ -44,7 +44,7 @@
4444
<title>筑波大学 自販機 Map</title>
4545
<meta name="og:title" content="about | 筑波大学 自販機 Map" />
4646
<meta name="og:type" content="website" />
47-
<meta name="og:url" content="{base}/" />
47+
<meta name="og:url" content={resolve('/about')} />
4848
<meta name="og:locale" content="ja_JP" />
4949
<meta name="og:images" content={ogpImage} />
5050
<meta name="og:description" content="筑波大学構内の自動販売機の場所を一覧できるサイト" />

‎src/routes/contribute/+page.svelte‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts">
2-
import { base } from '$app/paths';
2+
import { resolve } from '$app/paths';
33
import ogpImage from '$lib/assets/ogp.jpg';
44
</script>
55

@@ -96,7 +96,7 @@
9696
<title>筑波大学 自販機 Map</title>
9797
<meta name="og:title" content="contribute | 筑波大学 自販機 Map" />
9898
<meta name="og:type" content="website" />
99-
<meta name="og:url" content="{base}/" />
99+
<meta name="og:url" content={resolve('/contribute')} />
100100
<meta name="og:locale" content="ja_JP" />
101101
<meta name="og:images" content={ogpImage} />
102102
<meta name="og:description" content="筑波大学構内の自動販売機の場所を一覧できるサイト" />

0 commit comments

Comments
 (0)