refactor: prepare for Nuxt v4

SegaraRai · Jul 16, 2024 · cdcb9ad · cdcb9ad
1 parent 2c83a71
commit cdcb9ad
Show file tree

Hide file tree

Showing 57 changed files with 1,847 additions and 2,050 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Luonto をホストしているサーバー (Cloudflare Pages) は静的アセ
 以下が必要です
 
 - [Node.js](https://nodejs.org/) v20
-- [pnpm](https://pnpm.io/) v8
+- [pnpm](https://pnpm.io/) v9
 
 [Bun](https://bun.sh/) が正式に Windows に対応したら pnpm から移行するかも
 

diff --git a/app.config.ts → app/app.config.ts b/app.config.ts → app/app.config.ts
diff --git a/app.vue → app/app.vue b/app.vue → app/app.vue
diff --git a/components/AppHeader.vue → app/components/AppHeader.vue b/components/AppHeader.vue → app/components/AppHeader.vue
diff --git a/components/ErrorContent.vue → app/components/ErrorContent.vue b/components/ErrorContent.vue → app/components/ErrorContent.vue
@@ -25,7 +25,7 @@
 
 <script setup lang="ts">
 import type { H3Error } from "h3";
-import type { RateLimit } from "~/server/utils/rateLimit";
+import type { RateLimit } from "~~/server/utils/rateLimit";
 
 const props = defineProps<{ error: H3Error; onHandleError: () => void }>();
 

diff --git a/components/NatureApplianceCardButton.vue → app/components/NatureApplianceCardButton.vue b/components/NatureApplianceCardButton.vue → app/components/NatureApplianceCardButton.vue
diff --git a/components/NatureApplianceCardContent.vue → ...components/NatureApplianceCardContent.vue b/components/NatureApplianceCardContent.vue → ...components/NatureApplianceCardContent.vue
diff --git a/components/NatureApplianceCardLink.vue → app/components/NatureApplianceCardLink.vue b/components/NatureApplianceCardLink.vue → app/components/NatureApplianceCardLink.vue
diff --git a/components/NatureApplianceControlAC.vue → app/components/NatureApplianceControlAC.vue b/components/NatureApplianceControlAC.vue → app/components/NatureApplianceControlAC.vue
diff --git a/components/NatureApplianceControlLight.vue → ...omponents/NatureApplianceControlLight.vue b/components/NatureApplianceControlLight.vue → ...omponents/NatureApplianceControlLight.vue
diff --git a/components/NatureApplianceDeviceInfo.vue → app/components/NatureApplianceDeviceInfo.vue b/components/NatureApplianceDeviceInfo.vue → app/components/NatureApplianceDeviceInfo.vue
diff --git a/components/NatureDeviceCard.vue → app/components/NatureDeviceCard.vue b/components/NatureDeviceCard.vue → app/components/NatureDeviceCard.vue
diff --git a/components/NatureDeviceSensorList.vue → app/components/NatureDeviceSensorList.vue b/components/NatureDeviceSensorList.vue → app/components/NatureDeviceSensorList.vue
diff --git a/components/OfflineStatusBar.vue → app/components/OfflineStatusBar.vue b/components/OfflineStatusBar.vue → app/components/OfflineStatusBar.vue
diff --git a/components/PageContentError.vue → app/components/PageContentError.vue b/components/PageContentError.vue → app/components/PageContentError.vue
diff --git a/components/PageContentLoading.vue → app/components/PageContentLoading.vue b/components/PageContentLoading.vue → app/components/PageContentLoading.vue
diff --git a/components/ThemeSelector.vue → app/components/ThemeSelector.vue b/components/ThemeSelector.vue → app/components/ThemeSelector.vue
diff --git a/error.vue → app/error.vue b/error.vue → app/error.vue
diff --git a/layouts/app.vue → app/layouts/app.vue b/layouts/app.vue → app/layouts/app.vue
diff --git a/pages/about.vue → app/pages/about.vue b/pages/about.vue → app/pages/about.vue
diff --git a/pages/appliances/[id].vue → app/pages/appliances/[id].vue b/pages/appliances/[id].vue → app/pages/appliances/[id].vue
diff --git a/pages/devices/[id].vue → app/pages/devices/[id].vue b/pages/devices/[id].vue → app/pages/devices/[id].vue
diff --git a/pages/index.vue → app/pages/index.vue b/pages/index.vue → app/pages/index.vue
diff --git a/pages/loading.vue → app/pages/loading.vue b/pages/loading.vue → app/pages/loading.vue
diff --git a/pages/signin.vue → app/pages/signin.vue b/pages/signin.vue → app/pages/signin.vue
diff --git a/utils/applianceDescription.ts → app/utils/applianceDescription.ts b/utils/applianceDescription.ts → app/utils/applianceDescription.ts
diff --git a/utils/constants.ts → app/utils/constants.ts b/utils/constants.ts → app/utils/constants.ts
diff --git a/utils/deviceSensorItem.ts → app/utils/deviceSensorItem.ts b/utils/deviceSensorItem.ts → app/utils/deviceSensorItem.ts
diff --git a/utils/formatTimeAgoLocalized.ts → app/utils/formatTimeAgoLocalized.ts b/utils/formatTimeAgoLocalized.ts → app/utils/formatTimeAgoLocalized.ts
diff --git a/utils/getNatureAppliancePowerControl.ts → app/utils/getNatureAppliancePowerControl.ts b/utils/getNatureAppliancePowerControl.ts → app/utils/getNatureAppliancePowerControl.ts
diff --git a/utils/head.ts → app/utils/head.ts b/utils/head.ts → app/utils/head.ts
diff --git a/utils/invalidateTarget.ts → app/utils/invalidateTarget.ts b/utils/invalidateTarget.ts → app/utils/invalidateTarget.ts
diff --git a/utils/natureConstantsAC.ts → app/utils/natureConstantsAC.ts b/utils/natureConstantsAC.ts → app/utils/natureConstantsAC.ts
diff --git a/utils/natureConstantsLight.ts → app/utils/natureConstantsLight.ts b/utils/natureConstantsLight.ts → app/utils/natureConstantsLight.ts
diff --git a/utils/natureDeviceIcons.ts → app/utils/natureDeviceIcons.ts b/utils/natureDeviceIcons.ts → app/utils/natureDeviceIcons.ts
diff --git a/utils/natureDeviceTypes.ts → app/utils/natureDeviceTypes.ts b/utils/natureDeviceTypes.ts → app/utils/natureDeviceTypes.ts
diff --git a/utils/natureIcons.ts → app/utils/natureIcons.ts b/utils/natureIcons.ts → app/utils/natureIcons.ts
diff --git a/utils/natureTypes.ts → app/utils/natureTypes.ts b/utils/natureTypes.ts → app/utils/natureTypes.ts
diff --git a/utils/temperature.ts → app/utils/temperature.ts b/utils/temperature.ts → app/utils/temperature.ts
diff --git a/utils/useFetchCacheControlHelper.ts → app/utils/useFetchCacheControlHelper.ts b/utils/useFetchCacheControlHelper.ts → app/utils/useFetchCacheControlHelper.ts
diff --git a/utils/useHandleSignalSendPromise.ts → app/utils/useHandleSignalSendPromise.ts b/utils/useHandleSignalSendPromise.ts → app/utils/useHandleSignalSendPromise.ts
@@ -1,4 +1,4 @@
-import type { RateLimit } from "~/server/utils/rateLimit";
+import type { RateLimit } from "~~/server/utils/rateLimit";
 
 export function useHandleSignalSendPromise(): (
   promise: Promise<unknown>

diff --git a/utils/useHoverAvailable.ts → app/utils/useHoverAvailable.ts b/utils/useHoverAvailable.ts → app/utils/useHoverAvailable.ts
diff --git a/utils/useNatureApplianceStatus.ts → app/utils/useNatureApplianceStatus.ts b/utils/useNatureApplianceStatus.ts → app/utils/useNatureApplianceStatus.ts
diff --git a/utils/useNatureDeviceDetails.ts → app/utils/useNatureDeviceDetails.ts b/utils/useNatureDeviceDetails.ts → app/utils/useNatureDeviceDetails.ts
diff --git a/utils/useNatureDeviceSensors.ts → app/utils/useNatureDeviceSensors.ts b/utils/useNatureDeviceSensors.ts → app/utils/useNatureDeviceSensors.ts
diff --git a/utils/useRefreshCaller.ts → app/utils/useRefreshCaller.ts b/utils/useRefreshCaller.ts → app/utils/useRefreshCaller.ts
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -43,6 +43,10 @@ const nitro =
 
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
+  compatibilityDate: "2024-07-16",
+  future: {
+    compatibilityVersion: 4,
+  },
   devtools: { enabled: true },
   modules: [
     "@nuxt/eslint",

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
   "devDependencies": {
     "@auth/core": "^0.34.1",
     "@hebilicious/authjs-nuxt": "^0.3.5",
-    "@iconify-json/material-symbols": "^1.1.82",
+    "@iconify-json/material-symbols": "^1.1.84",
     "@iconify-json/mdi": "^1.1.67",
     "@iconify-json/mingcute": "^1.1.18",
     "@iconify-json/ph": "^1.1.13",
@@ -31,31 +31,31 @@
     "@vue/test-utils": "^2.4.6",
     "@vueuse/nuxt": "^10.11.0",
     "defu": "^6.1.4",
-    "eslint": "^9.6.0",
+    "eslint": "^9.7.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-define-config": "^2.1.0",
     "fast-glob": "^3.3.2",
     "happy-dom": "^14.12.3",
     "idb-keyval": "^6.2.1",
-    "lru-cache": "^10.3.0",
+    "lru-cache": "^11.0.0",
     "mime-types": "^2.1.35",
-    "nuxt": "^3.12.2",
-    "prettier": "^3.3.2",
-    "prettier-plugin-organize-imports": "^3.2.4",
+    "nuxt": "^3.12.3",
+    "prettier": "^3.3.3",
+    "prettier-plugin-organize-imports": "^4.0.0",
     "serve": "^14.2.3",
     "svgo": "^3.3.2",
-    "taze": "^0.13.9",
-    "tsx": "^4.16.0",
-    "typescript": "^5.5.2",
-    "valibot": "^0.35.0",
-    "vitest": "^1.6.0",
+    "taze": "^0.15.2",
+    "tsx": "^4.16.2",
+    "typescript": "^5.5.3",
+    "valibot": "^0.36.0",
+    "vitest": "^2.0.3",
     "vue": "^3.4.31",
     "vue-router": "^4.4.0",
-    "vue-tsc": "^2.0.24",
+    "vue-tsc": "^2.0.26",
     "workbox-build": "^7.1.1",
     "workbox-precaching": "^7.1.0",
     "workbox-routing": "^7.1.0",
     "workbox-strategies": "^7.1.0",
-    "wrangler": "^3.62.0"
+    "wrangler": "^3.64.0"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/server/api/auth/[...].ts b/server/api/auth/[...].ts
@@ -1,11 +1,11 @@
 import { NuxtAuthHandler } from "#auth";
 import Credentials from "@auth/core/providers/credentials";
 import type { AuthConfig, User } from "@auth/core/types";
-import { clearAnonymizeDetailStorage } from "~/server/utils/anonymizeDetailCache";
-import { clearNatureAPICacheStorage } from "~/server/utils/natureAPICache";
-import { clearRateLimitCacheStorage } from "~/server/utils/rateLimitCache";
-import type { SessionUserData } from "~/server/utils/session";
-import { clearCookieStorage } from "~/server/utils/swCookieStorage";
+import { clearAnonymizeDetailStorage } from "~~/server/utils/anonymizeDetailCache";
+import { clearNatureAPICacheStorage } from "~~/server/utils/natureAPICache";
+import { clearRateLimitCacheStorage } from "~~/server/utils/rateLimitCache";
+import type { SessionUserData } from "~~/server/utils/session";
+import { clearCookieStorage } from "~~/server/utils/swCookieStorage";
 
 const runtimeConfig = useRuntimeConfig();
 

diff --git a/server/api/bff/appliances/[id].get.ts b/server/api/bff/appliances/[id].get.ts
@@ -1,4 +1,4 @@
-import { fetchNatureAPIs } from "~/server/utils/fetchNatureAPIs";
+import { fetchNatureAPIs } from "~~/server/utils/fetchNatureAPIs";
 
 export default defineSWEventHandler(async (event) => {
   const id = getRouterParam(event, "id");

diff --git a/server/api/bff/devices/[id].get.ts b/server/api/bff/devices/[id].get.ts
@@ -1,4 +1,4 @@
-import { fetchNatureAPIs } from "~/server/utils/fetchNatureAPIs";
+import { fetchNatureAPIs } from "~~/server/utils/fetchNatureAPIs";
 
 export default defineSWEventHandler(async (event) => {
   const id = getRouterParam(event, "id");

diff --git a/server/api/bff/home.get.ts b/server/api/bff/home.get.ts
@@ -1,4 +1,4 @@
-import { fetchNatureAPIs } from "~/server/utils/fetchNatureAPIs";
+import { fetchNatureAPIs } from "~~/server/utils/fetchNatureAPIs";
 
 export default defineSWEventHandler(async (event) => {
   const { appliances, devices, $cacheStatus } = await fetchNatureAPIs(event, [

diff --git a/server/api/nature/[...].ts b/server/api/nature/[...].ts
@@ -1,16 +1,16 @@
-import { collectAnonymizeDetailDataFromResponse } from "~/server/utils/anonymizeDetailCache";
+import { collectAnonymizeDetailDataFromResponse } from "~~/server/utils/anonymizeDetailCache";
 import {
   CACHE_SWR_MAX_AGE_RESPONSE_CACHE_ERROR,
   CACHE_SWR_MAX_AGE_RESPONSE_CACHE_SUCCESSFUL,
-} from "~/server/utils/constants";
+} from "~~/server/utils/constants";
 import {
   createNatureAPIRequestHeaderInit,
   natureAPICache,
   persistNatureAPICache,
   restoreNatureAPICacheOnce,
-} from "~/server/utils/natureAPICache";
-import { createRateLimitFromHeaders } from "~/server/utils/rateLimit";
-import { setRateLimitCache } from "~/server/utils/rateLimitCache";
+} from "~~/server/utils/natureAPICache";
+import { createRateLimitFromHeaders } from "~~/server/utils/rateLimit";
+import { setRateLimitCache } from "~~/server/utils/rateLimitCache";
 
 export default defineSWEventHandler(async (event): Promise<Response> => {
   const user = await getAuthSessionUserData(event);

diff --git a/server/api/session.get.ts b/server/api/session.get.ts
@@ -1,4 +1,4 @@
-import { getRateLimitCache } from "~/server/utils/rateLimitCache";
+import { getRateLimitCache } from "~~/server/utils/rateLimitCache";
 
 export default defineSWEventHandler(async (event) => {
   const user = await getAuthSessionUserData(event);

diff --git a/server/utils/natureAPICache.ts b/server/utils/natureAPICache.ts
@@ -1,18 +1,18 @@
 import { LRUCache } from "lru-cache";
-import { collectAnonymizeDetailDataFromResponse } from "~/server/utils/anonymizeDetailCache";
+import { collectAnonymizeDetailDataFromResponse } from "~~/server/utils/anonymizeDetailCache";
 import {
   CACHE_MAX_RESPONSE_CACHE,
   CACHE_TTL_RESPONSE_CACHE,
   STORAGE_KEY_NATURE_API_CACHE,
-} from "~/server/utils/constants";
-import { createOnce } from "~/server/utils/once";
-import { createRateLimitFromHeaders } from "~/server/utils/rateLimit";
-import { setRateLimitCache } from "~/server/utils/rateLimitCache";
-import { createSerial } from "~/server/utils/serial";
+} from "~~/server/utils/constants";
+import { createOnce } from "~~/server/utils/once";
+import { createRateLimitFromHeaders } from "~~/server/utils/rateLimit";
+import { setRateLimitCache } from "~~/server/utils/rateLimitCache";
+import { createSerial } from "~~/server/utils/serial";
 import {
   loadServerStorage,
   storeServerStorage,
-} from "~/server/utils/serverStorage";
+} from "~~/server/utils/serverStorage";
 
 export function createNatureAPIRequestHeaderInit(token: string): HeadersInit {
   return {

diff --git a/server/utils/session.ts b/server/utils/session.ts
@@ -1,7 +1,7 @@
 import { getServerSession } from "#auth";
 import type { Session } from "@auth/core/types";
 import type { H3Event } from "h3";
-import { authOptions } from "~/server/api/auth/[...]";
+import { authOptions } from "~~/server/api/auth/[...]";
 
 export interface SessionUserData {
   readonly id: string;