fix: build 的時候沒有 accept-language，需拿掉

sexyoung · Aug 7, 2023 · 5707bcf · 5707bcf
1 parent bcdf3d9
commit 5707bcf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -113,8 +113,7 @@ jobs:
   deploy:
     name: 🚀 Deploy
     runs-on: ubuntu-latest
-    needs: [lint, typecheck, vitest]
-    # needs: [lint, typecheck, vitest, cypress]
+    needs: [lint, typecheck, vitest, cypress]
     # only build/deploy main branch on pushes
     if: ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push' }}
 

diff --git a/app/root.tsx b/app/root.tsx
@@ -50,15 +50,19 @@ export const loader = async ({ request, params }: LoaderArgs) => {
       }
     : {};
 
-  // 如果 params.lang 為空，判斷語系是否為英文，否則轉頁
-  if (!params.lang && !cookie?.keepLang) {
-    const browserLang =
-      request.headers
-        .get("accept-language")
-        ?.split(",")
-        .map((l) => l.split(";").shift())
-        .shift() || "";
+  const browserLang =
+    request.headers
+      .get("accept-language")
+      ?.split(",")
+      .map((l) => l.split(";").shift())
+      .shift() || "";
 
+  // 如果 params.lang 為空，判斷語系是否為英文，否則轉頁
+  if (
+    !params.lang &&
+    !cookie?.keepLang &&
+    request.headers.get("accept-language")
+  ) {
     if (!["en-US", "en"].includes(browserLang)) {
       return redirect(`/${browserLang}`, init);
     }