Normalize more dependencies.

Follow up toi #6029, this normalizes some more dependencies : `get-port`, `chalk`, `yargs`, `toucan-js`, `@typescript-eslint/parser`, `@typescript-eslint/eslint-plugin`, `esbuild-register`, `hono`, `glob-to-regexp, `@cloudflare/workers-types``
cloudflare · Jun 14, 2024 · ef96fa5 · ef96fa5
1 parent f5ad1d3
commit ef96fa5
Show file tree

Hide file tree

Showing 38 changed files with 213 additions and 475 deletions.
diff --git a/.changeset/moody-bees-end.md b/.changeset/moody-bees-end.md
@@ -0,0 +1,13 @@
+---
+"edge-preview-authenticated-proxy": patch
+"playground-preview-worker": patch
+"workers-playground": patch
+"create-cloudflare": patch
+"turbo-r2-archive": patch
+"format-errors": patch
+"wrangler": patch
+---
+
+Normalize more dependencies.
+
+Follow up to https://github.com/cloudflare/workers-sdk/pull/6029, this normalizes some more dependencies : `get-port`, `chalk`, `yargs`, `toucan-js`, `@typescript-eslint/parser`, `@typescript-eslint/eslint-plugin`, `esbuild-register`, `hono`, `glob-to-regexp`, `@cloudflare/workers-types`
diff --git a/.prettierignore b/.prettierignore
@@ -27,3 +27,7 @@ packages/create-cloudflare/templates/hello-world/**/worker-configuration.d.ts
 
 vscode.d.ts
 vscode.*.d.ts
