diff --git a/packages/next/next-server/server/spr-cache.ts b/packages/next/next-server/server/spr-cache.ts index 87deb0707539b099b44d73d44a3471d09f02d81f..138f531005ca4683022a8010c31ccf714b1ffde7 100644 --- a/packages/next/next-server/server/spr-cache.ts +++ b/packages/next/next-server/server/spr-cache.ts @@ -1,5 +1,5 @@ import fs from 'fs' -import LRUCache from 'lru-cache' +import LRUCache from 'next/dist/compiled/lru-cache' import path from 'path' import { promisify } from 'util' import { PrerenderManifest } from '../../build' diff --git a/packages/next/package.json b/packages/next/package.json index 9729448598af840fe095a2457bcdcd889cdc6221..26bb0dd5a7a908d147a0e36f48928f240ef84051 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -72,7 +72,6 @@ "ignore-loader": "0.1.2", "jest-worker": "24.9.0", "loader-utils": "2.0.0", - "lru-cache": "5.1.1", "mini-css-extract-plugin": "0.8.0", "native-url": "0.2.6", "node-fetch": "2.6.0", @@ -193,6 +192,7 @@ "jsonwebtoken": "8.5.1", "launch-editor": "2.2.1", "lodash.curry": "4.1.1", + "lru-cache": "5.1.1", "nanoid": "2.0.3", "resolve": "1.11.0", "taskr": "1.1.0", diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js index 4d03e9c117db4243565e8eafbb4a08816506ce59..6ffb84ebdb6a452b4f6238c06356885a860b14bc 100644 --- a/packages/next/taskfile.js +++ b/packages/next/taskfile.js @@ -394,6 +394,13 @@ export async function ncc_lodash_curry(task, opts) { .target('dist/compiled/lodash.curry') } // eslint-disable-next-line camelcase +export async function ncc_lru_cache(task, opts) { + await task + .source(opts.src || relative(__dirname, require.resolve('lru-cache'))) + .ncc({ packageName: 'lru-cache' }) + .target('dist/compiled/lru-cache') +} +// eslint-disable-next-line camelcase export async function ncc_nanoid(task, opts) { await task .source(opts.src || relative(__dirname, require.resolve('nanoid'))) @@ -468,6 +475,7 @@ export async function precompile(task) { 'ncc_jsonwebtoken', 'ncc_launch_editor', 'ncc_lodash_curry', + 'ncc_lru_cache', 'ncc_nanoid', 'ncc_resolve', 'ncc_text_table', diff --git a/packages/next/types/misc.d.ts b/packages/next/types/misc.d.ts index c767613c255210ec2442ed9dc3ec9c3f4412a4d0..8ff21fd3f244a423b4cb8c5040bd96b09204306f 100644 --- a/packages/next/types/misc.d.ts +++ b/packages/next/types/misc.d.ts @@ -132,6 +132,10 @@ declare module 'next/dist/compiled/lodash.curry' { import m from 'lodash.curry' export = m } +declare module 'next/dist/compiled/lru-cache' { + import m from 'lru-cache' + export = m +} declare module 'next/dist/compiled/nanoid/index.js' { function nanoid(size?: number): string export = nanoid