diff --git a/.yarn/cache/lru-cache-npm-11.0.1-636ae10c75-26688a1b2a.zip b/.yarn/cache/lru-cache-npm-11.0.1-636ae10c75-26688a1b2a.zip new file mode 100644 index 00000000000..12ef22187b1 Binary files /dev/null and b/.yarn/cache/lru-cache-npm-11.0.1-636ae10c75-26688a1b2a.zip differ diff --git a/.yarn/cache/lru-cache-npm-7.7.1-726274dc4d-4b9961764b.zip b/.yarn/cache/lru-cache-npm-7.7.1-726274dc4d-4b9961764b.zip deleted file mode 100644 index 830b37d40e1..00000000000 Binary files a/.yarn/cache/lru-cache-npm-7.7.1-726274dc4d-4b9961764b.zip and /dev/null differ diff --git a/package.json b/package.json index a3571884330..1829ea4f079 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "isomorphic-fetch": "3.0.0", "jalaali-js": "1.2.7", "js-cookie": "3.0.5", - "lru-cache": "7.7.1", + "lru-cache": "11.0.1", "moment": "2.30.1", "moment-timezone": "0.5.45", "morgan": "1.10.0", diff --git a/src/app/lib/utilities/getToggles/withCache.js b/src/app/lib/utilities/getToggles/withCache.js index c54cedca652..4899492e7fa 100644 --- a/src/app/lib/utilities/getToggles/withCache.js +++ b/src/app/lib/utilities/getToggles/withCache.js @@ -1,4 +1,4 @@ -import Cache from 'lru-cache'; +import { LRUCache } from 'lru-cache'; import getToggles from '.'; import { getEnvConfig } from '../getEnvConfig'; @@ -10,7 +10,7 @@ const cacheTTL = parseInt( getEnvConfig().SIMORGH_CONFIG_CACHE_MAX_AGE_SECONDS ?? 300, 10, ); -const cache = new Cache({ max: cacheMaxItems, ttl: cacheTTL * 1000 }); +const cache = new LRUCache({ max: cacheMaxItems, ttl: cacheTTL * 1000 }); const withCache = async service => getToggles(service, cache); diff --git a/src/app/lib/utilities/getToggles/withCache.test.js b/src/app/lib/utilities/getToggles/withCache.test.js index 42abc928ba0..8a48ed44eef 100644 --- a/src/app/lib/utilities/getToggles/withCache.test.js +++ b/src/app/lib/utilities/getToggles/withCache.test.js @@ -1,4 +1,4 @@ -import Cache from 'lru-cache'; +import { LRUCache } from 'lru-cache'; import withCache from './withCache'; import getToggles from '.'; @@ -25,10 +25,10 @@ describe('withCache', () => { withCache('pidgin'); // ensure we only have once instance of the cache - expect(Cache).toHaveBeenCalledTimes(1); + expect(LRUCache).toHaveBeenCalledTimes(1); // ensure the same cache is used for multiple calls - const mockCacheInstance = Cache.mock.instances[0]; + const mockCacheInstance = LRUCache.mock.instances[0]; expect(getToggles).toHaveBeenNthCalledWith(1, 'mundo', mockCacheInstance); expect(getToggles).toHaveBeenNthCalledWith(2, 'pidgin', mockCacheInstance); }); diff --git a/src/app/routes/utils/fetchPageData/withCache.js b/src/app/routes/utils/fetchPageData/withCache.js index a338c72ec76..6cc28982a84 100644 --- a/src/app/routes/utils/fetchPageData/withCache.js +++ b/src/app/routes/utils/fetchPageData/withCache.js @@ -1,4 +1,4 @@ -import LRUCache from 'lru-cache'; +import { LRUCache } from 'lru-cache'; import fetchPageData from '.'; const cacheMaxItems = 400; diff --git a/yarn.lock b/yarn.lock index 66ef7fe87b0..d0e38daaf6b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13214,10 +13214,10 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:7.7.1": - version: 7.7.1 - resolution: "lru-cache@npm:7.7.1" - checksum: 10/4b9961764bb5b7ae06f5857a20f645fb0f05bc3c4d66c67d35f6aacad98b3b14a48c2b879517d97d47e41cfa4c2d64fec627b118deccd661d3961716de75abe1 +"lru-cache@npm:11.0.1": + version: 11.0.1 + resolution: "lru-cache@npm:11.0.1" + checksum: 10/26688a1b2a4d7fb97e9ea1ffb15348f1ab21b7110496814f5ce9190d50258fbba8c1444ae7232876deae1fc54adb230aa63dd1efc5bd47f240620ba8bf218041 languageName: node linkType: hard @@ -16333,7 +16333,7 @@ __metadata: jest-silent-reporter: "npm:0.6.0" js-cookie: "npm:3.0.5" jsdom: "npm:24.1.1" - lru-cache: "npm:7.7.1" + lru-cache: "npm:11.0.1" minimist: "npm:1.2.8" mkdirp: "npm:3.0.1" mocha-junit-reporter: "npm:2.2.1"