fix: worker tweaks, use correct workspace name

Battlesquid · Dec 10, 2024 · cd3add3 · cd3add3
1 parent 6e6c69e
commit cd3add3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/worker-deploy.yml b/.github/workflows/worker-deploy.yml
@@ -21,3 +21,4 @@ jobs:
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           packageManager: yarn
+          workingDirectory: ./packages/worker
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
@@ -3,7 +3,7 @@
  * https://github.com/gr2m/cloudflare-worker-github-oauth-login
  */
 
-import { ExportedHandler, Response } from "@cloudflare/workers-types"
+import { type ExportedHandler } from "@cloudflare/workers-types"
 
 interface Env {
     CLIENT_ID: string;
@@ -50,7 +50,7 @@ export default {
                     }),
                 }
             );
-            const result = await response.json();
+            const result = await response.json<{ error: string, access_token: string }>();
             const headers = {
                 "Access-Control-Allow-Origin": "*",
             };
@@ -63,7 +63,7 @@ export default {
                 status: 201,
                 headers,
             });
-        } catch (error) {
+        } catch (error: any) {
             console.error(error);
             return new Response(error.message, {
                 status: 500,

diff --git a/packages/worker/tsconfig.json b/packages/worker/tsconfig.json
@@ -18,9 +18,5 @@
     "moduleDetection": "force",
     "isolatedModules": true
   },
-  "exclude": [
-    "node_modules",
-    "dist",
-    "test"
-  ]
+  "include": ["src/**/*.ts"]
 }
diff --git a/packages/worker/wrangler.toml b/packages/worker/wrangler.toml
@@ -1,7 +1,5 @@
 name = "github-oauth-login"
-type = "javascript"
 account_id = "43a4f22039b08a57004057adc36bf4d0"
 compatibility_date = "2024-12-10"
 workers_dev = true
-main = "src/index.ts"
-node_compat = true
+main = "src/index.ts"