From 760f9f3f07f1b39e8fb763d2580693cef6e6355a Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Mon, 21 Nov 2022 22:03:43 +0100
Subject: [PATCH] Migrate to wrangler v2

---
 .github/workflows/deploy-master-to-prod.yml |  4 +---
 README.md                                   |  6 +-----
 src/index.ts                                |  2 +-
 tsconfig.json                               |  4 ++--
 wrangler.toml                               | 22 ++-------------------
 5 files changed, 7 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/deploy-master-to-prod.yml b/.github/workflows/deploy-master-to-prod.yml
index 45a3a10..465ae9c 100644
--- a/.github/workflows/deploy-master-to-prod.yml
+++ b/.github/workflows/deploy-master-to-prod.yml
@@ -10,9 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: wrangler publish
-        uses: cloudflare/wrangler-action@1.3.0
+        uses: cloudflare/wrangler-action@2.0.0
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           environment: omaps
-
-# TODO: Add organicmaps deploy.
\ No newline at end of file
diff --git a/README.md b/README.md
index 3eb41ad..511f565 100644
--- a/README.md
+++ b/README.md
@@ -30,11 +30,7 @@ npm i
 
 ## Development
 
-Use `npx wrangler dev` for localhost development.
-
-## Preview on workers.dev
-
-Use `npx wrangler preview` to open and test deployed worker in browser.
+Use `npx wrangler dev` for development using Cloudflare, or `npx wrangler dev --local` for localhost development.
 
 ## Deployment
 
diff --git a/src/index.ts b/src/index.ts
index 795f3b5..f0dfa46 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -44,7 +44,7 @@ const OMAPS_REWRITE_RULES: Record<string, string> = {
 addEventListener('fetch', (event) => {
   try {
     event.respondWith(handleFetchEvent(event));
-  } catch (e) {
+  } catch (e: any) {
     if (DEBUG) {
       event.respondWith(new Response(e.message || e.toString(), { status: 500 }));
     } else {
diff --git a/tsconfig.json b/tsconfig.json
index d4114b3..07056a3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,12 +6,12 @@
     "moduleResolution": "node",
     "target": "ESNext",
     "lib": [
-      "ESNext",
-      "webworker"
+      "ESNext"
     ],
     "alwaysStrict": true,
     "strict": true,
     "preserveConstEnums": true,
+    "skipLibCheck": true,
     "sourceMap": true,
     "esModuleInterop": true,
     "types": [
diff --git a/wrangler.toml b/wrangler.toml
index 9ebe4e0..dbd432e 100644
--- a/wrangler.toml
+++ b/wrangler.toml
@@ -1,44 +1,26 @@
 # Default worker is for dev only.
 # See omaps and organicmaps environments below for production.
 name = 'url-processor'
-type = 'javascript'
 # Organic Maps CF Account ID.
 account_id = '462f578f0939f041e2c24ec99adce458'
 workers_dev = true
-compatibility_date = "2022-10-06"
+compatibility_date = '2022-11-21'
+main = './workers-site/index.js'
 
 [site]
 bucket = './public'
-entry-point = './workers-site'
 
 [build]
-upload.format = 'service-worker'
 command = 'npm i --prefer-offline --no-audit && npm run build'
 
 [vars]
 DEBUG = true
 
-
 [env.omaps]
 name = 'url-processor-omaps'
 workers_dev = false
-# omaps.app CF zone ID.
-zone_id = '3fce06554abc3899504e11d928be0ee7'
 # See the full list of handled files in the code.
 route = 'omaps.app/*'
 
 [env.omaps.vars]
 DEBUG = false
-
-
-#[env.organicmaps]
-#DEBUG = false
-#name = 'url-processor-organicmaps'
-#workers_dev = false
-# organicmaps.app CF zone ID.
-#zone_id = 'a520ad91909e819d66c62f53f9454589'
-# See the full list of handled files in the code.
-#route = 'organicmaps.app/*'
-
-[env.organicmaps.vars]
-DEBUG = false