+
+.e2e-logs
+templates/*/build
+templates/*/dist
diff --git a/fixtures/no-bundle-import/package.json b/fixtures/no-bundle-import/package.json
@@ -8,7 +8,7 @@
 		"test:watch": "vitest"
 	},
 	"devDependencies": {
-		"get-port": "^6.1.2",
+		"get-port": "^7.0.0",
 		"wrangler": "workspace:*"
 	},
 	"volta": {

diff --git a/package.json b/package.json
@@ -75,7 +75,6 @@
 		},
 		"patchedDependencies": {
 			"ink@3.2.0": "patches/ink@3.2.0.patch",
-			"toucan-js@3.2.2": "patches/toucan-js@3.2.2.patch",
 			"@cloudflare/component-listbox@1.10.6": "patches/@cloudflare__component-listbox@1.10.6.patch",
 			"capnp-ts@0.7.0": "patches/capnp-ts@0.7.0.patch",
 			"pg@8.11.3": "patches/pg@8.11.3.patch"

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -26,9 +26,9 @@
 		"@clack/prompts": "^0.6.3",
 		"@cloudflare/eslint-config-worker": "workspace:*",
 		"@cloudflare/workers-tsconfig": "workspace:*",
-		"@typescript-eslint/eslint-plugin": "^5.55.0",
-		"@typescript-eslint/parser": "^5.55.0",
-		"chalk": "^2.4.2",
+		"@typescript-eslint/eslint-plugin": "^6.9.0",
+		"@typescript-eslint/parser": "^6.9.0",
+		"chalk": "^5.2.0",
 		"esbuild": "0.17.19",
 		"log-update": "^5.0.1",
 		"undici": "^5.28.4"

diff --git a/packages/create-cloudflare/package.json b/packages/create-cloudflare/package.json
@@ -61,8 +61,8 @@
 		"@types/semver": "^7.5.1",
 		"@types/which-pm-runs": "^1.0.0",
 		"@types/yargs": "^17.0.22",
-		"@typescript-eslint/eslint-plugin": "^5.55.0",
-		"@typescript-eslint/parser": "^5.55.0",
+		"@typescript-eslint/eslint-plugin": "^6.9.0",
+		"@typescript-eslint/parser": "^6.9.0",
 		"chalk": "^5.2.0",
 		"command-exists": "^1.2.9",
 		"cross-spawn": "^7.0.3",
@@ -84,7 +84,7 @@
 		"which-pm-runs": "^1.1.0",
 		"wrangler": "workspace:*",
 		"wrap-ansi": "^9.0.0",
-		"yargs": "^17.7.1"
+		"yargs": "^17.7.2"
 	},
 	"engines": {
 		"node": ">=18.14.1"

diff --git a/packages/edge-preview-authenticated-proxy/package.json b/packages/edge-preview-authenticated-proxy/package.json
@@ -16,7 +16,7 @@
 		"@types/cookie": "^0.6.0",
 		"cookie": "^0.6.0",
 		"promjs": "^0.4.2",
-		"toucan-js": "^3.1.0",
+		"toucan-js": "^3.3.1",
 		"wrangler": "workspace:*"
 	},
 	"volta": {

diff --git a/packages/edge-preview-authenticated-proxy/src/index.ts b/packages/edge-preview-authenticated-proxy/src/index.ts
@@ -87,6 +87,9 @@ class InvalidURL extends HttpError {
 }
 
 function assertValidURL(maybeUrl: string) {
+	// @ts-expect-error This actually does exist in workers,
+	// but the types don't seem to have them. Following up in
+	// https://github.com/cloudflare/workerd/issues/2273
 	if (!URL.canParse(maybeUrl)) {
 		throw new InvalidURL(maybeUrl);
 	}
@@ -238,6 +241,10 @@ async function handleRawHttp(request: Request, url: URL) {
 
 	// The client needs the raw headers from the worker
 	// Prefix them with `cf-ew-raw-`, so that response headers from _this_ worker don't interfere
+
+	// @ts-expect-error This actually does exist in workers,
+	// but the types don't seem to have them. Following up in
+	// https://github.com/cloudflare/workerd/issues/2273
 	const setCookieHeader = responseHeaders.getSetCookie();
 	for (const setCookie of setCookieHeader) {
 		rawHeaders.append("cf-ew-raw-set-cookie", setCookie);

diff --git a/packages/eslint-config-worker/package.json b/packages/eslint-config-worker/package.json
@@ -5,7 +5,7 @@
 	"description": "ESLint config for workers-sdk",
 	"main": "index.js",
 	"dependencies": {
-		"@typescript-eslint/parser": "^6.7.2",
+		"@typescript-eslint/parser": "^6.9.0",
 		"eslint": "^8.49.0",
 		"eslint-config-turbo": "latest",
 		"eslint-plugin-import": "2.26.x",
@@ -15,7 +15,7 @@
 		"eslint-plugin-unused-imports": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@typescript-eslint/eslint-plugin": "^6.7.2"
+		"@typescript-eslint/eslint-plugin": "^6.9.0"
 	},
 	"volta": {
 		"extends": "../../package.json"

diff --git a/packages/format-errors/package.json b/packages/format-errors/package.json
@@ -13,7 +13,7 @@
 		"@cloudflare/workers-types": "^4.20240605.0",
 		"mustache": "^4.2.0",
 		"promjs": "^0.4.2",
-		"toucan-js": "^3.2.3",
+		"toucan-js": "^3.3.1",
 		"tsconfig": "*",
 		"wrangler": "workspace:*",
 		"zod": "^3.22.3"

diff --git a/packages/playground-preview-worker/package.json b/packages/playground-preview-worker/package.json
@@ -23,7 +23,7 @@
 		"cookie": "^0.5.0",
 		"itty-router": "^4.0.13",
 		"promjs": "^0.4.2",
-		"toucan-js": "^3.2.2",
+		"toucan-js": "^3.3.1",
 		"undici": "^5.28.4",
 		"wrangler": "workspace:*"
 	},

diff --git a/packages/quick-edit-extension/package.json b/packages/quick-edit-extension/package.json
@@ -43,7 +43,7 @@
 		"@cloudflare/workers-tsconfig": "workspace:^",
 		"@cloudflare/workers-types": "^4.20240605.0",
 		"esbuild": "0.17.19",
-		"esbuild-register": "^3.4.2"
+		"esbuild-register": "^3.5.0"
 	},
 	"engines": {
 		"vscode": "^1.76.0"

diff --git a/packages/turbo-r2-archive/package.json b/packages/turbo-r2-archive/package.json
@@ -18,7 +18,7 @@
 	},
 	"dependencies": {
 		"@hono/zod-validator": "^0.1.8",
-		"hono": "^3.5.6",
+		"hono": "^3.12.11",
 		"zod": "^3.22.3"
 	},
 	"devDependencies": {

diff --git a/packages/workers-playground/package.json b/packages/workers-playground/package.json
@@ -34,7 +34,7 @@
 		"csstype": "^3.1.2",
 		"es-module-lexer": "^1.3.0",
 		"glob-to-regexp": "^0.4.1",
-		"hono": "^3.3.2",
+		"hono": "^3.12.11",
 		"lz-string": "^1.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
@@ -53,8 +53,8 @@
 		"@types/react-dom": "^18.2.7",
 		"@types/react-tabs": "^2.3.4",
 		"@types/uuid": "^9.0.2",
-		"@typescript-eslint/eslint-plugin": "^5.61.0",
-		"@typescript-eslint/parser": "^5.61.0",
+		"@typescript-eslint/eslint-plugin": "^6.9.0",
+		"@typescript-eslint/parser": "^6.9.0",
 		"@vitejs/plugin-react": "^4.0.1",
 		"eslint": "^8.49.0",
 		"eslint-plugin-react-hooks": "^4.6.0",

diff --git a/packages/wrangler/package.json b/packages/wrangler/package.json
@@ -101,7 +101,7 @@
 		"@types/body-parser": "^1.19.2",
 		"@types/command-exists": "^1.2.0",
 		"@types/express": "^4.17.13",
-		"@types/glob-to-regexp": "0.4.1",
+		"@types/glob-to-regexp": "^0.4.1",
 		"@types/is-ci": "^3.0.0",
 		"@types/javascript-time-ago": "^2.0.3",
 		"@types/mime": "^2.0.3",
@@ -118,7 +118,7 @@
 		"@vitest/ui": "^1.6.0",
 		"@webcontainer/env": "^1.1.0",
 		"body-parser": "^1.20.0",
-		"chalk": "^2.4.2",
+		"chalk": "^5.2.0",
 		"cli-table3": "^0.6.3",
 		"clipboardy": "^3.0.0",
 		"cmd-shim": "^4.1.0",
@@ -130,8 +130,8 @@
 		"execa": "^6.1.0",
 		"express": "^4.18.1",
 		"find-up": "^6.3.0",
-		"get-port": "^6.1.2",
-		"glob-to-regexp": "0.4.1",
+		"get-port": "^7.0.0",
+		"glob-to-regexp": "^0.4.1",
 		"http-terminator": "^3.2.0",
 		"https-proxy-agent": "7.0.2",
 		"ignore": "^5.2.0",

diff --git a/patches/toucan-js@3.2.2.patch b/patches/toucan-js@3.2.2.patch