Merge pull request tone-row#564 from tone-row/dev

v1.38.0

.github/workflows/e2e.yml

@@ -31,8 +31,8 @@ jobs:
           touch app/.env
           echo RAPID_API_KEY=${{ secrets.RAPID_API_KEY }} >> app/.env
           echo STRIPE_KEY_TEST_ENV=${{ secrets.STRIPE_KEY_TEST_ENV }} >> app/.env
-          echo SUPABASE_TEST_URL=${{ secrets.SUPABASE_TEST_URL }} >> app/.env
-          echo SUPABASE_TEST_ANON_KEY=${{ secrets.SUPABASE_TEST_ANON_KEY }} >> app/.env
+          echo TESTING_EMAIL=${{ secrets.TESTING_EMAIL }} >> app/.env
+          echo TESTING_PASS=${{ secrets.TESTING_PASS }} >> app/.env
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
@@ -42,7 +42,7 @@ jobs:
           version: 8
       - name: Install Playwright
         run: |
-          pnpm add -g playwright@1.29.0
+          pnpm add -g playwright@1.36.2
           playwright install
       - name: Install Deps
         run: pnpm install

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-pnpm lint-staged
+pnpm lint-staged && pnpm -F app typecheck

api/customer-info.ts

@@ -16,15 +16,15 @@ export default async function customerInfo(
       status: "all",
     });
 
-    const subscription = subscriptions.length ? subscriptions[0] : undefined;
-    const priceId = subscription?.items.data[0].plan.id;
-
-    if (!subscription || !priceId) throw new Error("No Subscription Found");
+    // find the first valid subscription
+    const validSubscriptions = subscriptions.filter((subscription) => {
+      const priceId = subscription.items.data[0].plan.id;
+      return validStripePrices.includes(priceId);
+    });
 
-    // make sure priceId is valid
-    if (!validStripePrices.includes(priceId)) {
-      throw new Error("Invalid Subscription");
-    }
+    const subscription = validSubscriptions.length
+      ? validSubscriptions[0]
+      : undefined;
 
     res.json({ customerId: customer.id, subscription });
   } catch (error) {

api/get-signup-client-secret.ts

@@ -36,8 +36,10 @@ export default async function handler(req: VercelRequest, res: VercelResponse) {
 
     // If they already have a subscription in validStripePrices, return error
     if (
-      subscriptions.some((sub) =>
-        validStripePrices.includes(sub.items.data[0].price.id)
+      subscriptions.some(
+        (sub) =>
+          validStripePrices.includes(sub.items.data[0].price.id) &&
+          sub.status !== "incomplete"
       )
     ) {
       return res.status(402).json({

api/package.json

@@ -36,6 +36,6 @@
     "@vercel/node": "^2.8.15",
     "eslint": "^8.3.0",
     "jest": "^29.4.3",
-    "typescript": "^4.8.4"
+    "typescript": "^5.1.6"
   }
 }

app/.eslintrc.cjs

@@ -0,0 +1,26 @@
+module.exports = {
+  root: true,
+  env: { browser: true, es2020: true },
+  extends: [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:react-hooks/recommended",
+    "plugin:jsx-a11y/strict",
+  ],
+  ignorePatterns: ["dist", ".eslintrc.cjs"],
+  parser: "@typescript-eslint/parser",
+  plugins: ["jsx-a11y", "simple-import-sort", "react-refresh"],
+  rules: {
+    "@typescript-eslint/no-unused-vars": [
+      "warn",
+      {
+        argsIgnorePattern: "^_",
+        varsIgnorePattern: "^_",
+      },
+    ],
+    "@typescript-eslint/no-explicit-any": "off",
+    "@typescript-eslint/ban-ts-comment": "off",
+    "no-debugger": "warn",
+    "prefer-const": "off",
+  },
+};