Bump to latest LRUCache; use the correct import now the old way is de…

…precated (compiler-explorer#5116)

lib/cache/in-memory.ts

@@ -22,20 +22,20 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import LRU from 'lru-cache';
+import {LRUCache} from 'lru-cache';
 
 import type {GetResult} from '../../types/cache.interfaces.js';
 
 import {BaseCache} from './base.js';
 
 export class InMemoryCache extends BaseCache {
     readonly cacheMb: number;
-    private readonly cache: LRU<string, Buffer>;
+    private readonly cache: LRUCache<string, Buffer>;
 
     constructor(cacheName: string, cacheMb: number) {
         super(cacheName, `InMemoryCache(${cacheMb}Mb)`, 'memory');
         this.cacheMb = cacheMb;
-        this.cache = new LRU({
+        this.cache = new LRUCache({
             maxSize: cacheMb * 1024 * 1024,
             sizeCalculation: n => n.length,
         });

lib/cache/on-disk.ts

@@ -25,7 +25,7 @@
 import path from 'path';
 
 import fs from 'fs-extra';
-import LRU from 'lru-cache';
+import {LRUCache} from 'lru-cache';
 
 import type {GetResult} from '../../types/cache.interfaces.js';
 import {logger} from '../logger.js';
@@ -48,13 +48,13 @@ type CacheEntry = {path: string; size: number};
 export class OnDiskCache extends BaseCache {
     readonly path: string;
     readonly cacheMb: number;
-    private readonly cache: LRU<string, CacheEntry>;
+    private readonly cache: LRUCache<string, CacheEntry>;
 
     constructor(cacheName: string, path: string, cacheMb: number) {
         super(cacheName, `OnDiskCache(${path}, ${cacheMb}mb)`, 'disk');
         this.path = path;
         this.cacheMb = cacheMb;
-        this.cache = new LRU({
+        this.cache = new LRUCache({
             maxSize: cacheMb * 1024 * 1024,
             sizeCalculation: n => n.size,
             noDisposeOnSet: true,

package.json

@@ -52,7 +52,7 @@
     "jszip": "^3.7.1",
     "lodash": "^4.17.21",
     "lodash.clonedeep": "^4.5.0",
-    "lru-cache": "^8.0.3",
+    "lru-cache": "^9.1.2",
     "lz-string": "^1.4.4",
     "monaco-editor": "^0.36.1",
     "monaco-vim": "^0.3.5",

static/compiler-service.ts

@@ -25,7 +25,7 @@
 import $ from 'jquery';
 import * as Sentry from '@sentry/browser';
 import _ from 'underscore';
-import LRU from 'lru-cache';
+import {LRUCache} from 'lru-cache';
 import {EventEmitter} from 'golden-layout';
 
 import {options} from './options.js';
@@ -44,12 +44,12 @@ const ASCII_COLORS_RE = new RegExp(/\x1B\[[\d;]*m(.\[K)?/g);
 export class CompilerService {
     private readonly base = window.httpRoot;
     private allowStoreCodeDebug: boolean;
-    cache: LRU<string, CompilationResult>;
+    cache: LRUCache<string, CompilationResult>;
     private readonly compilersByLang: Record<string, Record<string, CompilerInfo>>;
 
     constructor(eventHub: EventEmitter) {
         this.allowStoreCodeDebug = true;
-        this.cache = new LRU({
+        this.cache = new LRUCache({
             maxSize: 200 * 1024,
             sizeCalculation: n => JSON.stringify(n).length,
         });

static/panes/compiler.ts

@@ -29,7 +29,7 @@ import {ga} from '../analytics.js';
 import * as colour from '../colour.js';
 import {Toggles} from '../widgets/toggles.js';
 import * as Components from '../components.js';
-import LruCache from 'lru-cache';
+import {LRUCache} from 'lru-cache';
 import {options} from '../options.js';
 import * as monaco from 'monaco-editor';
 import {Alert} from '../widgets/alert.js';
@@ -79,7 +79,7 @@ type CachedOpcode = {
     found: boolean;
     data: AssemblyInstructionInfo | string;
 };
-const OpcodeCache = new LruCache<string, CachedOpcode>({
+const OpcodeCache = new LRUCache<string, CachedOpcode>({
     maxSize: 64 * 1024,
     sizeCalculation: function (n) {
         return JSON.stringify(n).length;