feat: use @pnpm/read-importer-manifest in supi

pnpm · zkochan · May 1, 2019 · Apr 28, 2019 · Apr 28, 2019 · Apr 29, 2019
commit 4131c12f70589c5ef81c7ff8d0b213a740778eea
diff --git a/packages/supi/package.json b/packages/supi/package.json
@@ -35,6 +35,7 @@
     "@pnpm/package-requester": "7.0.6",
     "@pnpm/pkgid-to-filename": "2.0.0",
     "@pnpm/prune-lockfile": "1.0.4",
+    "@pnpm/read-importer-manifest": "0.0.0",
     "@pnpm/read-importers-context": "1.0.1",
     "@pnpm/read-modules-dir": "2.0.0",
     "@pnpm/read-package-json": "2.0.1",

diff --git a/packages/supi/src/link/index.ts b/packages/supi/src/link/index.ts
@@ -11,6 +11,7 @@ import {
 import logger, { streamParser } from '@pnpm/logger'
 import { prune } from '@pnpm/modules-cleaner'
 import { pruneSharedLockfile } from '@pnpm/prune-lockfile'
+import readImporterManifest from '@pnpm/read-importer-manifest'
 import { symlinkDirectRootDependency } from '@pnpm/symlink-dependency'
 import {
   DEPENDENCIES_FIELDS,
@@ -21,7 +22,6 @@ import {
 import {
   getSaveType,
 } from '@pnpm/utils'
-import loadJsonFile = require('load-json-file')
 import normalize = require('normalize-path')
 import path = require('path')
 import pathAbsolute = require('path-absolute')
@@ -66,27 +66,27 @@ export default async function link (
       linkFromPath = linkFrom.path
       linkFromAlias = linkFrom.alias
     }
-    const linkedPkg = await loadJsonFile<DependencyManifest>(path.join(linkFromPath, 'package.json'))
+    const { manifest } = await readImporterManifest(linkFromPath) as { manifest: DependencyManifest }
     specsToUpsert.push({
-      name: linkedPkg.name,
-      pref: getPref(linkedPkg.name, linkedPkg.name, linkedPkg.version, {
+      name: manifest.name,
+      pref: getPref(manifest.name, manifest.name, manifest.version, {
         pinnedVersion: opts.pinnedVersion,
       }),
-      saveType: (saveType || ctx.manifest && guessDependencyType(linkedPkg.name, ctx.manifest)) as DependenciesField,
+      saveType: (saveType || ctx.manifest && guessDependencyType(manifest.name, ctx.manifest)) as DependenciesField,
     })
 
     const packagePath = normalize(path.relative(opts.prefix, linkFromPath))
     const addLinkOpts = {
-      linkedPkgName: linkFromAlias || linkedPkg.name,
+      linkedPkgName: linkFromAlias || manifest.name,
       manifest: ctx.manifest,
       packagePath,
     }
     addLinkToLockfile(ctx.currentLockfile.importers[importerId], addLinkOpts)
     addLinkToLockfile(ctx.wantedLockfile.importers[importerId], addLinkOpts)
 
     linkedPkgs.push({
-      alias: linkFromAlias || linkedPkg.name,
-      manifest: linkedPkg,
+      alias: linkFromAlias || manifest.name,
+      manifest,
       path: linkFromPath,
     })
   }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml