From 878fc629f790ccadef6f6dd7c2f65f6584da978b Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 14 Jul 2018 22:21:27 +0300 Subject: [PATCH] refactor: use @pnpm/read-package-json --- package.json | 5 ++--- shrinkwrap.yaml | 16 ++++++++++++---- src/index.ts | 7 ++----- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 7bc73923d6..5933325a2b 100644 --- a/package.json +++ b/package.json @@ -37,11 +37,10 @@ "@pnpm/logger": "^1.0.0 || ^2.0.0" }, "dependencies": { + "@pnpm/read-package-json": "^1.0.0", "@pnpm/types": "^1.7.0", "npm-lifecycle": "^2.0.1", - "path-exists": "^3.0.0", - "read-package-json": "^2.0.13", - "util.promisify": "^1.0.0" + "path-exists": "^3.0.0" }, "devDependencies": { "@pnpm/logger": "^2.0.1", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index afabeb0970..2ad1e63440 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,10 +1,9 @@ dependencies: '@pnpm/lifecycle': 'link:../__package_previews__/lifecycle/@pnpm/lifecycle' + '@pnpm/read-package-json': 1.0.0 '@pnpm/types': 1.7.0 npm-lifecycle: 2.0.3 path-exists: 3.0.0 - read-package-json: 2.0.13 - util.promisify: 1.0.0 devDependencies: '@pnpm/logger': 2.0.1 '@types/load-json-file': 2.0.7 @@ -44,6 +43,16 @@ packages: node: '>=6' resolution: integrity: sha512-dST450D6Nj9iu0L16wqBv6dEXpbSQ6tyG1G9zSIzzjHqcDdKgdtpNR/0DvxpDEzBPfwGFQ868+o7AFaCuQsyig== + /@pnpm/read-package-json/1.0.0: + dependencies: + '@pnpm/types': 1.7.0 + read-package-json: 2.0.13 + util.promisify: 1.0.0 + dev: false + engines: + node: '>=6' + resolution: + integrity: sha512-G2bs2KRL84eJggkUYxDpI8RA0xFKR4tNqvHy6bGF8fDIzNtkp17nOgEMIcA2ShSwUX80gQ8BpBh6ix5KKF46tw== /@pnpm/self-installer/2.0.5: dev: true engines: @@ -3615,6 +3624,7 @@ shrinkwrapMinorVersion: 8 shrinkwrapVersion: 3 specifiers: '@pnpm/logger': ^2.0.1 + '@pnpm/read-package-json': ^1.0.0 '@pnpm/types': ^1.7.0 '@types/load-json-file': ^2.0.7 '@types/node': ^10.0.4 @@ -3627,10 +3637,8 @@ specifiers: npm-lifecycle: ^2.0.1 package-preview: ^1.0.1 path-exists: ^3.0.0 - read-package-json: ^2.0.13 rimraf: ^2.6.2 tape: ^4.8.0 ts-node: ^7.0.0 tslint: ^5.8.0 typescript: ^2.6.1 - util.promisify: ^1.0.0 diff --git a/src/index.ts b/src/index.ts index 66dfa19c2b..9374ebad81 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,13 +1,10 @@ +import {fromDir as readPackageJsonFromDir} from '@pnpm/read-package-json' import {PackageJson} from '@pnpm/types' import lifecycle = require('npm-lifecycle') import path = require('path') import exists = require('path-exists') -import readPackageJsonCB = require('read-package-json') -import promisify = require('util.promisify') import {LifecycleLog, lifecycleLogger} from './logger' -const readPackageJson = promisify(readPackageJsonCB) - function noop () {} // tslint:disable-line:no-empty export {LifecycleLog} @@ -22,7 +19,7 @@ export async function runPostinstallHooks ( unsafePerm: boolean, }, ): Promise { - const pkg = await readPackageJson(path.join(opts.pkgRoot, 'package.json')) + const pkg = await readPackageJsonFromDir(opts.pkgRoot) const scripts = pkg && pkg.scripts || {} if (!scripts.install) {