Merge pull request #472 from twin-te/enable-format-typefix

formatがチェックされるようにする

.github/workflows/ci.yml

@@ -23,6 +23,11 @@ jobs:
         env:
           CI: true
 
+      - name: format
+        run: yarn format
+        env:
+          CI: true
+
       - name: lint
         run: yarn lint
         env:

.vscode/extensions.json

@@ -1,3 +1,7 @@
 {
-  "recommendations": ["dbaeumer.vscode-eslint", "johnsoncodehk.volar"]
+  "recommendations": [
+    "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode",
+    "johnsoncodehk.volar"
+  ]
 }

.vscode/settings.json

@@ -2,5 +2,6 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
   },
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
   "eslint.validate": ["typescript", "vue"]
 }

package.json

@@ -7,6 +7,8 @@
     "typecheck": "vue-tsc --noEmit",
     "build": "yarn typecheck && vite build",
     "build:staging": "vite build --mode staging",
+    "format": "prettier ./src --check",
+    "format:fix": "prettier ./src --write",
     "lint": "eslint --ext .ts,.tsx,.vue ./src",
     "lint:fix": "yarn lint --fix",
     "test": "jest",

src/components/PopupContent.vue

@@ -23,8 +23,8 @@ export default defineComponent({
     },
     gtmMarker: {
       type: String,
-      default: ""
-    }
+      default: "",
+    },
   },
   emits: ["click"],
 });

src/main.ts

@@ -3,7 +3,7 @@ import VueClickAway from "vue3-click-away";
 import { createHead } from "@vueuse/head";
 import * as Sentry from "@sentry/browser";
 import { Integrations } from "@sentry/tracing";
-import { createGtm } from "@gtm-support/vue-gtm"
+import { createGtm } from "@gtm-support/vue-gtm";
 
 import App from "./App.vue";
 import { router } from "./route";
@@ -29,12 +29,14 @@ app
   .use(store, StateKey)
   .use(VueClickAway)
   .use(head)
-  .use(createGtm({
-    id: "GTM-PHSLD8B",
-    vueRouter: router,
-    enabled: import.meta.env.PROD,
-    debug: import.meta.env.DEV,
-  }))
+  .use(
+    createGtm({
+      id: "GTM-PHSLD8B",
+      vueRouter: router,
+      enabled: import.meta.env.PROD,
+      debug: import.meta.env.DEV,
+    })
+  )
   .mount("#app");
 
 window.addEventListener("error", (event) => {

src/pages/add/search.vue

@@ -260,7 +260,7 @@ export default defineComponent({
           event: "search-courses",
           term: searchWord.value,
           use_only_blank: onlyBlank.value,
-          schedules: schedules.value
+          schedules: schedules.value,
         });
       }
       isAccordionOpen.value = false;

src/usecases/courseListToTable.ts

@@ -32,7 +32,7 @@ type OrdinarySchedule = CourseSchedule & {
   period: Period;
 };
 
-const isOrdinarySchedule = (schedule: CourseSchedule) => 
+const isOrdinarySchedule = (schedule: CourseSchedule) =>
   isBaseModule(schedule.module) &&
   isWeekDay(schedule.day) &&
   1 <= schedule.period &&
@@ -54,7 +54,9 @@ export const courseListToTable = (
       const schedules = course.schedules ?? course.course?.schedules ?? [];
       const room = [...new Set(schedules.map((s) => s.room))].join(",");
       schedules
-        .filter((schedule): schedule is OrdinarySchedule => isOrdinarySchedule(schedule))
+        .filter((schedule): schedule is OrdinarySchedule =>
+          isOrdinarySchedule(schedule)
+        )
         .forEach((schedule) =>
           table[schedule.module][weekdayNum(schedule.day as WeekDay)][
             schedule.period - 1