From d2ee1bcd37d26c10368db051ab8150b1ec6d4359 Mon Sep 17 00:00:00 2001 From: Xi Xu Date: Mon, 8 Dec 2025 19:34:56 +0800 Subject: [PATCH] Add eslint-config-prettier and update ESLint config Integrated eslint-config-prettier to disable formatting rules that conflict with Prettier. Updated ESLint configuration and added the dependency to package.json for improved code formatting consistency. --- eslint.config.js | 2 ++ package-lock.json | 17 +++++++++++++++++ package.json | 1 + src/index.js | 10 +++++----- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index beb58a7..ddbc45c 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,4 +1,5 @@ import js from '@eslint/js'; +import prettierConfig from 'eslint-config-prettier'; export default [ js.configs.recommended, @@ -230,6 +231,7 @@ export default [ 'template-curly-spacing': ['error', 'never'] } }, + prettierConfig, // Disable formatting rules that conflict with Prettier { files: ['test/**/*.js'], rules: { diff --git a/package-lock.json b/package-lock.json index 38fd433..d927e71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "@cloudflare/vitest-pool-workers": "^0.10.14", "@cloudflare/workers-types": "^4.20251205.0", "eslint": "^9.39.1", + "eslint-config-prettier": "^10.1.8", "prettier": "^3.7.4", "typescript": "^5.9.3", "vitest": "^3.1.4", @@ -2381,6 +2382,22 @@ } } }, + "node_modules/eslint-config-prettier": { + "version": "10.1.8", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.8.tgz", + "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==", + "dev": true, + "license": "MIT", + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "funding": { + "url": "https://opencollective.com/eslint-config-prettier" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, "node_modules/eslint-scope": { "version": "8.4.0", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", diff --git a/package.json b/package.json index 518b836..c0be6ea 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "@cloudflare/vitest-pool-workers": "^0.10.14", "@cloudflare/workers-types": "^4.20251205.0", "eslint": "^9.39.1", + "eslint-config-prettier": "^10.1.8", "prettier": "^3.7.4", "typescript": "^5.9.3", "vitest": "^3.1.4", diff --git a/src/index.js b/src/index.js index e57498e..b4c877b 100644 --- a/src/index.js +++ b/src/index.js @@ -1328,11 +1328,11 @@ async function handleRequest(request, env, ctx) { // Always use GET method for cache key const cacheKey = rangeHeader ? new Request(targetUrl, { - method: 'GET', - headers: new Headers( - [...request.headers.entries()].filter(([k]) => k.toLowerCase() !== 'range') - ) - }) + method: 'GET', + headers: new Headers( + [...request.headers.entries()].filter(([k]) => k.toLowerCase() !== 'range') + ) + }) : new Request(targetUrl, { method: 'GET' }); // Use waitUntil if available (Cloudflare Workers), otherwise cache synchronously