Merge pull request #2 from SoraY677/feature/fix-2025-08

SoraY677 · web-flow · commit 7e331b0a3b9e · 2025-08-31T21:59:16.000+09:00
Feature/fix 2025 08
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
           node-version: v22.17.0	
 
       - name: Init
-        run: yarn install && yarn setup
+        run: yarn install
 
       - name: Lint
         run: yarn lint
diff --git a/.husky/pre-push b/.husky/pre-push
@@ -0,0 +1 @@
+docker compose exec -T root yarn lint:fix && yarn build && yarn test && yarn test-local
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:alpine
+FROM node:24-alpine
 
 COPY . /app
 WORKDIR /app
diff --git a/README.md b/README.md
@@ -36,10 +36,14 @@ docker compose down           # 停止
 docker compose exec root sh
 ```
 
-#### セットアップ
+#### ローカルセットアップ
 
 ```sh
-docker compose exec root yarn setup
+# インストール
+yarn install
+
+# セットアップ
+yarn setup-local
 ```
 
 #### ビルド
diff --git a/client/src/components/00-commons/CImage.vue b/client/src/components/00-commons/CImage.vue
@@ -5,9 +5,9 @@
 </template>
 
 <script setup lang="ts">
-import type { ImageType } from '@/types/element/ImageType';
+import type { ImageType } from '@type/element/ImageType'
 
-  const props = defineProps<ImageType>()
+const props = defineProps<ImageType>()
 </script>
 
 <style scoped>
diff --git a/client/src/components/01-atoms/image/Icon.vue b/client/src/components/01-atoms/image/Icon.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <CImage 
+    <CImage
       :src="props.src"
       :width="props.width"
       :height="props.height"
@@ -10,8 +10,8 @@
 </template>
 
 <script setup lang="ts">
-import type { ImageType } from '@/types/element/ImageType';
-import CImage from '@components/00-commons/CImage.vue';
+import CImage from '@components/00-commons/CImage.vue'
+import type { ImageType } from '@type/element/ImageType'
 
 const props = defineProps<ImageType>()
 
diff --git a/client/src/components/02-molecules/AppIcon.vue b/client/src/components/02-molecules/AppIcon.vue
@@ -1,5 +1,5 @@
 <template>
-  <Icon 
+  <Icon
     :width="128"
     :height="128"
     :src="iconImage"
@@ -8,7 +8,8 @@
 
 <script setup lang="ts">
 import iconImage from '@assets/images/app-icon-white.svg'
-import Icon from '@components/01-atoms/image/Icon.vue';
+
+import Icon from '@components/01-atoms/image/Icon.vue'
 </script>
 
 <style scoped lang="scss">
diff --git a/client/src/components/03-orgnisms/AppSample.vue b/client/src/components/03-orgnisms/AppSample.vue
@@ -10,8 +10,8 @@
 </template>
 
 <script setup lang="ts">
-import { useCounterStore } from '@/composables/state/CounterState';
-import AppIcon from '../02-molecules/AppIcon.vue';
+import AppIcon from '@components/02-molecules/AppIcon.vue'
+import { useCounterStore } from '@composables/state/CounterState'
 
 const counterState = useCounterStore()
 
diff --git a/client/src/components/04-templates/CommonTemplate.vue b/client/src/components/04-templates/CommonTemplate.vue
@@ -25,4 +25,3 @@ main {
   width: 100%;
 }
 </style>
-
diff --git a/client/src/components/05-pages/IndexPage.vue b/client/src/components/05-pages/IndexPage.vue
@@ -9,8 +9,8 @@
 </template>
 
 <script setup lang="ts">
-import CommonTemplate from '@components/04-templates/CommonTemplate.vue';
-import AppSample from '@components/03-orgnisms/AppSample.vue';
+import AppSample from '@components/03-orgnisms/AppSample.vue'
+import CommonTemplate from '@components/04-templates/CommonTemplate.vue'
 
 </script>
 
diff --git a/client/src/components/App.vue b/client/src/components/App.vue
@@ -5,16 +5,17 @@
 </template>
 
 <script setup lang="ts">
-import { useMeta } from '@/composables/head/Meta';
-import { useRoute } from '@/composables/router';
-import { clientEnvConfig } from '@/configs/ClientEnvConfig';
-import { MetaConfigs } from '@/configs/routes-config/MetaConfigs';
-import type { UrlPathConfigs } from '@/configs/routes-config/UrlPathConfigs';
+import { clientEnvConfig } from '@configs/ClientEnvConfig'
+import { MetaConfigs } from '@configs/routes-config/MetaConfigs'
+import type { UrlPathConfigs } from '@configs/routes-config/UrlPathConfigs'
+
+import { useMeta } from '@composables/head/Meta'
+import { useRoute } from '@composables/router'
 
 const route = useRoute()
 useMeta(clientEnvConfig.domain).setMeta(
   MetaConfigs[route.getCurrentPath() as UrlPathConfigs],
-  route.getCurrentPath()
+  route.getCurrentPath(),
 )
 </script>
 
diff --git a/client/src/composables/head/Meta.ts b/client/src/composables/head/Meta.ts
@@ -1,6 +1,7 @@
-import type { MetaType } from '@/types/route-types/MetaType'
 import { useHead } from '@unhead/vue'
 
+import type { MetaType } from '@type/route-types/MetaType'
+
 export const useMeta = (root: string) => ({
   setMeta: (meta: MetaType, path: string) => {
     useHead({
diff --git a/client/src/composables/router/RouteComponents.ts b/client/src/composables/router/RouteComponents.ts
@@ -1,9 +1,9 @@
+import { UrlPathConfigs } from '@configs/routes-config/UrlPathConfigs'
+
+import IndexPage from '@components/05-pages/IndexPage.vue'
 
-import { UrlPathConfigs } from '@/configs/routes-config/UrlPathConfigs'
 import type { Component } from 'vue'
-import IndexPage from '@/components/05-pages/IndexPage.vue'
 
 export const RouteComponentRecord: Record<UrlPathConfigs, Component> = {
   [UrlPathConfigs.INDEX]: IndexPage,
 }
-
diff --git a/client/src/composables/router/index.ts b/client/src/composables/router/index.ts
@@ -1,17 +1,19 @@
-import { UrlPathConfigs } from '@/configs/routes-config/UrlPathConfigs'
-import type { RouteRecordRaw } from 'vue-router'
 import { createRouter, createWebHistory } from 'vue-router'
-import { MetaConfigs } from '@/configs/routes-config/MetaConfigs'
-import { RouteComponentRecord } from '@composables/router/RouteComponents'
 import { useRoute as _useRoute } from 'vue-router'
 
+import { MetaConfigs } from '@configs/routes-config/MetaConfigs'
+import { UrlPathConfigs } from '@configs/routes-config/UrlPathConfigs'
+
+import { RouteComponentRecord } from '@composables/router/RouteComponents'
+
+import type { RouteRecordRaw } from 'vue-router'
+
 const generateRouteRecordRaw = (path: UrlPathConfigs): RouteRecordRaw => ({
   path: path,
   name: MetaConfigs[path].pageName,
   component: RouteComponentRecord[path],
 })
-const routeRecordRaws: RouteRecordRaw[] = Object.values(UrlPathConfigs).map((key) => generateRouteRecordRaw(key))
-
+const routeRecordRaws: RouteRecordRaw[] = Object.values(UrlPathConfigs).map(key => generateRouteRecordRaw(key))
 
 export const router = createRouter({
   history: createWebHistory(),
diff --git a/client/src/composables/state/CounterState.ts b/client/src/composables/state/CounterState.ts
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
 
 interface CounterState {
-  count: number;
+  count: number
 }
 
 export const useCounterStore = defineStore('counter', {
diff --git a/client/src/configs/routes-config/MetaConfigs.ts b/client/src/configs/routes-config/MetaConfigs.ts
@@ -1,5 +1,6 @@
-import { UrlPathConfigs } from '@/configs/routes-config/UrlPathConfigs'
-import type { MetaType } from '@/types/route-types/MetaType'
+import { UrlPathConfigs } from '@configs/routes-config/UrlPathConfigs'
+
+import type { MetaType } from '@type/route-types/MetaType'
 
 export const MetaConfigs: Record<UrlPathConfigs, MetaType> = {
   [UrlPathConfigs.INDEX]: {
diff --git a/client/src/configs/routes-config/UrlPathConfigs.ts b/client/src/configs/routes-config/UrlPathConfigs.ts
@@ -1,5 +1,4 @@
 export const UrlPathConfigs = {
   INDEX: '/',
 } as const
-export type UrlPathConfigs = (typeof UrlPathConfigs)[keyof typeof UrlPathConfigs];
-
+export type UrlPathConfigs = (typeof UrlPathConfigs)[keyof typeof UrlPathConfigs]
diff --git a/client/src/main.ts b/client/src/main.ts
@@ -1,10 +1,13 @@
-import { createApp } from 'vue'
 import '@assets/styles/index.scss'
-import App from '@components/App.vue'
-import { router } from '@composables/router'
-import { createPinia } from 'pinia'
+
 import { createHead } from '@unhead/vue/client'
+import { createPinia } from 'pinia'
+import { createApp } from 'vue'
 import { createVuetify } from 'vuetify'
+
+import App from '@components/App.vue'
+import { router } from '@composables/router'
+
 import '@mdi/font/css/materialdesignicons.css'
 import 'vuetify/styles/main.css'
 
diff --git a/client/src/tests/usecases/util/LoggerUtilUsecase.test.ts b/client/src/tests/usecases/util/LoggerUtilUsecase.test.ts
@@ -1,6 +1,7 @@
-import { logError, logInfo, logWarn } from '@/usecases/util/LoggerUtilUsecase'
 import { describe, it, expect, vi } from 'vitest'
 
+import { logError, logInfo, logWarn } from '@usecases/util/LoggerUtilUsecase'
+
 describe('LoggerUtilUsecase', () => {
   it('logInfo', () => {
     const logSpy = vi.spyOn(console, 'info')
diff --git a/client/src/types/element/ImageType.ts b/client/src/types/element/ImageType.ts
@@ -1,6 +1,6 @@
-export type ImageType  = {
-  src: string,
-  width: number,
-  height: number,
+export type ImageType = {
+  src: string
+  width: number
+  height: number
   alt: string
 }
diff --git a/client/src/usecases/util/LoggerUtilUsecase.ts b/client/src/usecases/util/LoggerUtilUsecase.ts
@@ -1,4 +1,3 @@
-
-export const logInfo = (objs: any) => console.info(`[INFO] ${objs}`)
-export const logWarn = (objs: any) => console.warn(`[WARN] ${objs}`)
-export const logError = (objs: any) => console.error(`[ERROR] ${objs}`)
+export const logInfo = (objs: unknown) => console.info(`[INFO] ${objs}`)
+export const logWarn = (objs: unknown) => console.warn(`[WARN] ${objs}`)
+export const logError = (objs: unknown) => console.error(`[ERROR] ${objs}`)
diff --git a/client/tsconfig.json b/client/tsconfig.json
@@ -18,7 +18,7 @@
       "@composables/*": ["./src/composables/*"],
       "@configs/*": ["./src/configs/*"],
       "@tests/*": ["./src/tests/*"],
-      "@types/*": ["./src/types/*"],
+      "@type/*": ["./src/types/*"],
       "@usecases/*": ["./src/usecases/*"],
     },
     "baseUrl": ".",
diff --git a/client/vite.config.ts b/client/vite.config.ts
@@ -9,7 +9,12 @@ process.env.VITE_DOMAIN = domain ? `https://${domain}` : 'http://localhost'
 
 // https://vite.dev/config/
 export default defineConfig({
-  plugins: [vue(), vuetify({ autoImport: true })],
+  plugins: [
+    // @ts-ignore
+    vue(),
+    // @ts-ignore
+    vuetify({ autoImport: true })
+  ],
   server: {
     host: true,
     port: Number(process.env.CLIENT_PORT ?? 80),
@@ -27,7 +32,7 @@ export default defineConfig({
       '@composables': path.resolve(__dirname, './src/composables'),
       '@configs': path.resolve(__dirname, './src/configs'),
       '@tests': path.resolve(__dirname, './src/tests'),
-      '@types': path.resolve(__dirname, './src/types'),
+      '@type': path.resolve(__dirname, './src/types'),
       '@usecases': path.resolve(__dirname, './src/usecases'),
     },
   },
diff --git a/client/vitest.config.ts b/client/vitest.config.ts
@@ -1,8 +1,9 @@
 import { defineConfig } from 'vitest/config'
+
 import viteConfig from './vite.config'
 
 export default defineConfig({
   test: {
-    alias: { ...( viteConfig.resolve?.alias ?? {})},
+    alias: { ...(viteConfig.resolve?.alias ?? {}) },
   },
 })
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,6 +6,9 @@ services:
       volumes:
         - ./:/app
         - /app/node_modules
+        - /app/client/node_modules
+        - /app/server/node_modules
+        - /app/infra/node_modules
       ports:
         - "${CLIENT_PORT}:${CLIENT_PORT}"
         - "${SERVER_PORT}:${SERVER_PORT}"
diff --git a/eslint.config.mjs b/eslint.config.mjs
diff --git a/infra/bin/main.ts b/infra/bin/main.ts
diff --git a/infra/lib/CertificationStack.ts b/infra/lib/CertificationStack.ts
diff --git a/infra/lib/MainStack.ts b/infra/lib/MainStack.ts
diff --git a/infra/resources/cloudfront/SpaIndexFunction.ts b/infra/resources/cloudfront/SpaIndexFunction.ts
diff --git a/infra/test/MainStack.test.ts b/infra/test/MainStack.test.ts
diff --git a/infra/tsconfig.json b/infra/tsconfig.json
diff --git a/package.json b/package.json
diff --git a/server/package.json b/server/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+docker compose exec -T root yarn lint:fix && yarn build && yarn test && yarn test-local`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:alpine`
	`1`	`+FROM node:24-alpine`
`2`	`2`
`3`	`3`	`COPY . /app`
`4`	`4`	`WORKDIR /app`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,3 @@ main {`
`25`	`25`	`width: 100%;`
`26`	`26`	`}`
`27`	`27`	`</style>`
`28`		`-`