diff --git a/package.json b/package.json index f4a34fd86..d18bd12f7 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "espree": "10.4.0", "fast-glob": "3.3.3", "fast-json-stable-stringify": "2.1.0", - "file-entry-cache": "10.1.4", + "file-entry-cache": "11.1.0", "find-cache-directory": "6.0.0", "flow-parser": "0.287.0", "get-east-asian-width": "1.4.0", diff --git a/src/cli/format-results-cache.js b/src/cli/format-results-cache.js index 7cc6b691c..6fddcb20a 100644 --- a/src/cli/format-results-cache.js +++ b/src/cli/format-results-cache.js @@ -36,7 +36,6 @@ function getMetadataFromFileDescriptor(fileDescriptor) { } class FormatResultsCache { - #useChecksum; #fileEntryCache; /** @@ -45,11 +44,16 @@ class FormatResultsCache { */ constructor(cacheFileLocation, cacheStrategy) { const useChecksum = cacheStrategy === "content"; + const fileEntryCacheOptions = { + useChecksum, + useModifiedTime: !useChecksum, + restrictAccessToCwd: false, + }; try { this.#fileEntryCache = fileEntryCache.createFromFile( /* filePath */ cacheFileLocation, - useChecksum, + fileEntryCacheOptions, ); } catch { // https://github.com/prettier/prettier/issues/17092 @@ -60,12 +64,10 @@ class FormatResultsCache { // retry this.#fileEntryCache = fileEntryCache.createFromFile( /* filePath */ cacheFileLocation, - useChecksum, + fileEntryCacheOptions, ); } } - - this.#useChecksum = useChecksum; } /** @@ -107,9 +109,7 @@ class FormatResultsCache { } #getFileDescriptor(filePath) { - return this.#fileEntryCache.getFileDescriptor(filePath, { - useModifiedTime: !this.#useChecksum, - }); + return this.#fileEntryCache.getFileDescriptor(filePath); } } diff --git a/yarn.lock b/yarn.lock index 3170bb350..e9120d3d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -478,32 +478,34 @@ __metadata: languageName: node linkType: hard -"@cacheable/memoize@npm:^2.0.1": - version: 2.0.1 - resolution: "@cacheable/memoize@npm:2.0.1" +"@cacheable/memoize@npm:^2.0.3": + version: 2.0.3 + resolution: "@cacheable/memoize@npm:2.0.3" dependencies: - "@cacheable/utils": "npm:^2.0.1" - checksum: 10/22e23b4f6921a0e934cee3479724e7dc7c312aeae9a4bd615f2f3349e6f33f1f73a803d0b2c457082dcd554ea4f14241bceb9bf3f5f5b1f715b83331723be491 + "@cacheable/utils": "npm:^2.0.3" + checksum: 10/3202faf6377f8211630b0529446407ba86be6752aabeeb442384362352c8d5dc8f2a6ae178b6f6d240b54763634618dea1a0158cf0ab7662e7082724a0fdf316 languageName: node linkType: hard -"@cacheable/memory@npm:^2.0.1": - version: 2.0.1 - resolution: "@cacheable/memory@npm:2.0.1" +"@cacheable/memory@npm:^2.0.3": + version: 2.0.3 + resolution: "@cacheable/memory@npm:2.0.3" dependencies: - "@cacheable/memoize": "npm:^2.0.1" - "@cacheable/utils": "npm:^2.0.1" - "@keyv/bigmap": "npm:^1.0.0" - hookified: "npm:^1.12.0" - keyv: "npm:^5.5.1" - checksum: 10/ce78aae039bf2693cba7e0aa70772d334c7029521f484887c71d4bb8a5920c2a2ae59919dc8f476cf784979e2308596630c5f71aa5f6edff46d50283da8f1142 + "@cacheable/memoize": "npm:^2.0.3" + "@cacheable/utils": "npm:^2.0.3" + "@keyv/bigmap": "npm:^1.0.2" + hookified: "npm:^1.12.1" + keyv: "npm:^5.5.3" + checksum: 10/d5521bfe347f3cd8856616eef0eb48122ec746b58faa61a6e70222abfe8630db21af10c8de0e4215d74b2d84d05b7beaf28f1c8108960602143c19efc23f1281 languageName: node linkType: hard -"@cacheable/utils@npm:^2.0.1": - version: 2.0.1 - resolution: "@cacheable/utils@npm:2.0.1" - checksum: 10/e6a6a026e53745619ec639abbc1264ecf5a1fe16daee60740c94c1163caa911406f5cbb99cf0a3749e99a4bd38c9b2b7c35d68ab09142d769ccf11fadfeedab1 +"@cacheable/utils@npm:^2.0.3, @cacheable/utils@npm:^2.1.0": + version: 2.1.0 + resolution: "@cacheable/utils@npm:2.1.0" + dependencies: + keyv: "npm:^5.5.3" + checksum: 10/b6fb48a79420b3fa118a7d8c85240d4630b75787c4e8a1e1055b8756ce2c0ede792a7a1b9350af24e185abe8fbfa2045af20c86717c8e0d187eaaafe45e71a0e languageName: node linkType: hard @@ -1906,12 +1908,12 @@ __metadata: languageName: node linkType: hard -"@keyv/bigmap@npm:^1.0.0": - version: 1.0.1 - resolution: "@keyv/bigmap@npm:1.0.1" +"@keyv/bigmap@npm:^1.0.2": + version: 1.0.3 + resolution: "@keyv/bigmap@npm:1.0.3" dependencies: - hookified: "npm:^1.12.0" - checksum: 10/e510c1a54f4ccf4e5454ca4e587a9df15c25517621a35d2b47291f241f2f65e4ee73e543671e8a1fed2207b6e987546dba598a21721816b17f130965c66431a1 + hookified: "npm:^1.12.1" + checksum: 10/c3be3f24f42f85af4851708c89f9a2a3284c8e1b48bfdda52b23f1cada6f7c7e65d6b3774f52b96fcae018726e47dd175876edd3357ff97d26d26f7c902eebbf languageName: node linkType: hard @@ -3249,16 +3251,17 @@ __metadata: languageName: node linkType: hard -"cacheable@npm:^2.0.1": - version: 2.0.1 - resolution: "cacheable@npm:2.0.1" +"cacheable@npm:^2.1.0": + version: 2.1.0 + resolution: "cacheable@npm:2.1.0" dependencies: - "@cacheable/memoize": "npm:^2.0.1" - "@cacheable/memory": "npm:^2.0.1" - "@cacheable/utils": "npm:^2.0.1" - hookified: "npm:^1.12.0" - keyv: "npm:^5.5.1" - checksum: 10/cf9f7d365b2e1ea8a2b77563d9251b4ffbadd417f25353d5a0cd291fac9f9947c5045e9cb6f75df0a12dbad0cdd0bea1ecfcefcb66ebd034403a1fe635c5988e + "@cacheable/memoize": "npm:^2.0.3" + "@cacheable/memory": "npm:^2.0.3" + "@cacheable/utils": "npm:^2.1.0" + hookified: "npm:^1.12.1" + keyv: "npm:^5.5.3" + qified: "npm:^0.5.0" + checksum: 10/c9668fad533bcfaacfb7fc0677719470bac7b0d2ebc2f680904e385cc8061553462e3ad4c5aa071f8196f977516c312b80a227871fc0f4ec3eb61dd07c4838f6 languageName: node linkType: hard @@ -4721,12 +4724,12 @@ __metadata: languageName: node linkType: hard -"file-entry-cache@npm:10.1.4": - version: 10.1.4 - resolution: "file-entry-cache@npm:10.1.4" +"file-entry-cache@npm:11.1.0": + version: 11.1.0 + resolution: "file-entry-cache@npm:11.1.0" dependencies: - flat-cache: "npm:^6.1.13" - checksum: 10/286fc7d632a7c62665baf8c794ab7aaa6ea30111da2f22bdb68b1b467e7393630737f637fe93298ef3d9d1ce149233fd739508a12c16c1555fbd85fe9d225ff0 + flat-cache: "npm:^6.1.17" + checksum: 10/6482573f0be7276b19c8b2b1d6183834673cf947a4d56b4b3163f6fdcd516193db7e3d44c8fcf0a1f19f08d549c63afaa17a96a406df1215c71a793b5746fc5a languageName: node linkType: hard @@ -4820,14 +4823,14 @@ __metadata: languageName: node linkType: hard -"flat-cache@npm:^6.1.13": - version: 6.1.14 - resolution: "flat-cache@npm:6.1.14" +"flat-cache@npm:^6.1.17": + version: 6.1.18 + resolution: "flat-cache@npm:6.1.18" dependencies: - cacheable: "npm:^2.0.1" + cacheable: "npm:^2.1.0" flatted: "npm:^3.3.3" hookified: "npm:^1.12.0" - checksum: 10/475074615fa5cc0006b4804f5cf36915b88fcaf68470c68a24c32ff51af089b165af40930d8ea8a077bdd2a1ae2ada03e079aa27bc6e6e0e5336f0564399b208 + checksum: 10/1c1f5659dda8ef7c140a8ff3ea63daa620c96542057ea81e51b929c9706241b8d1015c0c2db9d4eb8fc80e73ee031407d8eacc3c2dfd67ddeb7ce89a8c6b1bb1 languageName: node linkType: hard @@ -5141,7 +5144,7 @@ __metadata: languageName: node linkType: hard -"hookified@npm:^1.12.0": +"hookified@npm:^1.12.0, hookified@npm:^1.12.1": version: 1.12.1 resolution: "hookified@npm:1.12.1" checksum: 10/eeecf7557d1e5ee88695c4e1939f926b84451219d3f021080399f433ae51a588429eaa575160d605f56568e9fcf9280f1042078bd1d4bc56230f70bcf7c5002f @@ -6249,12 +6252,12 @@ __metadata: languageName: node linkType: hard -"keyv@npm:^5.5.1": - version: 5.5.2 - resolution: "keyv@npm:5.5.2" +"keyv@npm:^5.5.3": + version: 5.5.3 + resolution: "keyv@npm:5.5.3" dependencies: "@keyv/serialize": "npm:^1.1.1" - checksum: 10/d5468ae69c99ff727426b3cf4d1284954268af64e3717801ee3fec158724fe98fca3b4af87368ed1344fbf27f6c3704d57840515725cb5ce0cbf2ad3f99151e9 + checksum: 10/b8d2c354dade07cb4cb6ccffe6495c1a32a67cf9f066a9660eeaea974ab9d8b94dd568b4e71b23f217f587d3e07b558fa6e48158baea1a0bc9514bb15c1de555 languageName: node linkType: hard @@ -7369,7 +7372,7 @@ __metadata: espree: "npm:10.4.0" fast-glob: "npm:3.3.3" fast-json-stable-stringify: "npm:2.1.0" - file-entry-cache: "npm:10.1.4" + file-entry-cache: "npm:11.1.0" find-cache-directory: "npm:6.0.0" flow-parser: "npm:0.287.0" get-east-asian-width: "npm:1.4.0" @@ -7532,6 +7535,15 @@ __metadata: languageName: node linkType: hard +"qified@npm:^0.5.0": + version: 0.5.0 + resolution: "qified@npm:0.5.0" + dependencies: + hookified: "npm:^1.12.1" + checksum: 10/558865e861d6fb03323dab7c2731ce99b60f423067ad50c66a4e4b7e2478c28a39ddcedf687edc266468e58eff5635a277868c350e1161cdc2b4473691d6f4e3 + languageName: node + linkType: hard + "quansync@npm:^0.2.11": version: 0.2.11 resolution: "quansync@npm:0.2.11"