From a46df428258f509c1fa91c597f8b2b4893d35deb Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 14 Jul 2018 23:15:38 +0300 Subject: [PATCH] feat: use @pnpm/logger v2.1.0 BREAKING CHANGE: @pnpm/logger v2.1.0 is required --- package.json | 6 +-- shrinkwrap.yaml | 57 +++++++++++++--------- src/storeController/createImportPackage.ts | 8 +-- src/storeController/index.ts | 4 +- 4 files changed, 44 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 84d0e47b70..d0ed0ff8fb 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,12 @@ "lib/" ], "peerDependencies": { - "@pnpm/logger": "^1.0.0" + "@pnpm/logger": "^2.1.0" }, "dependencies": { "@pnpm/fetcher-base": "^1.0.0", "@pnpm/fs-locker": "^1.0.0", - "@pnpm/package-requester": "^3.0.0", + "@pnpm/package-requester": "^4.0.0", "@pnpm/resolver-base": "^1.1.0", "@pnpm/types": "^1.3.0", "@types/load-json-file": "^2.0.5", @@ -44,7 +44,7 @@ "write-json-file": "^2.2.0" }, "devDependencies": { - "@pnpm/logger": "^1.0.0", + "@pnpm/logger": "^2.1.0", "@pnpm/npm-resolver": "^2.0.0", "@pnpm/tarball-fetcher": "^1.0.0", "@types/tape": "^4.2.30", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 54ea5e31de..4ecf6a0fc8 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,7 +1,7 @@ dependencies: '@pnpm/fetcher-base': 1.0.0 '@pnpm/fs-locker': 1.0.2 - '@pnpm/package-requester': 3.0.0 + '@pnpm/package-requester': 4.0.0 '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 @@ -15,6 +15,7 @@ dependencies: ncp: 2.0.0 p-filter: 1.0.0 p-limit: 2.0.0 + package-store: 'link:../__package_previews__/package-store/package-store' path-exists: 3.0.0 path-temp: 1.0.0 ramda: 0.25.0 @@ -23,7 +24,7 @@ dependencies: util.promisify: 1.0.0 write-json-file: 2.3.0 devDependencies: - '@pnpm/logger': 1.0.2 + '@pnpm/logger': 2.1.0 '@pnpm/npm-resolver': 2.1.3 '@pnpm/tarball-fetcher': 1.0.0 '@types/tape': 4.2.32 @@ -81,16 +82,16 @@ packages: node: '>=4' resolution: integrity: sha512-ASULw2KzrapsjQVSMYdDc3f6+wYOs9cPt0M5Ip9VUkTfYfPrfxd0UYXcOPoUHkk7L12HUj0vwUYK0DE1da2gww== - /@pnpm/logger/1.0.2: + /@pnpm/logger/2.1.0: dependencies: - '@types/node': 10.3.4 + '@types/node': 10.5.2 bole: 3.0.2 ndjson: 1.5.0 dev: true engines: - node: '>=4' + node: '>=6' resolution: - integrity: sha512-A8XbJKvdueazvJGPn1qQ9LL6uopV88ebIT+dJKNQ68gT7yfCbtfT8j5ZzdVczmGbkiuBeZ1VckZerkO0tjOXZA== + integrity: sha512-BL4Laf6b50LjdcpOUWPukx2XJtb3mo2OpJjHdRNSDJu9YS2tRBeP14H2bNqGjCjfeml8z3KufI3Km6VQemVXNw== /@pnpm/npm-resolver/2.1.3: dependencies: '@pnpm/resolver-base': 1.1.0 @@ -117,7 +118,7 @@ packages: '@pnpm/logger': ^1.0.0 resolution: integrity: sha512-cZRzysG58KAP+hLRL3pOCDDH+2YBuLVmpd0bQ7noazXfDiTKPqcwH2alkT0rM+OBG9NymoqRJIPBg5DwIjyRDQ== - /@pnpm/package-requester/3.0.0: + /@pnpm/package-requester/4.0.0: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fetcher-base': 1.0.0 @@ -126,13 +127,13 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.3.4 + '@types/node': 10.5.2 '@types/p-queue': 2.3.1 '@types/write-json-file': 2.2.1 load-json-file: 5.0.0 mkdirp-promise: 5.0.1 mz: 2.7.0 - p-limit: 1.3.0 + p-limit: 2.0.0 p-queue: 2.4.2 path-exists: 3.0.0 read-package-json: 2.0.13 @@ -145,9 +146,9 @@ packages: engines: node: '>=6' peerDependencies: - '@pnpm/logger': ^1.0.0 + '@pnpm/logger': ^2.1.0 resolution: - integrity: sha512-0/YQP/UGkyyyMMruE83hY4b68dgSr9kqX/XpCr8zmGGL/1rNaJfPFuXrr8a9JHLYFTNBAzhVquTSTUnC/sM4lg== + integrity: sha512-zd4A0PkojX3zgTPV8UCrOURqTepQt7KGlAbgOwJVzAxfC1fhN7JfFgn3Z0jyYScsHKcKlcEiHxRc5A1vDg1uZQ== /@pnpm/pkgid-to-filename/1.0.1: dependencies: normalize-path: 3.0.0 @@ -236,12 +237,15 @@ packages: integrity: sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== /@types/mz/0.0.32: dependencies: - '@types/node': 10.3.4 + '@types/node': 10.5.2 resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== /@types/node/10.3.4: resolution: integrity: sha512-YMLlzdeNnAyLrQew39IFRkMacAR5BqKGIEei9ZjdHsIZtv+ZWKYTu1i7QJhetxQ9ReXx8w5f+cixdHZG3zgMQA== + /@types/node/10.5.2: + resolution: + integrity: sha512-m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q== /@types/p-queue/2.3.1: dev: false resolution: @@ -863,7 +867,7 @@ packages: es-to-primitive: 1.1.1 function-bind: 1.1.1 has: 1.0.3 - is-callable: 1.1.3 + is-callable: 1.1.4 is-regex: 1.0.4 engines: node: '>= 0.4' @@ -871,7 +875,7 @@ packages: integrity: sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA== /es-to-primitive/1.1.1: dependencies: - is-callable: 1.1.3 + is-callable: 1.1.4 is-date-object: 1.0.1 is-symbol: 1.0.1 engines: @@ -1249,11 +1253,9 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-TCu8inWJmP7r9e1oWA921GdotLw= - /hosted-git-info/2.6.0: - engines: - node: '>=4' + /hosted-git-info/2.7.1: resolution: - integrity: sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw== + integrity: sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w== /http-cache-semantics/3.8.1: dev: true resolution: @@ -1407,10 +1409,16 @@ packages: resolution: integrity: sha1-XuWOqlounIDiFAe+3yOuWsCRs/w= /is-callable/1.1.3: + dev: true engines: node: '>= 0.4' resolution: integrity: sha1-hut1OSgF3cM69xySoO7fdO52BLI= + /is-callable/1.1.4: + engines: + node: '>= 0.4' + resolution: + integrity: sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== /is-ci/1.1.0: dependencies: ci-info: 1.1.3 @@ -1825,6 +1833,7 @@ packages: /mkdirp/0.5.1: dependencies: minimist: 0.0.8 + hasBin: true resolution: integrity: sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= /move-concurrently/1.0.1: @@ -1872,6 +1881,7 @@ packages: split2: 2.2.0 through2: 2.0.3 dev: true + hasBin: true resolution: integrity: sha1-rmA7NrE0vOw0e0UkIrC/mNWDLsg= /nerf-dart/1.0.0: @@ -1907,7 +1917,7 @@ packages: integrity: sha1-3CNO3WSJmC1Y6PDbT2lQKavNjAQ= /normalize-package-data/2.4.0: dependencies: - hosted-git-info: 2.6.0 + hosted-git-info: 2.7.1 is-builtin-module: 1.0.0 semver: 5.5.0 validate-npm-package-license: 3.0.3 @@ -2504,6 +2514,7 @@ packages: /rimraf/2.6.2: dependencies: glob: 7.1.2 + hasBin: true resolution: integrity: sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w== /run-async/2.3.0: @@ -2538,6 +2549,7 @@ packages: resolution: integrity: sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk= /semver/5.5.0: + hasBin: true resolution: integrity: sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== /shebang-command/1.2.0: @@ -2760,13 +2772,14 @@ packages: /symlink-dir/1.1.3: dependencies: '@types/mz': 0.0.32 - '@types/node': 10.3.4 + '@types/node': 10.5.2 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 mz: 2.7.0 engines: node: '>=4' + hasBin: true resolution: integrity: sha512-klQgTYk7en8A69nAzZjJdaMXbGCmfh0DU+YLaZG/stHNp00VZSS3Pos238Ua7oCKVw57UszViod4D7RVRH6XHg== /tape/4.9.1: @@ -3085,9 +3098,9 @@ shrinkwrapVersion: 3 specifiers: '@pnpm/fetcher-base': ^1.0.0 '@pnpm/fs-locker': ^1.0.0 - '@pnpm/logger': ^1.0.0 + '@pnpm/logger': ^2.1.0 '@pnpm/npm-resolver': ^2.0.0 - '@pnpm/package-requester': ^3.0.0 + '@pnpm/package-requester': ^4.0.0 '@pnpm/resolver-base': ^1.1.0 '@pnpm/tarball-fetcher': ^1.0.0 '@pnpm/types': ^1.3.0 diff --git a/src/storeController/createImportPackage.ts b/src/storeController/createImportPackage.ts index 1a02921a18..098011aeaf 100644 --- a/src/storeController/createImportPackage.ts +++ b/src/storeController/createImportPackage.ts @@ -1,4 +1,4 @@ -import logger from '@pnpm/logger' +import {storeLogger} from '@pnpm/logger' import { PackageFilesResponse, } from '@pnpm/package-requester' @@ -62,8 +62,8 @@ function createImportPackage (packageImportMethod?: 'auto' | 'hardlink' | 'copy' await hardlinkPkg(from, to, opts) } catch (err) { if (!err.message.startsWith('EXDEV: cross-device link not permitted')) throw err - logger.warn(err.message) - logger.info('Falling back to copying packages from store') + storeLogger.warn(err.message) + storeLogger.info('Falling back to copying packages from store') fallbackToCopying = true await importPackage(from, to, opts) } @@ -117,7 +117,7 @@ async function pkgLinkedToStore ( ) { const pkgJsonPathInStore = path.join(from, 'package.json') if (await isSameFile(pkgJsonPath, pkgJsonPathInStore)) return true - logger.info(`Relinking ${to} from the store`) + storeLogger.info(`Relinking ${to} from the store`) return false } diff --git a/src/storeController/index.ts b/src/storeController/index.ts index ce9535f3c4..cd8bfbfd32 100644 --- a/src/storeController/index.ts +++ b/src/storeController/index.ts @@ -1,6 +1,6 @@ import {FetchFunction} from '@pnpm/fetcher-base' import lock from '@pnpm/fs-locker' -import logger from '@pnpm/logger' +import {storeLogger} from '@pnpm/logger' import createPackageRequester, { FetchPackageToStoreFunction, RequestPackageFunction, @@ -104,7 +104,7 @@ export default async function ( if (!storeIndex[pkgId].length) { delete storeIndex[pkgId] await rimraf(path.join(store, pkgId)) - logger.info(`- ${pkgId}`) + storeLogger.info(`- ${pkgId}`) } } }