Merge branch 'dev' of https://github.com/sparcs-kaist/taxi-front into #…

…685-add-storybook-to-taxi-front
sparcs-kaist · Nov 14, 2023 · fa10032 · fa10032
2 parents 3575049 + a955134
commit fa10032
Show file tree

Hide file tree

Showing 166 changed files with 9,234 additions and 4,710 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -21,29 +21,20 @@
     "ecmaVersion": 12,
     "sourceType": "module"
   },
-  "plugins": [
-    "react",
-    "cypress"
-  ],
+  "plugins": ["react", "cypress"],
   "rules": {
     "no-unused-vars": 1,
     "react/react-in-jsx-scope": "off",
     "react/no-unknown-property": [
       "error",
       {
-        "ignore": [
-          "css"
-        ]
+        "ignore": ["css"]
       }
     ]
   },
   "overrides": [
     {
-      "files": [
-        "*.ts",
-        "*.tsx",
-        "public/firebase-messaging-sw.js"
-      ],
+      "files": ["*.ts", "*.tsx", "public/firebase-messaging-sw.js"],
       "rules": {
         "no-undef": "off",
         "no-unused-vars": "off"

diff --git a/.prettierrc.json b/.prettierrc.json
@@ -15,13 +15,13 @@
   "plugins": ["@trivago/prettier-plugin-sort-imports"],
   "importOrder": [
     "<THIRD_PARTY_MODULES>",
-    "^types/",
-    "^hooks/",
-    "^components/|^pages/",
+    "^@/types/",
+    "^@/hooks/",
+    "^@/components/|^@/pages/",
     "^[./]",
-    "^atoms/|^recoil$",
-    "^tools/",
-    "^static/|^@mui|^@material-ui"
+    "^@/atoms/|^recoil$",
+    "^@/tools/",
+    "^@/static/|^@mui|^@material-ui"
   ],
   "importOrderSeparation": true,
   "importOrderSortSpecifiers": true,

diff --git a/index.html b/index.html
@@ -84,9 +84,8 @@
         false
       );
     </script>
-    <script type="module" src="/src/index.tsx">
-
-    </script>
+    <script src="/env.js"></script>
+    <script type="module" src="/src/index.tsx"></script>
   </head>
   <body>
     <div id="root"></div>

diff --git a/package.json b/package.json
@@ -58,13 +58,13 @@
     ]
   },
   "devDependencies": {
-    "@storybook/addon-essentials": "^7.5.1",
-    "@storybook/addon-interactions": "^7.5.1",
-    "@storybook/addon-links": "^7.5.1",
+    "@storybook/addon-essentials": "^7.5.2",
+    "@storybook/addon-interactions": "^7.5.2",
+    "@storybook/addon-links": "^7.5.2",
     "@storybook/addon-onboarding": "^1.0.8",
-    "@storybook/blocks": "^7.5.1",
-    "@storybook/react": "^7.5.1",
-    "@storybook/react-vite": "^7.5.1",
+    "@storybook/blocks": "^7.5.2",
+    "@storybook/react": "^7.5.2",
+    "@storybook/react-vite": "^7.5.2",
     "@storybook/testing-library": "^0.2.2",
     "@trivago/prettier-plugin-sort-imports": "^4.1.1",
     "@types/eslint": "^8.44.0",
@@ -76,7 +76,7 @@
     "@types/react-router-dom": "^5.3.3",
     "@typescript-eslint/eslint-plugin": "^5.37.0",
     "@typescript-eslint/parser": "^5.37.0",
-    "@vitejs/plugin-react": "^4.1.0",
+    "@vitejs/plugin-react-swc": "^3.4.1",
     "cypress": "^10.3.1",
     "cypress-react-selector": "^3.0.0",
     "eslint": "^7.32.0",
@@ -88,7 +88,7 @@
     "eslint-plugin-react": "^7.26.1",
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-storybook": "^0.6.15",
-    "storybook": "^7.5.1",
+    "storybook": "^7.5.2",
     "typescript": "^5.1.6",
     "vite": "^4.5.0",
     "vite-plugin-svgr": "^3.2.0"