Upgrade to Wrangler 2

Signed-off-by: Alexander Borsuk <me@alex.bio>

.github/workflows/deploy-master-to-prod.yml

@@ -10,7 +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: prod

README.md

@@ -12,22 +12,38 @@ npm i
 
 ## Development
 
-Use `npx wrangler dev` for localhost development.
+Use `npx wrangler dev --local` for localhost development.
+
+Use `npx wrangler dev` to test local changes using Cloudflare dev tools.
+
+## Update node dependencies to their major versions
+
+```bash
+npm run upgrade
+```
 
 ## Preview on workers.dev
 
-Use `npx wrangler preview` to open and test deployed worker in browser.
+Use `npx wrangler publish` to open and test deployed worker in browser at https://meta-dev.omaps.workers.dev
+
+## Monitor Worker logs
+
+For dev: `npx wrangler tail [--format json]`
+
+For production: `npx wrangler tail --env prod [--format json]`
 
 ## Deployment
 
-All pushes to master automatically deploy dev version to https://meta.omaps.workers.dev/
+All pushes to master automatically deploy prod version to https://meta.omaps.workers.dev/ and https://meta.omaps.app/
 
 Deploy to prod manually using `npx wrangler publish --env prod` or this
 [action](https://github.com/organicmaps/meta/actions/workflows/deploy-master-to-prod.yml).
 
+Deploy to test dev version live at https://meta-dev.omaps.workers.dev/ manually using `npx wrangler publish`.
+
 ## Known issues
 
-- Cloudflare's free Flexible SSL certificates does not support 4-th level
+- Cloudflare's free Flexible SSL certificates do not support 4-th level
   subdomains like a.b.example.com, so you can see strange SSL errors.
 - HTTPS `fetch` requests from Workers are converted to HTTP ones if the target
   host is in the same Cloudflare zone, see [here](https://community.cloudflare.com/t/does-cloudflare-worker-allow-secure-https-connection-to-fetch-even-on-flexible-ssl/68051/12)

package.json

@@ -16,20 +16,19 @@
   "author": "Alexander Borsuk <me@alex.bio>",
   "license": "MIT",
   "devDependencies": {
-    "@cloudflare/workers-types": "^3.16.0",
-    "@cloudflare/wrangler": "^1.19.13",
-    "@types/jest": "^29.0.3",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.0",
-    "esbuild": "^0.15.9",
-    "eslint": "^8.24.0",
-    "jest": "^29.0.3",
-    "jest-environment-miniflare": "^2.9.0",
-    "miniflare": "^2.9.0",
+    "@cloudflare/workers-types": "^4.20221111.1",
+    "@types/jest": "^29.2.3",
+    "@typescript-eslint/eslint-plugin": "^5.43.0",
+    "@typescript-eslint/parser": "^5.43.0",
+    "esbuild": "^0.15.15",
+    "eslint": "^8.28.0",
+    "jest": "^29.3.1",
+    "jest-environment-miniflare": "^2.11.0",
+    "miniflare": "^2.11.0",
     "prettier": "^2.7.1",
     "prettier-plugin-toml": "^0.3.1",
-    "ts-jest": "^29.0.2",
-    "typescript": "^4.8.3",
-    "wrangler": "^2.1.6"
+    "ts-jest": "^29.0.3",
+    "typescript": "^4.9.3",
+    "wrangler": "^2.4.2"
   }
 }

tsconfig.json

@@ -5,7 +5,7 @@
     "module": "ES6",
     "moduleResolution": "node",
     "target": "ESNext",
-    "lib": ["ESNext", "webworker"],
+    "lib": ["ESNext"],
     "alwaysStrict": true,
     "strict": true,
     "preserveConstEnums": true,

wrangler.toml

@@ -1,14 +1,15 @@
 # Default worker is for dev only.
 # See omaps and organicmaps environments below for production.
 name = 'meta-dev'
-type = 'javascript'
-compatibility_date = '2021-11-11'
+main = 'src/index.ts'
+compatibility_date = '2022-11-21'
 # Organic Maps CF Account ID.
 account_id = '462f578f0939f041e2c24ec99adce458'
 workers_dev = true
+# Whether Wrangler should send usage metrics to Cloudflare for this project.
+send_metrics = false
 
 [build]
-upload.format = 'service-worker'
 command = 'npm ci --prefer-offline --no-audit && npm run build'
 
 [vars]
@@ -17,8 +18,6 @@ DEBUG = true
 [env.prod]
 name = 'meta'
 workers_dev = false
-# omaps.app CF zone ID.
-zone_id = '3fce06554abc3899504e11d928be0ee7'
 # See the full list of handled paths in the code.
 route = 'meta.omaps.app/*'