Merge remote-tracking branch 'upstream/canary' into fix/basepath-public-folder-rewrite

ijjk · ijjk · commit a4876aeaa7e7 · 2020-08-19T11:18:35.000-05:00
diff --git a/packages/next/lib/get-package-version.ts b/packages/next/lib/get-package-version.ts
@@ -1,28 +1,47 @@
-//  issuer.endsWith(path.posix.sep) || issuer.endsWith(path.win32.sep)
-import findUp from 'next/dist/compiled/find-up'
-import * as path from 'path'
 import { promises as fs } from 'fs'
+import findUp from 'next/dist/compiled/find-up'
 import JSON5 from 'next/dist/compiled/json5'
+import * as path from 'path'
 import { resolveRequest } from './resolve-request'
 
-export async function getPackageVersion({
+type PackageJsonDependencies = {
+  dependencies: Record<string, string>
+  devDependencies: Record<string, string>
+}
+
+let cachedDeps: PackageJsonDependencies
+
+async function getDependencies({
   cwd,
-  name,
 }: {
   cwd: string
-  name: string
-}): Promise<string | null> {
+}): Promise<PackageJsonDependencies> {
+  if (cachedDeps) {
+    return cachedDeps
+  }
+
   const configurationPath: string | undefined = await findUp('package.json', {
     cwd,
   })
   if (!configurationPath) {
-    return null
+    return (cachedDeps = { dependencies: {}, devDependencies: {} })
   }
 
   const content = await fs.readFile(configurationPath, 'utf-8')
   const packageJson: any = JSON5.parse(content)
 
   const { dependencies = {}, devDependencies = {} } = packageJson || {}
+  return (cachedDeps = { dependencies, devDependencies })
+}
+
+export async function getPackageVersion({
+  cwd,
+  name,
+}: {
+  cwd: string
+  name: string
+}): Promise<string | null> {
+  const { dependencies, devDependencies } = await getDependencies({ cwd })
   if (!(dependencies[name] || devDependencies[name])) {
     return null
   }
