From 24a80cdcbcda85f1e3370cef52d1abd8088b6175 Mon Sep 17 00:00:00 2001 From: arx-ein Date: Fri, 17 Apr 2026 18:08:35 +0900 Subject: [PATCH 1/2] Remove baseUrl from tsconfig (deprecated) --- tsconfig.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 36d3b666f9..152ed4e8b6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,13 +1,12 @@ { "extends": "astro/tsconfigs/strict", "compilerOptions": { - "baseUrl": ".", "jsx": "preserve", "paths": { - "@components/*": ["src/components/*"], - "@data/*": ["src/data/*"], - "@layouts/*": ["src/layouts/*"], - "@styles/*": ["src/styles/*"] + "@components/*": ["./src/components/*"], + "@data/*": ["./src/data/*"], + "@layouts/*": ["./src/layouts/*"], + "@styles/*": ["./src/styles/*"] } }, "mdx": { From b9f9c2e5131f152d5d13b8d86f510e9eae252c84 Mon Sep 17 00:00:00 2001 From: arx-ein Date: Fri, 15 May 2026 17:14:45 +0900 Subject: [PATCH 2/2] Fix import paths for individual cases --- src/components/pages/Events.astro | 2 +- src/components/pages/NewsLetter.astro | 2 +- src/components/pages/Notice.astro | 2 +- src/content.config.ts | 2 +- src/styles/layout.scss | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/pages/Events.astro b/src/components/pages/Events.astro index 1c44e77d07..1885d4001c 100644 --- a/src/components/pages/Events.astro +++ b/src/components/pages/Events.astro @@ -2,7 +2,7 @@ import { getCollection } from "astro:content"; import If from "@components/utils/If.astro"; import type { Lang } from "@components/types"; -import { getLocaleDateString } from "src/util"; +import { getLocaleDateString } from "../../util"; interface EventInformation { key: string; diff --git a/src/components/pages/NewsLetter.astro b/src/components/pages/NewsLetter.astro index 8914b83277..144d972568 100644 --- a/src/components/pages/NewsLetter.astro +++ b/src/components/pages/NewsLetter.astro @@ -1,7 +1,7 @@ --- import type { MarkdownInstance } from "astro"; import type { Lang } from "@components/types"; -import { getISODateString } from "src/util"; +import { getISODateString } from "../../util"; interface Frontmatter { title: string; diff --git a/src/components/pages/Notice.astro b/src/components/pages/Notice.astro index 8b32604149..28ffd2d0c3 100644 --- a/src/components/pages/Notice.astro +++ b/src/components/pages/Notice.astro @@ -2,7 +2,7 @@ import { getEntry } from "astro:content"; import Markdown from "@components/utils/Markdown.astro"; import type { Lang } from "@components/types"; -import { getISODateString, getLocaleDateString } from "src/util"; +import { getISODateString, getLocaleDateString } from "../../util"; /** * `Markdown`の利用例として紹介されています. diff --git a/src/content.config.ts b/src/content.config.ts index 5f836c7d81..64b170053e 100644 --- a/src/content.config.ts +++ b/src/content.config.ts @@ -3,7 +3,7 @@ import { defineCollection } from "astro:content"; import { z } from "astro/zod"; import { glob } from "astro/loaders"; import { FORMATS, NUMBERS, TOOLS, KEYWORDS } from "@components/pages/GoodPractice"; -import { getISODateString } from "src/util"; +import { getISODateString } from "./util"; const emergencies = defineCollection({ loader: glob({ pattern: "*.{md,mdx}", base: "./src/emergencies" }), diff --git a/src/styles/layout.scss b/src/styles/layout.scss index 8331ced0d1..05f6b19966 100644 --- a/src/styles/layout.scss +++ b/src/styles/layout.scss @@ -1,4 +1,4 @@ -@use "node_modules/normalize.css/normalize"; +@use "../../node_modules/normalize.css/normalize"; @use "sass:meta"; * {