From 8c986b508237730fa1e27c9db1f66be36b266406 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 14 Jan 2017 19:30:05 +0200 Subject: [PATCH 001/196] feat: initial commit --- .gitignore | 41 ++++++++++++++ LICENSE | 21 ++++++++ README.md | 3 ++ package.json | 50 +++++++++++++++++ src/index.ts | 131 +++++++++++++++++++++++++++++++++++++++++++++ tsconfig.json | 29 ++++++++++ tslint.json | 40 ++++++++++++++ typings/index.d.ts | 1 + typings/local.d.ts | 4 ++ 9 files changed, 320 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md create mode 100644 package.json create mode 100644 src/index.ts create mode 100644 tsconfig.json create mode 100644 tslint.json create mode 100644 typings/index.d.ts create mode 100644 typings/local.d.ts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..a0b6db2e30 --- /dev/null +++ b/.gitignore @@ -0,0 +1,41 @@ +# Logs +logs +*.log +npm-debug.log* + +# Runtime data +pids +*.pid +*.seed + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules +jspm_packages + +# Optional npm cache directory +.npm + +# Optional REPL history +.node_repl_history + +shrinkwrap.yaml + +lib diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..32aafa0db0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Zoltan Kochan + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md new file mode 100644 index 0000000000..aa55eeac64 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# pnpm-reporter-default + +> The default reporter of pnpm diff --git a/package.json b/package.json new file mode 100644 index 0000000000..8a57502b32 --- /dev/null +++ b/package.json @@ -0,0 +1,50 @@ +{ + "name": "pnpm-reporter-default", + "version": "0.0.0", + "description": "The default reporter of pnpm", + "main": "lib/index.js", + "typings": "lib/index.d.ts", + "files": [ + "lib" + ], + "scripts": { + "test": "tslint -c tslint.json --project .", + "tsc": "rimraf lib && tsc", + "prepublish": "npm run tsc" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/pnpm/pnpm-reporter-default.git" + }, + "keywords": [ + "pnpm-reporter" + ], + "author": "Zoltan Kochan", + "license": "MIT", + "bugs": { + "url": "https://github.com/pnpm/pnpm-reporter-default/issues" + }, + "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", + "dependencies": { + "@types/chalk": "^0.4.31", + "chalk": "^1.1.3", + "observatory": "^1.0.0", + "pnpm-logger": "^0.0.0" + }, + "devDependencies": { + "commitizen": "^2.9.5", + "ghooks": "^2.0.0", + "rimraf": "^2.5.4", + "tslint": "^4.3.1", + "typescript": "^2.1.5", + "validate-commit-msg": "^2.8.2" + }, + "config": { + "commitizen": { + "path": "./node_modules/cz-conventional-changelog" + }, + "ghooks": { + "commit-msg": "node ./node_modules/validate-commit-msg/index.js" + } + } +} diff --git a/src/index.ts b/src/index.ts new file mode 100644 index 0000000000..2bce67d546 --- /dev/null +++ b/src/index.ts @@ -0,0 +1,131 @@ +import chalk = require('chalk') +import observatory = require('observatory') +import { + ProgressLog, + DownloadStatus, + LifecycleLog, + Log, + InstallCheckLog, +} from 'pnpm-logger' + +observatory.settings({ prefix: ' ', width: 74 }) + +export default function (streamParser: Object) { + const tasks = {} + + function getTask (pkgRawSpec: string, pkgName: string) { + if (tasks[pkgRawSpec]) return tasks[pkgRawSpec] + const task = observatory.add( + (pkgName ? (pkgName + ' ') : '') + + chalk.gray(pkgRawSpec || '')) + task.status(chalk.gray('·')) + tasks[pkgRawSpec] = task + return task + } + + streamParser['on']('data', (obj: Log) => { + switch (obj.name) { + case 'pnpm:progress': + reportProgress(obj) + return + case 'pnpm:lifecycle': + reportLifecycle(obj) + return + case 'pnpm:install-check': + reportInstallCheck(obj) + return + case 'pnpm:registry': + if (obj.level === 'warn') { + printWarn(obj['message']) + } + return + default: + if (obj.level === 'debug') return + if (obj.name !== 'pnpm' && obj.name.indexOf('pnpm:') !== 0) return + if (obj.level === 'warn') { + printWarn(obj['message']) + return + } + console.log(obj['message']) + return + } + }) + + function reportProgress (logObj: ProgressLog) { + // lazy get task + function t () { + return getTask(logObj.pkg.rawSpec, logObj.pkg.name) + } + + // the first thing it (probably) does is wait in queue to query the npm registry + + switch (logObj.status) { + case 'resolving': + t().status(chalk.yellow('finding ·')) + return + case 'download-queued': + if (logObj.pkg.version) { + t().status(chalk.gray('queued ' + logObj.pkg.version + ' ↓')) + return + } + t().status(chalk.gray('queued ↓')) + return + case 'downloading': + case 'download-start': + if (logObj.pkg.version) { + t().status(chalk.yellow('downloading ' + logObj.pkg.version + ' ↓')) + } else { + t().status(chalk.yellow('downloading ↓')) + } + if (logObj.downloadStatus && logObj.downloadStatus.total && logObj.downloadStatus.done < logObj.downloadStatus.total) { + t().details('' + Math.round(logObj.downloadStatus.done / logObj.downloadStatus.total * 100) + '%') + } else { + t().details('') + } + return + case 'done': + if (logObj.pkg.version) { + t().status(chalk.green('' + logObj.pkg.version + ' ✓')) + .details('') + return + } + t().status(chalk.green('OK ✓')).details('') + return + case 'dependencies': + t().status(chalk.gray('' + logObj.pkg.version + ' ·')) + .details('') + return + case 'error': + t().status(chalk.red('ERROR ✗')) + .details('') + return + default: + t().status(logObj.status) + .details('') + return + } + } +} + +function reportLifecycle (logObj: LifecycleLog) { + if (logObj.level === 'error') { + console.log(chalk.blue(logObj.pkgId) + '! ' + chalk.gray(logObj.line)) + return + } + console.log(chalk.blue(logObj.pkgId) + ' ' + chalk.gray(logObj.line)) +} + +function reportInstallCheck (logObj: InstallCheckLog) { + switch (logObj.code) { + case 'EBADPLATFORM': + printWarn(`Unsupported system. Skipping dependency ${logObj.pkgid}`) + break + case 'ENOTSUP': + console.warn(logObj) + break + } +} + +function printWarn (message: string) { + console.log(chalk.yellow('WARN'), message) +} diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000000..0308a05233 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,29 @@ +{ + "compilerOptions": { + "removeComments": false, + "preserveConstEnums": true, + "sourceMap": true, + "declaration": true, + "noImplicitAny": true, + "noImplicitReturns": true, + "suppressImplicitAnyIndexErrors": true, + "allowSyntheticDefaultImports": true, + "strictNullChecks": true, + "target": "es6", + "outDir": "lib", + "module": "commonjs", + "moduleResolution": "node" + }, + "filesGlob": [ + "src/**/*.ts", + "typings/**/*.d.ts" + ], + "atom": { + "rewriteTsconfig": true + }, + "files": [ + "src/index.ts", + "typings/index.d.ts", + "typings/local.d.ts" + ] +} diff --git a/tslint.json b/tslint.json new file mode 100644 index 0000000000..7891ff2b2c --- /dev/null +++ b/tslint.json @@ -0,0 +1,40 @@ +{ + "rules": { + "curly": false, + "eofline": false, + "align": [true, "parameters"], + "class-name": true, + "indent": [true, "spaces"], + "max-line-length": false, + "no-any": true, + "no-consecutive-blank-lines": true, + "no-trailing-whitespace": true, + "no-duplicate-variable": true, + "no-var-keyword": true, + "no-unused-expression": true, + "no-use-before-declare": true, + "no-var-requires": true, + "no-require-imports": false, + "one-line": [true, + "check-else", + "check-whitespace", + "check-open-brace"], + "quotemark": [true, + "single", + "avoid-escape"], + "semicolon": false, + "typedef-whitespace": [true, { + "call-signature": "nospace", + "index-signature": "nospace", + "parameter": "nospace", + "property-declaration": "nospace", + "variable-declaration": "nospace" + }], + "whitespace": [true, + "check-branch", + "check-decl", + "check-operator", + "check-separator", + "check-type"] + } +} diff --git a/typings/index.d.ts b/typings/index.d.ts new file mode 100644 index 0000000000..f3eb390d4a --- /dev/null +++ b/typings/index.d.ts @@ -0,0 +1 @@ +/// diff --git a/typings/local.d.ts b/typings/local.d.ts new file mode 100644 index 0000000000..b42e87f784 --- /dev/null +++ b/typings/local.d.ts @@ -0,0 +1,4 @@ +declare module 'observatory' { + const anything: any; + export = anything; +} From 1d7215c67c0eace495968a903555e191cc740975 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 14 Jan 2017 21:54:54 +0200 Subject: [PATCH 002/196] fix: print errors --- src/index.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/index.ts b/src/index.ts index 2bce67d546..ef2d64546f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -46,6 +46,10 @@ export default function (streamParser: Object) { printWarn(obj['message']) return } + if (obj.level === 'error') { + console.log(chalk.red('ERROR'), obj['err'] && obj['err'].message || obj['message']) + return + } console.log(obj['message']) return } From 898eb91cbb3dc32c240c4f53437c5c30ace5bdbb Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 15 Jan 2017 01:54:00 +0200 Subject: [PATCH 003/196] feat(bin): add CLI --- package.json | 3 +++ src/bin/pnpm-reporter-default.ts | 9 +++++++++ tsconfig.json | 1 + typings/local.d.ts | 5 +++++ 4 files changed, 18 insertions(+) create mode 100644 src/bin/pnpm-reporter-default.ts diff --git a/package.json b/package.json index 8a57502b32..7267ecee25 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "files": [ "lib" ], + "bin": "lib/bin/pnpm-reporter-default.js", "scripts": { "test": "tslint -c tslint.json --project .", "tsc": "rimraf lib && tsc", @@ -27,7 +28,9 @@ "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "dependencies": { "@types/chalk": "^0.4.31", + "@types/node": "^7.0.0", "chalk": "^1.1.3", + "ndjson": "^1.5.0", "observatory": "^1.0.0", "pnpm-logger": "^0.0.0" }, diff --git a/src/bin/pnpm-reporter-default.ts b/src/bin/pnpm-reporter-default.ts new file mode 100644 index 0000000000..4f6710b3f4 --- /dev/null +++ b/src/bin/pnpm-reporter-default.ts @@ -0,0 +1,9 @@ +#!/usr/bin/env node +import ndjson = require('ndjson') +import reporter from '..' + +process.stdin.resume() +process.stdin.setEncoding('utf8') +const streamParser = process.stdin + .pipe(ndjson.parse()) +reporter(streamParser) diff --git a/tsconfig.json b/tsconfig.json index 0308a05233..ca474dbf93 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -22,6 +22,7 @@ "rewriteTsconfig": true }, "files": [ + "src/bin/pnpm-reporter-default.ts", "src/index.ts", "typings/index.d.ts", "typings/local.d.ts" diff --git a/typings/local.d.ts b/typings/local.d.ts index b42e87f784..71733fbb68 100644 --- a/typings/local.d.ts +++ b/typings/local.d.ts @@ -2,3 +2,8 @@ declare module 'observatory' { const anything: any; export = anything; } + +declare module 'ndjson' { + const anything: any; + export = anything; +} From 5b1871070269af86317ea0f67b70db4580827ca8 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 15 Jan 2017 15:35:11 +0200 Subject: [PATCH 004/196] refactor: rename the package to pnpm-default-reporter --- README.md | 2 +- package.json | 4 ++-- .../{pnpm-reporter-default.ts => pnpm-default-reporter.ts} | 0 tsconfig.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename src/bin/{pnpm-reporter-default.ts => pnpm-default-reporter.ts} (100%) diff --git a/README.md b/README.md index aa55eeac64..d26f77e3ed 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -# pnpm-reporter-default +# pnpm-default-reporter > The default reporter of pnpm diff --git a/package.json b/package.json index 7267ecee25..c7216c9e73 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "pnpm-reporter-default", + "name": "pnpm-default-reporter", "version": "0.0.0", "description": "The default reporter of pnpm", "main": "lib/index.js", @@ -7,7 +7,7 @@ "files": [ "lib" ], - "bin": "lib/bin/pnpm-reporter-default.js", + "bin": "lib/bin/pnpm-default-reporter.js", "scripts": { "test": "tslint -c tslint.json --project .", "tsc": "rimraf lib && tsc", diff --git a/src/bin/pnpm-reporter-default.ts b/src/bin/pnpm-default-reporter.ts similarity index 100% rename from src/bin/pnpm-reporter-default.ts rename to src/bin/pnpm-default-reporter.ts diff --git a/tsconfig.json b/tsconfig.json index ca474dbf93..03bde01b1b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -22,7 +22,7 @@ "rewriteTsconfig": true }, "files": [ - "src/bin/pnpm-reporter-default.ts", + "src/bin/pnpm-default-reporter.ts", "src/index.ts", "typings/index.d.ts", "typings/local.d.ts" From 83dab10b6aedb738fd380148f3aca973af6d167c Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 15 Jan 2017 21:19:22 +0200 Subject: [PATCH 005/196] refactor: change pkgid property of InstallCheck BREAKING CHANGE: pkgid changed to pkgId --- package.json | 2 +- src/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c7216c9e73..ed36004fd5 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "chalk": "^1.1.3", "ndjson": "^1.5.0", "observatory": "^1.0.0", - "pnpm-logger": "^0.0.0" + "pnpm-logger": "^0.0.1" }, "devDependencies": { "commitizen": "^2.9.5", diff --git a/src/index.ts b/src/index.ts index ef2d64546f..28d9e153d3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -122,7 +122,7 @@ function reportLifecycle (logObj: LifecycleLog) { function reportInstallCheck (logObj: InstallCheckLog) { switch (logObj.code) { case 'EBADPLATFORM': - printWarn(`Unsupported system. Skipping dependency ${logObj.pkgid}`) + printWarn(`Unsupported system. Skipping dependency ${logObj.pkgId}`) break case 'ENOTSUP': console.warn(logObj) From fd4185fce927e4e53f05a4851fd38cb316475391 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 15 Jan 2017 21:20:18 +0200 Subject: [PATCH 006/196] chore: release v0.0.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ed36004fd5..0d041049fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.0.0", + "version": "0.0.1", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 79a984f10ef74e6918218f56a7a0c1dd72bd2d22 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 29 Jan 2017 20:23:41 +0200 Subject: [PATCH 007/196] feat: print better error messages --- src/index.ts | 5 ++-- src/reportError.ts | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 src/reportError.ts diff --git a/src/index.ts b/src/index.ts index 28d9e153d3..a5acd04e76 100644 --- a/src/index.ts +++ b/src/index.ts @@ -7,6 +7,7 @@ import { Log, InstallCheckLog, } from 'pnpm-logger' +import reportError from './reportError' observatory.settings({ prefix: ' ', width: 74 }) @@ -47,8 +48,8 @@ export default function (streamParser: Object) { return } if (obj.level === 'error') { - console.log(chalk.red('ERROR'), obj['err'] && obj['err'].message || obj['message']) - return + reportError(obj) + return } console.log(obj['message']) return diff --git a/src/reportError.ts b/src/reportError.ts new file mode 100644 index 0000000000..bce25ac2f1 --- /dev/null +++ b/src/reportError.ts @@ -0,0 +1,71 @@ +import chalk = require('chalk') +import {Log} from 'pnpm-logger' + +export default function reportError (logObj: Log) { + if (logObj['err']) { + const err = logObj['err'] + switch (err.code) { + case 'UNEXPECTED_STORE': + reportUnexpectedStore(err, logObj['message']) + return + case 'STORE_BREAKING_CHANGE': + reportStoreBreakingChange(err, logObj['message']) + return + case 'MODULES_BREAKING_CHANGE': + reportModulesBreakingChange(err, logObj['message']) + return + default: + printErrorSummary(err.message || logObj['message']) + return + } + } + printErrorSummary(logObj['message']) +} + +function reportUnexpectedStore (err: Error, msg: Object) { + printErrorSummary(err.message) + console.log() + console.log(`expected: ${chalk.yellow(msg['expectedStorePath'])}`) + console.log(`actual: ${chalk.yellow(msg['actualStorePath'])}`) + console.log() + console.log(`If you want to use the new store, run the same command with the ${chalk.yellow('--force')} parameter.`) +} + +function reportStoreBreakingChange (err: Error, msg: Object) { + printErrorSummary(`The store used for the current node_modules is incomatible with the current version of pnpm`) + console.log(`Store path: ${chalk.gray(msg['storePath'])}`) + console.log() + console.log(`Try running the same command with the ${chalk.yellow('--force')} parameter.`) + if (msg['additionalInformation']) { + console.log() + console.log(msg['additionalInformation']) + } + printRelatedSources(msg) +} + +function reportModulesBreakingChange (err: Error, msg: Object) { + printErrorSummary(`The current version of pnpm is not compatible with the available node_modules structure`) + console.log(`node_modules path: ${chalk.gray(msg['modulesPath'])}`) + console.log() + console.log(`Try running the same command with the ${chalk.yellow('--force')} parameter.`) + if (msg['additionalInformation']) { + console.log() + console.log(msg['additionalInformation']) + } + printRelatedSources(msg) +} + +function printRelatedSources (msg: Object) { + if (!msg['relatedIssue'] && !msg['relatedPR']) return + console.log() + if (msg['relatedIssue']) { + console.log(`Related issue: ${chalk.gray(`https://github.com/pnpm/pnpm/issues/${msg['relatedIssue']}`)}`) + } + if (msg['relatedPR']) { + console.log(`Related PR: ${chalk.gray(`https://github.com/pnpm/pnpm/pull/${msg['relatedPR']}`)}`) + } +} + +function printErrorSummary (message: string) { + console.log(chalk.red('ERROR'), message) +} From 47f8298977b270b3a139492e66912d6f7aadb481 Mon Sep 17 00:00:00 2001 From: zkochan Date: Mon, 30 Jan 2017 21:37:39 +0200 Subject: [PATCH 008/196] 0.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d041049fc..e37fb8999b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.0.1", + "version": "0.1.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 1aed02b7b94adb1cac936071e38c9df224cd28c7 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 5 Feb 2017 17:27:54 +0200 Subject: [PATCH 009/196] feat: report verification errors --- src/reportError.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/reportError.ts b/src/reportError.ts index bce25ac2f1..4f8609981e 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -14,6 +14,9 @@ export default function reportError (logObj: Log) { case 'MODULES_BREAKING_CHANGE': reportModulesBreakingChange(err, logObj['message']) return + case 'MODIFIED_DEPENDENCY': + reportModifiedDependency(err, logObj['message']) + return default: printErrorSummary(err.message || logObj['message']) return @@ -69,3 +72,12 @@ function printRelatedSources (msg: Object) { function printErrorSummary (message: string) { console.log(chalk.red('ERROR'), message) } + +function reportModifiedDependency (err: Error, msg: Object) { + printErrorSummary('Packages in the store have been mutated') + console.log() + console.log('These packages are modified:') + msg['modified'].forEach((pkgPath: string) => console.log(chalk.gray(pkgPath))) + console.log() + console.log(`You can run ${chalk.yellow('pnpm install')} to refetch the modified packages`) +} From 1612402b774a07b7e8c3ea06d0b72c572cd9cc5d Mon Sep 17 00:00:00 2001 From: zkochan Date: Mon, 6 Feb 2017 21:25:12 +0200 Subject: [PATCH 010/196] chore: release v0.2.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e37fb8999b..dee16e5bd0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.1.0", + "version": "0.2.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 7f6454c3162a0c31317507d43baed6c6c3ab7288 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 12 Feb 2017 23:05:55 +0200 Subject: [PATCH 011/196] refactor: run `console.log` less frequently Close #3 --- package.json | 2 + src/reportError.ts | 96 +++++++++++++++++++++++++++++----------------- 2 files changed, 63 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index dee16e5bd0..76b42fec9a 100644 --- a/package.json +++ b/package.json @@ -28,8 +28,10 @@ "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "dependencies": { "@types/chalk": "^0.4.31", + "@types/common-tags": "^1.2.5", "@types/node": "^7.0.0", "chalk": "^1.1.3", + "common-tags": "^1.4.0", "ndjson": "^1.5.0", "observatory": "^1.0.0", "pnpm-logger": "^0.0.1" diff --git a/src/reportError.ts b/src/reportError.ts index 4f8609981e..bd9ebc404a 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -1,5 +1,12 @@ import chalk = require('chalk') import {Log} from 'pnpm-logger' +import commonTags = require('common-tags') +import os = require('os') + +const stripIndent = commonTags.stripIndent +const EOL = os.EOL +const highlight = chalk.yellow +const colorPath = chalk.gray export default function reportError (logObj: Log) { if (logObj['err']) { @@ -18,66 +25,85 @@ export default function reportError (logObj: Log) { reportModifiedDependency(err, logObj['message']) return default: - printErrorSummary(err.message || logObj['message']) + console.log(formatErrorSummary(err.message || logObj['message'])) return } } - printErrorSummary(logObj['message']) + console.log(formatErrorSummary(logObj['message'])) } function reportUnexpectedStore (err: Error, msg: Object) { - printErrorSummary(err.message) - console.log() - console.log(`expected: ${chalk.yellow(msg['expectedStorePath'])}`) - console.log(`actual: ${chalk.yellow(msg['actualStorePath'])}`) - console.log() - console.log(`If you want to use the new store, run the same command with the ${chalk.yellow('--force')} parameter.`) + console.log(stripIndent` + ${formatErrorSummary(err.message)} + + expected: ${highlight(msg['expectedStorePath'])} + actual: ${highlight(msg['actualStorePath'])} + + If you want to use the new store, run the same command with the ${highlight('--force')} parameter. + `) } function reportStoreBreakingChange (err: Error, msg: Object) { - printErrorSummary(`The store used for the current node_modules is incomatible with the current version of pnpm`) - console.log(`Store path: ${chalk.gray(msg['storePath'])}`) - console.log() - console.log(`Try running the same command with the ${chalk.yellow('--force')} parameter.`) + let output = stripIndent` + ${formatErrorSummary(`The store used for the current node_modules is incomatible with the current version of pnpm`)} + Store path: ${colorPath(msg['storePath'])} + + Try running the same command with the ${highlight('--force')} parameter. + ` + if (msg['additionalInformation']) { - console.log() - console.log(msg['additionalInformation']) + output += EOL + EOL + msg['additionalInformation'] } - printRelatedSources(msg) + + output += formatRelatedSources(msg) + console.log(output) } function reportModulesBreakingChange (err: Error, msg: Object) { - printErrorSummary(`The current version of pnpm is not compatible with the available node_modules structure`) - console.log(`node_modules path: ${chalk.gray(msg['modulesPath'])}`) - console.log() - console.log(`Try running the same command with the ${chalk.yellow('--force')} parameter.`) + let output = stripIndent` + ${formatErrorSummary(`The current version of pnpm is not compatible with the available node_modules structure`)} + node_modules path: ${colorPath(msg['modulesPath'])} + + Try running the same command with the ${highlight('--force')} parameter. + ` + if (msg['additionalInformation']) { - console.log() - console.log(msg['additionalInformation']) + output += EOL + EOL + msg['additionalInformation'] } - printRelatedSources(msg) + + output += formatRelatedSources(msg) + console.log(output) } -function printRelatedSources (msg: Object) { - if (!msg['relatedIssue'] && !msg['relatedPR']) return - console.log() +function formatRelatedSources (msg: Object) { + let output = '' + + if (!msg['relatedIssue'] && !msg['relatedPR']) return output + + output += EOL + if (msg['relatedIssue']) { - console.log(`Related issue: ${chalk.gray(`https://github.com/pnpm/pnpm/issues/${msg['relatedIssue']}`)}`) + output += EOL + `Related issue: ${colorPath(`https://github.com/pnpm/pnpm/issues/${msg['relatedIssue']}`)}` } + if (msg['relatedPR']) { - console.log(`Related PR: ${chalk.gray(`https://github.com/pnpm/pnpm/pull/${msg['relatedPR']}`)}`) + output += EOL + `Related PR: ${colorPath(`https://github.com/pnpm/pnpm/pull/${msg['relatedPR']}`)}` } + + return output } -function printErrorSummary (message: string) { - console.log(chalk.red('ERROR'), message) +function formatErrorSummary (message: string) { + return `${chalk.red('ERROR')} ${message}` } function reportModifiedDependency (err: Error, msg: Object) { - printErrorSummary('Packages in the store have been mutated') - console.log() - console.log('These packages are modified:') - msg['modified'].forEach((pkgPath: string) => console.log(chalk.gray(pkgPath))) - console.log() - console.log(`You can run ${chalk.yellow('pnpm install')} to refetch the modified packages`) + console.log(stripIndent` + ${formatErrorSummary('Packages in the store have been mutated')} + + These packages are modified: + ${msg['modified'].map((pkgPath: string) => colorPath(pkgPath)).join(EOL)} + + You can run ${highlight('pnpm install')} to refetch the modified packages + `) } From 473f6ec8ae3783710e1ae88dec98a765bec2e039 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 12 Feb 2017 23:09:31 +0200 Subject: [PATCH 012/196] ci(travis): add .travis.yml --- .travis.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..c497bd0d5e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,17 @@ +language: node_js +node_js: + - 4 + - 6 + - 7 + +cache: + directories: + - $HOME/.pnpm-store + +sudo: false +before_install: + - npm install -g pnpm +install: + - pnpm install +script: + - npm test From 7e5dac166c6b343465423e2f9ffdf7a1988ca4a8 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 12 Feb 2017 23:20:41 +0200 Subject: [PATCH 013/196] feat: add reporter for breaking shrinkwrap change --- src/reportError.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/reportError.ts b/src/reportError.ts index bd9ebc404a..bf1262d310 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -24,6 +24,9 @@ export default function reportError (logObj: Log) { case 'MODIFIED_DEPENDENCY': reportModifiedDependency(err, logObj['message']) return + case 'SHRINKWRAP_BREAKING_CHANGE': + reportShrinkwrapBreakingChange(err, logObj['message']) + return default: console.log(formatErrorSummary(err.message || logObj['message'])) return @@ -107,3 +110,11 @@ function reportModifiedDependency (err: Error, msg: Object) { You can run ${highlight('pnpm install')} to refetch the modified packages `) } + +function reportShrinkwrapBreakingChange (err: Error, msg: Object) { + console.log(stripIndent` + ${formatErrorSummary(err.message)} + + Run with the ${highlight('--force')} parameter to recreate the shrinkwrap file. + `) +} From 2754731257dc9def6b6314edbc9770a0ef5a290d Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 12 Feb 2017 23:29:39 +0200 Subject: [PATCH 014/196] chore: release v0.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 76b42fec9a..ea7edf3fb1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.2.0", + "version": "0.3.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From b8a7a9681c346826b56be4c20fd65c7fe048575a Mon Sep 17 00:00:00 2001 From: zkochan Date: Fri, 24 Feb 2017 00:58:41 +0200 Subject: [PATCH 015/196] feat: less noise Show only statuses of the top dependencies --- package.json | 2 +- src/index.ts | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index ea7edf3fb1..1639a8c2f2 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "common-tags": "^1.4.0", "ndjson": "^1.5.0", "observatory": "^1.0.0", - "pnpm-logger": "^0.0.1" + "pnpm-logger": "^0.1.0" }, "devDependencies": { "commitizen": "^2.9.5", diff --git a/src/index.ts b/src/index.ts index a5acd04e76..8670e5b10e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,6 @@ import chalk = require('chalk') import observatory = require('observatory') import { ProgressLog, - DownloadStatus, LifecycleLog, Log, InstallCheckLog, @@ -56,39 +55,52 @@ export default function (streamParser: Object) { } }) + const trackedSpecs: string[] = [] + function reportProgress (logObj: ProgressLog) { // lazy get task function t () { return getTask(logObj.pkg.rawSpec, logObj.pkg.name) } + if (logObj.status === 'installing') { + if (!logObj.keypath || logObj.keypath.length > 0) { + return + } + t().status(logObj.status) + .details('') + trackedSpecs.push(logObj.pkg.rawSpec) + return + } + + if (trackedSpecs.indexOf(logObj.pkg.rawSpec) === -1) return + // the first thing it (probably) does is wait in queue to query the npm registry switch (logObj.status) { case 'resolving': t().status(chalk.yellow('finding ·')) return - case 'download-queued': + case 'resolved': if (logObj.pkg.version) { t().status(chalk.gray('queued ' + logObj.pkg.version + ' ↓')) return } t().status(chalk.gray('queued ↓')) return - case 'downloading': - case 'download-start': + case 'fetching': if (logObj.pkg.version) { t().status(chalk.yellow('downloading ' + logObj.pkg.version + ' ↓')) } else { t().status(chalk.yellow('downloading ↓')) } - if (logObj.downloadStatus && logObj.downloadStatus.total && logObj.downloadStatus.done < logObj.downloadStatus.total) { - t().details('' + Math.round(logObj.downloadStatus.done / logObj.downloadStatus.total * 100) + '%') + if (logObj.progress && logObj.progress.total && logObj.progress.done < logObj.progress.total) { + t().details('' + Math.round(logObj.progress.done / logObj.progress.total * 100) + '%') } else { t().details('') } return - case 'done': + case 'installed': if (logObj.pkg.version) { t().status(chalk.green('' + logObj.pkg.version + ' ✓')) .details('') @@ -96,10 +108,6 @@ export default function (streamParser: Object) { } t().status(chalk.green('OK ✓')).details('') return - case 'dependencies': - t().status(chalk.gray('' + logObj.pkg.version + ' ·')) - .details('') - return case 'error': t().status(chalk.red('ERROR ✗')) .details('') From 7267e92661a9eecc8277e3b22fca789a3e858d80 Mon Sep 17 00:00:00 2001 From: zkochan Date: Fri, 24 Feb 2017 01:00:10 +0200 Subject: [PATCH 016/196] chore: release v0.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1639a8c2f2..685eba8f87 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.3.0", + "version": "0.4.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From ab501207005d9c26bc1ca5b01c7f82aef07f4101 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 25 Feb 2017 16:25:38 +0200 Subject: [PATCH 017/196] fix: show statuses of top packages only --- package.json | 2 +- src/index.ts | 24 ++++++------------------ src/reportError.ts | 15 ++++++++------- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index 685eba8f87..9938224157 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "common-tags": "^1.4.0", "ndjson": "^1.5.0", "observatory": "^1.0.0", - "pnpm-logger": "^0.1.0" + "pnpm-logger": "^0.2.0" }, "devDependencies": { "commitizen": "^2.9.5", diff --git a/src/index.ts b/src/index.ts index 8670e5b10e..d721e1668d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -50,30 +50,18 @@ export default function (streamParser: Object) { reportError(obj) return } - console.log(obj['message']) + observatory.add(obj['message']) return } }) - const trackedSpecs: string[] = [] - function reportProgress (logObj: ProgressLog) { // lazy get task function t () { return getTask(logObj.pkg.rawSpec, logObj.pkg.name) } - if (logObj.status === 'installing') { - if (!logObj.keypath || logObj.keypath.length > 0) { - return - } - t().status(logObj.status) - .details('') - trackedSpecs.push(logObj.pkg.rawSpec) - return - } - - if (trackedSpecs.indexOf(logObj.pkg.rawSpec) === -1) return + if (logObj.pkg.dependentId) return // the first thing it (probably) does is wait in queue to query the npm registry @@ -122,10 +110,10 @@ export default function (streamParser: Object) { function reportLifecycle (logObj: LifecycleLog) { if (logObj.level === 'error') { - console.log(chalk.blue(logObj.pkgId) + '! ' + chalk.gray(logObj.line)) + observatory.add(`${chalk.blue(logObj.pkgId)}! ${chalk.gray(logObj.line)}`) return } - console.log(chalk.blue(logObj.pkgId) + ' ' + chalk.gray(logObj.line)) + observatory.add(`${chalk.blue(logObj.pkgId)} ${chalk.gray(logObj.line)}`) } function reportInstallCheck (logObj: InstallCheckLog) { @@ -134,11 +122,11 @@ function reportInstallCheck (logObj: InstallCheckLog) { printWarn(`Unsupported system. Skipping dependency ${logObj.pkgId}`) break case 'ENOTSUP': - console.warn(logObj) + observatory.add(logObj) break } } function printWarn (message: string) { - console.log(chalk.yellow('WARN'), message) + observatory.add(`${chalk.yellow('WARN')} ${message}`) } diff --git a/src/reportError.ts b/src/reportError.ts index bf1262d310..e90fe201c9 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -2,6 +2,7 @@ import chalk = require('chalk') import {Log} from 'pnpm-logger' import commonTags = require('common-tags') import os = require('os') +import observatory = require('observatory') const stripIndent = commonTags.stripIndent const EOL = os.EOL @@ -28,15 +29,15 @@ export default function reportError (logObj: Log) { reportShrinkwrapBreakingChange(err, logObj['message']) return default: - console.log(formatErrorSummary(err.message || logObj['message'])) + observatory.add(formatErrorSummary(err.message || logObj['message'])) return } } - console.log(formatErrorSummary(logObj['message'])) + observatory.add(formatErrorSummary(logObj['message'])) } function reportUnexpectedStore (err: Error, msg: Object) { - console.log(stripIndent` + observatory.add(stripIndent` ${formatErrorSummary(err.message)} expected: ${highlight(msg['expectedStorePath'])} @@ -59,7 +60,7 @@ function reportStoreBreakingChange (err: Error, msg: Object) { } output += formatRelatedSources(msg) - console.log(output) + observatory.add(output) } function reportModulesBreakingChange (err: Error, msg: Object) { @@ -75,7 +76,7 @@ function reportModulesBreakingChange (err: Error, msg: Object) { } output += formatRelatedSources(msg) - console.log(output) + observatory.add(output) } function formatRelatedSources (msg: Object) { @@ -101,7 +102,7 @@ function formatErrorSummary (message: string) { } function reportModifiedDependency (err: Error, msg: Object) { - console.log(stripIndent` + observatory.add(stripIndent` ${formatErrorSummary('Packages in the store have been mutated')} These packages are modified: @@ -112,7 +113,7 @@ function reportModifiedDependency (err: Error, msg: Object) { } function reportShrinkwrapBreakingChange (err: Error, msg: Object) { - console.log(stripIndent` + observatory.add(stripIndent` ${formatErrorSummary(err.message)} Run with the ${highlight('--force')} parameter to recreate the shrinkwrap file. From 5ab3a9e96657d03fdf26b1623b9bb5cdedecd4cd Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 25 Feb 2017 16:26:18 +0200 Subject: [PATCH 018/196] chore: add .shrinkwrap.yaml --- .gitignore | 2 - shrinkwrap.yaml | 1561 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1561 insertions(+), 2 deletions(-) create mode 100644 shrinkwrap.yaml diff --git a/.gitignore b/.gitignore index a0b6db2e30..fbd9508c5e 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,4 @@ jspm_packages # Optional REPL history .node_repl_history -shrinkwrap.yaml - lib diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml new file mode 100644 index 0000000000..bdc266a3e3 --- /dev/null +++ b/shrinkwrap.yaml @@ -0,0 +1,1561 @@ +dependencies: + '@types/chalk': registry.npmjs.org/@types/chalk/0.4.31 + '@types/common-tags': registry.npmjs.org/@types/common-tags/1.2.5 + '@types/node': registry.npmjs.org/@types/node/7.0.5 + chalk: registry.npmjs.org/chalk/1.1.3 + commitizen: registry.npmjs.org/commitizen/2.9.6 + common-tags: registry.npmjs.org/common-tags/1.4.0 + ghooks: registry.npmjs.org/ghooks/2.0.0 + ndjson: registry.npmjs.org/ndjson/1.5.0 + observatory: registry.npmjs.org/observatory/1.0.0 + pnpm-logger: registry.npmjs.org/pnpm-logger/0.2.0 + rimraf: registry.npmjs.org/rimraf/2.6.1 + tslint: registry.npmjs.org/tslint/4.4.2 + typescript: registry.npmjs.org/typescript/2.2.1 + validate-commit-msg: registry.npmjs.org/validate-commit-msg/2.11.1 +packages: + registry.npmjs.org/@types/chalk/0.4.31: + resolution: + shasum: a31d74241a6b1edbb973cf36d97a2896834a51f9 + tarball: 'https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz' + type: tarball + registry.npmjs.org/@types/common-tags/1.2.5: + resolution: + shasum: 14f29893992eb325594b83d739af02f2b6520f46 + tarball: 'https://registry.npmjs.org/@types/common-tags/-/common-tags-1.2.5.tgz' + type: tarball + registry.npmjs.org/@types/node/7.0.5: + resolution: + shasum: 96a0f0a618b7b606f1ec547403c00650210bfbb7 + tarball: 'https://registry.npmjs.org/@types/node/-/node-7.0.5.tgz' + type: tarball + registry.npmjs.org/ansi-align/1.1.0: + dependencies: + string-width: registry.npmjs.org/string-width/1.0.2 + resolution: + shasum: 2f0c1658829739add5ebb15e6b0c6e3423f016ba + tarball: 'https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz' + type: tarball + registry.npmjs.org/ansi-escapes/1.4.0: + resolution: + shasum: d3a8a83b319aa67793662b13e761c7911422306e + tarball: 'https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz' + type: tarball + registry.npmjs.org/ansi-regex/2.1.1: + resolution: + shasum: c3b33ab5ee360d86e0e628f0468ae7ef27d654df + tarball: 'https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz' + type: tarball + registry.npmjs.org/ansi-styles/2.2.1: + resolution: + shasum: b432dd3358b634cf75e1e4664368240533c1ddbe + tarball: 'https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz' + type: tarball + registry.npmjs.org/arr-diff/2.0.0: + dependencies: + arr-flatten: registry.npmjs.org/arr-flatten/1.0.1 + resolution: + shasum: 8f3b827f955a8bd669697e4a4256ac3ceae356cf + tarball: 'https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz' + type: tarball + registry.npmjs.org/arr-flatten/1.0.1: + resolution: + shasum: e5ffe54d45e19f32f216e91eb99c8ce892bb604b + tarball: 'https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz' + type: tarball + registry.npmjs.org/array-unique/0.2.1: + resolution: + shasum: a1d97ccafcbc2625cc70fadceb36a50c58b01a53 + tarball: 'https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz' + type: tarball + registry.npmjs.org/babel-code-frame/6.22.0: + dependencies: + chalk: registry.npmjs.org/chalk/1.1.3 + esutils: registry.npmjs.org/esutils/2.0.2 + js-tokens: registry.npmjs.org/js-tokens/3.0.1 + resolution: + shasum: 027620bee567a88c32561574e7fd0801d33118e4 + tarball: 'https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz' + type: tarball + registry.npmjs.org/babel-runtime/6.23.0: + dependencies: + core-js: registry.npmjs.org/core-js/2.4.1 + regenerator-runtime: registry.npmjs.org/regenerator-runtime/0.10.3 + resolution: + shasum: 0a9489f144de70efb3ce4300accdb329e2fc543b + tarball: 'https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz' + type: tarball + registry.npmjs.org/balanced-match/0.4.2: + resolution: + shasum: cb3f3e3c732dc0f01ee70b403f302e61d7709838 + tarball: 'https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz' + type: tarball + registry.npmjs.org/bole/3.0.2: + dependencies: + fast-safe-stringify: registry.npmjs.org/fast-safe-stringify/1.1.6 + individual: registry.npmjs.org/individual/3.0.0 + resolution: + shasum: bc8a483ca94049da9b837c1ad11cdfebee6e0514 + tarball: 'https://registry.npmjs.org/bole/-/bole-3.0.2.tgz' + type: tarball + registry.npmjs.org/boxen/0.6.0: + dependencies: + ansi-align: registry.npmjs.org/ansi-align/1.1.0 + camelcase: registry.npmjs.org/camelcase/2.1.1 + chalk: registry.npmjs.org/chalk/1.1.3 + cli-boxes: registry.npmjs.org/cli-boxes/1.0.0 + filled-array: registry.npmjs.org/filled-array/1.1.0 + object-assign: registry.npmjs.org/object-assign/4.1.1 + repeating: registry.npmjs.org/repeating/2.0.1 + string-width: registry.npmjs.org/string-width/1.0.2 + widest-line: registry.npmjs.org/widest-line/1.0.0 + resolution: + shasum: 8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6 + tarball: 'https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz' + type: tarball + registry.npmjs.org/brace-expansion/1.1.6: + dependencies: + balanced-match: registry.npmjs.org/balanced-match/0.4.2 + concat-map: registry.npmjs.org/concat-map/0.0.1 + resolution: + shasum: 7197d7eaa9b87e648390ea61fc66c84427420df9 + tarball: 'https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz' + type: tarball + registry.npmjs.org/braces/1.8.5: + dependencies: + expand-range: registry.npmjs.org/expand-range/1.8.2 + preserve: registry.npmjs.org/preserve/0.2.0 + repeat-element: registry.npmjs.org/repeat-element/1.1.2 + resolution: + shasum: ba77962e12dff969d6b76711e914b737857bf6a7 + tarball: 'https://registry.npmjs.org/braces/-/braces-1.8.5.tgz' + type: tarball + registry.npmjs.org/buffer-shims/1.0.0: + resolution: + shasum: 9978ce317388c649ad8793028c3477ef044a8b51 + tarball: 'https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz' + type: tarball + registry.npmjs.org/cachedir/1.1.1: + dependencies: + os-homedir: registry.npmjs.org/os-homedir/1.0.2 + resolution: + shasum: e1363075ea206a12767d92bb711c8a2f76a10f62 + tarball: 'https://registry.npmjs.org/cachedir/-/cachedir-1.1.1.tgz' + type: tarball + registry.npmjs.org/camelcase/2.1.1: + resolution: + shasum: 7c1d16d679a1bbe59ca02cacecfb011e201f5a1f + tarball: 'https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz' + type: tarball + registry.npmjs.org/capture-stack-trace/1.0.0: + resolution: + shasum: 4a6fa07399c26bba47f0b2496b4d0fb408c5550d + tarball: 'https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz' + type: tarball + registry.npmjs.org/chalk/1.1.3: + dependencies: + ansi-styles: registry.npmjs.org/ansi-styles/2.2.1 + escape-string-regexp: registry.npmjs.org/escape-string-regexp/1.0.5 + has-ansi: registry.npmjs.org/has-ansi/2.0.0 + strip-ansi: registry.npmjs.org/strip-ansi/3.0.1 + supports-color: registry.npmjs.org/supports-color/2.0.0 + resolution: + shasum: a8115c55e4a702fe4d150abd3872822a7e09fc98 + tarball: 'https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz' + type: tarball + registry.npmjs.org/cli-boxes/1.0.0: + resolution: + shasum: 4fa917c3e59c94a004cd61f8ee509da651687143 + tarball: 'https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz' + type: tarball + registry.npmjs.org/cli-cursor/1.0.2: + dependencies: + restore-cursor: registry.npmjs.org/restore-cursor/1.0.1 + resolution: + shasum: 64da3f7d56a54412e59794bd62dc35295e8f2987 + tarball: 'https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz' + type: tarball + registry.npmjs.org/cli-width/2.1.0: + resolution: + shasum: b234ca209b29ef66fc518d9b98d5847b00edf00a + tarball: 'https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz' + type: tarball + registry.npmjs.org/code-point-at/1.1.0: + resolution: + shasum: 0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77 + tarball: 'https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz' + type: tarball + registry.npmjs.org/colors/0.6.2: + resolution: + shasum: 2423fe6678ac0c5dae8852e5d0e5be08c997abcc + tarball: 'https://registry.npmjs.org/colors/-/colors-0.6.2.tgz' + type: tarball + registry.npmjs.org/colors/1.1.2: + resolution: + shasum: 168a4701756b6a7f51a12ce0c97bfa28c084ed63 + tarball: 'https://registry.npmjs.org/colors/-/colors-1.1.2.tgz' + type: tarball + registry.npmjs.org/commander/2.1.0: + resolution: + shasum: d121bbae860d9992a3d517ba96f56588e47c6781 + tarball: 'https://registry.npmjs.org/commander/-/commander-2.1.0.tgz' + type: tarball + registry.npmjs.org/commander/2.9.0: + dependencies: + graceful-readlink: registry.npmjs.org/graceful-readlink/1.0.1 + resolution: + shasum: 9c99094176e12240cb22d6c5146098400fe0f7d4 + tarball: 'https://registry.npmjs.org/commander/-/commander-2.9.0.tgz' + type: tarball + registry.npmjs.org/commitizen/2.9.6: + dependencies: + cachedir: registry.npmjs.org/cachedir/1.1.1 + chalk: registry.npmjs.org/chalk/1.1.3 + cz-conventional-changelog: registry.npmjs.org/cz-conventional-changelog/1.2.0 + dedent: registry.npmjs.org/dedent/0.6.0 + detect-indent: registry.npmjs.org/detect-indent/4.0.0 + find-node-modules: registry.npmjs.org/find-node-modules/1.0.4 + find-root: registry.npmjs.org/find-root/1.0.0 + fs-extra: registry.npmjs.org/fs-extra/1.0.0 + glob: registry.npmjs.org/glob/7.1.1 + inquirer: registry.npmjs.org/inquirer/1.2.3 + lodash: registry.npmjs.org/lodash/4.17.2 + minimist: registry.npmjs.org/minimist/1.2.0 + path-exists: registry.npmjs.org/path-exists/2.1.0 + shelljs: registry.npmjs.org/shelljs/0.7.6 + strip-json-comments: registry.npmjs.org/strip-json-comments/2.0.1 + resolution: + shasum: c0d00535ef264da7f63737edfda4228983fa2291 + tarball: 'https://registry.npmjs.org/commitizen/-/commitizen-2.9.6.tgz' + type: tarball + registry.npmjs.org/common-tags/1.4.0: + dependencies: + babel-runtime: registry.npmjs.org/babel-runtime/6.23.0 + resolution: + shasum: 1187be4f3d4cf0c0427d43f74eef1f73501614c0 + tarball: 'https://registry.npmjs.org/common-tags/-/common-tags-1.4.0.tgz' + type: tarball + registry.npmjs.org/concat-map/0.0.1: + resolution: + shasum: d8a96bd77fd68df7793a73036a3ba0d5405d477b + tarball: 'https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz' + type: tarball + registry.npmjs.org/concat-stream/1.6.0: + dependencies: + inherits: registry.npmjs.org/inherits/2.0.3 + readable-stream: registry.npmjs.org/readable-stream/2.2.3 + typedarray: registry.npmjs.org/typedarray/0.0.6 + resolution: + shasum: 0aac662fd52be78964d5532f694784e70110acf7 + tarball: 'https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz' + type: tarball + registry.npmjs.org/configstore/2.1.0: + dependencies: + dot-prop: registry.npmjs.org/dot-prop/3.0.0 + graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 + mkdirp: registry.npmjs.org/mkdirp/0.5.1 + object-assign: registry.npmjs.org/object-assign/4.1.1 + os-tmpdir: registry.npmjs.org/os-tmpdir/1.0.2 + osenv: registry.npmjs.org/osenv/0.1.4 + uuid: registry.npmjs.org/uuid/2.0.3 + write-file-atomic: registry.npmjs.org/write-file-atomic/1.3.1 + xdg-basedir: registry.npmjs.org/xdg-basedir/2.0.0 + resolution: + shasum: 737a3a7036e9886102aa6099e47bb33ab1aba1a1 + tarball: 'https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz' + type: tarball + registry.npmjs.org/conventional-commit-types/2.1.0: + resolution: + shasum: 45d860386c9a2e6537ee91d8a1b61bd0411b3d04 + tarball: 'https://registry.npmjs.org/conventional-commit-types/-/conventional-commit-types-2.1.0.tgz' + type: tarball + registry.npmjs.org/core-js/2.4.1: + resolution: + shasum: 4de911e667b0eae9124e34254b53aea6fc618d3e + tarball: 'https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz' + type: tarball + registry.npmjs.org/core-util-is/1.0.2: + resolution: + shasum: b5fd54220aa2bc5ab57aab7140c940754503c1a7 + tarball: 'https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz' + type: tarball + registry.npmjs.org/create-error-class/3.0.2: + dependencies: + capture-stack-trace: registry.npmjs.org/capture-stack-trace/1.0.0 + resolution: + shasum: 06be7abef947a3f14a30fd610671d401bca8b7b6 + tarball: 'https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz' + type: tarball + registry.npmjs.org/cross-spawn-async/2.2.5: + dependencies: + lru-cache: registry.npmjs.org/lru-cache/4.0.2 + which: registry.npmjs.org/which/1.2.12 + resolution: + shasum: 845ff0c0834a3ded9d160daca6d390906bb288cc + tarball: 'https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz' + type: tarball + registry.npmjs.org/cz-conventional-changelog/1.2.0: + dependencies: + conventional-commit-types: registry.npmjs.org/conventional-commit-types/2.1.0 + lodash.map: registry.npmjs.org/lodash.map/4.6.0 + longest: registry.npmjs.org/longest/1.0.1 + pad-right: registry.npmjs.org/pad-right/0.2.2 + right-pad: registry.npmjs.org/right-pad/1.0.1 + word-wrap: registry.npmjs.org/word-wrap/1.2.1 + resolution: + shasum: 2bca04964c8919b23f3fd6a89ef5e6008b31b3f8 + tarball: 'https://registry.npmjs.org/cz-conventional-changelog/-/cz-conventional-changelog-1.2.0.tgz' + type: tarball + registry.npmjs.org/dedent/0.6.0: + resolution: + shasum: 0e6da8f0ce52838ef5cec5c8f9396b0c1b64a3cb + tarball: 'https://registry.npmjs.org/dedent/-/dedent-0.6.0.tgz' + type: tarball + registry.npmjs.org/deep-extend/0.4.1: + resolution: + shasum: efe4113d08085f4e6f9687759810f807469e2253 + tarball: 'https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz' + type: tarball + registry.npmjs.org/detect-file/0.1.0: + dependencies: + fs-exists-sync: registry.npmjs.org/fs-exists-sync/0.1.0 + resolution: + shasum: 4935dedfd9488648e006b0129566e9386711ea63 + tarball: 'https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz' + type: tarball + registry.npmjs.org/detect-indent/4.0.0: + dependencies: + repeating: registry.npmjs.org/repeating/2.0.1 + resolution: + shasum: f76d064352cdf43a1cb6ce619c4ee3a9475de208 + tarball: 'https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz' + type: tarball + registry.npmjs.org/diff/3.2.0: + resolution: + shasum: c9ce393a4b7cbd0b058a725c93df299027868ff9 + tarball: 'https://registry.npmjs.org/diff/-/diff-3.2.0.tgz' + type: tarball + registry.npmjs.org/dot-prop/3.0.0: + dependencies: + is-obj: registry.npmjs.org/is-obj/1.0.1 + resolution: + shasum: 1b708af094a49c9a0e7dbcad790aba539dac1177 + tarball: 'https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz' + type: tarball + registry.npmjs.org/duplexer2/0.1.4: + dependencies: + readable-stream: registry.npmjs.org/readable-stream/2.2.3 + resolution: + shasum: 8b12dab878c0d69e3e7891051662a32fc6bddcc1 + tarball: 'https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz' + type: tarball + registry.npmjs.org/error-ex/1.3.0: + dependencies: + is-arrayish: registry.npmjs.org/is-arrayish/0.2.1 + resolution: + shasum: e67b43f3e82c96ea3a584ffee0b9fc3325d802d9 + tarball: 'https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz' + type: tarball + registry.npmjs.org/escape-string-regexp/1.0.5: + resolution: + shasum: 1b61c0562190a8dff6ae3bb2cf0200ca130b86d4 + tarball: 'https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz' + type: tarball + registry.npmjs.org/esutils/2.0.2: + resolution: + shasum: 0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b + tarball: 'https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz' + type: tarball + registry.npmjs.org/execa/0.4.0: + dependencies: + cross-spawn-async: registry.npmjs.org/cross-spawn-async/2.2.5 + is-stream: registry.npmjs.org/is-stream/1.1.0 + npm-run-path: registry.npmjs.org/npm-run-path/1.0.0 + object-assign: registry.npmjs.org/object-assign/4.1.1 + path-key: registry.npmjs.org/path-key/1.0.0 + strip-eof: registry.npmjs.org/strip-eof/1.0.0 + resolution: + shasum: 4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3 + tarball: 'https://registry.npmjs.org/execa/-/execa-0.4.0.tgz' + type: tarball + registry.npmjs.org/exit-hook/1.1.1: + resolution: + shasum: f05ca233b48c05d54fff07765df8507e95c02ff8 + tarball: 'https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz' + type: tarball + registry.npmjs.org/expand-brackets/0.1.5: + dependencies: + is-posix-bracket: registry.npmjs.org/is-posix-bracket/0.1.1 + resolution: + shasum: df07284e342a807cd733ac5af72411e581d1177b + tarball: 'https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz' + type: tarball + registry.npmjs.org/expand-range/1.8.2: + dependencies: + fill-range: registry.npmjs.org/fill-range/2.2.3 + resolution: + shasum: a299effd335fe2721ebae8e257ec79644fc85337 + tarball: 'https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz' + type: tarball + registry.npmjs.org/expand-tilde/1.2.2: + dependencies: + os-homedir: registry.npmjs.org/os-homedir/1.0.2 + resolution: + shasum: 0b81eba897e5a3d31d1c3d102f8f01441e559449 + tarball: 'https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz' + type: tarball + registry.npmjs.org/extend/3.0.0: + resolution: + shasum: 5a474353b9f3353ddd8176dfd37b91c83a46f1d4 + tarball: 'https://registry.npmjs.org/extend/-/extend-3.0.0.tgz' + type: tarball + registry.npmjs.org/external-editor/1.1.1: + dependencies: + extend: registry.npmjs.org/extend/3.0.0 + spawn-sync: registry.npmjs.org/spawn-sync/1.0.15 + tmp: registry.npmjs.org/tmp/0.0.29 + resolution: + shasum: 12d7b0db850f7ff7e7081baf4005700060c4600b + tarball: 'https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz' + type: tarball + registry.npmjs.org/extglob/0.3.2: + dependencies: + is-extglob: registry.npmjs.org/is-extglob/1.0.0 + resolution: + shasum: 2e18ff3d2f49ab2765cec9023f011daa8d8349a1 + tarball: 'https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz' + type: tarball + registry.npmjs.org/fast-safe-stringify/1.1.6: + resolution: + shasum: b30f4a55cbf657895a5b07b2c9c6fec91580802d + tarball: 'https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.1.6.tgz' + type: tarball + registry.npmjs.org/figures/1.7.0: + dependencies: + escape-string-regexp: registry.npmjs.org/escape-string-regexp/1.0.5 + object-assign: registry.npmjs.org/object-assign/4.1.1 + resolution: + shasum: cbe1e3affcf1cd44b80cadfed28dc793a9701d2e + tarball: 'https://registry.npmjs.org/figures/-/figures-1.7.0.tgz' + type: tarball + registry.npmjs.org/filename-regex/2.0.0: + resolution: + shasum: 996e3e80479b98b9897f15a8a58b3d084e926775 + tarball: 'https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz' + type: tarball + registry.npmjs.org/fill-range/2.2.3: + dependencies: + is-number: registry.npmjs.org/is-number/2.1.0 + isobject: registry.npmjs.org/isobject/2.1.0 + randomatic: registry.npmjs.org/randomatic/1.1.6 + repeat-element: registry.npmjs.org/repeat-element/1.1.2 + repeat-string: registry.npmjs.org/repeat-string/1.6.1 + resolution: + shasum: 50b77dfd7e469bc7492470963699fe7a8485a723 + tarball: 'https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz' + type: tarball + registry.npmjs.org/filled-array/1.1.0: + resolution: + shasum: c3c4f6c663b923459a9aa29912d2d031f1507f84 + tarball: 'https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz' + type: tarball + registry.npmjs.org/find-node-modules/1.0.4: + dependencies: + findup-sync: registry.npmjs.org/findup-sync/0.4.2 + merge: registry.npmjs.org/merge/1.2.0 + resolution: + shasum: b6deb3cccb699c87037677bcede2c5f5862b2550 + tarball: 'https://registry.npmjs.org/find-node-modules/-/find-node-modules-1.0.4.tgz' + type: tarball + registry.npmjs.org/find-root/1.0.0: + resolution: + shasum: 962ff211aab25c6520feeeb8d6287f8f6e95807a + tarball: 'https://registry.npmjs.org/find-root/-/find-root-1.0.0.tgz' + type: tarball + registry.npmjs.org/findup-sync/0.3.0: + dependencies: + glob: registry.npmjs.org/glob/5.0.15 + resolution: + shasum: 37930aa5d816b777c03445e1966cc6790a4c0b16 + tarball: 'https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz' + type: tarball + registry.npmjs.org/findup-sync/0.4.2: + dependencies: + detect-file: registry.npmjs.org/detect-file/0.1.0 + is-glob: registry.npmjs.org/is-glob/2.0.1 + micromatch: registry.npmjs.org/micromatch/2.3.11 + resolve-dir: registry.npmjs.org/resolve-dir/0.1.1 + resolution: + shasum: a8117d0f73124f5a4546839579fe52d7129fb5e5 + tarball: 'https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.2.tgz' + type: tarball + registry.npmjs.org/findup/0.1.5: + dependencies: + colors: registry.npmjs.org/colors/0.6.2 + commander: registry.npmjs.org/commander/2.1.0 + resolution: + shasum: 8ad929a3393bac627957a7e5de4623b06b0e2ceb + tarball: 'https://registry.npmjs.org/findup/-/findup-0.1.5.tgz' + type: tarball + registry.npmjs.org/for-in/0.1.6: + resolution: + shasum: c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8 + tarball: 'https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz' + type: tarball + registry.npmjs.org/for-own/0.1.4: + dependencies: + for-in: registry.npmjs.org/for-in/0.1.6 + resolution: + shasum: 0149b41a39088c7515f51ebe1c1386d45f935072 + tarball: 'https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz' + type: tarball + registry.npmjs.org/fs-exists-sync/0.1.0: + resolution: + shasum: 982d6893af918e72d08dec9e8673ff2b5a8d6add + tarball: 'https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz' + type: tarball + registry.npmjs.org/fs-extra/1.0.0: + dependencies: + graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 + jsonfile: registry.npmjs.org/jsonfile/2.4.0 + klaw: registry.npmjs.org/klaw/1.3.1 + resolution: + shasum: cd3ce5f7e7cb6145883fcae3191e9877f8587950 + tarball: 'https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz' + type: tarball + registry.npmjs.org/fs.realpath/1.0.0: + resolution: + shasum: 1504ad2523158caa40db4a2787cb01411994ea4f + tarball: 'https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz' + type: tarball + registry.npmjs.org/ghooks/2.0.0: + dependencies: + execa: registry.npmjs.org/execa/0.4.0 + findup: registry.npmjs.org/findup/0.1.5 + lodash.clone: registry.npmjs.org/lodash.clone/4.3.2 + manage-path: registry.npmjs.org/manage-path/2.0.0 + opt-cli: registry.npmjs.org/opt-cli/1.5.1 + path-exists: registry.npmjs.org/path-exists/2.1.0 + spawn-command: registry.npmjs.org/spawn-command/0.0.2 + resolution: + shasum: affd83a36e8b8fbdded9b851457c48ac74c8eab8 + tarball: 'https://registry.npmjs.org/ghooks/-/ghooks-2.0.0.tgz' + type: tarball + registry.npmjs.org/glob-base/0.3.0: + dependencies: + glob-parent: registry.npmjs.org/glob-parent/2.0.0 + is-glob: registry.npmjs.org/is-glob/2.0.1 + resolution: + shasum: dbb164f6221b1c0b1ccf82aea328b497df0ea3c4 + tarball: 'https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz' + type: tarball + registry.npmjs.org/glob-parent/2.0.0: + dependencies: + is-glob: registry.npmjs.org/is-glob/2.0.1 + resolution: + shasum: 81383d72db054fcccf5336daa902f182f6edbb28 + tarball: 'https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz' + type: tarball + registry.npmjs.org/glob/5.0.15: + dependencies: + inflight: registry.npmjs.org/inflight/1.0.6 + inherits: registry.npmjs.org/inherits/2.0.3 + minimatch: registry.npmjs.org/minimatch/3.0.3 + once: registry.npmjs.org/once/1.4.0 + path-is-absolute: registry.npmjs.org/path-is-absolute/1.0.1 + resolution: + shasum: 1bc936b9e02f4a603fcc222ecf7633d30b8b93b1 + tarball: 'https://registry.npmjs.org/glob/-/glob-5.0.15.tgz' + type: tarball + registry.npmjs.org/glob/7.1.1: + dependencies: + fs.realpath: registry.npmjs.org/fs.realpath/1.0.0 + inflight: registry.npmjs.org/inflight/1.0.6 + inherits: registry.npmjs.org/inherits/2.0.3 + minimatch: registry.npmjs.org/minimatch/3.0.3 + once: registry.npmjs.org/once/1.4.0 + path-is-absolute: registry.npmjs.org/path-is-absolute/1.0.1 + resolution: + shasum: 805211df04faaf1c63a3600306cdf5ade50b2ec8 + tarball: 'https://registry.npmjs.org/glob/-/glob-7.1.1.tgz' + type: tarball + registry.npmjs.org/global-modules/0.2.3: + dependencies: + global-prefix: registry.npmjs.org/global-prefix/0.1.5 + is-windows: registry.npmjs.org/is-windows/0.2.0 + resolution: + shasum: ea5a3bed42c6d6ce995a4f8a1269b5dae223828d + tarball: 'https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz' + type: tarball + registry.npmjs.org/global-prefix/0.1.5: + dependencies: + homedir-polyfill: registry.npmjs.org/homedir-polyfill/1.0.1 + ini: registry.npmjs.org/ini/1.3.4 + is-windows: registry.npmjs.org/is-windows/0.2.0 + which: registry.npmjs.org/which/1.2.12 + resolution: + shasum: 8d3bc6b8da3ca8112a160d8d496ff0462bfef78f + tarball: 'https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz' + type: tarball + registry.npmjs.org/got/5.7.1: + dependencies: + create-error-class: registry.npmjs.org/create-error-class/3.0.2 + duplexer2: registry.npmjs.org/duplexer2/0.1.4 + is-redirect: registry.npmjs.org/is-redirect/1.0.0 + is-retry-allowed: registry.npmjs.org/is-retry-allowed/1.1.0 + is-stream: registry.npmjs.org/is-stream/1.1.0 + lowercase-keys: registry.npmjs.org/lowercase-keys/1.0.0 + node-status-codes: registry.npmjs.org/node-status-codes/1.0.0 + object-assign: registry.npmjs.org/object-assign/4.1.1 + parse-json: registry.npmjs.org/parse-json/2.2.0 + pinkie-promise: registry.npmjs.org/pinkie-promise/2.0.1 + read-all-stream: registry.npmjs.org/read-all-stream/3.1.0 + readable-stream: registry.npmjs.org/readable-stream/2.2.3 + timed-out: registry.npmjs.org/timed-out/3.1.3 + unzip-response: registry.npmjs.org/unzip-response/1.0.2 + url-parse-lax: registry.npmjs.org/url-parse-lax/1.0.0 + resolution: + shasum: 5f81635a61e4a6589f180569ea4e381680a51f35 + tarball: 'https://registry.npmjs.org/got/-/got-5.7.1.tgz' + type: tarball + registry.npmjs.org/graceful-fs/4.1.11: + resolution: + shasum: 0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658 + tarball: 'https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz' + type: tarball + registry.npmjs.org/graceful-readlink/1.0.1: + resolution: + shasum: 4cafad76bc62f02fa039b2f94e9a3dd3a391a725 + tarball: 'https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz' + type: tarball + registry.npmjs.org/has-ansi/2.0.0: + dependencies: + ansi-regex: registry.npmjs.org/ansi-regex/2.1.1 + resolution: + shasum: 34f5049ce1ecdf2b0649af3ef24e45ed35416d91 + tarball: 'https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz' + type: tarball + registry.npmjs.org/homedir-polyfill/1.0.1: + dependencies: + parse-passwd: registry.npmjs.org/parse-passwd/1.0.0 + resolution: + shasum: 4c2bbc8a758998feebf5ed68580f76d46768b4bc + tarball: 'https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz' + type: tarball + registry.npmjs.org/imurmurhash/0.1.4: + resolution: + shasum: 9218b9b2b928a238b13dc4fb6b6d576f231453ea + tarball: 'https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz' + type: tarball + registry.npmjs.org/individual/3.0.0: + resolution: + shasum: e7ca4f85f8957b018734f285750dc22ec2f9862d + tarball: 'https://registry.npmjs.org/individual/-/individual-3.0.0.tgz' + type: tarball + registry.npmjs.org/inflight/1.0.6: + dependencies: + once: registry.npmjs.org/once/1.4.0 + wrappy: registry.npmjs.org/wrappy/1.0.2 + resolution: + shasum: 49bd6331d7d02d0c09bc910a1075ba8165b56df9 + tarball: 'https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz' + type: tarball + registry.npmjs.org/inherits/2.0.3: + resolution: + shasum: 633c2c83e3da42a502f52466022480f4208261de + tarball: 'https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz' + type: tarball + registry.npmjs.org/ini/1.3.4: + resolution: + shasum: 0537cb79daf59b59a1a517dff706c86ec039162e + tarball: 'https://registry.npmjs.org/ini/-/ini-1.3.4.tgz' + type: tarball + registry.npmjs.org/inquirer/1.2.3: + dependencies: + ansi-escapes: registry.npmjs.org/ansi-escapes/1.4.0 + chalk: registry.npmjs.org/chalk/1.1.3 + cli-cursor: registry.npmjs.org/cli-cursor/1.0.2 + cli-width: registry.npmjs.org/cli-width/2.1.0 + external-editor: registry.npmjs.org/external-editor/1.1.1 + figures: registry.npmjs.org/figures/1.7.0 + lodash: registry.npmjs.org/lodash/4.17.4 + mute-stream: registry.npmjs.org/mute-stream/0.0.6 + pinkie-promise: registry.npmjs.org/pinkie-promise/2.0.1 + run-async: registry.npmjs.org/run-async/2.3.0 + rx: registry.npmjs.org/rx/4.1.0 + string-width: registry.npmjs.org/string-width/1.0.2 + strip-ansi: registry.npmjs.org/strip-ansi/3.0.1 + through: registry.npmjs.org/through/2.3.8 + resolution: + shasum: 4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918 + tarball: 'https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz' + type: tarball + registry.npmjs.org/interpret/1.0.1: + resolution: + shasum: d579fb7f693b858004947af39fa0db49f795602c + tarball: 'https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz' + type: tarball + registry.npmjs.org/is-arrayish/0.2.1: + resolution: + shasum: 77c99840527aa8ecb1a8ba697b80645a7a926a9d + tarball: 'https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz' + type: tarball + registry.npmjs.org/is-buffer/1.1.4: + resolution: + shasum: cfc86ccd5dc5a52fa80489111c6920c457e2d98b + tarball: 'https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz' + type: tarball + registry.npmjs.org/is-dotfile/1.0.2: + resolution: + shasum: 2c132383f39199f8edc268ca01b9b007d205cc4d + tarball: 'https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz' + type: tarball + registry.npmjs.org/is-equal-shallow/0.1.3: + dependencies: + is-primitive: registry.npmjs.org/is-primitive/2.0.0 + resolution: + shasum: 2238098fc221de0bcfa5d9eac4c45d638aa1c534 + tarball: 'https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz' + type: tarball + registry.npmjs.org/is-extendable/0.1.1: + resolution: + shasum: 62b110e289a471418e3ec36a617d472e301dfc89 + tarball: 'https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz' + type: tarball + registry.npmjs.org/is-extglob/1.0.0: + resolution: + shasum: ac468177c4943405a092fc8f29760c6ffc6206c0 + tarball: 'https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz' + type: tarball + registry.npmjs.org/is-finite/1.0.2: + dependencies: + number-is-nan: registry.npmjs.org/number-is-nan/1.0.1 + resolution: + shasum: cc6677695602be550ef11e8b4aa6305342b6d0aa + tarball: 'https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz' + type: tarball + registry.npmjs.org/is-fullwidth-code-point/1.0.0: + dependencies: + number-is-nan: registry.npmjs.org/number-is-nan/1.0.1 + resolution: + shasum: ef9e31386f031a7f0d643af82fde50c457ef00cb + tarball: 'https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz' + type: tarball + registry.npmjs.org/is-glob/2.0.1: + dependencies: + is-extglob: registry.npmjs.org/is-extglob/1.0.0 + resolution: + shasum: d096f926a3ded5600f3fdfd91198cb0888c2d863 + tarball: 'https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz' + type: tarball + registry.npmjs.org/is-npm/1.0.0: + resolution: + shasum: f2fb63a65e4905b406c86072765a1a4dc793b9f4 + tarball: 'https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz' + type: tarball + registry.npmjs.org/is-number/2.1.0: + dependencies: + kind-of: registry.npmjs.org/kind-of/3.1.0 + resolution: + shasum: 01fcbbb393463a548f2f466cce16dece49db908f + tarball: 'https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz' + type: tarball + registry.npmjs.org/is-obj/1.0.1: + resolution: + shasum: 3e4729ac1f5fde025cd7d83a896dab9f4f67db0f + tarball: 'https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz' + type: tarball + registry.npmjs.org/is-posix-bracket/0.1.1: + resolution: + shasum: 3334dc79774368e92f016e6fbc0a88f5cd6e6bc4 + tarball: 'https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz' + type: tarball + registry.npmjs.org/is-primitive/2.0.0: + resolution: + shasum: 207bab91638499c07b2adf240a41a87210034575 + tarball: 'https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz' + type: tarball + registry.npmjs.org/is-promise/2.1.0: + resolution: + shasum: 79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa + tarball: 'https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz' + type: tarball + registry.npmjs.org/is-redirect/1.0.0: + resolution: + shasum: 1d03dded53bd8db0f30c26e4f95d36fc7c87dc24 + tarball: 'https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz' + type: tarball + registry.npmjs.org/is-retry-allowed/1.1.0: + resolution: + shasum: 11a060568b67339444033d0125a61a20d564fb34 + tarball: 'https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz' + type: tarball + registry.npmjs.org/is-stream/1.1.0: + resolution: + shasum: 12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44 + tarball: 'https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz' + type: tarball + registry.npmjs.org/is-windows/0.2.0: + resolution: + shasum: de1aa6d63ea29dd248737b69f1ff8b8002d2108c + tarball: 'https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz' + type: tarball + registry.npmjs.org/isarray/1.0.0: + resolution: + shasum: bb935d48582cba168c06834957a54a3e07124f11 + tarball: 'https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz' + type: tarball + registry.npmjs.org/isexe/1.1.2: + resolution: + shasum: 36f3e22e60750920f5e7241a476a8c6a42275ad0 + tarball: 'https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz' + type: tarball + registry.npmjs.org/isobject/2.1.0: + dependencies: + isarray: registry.npmjs.org/isarray/1.0.0 + resolution: + shasum: f065561096a3f1da2ef46272f815c840d87e0c89 + tarball: 'https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz' + type: tarball + registry.npmjs.org/js-tokens/3.0.1: + resolution: + shasum: 08e9f132484a2c45a30907e9dc4d5567b7f114d7 + tarball: 'https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz' + type: tarball + registry.npmjs.org/json-stringify-safe/5.0.1: + resolution: + shasum: 1296a2d58fd45f19a0f6ce01d65701e2c735b6eb + tarball: 'https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz' + type: tarball + registry.npmjs.org/jsonfile/2.4.0: + dependencies: + graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 + resolution: + shasum: 3736a2b428b87bbda0cc83b53fa3d633a35c2ae8 + tarball: 'https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz' + type: tarball + registry.npmjs.org/kind-of/3.1.0: + dependencies: + is-buffer: registry.npmjs.org/is-buffer/1.1.4 + resolution: + shasum: 475d698a5e49ff5e53d14e3e732429dc8bf4cf47 + tarball: 'https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz' + type: tarball + registry.npmjs.org/klaw/1.3.1: + dependencies: + graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 + resolution: + shasum: 4088433b46b3b1ba259d78785d8e96f73ba02439 + tarball: 'https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz' + type: tarball + registry.npmjs.org/latest-version/2.0.0: + dependencies: + package-json: registry.npmjs.org/package-json/2.4.0 + resolution: + shasum: 56f8d6139620847b8017f8f1f4d78e211324168b + tarball: 'https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz' + type: tarball + registry.npmjs.org/lazy-req/1.1.0: + resolution: + shasum: bdaebead30f8d824039ce0ce149d4daa07ba1fac + tarball: 'https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz' + type: tarball + registry.npmjs.org/lodash._baseclone/4.5.7: + resolution: + shasum: ce42ade08384ef5d62fa77c30f61a46e686f8434 + tarball: 'https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz' + type: tarball + registry.npmjs.org/lodash.clone/4.3.2: + dependencies: + lodash._baseclone: registry.npmjs.org/lodash._baseclone/4.5.7 + resolution: + shasum: e56b176b6823a7dde38f7f2bf58de7d5971200e9 + tarball: 'https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.3.2.tgz' + type: tarball + registry.npmjs.org/lodash.map/4.6.0: + resolution: + shasum: 771ec7839e3473d9c4cde28b19394c3562f4f6d3 + tarball: 'https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz' + type: tarball + registry.npmjs.org/lodash/3.10.1: + resolution: + shasum: 5bf45e8e49ba4189e17d482789dfd15bd140b7b6 + tarball: 'https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz' + type: tarball + registry.npmjs.org/lodash/4.17.2: + resolution: + shasum: 34a3055babe04ce42467b607d700072c7ff6bf42 + tarball: 'https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz' + type: tarball + registry.npmjs.org/lodash/4.17.4: + resolution: + shasum: 78203a4d1c328ae1d86dca6460e369b57f4055ae + tarball: 'https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz' + type: tarball + registry.npmjs.org/longest/1.0.1: + resolution: + shasum: 30a0b2da38f73770e8294a0d22e6625ed77d0097 + tarball: 'https://registry.npmjs.org/longest/-/longest-1.0.1.tgz' + type: tarball + registry.npmjs.org/lowercase-keys/1.0.0: + resolution: + shasum: 4e3366b39e7f5457e35f1324bdf6f88d0bfc7306 + tarball: 'https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz' + type: tarball + registry.npmjs.org/lru-cache/4.0.2: + dependencies: + pseudomap: registry.npmjs.org/pseudomap/1.0.2 + yallist: registry.npmjs.org/yallist/2.0.0 + resolution: + shasum: 1d17679c069cda5d040991a09dbc2c0db377e55e + tarball: 'https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz' + type: tarball + registry.npmjs.org/manage-path/2.0.0: + resolution: + shasum: f4cf8457b926eeee2a83b173501414bc76eb9597 + tarball: 'https://registry.npmjs.org/manage-path/-/manage-path-2.0.0.tgz' + type: tarball + registry.npmjs.org/merge/1.2.0: + resolution: + shasum: 7531e39d4949c281a66b8c5a6e0265e8b05894da + tarball: 'https://registry.npmjs.org/merge/-/merge-1.2.0.tgz' + type: tarball + registry.npmjs.org/micromatch/2.3.11: + dependencies: + arr-diff: registry.npmjs.org/arr-diff/2.0.0 + array-unique: registry.npmjs.org/array-unique/0.2.1 + braces: registry.npmjs.org/braces/1.8.5 + expand-brackets: registry.npmjs.org/expand-brackets/0.1.5 + extglob: registry.npmjs.org/extglob/0.3.2 + filename-regex: registry.npmjs.org/filename-regex/2.0.0 + is-extglob: registry.npmjs.org/is-extglob/1.0.0 + is-glob: registry.npmjs.org/is-glob/2.0.1 + kind-of: registry.npmjs.org/kind-of/3.1.0 + normalize-path: registry.npmjs.org/normalize-path/2.0.1 + object.omit: registry.npmjs.org/object.omit/2.0.1 + parse-glob: registry.npmjs.org/parse-glob/3.0.4 + regex-cache: registry.npmjs.org/regex-cache/0.4.3 + resolution: + shasum: 86677c97d1720b363431d04d0d15293bd38c1565 + tarball: 'https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz' + type: tarball + registry.npmjs.org/minimatch/3.0.3: + dependencies: + brace-expansion: registry.npmjs.org/brace-expansion/1.1.6 + resolution: + shasum: 2a4e4090b96b2db06a9d7df01055a62a77c9b774 + tarball: 'https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz' + type: tarball + registry.npmjs.org/minimist/0.0.10: + resolution: + shasum: de3f98543dbf96082be48ad1a0c7cda836301dcf + tarball: 'https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz' + type: tarball + registry.npmjs.org/minimist/0.0.8: + resolution: + shasum: 857fcabfc3397d2625b8228262e86aa7a011b05d + tarball: 'https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz' + type: tarball + registry.npmjs.org/minimist/1.2.0: + resolution: + shasum: a35008b20f41383eec1fb914f4cd5df79a264284 + tarball: 'https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz' + type: tarball + registry.npmjs.org/mkdirp/0.5.1: + dependencies: + minimist: registry.npmjs.org/minimist/0.0.8 + resolution: + shasum: 30057438eac6cf7f8c4767f38648d6697d75c903 + tarball: 'https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz' + type: tarball + registry.npmjs.org/mute-stream/0.0.6: + resolution: + shasum: 48962b19e169fd1dfc240b3f1e7317627bbc47db + tarball: 'https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz' + type: tarball + registry.npmjs.org/ndjson/1.5.0: + dependencies: + json-stringify-safe: registry.npmjs.org/json-stringify-safe/5.0.1 + minimist: registry.npmjs.org/minimist/1.2.0 + split2: registry.npmjs.org/split2/2.1.1 + through2: registry.npmjs.org/through2/2.0.3 + resolution: + shasum: ae603b36b134bcec347b452422b0bf98d5832ec8 + tarball: 'https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz' + type: tarball + registry.npmjs.org/node-status-codes/1.0.0: + resolution: + shasum: 5ae5541d024645d32a58fcddc9ceecea7ae3ac2f + tarball: 'https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz' + type: tarball + registry.npmjs.org/normalize-path/2.0.1: + resolution: + shasum: 47886ac1662760d4261b7d979d241709d3ce3f7a + tarball: 'https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz' + type: tarball + registry.npmjs.org/npm-run-path/1.0.0: + dependencies: + path-key: registry.npmjs.org/path-key/1.0.0 + resolution: + shasum: f5c32bf595fe81ae927daec52e82f8b000ac3c8f + tarball: 'https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz' + type: tarball + registry.npmjs.org/number-is-nan/1.0.1: + resolution: + shasum: 097b602b53422a522c1afb8790318336941a011d + tarball: 'https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz' + type: tarball + registry.npmjs.org/object-assign/4.1.1: + resolution: + shasum: 2109adc7965887cfc05cbbd442cac8bfbb360863 + tarball: 'https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz' + type: tarball + registry.npmjs.org/object.omit/2.0.1: + dependencies: + for-own: registry.npmjs.org/for-own/0.1.4 + is-extendable: registry.npmjs.org/is-extendable/0.1.1 + resolution: + shasum: 1a9c744829f39dbb858c76ca3579ae2a54ebd1fa + tarball: 'https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz' + type: tarball + registry.npmjs.org/observatory/1.0.0: + dependencies: + ansi-escapes: registry.npmjs.org/ansi-escapes/1.4.0 + chalk: registry.npmjs.org/chalk/1.1.3 + lodash: registry.npmjs.org/lodash/3.10.1 + resolution: + shasum: 2baa606e8299e6866914ec9c8a4db6a41136e59b + tarball: 'https://registry.npmjs.org/observatory/-/observatory-1.0.0.tgz' + type: tarball + registry.npmjs.org/once/1.4.0: + dependencies: + wrappy: registry.npmjs.org/wrappy/1.0.2 + resolution: + shasum: 583b1aa775961d4b113ac17d9c50baef9dd76bd1 + tarball: 'https://registry.npmjs.org/once/-/once-1.4.0.tgz' + type: tarball + registry.npmjs.org/onetime/1.1.0: + resolution: + shasum: a1f7838f8314c516f05ecefcbc4ccfe04b4ed789 + tarball: 'https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz' + type: tarball + registry.npmjs.org/opt-cli/1.5.1: + dependencies: + commander: registry.npmjs.org/commander/2.9.0 + lodash.clone: registry.npmjs.org/lodash.clone/4.3.2 + manage-path: registry.npmjs.org/manage-path/2.0.0 + spawn-command: registry.npmjs.org/spawn-command/0.0.2-1 + resolution: + shasum: 04db447b13c96b992eb31685266f4ed0d9736dc2 + tarball: 'https://registry.npmjs.org/opt-cli/-/opt-cli-1.5.1.tgz' + type: tarball + registry.npmjs.org/optimist/0.6.1: + dependencies: + minimist: registry.npmjs.org/minimist/0.0.10 + wordwrap: registry.npmjs.org/wordwrap/0.0.3 + resolution: + shasum: da3ea74686fa21a19a111c326e90eb15a0196686 + tarball: 'https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz' + type: tarball + registry.npmjs.org/os-homedir/1.0.2: + resolution: + shasum: ffbc4988336e0e833de0c168c7ef152121aa7fb3 + tarball: 'https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz' + type: tarball + registry.npmjs.org/os-shim/0.1.3: + resolution: + shasum: 6b62c3791cf7909ea35ed46e17658bb417cb3917 + tarball: 'https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz' + type: tarball + registry.npmjs.org/os-tmpdir/1.0.2: + resolution: + shasum: bbe67406c79aa85c5cfec766fe5734555dfa1274 + tarball: 'https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz' + type: tarball + registry.npmjs.org/osenv/0.1.4: + dependencies: + os-homedir: registry.npmjs.org/os-homedir/1.0.2 + os-tmpdir: registry.npmjs.org/os-tmpdir/1.0.2 + resolution: + shasum: 42fe6d5953df06c8064be6f176c3d05aaaa34644 + tarball: 'https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz' + type: tarball + registry.npmjs.org/package-json/2.4.0: + dependencies: + got: registry.npmjs.org/got/5.7.1 + registry-auth-token: registry.npmjs.org/registry-auth-token/3.1.0 + registry-url: registry.npmjs.org/registry-url/3.1.0 + semver: registry.npmjs.org/semver/5.3.0 + resolution: + shasum: 0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb + tarball: 'https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz' + type: tarball + registry.npmjs.org/pad-right/0.2.2: + dependencies: + repeat-string: registry.npmjs.org/repeat-string/1.6.1 + resolution: + shasum: 6fbc924045d244f2a2a244503060d3bfc6009774 + tarball: 'https://registry.npmjs.org/pad-right/-/pad-right-0.2.2.tgz' + type: tarball + registry.npmjs.org/parse-glob/3.0.4: + dependencies: + glob-base: registry.npmjs.org/glob-base/0.3.0 + is-dotfile: registry.npmjs.org/is-dotfile/1.0.2 + is-extglob: registry.npmjs.org/is-extglob/1.0.0 + is-glob: registry.npmjs.org/is-glob/2.0.1 + resolution: + shasum: b2c376cfb11f35513badd173ef0bb6e3a388391c + tarball: 'https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz' + type: tarball + registry.npmjs.org/parse-json/2.2.0: + dependencies: + error-ex: registry.npmjs.org/error-ex/1.3.0 + resolution: + shasum: f480f40434ef80741f8469099f8dea18f55a4dc9 + tarball: 'https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz' + type: tarball + registry.npmjs.org/parse-passwd/1.0.0: + resolution: + shasum: 6d5b934a456993b23d37f40a382d6f1666a8e5c6 + tarball: 'https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz' + type: tarball + registry.npmjs.org/path-exists/2.1.0: + dependencies: + pinkie-promise: registry.npmjs.org/pinkie-promise/2.0.1 + resolution: + shasum: 0feb6c64f0fc518d9a754dd5efb62c7022761f4b + tarball: 'https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz' + type: tarball + registry.npmjs.org/path-is-absolute/1.0.1: + resolution: + shasum: 174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f + tarball: 'https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz' + type: tarball + registry.npmjs.org/path-key/1.0.0: + resolution: + shasum: 5d53d578019646c0d68800db4e146e6bdc2ac7af + tarball: 'https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz' + type: tarball + registry.npmjs.org/path-parse/1.0.5: + resolution: + shasum: 3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1 + tarball: 'https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz' + type: tarball + registry.npmjs.org/pinkie-promise/2.0.1: + dependencies: + pinkie: registry.npmjs.org/pinkie/2.0.4 + resolution: + shasum: 2135d6dfa7a358c069ac9b178776288228450ffa + tarball: 'https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz' + type: tarball + registry.npmjs.org/pinkie/2.0.4: + resolution: + shasum: 72556b80cfa0d48a974e80e77248e80ed4f7f870 + tarball: 'https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz' + type: tarball + registry.npmjs.org/pnpm-logger/0.2.0: + dependencies: + bole: registry.npmjs.org/bole/3.0.2 + resolution: + shasum: 9e35a1282e4fae1a3c78cf4e31c4da9c776a9c79 + tarball: 'https://registry.npmjs.org/pnpm-logger/-/pnpm-logger-0.2.0.tgz' + type: tarball + registry.npmjs.org/prepend-http/1.0.4: + resolution: + shasum: d4f4562b0ce3696e41ac52d0e002e57a635dc6dc + tarball: 'https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz' + type: tarball + registry.npmjs.org/preserve/0.2.0: + resolution: + shasum: 815ed1f6ebc65926f865b310c0713bcb3315ce4b + tarball: 'https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz' + type: tarball + registry.npmjs.org/process-nextick-args/1.0.7: + resolution: + shasum: 150e20b756590ad3f91093f25a4f2ad8bff30ba3 + tarball: 'https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz' + type: tarball + registry.npmjs.org/pseudomap/1.0.2: + resolution: + shasum: f052a28da70e618917ef0a8ac34c1ae5a68286b3 + tarball: 'https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz' + type: tarball + registry.npmjs.org/randomatic/1.1.6: + dependencies: + is-number: registry.npmjs.org/is-number/2.1.0 + kind-of: registry.npmjs.org/kind-of/3.1.0 + resolution: + shasum: 110dcabff397e9dcff7c0789ccc0a49adf1ec5bb + tarball: 'https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz' + type: tarball + registry.npmjs.org/rc/1.1.7: + dependencies: + deep-extend: registry.npmjs.org/deep-extend/0.4.1 + ini: registry.npmjs.org/ini/1.3.4 + minimist: registry.npmjs.org/minimist/1.2.0 + strip-json-comments: registry.npmjs.org/strip-json-comments/2.0.1 + resolution: + shasum: c5ea564bb07aff9fd3a5b32e906c1d3a65940fea + tarball: 'https://registry.npmjs.org/rc/-/rc-1.1.7.tgz' + type: tarball + registry.npmjs.org/read-all-stream/3.1.0: + dependencies: + pinkie-promise: registry.npmjs.org/pinkie-promise/2.0.1 + readable-stream: registry.npmjs.org/readable-stream/2.2.3 + resolution: + shasum: 35c3e177f2078ef789ee4bfafa4373074eaef4fa + tarball: 'https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz' + type: tarball + registry.npmjs.org/readable-stream/2.2.3: + dependencies: + buffer-shims: registry.npmjs.org/buffer-shims/1.0.0 + core-util-is: registry.npmjs.org/core-util-is/1.0.2 + inherits: registry.npmjs.org/inherits/2.0.3 + isarray: registry.npmjs.org/isarray/1.0.0 + process-nextick-args: registry.npmjs.org/process-nextick-args/1.0.7 + string_decoder: registry.npmjs.org/string_decoder/0.10.31 + util-deprecate: registry.npmjs.org/util-deprecate/1.0.2 + resolution: + shasum: 9cf49463985df016c8ae8813097a9293a9b33729 + tarball: 'https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz' + type: tarball + registry.npmjs.org/rechoir/0.6.2: + dependencies: + resolve: registry.npmjs.org/resolve/1.3.1 + resolution: + shasum: 85204b54dba82d5742e28c96756ef43af50e3384 + tarball: 'https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz' + type: tarball + registry.npmjs.org/regenerator-runtime/0.10.3: + resolution: + shasum: 8c4367a904b51ea62a908ac310bf99ff90a82a3e + tarball: 'https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz' + type: tarball + registry.npmjs.org/regex-cache/0.4.3: + dependencies: + is-equal-shallow: registry.npmjs.org/is-equal-shallow/0.1.3 + is-primitive: registry.npmjs.org/is-primitive/2.0.0 + resolution: + shasum: 9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145 + tarball: 'https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz' + type: tarball + registry.npmjs.org/registry-auth-token/3.1.0: + dependencies: + rc: registry.npmjs.org/rc/1.1.7 + resolution: + shasum: 997c08256e0c7999837b90e944db39d8a790276b + tarball: 'https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz' + type: tarball + registry.npmjs.org/registry-url/3.1.0: + dependencies: + rc: registry.npmjs.org/rc/1.1.7 + resolution: + shasum: 3d4ef870f73dde1d77f0cf9a381432444e174942 + tarball: 'https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz' + type: tarball + registry.npmjs.org/repeat-element/1.1.2: + resolution: + shasum: ef089a178d1483baae4d93eb98b4f9e4e11d990a + tarball: 'https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz' + type: tarball + registry.npmjs.org/repeat-string/1.6.1: + resolution: + shasum: 8dcae470e1c88abc2d600fff4a776286da75e637 + tarball: 'https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz' + type: tarball + registry.npmjs.org/repeating/2.0.1: + dependencies: + is-finite: registry.npmjs.org/is-finite/1.0.2 + resolution: + shasum: 5214c53a926d3552707527fbab415dbc08d06dda + tarball: 'https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz' + type: tarball + registry.npmjs.org/resolve-dir/0.1.1: + dependencies: + expand-tilde: registry.npmjs.org/expand-tilde/1.2.2 + global-modules: registry.npmjs.org/global-modules/0.2.3 + resolution: + shasum: b219259a5602fac5c5c496ad894a6e8cc430261e + tarball: 'https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz' + type: tarball + registry.npmjs.org/resolve/1.3.1: + dependencies: + path-parse: registry.npmjs.org/path-parse/1.0.5 + resolution: + shasum: 5d0a1632609b6b00a22284293db1d5d973676314 + tarball: 'https://registry.npmjs.org/resolve/-/resolve-1.3.1.tgz' + type: tarball + registry.npmjs.org/restore-cursor/1.0.1: + dependencies: + exit-hook: registry.npmjs.org/exit-hook/1.1.1 + onetime: registry.npmjs.org/onetime/1.1.0 + resolution: + shasum: 34661f46886327fed2991479152252df92daa541 + tarball: 'https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz' + type: tarball + registry.npmjs.org/right-pad/1.0.1: + resolution: + shasum: 8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0 + tarball: 'https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz' + type: tarball + registry.npmjs.org/rimraf/2.6.1: + dependencies: + glob: registry.npmjs.org/glob/7.1.1 + resolution: + shasum: c2338ec643df7a1b7fe5c54fa86f57428a55f33d + tarball: 'https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz' + type: tarball + registry.npmjs.org/run-async/2.3.0: + dependencies: + is-promise: registry.npmjs.org/is-promise/2.1.0 + resolution: + shasum: 0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0 + tarball: 'https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz' + type: tarball + registry.npmjs.org/rx/4.1.0: + resolution: + shasum: a5f13ff79ef3b740fe30aa803fb09f98805d4782 + tarball: 'https://registry.npmjs.org/rx/-/rx-4.1.0.tgz' + type: tarball + registry.npmjs.org/semver-diff/2.1.0: + dependencies: + semver: registry.npmjs.org/semver/5.3.0 + resolution: + shasum: 4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36 + tarball: 'https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz' + type: tarball + registry.npmjs.org/semver-regex/1.0.0: + resolution: + shasum: 92a4969065f9c70c694753d55248fc68f8f652c9 + tarball: 'https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz' + type: tarball + registry.npmjs.org/semver/5.3.0: + resolution: + shasum: 9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f + tarball: 'https://registry.npmjs.org/semver/-/semver-5.3.0.tgz' + type: tarball + registry.npmjs.org/shelljs/0.7.6: + dependencies: + glob: registry.npmjs.org/glob/7.1.1 + interpret: registry.npmjs.org/interpret/1.0.1 + rechoir: registry.npmjs.org/rechoir/0.6.2 + resolution: + shasum: 379cccfb56b91c8601e4793356eb5382924de9ad + tarball: 'https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz' + type: tarball + registry.npmjs.org/slide/1.1.6: + resolution: + shasum: 56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707 + tarball: 'https://registry.npmjs.org/slide/-/slide-1.1.6.tgz' + type: tarball + registry.npmjs.org/spawn-command/0.0.2: + resolution: + shasum: 9544e1a43ca045f8531aac1a48cb29bdae62338e + tarball: 'https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2.tgz' + type: tarball + registry.npmjs.org/spawn-command/0.0.2-1: + resolution: + shasum: 62f5e9466981c1b796dc5929937e11c9c6921bd0 + tarball: 'https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz' + type: tarball + registry.npmjs.org/spawn-sync/1.0.15: + dependencies: + concat-stream: registry.npmjs.org/concat-stream/1.6.0 + os-shim: registry.npmjs.org/os-shim/0.1.3 + resolution: + shasum: b00799557eb7fb0c8376c29d44e8a1ea67e57476 + tarball: 'https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz' + type: tarball + registry.npmjs.org/split2/2.1.1: + dependencies: + through2: registry.npmjs.org/through2/2.0.3 + resolution: + shasum: 7a1f551e176a90ecd3345f7246a0cfe175ef4fd0 + tarball: 'https://registry.npmjs.org/split2/-/split2-2.1.1.tgz' + type: tarball + registry.npmjs.org/string-width/1.0.2: + dependencies: + code-point-at: registry.npmjs.org/code-point-at/1.1.0 + is-fullwidth-code-point: registry.npmjs.org/is-fullwidth-code-point/1.0.0 + strip-ansi: registry.npmjs.org/strip-ansi/3.0.1 + resolution: + shasum: 118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3 + tarball: 'https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz' + type: tarball + registry.npmjs.org/string_decoder/0.10.31: + resolution: + shasum: 62e203bc41766c6c28c9fc84301dab1c5310fa94 + tarball: 'https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz' + type: tarball + registry.npmjs.org/strip-ansi/3.0.1: + dependencies: + ansi-regex: registry.npmjs.org/ansi-regex/2.1.1 + resolution: + shasum: 6a385fb8853d952d5ff05d0e8aaf94278dc63dcf + tarball: 'https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz' + type: tarball + registry.npmjs.org/strip-eof/1.0.0: + resolution: + shasum: bb43ff5598a6eb05d89b59fcd129c983313606bf + tarball: 'https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz' + type: tarball + registry.npmjs.org/strip-json-comments/2.0.1: + resolution: + shasum: 3c531942e908c2697c0ec344858c286c7ca0a60a + tarball: 'https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz' + type: tarball + registry.npmjs.org/supports-color/2.0.0: + resolution: + shasum: 535d045ce6b6363fa40117084629995e9df324c7 + tarball: 'https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz' + type: tarball + registry.npmjs.org/through/2.3.8: + resolution: + shasum: 0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5 + tarball: 'https://registry.npmjs.org/through/-/through-2.3.8.tgz' + type: tarball + registry.npmjs.org/through2/2.0.3: + dependencies: + readable-stream: registry.npmjs.org/readable-stream/2.2.3 + xtend: registry.npmjs.org/xtend/4.0.1 + resolution: + shasum: 0004569b37c7c74ba39c43f3ced78d1ad94140be + tarball: 'https://registry.npmjs.org/through2/-/through2-2.0.3.tgz' + type: tarball + registry.npmjs.org/timed-out/3.1.3: + resolution: + shasum: 95860bfcc5c76c277f8f8326fd0f5b2e20eba217 + tarball: 'https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz' + type: tarball + registry.npmjs.org/tmp/0.0.29: + dependencies: + os-tmpdir: registry.npmjs.org/os-tmpdir/1.0.2 + resolution: + shasum: f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0 + tarball: 'https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz' + type: tarball + registry.npmjs.org/tslint/4.4.2: + dependencies: + babel-code-frame: registry.npmjs.org/babel-code-frame/6.22.0 + colors: registry.npmjs.org/colors/1.1.2 + diff: registry.npmjs.org/diff/3.2.0 + findup-sync: registry.npmjs.org/findup-sync/0.3.0 + glob: registry.npmjs.org/glob/7.1.1 + optimist: registry.npmjs.org/optimist/0.6.1 + resolve: registry.npmjs.org/resolve/1.3.1 + update-notifier: registry.npmjs.org/update-notifier/1.0.3 + resolution: + shasum: b14cb79ae039c72471ab4c2627226b940dda19c6 + tarball: 'https://registry.npmjs.org/tslint/-/tslint-4.4.2.tgz' + type: tarball + registry.npmjs.org/typedarray/0.0.6: + resolution: + shasum: 867ac74e3864187b1d3d47d996a78ec5c8830777 + tarball: 'https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz' + type: tarball + registry.npmjs.org/typescript/2.2.1: + resolution: + shasum: 4862b662b988a4c8ff691cc7969622d24db76ae9 + tarball: 'https://registry.npmjs.org/typescript/-/typescript-2.2.1.tgz' + type: tarball + registry.npmjs.org/unzip-response/1.0.2: + resolution: + shasum: b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe + tarball: 'https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz' + type: tarball + registry.npmjs.org/update-notifier/1.0.3: + dependencies: + boxen: registry.npmjs.org/boxen/0.6.0 + chalk: registry.npmjs.org/chalk/1.1.3 + configstore: registry.npmjs.org/configstore/2.1.0 + is-npm: registry.npmjs.org/is-npm/1.0.0 + latest-version: registry.npmjs.org/latest-version/2.0.0 + lazy-req: registry.npmjs.org/lazy-req/1.1.0 + semver-diff: registry.npmjs.org/semver-diff/2.1.0 + xdg-basedir: registry.npmjs.org/xdg-basedir/2.0.0 + resolution: + shasum: 8f92c515482bd6831b7c93013e70f87552c7cf5a + tarball: 'https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz' + type: tarball + registry.npmjs.org/url-parse-lax/1.0.0: + dependencies: + prepend-http: registry.npmjs.org/prepend-http/1.0.4 + resolution: + shasum: 7af8f303645e9bd79a272e7a14ac68bc0609da73 + tarball: 'https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz' + type: tarball + registry.npmjs.org/util-deprecate/1.0.2: + resolution: + shasum: 450d4dc9fa70de732762fbd2d4a28981419a0ccf + tarball: 'https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz' + type: tarball + registry.npmjs.org/uuid/2.0.3: + resolution: + shasum: 67e2e863797215530dff318e5bf9dcebfd47b21a + tarball: 'https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz' + type: tarball + registry.npmjs.org/validate-commit-msg/2.11.1: + dependencies: + conventional-commit-types: registry.npmjs.org/conventional-commit-types/2.1.0 + findup: registry.npmjs.org/findup/0.1.5 + semver-regex: registry.npmjs.org/semver-regex/1.0.0 + resolution: + shasum: c8f86643ca03b26da1b4f3e37d7f6e659fbc34ca + tarball: 'https://registry.npmjs.org/validate-commit-msg/-/validate-commit-msg-2.11.1.tgz' + type: tarball + registry.npmjs.org/which/1.2.12: + dependencies: + isexe: registry.npmjs.org/isexe/1.1.2 + resolution: + shasum: de67b5e450269f194909ef23ece4ebe416fa1192 + tarball: 'https://registry.npmjs.org/which/-/which-1.2.12.tgz' + type: tarball + registry.npmjs.org/widest-line/1.0.0: + dependencies: + string-width: registry.npmjs.org/string-width/1.0.2 + resolution: + shasum: 0c09c85c2a94683d0d7eaf8ee097d564bf0e105c + tarball: 'https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz' + type: tarball + registry.npmjs.org/word-wrap/1.2.1: + resolution: + shasum: 248f459b465d179a17bc407c854d3151d07e45d8 + tarball: 'https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.1.tgz' + type: tarball + registry.npmjs.org/wordwrap/0.0.3: + resolution: + shasum: a3d5da6cd5c0bc0008d37234bbaf1bed63059107 + tarball: 'https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz' + type: tarball + registry.npmjs.org/wrappy/1.0.2: + resolution: + shasum: b5243d8f3ec1aa35f1364605bc0d1036e30ab69f + tarball: 'https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz' + type: tarball + registry.npmjs.org/write-file-atomic/1.3.1: + dependencies: + graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 + imurmurhash: registry.npmjs.org/imurmurhash/0.1.4 + slide: registry.npmjs.org/slide/1.1.6 + resolution: + shasum: 7d45ba32316328dd1ec7d90f60ebc0d845bb759a + tarball: 'https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.1.tgz' + type: tarball + registry.npmjs.org/xdg-basedir/2.0.0: + dependencies: + os-homedir: registry.npmjs.org/os-homedir/1.0.2 + resolution: + shasum: edbc903cc385fc04523d966a335504b5504d1bd2 + tarball: 'https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz' + type: tarball + registry.npmjs.org/xtend/4.0.1: + resolution: + shasum: a5c6d532be656e23db820efb943a1f04998d63af + tarball: 'https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz' + type: tarball + registry.npmjs.org/yallist/2.0.0: + resolution: + shasum: 306c543835f09ee1a4cb23b7bce9ab341c91cdd4 + tarball: 'https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz' + type: tarball +version: 0 From 6c320b44e7c2be2160a75f5133289f201f076f3d Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 25 Feb 2017 19:14:53 +0200 Subject: [PATCH 019/196] chore: release v0.4.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9938224157..e98f86bf54 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.4.0", + "version": "0.4.1", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 32c2a0190116baf355ee26a627d98d167c1dec3e Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 25 Feb 2017 19:15:59 +0200 Subject: [PATCH 020/196] fix: notify about subdeps being installed --- src/index.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index d721e1668d..edd528be12 100644 --- a/src/index.ts +++ b/src/index.ts @@ -66,15 +66,25 @@ export default function (streamParser: Object) { // the first thing it (probably) does is wait in queue to query the npm registry switch (logObj.status) { + case 'installing': + t().status(chalk.gray('queued ↓')) + return case 'resolving': t().status(chalk.yellow('finding ·')) return case 'resolved': if (logObj.pkg.version) { - t().status(chalk.gray('queued ' + logObj.pkg.version + ' ↓')) + t().status(chalk.yellow('installing ' + logObj.pkg.version + ' .')) return } - t().status(chalk.gray('queued ↓')) + t().status(chalk.yellow('installing .')) + return + case 'fetched': + if (logObj.pkg.version) { + t().status(chalk.yellow('installing dependencies ' + logObj.pkg.version + ' .')) + return + } + t().status(chalk.yellow('installing dependencies .')) return case 'fetching': if (logObj.pkg.version) { From 82523e871824b909bcf6b9a6d6ccdb51ef213fc6 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 25 Feb 2017 19:16:56 +0200 Subject: [PATCH 021/196] chore: release v0.4.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e98f86bf54..4e0a7b54a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.4.1", + "version": "0.4.2", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 0bf44088487008a9b861641818b0ad09346f0649 Mon Sep 17 00:00:00 2001 From: zkochan Date: Mon, 6 Mar 2017 01:16:52 +0200 Subject: [PATCH 022/196] chore: update shrinkwrap.yaml --- shrinkwrap.yaml | 509 +++++++++++++----------------------------------- 1 file changed, 133 insertions(+), 376 deletions(-) diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index bdc266a3e3..377730aac4 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,73 +1,63 @@ dependencies: - '@types/chalk': registry.npmjs.org/@types/chalk/0.4.31 - '@types/common-tags': registry.npmjs.org/@types/common-tags/1.2.5 - '@types/node': registry.npmjs.org/@types/node/7.0.5 - chalk: registry.npmjs.org/chalk/1.1.3 - commitizen: registry.npmjs.org/commitizen/2.9.6 - common-tags: registry.npmjs.org/common-tags/1.4.0 - ghooks: registry.npmjs.org/ghooks/2.0.0 - ndjson: registry.npmjs.org/ndjson/1.5.0 - observatory: registry.npmjs.org/observatory/1.0.0 - pnpm-logger: registry.npmjs.org/pnpm-logger/0.2.0 - rimraf: registry.npmjs.org/rimraf/2.6.1 - tslint: registry.npmjs.org/tslint/4.4.2 - typescript: registry.npmjs.org/typescript/2.2.1 - validate-commit-msg: registry.npmjs.org/validate-commit-msg/2.11.1 + '@types/chalk@^0.4.31': registry.npmjs.org/@types/chalk/0.4.31 + '@types/common-tags@^1.2.5': registry.npmjs.org/@types/common-tags/1.2.5 + '@types/node@^7.0.0': registry.npmjs.org/@types/node/7.0.5 + chalk@^1.1.3: registry.npmjs.org/chalk/1.1.3 + commitizen@^2.9.5: registry.npmjs.org/commitizen/2.9.6 + common-tags@^1.4.0: registry.npmjs.org/common-tags/1.4.0 + ghooks@^2.0.0: registry.npmjs.org/ghooks/2.0.0 + ndjson@^1.5.0: registry.npmjs.org/ndjson/1.5.0 + observatory@^1.0.0: registry.npmjs.org/observatory/1.0.0 + pnpm-logger@^0.2.0: registry.npmjs.org/pnpm-logger/0.2.0 + rimraf@^2.5.4: registry.npmjs.org/rimraf/2.6.1 + tslint@^4.3.1: registry.npmjs.org/tslint/4.5.1 + typescript@^2.1.5: registry.npmjs.org/typescript/2.2.1 + validate-commit-msg@^2.8.2: registry.npmjs.org/validate-commit-msg/2.11.1 packages: registry.npmjs.org/@types/chalk/0.4.31: resolution: shasum: a31d74241a6b1edbb973cf36d97a2896834a51f9 tarball: 'https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz' - type: tarball registry.npmjs.org/@types/common-tags/1.2.5: resolution: shasum: 14f29893992eb325594b83d739af02f2b6520f46 tarball: 'https://registry.npmjs.org/@types/common-tags/-/common-tags-1.2.5.tgz' - type: tarball registry.npmjs.org/@types/node/7.0.5: resolution: shasum: 96a0f0a618b7b606f1ec547403c00650210bfbb7 tarball: 'https://registry.npmjs.org/@types/node/-/node-7.0.5.tgz' - type: tarball registry.npmjs.org/ansi-align/1.1.0: dependencies: string-width: registry.npmjs.org/string-width/1.0.2 resolution: shasum: 2f0c1658829739add5ebb15e6b0c6e3423f016ba tarball: 'https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz' - type: tarball registry.npmjs.org/ansi-escapes/1.4.0: resolution: shasum: d3a8a83b319aa67793662b13e761c7911422306e tarball: 'https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz' - type: tarball registry.npmjs.org/ansi-regex/2.1.1: resolution: shasum: c3b33ab5ee360d86e0e628f0468ae7ef27d654df tarball: 'https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz' - type: tarball registry.npmjs.org/ansi-styles/2.2.1: resolution: shasum: b432dd3358b634cf75e1e4664368240533c1ddbe tarball: 'https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz' - type: tarball registry.npmjs.org/arr-diff/2.0.0: dependencies: arr-flatten: registry.npmjs.org/arr-flatten/1.0.1 resolution: shasum: 8f3b827f955a8bd669697e4a4256ac3ceae356cf tarball: 'https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz' - type: tarball registry.npmjs.org/arr-flatten/1.0.1: resolution: shasum: e5ffe54d45e19f32f216e91eb99c8ce892bb604b tarball: 'https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz' - type: tarball registry.npmjs.org/array-unique/0.2.1: resolution: shasum: a1d97ccafcbc2625cc70fadceb36a50c58b01a53 tarball: 'https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz' - type: tarball registry.npmjs.org/babel-code-frame/6.22.0: dependencies: chalk: registry.npmjs.org/chalk/1.1.3 @@ -76,7 +66,6 @@ packages: resolution: shasum: 027620bee567a88c32561574e7fd0801d33118e4 tarball: 'https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz' - type: tarball registry.npmjs.org/babel-runtime/6.23.0: dependencies: core-js: registry.npmjs.org/core-js/2.4.1 @@ -84,12 +73,10 @@ packages: resolution: shasum: 0a9489f144de70efb3ce4300accdb329e2fc543b tarball: 'https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz' - type: tarball registry.npmjs.org/balanced-match/0.4.2: resolution: shasum: cb3f3e3c732dc0f01ee70b403f302e61d7709838 tarball: 'https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz' - type: tarball registry.npmjs.org/bole/3.0.2: dependencies: fast-safe-stringify: registry.npmjs.org/fast-safe-stringify/1.1.6 @@ -97,22 +84,18 @@ packages: resolution: shasum: bc8a483ca94049da9b837c1ad11cdfebee6e0514 tarball: 'https://registry.npmjs.org/bole/-/bole-3.0.2.tgz' - type: tarball - registry.npmjs.org/boxen/0.6.0: + registry.npmjs.org/boxen/1.0.0: dependencies: ansi-align: registry.npmjs.org/ansi-align/1.1.0 - camelcase: registry.npmjs.org/camelcase/2.1.1 + camelcase: registry.npmjs.org/camelcase/4.0.0 chalk: registry.npmjs.org/chalk/1.1.3 cli-boxes: registry.npmjs.org/cli-boxes/1.0.0 - filled-array: registry.npmjs.org/filled-array/1.1.0 - object-assign: registry.npmjs.org/object-assign/4.1.1 - repeating: registry.npmjs.org/repeating/2.0.1 - string-width: registry.npmjs.org/string-width/1.0.2 + string-width: registry.npmjs.org/string-width/2.0.0 + term-size: registry.npmjs.org/term-size/0.1.1 widest-line: registry.npmjs.org/widest-line/1.0.0 resolution: - shasum: 8364d4248ac34ff0ef1b2f2bf49a6c60ce0d81b6 - tarball: 'https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz' - type: tarball + shasum: b2694baf1f605f708ff0177c12193b22f29aaaab + tarball: 'https://registry.npmjs.org/boxen/-/boxen-1.0.0.tgz' registry.npmjs.org/brace-expansion/1.1.6: dependencies: balanced-match: registry.npmjs.org/balanced-match/0.4.2 @@ -120,7 +103,6 @@ packages: resolution: shasum: 7197d7eaa9b87e648390ea61fc66c84427420df9 tarball: 'https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz' - type: tarball registry.npmjs.org/braces/1.8.5: dependencies: expand-range: registry.npmjs.org/expand-range/1.8.2 @@ -129,29 +111,24 @@ packages: resolution: shasum: ba77962e12dff969d6b76711e914b737857bf6a7 tarball: 'https://registry.npmjs.org/braces/-/braces-1.8.5.tgz' - type: tarball registry.npmjs.org/buffer-shims/1.0.0: resolution: shasum: 9978ce317388c649ad8793028c3477ef044a8b51 tarball: 'https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz' - type: tarball registry.npmjs.org/cachedir/1.1.1: dependencies: os-homedir: registry.npmjs.org/os-homedir/1.0.2 resolution: shasum: e1363075ea206a12767d92bb711c8a2f76a10f62 tarball: 'https://registry.npmjs.org/cachedir/-/cachedir-1.1.1.tgz' - type: tarball - registry.npmjs.org/camelcase/2.1.1: + registry.npmjs.org/camelcase/4.0.0: resolution: - shasum: 7c1d16d679a1bbe59ca02cacecfb011e201f5a1f - tarball: 'https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz' - type: tarball + shasum: 8b0f90d44be5e281b903b9887349b92595ef07f2 + tarball: 'https://registry.npmjs.org/camelcase/-/camelcase-4.0.0.tgz' registry.npmjs.org/capture-stack-trace/1.0.0: resolution: shasum: 4a6fa07399c26bba47f0b2496b4d0fb408c5550d tarball: 'https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz' - type: tarball registry.npmjs.org/chalk/1.1.3: dependencies: ansi-styles: registry.npmjs.org/ansi-styles/2.2.1 @@ -162,51 +139,42 @@ packages: resolution: shasum: a8115c55e4a702fe4d150abd3872822a7e09fc98 tarball: 'https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz' - type: tarball registry.npmjs.org/cli-boxes/1.0.0: resolution: shasum: 4fa917c3e59c94a004cd61f8ee509da651687143 tarball: 'https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz' - type: tarball registry.npmjs.org/cli-cursor/1.0.2: dependencies: restore-cursor: registry.npmjs.org/restore-cursor/1.0.1 resolution: shasum: 64da3f7d56a54412e59794bd62dc35295e8f2987 tarball: 'https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz' - type: tarball registry.npmjs.org/cli-width/2.1.0: resolution: shasum: b234ca209b29ef66fc518d9b98d5847b00edf00a tarball: 'https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz' - type: tarball registry.npmjs.org/code-point-at/1.1.0: resolution: shasum: 0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77 tarball: 'https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz' - type: tarball registry.npmjs.org/colors/0.6.2: resolution: shasum: 2423fe6678ac0c5dae8852e5d0e5be08c997abcc tarball: 'https://registry.npmjs.org/colors/-/colors-0.6.2.tgz' - type: tarball registry.npmjs.org/colors/1.1.2: resolution: shasum: 168a4701756b6a7f51a12ce0c97bfa28c084ed63 tarball: 'https://registry.npmjs.org/colors/-/colors-1.1.2.tgz' - type: tarball registry.npmjs.org/commander/2.1.0: resolution: shasum: d121bbae860d9992a3d517ba96f56588e47c6781 tarball: 'https://registry.npmjs.org/commander/-/commander-2.1.0.tgz' - type: tarball registry.npmjs.org/commander/2.9.0: dependencies: graceful-readlink: registry.npmjs.org/graceful-readlink/1.0.1 resolution: shasum: 9c99094176e12240cb22d6c5146098400fe0f7d4 tarball: 'https://registry.npmjs.org/commander/-/commander-2.9.0.tgz' - type: tarball registry.npmjs.org/commitizen/2.9.6: dependencies: cachedir: registry.npmjs.org/cachedir/1.1.1 @@ -227,19 +195,16 @@ packages: resolution: shasum: c0d00535ef264da7f63737edfda4228983fa2291 tarball: 'https://registry.npmjs.org/commitizen/-/commitizen-2.9.6.tgz' - type: tarball registry.npmjs.org/common-tags/1.4.0: dependencies: babel-runtime: registry.npmjs.org/babel-runtime/6.23.0 resolution: shasum: 1187be4f3d4cf0c0427d43f74eef1f73501614c0 tarball: 'https://registry.npmjs.org/common-tags/-/common-tags-1.4.0.tgz' - type: tarball registry.npmjs.org/concat-map/0.0.1: resolution: shasum: d8a96bd77fd68df7793a73036a3ba0d5405d477b tarball: 'https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz' - type: tarball registry.npmjs.org/concat-stream/1.6.0: dependencies: inherits: registry.npmjs.org/inherits/2.0.3 @@ -248,44 +213,35 @@ packages: resolution: shasum: 0aac662fd52be78964d5532f694784e70110acf7 tarball: 'https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz' - type: tarball - registry.npmjs.org/configstore/2.1.0: + registry.npmjs.org/configstore/3.0.0: dependencies: - dot-prop: registry.npmjs.org/dot-prop/3.0.0 + dot-prop: registry.npmjs.org/dot-prop/4.1.1 graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 mkdirp: registry.npmjs.org/mkdirp/0.5.1 - object-assign: registry.npmjs.org/object-assign/4.1.1 - os-tmpdir: registry.npmjs.org/os-tmpdir/1.0.2 - osenv: registry.npmjs.org/osenv/0.1.4 - uuid: registry.npmjs.org/uuid/2.0.3 + unique-string: registry.npmjs.org/unique-string/1.0.0 write-file-atomic: registry.npmjs.org/write-file-atomic/1.3.1 - xdg-basedir: registry.npmjs.org/xdg-basedir/2.0.0 + xdg-basedir: registry.npmjs.org/xdg-basedir/3.0.0 resolution: - shasum: 737a3a7036e9886102aa6099e47bb33ab1aba1a1 - tarball: 'https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz' - type: tarball + shasum: e1b8669c1803ccc50b545e92f8e6e79aa80e0196 + tarball: 'https://registry.npmjs.org/configstore/-/configstore-3.0.0.tgz' registry.npmjs.org/conventional-commit-types/2.1.0: resolution: shasum: 45d860386c9a2e6537ee91d8a1b61bd0411b3d04 tarball: 'https://registry.npmjs.org/conventional-commit-types/-/conventional-commit-types-2.1.0.tgz' - type: tarball registry.npmjs.org/core-js/2.4.1: resolution: shasum: 4de911e667b0eae9124e34254b53aea6fc618d3e tarball: 'https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz' - type: tarball registry.npmjs.org/core-util-is/1.0.2: resolution: shasum: b5fd54220aa2bc5ab57aab7140c940754503c1a7 tarball: 'https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz' - type: tarball registry.npmjs.org/create-error-class/3.0.2: dependencies: capture-stack-trace: registry.npmjs.org/capture-stack-trace/1.0.0 resolution: shasum: 06be7abef947a3f14a30fd610671d401bca8b7b6 tarball: 'https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz' - type: tarball registry.npmjs.org/cross-spawn-async/2.2.5: dependencies: lru-cache: registry.npmjs.org/lru-cache/4.0.2 @@ -293,7 +249,10 @@ packages: resolution: shasum: 845ff0c0834a3ded9d160daca6d390906bb288cc tarball: 'https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz' - type: tarball + registry.npmjs.org/crypto-random-string/1.0.0: + resolution: + shasum: a230f64f568310e1498009940790ec99545bca7e + tarball: 'https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz' registry.npmjs.org/cz-conventional-changelog/1.2.0: dependencies: conventional-commit-types: registry.npmjs.org/conventional-commit-types/2.1.0 @@ -305,67 +264,48 @@ packages: resolution: shasum: 2bca04964c8919b23f3fd6a89ef5e6008b31b3f8 tarball: 'https://registry.npmjs.org/cz-conventional-changelog/-/cz-conventional-changelog-1.2.0.tgz' - type: tarball registry.npmjs.org/dedent/0.6.0: resolution: shasum: 0e6da8f0ce52838ef5cec5c8f9396b0c1b64a3cb tarball: 'https://registry.npmjs.org/dedent/-/dedent-0.6.0.tgz' - type: tarball registry.npmjs.org/deep-extend/0.4.1: resolution: shasum: efe4113d08085f4e6f9687759810f807469e2253 tarball: 'https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz' - type: tarball registry.npmjs.org/detect-file/0.1.0: dependencies: fs-exists-sync: registry.npmjs.org/fs-exists-sync/0.1.0 resolution: shasum: 4935dedfd9488648e006b0129566e9386711ea63 tarball: 'https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz' - type: tarball registry.npmjs.org/detect-indent/4.0.0: dependencies: repeating: registry.npmjs.org/repeating/2.0.1 resolution: shasum: f76d064352cdf43a1cb6ce619c4ee3a9475de208 tarball: 'https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz' - type: tarball registry.npmjs.org/diff/3.2.0: resolution: shasum: c9ce393a4b7cbd0b058a725c93df299027868ff9 tarball: 'https://registry.npmjs.org/diff/-/diff-3.2.0.tgz' - type: tarball - registry.npmjs.org/dot-prop/3.0.0: + registry.npmjs.org/dot-prop/4.1.1: dependencies: is-obj: registry.npmjs.org/is-obj/1.0.1 resolution: - shasum: 1b708af094a49c9a0e7dbcad790aba539dac1177 - tarball: 'https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz' - type: tarball - registry.npmjs.org/duplexer2/0.1.4: - dependencies: - readable-stream: registry.npmjs.org/readable-stream/2.2.3 + shasum: a8493f0b7b5eeec82525b5c7587fa7de7ca859c1 + tarball: 'https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz' + registry.npmjs.org/duplexer3/0.1.4: resolution: - shasum: 8b12dab878c0d69e3e7891051662a32fc6bddcc1 - tarball: 'https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz' - type: tarball - registry.npmjs.org/error-ex/1.3.0: - dependencies: - is-arrayish: registry.npmjs.org/is-arrayish/0.2.1 - resolution: - shasum: e67b43f3e82c96ea3a584ffee0b9fc3325d802d9 - tarball: 'https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz' - type: tarball + shasum: ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2 + tarball: 'https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz' registry.npmjs.org/escape-string-regexp/1.0.5: resolution: shasum: 1b61c0562190a8dff6ae3bb2cf0200ca130b86d4 tarball: 'https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz' - type: tarball registry.npmjs.org/esutils/2.0.2: resolution: shasum: 0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b tarball: 'https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz' - type: tarball registry.npmjs.org/execa/0.4.0: dependencies: cross-spawn-async: registry.npmjs.org/cross-spawn-async/2.2.5 @@ -377,38 +317,32 @@ packages: resolution: shasum: 4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3 tarball: 'https://registry.npmjs.org/execa/-/execa-0.4.0.tgz' - type: tarball registry.npmjs.org/exit-hook/1.1.1: resolution: shasum: f05ca233b48c05d54fff07765df8507e95c02ff8 tarball: 'https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz' - type: tarball registry.npmjs.org/expand-brackets/0.1.5: dependencies: is-posix-bracket: registry.npmjs.org/is-posix-bracket/0.1.1 resolution: shasum: df07284e342a807cd733ac5af72411e581d1177b tarball: 'https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz' - type: tarball registry.npmjs.org/expand-range/1.8.2: dependencies: fill-range: registry.npmjs.org/fill-range/2.2.3 resolution: shasum: a299effd335fe2721ebae8e257ec79644fc85337 tarball: 'https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz' - type: tarball registry.npmjs.org/expand-tilde/1.2.2: dependencies: os-homedir: registry.npmjs.org/os-homedir/1.0.2 resolution: shasum: 0b81eba897e5a3d31d1c3d102f8f01441e559449 tarball: 'https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz' - type: tarball registry.npmjs.org/extend/3.0.0: resolution: shasum: 5a474353b9f3353ddd8176dfd37b91c83a46f1d4 tarball: 'https://registry.npmjs.org/extend/-/extend-3.0.0.tgz' - type: tarball registry.npmjs.org/external-editor/1.1.1: dependencies: extend: registry.npmjs.org/extend/3.0.0 @@ -417,19 +351,16 @@ packages: resolution: shasum: 12d7b0db850f7ff7e7081baf4005700060c4600b tarball: 'https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz' - type: tarball registry.npmjs.org/extglob/0.3.2: dependencies: is-extglob: registry.npmjs.org/is-extglob/1.0.0 resolution: shasum: 2e18ff3d2f49ab2765cec9023f011daa8d8349a1 tarball: 'https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz' - type: tarball registry.npmjs.org/fast-safe-stringify/1.1.6: resolution: shasum: b30f4a55cbf657895a5b07b2c9c6fec91580802d tarball: 'https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.1.6.tgz' - type: tarball registry.npmjs.org/figures/1.7.0: dependencies: escape-string-regexp: registry.npmjs.org/escape-string-regexp/1.0.5 @@ -437,12 +368,10 @@ packages: resolution: shasum: cbe1e3affcf1cd44b80cadfed28dc793a9701d2e tarball: 'https://registry.npmjs.org/figures/-/figures-1.7.0.tgz' - type: tarball registry.npmjs.org/filename-regex/2.0.0: resolution: shasum: 996e3e80479b98b9897f15a8a58b3d084e926775 tarball: 'https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz' - type: tarball registry.npmjs.org/fill-range/2.2.3: dependencies: is-number: registry.npmjs.org/is-number/2.1.0 @@ -453,12 +382,6 @@ packages: resolution: shasum: 50b77dfd7e469bc7492470963699fe7a8485a723 tarball: 'https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz' - type: tarball - registry.npmjs.org/filled-array/1.1.0: - resolution: - shasum: c3c4f6c663b923459a9aa29912d2d031f1507f84 - tarball: 'https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz' - type: tarball registry.npmjs.org/find-node-modules/1.0.4: dependencies: findup-sync: registry.npmjs.org/findup-sync/0.4.2 @@ -466,19 +389,16 @@ packages: resolution: shasum: b6deb3cccb699c87037677bcede2c5f5862b2550 tarball: 'https://registry.npmjs.org/find-node-modules/-/find-node-modules-1.0.4.tgz' - type: tarball registry.npmjs.org/find-root/1.0.0: resolution: shasum: 962ff211aab25c6520feeeb8d6287f8f6e95807a tarball: 'https://registry.npmjs.org/find-root/-/find-root-1.0.0.tgz' - type: tarball registry.npmjs.org/findup-sync/0.3.0: dependencies: glob: registry.npmjs.org/glob/5.0.15 resolution: shasum: 37930aa5d816b777c03445e1966cc6790a4c0b16 tarball: 'https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz' - type: tarball registry.npmjs.org/findup-sync/0.4.2: dependencies: detect-file: registry.npmjs.org/detect-file/0.1.0 @@ -488,7 +408,6 @@ packages: resolution: shasum: a8117d0f73124f5a4546839579fe52d7129fb5e5 tarball: 'https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.2.tgz' - type: tarball registry.npmjs.org/findup/0.1.5: dependencies: colors: registry.npmjs.org/colors/0.6.2 @@ -496,24 +415,20 @@ packages: resolution: shasum: 8ad929a3393bac627957a7e5de4623b06b0e2ceb tarball: 'https://registry.npmjs.org/findup/-/findup-0.1.5.tgz' - type: tarball - registry.npmjs.org/for-in/0.1.6: + registry.npmjs.org/for-in/1.0.2: resolution: - shasum: c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8 - tarball: 'https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz' - type: tarball - registry.npmjs.org/for-own/0.1.4: + shasum: 81068d295a8142ec0ac726c6e2200c30fb6d5e80 + tarball: 'https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz' + registry.npmjs.org/for-own/0.1.5: dependencies: - for-in: registry.npmjs.org/for-in/0.1.6 + for-in: registry.npmjs.org/for-in/1.0.2 resolution: - shasum: 0149b41a39088c7515f51ebe1c1386d45f935072 - tarball: 'https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz' - type: tarball + shasum: 5265c681a4f294dabbf17c9509b6763aa84510ce + tarball: 'https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz' registry.npmjs.org/fs-exists-sync/0.1.0: resolution: shasum: 982d6893af918e72d08dec9e8673ff2b5a8d6add tarball: 'https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz' - type: tarball registry.npmjs.org/fs-extra/1.0.0: dependencies: graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 @@ -522,12 +437,14 @@ packages: resolution: shasum: cd3ce5f7e7cb6145883fcae3191e9877f8587950 tarball: 'https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz' - type: tarball registry.npmjs.org/fs.realpath/1.0.0: resolution: shasum: 1504ad2523158caa40db4a2787cb01411994ea4f tarball: 'https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz' - type: tarball + registry.npmjs.org/get-stream/3.0.0: + resolution: + shasum: 8e943d1358dc37555054ecbe2edb05aa174ede14 + tarball: 'https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz' registry.npmjs.org/ghooks/2.0.0: dependencies: execa: registry.npmjs.org/execa/0.4.0 @@ -540,7 +457,6 @@ packages: resolution: shasum: affd83a36e8b8fbdded9b851457c48ac74c8eab8 tarball: 'https://registry.npmjs.org/ghooks/-/ghooks-2.0.0.tgz' - type: tarball registry.npmjs.org/glob-base/0.3.0: dependencies: glob-parent: registry.npmjs.org/glob-parent/2.0.0 @@ -548,14 +464,12 @@ packages: resolution: shasum: dbb164f6221b1c0b1ccf82aea328b497df0ea3c4 tarball: 'https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz' - type: tarball registry.npmjs.org/glob-parent/2.0.0: dependencies: is-glob: registry.npmjs.org/is-glob/2.0.1 resolution: shasum: 81383d72db054fcccf5336daa902f182f6edbb28 tarball: 'https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz' - type: tarball registry.npmjs.org/glob/5.0.15: dependencies: inflight: registry.npmjs.org/inflight/1.0.6 @@ -566,7 +480,6 @@ packages: resolution: shasum: 1bc936b9e02f4a603fcc222ecf7633d30b8b93b1 tarball: 'https://registry.npmjs.org/glob/-/glob-5.0.15.tgz' - type: tarball registry.npmjs.org/glob/7.1.1: dependencies: fs.realpath: registry.npmjs.org/fs.realpath/1.0.0 @@ -578,7 +491,6 @@ packages: resolution: shasum: 805211df04faaf1c63a3600306cdf5ade50b2ec8 tarball: 'https://registry.npmjs.org/glob/-/glob-7.1.1.tgz' - type: tarball registry.npmjs.org/global-modules/0.2.3: dependencies: global-prefix: registry.npmjs.org/global-prefix/0.1.5 @@ -586,7 +498,6 @@ packages: resolution: shasum: ea5a3bed42c6d6ce995a4f8a1269b5dae223828d tarball: 'https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz' - type: tarball registry.npmjs.org/global-prefix/0.1.5: dependencies: homedir-polyfill: registry.npmjs.org/homedir-polyfill/1.0.1 @@ -596,62 +507,50 @@ packages: resolution: shasum: 8d3bc6b8da3ca8112a160d8d496ff0462bfef78f tarball: 'https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz' - type: tarball - registry.npmjs.org/got/5.7.1: + registry.npmjs.org/got/6.7.1: dependencies: create-error-class: registry.npmjs.org/create-error-class/3.0.2 - duplexer2: registry.npmjs.org/duplexer2/0.1.4 + duplexer3: registry.npmjs.org/duplexer3/0.1.4 + get-stream: registry.npmjs.org/get-stream/3.0.0 is-redirect: registry.npmjs.org/is-redirect/1.0.0 is-retry-allowed: registry.npmjs.org/is-retry-allowed/1.1.0 is-stream: registry.npmjs.org/is-stream/1.1.0 lowercase-keys: registry.npmjs.org/lowercase-keys/1.0.0 - node-status-codes: registry.npmjs.org/node-status-codes/1.0.0 - object-assign: registry.npmjs.org/object-assign/4.1.1 - parse-json: registry.npmjs.org/parse-json/2.2.0 - pinkie-promise: registry.npmjs.org/pinkie-promise/2.0.1 - read-all-stream: registry.npmjs.org/read-all-stream/3.1.0 - readable-stream: registry.npmjs.org/readable-stream/2.2.3 - timed-out: registry.npmjs.org/timed-out/3.1.3 - unzip-response: registry.npmjs.org/unzip-response/1.0.2 + safe-buffer: registry.npmjs.org/safe-buffer/5.0.1 + timed-out: registry.npmjs.org/timed-out/4.0.1 + unzip-response: registry.npmjs.org/unzip-response/2.0.1 url-parse-lax: registry.npmjs.org/url-parse-lax/1.0.0 resolution: - shasum: 5f81635a61e4a6589f180569ea4e381680a51f35 - tarball: 'https://registry.npmjs.org/got/-/got-5.7.1.tgz' - type: tarball + shasum: 240cd05785a9a18e561dc1b44b41c763ef1e8db0 + tarball: 'https://registry.npmjs.org/got/-/got-6.7.1.tgz' registry.npmjs.org/graceful-fs/4.1.11: resolution: shasum: 0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658 tarball: 'https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz' - type: tarball registry.npmjs.org/graceful-readlink/1.0.1: resolution: shasum: 4cafad76bc62f02fa039b2f94e9a3dd3a391a725 tarball: 'https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz' - type: tarball registry.npmjs.org/has-ansi/2.0.0: dependencies: ansi-regex: registry.npmjs.org/ansi-regex/2.1.1 resolution: shasum: 34f5049ce1ecdf2b0649af3ef24e45ed35416d91 tarball: 'https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz' - type: tarball registry.npmjs.org/homedir-polyfill/1.0.1: dependencies: parse-passwd: registry.npmjs.org/parse-passwd/1.0.0 resolution: shasum: 4c2bbc8a758998feebf5ed68580f76d46768b4bc tarball: 'https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz' - type: tarball registry.npmjs.org/imurmurhash/0.1.4: resolution: shasum: 9218b9b2b928a238b13dc4fb6b6d576f231453ea tarball: 'https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz' - type: tarball registry.npmjs.org/individual/3.0.0: resolution: shasum: e7ca4f85f8957b018734f285750dc22ec2f9862d tarball: 'https://registry.npmjs.org/individual/-/individual-3.0.0.tgz' - type: tarball registry.npmjs.org/inflight/1.0.6: dependencies: once: registry.npmjs.org/once/1.4.0 @@ -659,17 +558,14 @@ packages: resolution: shasum: 49bd6331d7d02d0c09bc910a1075ba8165b56df9 tarball: 'https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz' - type: tarball registry.npmjs.org/inherits/2.0.3: resolution: shasum: 633c2c83e3da42a502f52466022480f4208261de tarball: 'https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz' - type: tarball registry.npmjs.org/ini/1.3.4: resolution: shasum: 0537cb79daf59b59a1a517dff706c86ec039162e tarball: 'https://registry.npmjs.org/ini/-/ini-1.3.4.tgz' - type: tarball registry.npmjs.org/inquirer/1.2.3: dependencies: ansi-escapes: registry.npmjs.org/ansi-escapes/1.4.0 @@ -689,219 +585,180 @@ packages: resolution: shasum: 4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918 tarball: 'https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz' - type: tarball registry.npmjs.org/interpret/1.0.1: resolution: shasum: d579fb7f693b858004947af39fa0db49f795602c tarball: 'https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz' - type: tarball - registry.npmjs.org/is-arrayish/0.2.1: - resolution: - shasum: 77c99840527aa8ecb1a8ba697b80645a7a926a9d - tarball: 'https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz' - type: tarball registry.npmjs.org/is-buffer/1.1.4: resolution: shasum: cfc86ccd5dc5a52fa80489111c6920c457e2d98b tarball: 'https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz' - type: tarball registry.npmjs.org/is-dotfile/1.0.2: resolution: shasum: 2c132383f39199f8edc268ca01b9b007d205cc4d tarball: 'https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz' - type: tarball registry.npmjs.org/is-equal-shallow/0.1.3: dependencies: is-primitive: registry.npmjs.org/is-primitive/2.0.0 resolution: shasum: 2238098fc221de0bcfa5d9eac4c45d638aa1c534 tarball: 'https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz' - type: tarball registry.npmjs.org/is-extendable/0.1.1: resolution: shasum: 62b110e289a471418e3ec36a617d472e301dfc89 tarball: 'https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz' - type: tarball registry.npmjs.org/is-extglob/1.0.0: resolution: shasum: ac468177c4943405a092fc8f29760c6ffc6206c0 tarball: 'https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz' - type: tarball registry.npmjs.org/is-finite/1.0.2: dependencies: number-is-nan: registry.npmjs.org/number-is-nan/1.0.1 resolution: shasum: cc6677695602be550ef11e8b4aa6305342b6d0aa tarball: 'https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz' - type: tarball registry.npmjs.org/is-fullwidth-code-point/1.0.0: dependencies: number-is-nan: registry.npmjs.org/number-is-nan/1.0.1 resolution: shasum: ef9e31386f031a7f0d643af82fde50c457ef00cb tarball: 'https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz' - type: tarball + registry.npmjs.org/is-fullwidth-code-point/2.0.0: + resolution: + shasum: a3b30a5c4f199183167aaab93beefae3ddfb654f + tarball: 'https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz' registry.npmjs.org/is-glob/2.0.1: dependencies: is-extglob: registry.npmjs.org/is-extglob/1.0.0 resolution: shasum: d096f926a3ded5600f3fdfd91198cb0888c2d863 tarball: 'https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz' - type: tarball registry.npmjs.org/is-npm/1.0.0: resolution: shasum: f2fb63a65e4905b406c86072765a1a4dc793b9f4 tarball: 'https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz' - type: tarball registry.npmjs.org/is-number/2.1.0: dependencies: kind-of: registry.npmjs.org/kind-of/3.1.0 resolution: shasum: 01fcbbb393463a548f2f466cce16dece49db908f tarball: 'https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz' - type: tarball registry.npmjs.org/is-obj/1.0.1: resolution: shasum: 3e4729ac1f5fde025cd7d83a896dab9f4f67db0f tarball: 'https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz' - type: tarball registry.npmjs.org/is-posix-bracket/0.1.1: resolution: shasum: 3334dc79774368e92f016e6fbc0a88f5cd6e6bc4 tarball: 'https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz' - type: tarball registry.npmjs.org/is-primitive/2.0.0: resolution: shasum: 207bab91638499c07b2adf240a41a87210034575 tarball: 'https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz' - type: tarball registry.npmjs.org/is-promise/2.1.0: resolution: shasum: 79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa tarball: 'https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz' - type: tarball registry.npmjs.org/is-redirect/1.0.0: resolution: shasum: 1d03dded53bd8db0f30c26e4f95d36fc7c87dc24 tarball: 'https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz' - type: tarball registry.npmjs.org/is-retry-allowed/1.1.0: resolution: shasum: 11a060568b67339444033d0125a61a20d564fb34 tarball: 'https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz' - type: tarball registry.npmjs.org/is-stream/1.1.0: resolution: shasum: 12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44 tarball: 'https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz' - type: tarball registry.npmjs.org/is-windows/0.2.0: resolution: shasum: de1aa6d63ea29dd248737b69f1ff8b8002d2108c tarball: 'https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz' - type: tarball registry.npmjs.org/isarray/1.0.0: resolution: shasum: bb935d48582cba168c06834957a54a3e07124f11 tarball: 'https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz' - type: tarball registry.npmjs.org/isexe/1.1.2: resolution: shasum: 36f3e22e60750920f5e7241a476a8c6a42275ad0 tarball: 'https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz' - type: tarball registry.npmjs.org/isobject/2.1.0: dependencies: isarray: registry.npmjs.org/isarray/1.0.0 resolution: shasum: f065561096a3f1da2ef46272f815c840d87e0c89 tarball: 'https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz' - type: tarball registry.npmjs.org/js-tokens/3.0.1: resolution: shasum: 08e9f132484a2c45a30907e9dc4d5567b7f114d7 tarball: 'https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz' - type: tarball registry.npmjs.org/json-stringify-safe/5.0.1: resolution: shasum: 1296a2d58fd45f19a0f6ce01d65701e2c735b6eb tarball: 'https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz' - type: tarball registry.npmjs.org/jsonfile/2.4.0: dependencies: graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 resolution: shasum: 3736a2b428b87bbda0cc83b53fa3d633a35c2ae8 tarball: 'https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz' - type: tarball registry.npmjs.org/kind-of/3.1.0: dependencies: is-buffer: registry.npmjs.org/is-buffer/1.1.4 resolution: shasum: 475d698a5e49ff5e53d14e3e732429dc8bf4cf47 tarball: 'https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz' - type: tarball registry.npmjs.org/klaw/1.3.1: dependencies: graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 resolution: shasum: 4088433b46b3b1ba259d78785d8e96f73ba02439 tarball: 'https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz' - type: tarball - registry.npmjs.org/latest-version/2.0.0: + registry.npmjs.org/latest-version/3.0.0: dependencies: - package-json: registry.npmjs.org/package-json/2.4.0 + package-json: registry.npmjs.org/package-json/3.1.0 resolution: - shasum: 56f8d6139620847b8017f8f1f4d78e211324168b - tarball: 'https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz' - type: tarball - registry.npmjs.org/lazy-req/1.1.0: + shasum: 3104f008c0c391084107f85a344bc61e38970649 + tarball: 'https://registry.npmjs.org/latest-version/-/latest-version-3.0.0.tgz' + registry.npmjs.org/lazy-req/2.0.0: resolution: - shasum: bdaebead30f8d824039ce0ce149d4daa07ba1fac - tarball: 'https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz' - type: tarball + shasum: c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4 + tarball: 'https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz' registry.npmjs.org/lodash._baseclone/4.5.7: resolution: shasum: ce42ade08384ef5d62fa77c30f61a46e686f8434 tarball: 'https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz' - type: tarball registry.npmjs.org/lodash.clone/4.3.2: dependencies: lodash._baseclone: registry.npmjs.org/lodash._baseclone/4.5.7 resolution: shasum: e56b176b6823a7dde38f7f2bf58de7d5971200e9 tarball: 'https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.3.2.tgz' - type: tarball registry.npmjs.org/lodash.map/4.6.0: resolution: shasum: 771ec7839e3473d9c4cde28b19394c3562f4f6d3 tarball: 'https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz' - type: tarball registry.npmjs.org/lodash/3.10.1: resolution: shasum: 5bf45e8e49ba4189e17d482789dfd15bd140b7b6 tarball: 'https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz' - type: tarball registry.npmjs.org/lodash/4.17.2: resolution: shasum: 34a3055babe04ce42467b607d700072c7ff6bf42 tarball: 'https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz' - type: tarball registry.npmjs.org/lodash/4.17.4: resolution: shasum: 78203a4d1c328ae1d86dca6460e369b57f4055ae tarball: 'https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz' - type: tarball registry.npmjs.org/longest/1.0.1: resolution: shasum: 30a0b2da38f73770e8294a0d22e6625ed77d0097 tarball: 'https://registry.npmjs.org/longest/-/longest-1.0.1.tgz' - type: tarball registry.npmjs.org/lowercase-keys/1.0.0: resolution: shasum: 4e3366b39e7f5457e35f1324bdf6f88d0bfc7306 tarball: 'https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz' - type: tarball registry.npmjs.org/lru-cache/4.0.2: dependencies: pseudomap: registry.npmjs.org/pseudomap/1.0.2 @@ -909,17 +766,14 @@ packages: resolution: shasum: 1d17679c069cda5d040991a09dbc2c0db377e55e tarball: 'https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz' - type: tarball registry.npmjs.org/manage-path/2.0.0: resolution: shasum: f4cf8457b926eeee2a83b173501414bc76eb9597 tarball: 'https://registry.npmjs.org/manage-path/-/manage-path-2.0.0.tgz' - type: tarball registry.npmjs.org/merge/1.2.0: resolution: shasum: 7531e39d4949c281a66b8c5a6e0265e8b05894da tarball: 'https://registry.npmjs.org/merge/-/merge-1.2.0.tgz' - type: tarball registry.npmjs.org/micromatch/2.3.11: dependencies: arr-diff: registry.npmjs.org/arr-diff/2.0.0 @@ -938,41 +792,34 @@ packages: resolution: shasum: 86677c97d1720b363431d04d0d15293bd38c1565 tarball: 'https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz' - type: tarball registry.npmjs.org/minimatch/3.0.3: dependencies: brace-expansion: registry.npmjs.org/brace-expansion/1.1.6 resolution: shasum: 2a4e4090b96b2db06a9d7df01055a62a77c9b774 tarball: 'https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz' - type: tarball registry.npmjs.org/minimist/0.0.10: resolution: shasum: de3f98543dbf96082be48ad1a0c7cda836301dcf tarball: 'https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz' - type: tarball registry.npmjs.org/minimist/0.0.8: resolution: shasum: 857fcabfc3397d2625b8228262e86aa7a011b05d tarball: 'https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz' - type: tarball registry.npmjs.org/minimist/1.2.0: resolution: shasum: a35008b20f41383eec1fb914f4cd5df79a264284 tarball: 'https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz' - type: tarball registry.npmjs.org/mkdirp/0.5.1: dependencies: minimist: registry.npmjs.org/minimist/0.0.8 resolution: shasum: 30057438eac6cf7f8c4767f38648d6697d75c903 tarball: 'https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz' - type: tarball registry.npmjs.org/mute-stream/0.0.6: resolution: shasum: 48962b19e169fd1dfc240b3f1e7317627bbc47db tarball: 'https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz' - type: tarball registry.npmjs.org/ndjson/1.5.0: dependencies: json-stringify-safe: registry.npmjs.org/json-stringify-safe/5.0.1 @@ -982,42 +829,31 @@ packages: resolution: shasum: ae603b36b134bcec347b452422b0bf98d5832ec8 tarball: 'https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz' - type: tarball - registry.npmjs.org/node-status-codes/1.0.0: - resolution: - shasum: 5ae5541d024645d32a58fcddc9ceecea7ae3ac2f - tarball: 'https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz' - type: tarball registry.npmjs.org/normalize-path/2.0.1: resolution: shasum: 47886ac1662760d4261b7d979d241709d3ce3f7a tarball: 'https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz' - type: tarball registry.npmjs.org/npm-run-path/1.0.0: dependencies: path-key: registry.npmjs.org/path-key/1.0.0 resolution: shasum: f5c32bf595fe81ae927daec52e82f8b000ac3c8f tarball: 'https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz' - type: tarball registry.npmjs.org/number-is-nan/1.0.1: resolution: shasum: 097b602b53422a522c1afb8790318336941a011d tarball: 'https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz' - type: tarball registry.npmjs.org/object-assign/4.1.1: resolution: shasum: 2109adc7965887cfc05cbbd442cac8bfbb360863 tarball: 'https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz' - type: tarball registry.npmjs.org/object.omit/2.0.1: dependencies: - for-own: registry.npmjs.org/for-own/0.1.4 + for-own: registry.npmjs.org/for-own/0.1.5 is-extendable: registry.npmjs.org/is-extendable/0.1.1 resolution: shasum: 1a9c744829f39dbb858c76ca3579ae2a54ebd1fa tarball: 'https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz' - type: tarball registry.npmjs.org/observatory/1.0.0: dependencies: ansi-escapes: registry.npmjs.org/ansi-escapes/1.4.0 @@ -1026,19 +862,16 @@ packages: resolution: shasum: 2baa606e8299e6866914ec9c8a4db6a41136e59b tarball: 'https://registry.npmjs.org/observatory/-/observatory-1.0.0.tgz' - type: tarball registry.npmjs.org/once/1.4.0: dependencies: wrappy: registry.npmjs.org/wrappy/1.0.2 resolution: shasum: 583b1aa775961d4b113ac17d9c50baef9dd76bd1 tarball: 'https://registry.npmjs.org/once/-/once-1.4.0.tgz' - type: tarball registry.npmjs.org/onetime/1.1.0: resolution: shasum: a1f7838f8314c516f05ecefcbc4ccfe04b4ed789 tarball: 'https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz' - type: tarball registry.npmjs.org/opt-cli/1.5.1: dependencies: commander: registry.npmjs.org/commander/2.9.0 @@ -1048,7 +881,6 @@ packages: resolution: shasum: 04db447b13c96b992eb31685266f4ed0d9736dc2 tarball: 'https://registry.npmjs.org/opt-cli/-/opt-cli-1.5.1.tgz' - type: tarball registry.npmjs.org/optimist/0.6.1: dependencies: minimist: registry.npmjs.org/minimist/0.0.10 @@ -1056,47 +888,33 @@ packages: resolution: shasum: da3ea74686fa21a19a111c326e90eb15a0196686 tarball: 'https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz' - type: tarball registry.npmjs.org/os-homedir/1.0.2: resolution: shasum: ffbc4988336e0e833de0c168c7ef152121aa7fb3 tarball: 'https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz' - type: tarball registry.npmjs.org/os-shim/0.1.3: resolution: shasum: 6b62c3791cf7909ea35ed46e17658bb417cb3917 tarball: 'https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz' - type: tarball registry.npmjs.org/os-tmpdir/1.0.2: resolution: shasum: bbe67406c79aa85c5cfec766fe5734555dfa1274 tarball: 'https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz' - type: tarball - registry.npmjs.org/osenv/0.1.4: + registry.npmjs.org/package-json/3.1.0: dependencies: - os-homedir: registry.npmjs.org/os-homedir/1.0.2 - os-tmpdir: registry.npmjs.org/os-tmpdir/1.0.2 - resolution: - shasum: 42fe6d5953df06c8064be6f176c3d05aaaa34644 - tarball: 'https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz' - type: tarball - registry.npmjs.org/package-json/2.4.0: - dependencies: - got: registry.npmjs.org/got/5.7.1 + got: registry.npmjs.org/got/6.7.1 registry-auth-token: registry.npmjs.org/registry-auth-token/3.1.0 registry-url: registry.npmjs.org/registry-url/3.1.0 semver: registry.npmjs.org/semver/5.3.0 resolution: - shasum: 0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb - tarball: 'https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz' - type: tarball + shasum: ce281900fe8052150cc6709c6c006c18fdb2f379 + tarball: 'https://registry.npmjs.org/package-json/-/package-json-3.1.0.tgz' registry.npmjs.org/pad-right/0.2.2: dependencies: repeat-string: registry.npmjs.org/repeat-string/1.6.1 resolution: shasum: 6fbc924045d244f2a2a244503060d3bfc6009774 tarball: 'https://registry.npmjs.org/pad-right/-/pad-right-0.2.2.tgz' - type: tarball registry.npmjs.org/parse-glob/3.0.4: dependencies: glob-base: registry.npmjs.org/glob-base/0.3.0 @@ -1106,80 +924,60 @@ packages: resolution: shasum: b2c376cfb11f35513badd173ef0bb6e3a388391c tarball: 'https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz' - type: tarball - registry.npmjs.org/parse-json/2.2.0: - dependencies: - error-ex: registry.npmjs.org/error-ex/1.3.0 - resolution: - shasum: f480f40434ef80741f8469099f8dea18f55a4dc9 - tarball: 'https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz' - type: tarball registry.npmjs.org/parse-passwd/1.0.0: resolution: shasum: 6d5b934a456993b23d37f40a382d6f1666a8e5c6 tarball: 'https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz' - type: tarball registry.npmjs.org/path-exists/2.1.0: dependencies: pinkie-promise: registry.npmjs.org/pinkie-promise/2.0.1 resolution: shasum: 0feb6c64f0fc518d9a754dd5efb62c7022761f4b tarball: 'https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz' - type: tarball registry.npmjs.org/path-is-absolute/1.0.1: resolution: shasum: 174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f tarball: 'https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz' - type: tarball registry.npmjs.org/path-key/1.0.0: resolution: shasum: 5d53d578019646c0d68800db4e146e6bdc2ac7af tarball: 'https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz' - type: tarball registry.npmjs.org/path-parse/1.0.5: resolution: shasum: 3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1 tarball: 'https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz' - type: tarball registry.npmjs.org/pinkie-promise/2.0.1: dependencies: pinkie: registry.npmjs.org/pinkie/2.0.4 resolution: shasum: 2135d6dfa7a358c069ac9b178776288228450ffa tarball: 'https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz' - type: tarball registry.npmjs.org/pinkie/2.0.4: resolution: shasum: 72556b80cfa0d48a974e80e77248e80ed4f7f870 tarball: 'https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz' - type: tarball registry.npmjs.org/pnpm-logger/0.2.0: dependencies: bole: registry.npmjs.org/bole/3.0.2 resolution: shasum: 9e35a1282e4fae1a3c78cf4e31c4da9c776a9c79 tarball: 'https://registry.npmjs.org/pnpm-logger/-/pnpm-logger-0.2.0.tgz' - type: tarball registry.npmjs.org/prepend-http/1.0.4: resolution: shasum: d4f4562b0ce3696e41ac52d0e002e57a635dc6dc tarball: 'https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz' - type: tarball registry.npmjs.org/preserve/0.2.0: resolution: shasum: 815ed1f6ebc65926f865b310c0713bcb3315ce4b tarball: 'https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz' - type: tarball registry.npmjs.org/process-nextick-args/1.0.7: resolution: shasum: 150e20b756590ad3f91093f25a4f2ad8bff30ba3 tarball: 'https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz' - type: tarball registry.npmjs.org/pseudomap/1.0.2: resolution: shasum: f052a28da70e618917ef0a8ac34c1ae5a68286b3 tarball: 'https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz' - type: tarball registry.npmjs.org/randomatic/1.1.6: dependencies: is-number: registry.npmjs.org/is-number/2.1.0 @@ -1187,7 +985,6 @@ packages: resolution: shasum: 110dcabff397e9dcff7c0789ccc0a49adf1ec5bb tarball: 'https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz' - type: tarball registry.npmjs.org/rc/1.1.7: dependencies: deep-extend: registry.npmjs.org/deep-extend/0.4.1 @@ -1197,15 +994,6 @@ packages: resolution: shasum: c5ea564bb07aff9fd3a5b32e906c1d3a65940fea tarball: 'https://registry.npmjs.org/rc/-/rc-1.1.7.tgz' - type: tarball - registry.npmjs.org/read-all-stream/3.1.0: - dependencies: - pinkie-promise: registry.npmjs.org/pinkie-promise/2.0.1 - readable-stream: registry.npmjs.org/readable-stream/2.2.3 - resolution: - shasum: 35c3e177f2078ef789ee4bfafa4373074eaef4fa - tarball: 'https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz' - type: tarball registry.npmjs.org/readable-stream/2.2.3: dependencies: buffer-shims: registry.npmjs.org/buffer-shims/1.0.0 @@ -1218,19 +1006,16 @@ packages: resolution: shasum: 9cf49463985df016c8ae8813097a9293a9b33729 tarball: 'https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz' - type: tarball registry.npmjs.org/rechoir/0.6.2: dependencies: - resolve: registry.npmjs.org/resolve/1.3.1 + resolve: registry.npmjs.org/resolve/1.3.2 resolution: shasum: 85204b54dba82d5742e28c96756ef43af50e3384 tarball: 'https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz' - type: tarball registry.npmjs.org/regenerator-runtime/0.10.3: resolution: shasum: 8c4367a904b51ea62a908ac310bf99ff90a82a3e tarball: 'https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz' - type: tarball registry.npmjs.org/regex-cache/0.4.3: dependencies: is-equal-shallow: registry.npmjs.org/is-equal-shallow/0.1.3 @@ -1238,38 +1023,32 @@ packages: resolution: shasum: 9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145 tarball: 'https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz' - type: tarball registry.npmjs.org/registry-auth-token/3.1.0: dependencies: rc: registry.npmjs.org/rc/1.1.7 resolution: shasum: 997c08256e0c7999837b90e944db39d8a790276b tarball: 'https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz' - type: tarball registry.npmjs.org/registry-url/3.1.0: dependencies: rc: registry.npmjs.org/rc/1.1.7 resolution: shasum: 3d4ef870f73dde1d77f0cf9a381432444e174942 tarball: 'https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz' - type: tarball registry.npmjs.org/repeat-element/1.1.2: resolution: shasum: ef089a178d1483baae4d93eb98b4f9e4e11d990a tarball: 'https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz' - type: tarball registry.npmjs.org/repeat-string/1.6.1: resolution: shasum: 8dcae470e1c88abc2d600fff4a776286da75e637 tarball: 'https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz' - type: tarball registry.npmjs.org/repeating/2.0.1: dependencies: is-finite: registry.npmjs.org/is-finite/1.0.2 resolution: shasum: 5214c53a926d3552707527fbab415dbc08d06dda tarball: 'https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz' - type: tarball registry.npmjs.org/resolve-dir/0.1.1: dependencies: expand-tilde: registry.npmjs.org/expand-tilde/1.2.2 @@ -1277,14 +1056,12 @@ packages: resolution: shasum: b219259a5602fac5c5c496ad894a6e8cc430261e tarball: 'https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz' - type: tarball - registry.npmjs.org/resolve/1.3.1: + registry.npmjs.org/resolve/1.3.2: dependencies: path-parse: registry.npmjs.org/path-parse/1.0.5 resolution: - shasum: 5d0a1632609b6b00a22284293db1d5d973676314 - tarball: 'https://registry.npmjs.org/resolve/-/resolve-1.3.1.tgz' - type: tarball + shasum: 1f0442c9e0cbb8136e87b9305f932f46c7f28235 + tarball: 'https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz' registry.npmjs.org/restore-cursor/1.0.1: dependencies: exit-hook: registry.npmjs.org/exit-hook/1.1.1 @@ -1292,48 +1069,44 @@ packages: resolution: shasum: 34661f46886327fed2991479152252df92daa541 tarball: 'https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz' - type: tarball registry.npmjs.org/right-pad/1.0.1: resolution: shasum: 8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0 tarball: 'https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz' - type: tarball registry.npmjs.org/rimraf/2.6.1: dependencies: glob: registry.npmjs.org/glob/7.1.1 resolution: shasum: c2338ec643df7a1b7fe5c54fa86f57428a55f33d tarball: 'https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz' - type: tarball registry.npmjs.org/run-async/2.3.0: dependencies: is-promise: registry.npmjs.org/is-promise/2.1.0 resolution: shasum: 0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0 tarball: 'https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz' - type: tarball registry.npmjs.org/rx/4.1.0: resolution: shasum: a5f13ff79ef3b740fe30aa803fb09f98805d4782 tarball: 'https://registry.npmjs.org/rx/-/rx-4.1.0.tgz' - type: tarball + registry.npmjs.org/safe-buffer/5.0.1: + resolution: + shasum: d263ca54696cd8a306b5ca6551e92de57918fbe7 + tarball: 'https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz' registry.npmjs.org/semver-diff/2.1.0: dependencies: semver: registry.npmjs.org/semver/5.3.0 resolution: shasum: 4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36 tarball: 'https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz' - type: tarball registry.npmjs.org/semver-regex/1.0.0: resolution: shasum: 92a4969065f9c70c694753d55248fc68f8f652c9 tarball: 'https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz' - type: tarball registry.npmjs.org/semver/5.3.0: resolution: shasum: 9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f tarball: 'https://registry.npmjs.org/semver/-/semver-5.3.0.tgz' - type: tarball registry.npmjs.org/shelljs/0.7.6: dependencies: glob: registry.npmjs.org/glob/7.1.1 @@ -1342,22 +1115,18 @@ packages: resolution: shasum: 379cccfb56b91c8601e4793356eb5382924de9ad tarball: 'https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz' - type: tarball registry.npmjs.org/slide/1.1.6: resolution: shasum: 56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707 tarball: 'https://registry.npmjs.org/slide/-/slide-1.1.6.tgz' - type: tarball registry.npmjs.org/spawn-command/0.0.2: resolution: shasum: 9544e1a43ca045f8531aac1a48cb29bdae62338e tarball: 'https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2.tgz' - type: tarball registry.npmjs.org/spawn-command/0.0.2-1: resolution: shasum: 62f5e9466981c1b796dc5929937e11c9c6921bd0 tarball: 'https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz' - type: tarball registry.npmjs.org/spawn-sync/1.0.15: dependencies: concat-stream: registry.npmjs.org/concat-stream/1.6.0 @@ -1365,14 +1134,12 @@ packages: resolution: shasum: b00799557eb7fb0c8376c29d44e8a1ea67e57476 tarball: 'https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz' - type: tarball registry.npmjs.org/split2/2.1.1: dependencies: through2: registry.npmjs.org/through2/2.0.3 resolution: shasum: 7a1f551e176a90ecd3345f7246a0cfe175ef4fd0 tarball: 'https://registry.npmjs.org/split2/-/split2-2.1.1.tgz' - type: tarball registry.npmjs.org/string-width/1.0.2: dependencies: code-point-at: registry.npmjs.org/code-point-at/1.1.0 @@ -1381,39 +1148,45 @@ packages: resolution: shasum: 118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3 tarball: 'https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz' - type: tarball + registry.npmjs.org/string-width/2.0.0: + dependencies: + is-fullwidth-code-point: registry.npmjs.org/is-fullwidth-code-point/2.0.0 + strip-ansi: registry.npmjs.org/strip-ansi/3.0.1 + resolution: + shasum: 635c5436cc72a6e0c387ceca278d4e2eec52687e + tarball: 'https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz' registry.npmjs.org/string_decoder/0.10.31: resolution: shasum: 62e203bc41766c6c28c9fc84301dab1c5310fa94 tarball: 'https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz' - type: tarball registry.npmjs.org/strip-ansi/3.0.1: dependencies: ansi-regex: registry.npmjs.org/ansi-regex/2.1.1 resolution: shasum: 6a385fb8853d952d5ff05d0e8aaf94278dc63dcf tarball: 'https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz' - type: tarball registry.npmjs.org/strip-eof/1.0.0: resolution: shasum: bb43ff5598a6eb05d89b59fcd129c983313606bf tarball: 'https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz' - type: tarball registry.npmjs.org/strip-json-comments/2.0.1: resolution: shasum: 3c531942e908c2697c0ec344858c286c7ca0a60a tarball: 'https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz' - type: tarball registry.npmjs.org/supports-color/2.0.0: resolution: shasum: 535d045ce6b6363fa40117084629995e9df324c7 tarball: 'https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz' - type: tarball + registry.npmjs.org/term-size/0.1.1: + dependencies: + execa: registry.npmjs.org/execa/0.4.0 + resolution: + shasum: 87360b96396cab5760963714cda0d0cbeecad9ca + tarball: 'https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz' registry.npmjs.org/through/2.3.8: resolution: shasum: 0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5 tarball: 'https://registry.npmjs.org/through/-/through-2.3.8.tgz' - type: tarball registry.npmjs.org/through2/2.0.3: dependencies: readable-stream: registry.npmjs.org/readable-stream/2.2.3 @@ -1421,20 +1194,17 @@ packages: resolution: shasum: 0004569b37c7c74ba39c43f3ced78d1ad94140be tarball: 'https://registry.npmjs.org/through2/-/through2-2.0.3.tgz' - type: tarball - registry.npmjs.org/timed-out/3.1.3: + registry.npmjs.org/timed-out/4.0.1: resolution: - shasum: 95860bfcc5c76c277f8f8326fd0f5b2e20eba217 - tarball: 'https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz' - type: tarball + shasum: f32eacac5a175bea25d7fab565ab3ed8741ef56f + tarball: 'https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz' registry.npmjs.org/tmp/0.0.29: dependencies: os-tmpdir: registry.npmjs.org/os-tmpdir/1.0.2 resolution: shasum: f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0 tarball: 'https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz' - type: tarball - registry.npmjs.org/tslint/4.4.2: + registry.npmjs.org/tslint/4.5.1: dependencies: babel-code-frame: registry.npmjs.org/babel-code-frame/6.22.0 colors: registry.npmjs.org/colors/1.1.2 @@ -1442,58 +1212,57 @@ packages: findup-sync: registry.npmjs.org/findup-sync/0.3.0 glob: registry.npmjs.org/glob/7.1.1 optimist: registry.npmjs.org/optimist/0.6.1 - resolve: registry.npmjs.org/resolve/1.3.1 - update-notifier: registry.npmjs.org/update-notifier/1.0.3 + resolve: registry.npmjs.org/resolve/1.3.2 + tsutils: registry.npmjs.org/tsutils/1.2.1 + update-notifier: registry.npmjs.org/update-notifier/2.1.0 resolution: - shasum: b14cb79ae039c72471ab4c2627226b940dda19c6 - tarball: 'https://registry.npmjs.org/tslint/-/tslint-4.4.2.tgz' - type: tarball + shasum: 05356871bef23a434906734006fc188336ba824b + tarball: 'https://registry.npmjs.org/tslint/-/tslint-4.5.1.tgz' + registry.npmjs.org/tsutils/1.2.1: + resolution: + shasum: 74101a75dbf435800614ccafa4cd89a8d41ea03e + tarball: 'https://registry.npmjs.org/tsutils/-/tsutils-1.2.1.tgz' registry.npmjs.org/typedarray/0.0.6: resolution: shasum: 867ac74e3864187b1d3d47d996a78ec5c8830777 tarball: 'https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz' - type: tarball registry.npmjs.org/typescript/2.2.1: resolution: shasum: 4862b662b988a4c8ff691cc7969622d24db76ae9 tarball: 'https://registry.npmjs.org/typescript/-/typescript-2.2.1.tgz' - type: tarball - registry.npmjs.org/unzip-response/1.0.2: - resolution: - shasum: b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe - tarball: 'https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz' - type: tarball - registry.npmjs.org/update-notifier/1.0.3: + registry.npmjs.org/unique-string/1.0.0: dependencies: - boxen: registry.npmjs.org/boxen/0.6.0 - chalk: registry.npmjs.org/chalk/1.1.3 - configstore: registry.npmjs.org/configstore/2.1.0 - is-npm: registry.npmjs.org/is-npm/1.0.0 - latest-version: registry.npmjs.org/latest-version/2.0.0 - lazy-req: registry.npmjs.org/lazy-req/1.1.0 - semver-diff: registry.npmjs.org/semver-diff/2.1.0 - xdg-basedir: registry.npmjs.org/xdg-basedir/2.0.0 + crypto-random-string: registry.npmjs.org/crypto-random-string/1.0.0 resolution: - shasum: 8f92c515482bd6831b7c93013e70f87552c7cf5a - tarball: 'https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz' - type: tarball + shasum: 9e1057cca851abb93398f8b33ae187b99caec11a + tarball: 'https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz' + registry.npmjs.org/unzip-response/2.0.1: + resolution: + shasum: d2f0f737d16b0615e72a6935ed04214572d56f97 + tarball: 'https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz' + registry.npmjs.org/update-notifier/2.1.0: + dependencies: + boxen: registry.npmjs.org/boxen/1.0.0 + chalk: registry.npmjs.org/chalk/1.1.3 + configstore: registry.npmjs.org/configstore/3.0.0 + is-npm: registry.npmjs.org/is-npm/1.0.0 + latest-version: registry.npmjs.org/latest-version/3.0.0 + lazy-req: registry.npmjs.org/lazy-req/2.0.0 + semver-diff: registry.npmjs.org/semver-diff/2.1.0 + xdg-basedir: registry.npmjs.org/xdg-basedir/3.0.0 + resolution: + shasum: ec0c1e53536b76647a24b77cb83966d9315123d9 + tarball: 'https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz' registry.npmjs.org/url-parse-lax/1.0.0: dependencies: prepend-http: registry.npmjs.org/prepend-http/1.0.4 resolution: shasum: 7af8f303645e9bd79a272e7a14ac68bc0609da73 tarball: 'https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz' - type: tarball registry.npmjs.org/util-deprecate/1.0.2: resolution: shasum: 450d4dc9fa70de732762fbd2d4a28981419a0ccf tarball: 'https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz' - type: tarball - registry.npmjs.org/uuid/2.0.3: - resolution: - shasum: 67e2e863797215530dff318e5bf9dcebfd47b21a - tarball: 'https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz' - type: tarball registry.npmjs.org/validate-commit-msg/2.11.1: dependencies: conventional-commit-types: registry.npmjs.org/conventional-commit-types/2.1.0 @@ -1502,36 +1271,30 @@ packages: resolution: shasum: c8f86643ca03b26da1b4f3e37d7f6e659fbc34ca tarball: 'https://registry.npmjs.org/validate-commit-msg/-/validate-commit-msg-2.11.1.tgz' - type: tarball registry.npmjs.org/which/1.2.12: dependencies: isexe: registry.npmjs.org/isexe/1.1.2 resolution: shasum: de67b5e450269f194909ef23ece4ebe416fa1192 tarball: 'https://registry.npmjs.org/which/-/which-1.2.12.tgz' - type: tarball registry.npmjs.org/widest-line/1.0.0: dependencies: string-width: registry.npmjs.org/string-width/1.0.2 resolution: shasum: 0c09c85c2a94683d0d7eaf8ee097d564bf0e105c tarball: 'https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz' - type: tarball registry.npmjs.org/word-wrap/1.2.1: resolution: shasum: 248f459b465d179a17bc407c854d3151d07e45d8 tarball: 'https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.1.tgz' - type: tarball registry.npmjs.org/wordwrap/0.0.3: resolution: shasum: a3d5da6cd5c0bc0008d37234bbaf1bed63059107 tarball: 'https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz' - type: tarball registry.npmjs.org/wrappy/1.0.2: resolution: shasum: b5243d8f3ec1aa35f1364605bc0d1036e30ab69f tarball: 'https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz' - type: tarball registry.npmjs.org/write-file-atomic/1.3.1: dependencies: graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 @@ -1540,22 +1303,16 @@ packages: resolution: shasum: 7d45ba32316328dd1ec7d90f60ebc0d845bb759a tarball: 'https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.1.tgz' - type: tarball - registry.npmjs.org/xdg-basedir/2.0.0: - dependencies: - os-homedir: registry.npmjs.org/os-homedir/1.0.2 + registry.npmjs.org/xdg-basedir/3.0.0: resolution: - shasum: edbc903cc385fc04523d966a335504b5504d1bd2 - tarball: 'https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz' - type: tarball + shasum: 496b2cc109eca8dbacfe2dc72b603c17c5870ad4 + tarball: 'https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz' registry.npmjs.org/xtend/4.0.1: resolution: shasum: a5c6d532be656e23db820efb943a1f04998d63af tarball: 'https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz' - type: tarball registry.npmjs.org/yallist/2.0.0: resolution: shasum: 306c543835f09ee1a4cb23b7bce9ab341c91cdd4 tarball: 'https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz' - type: tarball -version: 0 +version: 1 From 7ccf1380c6f7bdd91a67ed506647cb8952da9e8c Mon Sep 17 00:00:00 2001 From: zkochan Date: Mon, 6 Mar 2017 01:20:02 +0200 Subject: [PATCH 023/196] fix: output of named installations When installing more than one package via a named installation. E.g. `pnpm i foo bar`, the output should log the status of each package installation. Ref https://github.com/pnpm/pnpm/issues/108 --- src/index.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index edd528be12..dd8347422f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -14,12 +14,13 @@ export default function (streamParser: Object) { const tasks = {} function getTask (pkgRawSpec: string, pkgName: string) { - if (tasks[pkgRawSpec]) return tasks[pkgRawSpec] + const taskId = `${pkgName}/${pkgRawSpec}` + if (tasks[taskId]) return tasks[taskId] const task = observatory.add( (pkgName ? (pkgName + ' ') : '') + chalk.gray(pkgRawSpec || '')) task.status(chalk.gray('·')) - tasks[pkgRawSpec] = task + tasks[taskId] = task return task } From 663fd6581b16197fbff94b15e176a4ab2ed9adae Mon Sep 17 00:00:00 2001 From: zkochan Date: Mon, 6 Mar 2017 01:23:28 +0200 Subject: [PATCH 024/196] chore: release v0.4.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4e0a7b54a7..8b548abbf3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.4.2", + "version": "0.4.3", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From a1b068feb883b2cc469ef81761b8b1e230c906c9 Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 5 Apr 2017 22:35:24 +0300 Subject: [PATCH 025/196] feat: suggest to reinstall node_modules on breaking change --- src/reportError.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/reportError.ts b/src/reportError.ts index e90fe201c9..cc9c7d9fe1 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -68,7 +68,7 @@ function reportModulesBreakingChange (err: Error, msg: Object) { ${formatErrorSummary(`The current version of pnpm is not compatible with the available node_modules structure`)} node_modules path: ${colorPath(msg['modulesPath'])} - Try running the same command with the ${highlight('--force')} parameter. + Run ${highlight('pnpm install --force')} to recreate node_modules. ` if (msg['additionalInformation']) { From 1520d3fd2f409b085aacd2cf0ee02d9bb78d1066 Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 5 Apr 2017 22:36:02 +0300 Subject: [PATCH 026/196] chore: release v0.5.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8b548abbf3..c4b1374523 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.4.3", + "version": "0.5.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 250986329e1c152c9448ffbb215313b2b4b177a3 Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 5 Apr 2017 22:40:10 +0300 Subject: [PATCH 027/196] chore: release v0.5.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c4b1374523..ae99e50a05 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.5.0", + "version": "0.5.1", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 769aaf8f7ab59ec47254eb2725c699f22e0ffe9f Mon Sep 17 00:00:00 2001 From: zkochan Date: Thu, 6 Apr 2017 23:53:10 +0300 Subject: [PATCH 028/196] chore: update .shrinkwrap.yaml --- shrinkwrap.yaml | 2062 +++++++++++++++++------------------------------ 1 file changed, 746 insertions(+), 1316 deletions(-) diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 377730aac4..e3b41cf155 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,1318 +1,748 @@ dependencies: - '@types/chalk@^0.4.31': registry.npmjs.org/@types/chalk/0.4.31 - '@types/common-tags@^1.2.5': registry.npmjs.org/@types/common-tags/1.2.5 - '@types/node@^7.0.0': registry.npmjs.org/@types/node/7.0.5 - chalk@^1.1.3: registry.npmjs.org/chalk/1.1.3 - commitizen@^2.9.5: registry.npmjs.org/commitizen/2.9.6 - common-tags@^1.4.0: registry.npmjs.org/common-tags/1.4.0 - ghooks@^2.0.0: registry.npmjs.org/ghooks/2.0.0 - ndjson@^1.5.0: registry.npmjs.org/ndjson/1.5.0 - observatory@^1.0.0: registry.npmjs.org/observatory/1.0.0 - pnpm-logger@^0.2.0: registry.npmjs.org/pnpm-logger/0.2.0 - rimraf@^2.5.4: registry.npmjs.org/rimraf/2.6.1 - tslint@^4.3.1: registry.npmjs.org/tslint/4.5.1 - typescript@^2.1.5: registry.npmjs.org/typescript/2.2.1 - validate-commit-msg@^2.8.2: registry.npmjs.org/validate-commit-msg/2.11.1 + '@types/chalk@^0.4.31': 0.4.31 + '@types/common-tags@^1.2.5': 1.2.5 + '@types/node@^7.0.0': 7.0.12 + chalk@^1.1.3: 1.1.3 + commitizen@^2.9.5: 2.9.6 + common-tags@^1.4.0: 1.4.0 + ghooks@^2.0.0: 2.0.0 + ndjson@^1.5.0: 1.5.0 + observatory@^1.0.0: 1.0.0 + pnpm-logger@^0.2.0: 0.2.0 + rimraf@^2.5.4: 2.6.1 + tslint@^4.3.1: 4.5.1 + typescript@^2.1.5: 2.2.2 + validate-commit-msg@^2.8.2: 2.12.1 packages: - registry.npmjs.org/@types/chalk/0.4.31: - resolution: - shasum: a31d74241a6b1edbb973cf36d97a2896834a51f9 - tarball: 'https://registry.npmjs.org/@types/chalk/-/chalk-0.4.31.tgz' - registry.npmjs.org/@types/common-tags/1.2.5: - resolution: - shasum: 14f29893992eb325594b83d739af02f2b6520f46 - tarball: 'https://registry.npmjs.org/@types/common-tags/-/common-tags-1.2.5.tgz' - registry.npmjs.org/@types/node/7.0.5: - resolution: - shasum: 96a0f0a618b7b606f1ec547403c00650210bfbb7 - tarball: 'https://registry.npmjs.org/@types/node/-/node-7.0.5.tgz' - registry.npmjs.org/ansi-align/1.1.0: - dependencies: - string-width: registry.npmjs.org/string-width/1.0.2 - resolution: - shasum: 2f0c1658829739add5ebb15e6b0c6e3423f016ba - tarball: 'https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz' - registry.npmjs.org/ansi-escapes/1.4.0: - resolution: - shasum: d3a8a83b319aa67793662b13e761c7911422306e - tarball: 'https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz' - registry.npmjs.org/ansi-regex/2.1.1: - resolution: - shasum: c3b33ab5ee360d86e0e628f0468ae7ef27d654df - tarball: 'https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz' - registry.npmjs.org/ansi-styles/2.2.1: - resolution: - shasum: b432dd3358b634cf75e1e4664368240533c1ddbe - tarball: 'https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz' - registry.npmjs.org/arr-diff/2.0.0: - dependencies: - arr-flatten: registry.npmjs.org/arr-flatten/1.0.1 - resolution: - shasum: 8f3b827f955a8bd669697e4a4256ac3ceae356cf - tarball: 'https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz' - registry.npmjs.org/arr-flatten/1.0.1: - resolution: - shasum: e5ffe54d45e19f32f216e91eb99c8ce892bb604b - tarball: 'https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz' - registry.npmjs.org/array-unique/0.2.1: - resolution: - shasum: a1d97ccafcbc2625cc70fadceb36a50c58b01a53 - tarball: 'https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz' - registry.npmjs.org/babel-code-frame/6.22.0: - dependencies: - chalk: registry.npmjs.org/chalk/1.1.3 - esutils: registry.npmjs.org/esutils/2.0.2 - js-tokens: registry.npmjs.org/js-tokens/3.0.1 - resolution: - shasum: 027620bee567a88c32561574e7fd0801d33118e4 - tarball: 'https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz' - registry.npmjs.org/babel-runtime/6.23.0: - dependencies: - core-js: registry.npmjs.org/core-js/2.4.1 - regenerator-runtime: registry.npmjs.org/regenerator-runtime/0.10.3 - resolution: - shasum: 0a9489f144de70efb3ce4300accdb329e2fc543b - tarball: 'https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz' - registry.npmjs.org/balanced-match/0.4.2: - resolution: - shasum: cb3f3e3c732dc0f01ee70b403f302e61d7709838 - tarball: 'https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz' - registry.npmjs.org/bole/3.0.2: - dependencies: - fast-safe-stringify: registry.npmjs.org/fast-safe-stringify/1.1.6 - individual: registry.npmjs.org/individual/3.0.0 - resolution: - shasum: bc8a483ca94049da9b837c1ad11cdfebee6e0514 - tarball: 'https://registry.npmjs.org/bole/-/bole-3.0.2.tgz' - registry.npmjs.org/boxen/1.0.0: - dependencies: - ansi-align: registry.npmjs.org/ansi-align/1.1.0 - camelcase: registry.npmjs.org/camelcase/4.0.0 - chalk: registry.npmjs.org/chalk/1.1.3 - cli-boxes: registry.npmjs.org/cli-boxes/1.0.0 - string-width: registry.npmjs.org/string-width/2.0.0 - term-size: registry.npmjs.org/term-size/0.1.1 - widest-line: registry.npmjs.org/widest-line/1.0.0 - resolution: - shasum: b2694baf1f605f708ff0177c12193b22f29aaaab - tarball: 'https://registry.npmjs.org/boxen/-/boxen-1.0.0.tgz' - registry.npmjs.org/brace-expansion/1.1.6: - dependencies: - balanced-match: registry.npmjs.org/balanced-match/0.4.2 - concat-map: registry.npmjs.org/concat-map/0.0.1 - resolution: - shasum: 7197d7eaa9b87e648390ea61fc66c84427420df9 - tarball: 'https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz' - registry.npmjs.org/braces/1.8.5: - dependencies: - expand-range: registry.npmjs.org/expand-range/1.8.2 - preserve: registry.npmjs.org/preserve/0.2.0 - repeat-element: registry.npmjs.org/repeat-element/1.1.2 - resolution: - shasum: ba77962e12dff969d6b76711e914b737857bf6a7 - tarball: 'https://registry.npmjs.org/braces/-/braces-1.8.5.tgz' - registry.npmjs.org/buffer-shims/1.0.0: - resolution: - shasum: 9978ce317388c649ad8793028c3477ef044a8b51 - tarball: 'https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz' - registry.npmjs.org/cachedir/1.1.1: - dependencies: - os-homedir: registry.npmjs.org/os-homedir/1.0.2 - resolution: - shasum: e1363075ea206a12767d92bb711c8a2f76a10f62 - tarball: 'https://registry.npmjs.org/cachedir/-/cachedir-1.1.1.tgz' - registry.npmjs.org/camelcase/4.0.0: - resolution: - shasum: 8b0f90d44be5e281b903b9887349b92595ef07f2 - tarball: 'https://registry.npmjs.org/camelcase/-/camelcase-4.0.0.tgz' - registry.npmjs.org/capture-stack-trace/1.0.0: - resolution: - shasum: 4a6fa07399c26bba47f0b2496b4d0fb408c5550d - tarball: 'https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz' - registry.npmjs.org/chalk/1.1.3: - dependencies: - ansi-styles: registry.npmjs.org/ansi-styles/2.2.1 - escape-string-regexp: registry.npmjs.org/escape-string-regexp/1.0.5 - has-ansi: registry.npmjs.org/has-ansi/2.0.0 - strip-ansi: registry.npmjs.org/strip-ansi/3.0.1 - supports-color: registry.npmjs.org/supports-color/2.0.0 - resolution: - shasum: a8115c55e4a702fe4d150abd3872822a7e09fc98 - tarball: 'https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz' - registry.npmjs.org/cli-boxes/1.0.0: - resolution: - shasum: 4fa917c3e59c94a004cd61f8ee509da651687143 - tarball: 'https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz' - registry.npmjs.org/cli-cursor/1.0.2: - dependencies: - restore-cursor: registry.npmjs.org/restore-cursor/1.0.1 - resolution: - shasum: 64da3f7d56a54412e59794bd62dc35295e8f2987 - tarball: 'https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz' - registry.npmjs.org/cli-width/2.1.0: - resolution: - shasum: b234ca209b29ef66fc518d9b98d5847b00edf00a - tarball: 'https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz' - registry.npmjs.org/code-point-at/1.1.0: - resolution: - shasum: 0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77 - tarball: 'https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz' - registry.npmjs.org/colors/0.6.2: - resolution: - shasum: 2423fe6678ac0c5dae8852e5d0e5be08c997abcc - tarball: 'https://registry.npmjs.org/colors/-/colors-0.6.2.tgz' - registry.npmjs.org/colors/1.1.2: - resolution: - shasum: 168a4701756b6a7f51a12ce0c97bfa28c084ed63 - tarball: 'https://registry.npmjs.org/colors/-/colors-1.1.2.tgz' - registry.npmjs.org/commander/2.1.0: - resolution: - shasum: d121bbae860d9992a3d517ba96f56588e47c6781 - tarball: 'https://registry.npmjs.org/commander/-/commander-2.1.0.tgz' - registry.npmjs.org/commander/2.9.0: - dependencies: - graceful-readlink: registry.npmjs.org/graceful-readlink/1.0.1 - resolution: - shasum: 9c99094176e12240cb22d6c5146098400fe0f7d4 - tarball: 'https://registry.npmjs.org/commander/-/commander-2.9.0.tgz' - registry.npmjs.org/commitizen/2.9.6: - dependencies: - cachedir: registry.npmjs.org/cachedir/1.1.1 - chalk: registry.npmjs.org/chalk/1.1.3 - cz-conventional-changelog: registry.npmjs.org/cz-conventional-changelog/1.2.0 - dedent: registry.npmjs.org/dedent/0.6.0 - detect-indent: registry.npmjs.org/detect-indent/4.0.0 - find-node-modules: registry.npmjs.org/find-node-modules/1.0.4 - find-root: registry.npmjs.org/find-root/1.0.0 - fs-extra: registry.npmjs.org/fs-extra/1.0.0 - glob: registry.npmjs.org/glob/7.1.1 - inquirer: registry.npmjs.org/inquirer/1.2.3 - lodash: registry.npmjs.org/lodash/4.17.2 - minimist: registry.npmjs.org/minimist/1.2.0 - path-exists: registry.npmjs.org/path-exists/2.1.0 - shelljs: registry.npmjs.org/shelljs/0.7.6 - strip-json-comments: registry.npmjs.org/strip-json-comments/2.0.1 - resolution: - shasum: c0d00535ef264da7f63737edfda4228983fa2291 - tarball: 'https://registry.npmjs.org/commitizen/-/commitizen-2.9.6.tgz' - registry.npmjs.org/common-tags/1.4.0: - dependencies: - babel-runtime: registry.npmjs.org/babel-runtime/6.23.0 - resolution: - shasum: 1187be4f3d4cf0c0427d43f74eef1f73501614c0 - tarball: 'https://registry.npmjs.org/common-tags/-/common-tags-1.4.0.tgz' - registry.npmjs.org/concat-map/0.0.1: - resolution: - shasum: d8a96bd77fd68df7793a73036a3ba0d5405d477b - tarball: 'https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz' - registry.npmjs.org/concat-stream/1.6.0: - dependencies: - inherits: registry.npmjs.org/inherits/2.0.3 - readable-stream: registry.npmjs.org/readable-stream/2.2.3 - typedarray: registry.npmjs.org/typedarray/0.0.6 - resolution: - shasum: 0aac662fd52be78964d5532f694784e70110acf7 - tarball: 'https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz' - registry.npmjs.org/configstore/3.0.0: - dependencies: - dot-prop: registry.npmjs.org/dot-prop/4.1.1 - graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 - mkdirp: registry.npmjs.org/mkdirp/0.5.1 - unique-string: registry.npmjs.org/unique-string/1.0.0 - write-file-atomic: registry.npmjs.org/write-file-atomic/1.3.1 - xdg-basedir: registry.npmjs.org/xdg-basedir/3.0.0 - resolution: - shasum: e1b8669c1803ccc50b545e92f8e6e79aa80e0196 - tarball: 'https://registry.npmjs.org/configstore/-/configstore-3.0.0.tgz' - registry.npmjs.org/conventional-commit-types/2.1.0: - resolution: - shasum: 45d860386c9a2e6537ee91d8a1b61bd0411b3d04 - tarball: 'https://registry.npmjs.org/conventional-commit-types/-/conventional-commit-types-2.1.0.tgz' - registry.npmjs.org/core-js/2.4.1: - resolution: - shasum: 4de911e667b0eae9124e34254b53aea6fc618d3e - tarball: 'https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz' - registry.npmjs.org/core-util-is/1.0.2: - resolution: - shasum: b5fd54220aa2bc5ab57aab7140c940754503c1a7 - tarball: 'https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz' - registry.npmjs.org/create-error-class/3.0.2: - dependencies: - capture-stack-trace: registry.npmjs.org/capture-stack-trace/1.0.0 - resolution: - shasum: 06be7abef947a3f14a30fd610671d401bca8b7b6 - tarball: 'https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz' - registry.npmjs.org/cross-spawn-async/2.2.5: - dependencies: - lru-cache: registry.npmjs.org/lru-cache/4.0.2 - which: registry.npmjs.org/which/1.2.12 - resolution: - shasum: 845ff0c0834a3ded9d160daca6d390906bb288cc - tarball: 'https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz' - registry.npmjs.org/crypto-random-string/1.0.0: - resolution: - shasum: a230f64f568310e1498009940790ec99545bca7e - tarball: 'https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz' - registry.npmjs.org/cz-conventional-changelog/1.2.0: - dependencies: - conventional-commit-types: registry.npmjs.org/conventional-commit-types/2.1.0 - lodash.map: registry.npmjs.org/lodash.map/4.6.0 - longest: registry.npmjs.org/longest/1.0.1 - pad-right: registry.npmjs.org/pad-right/0.2.2 - right-pad: registry.npmjs.org/right-pad/1.0.1 - word-wrap: registry.npmjs.org/word-wrap/1.2.1 - resolution: - shasum: 2bca04964c8919b23f3fd6a89ef5e6008b31b3f8 - tarball: 'https://registry.npmjs.org/cz-conventional-changelog/-/cz-conventional-changelog-1.2.0.tgz' - registry.npmjs.org/dedent/0.6.0: - resolution: - shasum: 0e6da8f0ce52838ef5cec5c8f9396b0c1b64a3cb - tarball: 'https://registry.npmjs.org/dedent/-/dedent-0.6.0.tgz' - registry.npmjs.org/deep-extend/0.4.1: - resolution: - shasum: efe4113d08085f4e6f9687759810f807469e2253 - tarball: 'https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz' - registry.npmjs.org/detect-file/0.1.0: - dependencies: - fs-exists-sync: registry.npmjs.org/fs-exists-sync/0.1.0 - resolution: - shasum: 4935dedfd9488648e006b0129566e9386711ea63 - tarball: 'https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz' - registry.npmjs.org/detect-indent/4.0.0: - dependencies: - repeating: registry.npmjs.org/repeating/2.0.1 - resolution: - shasum: f76d064352cdf43a1cb6ce619c4ee3a9475de208 - tarball: 'https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz' - registry.npmjs.org/diff/3.2.0: - resolution: - shasum: c9ce393a4b7cbd0b058a725c93df299027868ff9 - tarball: 'https://registry.npmjs.org/diff/-/diff-3.2.0.tgz' - registry.npmjs.org/dot-prop/4.1.1: - dependencies: - is-obj: registry.npmjs.org/is-obj/1.0.1 - resolution: - shasum: a8493f0b7b5eeec82525b5c7587fa7de7ca859c1 - tarball: 'https://registry.npmjs.org/dot-prop/-/dot-prop-4.1.1.tgz' - registry.npmjs.org/duplexer3/0.1.4: - resolution: - shasum: ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2 - tarball: 'https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz' - registry.npmjs.org/escape-string-regexp/1.0.5: - resolution: - shasum: 1b61c0562190a8dff6ae3bb2cf0200ca130b86d4 - tarball: 'https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz' - registry.npmjs.org/esutils/2.0.2: - resolution: - shasum: 0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b - tarball: 'https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz' - registry.npmjs.org/execa/0.4.0: - dependencies: - cross-spawn-async: registry.npmjs.org/cross-spawn-async/2.2.5 - is-stream: registry.npmjs.org/is-stream/1.1.0 - npm-run-path: registry.npmjs.org/npm-run-path/1.0.0 - object-assign: registry.npmjs.org/object-assign/4.1.1 - path-key: registry.npmjs.org/path-key/1.0.0 - strip-eof: registry.npmjs.org/strip-eof/1.0.0 - resolution: - shasum: 4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3 - tarball: 'https://registry.npmjs.org/execa/-/execa-0.4.0.tgz' - registry.npmjs.org/exit-hook/1.1.1: - resolution: - shasum: f05ca233b48c05d54fff07765df8507e95c02ff8 - tarball: 'https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz' - registry.npmjs.org/expand-brackets/0.1.5: - dependencies: - is-posix-bracket: registry.npmjs.org/is-posix-bracket/0.1.1 - resolution: - shasum: df07284e342a807cd733ac5af72411e581d1177b - tarball: 'https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz' - registry.npmjs.org/expand-range/1.8.2: - dependencies: - fill-range: registry.npmjs.org/fill-range/2.2.3 - resolution: - shasum: a299effd335fe2721ebae8e257ec79644fc85337 - tarball: 'https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz' - registry.npmjs.org/expand-tilde/1.2.2: - dependencies: - os-homedir: registry.npmjs.org/os-homedir/1.0.2 - resolution: - shasum: 0b81eba897e5a3d31d1c3d102f8f01441e559449 - tarball: 'https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz' - registry.npmjs.org/extend/3.0.0: - resolution: - shasum: 5a474353b9f3353ddd8176dfd37b91c83a46f1d4 - tarball: 'https://registry.npmjs.org/extend/-/extend-3.0.0.tgz' - registry.npmjs.org/external-editor/1.1.1: - dependencies: - extend: registry.npmjs.org/extend/3.0.0 - spawn-sync: registry.npmjs.org/spawn-sync/1.0.15 - tmp: registry.npmjs.org/tmp/0.0.29 - resolution: - shasum: 12d7b0db850f7ff7e7081baf4005700060c4600b - tarball: 'https://registry.npmjs.org/external-editor/-/external-editor-1.1.1.tgz' - registry.npmjs.org/extglob/0.3.2: - dependencies: - is-extglob: registry.npmjs.org/is-extglob/1.0.0 - resolution: - shasum: 2e18ff3d2f49ab2765cec9023f011daa8d8349a1 - tarball: 'https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz' - registry.npmjs.org/fast-safe-stringify/1.1.6: - resolution: - shasum: b30f4a55cbf657895a5b07b2c9c6fec91580802d - tarball: 'https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-1.1.6.tgz' - registry.npmjs.org/figures/1.7.0: - dependencies: - escape-string-regexp: registry.npmjs.org/escape-string-regexp/1.0.5 - object-assign: registry.npmjs.org/object-assign/4.1.1 - resolution: - shasum: cbe1e3affcf1cd44b80cadfed28dc793a9701d2e - tarball: 'https://registry.npmjs.org/figures/-/figures-1.7.0.tgz' - registry.npmjs.org/filename-regex/2.0.0: - resolution: - shasum: 996e3e80479b98b9897f15a8a58b3d084e926775 - tarball: 'https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz' - registry.npmjs.org/fill-range/2.2.3: - dependencies: - is-number: registry.npmjs.org/is-number/2.1.0 - isobject: registry.npmjs.org/isobject/2.1.0 - randomatic: registry.npmjs.org/randomatic/1.1.6 - repeat-element: registry.npmjs.org/repeat-element/1.1.2 - repeat-string: registry.npmjs.org/repeat-string/1.6.1 - resolution: - shasum: 50b77dfd7e469bc7492470963699fe7a8485a723 - tarball: 'https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz' - registry.npmjs.org/find-node-modules/1.0.4: - dependencies: - findup-sync: registry.npmjs.org/findup-sync/0.4.2 - merge: registry.npmjs.org/merge/1.2.0 - resolution: - shasum: b6deb3cccb699c87037677bcede2c5f5862b2550 - tarball: 'https://registry.npmjs.org/find-node-modules/-/find-node-modules-1.0.4.tgz' - registry.npmjs.org/find-root/1.0.0: - resolution: - shasum: 962ff211aab25c6520feeeb8d6287f8f6e95807a - tarball: 'https://registry.npmjs.org/find-root/-/find-root-1.0.0.tgz' - registry.npmjs.org/findup-sync/0.3.0: - dependencies: - glob: registry.npmjs.org/glob/5.0.15 - resolution: - shasum: 37930aa5d816b777c03445e1966cc6790a4c0b16 - tarball: 'https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz' - registry.npmjs.org/findup-sync/0.4.2: - dependencies: - detect-file: registry.npmjs.org/detect-file/0.1.0 - is-glob: registry.npmjs.org/is-glob/2.0.1 - micromatch: registry.npmjs.org/micromatch/2.3.11 - resolve-dir: registry.npmjs.org/resolve-dir/0.1.1 - resolution: - shasum: a8117d0f73124f5a4546839579fe52d7129fb5e5 - tarball: 'https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.2.tgz' - registry.npmjs.org/findup/0.1.5: - dependencies: - colors: registry.npmjs.org/colors/0.6.2 - commander: registry.npmjs.org/commander/2.1.0 - resolution: - shasum: 8ad929a3393bac627957a7e5de4623b06b0e2ceb - tarball: 'https://registry.npmjs.org/findup/-/findup-0.1.5.tgz' - registry.npmjs.org/for-in/1.0.2: - resolution: - shasum: 81068d295a8142ec0ac726c6e2200c30fb6d5e80 - tarball: 'https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz' - registry.npmjs.org/for-own/0.1.5: - dependencies: - for-in: registry.npmjs.org/for-in/1.0.2 - resolution: - shasum: 5265c681a4f294dabbf17c9509b6763aa84510ce - tarball: 'https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz' - registry.npmjs.org/fs-exists-sync/0.1.0: - resolution: - shasum: 982d6893af918e72d08dec9e8673ff2b5a8d6add - tarball: 'https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz' - registry.npmjs.org/fs-extra/1.0.0: - dependencies: - graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 - jsonfile: registry.npmjs.org/jsonfile/2.4.0 - klaw: registry.npmjs.org/klaw/1.3.1 - resolution: - shasum: cd3ce5f7e7cb6145883fcae3191e9877f8587950 - tarball: 'https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz' - registry.npmjs.org/fs.realpath/1.0.0: - resolution: - shasum: 1504ad2523158caa40db4a2787cb01411994ea4f - tarball: 'https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz' - registry.npmjs.org/get-stream/3.0.0: - resolution: - shasum: 8e943d1358dc37555054ecbe2edb05aa174ede14 - tarball: 'https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz' - registry.npmjs.org/ghooks/2.0.0: - dependencies: - execa: registry.npmjs.org/execa/0.4.0 - findup: registry.npmjs.org/findup/0.1.5 - lodash.clone: registry.npmjs.org/lodash.clone/4.3.2 - manage-path: registry.npmjs.org/manage-path/2.0.0 - opt-cli: registry.npmjs.org/opt-cli/1.5.1 - path-exists: registry.npmjs.org/path-exists/2.1.0 - spawn-command: registry.npmjs.org/spawn-command/0.0.2 - resolution: - shasum: affd83a36e8b8fbdded9b851457c48ac74c8eab8 - tarball: 'https://registry.npmjs.org/ghooks/-/ghooks-2.0.0.tgz' - registry.npmjs.org/glob-base/0.3.0: - dependencies: - glob-parent: registry.npmjs.org/glob-parent/2.0.0 - is-glob: registry.npmjs.org/is-glob/2.0.1 - resolution: - shasum: dbb164f6221b1c0b1ccf82aea328b497df0ea3c4 - tarball: 'https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz' - registry.npmjs.org/glob-parent/2.0.0: - dependencies: - is-glob: registry.npmjs.org/is-glob/2.0.1 - resolution: - shasum: 81383d72db054fcccf5336daa902f182f6edbb28 - tarball: 'https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz' - registry.npmjs.org/glob/5.0.15: - dependencies: - inflight: registry.npmjs.org/inflight/1.0.6 - inherits: registry.npmjs.org/inherits/2.0.3 - minimatch: registry.npmjs.org/minimatch/3.0.3 - once: registry.npmjs.org/once/1.4.0 - path-is-absolute: registry.npmjs.org/path-is-absolute/1.0.1 - resolution: - shasum: 1bc936b9e02f4a603fcc222ecf7633d30b8b93b1 - tarball: 'https://registry.npmjs.org/glob/-/glob-5.0.15.tgz' - registry.npmjs.org/glob/7.1.1: - dependencies: - fs.realpath: registry.npmjs.org/fs.realpath/1.0.0 - inflight: registry.npmjs.org/inflight/1.0.6 - inherits: registry.npmjs.org/inherits/2.0.3 - minimatch: registry.npmjs.org/minimatch/3.0.3 - once: registry.npmjs.org/once/1.4.0 - path-is-absolute: registry.npmjs.org/path-is-absolute/1.0.1 - resolution: - shasum: 805211df04faaf1c63a3600306cdf5ade50b2ec8 - tarball: 'https://registry.npmjs.org/glob/-/glob-7.1.1.tgz' - registry.npmjs.org/global-modules/0.2.3: - dependencies: - global-prefix: registry.npmjs.org/global-prefix/0.1.5 - is-windows: registry.npmjs.org/is-windows/0.2.0 - resolution: - shasum: ea5a3bed42c6d6ce995a4f8a1269b5dae223828d - tarball: 'https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz' - registry.npmjs.org/global-prefix/0.1.5: - dependencies: - homedir-polyfill: registry.npmjs.org/homedir-polyfill/1.0.1 - ini: registry.npmjs.org/ini/1.3.4 - is-windows: registry.npmjs.org/is-windows/0.2.0 - which: registry.npmjs.org/which/1.2.12 - resolution: - shasum: 8d3bc6b8da3ca8112a160d8d496ff0462bfef78f - tarball: 'https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz' - registry.npmjs.org/got/6.7.1: - dependencies: - create-error-class: registry.npmjs.org/create-error-class/3.0.2 - duplexer3: registry.npmjs.org/duplexer3/0.1.4 - get-stream: registry.npmjs.org/get-stream/3.0.0 - is-redirect: registry.npmjs.org/is-redirect/1.0.0 - is-retry-allowed: registry.npmjs.org/is-retry-allowed/1.1.0 - is-stream: registry.npmjs.org/is-stream/1.1.0 - lowercase-keys: registry.npmjs.org/lowercase-keys/1.0.0 - safe-buffer: registry.npmjs.org/safe-buffer/5.0.1 - timed-out: registry.npmjs.org/timed-out/4.0.1 - unzip-response: registry.npmjs.org/unzip-response/2.0.1 - url-parse-lax: registry.npmjs.org/url-parse-lax/1.0.0 - resolution: - shasum: 240cd05785a9a18e561dc1b44b41c763ef1e8db0 - tarball: 'https://registry.npmjs.org/got/-/got-6.7.1.tgz' - registry.npmjs.org/graceful-fs/4.1.11: - resolution: - shasum: 0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658 - tarball: 'https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz' - registry.npmjs.org/graceful-readlink/1.0.1: - resolution: - shasum: 4cafad76bc62f02fa039b2f94e9a3dd3a391a725 - tarball: 'https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz' - registry.npmjs.org/has-ansi/2.0.0: - dependencies: - ansi-regex: registry.npmjs.org/ansi-regex/2.1.1 - resolution: - shasum: 34f5049ce1ecdf2b0649af3ef24e45ed35416d91 - tarball: 'https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz' - registry.npmjs.org/homedir-polyfill/1.0.1: - dependencies: - parse-passwd: registry.npmjs.org/parse-passwd/1.0.0 - resolution: - shasum: 4c2bbc8a758998feebf5ed68580f76d46768b4bc - tarball: 'https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz' - registry.npmjs.org/imurmurhash/0.1.4: - resolution: - shasum: 9218b9b2b928a238b13dc4fb6b6d576f231453ea - tarball: 'https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz' - registry.npmjs.org/individual/3.0.0: - resolution: - shasum: e7ca4f85f8957b018734f285750dc22ec2f9862d - tarball: 'https://registry.npmjs.org/individual/-/individual-3.0.0.tgz' - registry.npmjs.org/inflight/1.0.6: - dependencies: - once: registry.npmjs.org/once/1.4.0 - wrappy: registry.npmjs.org/wrappy/1.0.2 - resolution: - shasum: 49bd6331d7d02d0c09bc910a1075ba8165b56df9 - tarball: 'https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz' - registry.npmjs.org/inherits/2.0.3: - resolution: - shasum: 633c2c83e3da42a502f52466022480f4208261de - tarball: 'https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz' - registry.npmjs.org/ini/1.3.4: - resolution: - shasum: 0537cb79daf59b59a1a517dff706c86ec039162e - tarball: 'https://registry.npmjs.org/ini/-/ini-1.3.4.tgz' - registry.npmjs.org/inquirer/1.2.3: - dependencies: - ansi-escapes: registry.npmjs.org/ansi-escapes/1.4.0 - chalk: registry.npmjs.org/chalk/1.1.3 - cli-cursor: registry.npmjs.org/cli-cursor/1.0.2 - cli-width: registry.npmjs.org/cli-width/2.1.0 - external-editor: registry.npmjs.org/external-editor/1.1.1 - figures: registry.npmjs.org/figures/1.7.0 - lodash: registry.npmjs.org/lodash/4.17.4 - mute-stream: registry.npmjs.org/mute-stream/0.0.6 - pinkie-promise: registry.npmjs.org/pinkie-promise/2.0.1 - run-async: registry.npmjs.org/run-async/2.3.0 - rx: registry.npmjs.org/rx/4.1.0 - string-width: registry.npmjs.org/string-width/1.0.2 - strip-ansi: registry.npmjs.org/strip-ansi/3.0.1 - through: registry.npmjs.org/through/2.3.8 - resolution: - shasum: 4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918 - tarball: 'https://registry.npmjs.org/inquirer/-/inquirer-1.2.3.tgz' - registry.npmjs.org/interpret/1.0.1: - resolution: - shasum: d579fb7f693b858004947af39fa0db49f795602c - tarball: 'https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz' - registry.npmjs.org/is-buffer/1.1.4: - resolution: - shasum: cfc86ccd5dc5a52fa80489111c6920c457e2d98b - tarball: 'https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz' - registry.npmjs.org/is-dotfile/1.0.2: - resolution: - shasum: 2c132383f39199f8edc268ca01b9b007d205cc4d - tarball: 'https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz' - registry.npmjs.org/is-equal-shallow/0.1.3: - dependencies: - is-primitive: registry.npmjs.org/is-primitive/2.0.0 - resolution: - shasum: 2238098fc221de0bcfa5d9eac4c45d638aa1c534 - tarball: 'https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz' - registry.npmjs.org/is-extendable/0.1.1: - resolution: - shasum: 62b110e289a471418e3ec36a617d472e301dfc89 - tarball: 'https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz' - registry.npmjs.org/is-extglob/1.0.0: - resolution: - shasum: ac468177c4943405a092fc8f29760c6ffc6206c0 - tarball: 'https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz' - registry.npmjs.org/is-finite/1.0.2: - dependencies: - number-is-nan: registry.npmjs.org/number-is-nan/1.0.1 - resolution: - shasum: cc6677695602be550ef11e8b4aa6305342b6d0aa - tarball: 'https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz' - registry.npmjs.org/is-fullwidth-code-point/1.0.0: - dependencies: - number-is-nan: registry.npmjs.org/number-is-nan/1.0.1 - resolution: - shasum: ef9e31386f031a7f0d643af82fde50c457ef00cb - tarball: 'https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz' - registry.npmjs.org/is-fullwidth-code-point/2.0.0: - resolution: - shasum: a3b30a5c4f199183167aaab93beefae3ddfb654f - tarball: 'https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz' - registry.npmjs.org/is-glob/2.0.1: - dependencies: - is-extglob: registry.npmjs.org/is-extglob/1.0.0 - resolution: - shasum: d096f926a3ded5600f3fdfd91198cb0888c2d863 - tarball: 'https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz' - registry.npmjs.org/is-npm/1.0.0: - resolution: - shasum: f2fb63a65e4905b406c86072765a1a4dc793b9f4 - tarball: 'https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz' - registry.npmjs.org/is-number/2.1.0: - dependencies: - kind-of: registry.npmjs.org/kind-of/3.1.0 - resolution: - shasum: 01fcbbb393463a548f2f466cce16dece49db908f - tarball: 'https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz' - registry.npmjs.org/is-obj/1.0.1: - resolution: - shasum: 3e4729ac1f5fde025cd7d83a896dab9f4f67db0f - tarball: 'https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz' - registry.npmjs.org/is-posix-bracket/0.1.1: - resolution: - shasum: 3334dc79774368e92f016e6fbc0a88f5cd6e6bc4 - tarball: 'https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz' - registry.npmjs.org/is-primitive/2.0.0: - resolution: - shasum: 207bab91638499c07b2adf240a41a87210034575 - tarball: 'https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz' - registry.npmjs.org/is-promise/2.1.0: - resolution: - shasum: 79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa - tarball: 'https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz' - registry.npmjs.org/is-redirect/1.0.0: - resolution: - shasum: 1d03dded53bd8db0f30c26e4f95d36fc7c87dc24 - tarball: 'https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz' - registry.npmjs.org/is-retry-allowed/1.1.0: - resolution: - shasum: 11a060568b67339444033d0125a61a20d564fb34 - tarball: 'https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz' - registry.npmjs.org/is-stream/1.1.0: - resolution: - shasum: 12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44 - tarball: 'https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz' - registry.npmjs.org/is-windows/0.2.0: - resolution: - shasum: de1aa6d63ea29dd248737b69f1ff8b8002d2108c - tarball: 'https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz' - registry.npmjs.org/isarray/1.0.0: - resolution: - shasum: bb935d48582cba168c06834957a54a3e07124f11 - tarball: 'https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz' - registry.npmjs.org/isexe/1.1.2: - resolution: - shasum: 36f3e22e60750920f5e7241a476a8c6a42275ad0 - tarball: 'https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz' - registry.npmjs.org/isobject/2.1.0: - dependencies: - isarray: registry.npmjs.org/isarray/1.0.0 - resolution: - shasum: f065561096a3f1da2ef46272f815c840d87e0c89 - tarball: 'https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz' - registry.npmjs.org/js-tokens/3.0.1: - resolution: - shasum: 08e9f132484a2c45a30907e9dc4d5567b7f114d7 - tarball: 'https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz' - registry.npmjs.org/json-stringify-safe/5.0.1: - resolution: - shasum: 1296a2d58fd45f19a0f6ce01d65701e2c735b6eb - tarball: 'https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz' - registry.npmjs.org/jsonfile/2.4.0: - dependencies: - graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 - resolution: - shasum: 3736a2b428b87bbda0cc83b53fa3d633a35c2ae8 - tarball: 'https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz' - registry.npmjs.org/kind-of/3.1.0: - dependencies: - is-buffer: registry.npmjs.org/is-buffer/1.1.4 - resolution: - shasum: 475d698a5e49ff5e53d14e3e732429dc8bf4cf47 - tarball: 'https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz' - registry.npmjs.org/klaw/1.3.1: - dependencies: - graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 - resolution: - shasum: 4088433b46b3b1ba259d78785d8e96f73ba02439 - tarball: 'https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz' - registry.npmjs.org/latest-version/3.0.0: - dependencies: - package-json: registry.npmjs.org/package-json/3.1.0 - resolution: - shasum: 3104f008c0c391084107f85a344bc61e38970649 - tarball: 'https://registry.npmjs.org/latest-version/-/latest-version-3.0.0.tgz' - registry.npmjs.org/lazy-req/2.0.0: - resolution: - shasum: c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4 - tarball: 'https://registry.npmjs.org/lazy-req/-/lazy-req-2.0.0.tgz' - registry.npmjs.org/lodash._baseclone/4.5.7: - resolution: - shasum: ce42ade08384ef5d62fa77c30f61a46e686f8434 - tarball: 'https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz' - registry.npmjs.org/lodash.clone/4.3.2: - dependencies: - lodash._baseclone: registry.npmjs.org/lodash._baseclone/4.5.7 - resolution: - shasum: e56b176b6823a7dde38f7f2bf58de7d5971200e9 - tarball: 'https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.3.2.tgz' - registry.npmjs.org/lodash.map/4.6.0: - resolution: - shasum: 771ec7839e3473d9c4cde28b19394c3562f4f6d3 - tarball: 'https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz' - registry.npmjs.org/lodash/3.10.1: - resolution: - shasum: 5bf45e8e49ba4189e17d482789dfd15bd140b7b6 - tarball: 'https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz' - registry.npmjs.org/lodash/4.17.2: - resolution: - shasum: 34a3055babe04ce42467b607d700072c7ff6bf42 - tarball: 'https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz' - registry.npmjs.org/lodash/4.17.4: - resolution: - shasum: 78203a4d1c328ae1d86dca6460e369b57f4055ae - tarball: 'https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz' - registry.npmjs.org/longest/1.0.1: - resolution: - shasum: 30a0b2da38f73770e8294a0d22e6625ed77d0097 - tarball: 'https://registry.npmjs.org/longest/-/longest-1.0.1.tgz' - registry.npmjs.org/lowercase-keys/1.0.0: - resolution: - shasum: 4e3366b39e7f5457e35f1324bdf6f88d0bfc7306 - tarball: 'https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz' - registry.npmjs.org/lru-cache/4.0.2: - dependencies: - pseudomap: registry.npmjs.org/pseudomap/1.0.2 - yallist: registry.npmjs.org/yallist/2.0.0 - resolution: - shasum: 1d17679c069cda5d040991a09dbc2c0db377e55e - tarball: 'https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz' - registry.npmjs.org/manage-path/2.0.0: - resolution: - shasum: f4cf8457b926eeee2a83b173501414bc76eb9597 - tarball: 'https://registry.npmjs.org/manage-path/-/manage-path-2.0.0.tgz' - registry.npmjs.org/merge/1.2.0: - resolution: - shasum: 7531e39d4949c281a66b8c5a6e0265e8b05894da - tarball: 'https://registry.npmjs.org/merge/-/merge-1.2.0.tgz' - registry.npmjs.org/micromatch/2.3.11: - dependencies: - arr-diff: registry.npmjs.org/arr-diff/2.0.0 - array-unique: registry.npmjs.org/array-unique/0.2.1 - braces: registry.npmjs.org/braces/1.8.5 - expand-brackets: registry.npmjs.org/expand-brackets/0.1.5 - extglob: registry.npmjs.org/extglob/0.3.2 - filename-regex: registry.npmjs.org/filename-regex/2.0.0 - is-extglob: registry.npmjs.org/is-extglob/1.0.0 - is-glob: registry.npmjs.org/is-glob/2.0.1 - kind-of: registry.npmjs.org/kind-of/3.1.0 - normalize-path: registry.npmjs.org/normalize-path/2.0.1 - object.omit: registry.npmjs.org/object.omit/2.0.1 - parse-glob: registry.npmjs.org/parse-glob/3.0.4 - regex-cache: registry.npmjs.org/regex-cache/0.4.3 - resolution: - shasum: 86677c97d1720b363431d04d0d15293bd38c1565 - tarball: 'https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz' - registry.npmjs.org/minimatch/3.0.3: - dependencies: - brace-expansion: registry.npmjs.org/brace-expansion/1.1.6 - resolution: - shasum: 2a4e4090b96b2db06a9d7df01055a62a77c9b774 - tarball: 'https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz' - registry.npmjs.org/minimist/0.0.10: - resolution: - shasum: de3f98543dbf96082be48ad1a0c7cda836301dcf - tarball: 'https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz' - registry.npmjs.org/minimist/0.0.8: - resolution: - shasum: 857fcabfc3397d2625b8228262e86aa7a011b05d - tarball: 'https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz' - registry.npmjs.org/minimist/1.2.0: - resolution: - shasum: a35008b20f41383eec1fb914f4cd5df79a264284 - tarball: 'https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz' - registry.npmjs.org/mkdirp/0.5.1: - dependencies: - minimist: registry.npmjs.org/minimist/0.0.8 - resolution: - shasum: 30057438eac6cf7f8c4767f38648d6697d75c903 - tarball: 'https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz' - registry.npmjs.org/mute-stream/0.0.6: - resolution: - shasum: 48962b19e169fd1dfc240b3f1e7317627bbc47db - tarball: 'https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz' - registry.npmjs.org/ndjson/1.5.0: - dependencies: - json-stringify-safe: registry.npmjs.org/json-stringify-safe/5.0.1 - minimist: registry.npmjs.org/minimist/1.2.0 - split2: registry.npmjs.org/split2/2.1.1 - through2: registry.npmjs.org/through2/2.0.3 - resolution: - shasum: ae603b36b134bcec347b452422b0bf98d5832ec8 - tarball: 'https://registry.npmjs.org/ndjson/-/ndjson-1.5.0.tgz' - registry.npmjs.org/normalize-path/2.0.1: - resolution: - shasum: 47886ac1662760d4261b7d979d241709d3ce3f7a - tarball: 'https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz' - registry.npmjs.org/npm-run-path/1.0.0: - dependencies: - path-key: registry.npmjs.org/path-key/1.0.0 - resolution: - shasum: f5c32bf595fe81ae927daec52e82f8b000ac3c8f - tarball: 'https://registry.npmjs.org/npm-run-path/-/npm-run-path-1.0.0.tgz' - registry.npmjs.org/number-is-nan/1.0.1: - resolution: - shasum: 097b602b53422a522c1afb8790318336941a011d - tarball: 'https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz' - registry.npmjs.org/object-assign/4.1.1: - resolution: - shasum: 2109adc7965887cfc05cbbd442cac8bfbb360863 - tarball: 'https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz' - registry.npmjs.org/object.omit/2.0.1: - dependencies: - for-own: registry.npmjs.org/for-own/0.1.5 - is-extendable: registry.npmjs.org/is-extendable/0.1.1 - resolution: - shasum: 1a9c744829f39dbb858c76ca3579ae2a54ebd1fa - tarball: 'https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz' - registry.npmjs.org/observatory/1.0.0: - dependencies: - ansi-escapes: registry.npmjs.org/ansi-escapes/1.4.0 - chalk: registry.npmjs.org/chalk/1.1.3 - lodash: registry.npmjs.org/lodash/3.10.1 - resolution: - shasum: 2baa606e8299e6866914ec9c8a4db6a41136e59b - tarball: 'https://registry.npmjs.org/observatory/-/observatory-1.0.0.tgz' - registry.npmjs.org/once/1.4.0: - dependencies: - wrappy: registry.npmjs.org/wrappy/1.0.2 - resolution: - shasum: 583b1aa775961d4b113ac17d9c50baef9dd76bd1 - tarball: 'https://registry.npmjs.org/once/-/once-1.4.0.tgz' - registry.npmjs.org/onetime/1.1.0: - resolution: - shasum: a1f7838f8314c516f05ecefcbc4ccfe04b4ed789 - tarball: 'https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz' - registry.npmjs.org/opt-cli/1.5.1: - dependencies: - commander: registry.npmjs.org/commander/2.9.0 - lodash.clone: registry.npmjs.org/lodash.clone/4.3.2 - manage-path: registry.npmjs.org/manage-path/2.0.0 - spawn-command: registry.npmjs.org/spawn-command/0.0.2-1 - resolution: - shasum: 04db447b13c96b992eb31685266f4ed0d9736dc2 - tarball: 'https://registry.npmjs.org/opt-cli/-/opt-cli-1.5.1.tgz' - registry.npmjs.org/optimist/0.6.1: - dependencies: - minimist: registry.npmjs.org/minimist/0.0.10 - wordwrap: registry.npmjs.org/wordwrap/0.0.3 - resolution: - shasum: da3ea74686fa21a19a111c326e90eb15a0196686 - tarball: 'https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz' - registry.npmjs.org/os-homedir/1.0.2: - resolution: - shasum: ffbc4988336e0e833de0c168c7ef152121aa7fb3 - tarball: 'https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz' - registry.npmjs.org/os-shim/0.1.3: - resolution: - shasum: 6b62c3791cf7909ea35ed46e17658bb417cb3917 - tarball: 'https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz' - registry.npmjs.org/os-tmpdir/1.0.2: - resolution: - shasum: bbe67406c79aa85c5cfec766fe5734555dfa1274 - tarball: 'https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz' - registry.npmjs.org/package-json/3.1.0: - dependencies: - got: registry.npmjs.org/got/6.7.1 - registry-auth-token: registry.npmjs.org/registry-auth-token/3.1.0 - registry-url: registry.npmjs.org/registry-url/3.1.0 - semver: registry.npmjs.org/semver/5.3.0 - resolution: - shasum: ce281900fe8052150cc6709c6c006c18fdb2f379 - tarball: 'https://registry.npmjs.org/package-json/-/package-json-3.1.0.tgz' - registry.npmjs.org/pad-right/0.2.2: - dependencies: - repeat-string: registry.npmjs.org/repeat-string/1.6.1 - resolution: - shasum: 6fbc924045d244f2a2a244503060d3bfc6009774 - tarball: 'https://registry.npmjs.org/pad-right/-/pad-right-0.2.2.tgz' - registry.npmjs.org/parse-glob/3.0.4: - dependencies: - glob-base: registry.npmjs.org/glob-base/0.3.0 - is-dotfile: registry.npmjs.org/is-dotfile/1.0.2 - is-extglob: registry.npmjs.org/is-extglob/1.0.0 - is-glob: registry.npmjs.org/is-glob/2.0.1 - resolution: - shasum: b2c376cfb11f35513badd173ef0bb6e3a388391c - tarball: 'https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz' - registry.npmjs.org/parse-passwd/1.0.0: - resolution: - shasum: 6d5b934a456993b23d37f40a382d6f1666a8e5c6 - tarball: 'https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz' - registry.npmjs.org/path-exists/2.1.0: - dependencies: - pinkie-promise: registry.npmjs.org/pinkie-promise/2.0.1 - resolution: - shasum: 0feb6c64f0fc518d9a754dd5efb62c7022761f4b - tarball: 'https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz' - registry.npmjs.org/path-is-absolute/1.0.1: - resolution: - shasum: 174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f - tarball: 'https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz' - registry.npmjs.org/path-key/1.0.0: - resolution: - shasum: 5d53d578019646c0d68800db4e146e6bdc2ac7af - tarball: 'https://registry.npmjs.org/path-key/-/path-key-1.0.0.tgz' - registry.npmjs.org/path-parse/1.0.5: - resolution: - shasum: 3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1 - tarball: 'https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz' - registry.npmjs.org/pinkie-promise/2.0.1: - dependencies: - pinkie: registry.npmjs.org/pinkie/2.0.4 - resolution: - shasum: 2135d6dfa7a358c069ac9b178776288228450ffa - tarball: 'https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz' - registry.npmjs.org/pinkie/2.0.4: - resolution: - shasum: 72556b80cfa0d48a974e80e77248e80ed4f7f870 - tarball: 'https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz' - registry.npmjs.org/pnpm-logger/0.2.0: - dependencies: - bole: registry.npmjs.org/bole/3.0.2 - resolution: - shasum: 9e35a1282e4fae1a3c78cf4e31c4da9c776a9c79 - tarball: 'https://registry.npmjs.org/pnpm-logger/-/pnpm-logger-0.2.0.tgz' - registry.npmjs.org/prepend-http/1.0.4: - resolution: - shasum: d4f4562b0ce3696e41ac52d0e002e57a635dc6dc - tarball: 'https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz' - registry.npmjs.org/preserve/0.2.0: - resolution: - shasum: 815ed1f6ebc65926f865b310c0713bcb3315ce4b - tarball: 'https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz' - registry.npmjs.org/process-nextick-args/1.0.7: - resolution: - shasum: 150e20b756590ad3f91093f25a4f2ad8bff30ba3 - tarball: 'https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz' - registry.npmjs.org/pseudomap/1.0.2: - resolution: - shasum: f052a28da70e618917ef0a8ac34c1ae5a68286b3 - tarball: 'https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz' - registry.npmjs.org/randomatic/1.1.6: - dependencies: - is-number: registry.npmjs.org/is-number/2.1.0 - kind-of: registry.npmjs.org/kind-of/3.1.0 - resolution: - shasum: 110dcabff397e9dcff7c0789ccc0a49adf1ec5bb - tarball: 'https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz' - registry.npmjs.org/rc/1.1.7: - dependencies: - deep-extend: registry.npmjs.org/deep-extend/0.4.1 - ini: registry.npmjs.org/ini/1.3.4 - minimist: registry.npmjs.org/minimist/1.2.0 - strip-json-comments: registry.npmjs.org/strip-json-comments/2.0.1 - resolution: - shasum: c5ea564bb07aff9fd3a5b32e906c1d3a65940fea - tarball: 'https://registry.npmjs.org/rc/-/rc-1.1.7.tgz' - registry.npmjs.org/readable-stream/2.2.3: - dependencies: - buffer-shims: registry.npmjs.org/buffer-shims/1.0.0 - core-util-is: registry.npmjs.org/core-util-is/1.0.2 - inherits: registry.npmjs.org/inherits/2.0.3 - isarray: registry.npmjs.org/isarray/1.0.0 - process-nextick-args: registry.npmjs.org/process-nextick-args/1.0.7 - string_decoder: registry.npmjs.org/string_decoder/0.10.31 - util-deprecate: registry.npmjs.org/util-deprecate/1.0.2 - resolution: - shasum: 9cf49463985df016c8ae8813097a9293a9b33729 - tarball: 'https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.3.tgz' - registry.npmjs.org/rechoir/0.6.2: - dependencies: - resolve: registry.npmjs.org/resolve/1.3.2 - resolution: - shasum: 85204b54dba82d5742e28c96756ef43af50e3384 - tarball: 'https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz' - registry.npmjs.org/regenerator-runtime/0.10.3: - resolution: - shasum: 8c4367a904b51ea62a908ac310bf99ff90a82a3e - tarball: 'https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz' - registry.npmjs.org/regex-cache/0.4.3: - dependencies: - is-equal-shallow: registry.npmjs.org/is-equal-shallow/0.1.3 - is-primitive: registry.npmjs.org/is-primitive/2.0.0 - resolution: - shasum: 9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145 - tarball: 'https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz' - registry.npmjs.org/registry-auth-token/3.1.0: - dependencies: - rc: registry.npmjs.org/rc/1.1.7 - resolution: - shasum: 997c08256e0c7999837b90e944db39d8a790276b - tarball: 'https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.1.0.tgz' - registry.npmjs.org/registry-url/3.1.0: - dependencies: - rc: registry.npmjs.org/rc/1.1.7 - resolution: - shasum: 3d4ef870f73dde1d77f0cf9a381432444e174942 - tarball: 'https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz' - registry.npmjs.org/repeat-element/1.1.2: - resolution: - shasum: ef089a178d1483baae4d93eb98b4f9e4e11d990a - tarball: 'https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz' - registry.npmjs.org/repeat-string/1.6.1: - resolution: - shasum: 8dcae470e1c88abc2d600fff4a776286da75e637 - tarball: 'https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz' - registry.npmjs.org/repeating/2.0.1: - dependencies: - is-finite: registry.npmjs.org/is-finite/1.0.2 - resolution: - shasum: 5214c53a926d3552707527fbab415dbc08d06dda - tarball: 'https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz' - registry.npmjs.org/resolve-dir/0.1.1: - dependencies: - expand-tilde: registry.npmjs.org/expand-tilde/1.2.2 - global-modules: registry.npmjs.org/global-modules/0.2.3 - resolution: - shasum: b219259a5602fac5c5c496ad894a6e8cc430261e - tarball: 'https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz' - registry.npmjs.org/resolve/1.3.2: - dependencies: - path-parse: registry.npmjs.org/path-parse/1.0.5 - resolution: - shasum: 1f0442c9e0cbb8136e87b9305f932f46c7f28235 - tarball: 'https://registry.npmjs.org/resolve/-/resolve-1.3.2.tgz' - registry.npmjs.org/restore-cursor/1.0.1: - dependencies: - exit-hook: registry.npmjs.org/exit-hook/1.1.1 - onetime: registry.npmjs.org/onetime/1.1.0 - resolution: - shasum: 34661f46886327fed2991479152252df92daa541 - tarball: 'https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz' - registry.npmjs.org/right-pad/1.0.1: - resolution: - shasum: 8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0 - tarball: 'https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz' - registry.npmjs.org/rimraf/2.6.1: - dependencies: - glob: registry.npmjs.org/glob/7.1.1 - resolution: - shasum: c2338ec643df7a1b7fe5c54fa86f57428a55f33d - tarball: 'https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz' - registry.npmjs.org/run-async/2.3.0: - dependencies: - is-promise: registry.npmjs.org/is-promise/2.1.0 - resolution: - shasum: 0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0 - tarball: 'https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz' - registry.npmjs.org/rx/4.1.0: - resolution: - shasum: a5f13ff79ef3b740fe30aa803fb09f98805d4782 - tarball: 'https://registry.npmjs.org/rx/-/rx-4.1.0.tgz' - registry.npmjs.org/safe-buffer/5.0.1: - resolution: - shasum: d263ca54696cd8a306b5ca6551e92de57918fbe7 - tarball: 'https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz' - registry.npmjs.org/semver-diff/2.1.0: - dependencies: - semver: registry.npmjs.org/semver/5.3.0 - resolution: - shasum: 4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36 - tarball: 'https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz' - registry.npmjs.org/semver-regex/1.0.0: - resolution: - shasum: 92a4969065f9c70c694753d55248fc68f8f652c9 - tarball: 'https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz' - registry.npmjs.org/semver/5.3.0: - resolution: - shasum: 9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f - tarball: 'https://registry.npmjs.org/semver/-/semver-5.3.0.tgz' - registry.npmjs.org/shelljs/0.7.6: - dependencies: - glob: registry.npmjs.org/glob/7.1.1 - interpret: registry.npmjs.org/interpret/1.0.1 - rechoir: registry.npmjs.org/rechoir/0.6.2 - resolution: - shasum: 379cccfb56b91c8601e4793356eb5382924de9ad - tarball: 'https://registry.npmjs.org/shelljs/-/shelljs-0.7.6.tgz' - registry.npmjs.org/slide/1.1.6: - resolution: - shasum: 56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707 - tarball: 'https://registry.npmjs.org/slide/-/slide-1.1.6.tgz' - registry.npmjs.org/spawn-command/0.0.2: - resolution: - shasum: 9544e1a43ca045f8531aac1a48cb29bdae62338e - tarball: 'https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2.tgz' - registry.npmjs.org/spawn-command/0.0.2-1: - resolution: - shasum: 62f5e9466981c1b796dc5929937e11c9c6921bd0 - tarball: 'https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz' - registry.npmjs.org/spawn-sync/1.0.15: - dependencies: - concat-stream: registry.npmjs.org/concat-stream/1.6.0 - os-shim: registry.npmjs.org/os-shim/0.1.3 - resolution: - shasum: b00799557eb7fb0c8376c29d44e8a1ea67e57476 - tarball: 'https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz' - registry.npmjs.org/split2/2.1.1: - dependencies: - through2: registry.npmjs.org/through2/2.0.3 - resolution: - shasum: 7a1f551e176a90ecd3345f7246a0cfe175ef4fd0 - tarball: 'https://registry.npmjs.org/split2/-/split2-2.1.1.tgz' - registry.npmjs.org/string-width/1.0.2: - dependencies: - code-point-at: registry.npmjs.org/code-point-at/1.1.0 - is-fullwidth-code-point: registry.npmjs.org/is-fullwidth-code-point/1.0.0 - strip-ansi: registry.npmjs.org/strip-ansi/3.0.1 - resolution: - shasum: 118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3 - tarball: 'https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz' - registry.npmjs.org/string-width/2.0.0: - dependencies: - is-fullwidth-code-point: registry.npmjs.org/is-fullwidth-code-point/2.0.0 - strip-ansi: registry.npmjs.org/strip-ansi/3.0.1 - resolution: - shasum: 635c5436cc72a6e0c387ceca278d4e2eec52687e - tarball: 'https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz' - registry.npmjs.org/string_decoder/0.10.31: - resolution: - shasum: 62e203bc41766c6c28c9fc84301dab1c5310fa94 - tarball: 'https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz' - registry.npmjs.org/strip-ansi/3.0.1: - dependencies: - ansi-regex: registry.npmjs.org/ansi-regex/2.1.1 - resolution: - shasum: 6a385fb8853d952d5ff05d0e8aaf94278dc63dcf - tarball: 'https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz' - registry.npmjs.org/strip-eof/1.0.0: - resolution: - shasum: bb43ff5598a6eb05d89b59fcd129c983313606bf - tarball: 'https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz' - registry.npmjs.org/strip-json-comments/2.0.1: - resolution: - shasum: 3c531942e908c2697c0ec344858c286c7ca0a60a - tarball: 'https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz' - registry.npmjs.org/supports-color/2.0.0: - resolution: - shasum: 535d045ce6b6363fa40117084629995e9df324c7 - tarball: 'https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz' - registry.npmjs.org/term-size/0.1.1: - dependencies: - execa: registry.npmjs.org/execa/0.4.0 - resolution: - shasum: 87360b96396cab5760963714cda0d0cbeecad9ca - tarball: 'https://registry.npmjs.org/term-size/-/term-size-0.1.1.tgz' - registry.npmjs.org/through/2.3.8: - resolution: - shasum: 0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5 - tarball: 'https://registry.npmjs.org/through/-/through-2.3.8.tgz' - registry.npmjs.org/through2/2.0.3: - dependencies: - readable-stream: registry.npmjs.org/readable-stream/2.2.3 - xtend: registry.npmjs.org/xtend/4.0.1 - resolution: - shasum: 0004569b37c7c74ba39c43f3ced78d1ad94140be - tarball: 'https://registry.npmjs.org/through2/-/through2-2.0.3.tgz' - registry.npmjs.org/timed-out/4.0.1: - resolution: - shasum: f32eacac5a175bea25d7fab565ab3ed8741ef56f - tarball: 'https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz' - registry.npmjs.org/tmp/0.0.29: - dependencies: - os-tmpdir: registry.npmjs.org/os-tmpdir/1.0.2 - resolution: - shasum: f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0 - tarball: 'https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz' - registry.npmjs.org/tslint/4.5.1: - dependencies: - babel-code-frame: registry.npmjs.org/babel-code-frame/6.22.0 - colors: registry.npmjs.org/colors/1.1.2 - diff: registry.npmjs.org/diff/3.2.0 - findup-sync: registry.npmjs.org/findup-sync/0.3.0 - glob: registry.npmjs.org/glob/7.1.1 - optimist: registry.npmjs.org/optimist/0.6.1 - resolve: registry.npmjs.org/resolve/1.3.2 - tsutils: registry.npmjs.org/tsutils/1.2.1 - update-notifier: registry.npmjs.org/update-notifier/2.1.0 - resolution: - shasum: 05356871bef23a434906734006fc188336ba824b - tarball: 'https://registry.npmjs.org/tslint/-/tslint-4.5.1.tgz' - registry.npmjs.org/tsutils/1.2.1: - resolution: - shasum: 74101a75dbf435800614ccafa4cd89a8d41ea03e - tarball: 'https://registry.npmjs.org/tsutils/-/tsutils-1.2.1.tgz' - registry.npmjs.org/typedarray/0.0.6: - resolution: - shasum: 867ac74e3864187b1d3d47d996a78ec5c8830777 - tarball: 'https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz' - registry.npmjs.org/typescript/2.2.1: - resolution: - shasum: 4862b662b988a4c8ff691cc7969622d24db76ae9 - tarball: 'https://registry.npmjs.org/typescript/-/typescript-2.2.1.tgz' - registry.npmjs.org/unique-string/1.0.0: - dependencies: - crypto-random-string: registry.npmjs.org/crypto-random-string/1.0.0 - resolution: - shasum: 9e1057cca851abb93398f8b33ae187b99caec11a - tarball: 'https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz' - registry.npmjs.org/unzip-response/2.0.1: - resolution: - shasum: d2f0f737d16b0615e72a6935ed04214572d56f97 - tarball: 'https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz' - registry.npmjs.org/update-notifier/2.1.0: - dependencies: - boxen: registry.npmjs.org/boxen/1.0.0 - chalk: registry.npmjs.org/chalk/1.1.3 - configstore: registry.npmjs.org/configstore/3.0.0 - is-npm: registry.npmjs.org/is-npm/1.0.0 - latest-version: registry.npmjs.org/latest-version/3.0.0 - lazy-req: registry.npmjs.org/lazy-req/2.0.0 - semver-diff: registry.npmjs.org/semver-diff/2.1.0 - xdg-basedir: registry.npmjs.org/xdg-basedir/3.0.0 - resolution: - shasum: ec0c1e53536b76647a24b77cb83966d9315123d9 - tarball: 'https://registry.npmjs.org/update-notifier/-/update-notifier-2.1.0.tgz' - registry.npmjs.org/url-parse-lax/1.0.0: - dependencies: - prepend-http: registry.npmjs.org/prepend-http/1.0.4 - resolution: - shasum: 7af8f303645e9bd79a272e7a14ac68bc0609da73 - tarball: 'https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz' - registry.npmjs.org/util-deprecate/1.0.2: - resolution: - shasum: 450d4dc9fa70de732762fbd2d4a28981419a0ccf - tarball: 'https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz' - registry.npmjs.org/validate-commit-msg/2.11.1: - dependencies: - conventional-commit-types: registry.npmjs.org/conventional-commit-types/2.1.0 - findup: registry.npmjs.org/findup/0.1.5 - semver-regex: registry.npmjs.org/semver-regex/1.0.0 - resolution: - shasum: c8f86643ca03b26da1b4f3e37d7f6e659fbc34ca - tarball: 'https://registry.npmjs.org/validate-commit-msg/-/validate-commit-msg-2.11.1.tgz' - registry.npmjs.org/which/1.2.12: - dependencies: - isexe: registry.npmjs.org/isexe/1.1.2 - resolution: - shasum: de67b5e450269f194909ef23ece4ebe416fa1192 - tarball: 'https://registry.npmjs.org/which/-/which-1.2.12.tgz' - registry.npmjs.org/widest-line/1.0.0: - dependencies: - string-width: registry.npmjs.org/string-width/1.0.2 - resolution: - shasum: 0c09c85c2a94683d0d7eaf8ee097d564bf0e105c - tarball: 'https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz' - registry.npmjs.org/word-wrap/1.2.1: - resolution: - shasum: 248f459b465d179a17bc407c854d3151d07e45d8 - tarball: 'https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.1.tgz' - registry.npmjs.org/wordwrap/0.0.3: - resolution: - shasum: a3d5da6cd5c0bc0008d37234bbaf1bed63059107 - tarball: 'https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz' - registry.npmjs.org/wrappy/1.0.2: - resolution: - shasum: b5243d8f3ec1aa35f1364605bc0d1036e30ab69f - tarball: 'https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz' - registry.npmjs.org/write-file-atomic/1.3.1: - dependencies: - graceful-fs: registry.npmjs.org/graceful-fs/4.1.11 - imurmurhash: registry.npmjs.org/imurmurhash/0.1.4 - slide: registry.npmjs.org/slide/1.1.6 - resolution: - shasum: 7d45ba32316328dd1ec7d90f60ebc0d845bb759a - tarball: 'https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.1.tgz' - registry.npmjs.org/xdg-basedir/3.0.0: - resolution: - shasum: 496b2cc109eca8dbacfe2dc72b603c17c5870ad4 - tarball: 'https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz' - registry.npmjs.org/xtend/4.0.1: - resolution: - shasum: a5c6d532be656e23db820efb943a1f04998d63af - tarball: 'https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz' - registry.npmjs.org/yallist/2.0.0: - resolution: - shasum: 306c543835f09ee1a4cb23b7bce9ab341c91cdd4 - tarball: 'https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz' -version: 1 + /@types/chalk/0.4.31: a31d74241a6b1edbb973cf36d97a2896834a51f9 + /@types/common-tags/1.2.5: 14f29893992eb325594b83d739af02f2b6520f46 + /@types/node/7.0.12: ae5f67a19c15f752148004db07cbbb372e69efc9 + /ansi-align/1.1.0: + dependencies: + string-width: 1.0.2 + resolution: 2f0c1658829739add5ebb15e6b0c6e3423f016ba + /ansi-escapes/1.4.0: d3a8a83b319aa67793662b13e761c7911422306e + /ansi-regex/2.1.1: c3b33ab5ee360d86e0e628f0468ae7ef27d654df + /ansi-styles/2.2.1: b432dd3358b634cf75e1e4664368240533c1ddbe + /arr-diff/2.0.0: + dependencies: + arr-flatten: 1.0.1 + resolution: 8f3b827f955a8bd669697e4a4256ac3ceae356cf + /arr-flatten/1.0.1: e5ffe54d45e19f32f216e91eb99c8ce892bb604b + /array-unique/0.2.1: a1d97ccafcbc2625cc70fadceb36a50c58b01a53 + /babel-code-frame/6.22.0: + dependencies: + chalk: 1.1.3 + esutils: 2.0.2 + js-tokens: 3.0.1 + resolution: 027620bee567a88c32561574e7fd0801d33118e4 + /babel-runtime/6.23.0: + dependencies: + core-js: 2.4.1 + regenerator-runtime: 0.10.3 + resolution: 0a9489f144de70efb3ce4300accdb329e2fc543b + /balanced-match/0.4.2: cb3f3e3c732dc0f01ee70b403f302e61d7709838 + /bole/3.0.2: + dependencies: + fast-safe-stringify: 1.1.13 + individual: 3.0.0 + resolution: bc8a483ca94049da9b837c1ad11cdfebee6e0514 + /boxen/1.0.0: + dependencies: + ansi-align: 1.1.0 + camelcase: 4.1.0 + chalk: 1.1.3 + cli-boxes: 1.0.0 + string-width: 2.0.0 + term-size: 0.1.1 + widest-line: 1.0.0 + resolution: b2694baf1f605f708ff0177c12193b22f29aaaab + /brace-expansion/1.1.6: + dependencies: + balanced-match: 0.4.2 + concat-map: 0.0.1 + resolution: 7197d7eaa9b87e648390ea61fc66c84427420df9 + /braces/1.8.5: + dependencies: + expand-range: 1.8.2 + preserve: 0.2.0 + repeat-element: 1.1.2 + resolution: ba77962e12dff969d6b76711e914b737857bf6a7 + /buffer-shims/1.0.0: 9978ce317388c649ad8793028c3477ef044a8b51 + /cachedir/1.1.1: + dependencies: + os-homedir: 1.0.2 + resolution: e1363075ea206a12767d92bb711c8a2f76a10f62 + /camelcase/4.1.0: d545635be1e33c542649c69173e5de6acfae34dd + /capture-stack-trace/1.0.0: 4a6fa07399c26bba47f0b2496b4d0fb408c5550d + /chalk/1.1.3: + dependencies: + ansi-styles: 2.2.1 + escape-string-regexp: 1.0.5 + has-ansi: 2.0.0 + strip-ansi: 3.0.1 + supports-color: 2.0.0 + resolution: a8115c55e4a702fe4d150abd3872822a7e09fc98 + /cli-boxes/1.0.0: 4fa917c3e59c94a004cd61f8ee509da651687143 + /cli-cursor/1.0.2: + dependencies: + restore-cursor: 1.0.1 + resolution: 64da3f7d56a54412e59794bd62dc35295e8f2987 + /cli-width/2.1.0: b234ca209b29ef66fc518d9b98d5847b00edf00a + /code-point-at/1.1.0: 0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77 + /colors/0.6.2: 2423fe6678ac0c5dae8852e5d0e5be08c997abcc + /colors/1.1.2: 168a4701756b6a7f51a12ce0c97bfa28c084ed63 + /commander/2.1.0: d121bbae860d9992a3d517ba96f56588e47c6781 + /commander/2.9.0: + dependencies: + graceful-readlink: 1.0.1 + resolution: 9c99094176e12240cb22d6c5146098400fe0f7d4 + /commitizen/2.9.6: + dependencies: + cachedir: 1.1.1 + chalk: 1.1.3 + cz-conventional-changelog: 1.2.0 + dedent: 0.6.0 + detect-indent: 4.0.0 + find-node-modules: 1.0.4 + find-root: 1.0.0 + fs-extra: 1.0.0 + glob: 7.1.1 + inquirer: 1.2.3 + lodash: 4.17.2 + minimist: 1.2.0 + path-exists: 2.1.0 + shelljs: 0.7.6 + strip-json-comments: 2.0.1 + resolution: c0d00535ef264da7f63737edfda4228983fa2291 + /common-tags/1.4.0: + dependencies: + babel-runtime: 6.23.0 + resolution: 1187be4f3d4cf0c0427d43f74eef1f73501614c0 + /concat-map/0.0.1: d8a96bd77fd68df7793a73036a3ba0d5405d477b + /concat-stream/1.6.0: + dependencies: + inherits: 2.0.3 + readable-stream: 2.2.6 + typedarray: 0.0.6 + resolution: 0aac662fd52be78964d5532f694784e70110acf7 + /configstore/3.0.0: + dependencies: + dot-prop: 4.1.1 + graceful-fs: 4.1.11 + mkdirp: 0.5.1 + unique-string: 1.0.0 + write-file-atomic: 1.3.1 + xdg-basedir: 3.0.0 + resolution: e1b8669c1803ccc50b545e92f8e6e79aa80e0196 + /conventional-commit-types/2.1.0: 45d860386c9a2e6537ee91d8a1b61bd0411b3d04 + /core-js/2.4.1: 4de911e667b0eae9124e34254b53aea6fc618d3e + /core-util-is/1.0.2: b5fd54220aa2bc5ab57aab7140c940754503c1a7 + /create-error-class/3.0.2: + dependencies: + capture-stack-trace: 1.0.0 + resolution: 06be7abef947a3f14a30fd610671d401bca8b7b6 + /cross-spawn-async/2.2.5: + dependencies: + lru-cache: 4.0.2 + which: 1.2.14 + resolution: 845ff0c0834a3ded9d160daca6d390906bb288cc + /crypto-random-string/1.0.0: a230f64f568310e1498009940790ec99545bca7e + /cz-conventional-changelog/1.2.0: + dependencies: + conventional-commit-types: 2.1.0 + lodash.map: 4.6.0 + longest: 1.0.1 + pad-right: 0.2.2 + right-pad: 1.0.1 + word-wrap: 1.2.1 + resolution: 2bca04964c8919b23f3fd6a89ef5e6008b31b3f8 + /dedent/0.6.0: 0e6da8f0ce52838ef5cec5c8f9396b0c1b64a3cb + /deep-extend/0.4.1: efe4113d08085f4e6f9687759810f807469e2253 + /detect-file/0.1.0: + dependencies: + fs-exists-sync: 0.1.0 + resolution: 4935dedfd9488648e006b0129566e9386711ea63 + /detect-indent/4.0.0: + dependencies: + repeating: 2.0.1 + resolution: f76d064352cdf43a1cb6ce619c4ee3a9475de208 + /diff/3.2.0: c9ce393a4b7cbd0b058a725c93df299027868ff9 + /dot-prop/4.1.1: + dependencies: + is-obj: 1.0.1 + resolution: a8493f0b7b5eeec82525b5c7587fa7de7ca859c1 + /duplexer3/0.1.4: ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2 + /escape-string-regexp/1.0.5: 1b61c0562190a8dff6ae3bb2cf0200ca130b86d4 + /esutils/2.0.2: 0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b + /execa/0.4.0: + dependencies: + cross-spawn-async: 2.2.5 + is-stream: 1.1.0 + npm-run-path: 1.0.0 + object-assign: 4.1.1 + path-key: 1.0.0 + strip-eof: 1.0.0 + resolution: 4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3 + /exit-hook/1.1.1: f05ca233b48c05d54fff07765df8507e95c02ff8 + /expand-brackets/0.1.5: + dependencies: + is-posix-bracket: 0.1.1 + resolution: df07284e342a807cd733ac5af72411e581d1177b + /expand-range/1.8.2: + dependencies: + fill-range: 2.2.3 + resolution: a299effd335fe2721ebae8e257ec79644fc85337 + /expand-tilde/1.2.2: + dependencies: + os-homedir: 1.0.2 + resolution: 0b81eba897e5a3d31d1c3d102f8f01441e559449 + /extend/3.0.0: 5a474353b9f3353ddd8176dfd37b91c83a46f1d4 + /external-editor/1.1.1: + dependencies: + extend: 3.0.0 + spawn-sync: 1.0.15 + tmp: 0.0.29 + resolution: 12d7b0db850f7ff7e7081baf4005700060c4600b + /extglob/0.3.2: + dependencies: + is-extglob: 1.0.0 + resolution: 2e18ff3d2f49ab2765cec9023f011daa8d8349a1 + /fast-safe-stringify/1.1.13: a01e9cd9c9e491715c98a75a42d5f0bbd107ff76 + /figures/1.7.0: + dependencies: + escape-string-regexp: 1.0.5 + object-assign: 4.1.1 + resolution: cbe1e3affcf1cd44b80cadfed28dc793a9701d2e + /filename-regex/2.0.0: 996e3e80479b98b9897f15a8a58b3d084e926775 + /fill-range/2.2.3: + dependencies: + is-number: 2.1.0 + isobject: 2.1.0 + randomatic: 1.1.6 + repeat-element: 1.1.2 + repeat-string: 1.6.1 + resolution: 50b77dfd7e469bc7492470963699fe7a8485a723 + /find-node-modules/1.0.4: + dependencies: + findup-sync: 0.4.2 + merge: 1.2.0 + resolution: b6deb3cccb699c87037677bcede2c5f5862b2550 + /find-parent-dir/0.3.0: 33c44b429ab2b2f0646299c5f9f718f376ff8d54 + /find-root/1.0.0: 962ff211aab25c6520feeeb8d6287f8f6e95807a + /findup-sync/0.3.0: + dependencies: + glob: 5.0.15 + resolution: 37930aa5d816b777c03445e1966cc6790a4c0b16 + /findup-sync/0.4.2: + dependencies: + detect-file: 0.1.0 + is-glob: 2.0.1 + micromatch: 2.3.11 + resolve-dir: 0.1.1 + resolution: a8117d0f73124f5a4546839579fe52d7129fb5e5 + /findup/0.1.5: + dependencies: + colors: 0.6.2 + commander: 2.1.0 + resolution: 8ad929a3393bac627957a7e5de4623b06b0e2ceb + /for-in/1.0.2: 81068d295a8142ec0ac726c6e2200c30fb6d5e80 + /for-own/0.1.5: + dependencies: + for-in: 1.0.2 + resolution: 5265c681a4f294dabbf17c9509b6763aa84510ce + /fs-exists-sync/0.1.0: 982d6893af918e72d08dec9e8673ff2b5a8d6add + /fs-extra/1.0.0: + dependencies: + graceful-fs: 4.1.11 + jsonfile: 2.4.0 + klaw: 1.3.1 + resolution: cd3ce5f7e7cb6145883fcae3191e9877f8587950 + /fs.realpath/1.0.0: 1504ad2523158caa40db4a2787cb01411994ea4f + /get-stream/3.0.0: 8e943d1358dc37555054ecbe2edb05aa174ede14 + /ghooks/2.0.0: + dependencies: + execa: 0.4.0 + findup: 0.1.5 + lodash.clone: 4.3.2 + manage-path: 2.0.0 + opt-cli: 1.5.1 + path-exists: 2.1.0 + spawn-command: 0.0.2 + resolution: affd83a36e8b8fbdded9b851457c48ac74c8eab8 + /glob-base/0.3.0: + dependencies: + glob-parent: 2.0.0 + is-glob: 2.0.1 + resolution: dbb164f6221b1c0b1ccf82aea328b497df0ea3c4 + /glob-parent/2.0.0: + dependencies: + is-glob: 2.0.1 + resolution: 81383d72db054fcccf5336daa902f182f6edbb28 + /glob/5.0.15: + dependencies: + inflight: 1.0.6 + inherits: 2.0.3 + minimatch: 3.0.3 + once: 1.4.0 + path-is-absolute: 1.0.1 + resolution: 1bc936b9e02f4a603fcc222ecf7633d30b8b93b1 + /glob/7.1.1: + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.3 + minimatch: 3.0.3 + once: 1.4.0 + path-is-absolute: 1.0.1 + resolution: 805211df04faaf1c63a3600306cdf5ade50b2ec8 + /global-modules/0.2.3: + dependencies: + global-prefix: 0.1.5 + is-windows: 0.2.0 + resolution: ea5a3bed42c6d6ce995a4f8a1269b5dae223828d + /global-prefix/0.1.5: + dependencies: + homedir-polyfill: 1.0.1 + ini: 1.3.4 + is-windows: 0.2.0 + which: 1.2.14 + resolution: 8d3bc6b8da3ca8112a160d8d496ff0462bfef78f + /got/6.7.1: + dependencies: + create-error-class: 3.0.2 + duplexer3: 0.1.4 + get-stream: 3.0.0 + is-redirect: 1.0.0 + is-retry-allowed: 1.1.0 + is-stream: 1.1.0 + lowercase-keys: 1.0.0 + safe-buffer: 5.0.1 + timed-out: 4.0.1 + unzip-response: 2.0.1 + url-parse-lax: 1.0.0 + resolution: 240cd05785a9a18e561dc1b44b41c763ef1e8db0 + /graceful-fs/4.1.11: 0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658 + /graceful-readlink/1.0.1: 4cafad76bc62f02fa039b2f94e9a3dd3a391a725 + /has-ansi/2.0.0: + dependencies: + ansi-regex: 2.1.1 + resolution: 34f5049ce1ecdf2b0649af3ef24e45ed35416d91 + /homedir-polyfill/1.0.1: + dependencies: + parse-passwd: 1.0.0 + resolution: 4c2bbc8a758998feebf5ed68580f76d46768b4bc + /imurmurhash/0.1.4: 9218b9b2b928a238b13dc4fb6b6d576f231453ea + /individual/3.0.0: e7ca4f85f8957b018734f285750dc22ec2f9862d + /inflight/1.0.6: + dependencies: + once: 1.4.0 + wrappy: 1.0.2 + resolution: 49bd6331d7d02d0c09bc910a1075ba8165b56df9 + /inherits/2.0.3: 633c2c83e3da42a502f52466022480f4208261de + /ini/1.3.4: 0537cb79daf59b59a1a517dff706c86ec039162e + /inquirer/1.2.3: + dependencies: + ansi-escapes: 1.4.0 + chalk: 1.1.3 + cli-cursor: 1.0.2 + cli-width: 2.1.0 + external-editor: 1.1.1 + figures: 1.7.0 + lodash: 4.17.4 + mute-stream: 0.0.6 + pinkie-promise: 2.0.1 + run-async: 2.3.0 + rx: 4.1.0 + string-width: 1.0.2 + strip-ansi: 3.0.1 + through: 2.3.8 + resolution: 4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918 + /interpret/1.0.2: f4f623f0bb7122f15f5717c8e254b8161b5c5b2d + /is-buffer/1.1.5: 1f3b26ef613b214b88cbca23cc6c01d87961eecc + /is-dotfile/1.0.2: 2c132383f39199f8edc268ca01b9b007d205cc4d + /is-equal-shallow/0.1.3: + dependencies: + is-primitive: 2.0.0 + resolution: 2238098fc221de0bcfa5d9eac4c45d638aa1c534 + /is-extendable/0.1.1: 62b110e289a471418e3ec36a617d472e301dfc89 + /is-extglob/1.0.0: ac468177c4943405a092fc8f29760c6ffc6206c0 + /is-finite/1.0.2: + dependencies: + number-is-nan: 1.0.1 + resolution: cc6677695602be550ef11e8b4aa6305342b6d0aa + /is-fullwidth-code-point/1.0.0: + dependencies: + number-is-nan: 1.0.1 + resolution: ef9e31386f031a7f0d643af82fde50c457ef00cb + /is-fullwidth-code-point/2.0.0: a3b30a5c4f199183167aaab93beefae3ddfb654f + /is-glob/2.0.1: + dependencies: + is-extglob: 1.0.0 + resolution: d096f926a3ded5600f3fdfd91198cb0888c2d863 + /is-npm/1.0.0: f2fb63a65e4905b406c86072765a1a4dc793b9f4 + /is-number/2.1.0: + dependencies: + kind-of: 3.1.0 + resolution: 01fcbbb393463a548f2f466cce16dece49db908f + /is-obj/1.0.1: 3e4729ac1f5fde025cd7d83a896dab9f4f67db0f + /is-posix-bracket/0.1.1: 3334dc79774368e92f016e6fbc0a88f5cd6e6bc4 + /is-primitive/2.0.0: 207bab91638499c07b2adf240a41a87210034575 + /is-promise/2.1.0: 79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa + /is-redirect/1.0.0: 1d03dded53bd8db0f30c26e4f95d36fc7c87dc24 + /is-retry-allowed/1.1.0: 11a060568b67339444033d0125a61a20d564fb34 + /is-stream/1.1.0: 12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44 + /is-windows/0.2.0: de1aa6d63ea29dd248737b69f1ff8b8002d2108c + /isarray/1.0.0: bb935d48582cba168c06834957a54a3e07124f11 + /isexe/2.0.0: e8fbf374dc556ff8947a10dcb0572d633f2cfa10 + /isobject/2.1.0: + dependencies: + isarray: 1.0.0 + resolution: f065561096a3f1da2ef46272f815c840d87e0c89 + /js-tokens/3.0.1: 08e9f132484a2c45a30907e9dc4d5567b7f114d7 + /json-stringify-safe/5.0.1: 1296a2d58fd45f19a0f6ce01d65701e2c735b6eb + /jsonfile/2.4.0: + dependencies: + graceful-fs: 4.1.11 + resolution: 3736a2b428b87bbda0cc83b53fa3d633a35c2ae8 + /kind-of/3.1.0: + dependencies: + is-buffer: 1.1.5 + resolution: 475d698a5e49ff5e53d14e3e732429dc8bf4cf47 + /klaw/1.3.1: + dependencies: + graceful-fs: 4.1.11 + resolution: 4088433b46b3b1ba259d78785d8e96f73ba02439 + /latest-version/3.1.0: + dependencies: + package-json: 4.0.0 + resolution: a205383fea322b33b5ae3b18abee0dc2f356ee15 + /lazy-req/2.0.0: c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4 + /lodash._baseclone/4.5.7: ce42ade08384ef5d62fa77c30f61a46e686f8434 + /lodash.clone/4.3.2: + dependencies: + lodash._baseclone: 4.5.7 + resolution: e56b176b6823a7dde38f7f2bf58de7d5971200e9 + /lodash.map/4.6.0: 771ec7839e3473d9c4cde28b19394c3562f4f6d3 + /lodash/3.10.1: 5bf45e8e49ba4189e17d482789dfd15bd140b7b6 + /lodash/4.17.2: 34a3055babe04ce42467b607d700072c7ff6bf42 + /lodash/4.17.4: 78203a4d1c328ae1d86dca6460e369b57f4055ae + /longest/1.0.1: 30a0b2da38f73770e8294a0d22e6625ed77d0097 + /lowercase-keys/1.0.0: 4e3366b39e7f5457e35f1324bdf6f88d0bfc7306 + /lru-cache/4.0.2: + dependencies: + pseudomap: 1.0.2 + yallist: 2.1.2 + resolution: 1d17679c069cda5d040991a09dbc2c0db377e55e + /manage-path/2.0.0: f4cf8457b926eeee2a83b173501414bc76eb9597 + /merge/1.2.0: 7531e39d4949c281a66b8c5a6e0265e8b05894da + /micromatch/2.3.11: + dependencies: + arr-diff: 2.0.0 + array-unique: 0.2.1 + braces: 1.8.5 + expand-brackets: 0.1.5 + extglob: 0.3.2 + filename-regex: 2.0.0 + is-extglob: 1.0.0 + is-glob: 2.0.1 + kind-of: 3.1.0 + normalize-path: 2.1.1 + object.omit: 2.0.1 + parse-glob: 3.0.4 + regex-cache: 0.4.3 + resolution: 86677c97d1720b363431d04d0d15293bd38c1565 + /minimatch/3.0.3: + dependencies: + brace-expansion: 1.1.6 + resolution: 2a4e4090b96b2db06a9d7df01055a62a77c9b774 + /minimist/0.0.10: de3f98543dbf96082be48ad1a0c7cda836301dcf + /minimist/0.0.8: 857fcabfc3397d2625b8228262e86aa7a011b05d + /minimist/1.2.0: a35008b20f41383eec1fb914f4cd5df79a264284 + /mkdirp/0.5.1: + dependencies: + minimist: 0.0.8 + resolution: 30057438eac6cf7f8c4767f38648d6697d75c903 + /mute-stream/0.0.6: 48962b19e169fd1dfc240b3f1e7317627bbc47db + /ndjson/1.5.0: + dependencies: + json-stringify-safe: 5.0.1 + minimist: 1.2.0 + split2: 2.1.1 + through2: 2.0.3 + resolution: ae603b36b134bcec347b452422b0bf98d5832ec8 + /normalize-path/2.1.1: + dependencies: + remove-trailing-separator: 1.0.1 + resolution: 1ab28b556e198363a8c1a6f7e6fa20137fe6aed9 + /npm-run-path/1.0.0: + dependencies: + path-key: 1.0.0 + resolution: f5c32bf595fe81ae927daec52e82f8b000ac3c8f + /number-is-nan/1.0.1: 097b602b53422a522c1afb8790318336941a011d + /object-assign/4.1.1: 2109adc7965887cfc05cbbd442cac8bfbb360863 + /object.omit/2.0.1: + dependencies: + for-own: 0.1.5 + is-extendable: 0.1.1 + resolution: 1a9c744829f39dbb858c76ca3579ae2a54ebd1fa + /observatory/1.0.0: + dependencies: + ansi-escapes: 1.4.0 + chalk: 1.1.3 + lodash: 3.10.1 + resolution: 2baa606e8299e6866914ec9c8a4db6a41136e59b + /once/1.4.0: + dependencies: + wrappy: 1.0.2 + resolution: 583b1aa775961d4b113ac17d9c50baef9dd76bd1 + /onetime/1.1.0: a1f7838f8314c516f05ecefcbc4ccfe04b4ed789 + /opt-cli/1.5.1: + dependencies: + commander: 2.9.0 + lodash.clone: 4.3.2 + manage-path: 2.0.0 + spawn-command: 0.0.2-1 + resolution: 04db447b13c96b992eb31685266f4ed0d9736dc2 + /optimist/0.6.1: + dependencies: + minimist: 0.0.10 + wordwrap: 0.0.3 + resolution: da3ea74686fa21a19a111c326e90eb15a0196686 + /os-homedir/1.0.2: ffbc4988336e0e833de0c168c7ef152121aa7fb3 + /os-shim/0.1.3: 6b62c3791cf7909ea35ed46e17658bb417cb3917 + /os-tmpdir/1.0.2: bbe67406c79aa85c5cfec766fe5734555dfa1274 + /package-json/4.0.0: + dependencies: + got: 6.7.1 + registry-auth-token: 3.1.1 + registry-url: 3.1.0 + semver: 5.3.0 + resolution: f3c9dc8738f5b59304d54d2cfb3f91d08fdd7998 + /pad-right/0.2.2: + dependencies: + repeat-string: 1.6.1 + resolution: 6fbc924045d244f2a2a244503060d3bfc6009774 + /parse-glob/3.0.4: + dependencies: + glob-base: 0.3.0 + is-dotfile: 1.0.2 + is-extglob: 1.0.0 + is-glob: 2.0.1 + resolution: b2c376cfb11f35513badd173ef0bb6e3a388391c + /parse-passwd/1.0.0: 6d5b934a456993b23d37f40a382d6f1666a8e5c6 + /path-exists/2.1.0: + dependencies: + pinkie-promise: 2.0.1 + resolution: 0feb6c64f0fc518d9a754dd5efb62c7022761f4b + /path-is-absolute/1.0.1: 174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f + /path-key/1.0.0: 5d53d578019646c0d68800db4e146e6bdc2ac7af + /path-parse/1.0.5: 3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1 + /pinkie-promise/2.0.1: + dependencies: + pinkie: 2.0.4 + resolution: 2135d6dfa7a358c069ac9b178776288228450ffa + /pinkie/2.0.4: 72556b80cfa0d48a974e80e77248e80ed4f7f870 + /pnpm-logger/0.2.0: + dependencies: + bole: 3.0.2 + resolution: 9e35a1282e4fae1a3c78cf4e31c4da9c776a9c79 + /prepend-http/1.0.4: d4f4562b0ce3696e41ac52d0e002e57a635dc6dc + /preserve/0.2.0: 815ed1f6ebc65926f865b310c0713bcb3315ce4b + /process-nextick-args/1.0.7: 150e20b756590ad3f91093f25a4f2ad8bff30ba3 + /pseudomap/1.0.2: f052a28da70e618917ef0a8ac34c1ae5a68286b3 + /randomatic/1.1.6: + dependencies: + is-number: 2.1.0 + kind-of: 3.1.0 + resolution: 110dcabff397e9dcff7c0789ccc0a49adf1ec5bb + /rc/1.2.1: + dependencies: + deep-extend: 0.4.1 + ini: 1.3.4 + minimist: 1.2.0 + strip-json-comments: 2.0.1 + resolution: 2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95 + /readable-stream/2.2.6: + dependencies: + buffer-shims: 1.0.0 + core-util-is: 1.0.2 + inherits: 2.0.3 + isarray: 1.0.0 + process-nextick-args: 1.0.7 + string_decoder: 0.10.31 + util-deprecate: 1.0.2 + resolution: 8b43aed76e71483938d12a8d46c6cf1a00b1f816 + /rechoir/0.6.2: + dependencies: + resolve: 1.3.2 + resolution: 85204b54dba82d5742e28c96756ef43af50e3384 + /regenerator-runtime/0.10.3: 8c4367a904b51ea62a908ac310bf99ff90a82a3e + /regex-cache/0.4.3: + dependencies: + is-equal-shallow: 0.1.3 + is-primitive: 2.0.0 + resolution: 9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145 + /registry-auth-token/3.1.1: + dependencies: + rc: 1.2.1 + resolution: 1b93317b42527732f56f88c41b73b7bf855e05a5 + /registry-url/3.1.0: + dependencies: + rc: 1.2.1 + resolution: 3d4ef870f73dde1d77f0cf9a381432444e174942 + /remove-trailing-separator/1.0.1: 615ebb96af559552d4bf4057c8436d486ab63cc4 + /repeat-element/1.1.2: ef089a178d1483baae4d93eb98b4f9e4e11d990a + /repeat-string/1.6.1: 8dcae470e1c88abc2d600fff4a776286da75e637 + /repeating/2.0.1: + dependencies: + is-finite: 1.0.2 + resolution: 5214c53a926d3552707527fbab415dbc08d06dda + /resolve-dir/0.1.1: + dependencies: + expand-tilde: 1.2.2 + global-modules: 0.2.3 + resolution: b219259a5602fac5c5c496ad894a6e8cc430261e + /resolve/1.3.2: + dependencies: + path-parse: 1.0.5 + resolution: 1f0442c9e0cbb8136e87b9305f932f46c7f28235 + /restore-cursor/1.0.1: + dependencies: + exit-hook: 1.1.1 + onetime: 1.1.0 + resolution: 34661f46886327fed2991479152252df92daa541 + /right-pad/1.0.1: 8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0 + /rimraf/2.6.1: + dependencies: + glob: 7.1.1 + resolution: c2338ec643df7a1b7fe5c54fa86f57428a55f33d + /run-async/2.3.0: + dependencies: + is-promise: 2.1.0 + resolution: 0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0 + /rx/4.1.0: a5f13ff79ef3b740fe30aa803fb09f98805d4782 + /safe-buffer/5.0.1: d263ca54696cd8a306b5ca6551e92de57918fbe7 + /semver-diff/2.1.0: + dependencies: + semver: 5.3.0 + resolution: 4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36 + /semver-regex/1.0.0: 92a4969065f9c70c694753d55248fc68f8f652c9 + /semver/5.3.0: 9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f + /shelljs/0.7.6: + dependencies: + glob: 7.1.1 + interpret: 1.0.2 + rechoir: 0.6.2 + resolution: 379cccfb56b91c8601e4793356eb5382924de9ad + /slide/1.1.6: 56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707 + /spawn-command/0.0.2: 9544e1a43ca045f8531aac1a48cb29bdae62338e + /spawn-command/0.0.2-1: 62f5e9466981c1b796dc5929937e11c9c6921bd0 + /spawn-sync/1.0.15: + dependencies: + concat-stream: 1.6.0 + os-shim: 0.1.3 + resolution: b00799557eb7fb0c8376c29d44e8a1ea67e57476 + /split2/2.1.1: + dependencies: + through2: 2.0.3 + resolution: 7a1f551e176a90ecd3345f7246a0cfe175ef4fd0 + /string-width/1.0.2: + dependencies: + code-point-at: 1.1.0 + is-fullwidth-code-point: 1.0.0 + strip-ansi: 3.0.1 + resolution: 118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3 + /string-width/2.0.0: + dependencies: + is-fullwidth-code-point: 2.0.0 + strip-ansi: 3.0.1 + resolution: 635c5436cc72a6e0c387ceca278d4e2eec52687e + /string_decoder/0.10.31: 62e203bc41766c6c28c9fc84301dab1c5310fa94 + /strip-ansi/3.0.1: + dependencies: + ansi-regex: 2.1.1 + resolution: 6a385fb8853d952d5ff05d0e8aaf94278dc63dcf + /strip-eof/1.0.0: bb43ff5598a6eb05d89b59fcd129c983313606bf + /strip-json-comments/2.0.1: 3c531942e908c2697c0ec344858c286c7ca0a60a + /supports-color/2.0.0: 535d045ce6b6363fa40117084629995e9df324c7 + /term-size/0.1.1: + dependencies: + execa: 0.4.0 + resolution: 87360b96396cab5760963714cda0d0cbeecad9ca + /through/2.3.8: 0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5 + /through2/2.0.3: + dependencies: + readable-stream: 2.2.6 + xtend: 4.0.1 + resolution: 0004569b37c7c74ba39c43f3ced78d1ad94140be + /timed-out/4.0.1: f32eacac5a175bea25d7fab565ab3ed8741ef56f + /tmp/0.0.29: + dependencies: + os-tmpdir: 1.0.2 + resolution: f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0 + /tslint/4.5.1: + dependencies: + babel-code-frame: 6.22.0 + colors: 1.1.2 + diff: 3.2.0 + findup-sync: 0.3.0 + glob: 7.1.1 + optimist: 0.6.1 + resolve: 1.3.2 + tsutils: 1.6.0 + update-notifier: 2.1.0 + resolution: 05356871bef23a434906734006fc188336ba824b + /tsutils/1.6.0: 1fd7fac2a61369ed99cd3997f0fbb437128850f2 + /typedarray/0.0.6: 867ac74e3864187b1d3d47d996a78ec5c8830777 + /typescript/2.2.2: 606022508479b55ffa368b58fee963a03dfd7b0c + /unique-string/1.0.0: + dependencies: + crypto-random-string: 1.0.0 + resolution: 9e1057cca851abb93398f8b33ae187b99caec11a + /unzip-response/2.0.1: d2f0f737d16b0615e72a6935ed04214572d56f97 + /update-notifier/2.1.0: + dependencies: + boxen: 1.0.0 + chalk: 1.1.3 + configstore: 3.0.0 + is-npm: 1.0.0 + latest-version: 3.1.0 + lazy-req: 2.0.0 + semver-diff: 2.1.0 + xdg-basedir: 3.0.0 + resolution: ec0c1e53536b76647a24b77cb83966d9315123d9 + /url-parse-lax/1.0.0: + dependencies: + prepend-http: 1.0.4 + resolution: 7af8f303645e9bd79a272e7a14ac68bc0609da73 + /util-deprecate/1.0.2: 450d4dc9fa70de732762fbd2d4a28981419a0ccf + /validate-commit-msg/2.12.1: + dependencies: + conventional-commit-types: 2.1.0 + find-parent-dir: 0.3.0 + findup: 0.1.5 + semver-regex: 1.0.0 + resolution: 612b61bc9f09f0fee5130de3648870d01cdddf1d + /which/1.2.14: + dependencies: + isexe: 2.0.0 + resolution: 9a87c4378f03e827cecaf1acdf56c736c01c14e5 + /widest-line/1.0.0: + dependencies: + string-width: 1.0.2 + resolution: 0c09c85c2a94683d0d7eaf8ee097d564bf0e105c + /word-wrap/1.2.1: 248f459b465d179a17bc407c854d3151d07e45d8 + /wordwrap/0.0.3: a3d5da6cd5c0bc0008d37234bbaf1bed63059107 + /wrappy/1.0.2: b5243d8f3ec1aa35f1364605bc0d1036e30ab69f + /write-file-atomic/1.3.1: + dependencies: + graceful-fs: 4.1.11 + imurmurhash: 0.1.4 + slide: 1.1.6 + resolution: 7d45ba32316328dd1ec7d90f60ebc0d845bb759a + /xdg-basedir/3.0.0: 496b2cc109eca8dbacfe2dc72b603c17c5870ad4 + /xtend/4.0.1: a5c6d532be656e23db820efb943a1f04998d63af + /yallist/2.1.2: 1c11f9218f076089a47dd512f93c6699a6a81d52 +registry: 'https://registry.npmjs.org/' +version: 2 From 33ab54410ac9a1790052c47a06b0db3e1cd7061d Mon Sep 17 00:00:00 2001 From: zkochan Date: Fri, 7 Apr 2017 00:04:34 +0300 Subject: [PATCH 029/196] refactor: remove redundant t() function --- src/index.ts | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/src/index.ts b/src/index.ts index dd8347422f..58a37cd5cf 100644 --- a/src/index.ts +++ b/src/index.ts @@ -57,62 +57,57 @@ export default function (streamParser: Object) { }) function reportProgress (logObj: ProgressLog) { - // lazy get task - function t () { - return getTask(logObj.pkg.rawSpec, logObj.pkg.name) - } - if (logObj.pkg.dependentId) return - // the first thing it (probably) does is wait in queue to query the npm registry + const task = getTask(logObj.pkg.rawSpec, logObj.pkg.name) switch (logObj.status) { case 'installing': - t().status(chalk.gray('queued ↓')) + task.status(chalk.gray('queued ↓')) return case 'resolving': - t().status(chalk.yellow('finding ·')) + task.status(chalk.yellow('finding ·')) return case 'resolved': if (logObj.pkg.version) { - t().status(chalk.yellow('installing ' + logObj.pkg.version + ' .')) + task.status(chalk.yellow('installing ' + logObj.pkg.version + ' .')) return } - t().status(chalk.yellow('installing .')) + task.status(chalk.yellow('installing .')) return case 'fetched': if (logObj.pkg.version) { - t().status(chalk.yellow('installing dependencies ' + logObj.pkg.version + ' .')) + task.status(chalk.yellow('installing dependencies ' + logObj.pkg.version + ' .')) return } - t().status(chalk.yellow('installing dependencies .')) + task.status(chalk.yellow('installing dependencies .')) return case 'fetching': if (logObj.pkg.version) { - t().status(chalk.yellow('downloading ' + logObj.pkg.version + ' ↓')) + task.status(chalk.yellow('downloading ' + logObj.pkg.version + ' ↓')) } else { - t().status(chalk.yellow('downloading ↓')) + task.status(chalk.yellow('downloading ↓')) } if (logObj.progress && logObj.progress.total && logObj.progress.done < logObj.progress.total) { - t().details('' + Math.round(logObj.progress.done / logObj.progress.total * 100) + '%') + task.details('' + Math.round(logObj.progress.done / logObj.progress.total * 100) + '%') } else { - t().details('') + task.details('') } return case 'installed': if (logObj.pkg.version) { - t().status(chalk.green('' + logObj.pkg.version + ' ✓')) + task.status(chalk.green('' + logObj.pkg.version + ' ✓')) .details('') return } - t().status(chalk.green('OK ✓')).details('') + task.status(chalk.green('OK ✓')).details('') return case 'error': - t().status(chalk.red('ERROR ✗')) + task.status(chalk.red('ERROR ✗')) .details('') return default: - t().status(logObj.status) + task.status(logObj.status) .details('') return } From adc894496c8c2fd3ec5478ac30bed4a462adddd2 Mon Sep 17 00:00:00 2001 From: zkochan Date: Fri, 7 Apr 2017 01:39:55 +0300 Subject: [PATCH 030/196] feat: use the new format of status messages BREAKING CHANGE: Uses a new format of status messages --- package.json | 2 +- shrinkwrap.yaml | 6 ++--- src/index.ts | 63 +++++++++++++++++++++++++++++++++++++------------ 3 files changed, 52 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index ae99e50a05..a0091800d1 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "common-tags": "^1.4.0", "ndjson": "^1.5.0", "observatory": "^1.0.0", - "pnpm-logger": "^0.2.0" + "pnpm-logger": "^0.3.0" }, "devDependencies": { "commitizen": "^2.9.5", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index e3b41cf155..df3822fc01 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -8,7 +8,7 @@ dependencies: ghooks@^2.0.0: 2.0.0 ndjson@^1.5.0: 1.5.0 observatory@^1.0.0: 1.0.0 - pnpm-logger@^0.2.0: 0.2.0 + pnpm-logger@^0.3.0: 0.3.0 rimraf@^2.5.4: 2.6.1 tslint@^4.3.1: 4.5.1 typescript@^2.1.5: 2.2.2 @@ -543,10 +543,10 @@ packages: pinkie: 2.0.4 resolution: 2135d6dfa7a358c069ac9b178776288228450ffa /pinkie/2.0.4: 72556b80cfa0d48a974e80e77248e80ed4f7f870 - /pnpm-logger/0.2.0: + /pnpm-logger/0.3.0: dependencies: bole: 3.0.2 - resolution: 9e35a1282e4fae1a3c78cf4e31c4da9c776a9c79 + resolution: eaecea5a037f053a64c50bda7eda3cb87f5ed661 /prepend-http/1.0.4: d4f4562b0ce3696e41ac52d0e002e57a635dc6dc /preserve/0.2.0: 815ed1f6ebc65926f865b310c0713bcb3315ce4b /process-nextick-args/1.0.7: 150e20b756590ad3f91093f25a4f2ad8bff30ba3 diff --git a/src/index.ts b/src/index.ts index 58a37cd5cf..9f943a4984 100644 --- a/src/index.ts +++ b/src/index.ts @@ -56,10 +56,40 @@ export default function (streamParser: Object) { } }) - function reportProgress (logObj: ProgressLog) { - if (logObj.pkg.dependentId) return + const taskByPkgId = {} + const pkgVersionByPkgId = {} - const task = getTask(logObj.pkg.rawSpec, logObj.pkg.name) + function reportProgress (logObj: ProgressLog) { + let task + let pkgVersion = pkgVersionByPkgId[logObj['pkgId']] + switch (logObj.status) { + case 'fetching': + case 'fetched': + case 'installed': + case 'dependencies_installed': + task = taskByPkgId[logObj.pkgId] + break + case 'resolving': + case 'error': + case 'installing': + case 'resolved': + // log statuses of the top dependencies only + if (logObj.pkg && logObj.pkg.dependentId) break + + task = getTask(logObj.pkg.rawSpec, logObj.pkg.name) + + if (logObj.status === 'resolved' && logObj.pkgId) { + taskByPkgId[logObj.pkgId] = task + } + break + default: + if (logObj.status === 'downloaded_manifest') { + pkgVersionByPkgId[logObj.pkgId] = logObj.pkgVersion + } + return + } + + if (!task) return switch (logObj.status) { case 'installing': @@ -69,22 +99,22 @@ export default function (streamParser: Object) { task.status(chalk.yellow('finding ·')) return case 'resolved': - if (logObj.pkg.version) { - task.status(chalk.yellow('installing ' + logObj.pkg.version + ' .')) + if (pkgVersion) { + task.status(chalk.yellow('installing ' + pkgVersion + ' .')) return } task.status(chalk.yellow('installing .')) return case 'fetched': - if (logObj.pkg.version) { - task.status(chalk.yellow('installing dependencies ' + logObj.pkg.version + ' .')) + if (pkgVersion) { + task.status(chalk.yellow('installing dependencies ' + pkgVersion + ' .')) return } task.status(chalk.yellow('installing dependencies .')) return case 'fetching': - if (logObj.pkg.version) { - task.status(chalk.yellow('downloading ' + logObj.pkg.version + ' ↓')) + if (pkgVersion) { + task.status(chalk.yellow('downloading ' + pkgVersion + ' ↓')) } else { task.status(chalk.yellow('downloading ↓')) } @@ -94,9 +124,16 @@ export default function (streamParser: Object) { task.details('') } return + case 'dependencies_installed': + if (pkgVersion) { + task.status(chalk.yellow('linking ' + pkgVersion + ' ↓')) + return + } + task.status(chalk.yellow('linking ↓')) + return case 'installed': - if (logObj.pkg.version) { - task.status(chalk.green('' + logObj.pkg.version + ' ✓')) + if (pkgVersion) { + task.status(chalk.green('' + pkgVersion + ' ✓')) .details('') return } @@ -106,10 +143,6 @@ export default function (streamParser: Object) { task.status(chalk.red('ERROR ✗')) .details('') return - default: - task.status(logObj.status) - .details('') - return } } } From 3fabe3469b1087b7a61e886bcb4746a1adf0b39e Mon Sep 17 00:00:00 2001 From: zkochan Date: Fri, 7 Apr 2017 01:40:37 +0300 Subject: [PATCH 031/196] chore: release v0.6.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a0091800d1..42c41403af 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.5.1", + "version": "0.6.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From f69f7ebbed796e52084fb57fa65a0364253d3e7d Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 1 Jul 2017 00:41:18 +0300 Subject: [PATCH 032/196] chore: update shrinkwrap.yaml --- shrinkwrap.yaml | 1213 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 904 insertions(+), 309 deletions(-) diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index df3822fc01..0e1f5e3d2d 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,80 +1,127 @@ dependencies: - '@types/chalk@^0.4.31': 0.4.31 - '@types/common-tags@^1.2.5': 1.2.5 - '@types/node@^7.0.0': 7.0.12 - chalk@^1.1.3: 1.1.3 - commitizen@^2.9.5: 2.9.6 - common-tags@^1.4.0: 1.4.0 - ghooks@^2.0.0: 2.0.0 - ndjson@^1.5.0: 1.5.0 - observatory@^1.0.0: 1.0.0 - pnpm-logger@^0.3.0: 0.3.0 - rimraf@^2.5.4: 2.6.1 - tslint@^4.3.1: 4.5.1 - typescript@^2.1.5: 2.2.2 - validate-commit-msg@^2.8.2: 2.12.1 + '@types/chalk': 0.4.31 + '@types/common-tags': 1.2.5 + '@types/node': 7.0.33 + chalk: 1.1.3 + common-tags: 1.4.0 + ndjson: 1.5.0 + observatory: 1.0.0 + pnpm-logger: 0.3.0 +devDependencies: + commitizen: 2.9.6 + ghooks: 2.0.0 + rimraf: 2.6.1 + tslint: 4.5.1 + typescript: 2.4.1 + validate-commit-msg: 2.12.2 packages: - /@types/chalk/0.4.31: a31d74241a6b1edbb973cf36d97a2896834a51f9 - /@types/common-tags/1.2.5: 14f29893992eb325594b83d739af02f2b6520f46 - /@types/node/7.0.12: ae5f67a19c15f752148004db07cbbb372e69efc9 - /ansi-align/1.1.0: + /@types/chalk/0.4.31: + resolution: + integrity: sha1-ox10JBprHtu5c8822XooloNKUfk= + /@types/common-tags/1.2.5: + resolution: + integrity: sha1-FPKYk5kusyVZS4PXOa8C8rZSD0Y= + /@types/node/7.0.33: + resolution: + integrity: sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw== + /ansi-align/2.0.0: dependencies: - string-width: 1.0.2 - resolution: 2f0c1658829739add5ebb15e6b0c6e3423f016ba - /ansi-escapes/1.4.0: d3a8a83b319aa67793662b13e761c7911422306e - /ansi-regex/2.1.1: c3b33ab5ee360d86e0e628f0468ae7ef27d654df - /ansi-styles/2.2.1: b432dd3358b634cf75e1e4664368240533c1ddbe + string-width: 2.1.0 + dev: true + resolution: + integrity: sha1-w2rsy6VjuJzrVW82kPCx2eNUf38= + /ansi-escapes/1.4.0: + resolution: + integrity: sha1-06ioOzGapneTZisT52HHkRQiMG4= + /ansi-regex/2.1.1: + resolution: + integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + /ansi-regex/3.0.0: + dev: true + resolution: + integrity: sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + /ansi-styles/2.2.1: + resolution: + integrity: sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= /arr-diff/2.0.0: dependencies: - arr-flatten: 1.0.1 - resolution: 8f3b827f955a8bd669697e4a4256ac3ceae356cf - /arr-flatten/1.0.1: e5ffe54d45e19f32f216e91eb99c8ce892bb604b - /array-unique/0.2.1: a1d97ccafcbc2625cc70fadceb36a50c58b01a53 + arr-flatten: 1.0.3 + dev: true + resolution: + integrity: sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= + /arr-flatten/1.0.3: + dev: true + resolution: + integrity: sha1-onTthawIhJtr14R8RYB0XcUa37E= + /array-unique/0.2.1: + dev: true + resolution: + integrity: sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= /babel-code-frame/6.22.0: dependencies: chalk: 1.1.3 esutils: 2.0.2 - js-tokens: 3.0.1 - resolution: 027620bee567a88c32561574e7fd0801d33118e4 + js-tokens: 3.0.2 + dev: true + resolution: + integrity: sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ= /babel-runtime/6.23.0: dependencies: core-js: 2.4.1 - regenerator-runtime: 0.10.3 - resolution: 0a9489f144de70efb3ce4300accdb329e2fc543b - /balanced-match/0.4.2: cb3f3e3c732dc0f01ee70b403f302e61d7709838 + regenerator-runtime: 0.10.5 + resolution: + integrity: sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs= + /balanced-match/1.0.0: + dev: true + resolution: + integrity: sha1-ibTRmasr7kneFk6gK4nORi1xt2c= /bole/3.0.2: dependencies: fast-safe-stringify: 1.1.13 individual: 3.0.0 - resolution: bc8a483ca94049da9b837c1ad11cdfebee6e0514 - /boxen/1.0.0: + resolution: + integrity: sha1-vIpIPKlASdqbg3wa0Rzf6+5uBRQ= + /boxen/1.1.0: dependencies: - ansi-align: 1.1.0 + ansi-align: 2.0.0 camelcase: 4.1.0 chalk: 1.1.3 cli-boxes: 1.0.0 - string-width: 2.0.0 + string-width: 2.1.0 term-size: 0.1.1 widest-line: 1.0.0 - resolution: b2694baf1f605f708ff0177c12193b22f29aaaab - /brace-expansion/1.1.6: + dev: true + resolution: + integrity: sha1-sbad1SIwXoB6md7ud329blFnsQI= + /brace-expansion/1.1.8: dependencies: - balanced-match: 0.4.2 + balanced-match: 1.0.0 concat-map: 0.0.1 - resolution: 7197d7eaa9b87e648390ea61fc66c84427420df9 + dev: true + resolution: + integrity: sha1-wHshHHyVLsH479Uad+8NHTmQopI= /braces/1.8.5: dependencies: expand-range: 1.8.2 preserve: 0.2.0 repeat-element: 1.1.2 - resolution: ba77962e12dff969d6b76711e914b737857bf6a7 - /buffer-shims/1.0.0: 9978ce317388c649ad8793028c3477ef044a8b51 + dev: true + resolution: + integrity: sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= /cachedir/1.1.1: dependencies: os-homedir: 1.0.2 - resolution: e1363075ea206a12767d92bb711c8a2f76a10f62 - /camelcase/4.1.0: d545635be1e33c542649c69173e5de6acfae34dd - /capture-stack-trace/1.0.0: 4a6fa07399c26bba47f0b2496b4d0fb408c5550d + dev: true + resolution: + integrity: sha1-4TYwdeogahJ2fZK7cRyKL3ahD2I= + /camelcase/4.1.0: + dev: true + resolution: + integrity: sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= + /capture-stack-trace/1.0.0: + dev: true + resolution: + integrity: sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0= /chalk/1.1.3: dependencies: ansi-styles: 2.2.1 @@ -82,21 +129,44 @@ packages: has-ansi: 2.0.0 strip-ansi: 3.0.1 supports-color: 2.0.0 - resolution: a8115c55e4a702fe4d150abd3872822a7e09fc98 - /cli-boxes/1.0.0: 4fa917c3e59c94a004cd61f8ee509da651687143 + resolution: + integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + /cli-boxes/1.0.0: + dev: true + resolution: + integrity: sha1-T6kXw+WclKAEzWH47lCdplFocUM= /cli-cursor/1.0.2: dependencies: restore-cursor: 1.0.1 - resolution: 64da3f7d56a54412e59794bd62dc35295e8f2987 - /cli-width/2.1.0: b234ca209b29ef66fc518d9b98d5847b00edf00a - /code-point-at/1.1.0: 0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77 - /colors/0.6.2: 2423fe6678ac0c5dae8852e5d0e5be08c997abcc - /colors/1.1.2: 168a4701756b6a7f51a12ce0c97bfa28c084ed63 - /commander/2.1.0: d121bbae860d9992a3d517ba96f56588e47c6781 + dev: true + resolution: + integrity: sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc= + /cli-width/2.1.0: + dev: true + resolution: + integrity: sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao= + /code-point-at/1.1.0: + dev: true + resolution: + integrity: sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + /colors/0.6.2: + dev: true + resolution: + integrity: sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w= + /colors/1.1.2: + dev: true + resolution: + integrity: sha1-FopHAXVran9RoSzgyXv6KMCE7WM= + /commander/2.1.0: + dev: true + resolution: + integrity: sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E= /commander/2.9.0: dependencies: graceful-readlink: 1.0.1 - resolution: 9c99094176e12240cb22d6c5146098400fe0f7d4 + dev: true + resolution: + integrity: sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= /commitizen/2.9.6: dependencies: cachedir: 1.1.1 @@ -114,40 +184,64 @@ packages: path-exists: 2.1.0 shelljs: 0.7.6 strip-json-comments: 2.0.1 - resolution: c0d00535ef264da7f63737edfda4228983fa2291 + dev: true + resolution: + integrity: sha1-wNAFNe8mTaf2Nzft/aQiiYP6IpE= /common-tags/1.4.0: dependencies: babel-runtime: 6.23.0 - resolution: 1187be4f3d4cf0c0427d43f74eef1f73501614c0 - /concat-map/0.0.1: d8a96bd77fd68df7793a73036a3ba0d5405d477b + resolution: + integrity: sha1-EYe+Tz1M8MBCfUP3Tu8fc1AWFMA= + /concat-map/0.0.1: + dev: true + resolution: + integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= /concat-stream/1.6.0: dependencies: inherits: 2.0.3 - readable-stream: 2.2.6 + readable-stream: 2.3.3 typedarray: 0.0.6 - resolution: 0aac662fd52be78964d5532f694784e70110acf7 - /configstore/3.0.0: + dev: true + resolution: + integrity: sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc= + /configstore/3.1.0: dependencies: dot-prop: 4.1.1 graceful-fs: 4.1.11 - mkdirp: 0.5.1 + make-dir: 1.0.0 unique-string: 1.0.0 - write-file-atomic: 1.3.1 + write-file-atomic: 2.1.0 xdg-basedir: 3.0.0 - resolution: e1b8669c1803ccc50b545e92f8e6e79aa80e0196 - /conventional-commit-types/2.1.0: 45d860386c9a2e6537ee91d8a1b61bd0411b3d04 - /core-js/2.4.1: 4de911e667b0eae9124e34254b53aea6fc618d3e - /core-util-is/1.0.2: b5fd54220aa2bc5ab57aab7140c940754503c1a7 + dev: true + resolution: + integrity: sha1-Rd+QcHPibfoc9LLVL1tgVF6qEdE= + /conventional-commit-types/2.1.0: + dev: true + resolution: + integrity: sha1-RdhgOGyaLmU37pHYobYb0EEbPQQ= + /core-js/2.4.1: + resolution: + integrity: sha1-TekR5mew6ukSTjQlS1OupvxhjT4= + /core-util-is/1.0.2: + resolution: + integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= /create-error-class/3.0.2: dependencies: capture-stack-trace: 1.0.0 - resolution: 06be7abef947a3f14a30fd610671d401bca8b7b6 + dev: true + resolution: + integrity: sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y= /cross-spawn-async/2.2.5: dependencies: - lru-cache: 4.0.2 + lru-cache: 4.1.1 which: 1.2.14 - resolution: 845ff0c0834a3ded9d160daca6d390906bb288cc - /crypto-random-string/1.0.0: a230f64f568310e1498009940790ec99545bca7e + dev: true + resolution: + integrity: sha1-hF/wwINKPe2dFg2sptOQkGuyiMw= + /crypto-random-string/1.0.0: + dev: true + resolution: + integrity: sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4= /cz-conventional-changelog/1.2.0: dependencies: conventional-commit-types: 2.1.0 @@ -155,26 +249,51 @@ packages: longest: 1.0.1 pad-right: 0.2.2 right-pad: 1.0.1 - word-wrap: 1.2.1 - resolution: 2bca04964c8919b23f3fd6a89ef5e6008b31b3f8 - /dedent/0.6.0: 0e6da8f0ce52838ef5cec5c8f9396b0c1b64a3cb - /deep-extend/0.4.1: efe4113d08085f4e6f9687759810f807469e2253 + word-wrap: 1.2.3 + dev: true + resolution: + integrity: sha1-K8oElkyJGbI/P9aonvXmAIsxs/g= + /dedent/0.6.0: + dev: true + resolution: + integrity: sha1-Dm2o8M5Sg471zsXI+TlrDBtko8s= + /deep-extend/0.4.2: + dev: true + resolution: + integrity: sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8= /detect-file/0.1.0: dependencies: fs-exists-sync: 0.1.0 - resolution: 4935dedfd9488648e006b0129566e9386711ea63 + dev: true + resolution: + integrity: sha1-STXe39lIhkjgBrASlWbpOGcR6mM= /detect-indent/4.0.0: dependencies: repeating: 2.0.1 - resolution: f76d064352cdf43a1cb6ce619c4ee3a9475de208 - /diff/3.2.0: c9ce393a4b7cbd0b058a725c93df299027868ff9 + dev: true + resolution: + integrity: sha1-920GQ1LN9Docts5hnE7jqUdd4gg= + /diff/3.2.0: + dev: true + resolution: + integrity: sha1-yc45Okt8vQsFinJck98pkCeGj/k= /dot-prop/4.1.1: dependencies: is-obj: 1.0.1 - resolution: a8493f0b7b5eeec82525b5c7587fa7de7ca859c1 - /duplexer3/0.1.4: ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2 - /escape-string-regexp/1.0.5: 1b61c0562190a8dff6ae3bb2cf0200ca130b86d4 - /esutils/2.0.2: 0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b + dev: true + resolution: + integrity: sha1-qEk/C3te7sglJbXHWH+n3nyoWcE= + /duplexer3/0.1.4: + dev: true + resolution: + integrity: sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + /escape-string-regexp/1.0.5: + resolution: + integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + /esutils/2.0.2: + dev: true + resolution: + integrity: sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= /execa/0.4.0: dependencies: cross-spawn-async: 2.2.5 @@ -183,83 +302,140 @@ packages: object-assign: 4.1.1 path-key: 1.0.0 strip-eof: 1.0.0 - resolution: 4eb6467a36a095fabb2970ff9d5e3fb7bce6ebc3 - /exit-hook/1.1.1: f05ca233b48c05d54fff07765df8507e95c02ff8 + dev: true + resolution: + integrity: sha1-TrZGejaglfq7KXD/nV4/t7zm68M= + /exit-hook/1.1.1: + dev: true + resolution: + integrity: sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g= /expand-brackets/0.1.5: dependencies: is-posix-bracket: 0.1.1 - resolution: df07284e342a807cd733ac5af72411e581d1177b + dev: true + resolution: + integrity: sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= /expand-range/1.8.2: dependencies: fill-range: 2.2.3 - resolution: a299effd335fe2721ebae8e257ec79644fc85337 + dev: true + resolution: + integrity: sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= /expand-tilde/1.2.2: dependencies: os-homedir: 1.0.2 - resolution: 0b81eba897e5a3d31d1c3d102f8f01441e559449 - /extend/3.0.0: 5a474353b9f3353ddd8176dfd37b91c83a46f1d4 + dev: true + resolution: + integrity: sha1-C4HrqJflo9MdHD0QL48BRB5VlEk= + /extend/3.0.1: + dev: true + resolution: + integrity: sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ= /external-editor/1.1.1: dependencies: - extend: 3.0.0 + extend: 3.0.1 spawn-sync: 1.0.15 tmp: 0.0.29 - resolution: 12d7b0db850f7ff7e7081baf4005700060c4600b + dev: true + resolution: + integrity: sha1-Etew24UPf/fnCBuvQAVwAGDEYAs= /extglob/0.3.2: dependencies: is-extglob: 1.0.0 - resolution: 2e18ff3d2f49ab2765cec9023f011daa8d8349a1 - /fast-safe-stringify/1.1.13: a01e9cd9c9e491715c98a75a42d5f0bbd107ff76 + dev: true + resolution: + integrity: sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= + /fast-safe-stringify/1.1.13: + resolution: + integrity: sha1-oB6c2cnkkXFcmKdaQtXwu9EH/3Y= /figures/1.7.0: dependencies: escape-string-regexp: 1.0.5 object-assign: 4.1.1 - resolution: cbe1e3affcf1cd44b80cadfed28dc793a9701d2e - /filename-regex/2.0.0: 996e3e80479b98b9897f15a8a58b3d084e926775 + dev: true + resolution: + integrity: sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= + /filename-regex/2.0.1: + dev: true + resolution: + integrity: sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= /fill-range/2.2.3: dependencies: is-number: 2.1.0 isobject: 2.1.0 - randomatic: 1.1.6 + randomatic: 1.1.7 repeat-element: 1.1.2 repeat-string: 1.6.1 - resolution: 50b77dfd7e469bc7492470963699fe7a8485a723 + dev: true + resolution: + integrity: sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM= /find-node-modules/1.0.4: dependencies: findup-sync: 0.4.2 merge: 1.2.0 - resolution: b6deb3cccb699c87037677bcede2c5f5862b2550 - /find-parent-dir/0.3.0: 33c44b429ab2b2f0646299c5f9f718f376ff8d54 - /find-root/1.0.0: 962ff211aab25c6520feeeb8d6287f8f6e95807a + dev: true + resolution: + integrity: sha1-tt6zzMtpnIcDdne87eLF9YYrJVA= + /find-parent-dir/0.3.0: + dev: true + resolution: + integrity: sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ= + /find-root/1.0.0: + dev: true + resolution: + integrity: sha1-li/yEaqyXGUg/u641ih/j26VgHo= /findup-sync/0.3.0: dependencies: glob: 5.0.15 - resolution: 37930aa5d816b777c03445e1966cc6790a4c0b16 + dev: true + resolution: + integrity: sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY= /findup-sync/0.4.2: dependencies: detect-file: 0.1.0 is-glob: 2.0.1 micromatch: 2.3.11 resolve-dir: 0.1.1 - resolution: a8117d0f73124f5a4546839579fe52d7129fb5e5 + dev: true + resolution: + integrity: sha1-qBF9D3MST1pFRoOVef5S1xKfteU= /findup/0.1.5: dependencies: colors: 0.6.2 commander: 2.1.0 - resolution: 8ad929a3393bac627957a7e5de4623b06b0e2ceb - /for-in/1.0.2: 81068d295a8142ec0ac726c6e2200c30fb6d5e80 + dev: true + resolution: + integrity: sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs= + /for-in/1.0.2: + dev: true + resolution: + integrity: sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= /for-own/0.1.5: dependencies: for-in: 1.0.2 - resolution: 5265c681a4f294dabbf17c9509b6763aa84510ce - /fs-exists-sync/0.1.0: 982d6893af918e72d08dec9e8673ff2b5a8d6add + dev: true + resolution: + integrity: sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= + /fs-exists-sync/0.1.0: + dev: true + resolution: + integrity: sha1-mC1ok6+RjnLQjeyehnP/K1qNat0= /fs-extra/1.0.0: dependencies: graceful-fs: 4.1.11 jsonfile: 2.4.0 klaw: 1.3.1 - resolution: cd3ce5f7e7cb6145883fcae3191e9877f8587950 - /fs.realpath/1.0.0: 1504ad2523158caa40db4a2787cb01411994ea4f - /get-stream/3.0.0: 8e943d1358dc37555054ecbe2edb05aa174ede14 + dev: true + resolution: + integrity: sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA= + /fs.realpath/1.0.0: + dev: true + resolution: + integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + /get-stream/3.0.0: + dev: true + resolution: + integrity: sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= /ghooks/2.0.0: dependencies: execa: 0.4.0 @@ -269,45 +445,70 @@ packages: opt-cli: 1.5.1 path-exists: 2.1.0 spawn-command: 0.0.2 - resolution: affd83a36e8b8fbdded9b851457c48ac74c8eab8 + dev: true + resolution: + integrity: sha1-r/2Do26Lj73e2bhRRXxIrHTI6rg= /glob-base/0.3.0: dependencies: glob-parent: 2.0.0 is-glob: 2.0.1 - resolution: dbb164f6221b1c0b1ccf82aea328b497df0ea3c4 + dev: true + resolution: + integrity: sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= /glob-parent/2.0.0: dependencies: is-glob: 2.0.1 - resolution: 81383d72db054fcccf5336daa902f182f6edbb28 + dev: true + resolution: + integrity: sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= /glob/5.0.15: dependencies: inflight: 1.0.6 inherits: 2.0.3 - minimatch: 3.0.3 + minimatch: 3.0.4 once: 1.4.0 path-is-absolute: 1.0.1 - resolution: 1bc936b9e02f4a603fcc222ecf7633d30b8b93b1 + dev: true + resolution: + integrity: sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= /glob/7.1.1: dependencies: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.3 - minimatch: 3.0.3 + minimatch: 3.0.4 once: 1.4.0 path-is-absolute: 1.0.1 - resolution: 805211df04faaf1c63a3600306cdf5ade50b2ec8 + dev: true + resolution: + integrity: sha1-gFIR3wT6rxxjo2ADBs31reULLsg= + /glob/7.1.2: + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.3 + minimatch: 3.0.4 + once: 1.4.0 + path-is-absolute: 1.0.1 + dev: true + resolution: + integrity: sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== /global-modules/0.2.3: dependencies: global-prefix: 0.1.5 is-windows: 0.2.0 - resolution: ea5a3bed42c6d6ce995a4f8a1269b5dae223828d + dev: true + resolution: + integrity: sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0= /global-prefix/0.1.5: dependencies: homedir-polyfill: 1.0.1 ini: 1.3.4 is-windows: 0.2.0 which: 1.2.14 - resolution: 8d3bc6b8da3ca8112a160d8d496ff0462bfef78f + dev: true + resolution: + integrity: sha1-jTvGuNo8qBEqFg2NSW/wRiv+948= /got/6.7.1: dependencies: create-error-class: 3.0.2 @@ -317,30 +518,57 @@ packages: is-retry-allowed: 1.1.0 is-stream: 1.1.0 lowercase-keys: 1.0.0 - safe-buffer: 5.0.1 + safe-buffer: 5.1.1 timed-out: 4.0.1 unzip-response: 2.0.1 url-parse-lax: 1.0.0 - resolution: 240cd05785a9a18e561dc1b44b41c763ef1e8db0 - /graceful-fs/4.1.11: 0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658 - /graceful-readlink/1.0.1: 4cafad76bc62f02fa039b2f94e9a3dd3a391a725 + dev: true + resolution: + integrity: sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA= + /graceful-fs/4.1.11: + dev: true + resolution: + integrity: sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg= + /graceful-readlink/1.0.1: + dev: true + resolution: + integrity: sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= /has-ansi/2.0.0: dependencies: ansi-regex: 2.1.1 - resolution: 34f5049ce1ecdf2b0649af3ef24e45ed35416d91 + resolution: + integrity: sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= /homedir-polyfill/1.0.1: dependencies: parse-passwd: 1.0.0 - resolution: 4c2bbc8a758998feebf5ed68580f76d46768b4bc - /imurmurhash/0.1.4: 9218b9b2b928a238b13dc4fb6b6d576f231453ea - /individual/3.0.0: e7ca4f85f8957b018734f285750dc22ec2f9862d + dev: true + resolution: + integrity: sha1-TCu8inWJmP7r9e1oWA921GdotLw= + /import-lazy/2.1.0: + dev: true + resolution: + integrity: sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= + /imurmurhash/0.1.4: + dev: true + resolution: + integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o= + /individual/3.0.0: + resolution: + integrity: sha1-58pPhfiVewGHNPKFdQ3CLsL5hi0= /inflight/1.0.6: dependencies: once: 1.4.0 wrappy: 1.0.2 - resolution: 49bd6331d7d02d0c09bc910a1075ba8165b56df9 - /inherits/2.0.3: 633c2c83e3da42a502f52466022480f4208261de - /ini/1.3.4: 0537cb79daf59b59a1a517dff706c86ec039162e + dev: true + resolution: + integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + /inherits/2.0.3: + resolution: + integrity: sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + /ini/1.3.4: + dev: true + resolution: + integrity: sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4= /inquirer/1.2.3: dependencies: ansi-escapes: 1.4.0 @@ -357,85 +585,209 @@ packages: string-width: 1.0.2 strip-ansi: 3.0.1 through: 2.3.8 - resolution: 4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918 - /interpret/1.0.2: f4f623f0bb7122f15f5717c8e254b8161b5c5b2d - /is-buffer/1.1.5: 1f3b26ef613b214b88cbca23cc6c01d87961eecc - /is-dotfile/1.0.2: 2c132383f39199f8edc268ca01b9b007d205cc4d + dev: true + resolution: + integrity: sha1-TexvMvN+97sLLtPx0aXD9UUHSRg= + /interpret/1.0.3: + dev: true + resolution: + integrity: sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A= + /is-buffer/1.1.5: + dev: true + resolution: + integrity: sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw= + /is-dotfile/1.0.3: + dev: true + resolution: + integrity: sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= /is-equal-shallow/0.1.3: dependencies: is-primitive: 2.0.0 - resolution: 2238098fc221de0bcfa5d9eac4c45d638aa1c534 - /is-extendable/0.1.1: 62b110e289a471418e3ec36a617d472e301dfc89 - /is-extglob/1.0.0: ac468177c4943405a092fc8f29760c6ffc6206c0 + dev: true + resolution: + integrity: sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= + /is-extendable/0.1.1: + dev: true + resolution: + integrity: sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= + /is-extglob/1.0.0: + dev: true + resolution: + integrity: sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= /is-finite/1.0.2: dependencies: number-is-nan: 1.0.1 - resolution: cc6677695602be550ef11e8b4aa6305342b6d0aa + dev: true + resolution: + integrity: sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= /is-fullwidth-code-point/1.0.0: dependencies: number-is-nan: 1.0.1 - resolution: ef9e31386f031a7f0d643af82fde50c457ef00cb - /is-fullwidth-code-point/2.0.0: a3b30a5c4f199183167aaab93beefae3ddfb654f + dev: true + resolution: + integrity: sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + /is-fullwidth-code-point/2.0.0: + dev: true + resolution: + integrity: sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= /is-glob/2.0.1: dependencies: is-extglob: 1.0.0 - resolution: d096f926a3ded5600f3fdfd91198cb0888c2d863 - /is-npm/1.0.0: f2fb63a65e4905b406c86072765a1a4dc793b9f4 + dev: true + resolution: + integrity: sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= + /is-npm/1.0.0: + dev: true + resolution: + integrity: sha1-8vtjpl5JBbQGyGBydloaTceTufQ= /is-number/2.1.0: dependencies: - kind-of: 3.1.0 - resolution: 01fcbbb393463a548f2f466cce16dece49db908f - /is-obj/1.0.1: 3e4729ac1f5fde025cd7d83a896dab9f4f67db0f - /is-posix-bracket/0.1.1: 3334dc79774368e92f016e6fbc0a88f5cd6e6bc4 - /is-primitive/2.0.0: 207bab91638499c07b2adf240a41a87210034575 - /is-promise/2.1.0: 79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa - /is-redirect/1.0.0: 1d03dded53bd8db0f30c26e4f95d36fc7c87dc24 - /is-retry-allowed/1.1.0: 11a060568b67339444033d0125a61a20d564fb34 - /is-stream/1.1.0: 12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44 - /is-windows/0.2.0: de1aa6d63ea29dd248737b69f1ff8b8002d2108c - /isarray/1.0.0: bb935d48582cba168c06834957a54a3e07124f11 - /isexe/2.0.0: e8fbf374dc556ff8947a10dcb0572d633f2cfa10 + kind-of: 3.2.2 + dev: true + resolution: + integrity: sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= + /is-number/3.0.0: + dependencies: + kind-of: 3.2.2 + dev: true + resolution: + integrity: sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + /is-obj/1.0.1: + dev: true + resolution: + integrity: sha1-PkcprB9f3gJc19g6iW2rn09n2w8= + /is-posix-bracket/0.1.1: + dev: true + resolution: + integrity: sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= + /is-primitive/2.0.0: + dev: true + resolution: + integrity: sha1-IHurkWOEmcB7Kt8kCkGochADRXU= + /is-promise/2.1.0: + dev: true + resolution: + integrity: sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= + /is-redirect/1.0.0: + dev: true + resolution: + integrity: sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= + /is-retry-allowed/1.1.0: + dev: true + resolution: + integrity: sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= + /is-stream/1.1.0: + dev: true + resolution: + integrity: sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + /is-windows/0.2.0: + dev: true + resolution: + integrity: sha1-3hqm1j6indJIc3tp8f+LgALSEIw= + /isarray/1.0.0: + resolution: + integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + /isexe/2.0.0: + dev: true + resolution: + integrity: sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= /isobject/2.1.0: dependencies: isarray: 1.0.0 - resolution: f065561096a3f1da2ef46272f815c840d87e0c89 - /js-tokens/3.0.1: 08e9f132484a2c45a30907e9dc4d5567b7f114d7 - /json-stringify-safe/5.0.1: 1296a2d58fd45f19a0f6ce01d65701e2c735b6eb + dev: true + resolution: + integrity: sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + /js-tokens/3.0.2: + dev: true + resolution: + integrity: sha1-mGbfOVECEw449/mWvOtlRDIJwls= + /json-stringify-safe/5.0.1: + resolution: + integrity: sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= /jsonfile/2.4.0: - dependencies: + dev: true + optionalDependencies: graceful-fs: 4.1.11 - resolution: 3736a2b428b87bbda0cc83b53fa3d633a35c2ae8 - /kind-of/3.1.0: + resolution: + integrity: sha1-NzaitCi4e72gzIO1P6PWM6NcKug= + /kind-of/3.2.2: dependencies: is-buffer: 1.1.5 - resolution: 475d698a5e49ff5e53d14e3e732429dc8bf4cf47 - /klaw/1.3.1: + dev: true + resolution: + integrity: sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= + /kind-of/4.0.0: dependencies: + is-buffer: 1.1.5 + dev: true + resolution: + integrity: sha1-IIE989cSkosgc3hpGkUGb65y3Vc= + /klaw/1.3.1: + dev: true + optionalDependencies: graceful-fs: 4.1.11 - resolution: 4088433b46b3b1ba259d78785d8e96f73ba02439 + resolution: + integrity: sha1-QIhDO0azsbolnXh4XY6W9zugJDk= /latest-version/3.1.0: dependencies: - package-json: 4.0.0 - resolution: a205383fea322b33b5ae3b18abee0dc2f356ee15 - /lazy-req/2.0.0: c9450a363ecdda2e6f0c70132ad4f37f8f06f2b4 - /lodash._baseclone/4.5.7: ce42ade08384ef5d62fa77c30f61a46e686f8434 + package-json: 4.0.1 + dev: true + resolution: + integrity: sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU= + /lodash._baseclone/4.5.7: + dev: true + resolution: + integrity: sha1-zkKt4IOE711i+nfDD2GkbmhvhDQ= /lodash.clone/4.3.2: dependencies: lodash._baseclone: 4.5.7 - resolution: e56b176b6823a7dde38f7f2bf58de7d5971200e9 - /lodash.map/4.6.0: 771ec7839e3473d9c4cde28b19394c3562f4f6d3 - /lodash/3.10.1: 5bf45e8e49ba4189e17d482789dfd15bd140b7b6 - /lodash/4.17.2: 34a3055babe04ce42467b607d700072c7ff6bf42 - /lodash/4.17.4: 78203a4d1c328ae1d86dca6460e369b57f4055ae - /longest/1.0.1: 30a0b2da38f73770e8294a0d22e6625ed77d0097 - /lowercase-keys/1.0.0: 4e3366b39e7f5457e35f1324bdf6f88d0bfc7306 - /lru-cache/4.0.2: + dev: true + resolution: + integrity: sha1-5WsXa2gjp93jj38r9Y3n1ZcSAOk= + /lodash.map/4.6.0: + dev: true + resolution: + integrity: sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= + /lodash/3.10.1: + resolution: + integrity: sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y= + /lodash/4.17.2: + dev: true + resolution: + integrity: sha1-NKMFW6vgTOQkZ7YH1wAHLH/2v0I= + /lodash/4.17.4: + dev: true + resolution: + integrity: sha1-eCA6TRwyiuHYbcpkYONptX9AVa4= + /longest/1.0.1: + dev: true + resolution: + integrity: sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc= + /lowercase-keys/1.0.0: + dev: true + resolution: + integrity: sha1-TjNms55/VFfjXxMkvfb4jQv8cwY= + /lru-cache/4.1.1: dependencies: pseudomap: 1.0.2 yallist: 2.1.2 - resolution: 1d17679c069cda5d040991a09dbc2c0db377e55e - /manage-path/2.0.0: f4cf8457b926eeee2a83b173501414bc76eb9597 - /merge/1.2.0: 7531e39d4949c281a66b8c5a6e0265e8b05894da + dev: true + resolution: + integrity: sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew== + /make-dir/1.0.0: + dependencies: + pify: 2.3.0 + dev: true + resolution: + integrity: sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg= + /manage-path/2.0.0: + dev: true + resolution: + integrity: sha1-9M+EV7km7u4qg7FzUBQUvHbrlZc= + /merge/1.2.0: + dev: true + resolution: + integrity: sha1-dTHjnUlJwoGma4xabgJl6LBYlNo= /micromatch/2.3.11: dependencies: arr-diff: 2.0.0 @@ -443,306 +795,549 @@ packages: braces: 1.8.5 expand-brackets: 0.1.5 extglob: 0.3.2 - filename-regex: 2.0.0 + filename-regex: 2.0.1 is-extglob: 1.0.0 is-glob: 2.0.1 - kind-of: 3.1.0 + kind-of: 3.2.2 normalize-path: 2.1.1 object.omit: 2.0.1 parse-glob: 3.0.4 regex-cache: 0.4.3 - resolution: 86677c97d1720b363431d04d0d15293bd38c1565 - /minimatch/3.0.3: + dev: true + resolution: + integrity: sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= + /minimatch/3.0.4: dependencies: - brace-expansion: 1.1.6 - resolution: 2a4e4090b96b2db06a9d7df01055a62a77c9b774 - /minimist/0.0.10: de3f98543dbf96082be48ad1a0c7cda836301dcf - /minimist/0.0.8: 857fcabfc3397d2625b8228262e86aa7a011b05d - /minimist/1.2.0: a35008b20f41383eec1fb914f4cd5df79a264284 - /mkdirp/0.5.1: - dependencies: - minimist: 0.0.8 - resolution: 30057438eac6cf7f8c4767f38648d6697d75c903 - /mute-stream/0.0.6: 48962b19e169fd1dfc240b3f1e7317627bbc47db + brace-expansion: 1.1.8 + dev: true + resolution: + integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + /minimist/0.0.10: + dev: true + resolution: + integrity: sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= + /minimist/1.2.0: + resolution: + integrity: sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + /mute-stream/0.0.6: + dev: true + resolution: + integrity: sha1-SJYrGeFp/R38JAs/HnMXYnu8R9s= /ndjson/1.5.0: dependencies: json-stringify-safe: 5.0.1 minimist: 1.2.0 split2: 2.1.1 through2: 2.0.3 - resolution: ae603b36b134bcec347b452422b0bf98d5832ec8 + resolution: + integrity: sha1-rmA7NrE0vOw0e0UkIrC/mNWDLsg= /normalize-path/2.1.1: dependencies: - remove-trailing-separator: 1.0.1 - resolution: 1ab28b556e198363a8c1a6f7e6fa20137fe6aed9 + remove-trailing-separator: 1.0.2 + dev: true + resolution: + integrity: sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= /npm-run-path/1.0.0: dependencies: path-key: 1.0.0 - resolution: f5c32bf595fe81ae927daec52e82f8b000ac3c8f - /number-is-nan/1.0.1: 097b602b53422a522c1afb8790318336941a011d - /object-assign/4.1.1: 2109adc7965887cfc05cbbd442cac8bfbb360863 + dev: true + resolution: + integrity: sha1-9cMr9ZX+ga6Sfa7FLoL4sACsPI8= + /number-is-nan/1.0.1: + dev: true + resolution: + integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + /object-assign/4.1.1: + dev: true + resolution: + integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= /object.omit/2.0.1: dependencies: for-own: 0.1.5 is-extendable: 0.1.1 - resolution: 1a9c744829f39dbb858c76ca3579ae2a54ebd1fa + dev: true + resolution: + integrity: sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= /observatory/1.0.0: dependencies: ansi-escapes: 1.4.0 chalk: 1.1.3 lodash: 3.10.1 - resolution: 2baa606e8299e6866914ec9c8a4db6a41136e59b + resolution: + integrity: sha1-K6pgboKZ5oZpFOycik22pBE25Zs= /once/1.4.0: dependencies: wrappy: 1.0.2 - resolution: 583b1aa775961d4b113ac17d9c50baef9dd76bd1 - /onetime/1.1.0: a1f7838f8314c516f05ecefcbc4ccfe04b4ed789 + dev: true + resolution: + integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + /onetime/1.1.0: + dev: true + resolution: + integrity: sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= /opt-cli/1.5.1: dependencies: commander: 2.9.0 lodash.clone: 4.3.2 manage-path: 2.0.0 spawn-command: 0.0.2-1 - resolution: 04db447b13c96b992eb31685266f4ed0d9736dc2 + dev: true + resolution: + integrity: sha1-BNtEexPJa5kusxaFJm9O0NlzbcI= /optimist/0.6.1: dependencies: minimist: 0.0.10 wordwrap: 0.0.3 - resolution: da3ea74686fa21a19a111c326e90eb15a0196686 - /os-homedir/1.0.2: ffbc4988336e0e833de0c168c7ef152121aa7fb3 - /os-shim/0.1.3: 6b62c3791cf7909ea35ed46e17658bb417cb3917 - /os-tmpdir/1.0.2: bbe67406c79aa85c5cfec766fe5734555dfa1274 - /package-json/4.0.0: + dev: true + resolution: + integrity: sha1-2j6nRob6IaGaERwybpDrFaAZZoY= + /os-homedir/1.0.2: + dev: true + resolution: + integrity: sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + /os-shim/0.1.3: + dev: true + resolution: + integrity: sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc= + /os-tmpdir/1.0.2: + dev: true + resolution: + integrity: sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + /package-json/4.0.1: dependencies: got: 6.7.1 - registry-auth-token: 3.1.1 + registry-auth-token: 3.3.1 registry-url: 3.1.0 semver: 5.3.0 - resolution: f3c9dc8738f5b59304d54d2cfb3f91d08fdd7998 + dev: true + resolution: + integrity: sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0= /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 - resolution: 6fbc924045d244f2a2a244503060d3bfc6009774 + dev: true + resolution: + integrity: sha1-b7ySQEXSRPKiokRQMGDTv8YAl3Q= /parse-glob/3.0.4: dependencies: glob-base: 0.3.0 - is-dotfile: 1.0.2 + is-dotfile: 1.0.3 is-extglob: 1.0.0 is-glob: 2.0.1 - resolution: b2c376cfb11f35513badd173ef0bb6e3a388391c - /parse-passwd/1.0.0: 6d5b934a456993b23d37f40a382d6f1666a8e5c6 + dev: true + resolution: + integrity: sha1-ssN2z7EfNVE7rdFz7wu246OIORw= + /parse-passwd/1.0.0: + dev: true + resolution: + integrity: sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= /path-exists/2.1.0: dependencies: pinkie-promise: 2.0.1 - resolution: 0feb6c64f0fc518d9a754dd5efb62c7022761f4b - /path-is-absolute/1.0.1: 174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f - /path-key/1.0.0: 5d53d578019646c0d68800db4e146e6bdc2ac7af - /path-parse/1.0.5: 3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1 + dev: true + resolution: + integrity: sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= + /path-is-absolute/1.0.1: + dev: true + resolution: + integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + /path-key/1.0.0: + dev: true + resolution: + integrity: sha1-XVPVeAGWRsDWiADbThRua9wqx68= + /path-parse/1.0.5: + dev: true + resolution: + integrity: sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME= + /pify/2.3.0: + dev: true + resolution: + integrity: sha1-7RQaasBDqEnqWISY59yosVMw6Qw= /pinkie-promise/2.0.1: dependencies: pinkie: 2.0.4 - resolution: 2135d6dfa7a358c069ac9b178776288228450ffa - /pinkie/2.0.4: 72556b80cfa0d48a974e80e77248e80ed4f7f870 + dev: true + resolution: + integrity: sha1-ITXW36ejWMBprJsXh3YogihFD/o= + /pinkie/2.0.4: + dev: true + resolution: + integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= /pnpm-logger/0.3.0: dependencies: bole: 3.0.2 - resolution: eaecea5a037f053a64c50bda7eda3cb87f5ed661 - /prepend-http/1.0.4: d4f4562b0ce3696e41ac52d0e002e57a635dc6dc - /preserve/0.2.0: 815ed1f6ebc65926f865b310c0713bcb3315ce4b - /process-nextick-args/1.0.7: 150e20b756590ad3f91093f25a4f2ad8bff30ba3 - /pseudomap/1.0.2: f052a28da70e618917ef0a8ac34c1ae5a68286b3 - /randomatic/1.1.6: + resolution: + integrity: sha1-6uzqWgN/BTpkxQvafto8uH9e1mE= + /prepend-http/1.0.4: + dev: true + resolution: + integrity: sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= + /preserve/0.2.0: + dev: true + resolution: + integrity: sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= + /process-nextick-args/1.0.7: + resolution: + integrity: sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= + /pseudomap/1.0.2: + dev: true + resolution: + integrity: sha1-8FKijacOYYkX7wqKw0wa5aaChrM= + /randomatic/1.1.7: dependencies: - is-number: 2.1.0 - kind-of: 3.1.0 - resolution: 110dcabff397e9dcff7c0789ccc0a49adf1ec5bb + is-number: 3.0.0 + kind-of: 4.0.0 + dev: true + resolution: + integrity: sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how== /rc/1.2.1: dependencies: - deep-extend: 0.4.1 + deep-extend: 0.4.2 ini: 1.3.4 minimist: 1.2.0 strip-json-comments: 2.0.1 - resolution: 2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95 - /readable-stream/2.2.6: + dev: true + resolution: + integrity: sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU= + /readable-stream/2.3.3: dependencies: - buffer-shims: 1.0.0 core-util-is: 1.0.2 inherits: 2.0.3 isarray: 1.0.0 process-nextick-args: 1.0.7 - string_decoder: 0.10.31 + safe-buffer: 5.1.1 + string_decoder: 1.0.3 util-deprecate: 1.0.2 - resolution: 8b43aed76e71483938d12a8d46c6cf1a00b1f816 + resolution: + integrity: sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== /rechoir/0.6.2: dependencies: - resolve: 1.3.2 - resolution: 85204b54dba82d5742e28c96756ef43af50e3384 - /regenerator-runtime/0.10.3: 8c4367a904b51ea62a908ac310bf99ff90a82a3e + resolve: 1.3.3 + dev: true + resolution: + integrity: sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= + /regenerator-runtime/0.10.5: + resolution: + integrity: sha1-M2w+/BIgrc7dosn6tntaeVWjNlg= /regex-cache/0.4.3: dependencies: is-equal-shallow: 0.1.3 is-primitive: 2.0.0 - resolution: 9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145 - /registry-auth-token/3.1.1: + dev: true + resolution: + integrity: sha1-mxpsNdTQ3871cRrmUejp09cRQUU= + /registry-auth-token/3.3.1: dependencies: rc: 1.2.1 - resolution: 1b93317b42527732f56f88c41b73b7bf855e05a5 + safe-buffer: 5.1.1 + dev: true + resolution: + integrity: sha1-+w0yie4Nmtosu1KvXf5mywcNMAY= /registry-url/3.1.0: dependencies: rc: 1.2.1 - resolution: 3d4ef870f73dde1d77f0cf9a381432444e174942 - /remove-trailing-separator/1.0.1: 615ebb96af559552d4bf4057c8436d486ab63cc4 - /repeat-element/1.1.2: ef089a178d1483baae4d93eb98b4f9e4e11d990a - /repeat-string/1.6.1: 8dcae470e1c88abc2d600fff4a776286da75e637 + dev: true + resolution: + integrity: sha1-PU74cPc93h138M+aOBQyRE4XSUI= + /remove-trailing-separator/1.0.2: + dev: true + resolution: + integrity: sha1-abBi2XhyetFNxrVrpKt3L9jXBRE= + /repeat-element/1.1.2: + dev: true + resolution: + integrity: sha1-7wiaF40Ug7quTZPrmLT55OEdmQo= + /repeat-string/1.6.1: + dev: true + resolution: + integrity: sha1-jcrkcOHIirwtYA//Sndihtp15jc= /repeating/2.0.1: dependencies: is-finite: 1.0.2 - resolution: 5214c53a926d3552707527fbab415dbc08d06dda + dev: true + resolution: + integrity: sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= /resolve-dir/0.1.1: dependencies: expand-tilde: 1.2.2 global-modules: 0.2.3 - resolution: b219259a5602fac5c5c496ad894a6e8cc430261e - /resolve/1.3.2: + dev: true + resolution: + integrity: sha1-shklmlYC+sXFxJatiUpujMQwJh4= + /resolve/1.3.3: dependencies: path-parse: 1.0.5 - resolution: 1f0442c9e0cbb8136e87b9305f932f46c7f28235 + dev: true + resolution: + integrity: sha1-ZVkHw0aahoDcLeOidaj91paR8OU= /restore-cursor/1.0.1: dependencies: exit-hook: 1.1.1 onetime: 1.1.0 - resolution: 34661f46886327fed2991479152252df92daa541 - /right-pad/1.0.1: 8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0 + dev: true + resolution: + integrity: sha1-NGYfRohjJ/7SmRR5FSJS35LapUE= + /right-pad/1.0.1: + dev: true + resolution: + integrity: sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA= /rimraf/2.6.1: dependencies: - glob: 7.1.1 - resolution: c2338ec643df7a1b7fe5c54fa86f57428a55f33d + glob: 7.1.2 + dev: true + resolution: + integrity: sha1-wjOOxkPfeht/5cVPqG9XQopV8z0= /run-async/2.3.0: dependencies: is-promise: 2.1.0 - resolution: 0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0 - /rx/4.1.0: a5f13ff79ef3b740fe30aa803fb09f98805d4782 - /safe-buffer/5.0.1: d263ca54696cd8a306b5ca6551e92de57918fbe7 + dev: true + resolution: + integrity: sha1-A3GrSuC91yDUFm19/aZP96RFpsA= + /rx/4.1.0: + dev: true + resolution: + integrity: sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= + /safe-buffer/5.1.1: + resolution: + integrity: sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== /semver-diff/2.1.0: dependencies: semver: 5.3.0 - resolution: 4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36 - /semver-regex/1.0.0: 92a4969065f9c70c694753d55248fc68f8f652c9 - /semver/5.3.0: 9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f + dev: true + resolution: + integrity: sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY= + /semver-regex/1.0.0: + dev: true + resolution: + integrity: sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk= + /semver/5.3.0: + dev: true + resolution: + integrity: sha1-myzl094C0XxgEq0yaqa00M9U+U8= /shelljs/0.7.6: dependencies: - glob: 7.1.1 - interpret: 1.0.2 + glob: 7.1.2 + interpret: 1.0.3 rechoir: 0.6.2 - resolution: 379cccfb56b91c8601e4793356eb5382924de9ad - /slide/1.1.6: 56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707 - /spawn-command/0.0.2: 9544e1a43ca045f8531aac1a48cb29bdae62338e - /spawn-command/0.0.2-1: 62f5e9466981c1b796dc5929937e11c9c6921bd0 + dev: true + resolution: + integrity: sha1-N5zM+1a5HIYB5HkzVutTgpJN6a0= + /slide/1.1.6: + dev: true + resolution: + integrity: sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= + /spawn-command/0.0.2: + dev: true + resolution: + integrity: sha1-lUThpDygRfhTGqwaSMspva5iM44= + /spawn-command/0.0.2-1: + dev: true + resolution: + integrity: sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A= /spawn-sync/1.0.15: dependencies: concat-stream: 1.6.0 os-shim: 0.1.3 - resolution: b00799557eb7fb0c8376c29d44e8a1ea67e57476 + dev: true + resolution: + integrity: sha1-sAeZVX63+wyDdsKdROih6mfldHY= /split2/2.1.1: dependencies: through2: 2.0.3 - resolution: 7a1f551e176a90ecd3345f7246a0cfe175ef4fd0 + resolution: + integrity: sha1-eh9VHhdqkOzTNF9yRqDP4XXvT9A= /string-width/1.0.2: dependencies: code-point-at: 1.1.0 is-fullwidth-code-point: 1.0.0 strip-ansi: 3.0.1 - resolution: 118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3 - /string-width/2.0.0: + dev: true + resolution: + integrity: sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + /string-width/2.1.0: dependencies: is-fullwidth-code-point: 2.0.0 - strip-ansi: 3.0.1 - resolution: 635c5436cc72a6e0c387ceca278d4e2eec52687e - /string_decoder/0.10.31: 62e203bc41766c6c28c9fc84301dab1c5310fa94 + strip-ansi: 4.0.0 + dev: true + resolution: + integrity: sha1-AwZkVh/BRslCPsfZeP4kV0N/5tA= + /string_decoder/1.0.3: + dependencies: + safe-buffer: 5.1.1 + resolution: + integrity: sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== /strip-ansi/3.0.1: dependencies: ansi-regex: 2.1.1 - resolution: 6a385fb8853d952d5ff05d0e8aaf94278dc63dcf - /strip-eof/1.0.0: bb43ff5598a6eb05d89b59fcd129c983313606bf - /strip-json-comments/2.0.1: 3c531942e908c2697c0ec344858c286c7ca0a60a - /supports-color/2.0.0: 535d045ce6b6363fa40117084629995e9df324c7 + resolution: + integrity: sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + /strip-ansi/4.0.0: + dependencies: + ansi-regex: 3.0.0 + dev: true + resolution: + integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8= + /strip-eof/1.0.0: + dev: true + resolution: + integrity: sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + /strip-json-comments/2.0.1: + dev: true + resolution: + integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= + /supports-color/2.0.0: + resolution: + integrity: sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= /term-size/0.1.1: dependencies: execa: 0.4.0 - resolution: 87360b96396cab5760963714cda0d0cbeecad9ca - /through/2.3.8: 0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5 + dev: true + resolution: + integrity: sha1-hzYLljlsq1dgljcUzaDQy+7K2co= + /through/2.3.8: + dev: true + resolution: + integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= /through2/2.0.3: dependencies: - readable-stream: 2.2.6 + readable-stream: 2.3.3 xtend: 4.0.1 - resolution: 0004569b37c7c74ba39c43f3ced78d1ad94140be - /timed-out/4.0.1: f32eacac5a175bea25d7fab565ab3ed8741ef56f + resolution: + integrity: sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= + /timed-out/4.0.1: + dev: true + resolution: + integrity: sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= /tmp/0.0.29: dependencies: os-tmpdir: 1.0.2 - resolution: f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0 + dev: true + resolution: + integrity: sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA= /tslint/4.5.1: dependencies: babel-code-frame: 6.22.0 colors: 1.1.2 diff: 3.2.0 findup-sync: 0.3.0 - glob: 7.1.1 + glob: 7.1.2 optimist: 0.6.1 - resolve: 1.3.2 - tsutils: 1.6.0 - update-notifier: 2.1.0 - resolution: 05356871bef23a434906734006fc188336ba824b - /tsutils/1.6.0: 1fd7fac2a61369ed99cd3997f0fbb437128850f2 - /typedarray/0.0.6: 867ac74e3864187b1d3d47d996a78ec5c8830777 - /typescript/2.2.2: 606022508479b55ffa368b58fee963a03dfd7b0c + resolve: 1.3.3 + tsutils: 1.9.1 + update-notifier: 2.2.0 + dev: true + resolution: + integrity: sha1-BTVocb7yOkNJBnNABvwYgza6gks= + /tsutils/1.9.1: + dev: true + resolution: + integrity: sha1-ufmrROVa+WgYMdXyjQrur1x1DLA= + /typedarray/0.0.6: + dev: true + resolution: + integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + /typescript/2.4.1: + dev: true + resolution: + integrity: sha1-w8yxbdqgsjFN4DHn5v7onlujRrw= /unique-string/1.0.0: dependencies: crypto-random-string: 1.0.0 - resolution: 9e1057cca851abb93398f8b33ae187b99caec11a - /unzip-response/2.0.1: d2f0f737d16b0615e72a6935ed04214572d56f97 - /update-notifier/2.1.0: + dev: true + resolution: + integrity: sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo= + /unzip-response/2.0.1: + dev: true + resolution: + integrity: sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c= + /update-notifier/2.2.0: dependencies: - boxen: 1.0.0 + boxen: 1.1.0 chalk: 1.1.3 - configstore: 3.0.0 + configstore: 3.1.0 + import-lazy: 2.1.0 is-npm: 1.0.0 latest-version: 3.1.0 - lazy-req: 2.0.0 semver-diff: 2.1.0 xdg-basedir: 3.0.0 - resolution: ec0c1e53536b76647a24b77cb83966d9315123d9 + dev: true + resolution: + integrity: sha1-G1g3z5DAc22IYncytmHBOPht5y8= /url-parse-lax/1.0.0: dependencies: prepend-http: 1.0.4 - resolution: 7af8f303645e9bd79a272e7a14ac68bc0609da73 - /util-deprecate/1.0.2: 450d4dc9fa70de732762fbd2d4a28981419a0ccf - /validate-commit-msg/2.12.1: + dev: true + resolution: + integrity: sha1-evjzA2Rem9eaJy56FKxovAYJ2nM= + /util-deprecate/1.0.2: + resolution: + integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + /validate-commit-msg/2.12.2: dependencies: conventional-commit-types: 2.1.0 find-parent-dir: 0.3.0 findup: 0.1.5 semver-regex: 1.0.0 - resolution: 612b61bc9f09f0fee5130de3648870d01cdddf1d + dev: true + resolution: + integrity: sha1-bVAVMxvxlsIq+4gNPzO87x3q/qY= /which/1.2.14: dependencies: isexe: 2.0.0 - resolution: 9a87c4378f03e827cecaf1acdf56c736c01c14e5 + dev: true + resolution: + integrity: sha1-mofEN48D6CfOyvGs31bHNsAcFOU= /widest-line/1.0.0: dependencies: string-width: 1.0.2 - resolution: 0c09c85c2a94683d0d7eaf8ee097d564bf0e105c - /word-wrap/1.2.1: 248f459b465d179a17bc407c854d3151d07e45d8 - /wordwrap/0.0.3: a3d5da6cd5c0bc0008d37234bbaf1bed63059107 - /wrappy/1.0.2: b5243d8f3ec1aa35f1364605bc0d1036e30ab69f - /write-file-atomic/1.3.1: + dev: true + resolution: + integrity: sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw= + /word-wrap/1.2.3: + dev: true + resolution: + integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + /wordwrap/0.0.3: + dev: true + resolution: + integrity: sha1-o9XabNXAvAAI03I0u68b7WMFkQc= + /wrappy/1.0.2: + dev: true + resolution: + integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + /write-file-atomic/2.1.0: dependencies: graceful-fs: 4.1.11 imurmurhash: 0.1.4 slide: 1.1.6 - resolution: 7d45ba32316328dd1ec7d90f60ebc0d845bb759a - /xdg-basedir/3.0.0: 496b2cc109eca8dbacfe2dc72b603c17c5870ad4 - /xtend/4.0.1: a5c6d532be656e23db820efb943a1f04998d63af - /yallist/2.1.2: 1c11f9218f076089a47dd512f93c6699a6a81d52 + dev: true + resolution: + integrity: sha512-0TZ20a+xcIl4u0+Mj5xDH2yOWdmQiXlKf9Hm+TgDXjTMsEYb+gDrmb8e8UNAzMCitX8NBqG4Z/FUQIyzv/R1JQ== + /xdg-basedir/3.0.0: + dev: true + resolution: + integrity: sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= + /xtend/4.0.1: + resolution: + integrity: sha1-pcbVMr5lbiPbgg77lDofBJmNY68= + /yallist/2.1.2: + dev: true + resolution: + integrity: sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= registry: 'https://registry.npmjs.org/' -version: 2 +shrinkwrapVersion: 3 +specifiers: + '@types/chalk': ^0.4.31 + '@types/common-tags': ^1.2.5 + '@types/node': ^7.0.0 + chalk: ^1.1.3 + commitizen: ^2.9.5 + common-tags: ^1.4.0 + ghooks: ^2.0.0 + ndjson: ^1.5.0 + observatory: ^1.0.0 + pnpm-logger: ^0.3.0 + rimraf: ^2.5.4 + tslint: ^4.3.1 + typescript: ^2.1.5 + validate-commit-msg: ^2.8.2 From 04ad30fac88a27a8320c67147548cec00c72eee1 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 1 Jul 2017 13:46:32 +0300 Subject: [PATCH 033/196] feat: show overall progress instead of logging of each package --- package.json | 4 +- shrinkwrap.yaml | 61 +++++++++++++------- src/index.ts | 130 +++++++++++------------------------------- src/reportError.ts | 16 +++--- src/terminalWriter.ts | 19 ++++++ typings/local.d.ts | 2 +- 6 files changed, 103 insertions(+), 129 deletions(-) create mode 100644 src/terminalWriter.ts diff --git a/package.json b/package.json index 42c41403af..cf6da1d8f2 100644 --- a/package.json +++ b/package.json @@ -32,9 +32,9 @@ "@types/node": "^7.0.0", "chalk": "^1.1.3", "common-tags": "^1.4.0", + "log-update": "^2.0.0", "ndjson": "^1.5.0", - "observatory": "^1.0.0", - "pnpm-logger": "^0.3.0" + "pnpm-logger": "^0.4.0" }, "devDependencies": { "commitizen": "^2.9.5", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 0e1f5e3d2d..598f702229 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -4,9 +4,9 @@ dependencies: '@types/node': 7.0.33 chalk: 1.1.3 common-tags: 1.4.0 + log-update: 2.0.0 ndjson: 1.5.0 - observatory: 1.0.0 - pnpm-logger: 0.3.0 + pnpm-logger: 0.4.0 devDependencies: commitizen: 2.9.6 ghooks: 2.0.0 @@ -141,12 +141,16 @@ packages: dev: true resolution: integrity: sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc= + /cli-cursor/2.1.0: + dependencies: + restore-cursor: 2.0.0 + resolution: + integrity: sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= /cli-width/2.1.0: dev: true resolution: integrity: sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao= /code-point-at/1.1.0: - dev: true resolution: integrity: sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= /colors/0.6.2: @@ -623,7 +627,6 @@ packages: /is-fullwidth-code-point/1.0.0: dependencies: number-is-nan: 1.0.1 - dev: true resolution: integrity: sha1-754xOG8DGn8NZDr4L95QxFfvAMs= /is-fullwidth-code-point/2.0.0: @@ -748,9 +751,6 @@ packages: dev: true resolution: integrity: sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= - /lodash/3.10.1: - resolution: - integrity: sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y= /lodash/4.17.2: dev: true resolution: @@ -759,6 +759,13 @@ packages: dev: true resolution: integrity: sha1-eCA6TRwyiuHYbcpkYONptX9AVa4= + /log-update/2.0.0: + dependencies: + ansi-escapes: 1.4.0 + cli-cursor: 2.1.0 + wrap-ansi: 2.1.0 + resolution: + integrity: sha1-f0NU174b5ityT8uzxLlEVMDbXiY= /longest/1.0.1: dev: true resolution: @@ -806,6 +813,9 @@ packages: dev: true resolution: integrity: sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= + /mimic-fn/1.1.0: + resolution: + integrity: sha1-5md4PZLonb00KBi1IwudYqZyrRg= /minimatch/3.0.4: dependencies: brace-expansion: 1.1.8 @@ -844,7 +854,6 @@ packages: resolution: integrity: sha1-9cMr9ZX+ga6Sfa7FLoL4sACsPI8= /number-is-nan/1.0.1: - dev: true resolution: integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= /object-assign/4.1.1: @@ -858,13 +867,6 @@ packages: dev: true resolution: integrity: sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= - /observatory/1.0.0: - dependencies: - ansi-escapes: 1.4.0 - chalk: 1.1.3 - lodash: 3.10.1 - resolution: - integrity: sha1-K6pgboKZ5oZpFOycik22pBE25Zs= /once/1.4.0: dependencies: wrappy: 1.0.2 @@ -875,6 +877,11 @@ packages: dev: true resolution: integrity: sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= + /onetime/2.0.1: + dependencies: + mimic-fn: 1.1.0 + resolution: + integrity: sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= /opt-cli/1.5.1: dependencies: commander: 2.9.0 @@ -963,11 +970,11 @@ packages: dev: true resolution: integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - /pnpm-logger/0.3.0: + /pnpm-logger/0.4.0: dependencies: bole: 3.0.2 resolution: - integrity: sha1-6uzqWgN/BTpkxQvafto8uH9e1mE= + integrity: sha1-nHQPGm58hOypD01B5NEr0WuYtjI= /prepend-http/1.0.4: dev: true resolution: @@ -1077,6 +1084,12 @@ packages: dev: true resolution: integrity: sha1-NGYfRohjJ/7SmRR5FSJS35LapUE= + /restore-cursor/2.0.0: + dependencies: + onetime: 2.0.1 + signal-exit: 3.0.2 + resolution: + integrity: sha1-n37ih/gv0ybU/RYpI9YhKe7g368= /right-pad/1.0.1: dev: true resolution: @@ -1122,6 +1135,9 @@ packages: dev: true resolution: integrity: sha1-N5zM+1a5HIYB5HkzVutTgpJN6a0= + /signal-exit/3.0.2: + resolution: + integrity: sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= /slide/1.1.6: dev: true resolution: @@ -1151,7 +1167,6 @@ packages: code-point-at: 1.1.0 is-fullwidth-code-point: 1.0.0 strip-ansi: 3.0.1 - dev: true resolution: integrity: sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= /string-width/2.1.0: @@ -1301,6 +1316,12 @@ packages: dev: true resolution: integrity: sha1-o9XabNXAvAAI03I0u68b7WMFkQc= + /wrap-ansi/2.1.0: + dependencies: + string-width: 1.0.2 + strip-ansi: 3.0.1 + resolution: + integrity: sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= /wrappy/1.0.2: dev: true resolution: @@ -1334,9 +1355,9 @@ specifiers: commitizen: ^2.9.5 common-tags: ^1.4.0 ghooks: ^2.0.0 + log-update: ^2.0.0 ndjson: ^1.5.0 - observatory: ^1.0.0 - pnpm-logger: ^0.3.0 + pnpm-logger: ^0.4.0 rimraf: ^2.5.4 tslint: ^4.3.1 typescript: ^2.1.5 diff --git a/src/index.ts b/src/index.ts index 9f943a4984..2f5a471b72 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,5 @@ import chalk = require('chalk') -import observatory = require('observatory') +import * as terminalWriter from './terminalWriter' import { ProgressLog, LifecycleLog, @@ -8,27 +8,20 @@ import { } from 'pnpm-logger' import reportError from './reportError' -observatory.settings({ prefix: ' ', width: 74 }) - export default function (streamParser: Object) { - const tasks = {} - - function getTask (pkgRawSpec: string, pkgName: string) { - const taskId = `${pkgName}/${pkgRawSpec}` - if (tasks[taskId]) return tasks[taskId] - const task = observatory.add( - (pkgName ? (pkgName + ' ') : '') + - chalk.gray(pkgRawSpec || '')) - task.status(chalk.gray('·')) - tasks[taskId] = task - return task - } + let resolutionDone = false streamParser['on']('data', (obj: Log) => { switch (obj.name) { case 'pnpm:progress': reportProgress(obj) return + case 'pnpm:stage': + if (obj['message'] === 'resolution_done') { + resolutionDone = true + updateProgress() + } + return case 'pnpm:lifecycle': reportLifecycle(obj) return @@ -51,108 +44,49 @@ export default function (streamParser: Object) { reportError(obj) return } - observatory.add(obj['message']) + terminalWriter.write(obj['message']) return } }) - const taskByPkgId = {} - const pkgVersionByPkgId = {} + let resolving = 0 + let fetched = 0 + let foundInStore = 0 function reportProgress (logObj: ProgressLog) { - let task - let pkgVersion = pkgVersionByPkgId[logObj['pkgId']] switch (logObj.status) { - case 'fetching': - case 'fetched': - case 'installed': - case 'dependencies_installed': - task = taskByPkgId[logObj.pkgId] + case 'resolving_content': + resolving++ break - case 'resolving': - case 'error': - case 'installing': - case 'resolved': - // log statuses of the top dependencies only - if (logObj.pkg && logObj.pkg.dependentId) break - - task = getTask(logObj.pkg.rawSpec, logObj.pkg.name) - - if (logObj.status === 'resolved' && logObj.pkgId) { - taskByPkgId[logObj.pkgId] = task - } + case 'found_in_store': + foundInStore++; + break + case 'fetched': + fetched++; break default: - if (logObj.status === 'downloaded_manifest') { - pkgVersionByPkgId[logObj.pkgId] = logObj.pkgVersion - } return } + updateProgress() + } - if (!task) return - - switch (logObj.status) { - case 'installing': - task.status(chalk.gray('queued ↓')) - return - case 'resolving': - task.status(chalk.yellow('finding ·')) - return - case 'resolved': - if (pkgVersion) { - task.status(chalk.yellow('installing ' + pkgVersion + ' .')) - return - } - task.status(chalk.yellow('installing .')) - return - case 'fetched': - if (pkgVersion) { - task.status(chalk.yellow('installing dependencies ' + pkgVersion + ' .')) - return - } - task.status(chalk.yellow('installing dependencies .')) - return - case 'fetching': - if (pkgVersion) { - task.status(chalk.yellow('downloading ' + pkgVersion + ' ↓')) - } else { - task.status(chalk.yellow('downloading ↓')) - } - if (logObj.progress && logObj.progress.total && logObj.progress.done < logObj.progress.total) { - task.details('' + Math.round(logObj.progress.done / logObj.progress.total * 100) + '%') - } else { - task.details('') - } - return - case 'dependencies_installed': - if (pkgVersion) { - task.status(chalk.yellow('linking ' + pkgVersion + ' ↓')) - return - } - task.status(chalk.yellow('linking ↓')) - return - case 'installed': - if (pkgVersion) { - task.status(chalk.green('' + pkgVersion + ' ✓')) - .details('') - return - } - task.status(chalk.green('OK ✓')).details('') - return - case 'error': - task.status(chalk.red('ERROR ✗')) - .details('') - return + function updateProgress() { + const msg = `Resolving: total ${resolving}, reused ${foundInStore}, downloaded ${fetched}` + if (resolving === foundInStore + fetched && resolutionDone) { + terminalWriter.fixedWrite(`${msg}, done`) + terminalWriter.done() + } else { + terminalWriter.fixedWrite(msg) } } } function reportLifecycle (logObj: LifecycleLog) { if (logObj.level === 'error') { - observatory.add(`${chalk.blue(logObj.pkgId)}! ${chalk.gray(logObj.line)}`) + terminalWriter.write(`${chalk.blue(logObj.pkgId)}! ${chalk.gray(logObj.line)}`) return } - observatory.add(`${chalk.blue(logObj.pkgId)} ${chalk.gray(logObj.line)}`) + terminalWriter.write(`${chalk.blue(logObj.pkgId)} ${chalk.gray(logObj.line)}`) } function reportInstallCheck (logObj: InstallCheckLog) { @@ -161,11 +95,11 @@ function reportInstallCheck (logObj: InstallCheckLog) { printWarn(`Unsupported system. Skipping dependency ${logObj.pkgId}`) break case 'ENOTSUP': - observatory.add(logObj) + terminalWriter.write(logObj.toString()) break } } function printWarn (message: string) { - observatory.add(`${chalk.yellow('WARN')} ${message}`) + terminalWriter.write(`${chalk.yellow('WARN')} ${message}`) } diff --git a/src/reportError.ts b/src/reportError.ts index cc9c7d9fe1..42f099e30d 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -2,7 +2,7 @@ import chalk = require('chalk') import {Log} from 'pnpm-logger' import commonTags = require('common-tags') import os = require('os') -import observatory = require('observatory') +import * as terminalWriter from './terminalWriter' const stripIndent = commonTags.stripIndent const EOL = os.EOL @@ -29,15 +29,15 @@ export default function reportError (logObj: Log) { reportShrinkwrapBreakingChange(err, logObj['message']) return default: - observatory.add(formatErrorSummary(err.message || logObj['message'])) + terminalWriter.write(formatErrorSummary(err.message || logObj['message'])) return } } - observatory.add(formatErrorSummary(logObj['message'])) + terminalWriter.write(formatErrorSummary(logObj['message'])) } function reportUnexpectedStore (err: Error, msg: Object) { - observatory.add(stripIndent` + terminalWriter.write(stripIndent` ${formatErrorSummary(err.message)} expected: ${highlight(msg['expectedStorePath'])} @@ -60,7 +60,7 @@ function reportStoreBreakingChange (err: Error, msg: Object) { } output += formatRelatedSources(msg) - observatory.add(output) + terminalWriter.write(output) } function reportModulesBreakingChange (err: Error, msg: Object) { @@ -76,7 +76,7 @@ function reportModulesBreakingChange (err: Error, msg: Object) { } output += formatRelatedSources(msg) - observatory.add(output) + terminalWriter.write(output) } function formatRelatedSources (msg: Object) { @@ -102,7 +102,7 @@ function formatErrorSummary (message: string) { } function reportModifiedDependency (err: Error, msg: Object) { - observatory.add(stripIndent` + terminalWriter.write(stripIndent` ${formatErrorSummary('Packages in the store have been mutated')} These packages are modified: @@ -113,7 +113,7 @@ function reportModifiedDependency (err: Error, msg: Object) { } function reportShrinkwrapBreakingChange (err: Error, msg: Object) { - observatory.add(stripIndent` + terminalWriter.write(stripIndent` ${formatErrorSummary(err.message)} Run with the ${highlight('--force')} parameter to recreate the shrinkwrap file. diff --git a/src/terminalWriter.ts b/src/terminalWriter.ts new file mode 100644 index 0000000000..afb2d39b4d --- /dev/null +++ b/src/terminalWriter.ts @@ -0,0 +1,19 @@ +import logUpdate = require('log-update') + +let fixed: string | null + +export function write (line: string) { + logUpdate(line) + logUpdate.done() + if (fixed) logUpdate(fixed) +} + +export function fixedWrite (line: string) { + fixed = line + logUpdate(line) +} + +export function done () { + fixed = null + logUpdate.done() +} diff --git a/typings/local.d.ts b/typings/local.d.ts index 71733fbb68..2f3fd9838c 100644 --- a/typings/local.d.ts +++ b/typings/local.d.ts @@ -1,4 +1,4 @@ -declare module 'observatory' { +declare module 'log-update' { const anything: any; export = anything; } From fd02617916af2463e6f6b8a3206ab2543c124ff7 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 1 Jul 2017 13:48:11 +0300 Subject: [PATCH 034/196] chore(npmrc): use custom publish commit message and tag --- .npmrc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000000..364c902fd6 --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +tag-version-prefix = pnpm-default-reporter/ +message = chore: release %s From 3bd9f1a0c7ef1b4f0026e5db71a33ababa3893f6 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 1 Jul 2017 18:14:02 +0300 Subject: [PATCH 035/196] chore: release 0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cf6da1d8f2..d5455ca279 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.6.0", + "version": "0.7.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From b132679ce3460906287905b02d00a3b0cef935ee Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 8 Jul 2017 21:20:54 +0300 Subject: [PATCH 036/196] feat: print summary of added/removed root packages --- src/index.ts | 38 ++++++++++++++++++++++++++++++++++++++ tslint.json | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 2f5a471b72..212e6072b9 100644 --- a/src/index.ts +++ b/src/index.ts @@ -7,9 +7,16 @@ import { InstallCheckLog, } from 'pnpm-logger' import reportError from './reportError' +import os = require('os') + +const EOL = os.EOL + +const addedSign = chalk.green('+') +const removedSign = chalk.red('-') export default function (streamParser: Object) { let resolutionDone = false + let pkgsDiff: {name: string, version?: string, added: boolean}[] = [] streamParser['on']('data', (obj: Log) => { switch (obj.name) { @@ -33,6 +40,37 @@ export default function (streamParser: Object) { printWarn(obj['message']) } return + case 'pnpm:root': + if (obj['added']) { + pkgsDiff.push({ + name: obj['added'].name, + version: obj['added'].version, + added: true, + }) + return + } + if (obj['removed']) { + pkgsDiff.push({ + name: obj['removed'].name, + version: obj['removed'].version, + added: false, + }) + return + } + return + case 'pnpm:summary': + pkgsDiff.sort((a, b) => (a.name.localeCompare(b.name) + (Number(!b.added) - Number(!a.added)))) + const msg = pkgsDiff.map(pkg => { + let result = pkg.added ? addedSign : removedSign + result += ` ${pkg.name}` + if (pkg.version) { + result += ` ${chalk.grey(pkg.version)}` + } + return result + }).join(EOL) + if (!msg) return + terminalWriter.write(`${EOL}${msg}`) + return default: if (obj.level === 'debug') return if (obj.name !== 'pnpm' && obj.name.indexOf('pnpm:') !== 0) return diff --git a/tslint.json b/tslint.json index 7891ff2b2c..da373b90fd 100644 --- a/tslint.json +++ b/tslint.json @@ -6,7 +6,7 @@ "class-name": true, "indent": [true, "spaces"], "max-line-length": false, - "no-any": true, + "no-any": false, "no-consecutive-blank-lines": true, "no-trailing-whitespace": true, "no-duplicate-variable": true, From 22f8d1aec1c4898a11bcd1955e0c4665da2ab75f Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 8 Jul 2017 21:22:57 +0300 Subject: [PATCH 037/196] chore: release 0.7.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d5455ca279..cde6112343 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.7.0", + "version": "0.7.1", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From ec653d8077e2875dbd2b2205d248be1184d2f89d Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 8 Jul 2017 21:24:39 +0300 Subject: [PATCH 038/196] chore: change prepublish to prepublishOnly --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cde6112343..92951abd7e 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "scripts": { "test": "tslint -c tslint.json --project .", "tsc": "rimraf lib && tsc", - "prepublish": "npm run tsc" + "prepublishOnly": "npm run tsc" }, "repository": { "type": "git", From 7698abeea8c4c55ae8e2662a4198787c61942f7c Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 8 Jul 2017 22:10:05 +0300 Subject: [PATCH 039/196] fix: alphabetical sorting has priority in packages summary order --- src/index.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 212e6072b9..6226611b65 100644 --- a/src/index.ts +++ b/src/index.ts @@ -59,7 +59,11 @@ export default function (streamParser: Object) { } return case 'pnpm:summary': - pkgsDiff.sort((a, b) => (a.name.localeCompare(b.name) + (Number(!b.added) - Number(!a.added)))) + // Sorts by alphabet then by removed/added + // + ava 0.10.0 + // - chalk 1.0.0 + // + chalk 2.0.0 + pkgsDiff.sort((a, b) => (a.name.localeCompare(b.name) * 10 + (Number(!b.added) - Number(!a.added)))) const msg = pkgsDiff.map(pkg => { let result = pkg.added ? addedSign : removedSign result += ` ${pkg.name}` From b180577a111e8c6169ac0507c186ad07e6895c20 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 8 Jul 2017 22:10:38 +0300 Subject: [PATCH 040/196] chore: release 0.7.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92951abd7e..242116b1e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.7.1", + "version": "0.7.2", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 3decb9bfb14b82ecf4a35a53def1c1ce1a52638e Mon Sep 17 00:00:00 2001 From: zkochan Date: Tue, 11 Jul 2017 22:30:04 +0300 Subject: [PATCH 041/196] feat: report deprecation warnings --- package.json | 2 +- shrinkwrap.yaml | 8 ++++---- src/index.ts | 24 ++++++++++++++++-------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 242116b1e8..f8861ba394 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "common-tags": "^1.4.0", "log-update": "^2.0.0", "ndjson": "^1.5.0", - "pnpm-logger": "^0.4.0" + "pnpm-logger": "^0.5.0" }, "devDependencies": { "commitizen": "^2.9.5", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 598f702229..851db7054e 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -6,7 +6,7 @@ dependencies: common-tags: 1.4.0 log-update: 2.0.0 ndjson: 1.5.0 - pnpm-logger: 0.4.0 + pnpm-logger: 0.5.0 devDependencies: commitizen: 2.9.6 ghooks: 2.0.0 @@ -970,11 +970,11 @@ packages: dev: true resolution: integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - /pnpm-logger/0.4.0: + /pnpm-logger/0.5.0: dependencies: bole: 3.0.2 resolution: - integrity: sha1-nHQPGm58hOypD01B5NEr0WuYtjI= + integrity: sha512-J5n4RJ3eW3Yt1yCWB43yUna0j8TYyqh1SGu8ffk9SBjUXS7zIGwi9C2zwNqNZIou4jvaQ1+dAc5RPE/U/eJLoQ== /prepend-http/1.0.4: dev: true resolution: @@ -1357,7 +1357,7 @@ specifiers: ghooks: ^2.0.0 log-update: ^2.0.0 ndjson: ^1.5.0 - pnpm-logger: ^0.4.0 + pnpm-logger: ^0.5.0 rimraf: ^2.5.4 tslint: ^4.3.1 typescript: ^2.1.5 diff --git a/src/index.ts b/src/index.ts index 6226611b65..8c97487de4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -16,28 +16,29 @@ const removedSign = chalk.red('-') export default function (streamParser: Object) { let resolutionDone = false - let pkgsDiff: {name: string, version?: string, added: boolean}[] = [] + let pkgsDiff: {name: string, version?: string, added: boolean, deprecated?: boolean}[] = [] + const deprecated = {} streamParser['on']('data', (obj: Log) => { switch (obj.name) { case 'pnpm:progress': - reportProgress(obj) + reportProgress(obj) return case 'pnpm:stage': - if (obj['message'] === 'resolution_done') { + if (obj.message === 'resolution_done') { resolutionDone = true updateProgress() } return case 'pnpm:lifecycle': - reportLifecycle(obj) + reportLifecycle(obj) return case 'pnpm:install-check': - reportInstallCheck(obj) + reportInstallCheck(obj) return case 'pnpm:registry': if (obj.level === 'warn') { - printWarn(obj['message']) + printWarn(obj.message) } return case 'pnpm:root': @@ -45,6 +46,7 @@ export default function (streamParser: Object) { pkgsDiff.push({ name: obj['added'].name, version: obj['added'].version, + deprecated: !!deprecated[obj['added'].id], added: true, }) return @@ -70,14 +72,20 @@ export default function (streamParser: Object) { if (pkg.version) { result += ` ${chalk.grey(pkg.version)}` } + if (pkg.deprecated) { + result += ` ${chalk.red('deprecated')}` + } return result }).join(EOL) if (!msg) return terminalWriter.write(`${EOL}${msg}`) return - default: + case 'pnpm:deprecation': + deprecated[obj.pkgId] = obj['deprecated'] + printWarn(`${chalk.red('deprecated')} ${obj['pkgName']}@${obj['pkgVersion']}: ${obj['deprecated']}`) + return + case 'pnpm': if (obj.level === 'debug') return - if (obj.name !== 'pnpm' && obj.name.indexOf('pnpm:') !== 0) return if (obj.level === 'warn') { printWarn(obj['message']) return From 8ecf23e83bcc211cb9c18805a9f5f433f3028579 Mon Sep 17 00:00:00 2001 From: zkochan Date: Tue, 11 Jul 2017 22:39:37 +0300 Subject: [PATCH 042/196] chore(npmrc): change the release commit message format --- .npmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.npmrc b/.npmrc index 364c902fd6..a8f757884b 100644 --- a/.npmrc +++ b/.npmrc @@ -1,2 +1,2 @@ tag-version-prefix = pnpm-default-reporter/ -message = chore: release %s +message = chore(release): %s From 7e22cbbe57b10daf03b93a7c3a1cded16caa6404 Mon Sep 17 00:00:00 2001 From: zkochan Date: Tue, 11 Jul 2017 22:40:02 +0300 Subject: [PATCH 043/196] chore(release): 0.7.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f8861ba394..430d71ca71 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.7.2", + "version": "0.7.3", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 9ee564e86bd940c3aa9d4e974e5a7fe6ab8f7f3b Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 12 Jul 2017 00:31:56 +0300 Subject: [PATCH 044/196] feat: require pnpm-logger as a peer dependency BREAKING CHANGE: added a new peer dependency --- package.json | 7 +++++-- shrinkwrap.yaml | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 430d71ca71..808a7690c0 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,9 @@ "url": "https://github.com/pnpm/pnpm-reporter-default/issues" }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", + "peerDependencies":{ + "pnpm-logger": "^0.5.0" + }, "dependencies": { "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", @@ -33,12 +36,12 @@ "chalk": "^1.1.3", "common-tags": "^1.4.0", "log-update": "^2.0.0", - "ndjson": "^1.5.0", - "pnpm-logger": "^0.5.0" + "ndjson": "^1.5.0" }, "devDependencies": { "commitizen": "^2.9.5", "ghooks": "^2.0.0", + "pnpm-logger": "^0.5.0", "rimraf": "^2.5.4", "tslint": "^4.3.1", "typescript": "^2.1.5", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 851db7054e..966bd411bb 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -6,10 +6,10 @@ dependencies: common-tags: 1.4.0 log-update: 2.0.0 ndjson: 1.5.0 - pnpm-logger: 0.5.0 devDependencies: commitizen: 2.9.6 ghooks: 2.0.0 + pnpm-logger: 0.5.0 rimraf: 2.6.1 tslint: 4.5.1 typescript: 2.4.1 @@ -79,6 +79,7 @@ packages: dependencies: fast-safe-stringify: 1.1.13 individual: 3.0.0 + dev: true resolution: integrity: sha1-vIpIPKlASdqbg3wa0Rzf6+5uBRQ= /boxen/1.1.0: @@ -350,6 +351,7 @@ packages: resolution: integrity: sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= /fast-safe-stringify/1.1.13: + dev: true resolution: integrity: sha1-oB6c2cnkkXFcmKdaQtXwu9EH/3Y= /figures/1.7.0: @@ -557,6 +559,7 @@ packages: resolution: integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o= /individual/3.0.0: + dev: true resolution: integrity: sha1-58pPhfiVewGHNPKFdQ3CLsL5hi0= /inflight/1.0.6: @@ -973,6 +976,7 @@ packages: /pnpm-logger/0.5.0: dependencies: bole: 3.0.2 + dev: true resolution: integrity: sha512-J5n4RJ3eW3Yt1yCWB43yUna0j8TYyqh1SGu8ffk9SBjUXS7zIGwi9C2zwNqNZIou4jvaQ1+dAc5RPE/U/eJLoQ== /prepend-http/1.0.4: From b946d60152e0a695f09e7155580adc92fd6105ec Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 12 Jul 2017 00:32:24 +0300 Subject: [PATCH 045/196] chore(release): 0.8.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 808a7690c0..b918c99660 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.7.3", + "version": "0.8.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", @@ -26,7 +26,7 @@ "url": "https://github.com/pnpm/pnpm-reporter-default/issues" }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", - "peerDependencies":{ + "peerDependencies": { "pnpm-logger": "^0.5.0" }, "dependencies": { From 6c1b603c5dd9d490e9e97e0e3f748ffbdad6a391 Mon Sep 17 00:00:00 2001 From: zkochan Date: Fri, 28 Jul 2017 01:17:02 +0300 Subject: [PATCH 046/196] fix: print warnings only about deprecated packages from the root --- package.json | 4 +- shrinkwrap.yaml | 218 +++++++++++++++++++++++++++++++++--------------- src/index.ts | 6 +- 3 files changed, 159 insertions(+), 69 deletions(-) diff --git a/package.json b/package.json index b918c99660..9c125379d4 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "pnpm-logger": "^0.5.0" + "pnpm-logger": "^0.5.3" }, "dependencies": { "@types/chalk": "^0.4.31", @@ -41,7 +41,7 @@ "devDependencies": { "commitizen": "^2.9.5", "ghooks": "^2.0.0", - "pnpm-logger": "^0.5.0", + "pnpm-logger": "^0.5.3", "rimraf": "^2.5.4", "tslint": "^4.3.1", "typescript": "^2.1.5", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 966bd411bb..cbb6c74461 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,19 +1,19 @@ dependencies: '@types/chalk': 0.4.31 '@types/common-tags': 1.2.5 - '@types/node': 7.0.33 + '@types/node': 7.0.39 chalk: 1.1.3 common-tags: 1.4.0 - log-update: 2.0.0 + log-update: 2.1.0 ndjson: 1.5.0 devDependencies: commitizen: 2.9.6 ghooks: 2.0.0 - pnpm-logger: 0.5.0 + pnpm-logger: 0.5.3 rimraf: 2.6.1 tslint: 4.5.1 - typescript: 2.4.1 - validate-commit-msg: 2.12.2 + typescript: 2.4.2 + validate-commit-msg: 2.13.1 packages: /@types/chalk/0.4.31: resolution: @@ -21,38 +21,51 @@ packages: /@types/common-tags/1.2.5: resolution: integrity: sha1-FPKYk5kusyVZS4PXOa8C8rZSD0Y= - /@types/node/7.0.33: + /@types/node/7.0.39: resolution: - integrity: sha512-8fVvl6Yyk3jZvSYxRMS9/AmZJ5RXCOP9N4xSlykyBViVESu751pxHYTN14Embn1Fem78YwEHdC7p7KGQQpwunw== + integrity: sha512-KQHAZeVsk4UIT9XaR6cn4WpHZzimK6UBD1UomQKfQQFmTlUHaNBzeuov+TM4+kigLO0IJt4I5OOsshcCyA9gSA== + /@types/node/8.0.17: + dev: true + resolution: + integrity: sha512-iq0LxqG6P9GV/2bVA2AQAQ58NvneLdVDVs9dJ+88Jk6gDK9opNC0SushdYqlAyvxo0dk0NJjTKCenq/l3AKtuA== /ansi-align/2.0.0: dependencies: - string-width: 2.1.0 + string-width: 2.1.1 dev: true resolution: integrity: sha1-w2rsy6VjuJzrVW82kPCx2eNUf38= /ansi-escapes/1.4.0: + dev: true resolution: integrity: sha1-06ioOzGapneTZisT52HHkRQiMG4= + /ansi-escapes/2.0.0: + resolution: + integrity: sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs= /ansi-regex/2.1.1: resolution: integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8= /ansi-regex/3.0.0: - dev: true resolution: integrity: sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= /ansi-styles/2.2.1: resolution: integrity: sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + /ansi-styles/3.2.0: + dependencies: + color-convert: 1.9.0 + dev: true + resolution: + integrity: sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug== /arr-diff/2.0.0: dependencies: - arr-flatten: 1.0.3 + arr-flatten: 1.1.0 dev: true resolution: integrity: sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= - /arr-flatten/1.0.3: + /arr-flatten/1.1.0: dev: true resolution: - integrity: sha1-onTthawIhJtr14R8RYB0XcUa37E= + integrity: sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== /array-unique/0.2.1: dev: true resolution: @@ -65,12 +78,12 @@ packages: dev: true resolution: integrity: sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ= - /babel-runtime/6.23.0: + /babel-runtime/6.25.0: dependencies: core-js: 2.4.1 regenerator-runtime: 0.10.5 resolution: - integrity: sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs= + integrity: sha1-M7mOql1IK7AajRqmtDetKwGuxBw= /balanced-match/1.0.0: dev: true resolution: @@ -82,18 +95,18 @@ packages: dev: true resolution: integrity: sha1-vIpIPKlASdqbg3wa0Rzf6+5uBRQ= - /boxen/1.1.0: + /boxen/1.2.1: dependencies: ansi-align: 2.0.0 camelcase: 4.1.0 - chalk: 1.1.3 + chalk: 2.0.1 cli-boxes: 1.0.0 - string-width: 2.1.0 - term-size: 0.1.1 + string-width: 2.1.1 + term-size: 1.2.0 widest-line: 1.0.0 dev: true resolution: - integrity: sha1-sbad1SIwXoB6md7ud329blFnsQI= + integrity: sha1-DxHn/jRO25OXl3/BPt5/ZNlWSB0= /brace-expansion/1.1.8: dependencies: balanced-match: 1.0.0 @@ -132,6 +145,14 @@ packages: supports-color: 2.0.0 resolution: integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + /chalk/2.0.1: + dependencies: + ansi-styles: 3.2.0 + escape-string-regexp: 1.0.5 + supports-color: 4.2.1 + dev: true + resolution: + integrity: sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g== /cli-boxes/1.0.0: dev: true resolution: @@ -152,8 +173,19 @@ packages: resolution: integrity: sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao= /code-point-at/1.1.0: + dev: true resolution: integrity: sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + /color-convert/1.9.0: + dependencies: + color-name: 1.1.3 + dev: true + resolution: + integrity: sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o= + /color-name/1.1.3: + dev: true + resolution: + integrity: sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= /colors/0.6.2: dev: true resolution: @@ -194,7 +226,7 @@ packages: integrity: sha1-wNAFNe8mTaf2Nzft/aQiiYP6IpE= /common-tags/1.4.0: dependencies: - babel-runtime: 6.23.0 + babel-runtime: 6.25.0 resolution: integrity: sha1-EYe+Tz1M8MBCfUP3Tu8fc1AWFMA= /concat-map/0.0.1: @@ -209,9 +241,9 @@ packages: dev: true resolution: integrity: sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc= - /configstore/3.1.0: + /configstore/3.1.1: dependencies: - dot-prop: 4.1.1 + dot-prop: 4.2.0 graceful-fs: 4.1.11 make-dir: 1.0.0 unique-string: 1.0.0 @@ -219,11 +251,11 @@ packages: xdg-basedir: 3.0.0 dev: true resolution: - integrity: sha1-Rd+QcHPibfoc9LLVL1tgVF6qEdE= - /conventional-commit-types/2.1.0: + integrity: sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw== + /conventional-commit-types/2.2.0: dev: true resolution: - integrity: sha1-RdhgOGyaLmU37pHYobYb0EEbPQQ= + integrity: sha1-XblXOdbCEqy+e29lahG5QLqmiUY= /core-js/2.4.1: resolution: integrity: sha1-TekR5mew6ukSTjQlS1OupvxhjT4= @@ -243,13 +275,21 @@ packages: dev: true resolution: integrity: sha1-hF/wwINKPe2dFg2sptOQkGuyiMw= + /cross-spawn/5.1.0: + dependencies: + lru-cache: 4.1.1 + shebang-command: 1.2.0 + which: 1.2.14 + dev: true + resolution: + integrity: sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= /crypto-random-string/1.0.0: dev: true resolution: integrity: sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4= /cz-conventional-changelog/1.2.0: dependencies: - conventional-commit-types: 2.1.0 + conventional-commit-types: 2.2.0 lodash.map: 4.6.0 longest: 1.0.1 pad-right: 0.2.2 @@ -278,16 +318,16 @@ packages: dev: true resolution: integrity: sha1-920GQ1LN9Docts5hnE7jqUdd4gg= - /diff/3.2.0: + /diff/3.3.0: dev: true resolution: - integrity: sha1-yc45Okt8vQsFinJck98pkCeGj/k= - /dot-prop/4.1.1: + integrity: sha512-w0XZubFWn0Adlsapj9EAWX0FqWdO4tz8kc3RiYdWLh4k/V8PTb6i0SMgXt0vRM3zyKnT8tKO7mUlieRQHIjMNg== + /dot-prop/4.2.0: dependencies: is-obj: 1.0.1 dev: true resolution: - integrity: sha1-qEk/C3te7sglJbXHWH+n3nyoWcE= + integrity: sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ== /duplexer3/0.1.4: dev: true resolution: @@ -310,6 +350,18 @@ packages: dev: true resolution: integrity: sha1-TrZGejaglfq7KXD/nV4/t7zm68M= + /execa/0.7.0: + dependencies: + cross-spawn: 5.1.0 + get-stream: 3.0.0 + is-stream: 1.1.0 + npm-run-path: 2.0.2 + p-finally: 1.0.0 + signal-exit: 3.0.2 + strip-eof: 1.0.0 + dev: true + resolution: + integrity: sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= /exit-hook/1.1.1: dev: true resolution: @@ -544,6 +596,10 @@ packages: ansi-regex: 2.1.1 resolution: integrity: sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + /has-flag/2.0.0: + dev: true + resolution: + integrity: sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= /homedir-polyfill/1.0.1: dependencies: parse-passwd: 1.0.0 @@ -630,10 +686,10 @@ packages: /is-fullwidth-code-point/1.0.0: dependencies: number-is-nan: 1.0.1 + dev: true resolution: integrity: sha1-754xOG8DGn8NZDr4L95QxFfvAMs= /is-fullwidth-code-point/2.0.0: - dev: true resolution: integrity: sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= /is-glob/2.0.1: @@ -762,13 +818,13 @@ packages: dev: true resolution: integrity: sha1-eCA6TRwyiuHYbcpkYONptX9AVa4= - /log-update/2.0.0: + /log-update/2.1.0: dependencies: - ansi-escapes: 1.4.0 + ansi-escapes: 2.0.0 cli-cursor: 2.1.0 - wrap-ansi: 2.1.0 + wrap-ansi: 3.0.1 resolution: - integrity: sha1-f0NU174b5ityT8uzxLlEVMDbXiY= + integrity: sha1-6jcli1NU7bAuc7KRkAFsh9HIcUE= /longest/1.0.1: dev: true resolution: @@ -856,7 +912,14 @@ packages: dev: true resolution: integrity: sha1-9cMr9ZX+ga6Sfa7FLoL4sACsPI8= + /npm-run-path/2.0.2: + dependencies: + path-key: 2.0.1 + dev: true + resolution: + integrity: sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= /number-is-nan/1.0.1: + dev: true resolution: integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= /object-assign/4.1.1: @@ -913,12 +976,16 @@ packages: dev: true resolution: integrity: sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + /p-finally/1.0.0: + dev: true + resolution: + integrity: sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= /package-json/4.0.1: dependencies: got: 6.7.1 registry-auth-token: 3.3.1 registry-url: 3.1.0 - semver: 5.3.0 + semver: 5.4.1 dev: true resolution: integrity: sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0= @@ -955,6 +1022,10 @@ packages: dev: true resolution: integrity: sha1-XVPVeAGWRsDWiADbThRua9wqx68= + /path-key/2.0.1: + dev: true + resolution: + integrity: sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= /path-parse/1.0.5: dev: true resolution: @@ -973,12 +1044,14 @@ packages: dev: true resolution: integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - /pnpm-logger/0.5.0: + /pnpm-logger/0.5.3: dependencies: + '@types/node': 8.0.17 bole: 3.0.2 + ndjson: 1.5.0 dev: true resolution: - integrity: sha512-J5n4RJ3eW3Yt1yCWB43yUna0j8TYyqh1SGu8ffk9SBjUXS7zIGwi9C2zwNqNZIou4jvaQ1+dAc5RPE/U/eJLoQ== + integrity: sha512-uIDVA3VrDtzYPWuBRBR+/PVj2GqL7srSbT8V1fX7MVVHYzXLOfKrCGkY2rcWThn6lpBvq65BVebU5kFvxaEKaw== /prepend-http/1.0.4: dev: true resolution: @@ -1023,7 +1096,7 @@ packages: integrity: sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== /rechoir/0.6.2: dependencies: - resolve: 1.3.3 + resolve: 1.4.0 dev: true resolution: integrity: sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= @@ -1075,12 +1148,12 @@ packages: dev: true resolution: integrity: sha1-shklmlYC+sXFxJatiUpujMQwJh4= - /resolve/1.3.3: + /resolve/1.4.0: dependencies: path-parse: 1.0.5 dev: true resolution: - integrity: sha1-ZVkHw0aahoDcLeOidaj91paR8OU= + integrity: sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q== /restore-cursor/1.0.1: dependencies: exit-hook: 1.1.1 @@ -1119,7 +1192,7 @@ packages: integrity: sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== /semver-diff/2.1.0: dependencies: - semver: 5.3.0 + semver: 5.4.1 dev: true resolution: integrity: sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY= @@ -1127,10 +1200,20 @@ packages: dev: true resolution: integrity: sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk= - /semver/5.3.0: + /semver/5.4.1: dev: true resolution: - integrity: sha1-myzl094C0XxgEq0yaqa00M9U+U8= + integrity: sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg== + /shebang-command/1.2.0: + dependencies: + shebang-regex: 1.0.0 + dev: true + resolution: + integrity: sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + /shebang-regex/1.0.0: + dev: true + resolution: + integrity: sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= /shelljs/0.7.6: dependencies: glob: 7.1.2 @@ -1171,15 +1254,15 @@ packages: code-point-at: 1.1.0 is-fullwidth-code-point: 1.0.0 strip-ansi: 3.0.1 + dev: true resolution: integrity: sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - /string-width/2.1.0: + /string-width/2.1.1: dependencies: is-fullwidth-code-point: 2.0.0 strip-ansi: 4.0.0 - dev: true resolution: - integrity: sha1-AwZkVh/BRslCPsfZeP4kV0N/5tA= + integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== /string_decoder/1.0.3: dependencies: safe-buffer: 5.1.1 @@ -1193,7 +1276,6 @@ packages: /strip-ansi/4.0.0: dependencies: ansi-regex: 3.0.0 - dev: true resolution: integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8= /strip-eof/1.0.0: @@ -1207,12 +1289,18 @@ packages: /supports-color/2.0.0: resolution: integrity: sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - /term-size/0.1.1: + /supports-color/4.2.1: dependencies: - execa: 0.4.0 + has-flag: 2.0.0 dev: true resolution: - integrity: sha1-hzYLljlsq1dgljcUzaDQy+7K2co= + integrity: sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA== + /term-size/1.2.0: + dependencies: + execa: 0.7.0 + dev: true + resolution: + integrity: sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk= /through/2.3.8: dev: true resolution: @@ -1237,11 +1325,11 @@ packages: dependencies: babel-code-frame: 6.22.0 colors: 1.1.2 - diff: 3.2.0 + diff: 3.3.0 findup-sync: 0.3.0 glob: 7.1.2 optimist: 0.6.1 - resolve: 1.3.3 + resolve: 1.4.0 tsutils: 1.9.1 update-notifier: 2.2.0 dev: true @@ -1255,10 +1343,10 @@ packages: dev: true resolution: integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - /typescript/2.4.1: + /typescript/2.4.2: dev: true resolution: - integrity: sha1-w8yxbdqgsjFN4DHn5v7onlujRrw= + integrity: sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ= /unique-string/1.0.0: dependencies: crypto-random-string: 1.0.0 @@ -1271,9 +1359,9 @@ packages: integrity: sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c= /update-notifier/2.2.0: dependencies: - boxen: 1.1.0 + boxen: 1.2.1 chalk: 1.1.3 - configstore: 3.1.0 + configstore: 3.1.1 import-lazy: 2.1.0 is-npm: 1.0.0 latest-version: 3.1.0 @@ -1291,15 +1379,15 @@ packages: /util-deprecate/1.0.2: resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - /validate-commit-msg/2.12.2: + /validate-commit-msg/2.13.1: dependencies: - conventional-commit-types: 2.1.0 + conventional-commit-types: 2.2.0 find-parent-dir: 0.3.0 findup: 0.1.5 semver-regex: 1.0.0 dev: true resolution: - integrity: sha1-bVAVMxvxlsIq+4gNPzO87x3q/qY= + integrity: sha1-cThupFNJxJcOCRKW8TLc9n3FBxQ= /which/1.2.14: dependencies: isexe: 2.0.0 @@ -1320,12 +1408,12 @@ packages: dev: true resolution: integrity: sha1-o9XabNXAvAAI03I0u68b7WMFkQc= - /wrap-ansi/2.1.0: + /wrap-ansi/3.0.1: dependencies: - string-width: 1.0.2 - strip-ansi: 3.0.1 + string-width: 2.1.1 + strip-ansi: 4.0.0 resolution: - integrity: sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= + integrity: sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= /wrappy/1.0.2: dev: true resolution: @@ -1361,7 +1449,7 @@ specifiers: ghooks: ^2.0.0 log-update: ^2.0.0 ndjson: ^1.5.0 - pnpm-logger: ^0.5.0 + pnpm-logger: ^0.5.3 rimraf: ^2.5.4 tslint: ^4.3.1 typescript: ^2.1.5 diff --git a/src/index.ts b/src/index.ts index 8c97487de4..182dbbbcf0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -81,8 +81,10 @@ export default function (streamParser: Object) { terminalWriter.write(`${EOL}${msg}`) return case 'pnpm:deprecation': - deprecated[obj.pkgId] = obj['deprecated'] - printWarn(`${chalk.red('deprecated')} ${obj['pkgName']}@${obj['pkgVersion']}: ${obj['deprecated']}`) + // print warnings only about deprecated packages from the root + if (obj.depth > 0) return + deprecated[obj.pkgId] = obj.deprecated + printWarn(`${chalk.red('deprecated')} ${obj.pkgName}@${obj.pkgVersion}: ${obj.deprecated}`) return case 'pnpm': if (obj.level === 'debug') return From e7385f8f744aa5bd3e0d23c36b6a0743444ba5ac Mon Sep 17 00:00:00 2001 From: zkochan Date: Fri, 28 Jul 2017 01:17:36 +0300 Subject: [PATCH 047/196] chore(release): 0.8.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9c125379d4..1b7e1a9fb8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.8.0", + "version": "0.8.1", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 32f9e589d8b6d3c2c60987c4fe6a3df355c88e29 Mon Sep 17 00:00:00 2001 From: zkochan Date: Tue, 1 Aug 2017 01:06:50 +0300 Subject: [PATCH 048/196] feat: in summary group different dependency type --- package.json | 4 +-- shrinkwrap.yaml | 8 +++--- src/index.ts | 73 ++++++++++++++++++++++++++++++++++++------------- 3 files changed, 60 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index 1b7e1a9fb8..e2336ef8de 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "pnpm-logger": "^0.5.3" + "pnpm-logger": "^0.5.4" }, "dependencies": { "@types/chalk": "^0.4.31", @@ -41,7 +41,7 @@ "devDependencies": { "commitizen": "^2.9.5", "ghooks": "^2.0.0", - "pnpm-logger": "^0.5.3", + "pnpm-logger": "^0.5.4", "rimraf": "^2.5.4", "tslint": "^4.3.1", "typescript": "^2.1.5", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index cbb6c74461..6664277999 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -9,7 +9,7 @@ dependencies: devDependencies: commitizen: 2.9.6 ghooks: 2.0.0 - pnpm-logger: 0.5.3 + pnpm-logger: 0.5.4 rimraf: 2.6.1 tslint: 4.5.1 typescript: 2.4.2 @@ -1044,14 +1044,14 @@ packages: dev: true resolution: integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - /pnpm-logger/0.5.3: + /pnpm-logger/0.5.4: dependencies: '@types/node': 8.0.17 bole: 3.0.2 ndjson: 1.5.0 dev: true resolution: - integrity: sha512-uIDVA3VrDtzYPWuBRBR+/PVj2GqL7srSbT8V1fX7MVVHYzXLOfKrCGkY2rcWThn6lpBvq65BVebU5kFvxaEKaw== + integrity: sha512-4qWj8oOPmzkAR395KInwnQU7/0MvPIz4Oz7tJa7v+VKDsUCL1sd7AEnvwgNQ2ZJ3NaELAsnkI6bNOsP4nT6mhg== /prepend-http/1.0.4: dev: true resolution: @@ -1449,7 +1449,7 @@ specifiers: ghooks: ^2.0.0 log-update: ^2.0.0 ndjson: ^1.5.0 - pnpm-logger: ^0.5.3 + pnpm-logger: ^0.5.4 rimraf: ^2.5.4 tslint: ^4.3.1 typescript: ^2.1.5 diff --git a/src/index.ts b/src/index.ts index 182dbbbcf0..568ef62e52 100644 --- a/src/index.ts +++ b/src/index.ts @@ -14,9 +14,30 @@ const EOL = os.EOL const addedSign = chalk.green('+') const removedSign = chalk.red('-') +type PackageDiff = { + name: string, + version?: string, + added: boolean, + deprecated?: boolean, +} + +const propertyByDependencyType = { + prod: 'dependencies', + dev: 'devDependencies', + optional: 'optionalDependencies', +} + export default function (streamParser: Object) { let resolutionDone = false - let pkgsDiff: {name: string, version?: string, added: boolean, deprecated?: boolean}[] = [] + let pkgsDiff: { + prod: PackageDiff[], + dev: PackageDiff[], + optional: PackageDiff[], + } = { + prod: [], + dev: [], + optional: [], + } const deprecated = {} streamParser['on']('data', (obj: Log) => { @@ -43,7 +64,7 @@ export default function (streamParser: Object) { return case 'pnpm:root': if (obj['added']) { - pkgsDiff.push({ + pkgsDiff[obj['added'].dependencyType].push({ name: obj['added'].name, version: obj['added'].version, deprecated: !!deprecated[obj['added'].id], @@ -52,7 +73,7 @@ export default function (streamParser: Object) { return } if (obj['removed']) { - pkgsDiff.push({ + pkgsDiff[obj['removed'].dependencyType].push({ name: obj['removed'].name, version: obj['removed'].version, added: false, @@ -61,24 +82,18 @@ export default function (streamParser: Object) { } return case 'pnpm:summary': - // Sorts by alphabet then by removed/added - // + ava 0.10.0 - // - chalk 1.0.0 - // + chalk 2.0.0 - pkgsDiff.sort((a, b) => (a.name.localeCompare(b.name) * 10 + (Number(!b.added) - Number(!a.added)))) - const msg = pkgsDiff.map(pkg => { - let result = pkg.added ? addedSign : removedSign - result += ` ${pkg.name}` - if (pkg.version) { - result += ` ${chalk.grey(pkg.version)}` + let msg = '' + for (const depType of ['prod', 'optional', 'dev']) { + if (pkgsDiff[depType].length) { + msg += EOL + msg += chalk.blue(`${propertyByDependencyType[depType]}:`) + msg += EOL + msg += printDiffs(pkgsDiff[depType]) + msg += EOL } - if (pkg.deprecated) { - result += ` ${chalk.red('deprecated')}` - } - return result - }).join(EOL) + } if (!msg) return - terminalWriter.write(`${EOL}${msg}`) + terminalWriter.write(msg) return case 'pnpm:deprecation': // print warnings only about deprecated packages from the root @@ -133,6 +148,26 @@ export default function (streamParser: Object) { } } +function printDiffs (pkgsDiff: PackageDiff[]) { + // Sorts by alphabet then by removed/added + // + ava 0.10.0 + // - chalk 1.0.0 + // + chalk 2.0.0 + pkgsDiff.sort((a, b) => (a.name.localeCompare(b.name) * 10 + (Number(!b.added) - Number(!a.added)))) + const msg = pkgsDiff.map(pkg => { + let result = pkg.added ? addedSign : removedSign + result += ` ${pkg.name}` + if (pkg.version) { + result += ` ${chalk.grey(pkg.version)}` + } + if (pkg.deprecated) { + result += ` ${chalk.red('deprecated')}` + } + return result + }).join(EOL) + return msg +} + function reportLifecycle (logObj: LifecycleLog) { if (logObj.level === 'error') { terminalWriter.write(`${chalk.blue(logObj.pkgId)}! ${chalk.gray(logObj.line)}`) From 5465045142fca08d9608f190b745c01144386b9d Mon Sep 17 00:00:00 2001 From: zkochan Date: Tue, 1 Aug 2017 01:10:00 +0300 Subject: [PATCH 049/196] chore(release): 0.8.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e2336ef8de..f5b5949509 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.8.1", + "version": "0.8.2", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 4f18eaaa087af21a384f398b836c2a41e0b7e8a7 Mon Sep 17 00:00:00 2001 From: zkochan Date: Mon, 4 Sep 2017 02:43:09 +0300 Subject: [PATCH 050/196] chore: add .editorconfig --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..270dd84bb6 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +[*] +insert_final_newline = true +charset = utf-8 +trim_trailing_whitespace = true +end_of_line = lf + +[*.{ts,js,json}] +indent_style = space +indent_size = 2 From 3c101ce4bad853ec4d73eb0718976de443d3a454 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 4 Sep 2017 01:34:16 +0300 Subject: [PATCH 051/196] refactor: rewrite using FRP Ref https://github.com/pnpm/pnpm/issues/879 --- package.json | 11 +- shrinkwrap.yaml | 28 ++- src/index.ts | 363 +++++++++++++++++++++----------- src/reportError.ts | 37 ++-- src/terminalWriter.ts | 19 -- test/index.ts | 252 +++++++++++++++++++++++ test/package.json | 12 ++ test/shrinkwrap.yaml | 466 ++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 1020 insertions(+), 168 deletions(-) delete mode 100644 src/terminalWriter.ts create mode 100644 test/index.ts create mode 100644 test/package.json create mode 100644 test/shrinkwrap.yaml diff --git a/package.json b/package.json index f5b5949509..fb498ffdd3 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,9 @@ ], "bin": "lib/bin/pnpm-default-reporter.js", "scripts": { - "test": "tslint -c tslint.json --project .", + "prepare": "cd test && pnpm install", + "lint": "tslint -c tslint.json --project .", + "test": "npm run lint && cd test && npm t", "tsc": "rimraf lib && tsc", "prepublishOnly": "npm run tsc" }, @@ -33,15 +35,18 @@ "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", "@types/node": "^7.0.0", + "@types/ramda": "^0.24.9", "chalk": "^1.1.3", "common-tags": "^1.4.0", "log-update": "^2.0.0", - "ndjson": "^1.5.0" + "ndjson": "^1.5.0", + "ramda": "^0.24.1", + "xstream": "^10.9.0" }, "devDependencies": { "commitizen": "^2.9.5", "ghooks": "^2.0.0", - "pnpm-logger": "^0.5.4", + "pnpm-logger": "^0.5.5", "rimraf": "^2.5.4", "tslint": "^4.3.1", "typescript": "^2.1.5", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 6664277999..42cd2c063c 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -2,14 +2,17 @@ dependencies: '@types/chalk': 0.4.31 '@types/common-tags': 1.2.5 '@types/node': 7.0.39 + '@types/ramda': 0.24.9 chalk: 1.1.3 common-tags: 1.4.0 log-update: 2.1.0 ndjson: 1.5.0 + ramda: 0.24.1 + xstream: 10.9.0 devDependencies: commitizen: 2.9.6 ghooks: 2.0.0 - pnpm-logger: 0.5.4 + pnpm-logger: 0.5.5 rimraf: 2.6.1 tslint: 4.5.1 typescript: 2.4.2 @@ -28,6 +31,9 @@ packages: dev: true resolution: integrity: sha512-iq0LxqG6P9GV/2bVA2AQAQ58NvneLdVDVs9dJ+88Jk6gDK9opNC0SushdYqlAyvxo0dk0NJjTKCenq/l3AKtuA== + /@types/ramda/0.24.9: + resolution: + integrity: sha512-VFBycWFpzbhDIK7afthxUiDSfXfhfsQ4uYzguflDiH/iMbAumzNS53mnE8bzvLay8bKuCCsZwt20c3SPs9nw6Q== /ansi-align/2.0.0: dependencies: string-width: 2.1.1 @@ -1044,14 +1050,14 @@ packages: dev: true resolution: integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - /pnpm-logger/0.5.4: + /pnpm-logger/0.5.5: dependencies: '@types/node': 8.0.17 bole: 3.0.2 ndjson: 1.5.0 dev: true resolution: - integrity: sha512-4qWj8oOPmzkAR395KInwnQU7/0MvPIz4Oz7tJa7v+VKDsUCL1sd7AEnvwgNQ2ZJ3NaELAsnkI6bNOsP4nT6mhg== + integrity: sha512-UQxSK3M6xrUZErgo2feYknlkRILLh8pGQAsSv4EHeU6npVCGNQwDb8wN+O6l17jdEa+XUXcjmgdhz2C9XJ5n1A== /prepend-http/1.0.4: dev: true resolution: @@ -1067,6 +1073,9 @@ packages: dev: true resolution: integrity: sha1-8FKijacOYYkX7wqKw0wa5aaChrM= + /ramda/0.24.1: + resolution: + integrity: sha1-w7d1UZfzW43DUCIoJixMkd22uFc= /randomatic/1.1.7: dependencies: is-number: 3.0.0 @@ -1295,6 +1304,9 @@ packages: dev: true resolution: integrity: sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA== + /symbol-observable/1.0.4: + resolution: + integrity: sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0= /term-size/1.2.0: dependencies: execa: 0.7.0 @@ -1430,6 +1442,11 @@ packages: dev: true resolution: integrity: sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= + /xstream/10.9.0: + dependencies: + symbol-observable: 1.0.4 + resolution: + integrity: sha1-23k0zsLaATYNQ6u7yHm4RSQ5e1U= /xtend/4.0.1: resolution: integrity: sha1-pcbVMr5lbiPbgg77lDofBJmNY68= @@ -1443,14 +1460,17 @@ specifiers: '@types/chalk': ^0.4.31 '@types/common-tags': ^1.2.5 '@types/node': ^7.0.0 + '@types/ramda': ^0.24.9 chalk: ^1.1.3 commitizen: ^2.9.5 common-tags: ^1.4.0 ghooks: ^2.0.0 log-update: ^2.0.0 ndjson: ^1.5.0 - pnpm-logger: ^0.5.4 + pnpm-logger: ^0.5.5 + ramda: ^0.24.1 rimraf: ^2.5.4 tslint: ^4.3.1 typescript: ^2.1.5 validate-commit-msg: ^2.8.2 + xstream: ^10.9.0 diff --git a/src/index.ts b/src/index.ts index 568ef62e52..78377289f3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,13 +1,21 @@ +import logUpdate = require('log-update') import chalk = require('chalk') -import * as terminalWriter from './terminalWriter' import { ProgressLog, LifecycleLog, Log, InstallCheckLog, + DeprecationLog, + RegistryLog, } from 'pnpm-logger' import reportError from './reportError' import os = require('os') +import xs, {Stream} from 'xstream' +import flattenConcurrently from 'xstream/extra/flattenConcurrently' +import dropRepeats from 'xstream/extra/dropRepeats' +import fromEvent from 'xstream/extra/fromEvent' +import R = require('ramda') +import {EventEmitter} from 'events' const EOL = os.EOL @@ -28,124 +36,240 @@ const propertyByDependencyType = { } export default function (streamParser: Object) { - let resolutionDone = false - let pkgsDiff: { - prod: PackageDiff[], - dev: PackageDiff[], - optional: PackageDiff[], - } = { + toOutput$(streamParser) + .subscribe({ + next: logUpdate, + error: err => logUpdate(err.message), + complete () {}, + }) +} + +export function toOutput$ (streamParser: Object) { + const obs = fromEvent(streamParser as EventEmitter, 'data') + const log$ = xs.fromObservable(obs) + + const progressLog$ = log$ + .filter(log => log.name === 'pnpm:progress') as Stream + + const resolvingContentLog$ = progressLog$ + .filter(log => log.status === 'resolving_content') + .fold(R.inc, 0) + .drop(1) + + const fedtchedLog$ = progressLog$ + .filter(log => log.status === 'fetched') + .fold(R.inc, 0) + + const foundInStoreLog$ = progressLog$ + .filter(log => log.status === 'found_in_store') + .fold(R.inc, 0) + + const resolutionDone$ = log$ + .filter(log => log.name === 'pnpm:stage' && log.message === 'resolution_done') + .mapTo(true) + .take(1) + .startWith(false) + + const progressSummaryOutput$ = xs.of( + xs.combine( + resolvingContentLog$, + fedtchedLog$, + foundInStoreLog$, + resolutionDone$ + ) + .map( + R.apply((resolving, fetched, foundInStore: number, resolutionDone) => { + const msg = `Resolving: total ${resolving}, reused ${foundInStore}, downloaded ${fetched}` + if (resolving === foundInStore + fetched && resolutionDone) { + return { + fixed: false, + msg: `${msg}, done`, + } + } + return { + fixed: true, + msg, + } + }) + ) + ) + + const deprecationLog$ = log$ + .filter(log => log.name === 'pnpm:deprecation') as Stream + + const deprecationSet$ = deprecationLog$ + .fold((acc, log) => { + acc.add(log.pkgId) + return acc + }, new Set()) + + const rootLog$ = log$.filter(log => log.name === 'pnpm:root') + + const pkgsDiff$ = xs.combine( + rootLog$, + deprecationSet$ + ) + .fold((pkgsDiff, args) => { + const rootLog = args[0] + const deprecationSet = args[1] as Set + if (rootLog['added']) { + pkgsDiff[rootLog['added'].dependencyType].push({ + name: rootLog['added'].name, + version: rootLog['added'].version, + deprecated: deprecationSet.has(rootLog['added'].id), + added: true, + }) + return pkgsDiff + } + if (rootLog['removed']) { + pkgsDiff[rootLog['removed'].dependencyType].push({ + name: rootLog['removed'].name, + version: rootLog['removed'].version, + added: false, + }) + return pkgsDiff + } + return pkgsDiff + }, { prod: [], dev: [], optional: [], - } - const deprecated = {} - - streamParser['on']('data', (obj: Log) => { - switch (obj.name) { - case 'pnpm:progress': - reportProgress(obj) - return - case 'pnpm:stage': - if (obj.message === 'resolution_done') { - resolutionDone = true - updateProgress() - } - return - case 'pnpm:lifecycle': - reportLifecycle(obj) - return - case 'pnpm:install-check': - reportInstallCheck(obj) - return - case 'pnpm:registry': - if (obj.level === 'warn') { - printWarn(obj.message) - } - return - case 'pnpm:root': - if (obj['added']) { - pkgsDiff[obj['added'].dependencyType].push({ - name: obj['added'].name, - version: obj['added'].version, - deprecated: !!deprecated[obj['added'].id], - added: true, - }) - return - } - if (obj['removed']) { - pkgsDiff[obj['removed'].dependencyType].push({ - name: obj['removed'].name, - version: obj['removed'].version, - added: false, - }) - return - } - return - case 'pnpm:summary': - let msg = '' - for (const depType of ['prod', 'optional', 'dev']) { - if (pkgsDiff[depType].length) { - msg += EOL - msg += chalk.blue(`${propertyByDependencyType[depType]}:`) - msg += EOL - msg += printDiffs(pkgsDiff[depType]) - msg += EOL - } - } - if (!msg) return - terminalWriter.write(msg) - return - case 'pnpm:deprecation': - // print warnings only about deprecated packages from the root - if (obj.depth > 0) return - deprecated[obj.pkgId] = obj.deprecated - printWarn(`${chalk.red('deprecated')} ${obj.pkgName}@${obj.pkgVersion}: ${obj.deprecated}`) - return - case 'pnpm': - if (obj.level === 'debug') return - if (obj.level === 'warn') { - printWarn(obj['message']) - return - } - if (obj.level === 'error') { - reportError(obj) - return - } - terminalWriter.write(obj['message']) - return - } + } as { + prod: PackageDiff[], + dev: PackageDiff[], + optional: PackageDiff[], }) - let resolving = 0 - let fetched = 0 - let foundInStore = 0 + const summaryLog$ = log$ + .filter(log => log.name === 'pnpm:summary') + .take(1) - function reportProgress (logObj: ProgressLog) { - switch (logObj.status) { - case 'resolving_content': - resolving++ - break - case 'found_in_store': - foundInStore++; - break - case 'fetched': - fetched++; - break - default: - return + const summaryOutput$ = xs.combine( + pkgsDiff$, + summaryLog$ + ) + .map(R.apply(pkgsDiff => { + let msg = '' + for (const depType of ['prod', 'optional', 'dev']) { + if (pkgsDiff[depType].length) { + msg += EOL + msg += chalk.blue(`${propertyByDependencyType[depType]}:`) + msg += EOL + msg += printDiffs(pkgsDiff[depType]) + msg += EOL + } } - updateProgress() - } + return {msg} + })) + .take(1) + .map(xs.of) - function updateProgress() { - const msg = `Resolving: total ${resolving}, reused ${foundInStore}, downloaded ${fetched}` - if (resolving === foundInStore + fetched && resolutionDone) { - terminalWriter.fixedWrite(`${msg}, done`) - terminalWriter.done() + const deprecationOutput$ = deprecationLog$ + // print warnings only about deprecated packages from the root + .filter(log => log.depth === 0) + .map(log => { + return { + msg: formatWarn(`${chalk.red('deprecated')} ${log.pkgName}@${log.pkgVersion}: ${log.deprecated}`) + } + }) + .map(xs.of) + + const lifecycleOutput$ = log$ + .filter(log => log.name === 'pnpm:lifecycle') + .map(formatLifecycle) + .map(msg => ({msg})) + .map(xs.of) + + const installCheckOutput$ = log$ + .filter(log => log.name === 'pnpm:install-check') + .map(formatInstallCheck) + .filter(Boolean) + .map(msg => ({msg})) + .map(xs.of) as Stream> + + const registryOutput$ = log$ + .filter(log => log.name === 'pnpm:registry' && log.level === 'warn') + .map((log: RegistryLog) => ({msg: formatWarn(log.message)})) + .map(xs.of) + + const miscOutput$ = log$ + .filter(log => log.name === 'pnpm') + .map(obj => { + if (obj.level === 'debug') return + if (obj.level === 'warn') { + return formatWarn(obj['message']) + } + if (obj.level === 'error') { + return reportError(obj) + } + return obj['message'] + }) + .map(msg => ({msg})) + .map(xs.of) + + let blockNo = 0 + let fixedBlockNo = 0 + let started = false + return flattenConcurrently( + xs.merge( + summaryOutput$, + progressSummaryOutput$, + registryOutput$, + installCheckOutput$, + lifecycleOutput$, + deprecationOutput$, + miscOutput$, + ) + .map((log: Stream<{msg: string, fixed: boolean}>) => { + let currentBlockNo = -1 + let currentFixedBlockNo = -1 + let calculated = false + let fixedCalculated = false + return log + .map(msg => { + if (msg['fixed']) { + if (!fixedCalculated) { + fixedCalculated = true + currentFixedBlockNo = fixedBlockNo++ + } + return { + blockNo: currentFixedBlockNo, + fixed: true, + msg: msg.msg, + } + } + if (!calculated) { + calculated = true + currentBlockNo = blockNo++ + } + return { + prevFixedBlockNo: currentFixedBlockNo, + blockNo: currentBlockNo, + fixed: false, + msg: typeof msg === 'string' ? msg : msg.msg, + } + }) + }) + ) + .fold((acc, log) => { + if (log.fixed === true) { + acc.fixedBlocks[log.blockNo] = log.msg } else { - terminalWriter.fixedWrite(msg) + delete acc.fixedBlocks[log['prevFixedBlockNo']] + acc.blocks[log.blockNo] = log.msg } - } + return acc + }, {fixedBlocks: [], blocks: []} as {fixedBlocks: string[], blocks: string[]}) + .map(sections => (sections.blocks.concat(sections.fixedBlocks)).filter(Boolean).join(EOL)) + .filter(msg => { + if (started) { + return true + } + if (msg === '') return false + started = true + return true + }) + .compose(dropRepeats()) } function printDiffs (pkgsDiff: PackageDiff[]) { @@ -168,25 +292,24 @@ function printDiffs (pkgsDiff: PackageDiff[]) { return msg } -function reportLifecycle (logObj: LifecycleLog) { +function formatLifecycle (logObj: LifecycleLog) { if (logObj.level === 'error') { - terminalWriter.write(`${chalk.blue(logObj.pkgId)}! ${chalk.gray(logObj.line)}`) - return + return `${chalk.blue(logObj.pkgId)}! ${chalk.gray(logObj.line)}` } - terminalWriter.write(`${chalk.blue(logObj.pkgId)} ${chalk.gray(logObj.line)}`) + return `${chalk.blue(logObj.pkgId)} ${chalk.gray(logObj.line)}` } -function reportInstallCheck (logObj: InstallCheckLog) { +function formatInstallCheck (logObj: InstallCheckLog) { switch (logObj.code) { case 'EBADPLATFORM': - printWarn(`Unsupported system. Skipping dependency ${logObj.pkgId}`) - break + return formatWarn(`Unsupported system. Skipping dependency ${logObj.pkgId}`) case 'ENOTSUP': - terminalWriter.write(logObj.toString()) - break + return logObj.toString() + default: + return } } -function printWarn (message: string) { - terminalWriter.write(`${chalk.yellow('WARN')} ${message}`) +function formatWarn (message: string) { + return `${chalk.yellow('WARN')} ${message}` } diff --git a/src/reportError.ts b/src/reportError.ts index 42f099e30d..a15b4a736e 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -2,7 +2,6 @@ import chalk = require('chalk') import {Log} from 'pnpm-logger' import commonTags = require('common-tags') import os = require('os') -import * as terminalWriter from './terminalWriter' const stripIndent = commonTags.stripIndent const EOL = os.EOL @@ -14,37 +13,31 @@ export default function reportError (logObj: Log) { const err = logObj['err'] switch (err.code) { case 'UNEXPECTED_STORE': - reportUnexpectedStore(err, logObj['message']) - return + return reportUnexpectedStore(err, logObj['message']) case 'STORE_BREAKING_CHANGE': - reportStoreBreakingChange(err, logObj['message']) - return + return reportStoreBreakingChange(err, logObj['message']) case 'MODULES_BREAKING_CHANGE': - reportModulesBreakingChange(err, logObj['message']) - return + return reportModulesBreakingChange(err, logObj['message']) case 'MODIFIED_DEPENDENCY': - reportModifiedDependency(err, logObj['message']) - return + return reportModifiedDependency(err, logObj['message']) case 'SHRINKWRAP_BREAKING_CHANGE': - reportShrinkwrapBreakingChange(err, logObj['message']) - return + return reportShrinkwrapBreakingChange(err, logObj['message']) default: - terminalWriter.write(formatErrorSummary(err.message || logObj['message'])) - return + return formatErrorSummary(err.message || logObj['message']) } } - terminalWriter.write(formatErrorSummary(logObj['message'])) + return formatErrorSummary(logObj['message']) } function reportUnexpectedStore (err: Error, msg: Object) { - terminalWriter.write(stripIndent` + return stripIndent` ${formatErrorSummary(err.message)} expected: ${highlight(msg['expectedStorePath'])} actual: ${highlight(msg['actualStorePath'])} If you want to use the new store, run the same command with the ${highlight('--force')} parameter. - `) + ` } function reportStoreBreakingChange (err: Error, msg: Object) { @@ -60,7 +53,7 @@ function reportStoreBreakingChange (err: Error, msg: Object) { } output += formatRelatedSources(msg) - terminalWriter.write(output) + return output } function reportModulesBreakingChange (err: Error, msg: Object) { @@ -76,7 +69,7 @@ function reportModulesBreakingChange (err: Error, msg: Object) { } output += formatRelatedSources(msg) - terminalWriter.write(output) + return output } function formatRelatedSources (msg: Object) { @@ -102,20 +95,20 @@ function formatErrorSummary (message: string) { } function reportModifiedDependency (err: Error, msg: Object) { - terminalWriter.write(stripIndent` + return stripIndent` ${formatErrorSummary('Packages in the store have been mutated')} These packages are modified: ${msg['modified'].map((pkgPath: string) => colorPath(pkgPath)).join(EOL)} You can run ${highlight('pnpm install')} to refetch the modified packages - `) + ` } function reportShrinkwrapBreakingChange (err: Error, msg: Object) { - terminalWriter.write(stripIndent` + return stripIndent` ${formatErrorSummary(err.message)} Run with the ${highlight('--force')} parameter to recreate the shrinkwrap file. - `) + ` } diff --git a/src/terminalWriter.ts b/src/terminalWriter.ts deleted file mode 100644 index afb2d39b4d..0000000000 --- a/src/terminalWriter.ts +++ /dev/null @@ -1,19 +0,0 @@ -import logUpdate = require('log-update') - -let fixed: string | null - -export function write (line: string) { - logUpdate(line) - logUpdate.done() - if (fixed) logUpdate(fixed) -} - -export function fixedWrite (line: string) { - fixed = line - logUpdate(line) -} - -export function done () { - fixed = null - logUpdate.done() -} diff --git a/test/index.ts b/test/index.ts new file mode 100644 index 0000000000..1065be1df0 --- /dev/null +++ b/test/index.ts @@ -0,0 +1,252 @@ +import test = require('tape') +import logger, { + createStreamParser, + progressLogger, + stageLogger, + rootLogger, + deprecationLogger, + summaryLogger, + lifecycleLogger, +} from 'pnpm-logger' +import {toOutput$} from '../src' +import {stripIndents} from 'common-tags' +import chalk = require('chalk') + +const WARN = chalk.yellow('WARN') +const ERROR = chalk.red('ERROR') +const DEPRECATED = chalk.red('deprecated') +const versionColor = chalk.grey +const ADD = chalk.green('+') +const SUB = chalk.red('-') +const h1 = chalk.blue + +test('prints progress beginning', t => { + const output$ = toOutput$(createStreamParser()) + + const pkgId = 'registry.npmjs.org/foo/1.0.0' + + progressLogger.debug({ + status: 'resolving_content', + pkgId, + }) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, 'Resolving: total 1, reused 0, downloaded 0') + }, + error: t.end, + complete: t.end, + }) +}) + +test('prints progress on first download', t => { + const output$ = toOutput$(createStreamParser()) + + const pkgId = 'registry.npmjs.org/foo/1.0.0' + + progressLogger.debug({ + status: 'resolving_content', + pkgId, + }) + progressLogger.debug({ + status: 'fetched', + pkgId, + }) + + t.plan(1) + + output$.drop(1).take(1).subscribe({ + next: output => { + t.equal(output, 'Resolving: total 1, reused 0, downloaded 1') + }, + complete: t.end, + error: t.end, + }) +}) + +test('moves fixed line to the end', t => { + const output$ = toOutput$(createStreamParser()) + + const pkgId = 'registry.npmjs.org/foo/1.0.0' + + progressLogger.debug({ + status: 'resolving_content', + pkgId, + }) + progressLogger.debug({ + status: 'fetched', + pkgId, + }) + logger.warn('foo') + stageLogger.debug('resolution_done') + + t.plan(1) + + output$.drop(3).take(1).subscribe({ + next: output => { + t.equal(output, stripIndents` + ${WARN} foo + Resolving: total 1, reused 0, downloaded 1, done + `) + }, + complete: t.end, + error: t.end, + }) +}) + +test('prints summary', t => { + const output$ = toOutput$(createStreamParser()) + + deprecationLogger.warn({ + pkgName: 'bar', + pkgVersion: '2.0.0', + pkgId: 'registry.npmjs.org/bar/2.0.0', + deprecated: 'This package was deprecated because bla bla bla', + depth: 0, + }) + rootLogger.info({ + added: { + dependencyType: 'prod', + name: 'foo', + version: '1.0.0', + id: 'registry.npmjs.org/foo/1.0.0', + }, + }) + rootLogger.info({ + added: { + dependencyType: 'prod', + name: 'bar', + version: '2.0.0', + id: 'registry.npmjs.org/bar/2.0.0', + }, + }) + rootLogger.info({ + removed: { + dependencyType: 'prod', + name: 'foo', + version: '0.1.0', + }, + }) + rootLogger.info({ + added: { + dependencyType: 'dev', + name: 'qar', + version: '2.0.0', + id: 'registry.npmjs.org/qar/2.0.0', + }, + }) + rootLogger.info({ + added: { + dependencyType: 'optional', + name: 'lala', + version: '1.1.0', + id: 'registry.npmjs.org/lala/1.1.0', + }, + }) + rootLogger.info({ + removed: { + dependencyType: 'optional', + name: 'is-positive', + }, + }) + summaryLogger.info(undefined) + + t.plan(1) + + output$.drop(1).take(1).subscribe({ + next: output => { + t.equal(output, stripIndents` + ${WARN} ${DEPRECATED} bar@2.0.0: This package was deprecated because bla bla bla + + ${h1('dependencies:')} + ${ADD} bar ${versionColor('2.0.0')} ${DEPRECATED} + ${SUB} foo ${versionColor('0.1.0')} + ${ADD} foo ${versionColor('1.0.0')} + + ${h1('optionalDependencies:')} + ${SUB} is-positive + ${ADD} lala ${versionColor('1.1.0')} + + ${h1('devDependencies:')} + ${ADD} qar ${versionColor('2.0.0')} + ` + '\n') + }, + complete: t.end, + error: t.end, + }) +}) + +test('prints lifecycle progress', t => { + const output$ = toOutput$(createStreamParser()) + + const pkgId = 'registry.npmjs.org/foo/1.0.0' + + lifecycleLogger.debug({ + pkgId: 'registry.npmjs.org/foo/1.0.0', + line: 'foo I', + }) + lifecycleLogger.debug({ + pkgId: 'registry.npmjs.org/bar/1.0.0', + line: 'bar I', + }) + lifecycleLogger.error({ + pkgId: 'registry.npmjs.org/foo/1.0.0', + line: 'foo II', + }) + lifecycleLogger.debug({ + pkgId: 'registry.npmjs.org/foo/1.0.0', + line: 'foo III', + }) + + t.plan(1) + + const pkgIdColor = chalk.blue + const childOutputColor = chalk.grey + + output$.drop(3).take(1).subscribe({ + next: output => { + t.equal(output, stripIndents` + ${pkgIdColor('registry.npmjs.org/foo/1.0.0')} ${childOutputColor('foo I')} + ${pkgIdColor('registry.npmjs.org/bar/1.0.0')} ${childOutputColor('bar I')} + ${pkgIdColor('registry.npmjs.org/foo/1.0.0')}! ${childOutputColor('foo II')} + ${pkgIdColor('registry.npmjs.org/foo/1.0.0')} ${childOutputColor('foo III')} + `) + }, + complete: t.end, + error: t.end, + }) +}) + +test('prints error', t => { + const output$ = toOutput$(createStreamParser()) + + logger.error(new Error('some error')) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, `${ERROR} some error`) + }, + complete: t.end, + error: t.end, + }) +}) + +test('prints info', t => { + const output$ = toOutput$(createStreamParser()) + + logger.info('info message') + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, 'info message') + }, + complete: t.end, + error: t.end, + }) +}) diff --git a/test/package.json b/test/package.json new file mode 100644 index 0000000000..516268c0e2 --- /dev/null +++ b/test/package.json @@ -0,0 +1,12 @@ +{ + "scripts": { + "test": "ts-node index.ts", + "pretty-test": "ts-node index.ts | tap-diff" + }, + "dependencies": { + "@types/tape": "^4.2.30", + "mos-tap-diff": "^1.0.0", + "tape": "^4.8.0", + "ts-node": "^3.3.0" + } +} diff --git a/test/shrinkwrap.yaml b/test/shrinkwrap.yaml new file mode 100644 index 0000000000..7493eb87e9 --- /dev/null +++ b/test/shrinkwrap.yaml @@ -0,0 +1,466 @@ +dependencies: + '@types/tape': 4.2.30 + mos-tap-diff: 1.0.0 + tape: 4.8.0 + ts-node: 3.3.0 +packages: + /@types/node/8.0.26: + resolution: + integrity: sha512-wbKN0MB4XsjdnSE04HiCzLoBDirGCM6zXrqavSj44nZnPFYpnrTF64E9O6Xmf0ca/IuKK/BHUcXwMiwk92gW6Q== + /@types/tape/4.2.30: + dependencies: + '@types/node': 8.0.26 + resolution: + integrity: sha1-PBkXxN/W8nJxuZInclE1FbxsRrQ= + /ansi-regex/0.2.1: + resolution: + integrity: sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk= + /ansi-regex/2.1.1: + resolution: + integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + /ansi-styles/1.1.0: + resolution: + integrity: sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94= + /ansi-styles/2.2.1: + resolution: + integrity: sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= + /ansi-styles/3.2.0: + dependencies: + color-convert: 1.9.0 + resolution: + integrity: sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug== + /argparse/1.0.9: + dependencies: + sprintf-js: 1.0.3 + resolution: + integrity: sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY= + /arrify/1.0.1: + resolution: + integrity: sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= + /babel-runtime/6.26.0: + dependencies: + core-js: 2.5.1 + regenerator-runtime: 0.11.0 + resolution: + integrity: sha1-llxwWGaOgrVde/4E/yM3vItWR/4= + /balanced-match/1.0.0: + resolution: + integrity: sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + /brace-expansion/1.1.8: + dependencies: + balanced-match: 1.0.0 + concat-map: 0.0.1 + resolution: + integrity: sha1-wHshHHyVLsH479Uad+8NHTmQopI= + /chalk/0.5.1: + dependencies: + ansi-styles: 1.1.0 + escape-string-regexp: 1.0.5 + has-ansi: 0.1.0 + strip-ansi: 0.3.0 + supports-color: 0.2.0 + resolution: + integrity: sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ= + /chalk/1.1.3: + dependencies: + ansi-styles: 2.2.1 + escape-string-regexp: 1.0.5 + has-ansi: 2.0.0 + strip-ansi: 3.0.1 + supports-color: 2.0.0 + resolution: + integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + /chalk/2.1.0: + dependencies: + ansi-styles: 3.2.0 + escape-string-regexp: 1.0.5 + supports-color: 4.4.0 + resolution: + integrity: sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ== + /color-convert/1.9.0: + dependencies: + color-name: 1.1.3 + resolution: + integrity: sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o= + /color-name/1.1.3: + resolution: + integrity: sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + /concat-map/0.0.1: + resolution: + integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + /core-js/2.5.1: + resolution: + integrity: sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs= + /core-util-is/1.0.2: + resolution: + integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + /deep-equal/1.0.1: + resolution: + integrity: sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= + /define-properties/1.1.2: + dependencies: + foreach: 2.0.5 + object-keys: 1.0.11 + resolution: + integrity: sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ= + /defined/1.0.0: + resolution: + integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= + /diff/2.2.3: + resolution: + integrity: sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k= + /diff/3.3.1: + resolution: + integrity: sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww== + /duplexer/0.1.1: + resolution: + integrity: sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= + /es-abstract/1.8.1: + dependencies: + es-to-primitive: 1.1.1 + function-bind: 1.1.1 + has: 1.0.1 + is-callable: 1.1.3 + is-regex: 1.0.4 + resolution: + integrity: sha512-G6pkMLdmxF3dh4hbuYuQiku29rRqo9p5+iRf7mZTEELT/xZ/D9Vzg04ddlvzJuJuCmZp1WBbfbVLZEeygYNkpw== + /es-to-primitive/1.1.1: + dependencies: + is-callable: 1.1.3 + is-date-object: 1.0.1 + is-symbol: 1.0.1 + resolution: + integrity: sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0= + /escape-string-regexp/1.0.5: + resolution: + integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + /esprima/4.0.0: + resolution: + integrity: sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw== + /events-to-array/1.1.2: + resolution: + integrity: sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y= + /figures/1.7.0: + dependencies: + escape-string-regexp: 1.0.5 + object-assign: 4.1.1 + resolution: + integrity: sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= + /for-each/0.3.2: + dependencies: + is-function: 1.0.1 + resolution: + integrity: sha1-LEBFC5NI6X8oEyJZO6lnBLmr1NQ= + /foreach/2.0.5: + resolution: + integrity: sha1-C+4AUBiusmDQo6865ljdATbsG5k= + /fs.realpath/1.0.0: + resolution: + integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + /function-bind/1.1.1: + resolution: + integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + /glob/7.1.2: + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.3 + minimatch: 3.0.4 + once: 1.4.0 + path-is-absolute: 1.0.1 + resolution: + integrity: sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== + /has-ansi/0.1.0: + dependencies: + ansi-regex: 0.2.1 + resolution: + integrity: sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4= + /has-ansi/2.0.0: + dependencies: + ansi-regex: 2.1.1 + resolution: + integrity: sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= + /has-flag/2.0.0: + resolution: + integrity: sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= + /has/1.0.1: + dependencies: + function-bind: 1.1.1 + resolution: + integrity: sha1-hGFzP1OLCDfJNh45qauelwTcLyg= + /inflight/1.0.6: + dependencies: + once: 1.4.0 + wrappy: 1.0.2 + resolution: + integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + /inherits/2.0.3: + resolution: + integrity: sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + /is-callable/1.1.3: + resolution: + integrity: sha1-hut1OSgF3cM69xySoO7fdO52BLI= + /is-date-object/1.0.1: + resolution: + integrity: sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= + /is-finite/1.0.2: + dependencies: + number-is-nan: 1.0.1 + resolution: + integrity: sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= + /is-function/1.0.1: + resolution: + integrity: sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU= + /is-regex/1.0.4: + dependencies: + has: 1.0.1 + resolution: + integrity: sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= + /is-symbol/1.0.1: + resolution: + integrity: sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI= + /isarray/1.0.0: + resolution: + integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + /js-yaml/3.9.1: + dependencies: + argparse: 1.0.9 + esprima: 4.0.0 + resolution: + integrity: sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww== + /jsondiffpatch/0.1.43: + dependencies: + chalk: 0.5.1 + resolution: + integrity: sha1-wFKImpnvfroZ0AlfkPclz6cKVhE= + /make-error/1.3.0: + resolution: + integrity: sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y= + /minimatch/3.0.4: + dependencies: + brace-expansion: 1.1.8 + resolution: + integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + /minimist/0.0.8: + resolution: + integrity: sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= + /minimist/1.2.0: + resolution: + integrity: sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + /mkdirp/0.5.1: + dependencies: + minimist: 0.0.8 + resolution: + integrity: sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + /mos-tap-diff/1.0.0: + dependencies: + babel-runtime: 6.26.0 + chalk: 1.1.3 + core-js: 2.5.1 + diff: 2.2.3 + duplexer: 0.1.1 + figures: 1.7.0 + jsondiffpatch: 0.1.43 + pretty-ms: 2.1.0 + tap-parser: 1.3.2 + through2: 2.0.3 + resolution: + integrity: sha1-NDOB0f2e1RljsLMVNbf9i64E/3A= + /number-is-nan/1.0.1: + resolution: + integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + /object-assign/4.1.1: + resolution: + integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + /object-inspect/1.3.0: + resolution: + integrity: sha512-OHHnLgLNXpM++GnJRyyhbr2bwl3pPVm4YvaraHrRvDt/N3r+s/gDVHciA7EJBTkijKXj61ssgSAikq1fb0IBRg== + /object-keys/1.0.11: + resolution: + integrity: sha1-xUYBd4rVYPEULODgG8yotW0TQm0= + /once/1.4.0: + dependencies: + wrappy: 1.0.2 + resolution: + integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + /parse-ms/1.0.1: + resolution: + integrity: sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0= + /path-is-absolute/1.0.1: + resolution: + integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + /path-parse/1.0.5: + resolution: + integrity: sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME= + /plur/1.0.0: + resolution: + integrity: sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY= + /pretty-ms/2.1.0: + dependencies: + is-finite: 1.0.2 + parse-ms: 1.0.1 + plur: 1.0.0 + resolution: + integrity: sha1-QlfCVt8/sLRR1q/6qwIYhBJpgdw= + /process-nextick-args/1.0.7: + resolution: + integrity: sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= + /readable-stream/2.3.3: + dependencies: + core-util-is: 1.0.2 + inherits: 2.0.3 + isarray: 1.0.0 + process-nextick-args: 1.0.7 + safe-buffer: 5.1.1 + string_decoder: 1.0.3 + util-deprecate: 1.0.2 + resolution: + integrity: sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== + /regenerator-runtime/0.11.0: + resolution: + integrity: sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A== + /resolve/1.4.0: + dependencies: + path-parse: 1.0.5 + resolution: + integrity: sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q== + /resumer/0.0.0: + dependencies: + through: 2.3.8 + resolution: + integrity: sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k= + /safe-buffer/5.1.1: + resolution: + integrity: sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== + /source-map-support/0.4.17: + dependencies: + source-map: 0.5.7 + resolution: + integrity: sha512-30c1Ch8FSjV0FwC253iftbbj0dU/OXoSg1LAEGZJUlGgjTNj6cu+DVqJWWIZJY5RXLWV4eFtR+4ouo0VIOYOTg== + /source-map/0.5.7: + resolution: + integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + /sprintf-js/1.0.3: + resolution: + integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + /string.prototype.trim/1.1.2: + dependencies: + define-properties: 1.1.2 + es-abstract: 1.8.1 + function-bind: 1.1.1 + resolution: + integrity: sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo= + /string_decoder/1.0.3: + dependencies: + safe-buffer: 5.1.1 + resolution: + integrity: sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== + /strip-ansi/0.3.0: + dependencies: + ansi-regex: 0.2.1 + resolution: + integrity: sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA= + /strip-ansi/3.0.1: + dependencies: + ansi-regex: 2.1.1 + resolution: + integrity: sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + /strip-bom/3.0.0: + resolution: + integrity: sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= + /strip-json-comments/2.0.1: + resolution: + integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= + /supports-color/0.2.0: + resolution: + integrity: sha1-2S3iaU6z9nMjlz1649i1W0wiGQo= + /supports-color/2.0.0: + resolution: + integrity: sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + /supports-color/4.4.0: + dependencies: + has-flag: 2.0.0 + resolution: + integrity: sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ== + /tap-parser/1.3.2: + dependencies: + events-to-array: 1.1.2 + inherits: 2.0.3 + js-yaml: 3.9.1 + optionalDependencies: + readable-stream: 2.3.3 + resolution: + integrity: sha1-EgxQiciMPIp5PvKIhn3jIeGPjCI= + /tape/4.8.0: + dependencies: + deep-equal: 1.0.1 + defined: 1.0.0 + for-each: 0.3.2 + function-bind: 1.1.1 + glob: 7.1.2 + has: 1.0.1 + inherits: 2.0.3 + minimist: 1.2.0 + object-inspect: 1.3.0 + resolve: 1.4.0 + resumer: 0.0.0 + string.prototype.trim: 1.1.2 + through: 2.3.8 + resolution: + integrity: sha512-TWILfEnvO7I8mFe35d98F6T5fbLaEtbFTG/lxWvid8qDfFTxt19EBijWmB4j3+Hoh5TfHE2faWs73ua+EphuBA== + /through/2.3.8: + resolution: + integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + /through2/2.0.3: + dependencies: + readable-stream: 2.3.3 + xtend: 4.0.1 + resolution: + integrity: sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= + /ts-node/3.3.0: + dependencies: + arrify: 1.0.1 + chalk: 2.1.0 + diff: 3.3.1 + make-error: 1.3.0 + minimist: 1.2.0 + mkdirp: 0.5.1 + source-map-support: 0.4.17 + tsconfig: 6.0.0 + v8flags: 3.0.0 + yn: 2.0.0 + resolution: + integrity: sha1-wTxqMCTjC+EYDdUwOPwgkonUv2k= + /tsconfig/6.0.0: + dependencies: + strip-bom: 3.0.0 + strip-json-comments: 2.0.1 + resolution: + integrity: sha1-aw6DdgA9evGGT434+J3QBZ/80DI= + /user-home/1.1.1: + resolution: + integrity: sha1-K1viOjK2Onyd640PKNSFcko98ZA= + /util-deprecate/1.0.2: + resolution: + integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + /v8flags/3.0.0: + dependencies: + user-home: 1.1.1 + resolution: + integrity: sha512-AGl+C+4qpeSu2g3JxCD/mGFFOs/vVZ3XREkD3ibQXEqr4Y4zgIrPWW124/IKJFHOIVFIoH8miWrLf0o84HYjwA== + /wrappy/1.0.2: + resolution: + integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + /xtend/4.0.1: + resolution: + integrity: sha1-pcbVMr5lbiPbgg77lDofBJmNY68= + /yn/2.0.0: + resolution: + integrity: sha1-5a2ryKz0CPY4X8dklWhMiOavaJo= +registry: 'https://registry.npmjs.org/' +shrinkwrapVersion: 3 +specifiers: + '@types/tape': ^4.2.30 + mos-tap-diff: ^1.0.0 + tape: ^4.8.0 + ts-node: ^3.3.0 From 7ccb9836a51c6c12a5d0cdfb72fffc243fd6a93b Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 5 Sep 2017 19:22:40 +0300 Subject: [PATCH 052/196] test: fix on Windows EOLs are normalized before comparing expected with actual output --- test/index.ts | 7 ++++--- test/package.json | 1 + test/shrinkwrap.yaml | 5 +++++ typings/local.d.ts | 5 +++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/test/index.ts b/test/index.ts index 1065be1df0..31fa0946f7 100644 --- a/test/index.ts +++ b/test/index.ts @@ -8,6 +8,7 @@ import logger, { summaryLogger, lifecycleLogger, } from 'pnpm-logger' +import normalizeNewline = require('normalize-newline') import {toOutput$} from '../src' import {stripIndents} from 'common-tags' import chalk = require('chalk') @@ -84,7 +85,7 @@ test('moves fixed line to the end', t => { t.plan(1) - output$.drop(3).take(1).subscribe({ + output$.drop(3).take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` ${WARN} foo @@ -155,7 +156,7 @@ test('prints summary', t => { t.plan(1) - output$.drop(1).take(1).subscribe({ + output$.drop(1).take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` ${WARN} ${DEPRECATED} bar@2.0.0: This package was deprecated because bla bla bla @@ -205,7 +206,7 @@ test('prints lifecycle progress', t => { const pkgIdColor = chalk.blue const childOutputColor = chalk.grey - output$.drop(3).take(1).subscribe({ + output$.drop(3).take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` ${pkgIdColor('registry.npmjs.org/foo/1.0.0')} ${childOutputColor('foo I')} diff --git a/test/package.json b/test/package.json index 516268c0e2..353962952a 100644 --- a/test/package.json +++ b/test/package.json @@ -6,6 +6,7 @@ "dependencies": { "@types/tape": "^4.2.30", "mos-tap-diff": "^1.0.0", + "normalize-newline": "^3.0.0", "tape": "^4.8.0", "ts-node": "^3.3.0" } diff --git a/test/shrinkwrap.yaml b/test/shrinkwrap.yaml index 7493eb87e9..3858022114 100644 --- a/test/shrinkwrap.yaml +++ b/test/shrinkwrap.yaml @@ -1,6 +1,7 @@ dependencies: '@types/tape': 4.2.30 mos-tap-diff: 1.0.0 + normalize-newline: 3.0.0 tape: 4.8.0 ts-node: 3.3.0 packages: @@ -266,6 +267,9 @@ packages: through2: 2.0.3 resolution: integrity: sha1-NDOB0f2e1RljsLMVNbf9i64E/3A= + /normalize-newline/3.0.0: + resolution: + integrity: sha1-HL6oBKukNgAfg5OKsh7AOdaa6dM= /number-is-nan/1.0.1: resolution: integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= @@ -462,5 +466,6 @@ shrinkwrapVersion: 3 specifiers: '@types/tape': ^4.2.30 mos-tap-diff: ^1.0.0 + normalize-newline: ^3.0.0 tape: ^4.8.0 ts-node: ^3.3.0 diff --git a/typings/local.d.ts b/typings/local.d.ts index 2f3fd9838c..19242caaca 100644 --- a/typings/local.d.ts +++ b/typings/local.d.ts @@ -7,3 +7,8 @@ declare module 'ndjson' { const anything: any; export = anything; } + +declare module 'normalize-newline' { + const anything: any; + export = anything; +} From 36031d4553c4d594b9a6245b0b69c845f7d8e88a Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 6 Sep 2017 00:53:06 +0300 Subject: [PATCH 053/196] feat: show progress of big tar downloads Ref https://github.com/pnpm/pnpm/issues/879 --- package.json | 5 +- shrinkwrap.yaml | 13 +++-- src/index.ts | 23 +++++++- test/index.ts | 131 +++++++++++++++++++++++++++++++++++++++++++++ typings/local.d.ts | 5 ++ 5 files changed, 170 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index fb498ffdd3..7528c1e0df 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "pnpm-logger": "^0.5.4" + "pnpm-logger": "^0.6.0" }, "dependencies": { "@types/chalk": "^0.4.31", @@ -40,13 +40,14 @@ "common-tags": "^1.4.0", "log-update": "^2.0.0", "ndjson": "^1.5.0", + "pretty-bytes": "^4.0.2", "ramda": "^0.24.1", "xstream": "^10.9.0" }, "devDependencies": { "commitizen": "^2.9.5", "ghooks": "^2.0.0", - "pnpm-logger": "^0.5.5", + "pnpm-logger": "^0.6.0", "rimraf": "^2.5.4", "tslint": "^4.3.1", "typescript": "^2.1.5", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 42cd2c063c..74a613f93d 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -7,12 +7,13 @@ dependencies: common-tags: 1.4.0 log-update: 2.1.0 ndjson: 1.5.0 + pretty-bytes: 4.0.2 ramda: 0.24.1 xstream: 10.9.0 devDependencies: commitizen: 2.9.6 ghooks: 2.0.0 - pnpm-logger: 0.5.5 + pnpm-logger: 0.6.0 rimraf: 2.6.1 tslint: 4.5.1 typescript: 2.4.2 @@ -1050,14 +1051,14 @@ packages: dev: true resolution: integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - /pnpm-logger/0.5.5: + /pnpm-logger/0.6.0: dependencies: '@types/node': 8.0.17 bole: 3.0.2 ndjson: 1.5.0 dev: true resolution: - integrity: sha512-UQxSK3M6xrUZErgo2feYknlkRILLh8pGQAsSv4EHeU6npVCGNQwDb8wN+O6l17jdEa+XUXcjmgdhz2C9XJ5n1A== + integrity: sha512-nnfR7C8PzBfYCorvmIYDThBydWdBQOih51kQRSM5oi4bGQJd/DWpqORGolhdK5ZSdpVFokMmN2xJjpIXAc4Ysw== /prepend-http/1.0.4: dev: true resolution: @@ -1066,6 +1067,9 @@ packages: dev: true resolution: integrity: sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= + /pretty-bytes/4.0.2: + resolution: + integrity: sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk= /process-nextick-args/1.0.7: resolution: integrity: sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= @@ -1467,7 +1471,8 @@ specifiers: ghooks: ^2.0.0 log-update: ^2.0.0 ndjson: ^1.5.0 - pnpm-logger: ^0.5.5 + pnpm-logger: ^0.6.0 + pretty-bytes: ^4.0.2 ramda: ^0.24.1 rimraf: ^2.5.4 tslint: ^4.3.1 diff --git a/src/index.ts b/src/index.ts index 78377289f3..0069c19e42 100644 --- a/src/index.ts +++ b/src/index.ts @@ -16,6 +16,7 @@ import dropRepeats from 'xstream/extra/dropRepeats' import fromEvent from 'xstream/extra/fromEvent' import R = require('ramda') import {EventEmitter} from 'events' +import prettyBytes = require('pretty-bytes') const EOL = os.EOL @@ -44,7 +45,7 @@ export default function (streamParser: Object) { }) } -export function toOutput$ (streamParser: Object) { +export function toOutput$ (streamParser: Object): Stream { const obs = fromEvent(streamParser as EventEmitter, 'data') const log$ = xs.fromObservable(obs) @@ -94,6 +95,25 @@ export function toOutput$ (streamParser: Object) { ) ) + const tarballsProgressOutput$ = progressLog$ + .filter(log => log.status === 'fetching_started' && + typeof log.size === 'number' && log.size >= 1024 * 1024) + .map(startedLog => { + const size = prettyBytes(startedLog['size']) + return progressLog$ + .filter(log => log.status === 'fetching_progress' && log.pkgId === startedLog['pkgId']) + .map(log => log['downloaded']) + .startWith(0) + .map(downloadedRaw => { + const done = startedLog['size'] === downloadedRaw + const downloaded = prettyBytes(downloadedRaw) + return { + msg: `Downloading ${startedLog['pkgId']}: ${downloaded}/${size}${done ? ', done' : ''}`, + fixed: !done, + } + }) + }) + const deprecationLog$ = log$ .filter(log => log.name === 'pnpm:deprecation') as Stream @@ -219,6 +239,7 @@ export function toOutput$ (streamParser: Object) { lifecycleOutput$, deprecationOutput$, miscOutput$, + tarballsProgressOutput$, ) .map((log: Stream<{msg: string, fixed: boolean}>) => { let currentBlockNo = -1 diff --git a/test/index.ts b/test/index.ts index 31fa0946f7..5e5efbcc65 100644 --- a/test/index.ts +++ b/test/index.ts @@ -12,6 +12,7 @@ import normalizeNewline = require('normalize-newline') import {toOutput$} from '../src' import {stripIndents} from 'common-tags' import chalk = require('chalk') +import xs, {Stream} from 'xstream' const WARN = chalk.yellow('WARN') const ERROR = chalk.red('ERROR') @@ -251,3 +252,133 @@ test('prints info', t => { error: t.end, }) }) + +test('prints progress of big files download', t => { + let output$ = toOutput$(createStreamParser()).map(normalizeNewline) as Stream + const stream$: Stream[] = [] + + const pkgId1 = 'registry.npmjs.org/foo/1.0.0' + const pkgId2 = 'registry.npmjs.org/bar/2.0.0' + const pkgId3 = 'registry.npmjs.org/qar/3.0.0' + + progressLogger.debug({ + status: 'resolving_content', + pkgId: pkgId1, + }) + + stream$.push( + output$.take(1) + .debug(output => t.equal(output, 'Resolving: total 1, reused 0, downloaded 0')) + ) + + output$ = output$.drop(1) + + progressLogger.debug({ + status: 'fetching_started', + pkgId: pkgId1, + size: 1024 * 1024 * 10, // 10 MB + }) + + stream$.push( + output$.take(1) + .debug(output => t.equal(output, stripIndents` + Resolving: total 1, reused 0, downloaded 0 + Downloading ${pkgId1}: 0 B/10.5 MB + `)) + ) + + output$ = output$.drop(1) + + progressLogger.debug({ + status: 'fetching_progress', + pkgId: pkgId1, + downloaded: 1024 * 1024 * 5.5, // 5.5 MB + }) + + stream$.push( + output$.take(1) + .debug(output => t.equal(output, stripIndents` + Resolving: total 1, reused 0, downloaded 0 + Downloading ${pkgId1}: 5.77 MB/10.5 MB + `)) + ) + + output$ = output$.drop(1) + + progressLogger.debug({ + status: 'resolving_content', + pkgId: pkgId2, + }) + + progressLogger.debug({ + status: 'fetching_started', + pkgId: pkgId1, + size: 10, // 10 B + }) + + progressLogger.debug({ + status: 'fetching_progress', + pkgId: pkgId1, + downloaded: 1024 * 1024 * 7, + }) + + stream$.push( + output$.drop(1).take(1) + .debug(output => t.equal(output, stripIndents` + Resolving: total 2, reused 0, downloaded 0 + Downloading ${pkgId1}: 7.34 MB/10.5 MB + `, 'downloading of small package not reported')) + ) + + output$ = output$.drop(2) + + progressLogger.debug({ + status: 'resolving_content', + pkgId: pkgId3, + }) + + progressLogger.debug({ + status: 'fetching_started', + pkgId: pkgId3, + size: 1024 * 1024 * 20, // 20 MB + }) + + progressLogger.debug({ + status: 'fetching_progress', + pkgId: pkgId3, + downloaded: 1024 * 1024 * 19, // 19 MB + }) + + stream$.push( + output$.drop(2).take(1) + .debug(output => t.equal(output, stripIndents` + Resolving: total 3, reused 0, downloaded 0 + Downloading ${pkgId1}: 7.34 MB/10.5 MB + Downloading ${pkgId3}: 19.9 MB/21 MB + `)) + ) + + output$ = output$.drop(3) + + progressLogger.debug({ + status: 'fetching_progress', + pkgId: pkgId1, + downloaded: 1024 * 1024 * 10, // 10 MB + }) + + stream$.push( + output$.take(1) + .debug(output => t.equal(output, stripIndents` + Downloading ${pkgId1}: 10.5 MB/10.5 MB, done + Resolving: total 3, reused 0, downloaded 0 + Downloading ${pkgId3}: 19.9 MB/21 MB + `)) + ) + + xs.combine + .apply(xs, stream$) + .subscribe({ + complete: t.end, + error: t.end, + }) +}) diff --git a/typings/local.d.ts b/typings/local.d.ts index 19242caaca..db14a3be5b 100644 --- a/typings/local.d.ts +++ b/typings/local.d.ts @@ -12,3 +12,8 @@ declare module 'normalize-newline' { const anything: any; export = anything; } + +declare module 'pretty-bytes' { + const anything: any; + export = anything; +} From 34b1ed817c2812f86c9242a45767f765fb59e021 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 6 Sep 2017 02:37:58 +0300 Subject: [PATCH 054/196] chore(release): 0.9.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7528c1e0df..5f544c0ba2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.8.2", + "version": "0.9.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 16d7a43b23094953924e10432211bd72e0071f70 Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 6 Sep 2017 22:15:57 +0300 Subject: [PATCH 055/196] feat: update chalk to version 2 --- package.json | 2 +- shrinkwrap.yaml | 129 +++++++++++++++++++++++------------------------- 2 files changed, 63 insertions(+), 68 deletions(-) diff --git a/package.json b/package.json index 5f544c0ba2..8c55216686 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@types/common-tags": "^1.2.5", "@types/node": "^7.0.0", "@types/ramda": "^0.24.9", - "chalk": "^1.1.3", + "chalk": "^2.1.0", "common-tags": "^1.4.0", "log-update": "^2.0.0", "ndjson": "^1.5.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 74a613f93d..cfadb528ef 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,9 +1,9 @@ dependencies: '@types/chalk': 0.4.31 '@types/common-tags': 1.2.5 - '@types/node': 7.0.39 + '@types/node': 7.0.43 '@types/ramda': 0.24.9 - chalk: 1.1.3 + chalk: 2.1.0 common-tags: 1.4.0 log-update: 2.1.0 ndjson: 1.5.0 @@ -16,8 +16,8 @@ devDependencies: pnpm-logger: 0.6.0 rimraf: 2.6.1 tslint: 4.5.1 - typescript: 2.4.2 - validate-commit-msg: 2.13.1 + typescript: 2.5.2 + validate-commit-msg: 2.14.0 packages: /@types/chalk/0.4.31: resolution: @@ -25,13 +25,13 @@ packages: /@types/common-tags/1.2.5: resolution: integrity: sha1-FPKYk5kusyVZS4PXOa8C8rZSD0Y= - /@types/node/7.0.39: + /@types/node/7.0.43: resolution: - integrity: sha512-KQHAZeVsk4UIT9XaR6cn4WpHZzimK6UBD1UomQKfQQFmTlUHaNBzeuov+TM4+kigLO0IJt4I5OOsshcCyA9gSA== - /@types/node/8.0.17: + integrity: sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ== + /@types/node/8.0.26: dev: true resolution: - integrity: sha512-iq0LxqG6P9GV/2bVA2AQAQ58NvneLdVDVs9dJ+88Jk6gDK9opNC0SushdYqlAyvxo0dk0NJjTKCenq/l3AKtuA== + integrity: sha512-wbKN0MB4XsjdnSE04HiCzLoBDirGCM6zXrqavSj44nZnPFYpnrTF64E9O6Xmf0ca/IuKK/BHUcXwMiwk92gW6Q== /@types/ramda/0.24.9: resolution: integrity: sha512-VFBycWFpzbhDIK7afthxUiDSfXfhfsQ4uYzguflDiH/iMbAumzNS53mnE8bzvLay8bKuCCsZwt20c3SPs9nw6Q== @@ -49,18 +49,19 @@ packages: resolution: integrity: sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs= /ansi-regex/2.1.1: + dev: true resolution: integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8= /ansi-regex/3.0.0: resolution: integrity: sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= /ansi-styles/2.2.1: + dev: true resolution: integrity: sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= /ansi-styles/3.2.0: dependencies: color-convert: 1.9.0 - dev: true resolution: integrity: sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug== /arr-diff/2.0.0: @@ -77,20 +78,20 @@ packages: dev: true resolution: integrity: sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= - /babel-code-frame/6.22.0: + /babel-code-frame/6.26.0: dependencies: chalk: 1.1.3 esutils: 2.0.2 js-tokens: 3.0.2 dev: true resolution: - integrity: sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ= - /babel-runtime/6.25.0: + integrity: sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= + /babel-runtime/6.26.0: dependencies: - core-js: 2.4.1 - regenerator-runtime: 0.10.5 + core-js: 2.5.1 + regenerator-runtime: 0.11.0 resolution: - integrity: sha1-M7mOql1IK7AajRqmtDetKwGuxBw= + integrity: sha1-llxwWGaOgrVde/4E/yM3vItWR/4= /balanced-match/1.0.0: dev: true resolution: @@ -106,7 +107,7 @@ packages: dependencies: ansi-align: 2.0.0 camelcase: 4.1.0 - chalk: 2.0.1 + chalk: 2.1.0 cli-boxes: 1.0.0 string-width: 2.1.1 term-size: 1.2.0 @@ -150,16 +151,16 @@ packages: has-ansi: 2.0.0 strip-ansi: 3.0.1 supports-color: 2.0.0 + dev: true resolution: integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - /chalk/2.0.1: + /chalk/2.1.0: dependencies: ansi-styles: 3.2.0 escape-string-regexp: 1.0.5 - supports-color: 4.2.1 - dev: true + supports-color: 4.4.0 resolution: - integrity: sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g== + integrity: sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ== /cli-boxes/1.0.0: dev: true resolution: @@ -175,10 +176,10 @@ packages: restore-cursor: 2.0.0 resolution: integrity: sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= - /cli-width/2.1.0: + /cli-width/2.2.0: dev: true resolution: - integrity: sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao= + integrity: sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= /code-point-at/1.1.0: dev: true resolution: @@ -186,11 +187,9 @@ packages: /color-convert/1.9.0: dependencies: color-name: 1.1.3 - dev: true resolution: integrity: sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o= /color-name/1.1.3: - dev: true resolution: integrity: sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= /colors/0.6.2: @@ -233,7 +232,7 @@ packages: integrity: sha1-wNAFNe8mTaf2Nzft/aQiiYP6IpE= /common-tags/1.4.0: dependencies: - babel-runtime: 6.25.0 + babel-runtime: 6.26.0 resolution: integrity: sha1-EYe+Tz1M8MBCfUP3Tu8fc1AWFMA= /concat-map/0.0.1: @@ -254,7 +253,7 @@ packages: graceful-fs: 4.1.11 make-dir: 1.0.0 unique-string: 1.0.0 - write-file-atomic: 2.1.0 + write-file-atomic: 2.3.0 xdg-basedir: 3.0.0 dev: true resolution: @@ -263,9 +262,9 @@ packages: dev: true resolution: integrity: sha1-XblXOdbCEqy+e29lahG5QLqmiUY= - /core-js/2.4.1: + /core-js/2.5.1: resolution: - integrity: sha1-TekR5mew6ukSTjQlS1OupvxhjT4= + integrity: sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs= /core-util-is/1.0.2: resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= @@ -278,7 +277,7 @@ packages: /cross-spawn-async/2.2.5: dependencies: lru-cache: 4.1.1 - which: 1.2.14 + which: 1.3.0 dev: true resolution: integrity: sha1-hF/wwINKPe2dFg2sptOQkGuyiMw= @@ -286,7 +285,7 @@ packages: dependencies: lru-cache: 4.1.1 shebang-command: 1.2.0 - which: 1.2.14 + which: 1.3.0 dev: true resolution: integrity: sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= @@ -325,10 +324,10 @@ packages: dev: true resolution: integrity: sha1-920GQ1LN9Docts5hnE7jqUdd4gg= - /diff/3.3.0: + /diff/3.3.1: dev: true resolution: - integrity: sha512-w0XZubFWn0Adlsapj9EAWX0FqWdO4tz8kc3RiYdWLh4k/V8PTb6i0SMgXt0vRM3zyKnT8tKO7mUlieRQHIjMNg== + integrity: sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww== /dot-prop/4.2.0: dependencies: is-obj: 1.0.1 @@ -570,7 +569,7 @@ packages: homedir-polyfill: 1.0.1 ini: 1.3.4 is-windows: 0.2.0 - which: 1.2.14 + which: 1.3.0 dev: true resolution: integrity: sha1-jTvGuNo8qBEqFg2NSW/wRiv+948= @@ -601,10 +600,10 @@ packages: /has-ansi/2.0.0: dependencies: ansi-regex: 2.1.1 + dev: true resolution: integrity: sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= /has-flag/2.0.0: - dev: true resolution: integrity: sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= /homedir-polyfill/1.0.1: @@ -644,7 +643,7 @@ packages: ansi-escapes: 1.4.0 chalk: 1.1.3 cli-cursor: 1.0.2 - cli-width: 2.1.0 + cli-width: 2.2.0 external-editor: 1.1.1 figures: 1.7.0 lodash: 4.17.4 @@ -875,7 +874,7 @@ packages: normalize-path: 2.1.1 object.omit: 2.0.1 parse-glob: 3.0.4 - regex-cache: 0.4.3 + regex-cache: 0.4.4 dev: true resolution: integrity: sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= @@ -909,7 +908,7 @@ packages: integrity: sha1-rmA7NrE0vOw0e0UkIrC/mNWDLsg= /normalize-path/2.1.1: dependencies: - remove-trailing-separator: 1.0.2 + remove-trailing-separator: 1.1.0 dev: true resolution: integrity: sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= @@ -1053,7 +1052,7 @@ packages: integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= /pnpm-logger/0.6.0: dependencies: - '@types/node': 8.0.17 + '@types/node': 8.0.26 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -1113,16 +1112,15 @@ packages: dev: true resolution: integrity: sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= - /regenerator-runtime/0.10.5: + /regenerator-runtime/0.11.0: resolution: - integrity: sha1-M2w+/BIgrc7dosn6tntaeVWjNlg= - /regex-cache/0.4.3: + integrity: sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A== + /regex-cache/0.4.4: dependencies: is-equal-shallow: 0.1.3 - is-primitive: 2.0.0 dev: true resolution: - integrity: sha1-mxpsNdTQ3871cRrmUejp09cRQUU= + integrity: sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ== /registry-auth-token/3.3.1: dependencies: rc: 1.2.1 @@ -1136,10 +1134,10 @@ packages: dev: true resolution: integrity: sha1-PU74cPc93h138M+aOBQyRE4XSUI= - /remove-trailing-separator/1.0.2: + /remove-trailing-separator/1.1.0: dev: true resolution: - integrity: sha1-abBi2XhyetFNxrVrpKt3L9jXBRE= + integrity: sha1-wkvOKig62tW8P1jg1IJJuSN52O8= /repeat-element/1.1.2: dev: true resolution: @@ -1238,10 +1236,6 @@ packages: /signal-exit/3.0.2: resolution: integrity: sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= - /slide/1.1.6: - dev: true - resolution: - integrity: sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= /spawn-command/0.0.2: dev: true resolution: @@ -1284,6 +1278,7 @@ packages: /strip-ansi/3.0.1: dependencies: ansi-regex: 2.1.1 + dev: true resolution: integrity: sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= /strip-ansi/4.0.0: @@ -1300,14 +1295,14 @@ packages: resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= /supports-color/2.0.0: - resolution: - integrity: sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - /supports-color/4.2.1: - dependencies: - has-flag: 2.0.0 dev: true resolution: - integrity: sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA== + integrity: sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= + /supports-color/4.4.0: + dependencies: + has-flag: 2.0.0 + resolution: + integrity: sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ== /symbol-observable/1.0.4: resolution: integrity: sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0= @@ -1339,9 +1334,9 @@ packages: integrity: sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA= /tslint/4.5.1: dependencies: - babel-code-frame: 6.22.0 + babel-code-frame: 6.26.0 colors: 1.1.2 - diff: 3.3.0 + diff: 3.3.1 findup-sync: 0.3.0 glob: 7.1.2 optimist: 0.6.1 @@ -1359,10 +1354,10 @@ packages: dev: true resolution: integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - /typescript/2.4.2: + /typescript/2.5.2: dev: true resolution: - integrity: sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ= + integrity: sha1-A4qV99m7tCCxvzW6MdTFwd0//jQ= /unique-string/1.0.0: dependencies: crypto-random-string: 1.0.0 @@ -1395,7 +1390,7 @@ packages: /util-deprecate/1.0.2: resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - /validate-commit-msg/2.13.1: + /validate-commit-msg/2.14.0: dependencies: conventional-commit-types: 2.2.0 find-parent-dir: 0.3.0 @@ -1403,13 +1398,13 @@ packages: semver-regex: 1.0.0 dev: true resolution: - integrity: sha1-cThupFNJxJcOCRKW8TLc9n3FBxQ= - /which/1.2.14: + integrity: sha1-5Tg2kQEsuycNzAvCpO/+vhSJDqw= + /which/1.3.0: dependencies: isexe: 2.0.0 dev: true resolution: - integrity: sha1-mofEN48D6CfOyvGs31bHNsAcFOU= + integrity: sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg== /widest-line/1.0.0: dependencies: string-width: 1.0.2 @@ -1434,14 +1429,14 @@ packages: dev: true resolution: integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - /write-file-atomic/2.1.0: + /write-file-atomic/2.3.0: dependencies: graceful-fs: 4.1.11 imurmurhash: 0.1.4 - slide: 1.1.6 + signal-exit: 3.0.2 dev: true resolution: - integrity: sha512-0TZ20a+xcIl4u0+Mj5xDH2yOWdmQiXlKf9Hm+TgDXjTMsEYb+gDrmb8e8UNAzMCitX8NBqG4Z/FUQIyzv/R1JQ== + integrity: sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA== /xdg-basedir/3.0.0: dev: true resolution: @@ -1465,7 +1460,7 @@ specifiers: '@types/common-tags': ^1.2.5 '@types/node': ^7.0.0 '@types/ramda': ^0.24.9 - chalk: ^1.1.3 + chalk: ^2.1.0 commitizen: ^2.9.5 common-tags: ^1.4.0 ghooks: ^2.0.0 From a4198146740dc52ac6a8ab7539d1815ed80542a1 Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 6 Sep 2017 22:55:13 +0300 Subject: [PATCH 056/196] feat: highlight values and dim non-active lines --- src/index.ts | 19 ++++++++++++++++--- test/index.ts | 34 ++++++++++++++++++---------------- 2 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src/index.ts b/src/index.ts index 0069c19e42..d364b2656a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -22,6 +22,8 @@ const EOL = os.EOL const addedSign = chalk.green('+') const removedSign = chalk.red('-') +const hlValue = chalk.blue +const hlPkgId = chalk['whiteBright'] type PackageDiff = { name: string, @@ -80,7 +82,7 @@ export function toOutput$ (streamParser: Object): Stream { ) .map( R.apply((resolving, fetched, foundInStore: number, resolutionDone) => { - const msg = `Resolving: total ${resolving}, reused ${foundInStore}, downloaded ${fetched}` + const msg = `Resolving: total ${hlValue(resolving.toString())}, reused ${hlValue(foundInStore.toString())}, downloaded ${hlValue(fetched.toString())}` if (resolving === foundInStore + fetched && resolutionDone) { return { fixed: false, @@ -108,7 +110,7 @@ export function toOutput$ (streamParser: Object): Stream { const done = startedLog['size'] === downloadedRaw const downloaded = prettyBytes(downloadedRaw) return { - msg: `Downloading ${startedLog['pkgId']}: ${downloaded}/${size}${done ? ', done' : ''}`, + msg: `Downloading ${hlPkgId(startedLog['pkgId'])}: ${hlValue(downloaded)}/${hlValue(size)}${done ? ', done' : ''}`, fixed: !done, } }) @@ -281,7 +283,18 @@ export function toOutput$ (streamParser: Object): Stream { } return acc }, {fixedBlocks: [], blocks: []} as {fixedBlocks: string[], blocks: string[]}) - .map(sections => (sections.blocks.concat(sections.fixedBlocks)).filter(Boolean).join(EOL)) + .map(sections => { + const fixedBlocks = sections.fixedBlocks.filter(Boolean) + const nonFixedPart = sections.blocks.filter(Boolean).join(EOL) + if (!fixedBlocks.length) { + return nonFixedPart + } + const fixedPart = fixedBlocks.join(EOL) + if (!nonFixedPart) { + return fixedPart + } + return chalk.dim(nonFixedPart) + EOL + fixedPart + }) .filter(msg => { if (started) { return true diff --git a/test/index.ts b/test/index.ts index 5e5efbcc65..af95556541 100644 --- a/test/index.ts +++ b/test/index.ts @@ -21,6 +21,8 @@ const versionColor = chalk.grey const ADD = chalk.green('+') const SUB = chalk.red('-') const h1 = chalk.blue +const hlValue = chalk.blue +const hlPkgId = chalk['whiteBright'] test('prints progress beginning', t => { const output$ = toOutput$(createStreamParser()) @@ -36,7 +38,7 @@ test('prints progress beginning', t => { output$.take(1).subscribe({ next: output => { - t.equal(output, 'Resolving: total 1, reused 0, downloaded 0') + t.equal(output, `Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')}`) }, error: t.end, complete: t.end, @@ -61,7 +63,7 @@ test('prints progress on first download', t => { output$.drop(1).take(1).subscribe({ next: output => { - t.equal(output, 'Resolving: total 1, reused 0, downloaded 1') + t.equal(output, `Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('1')}`) }, complete: t.end, error: t.end, @@ -90,7 +92,7 @@ test('moves fixed line to the end', t => { next: output => { t.equal(output, stripIndents` ${WARN} foo - Resolving: total 1, reused 0, downloaded 1, done + Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('1')}, done `) }, complete: t.end, @@ -268,7 +270,7 @@ test('prints progress of big files download', t => { stream$.push( output$.take(1) - .debug(output => t.equal(output, 'Resolving: total 1, reused 0, downloaded 0')) + .debug(output => t.equal(output, `Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')}`)) ) output$ = output$.drop(1) @@ -282,8 +284,8 @@ test('prints progress of big files download', t => { stream$.push( output$.take(1) .debug(output => t.equal(output, stripIndents` - Resolving: total 1, reused 0, downloaded 0 - Downloading ${pkgId1}: 0 B/10.5 MB + Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} + Downloading ${hlPkgId(pkgId1)}: ${hlValue('0 B')}/${hlValue('10.5 MB')} `)) ) @@ -298,8 +300,8 @@ test('prints progress of big files download', t => { stream$.push( output$.take(1) .debug(output => t.equal(output, stripIndents` - Resolving: total 1, reused 0, downloaded 0 - Downloading ${pkgId1}: 5.77 MB/10.5 MB + Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} + Downloading ${hlPkgId(pkgId1)}: ${hlValue('5.77 MB')}/${hlValue('10.5 MB')} `)) ) @@ -325,8 +327,8 @@ test('prints progress of big files download', t => { stream$.push( output$.drop(1).take(1) .debug(output => t.equal(output, stripIndents` - Resolving: total 2, reused 0, downloaded 0 - Downloading ${pkgId1}: 7.34 MB/10.5 MB + Resolving: total ${hlValue('2')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} + Downloading ${hlPkgId(pkgId1)}: ${hlValue('7.34 MB')}/${hlValue('10.5 MB')} `, 'downloading of small package not reported')) ) @@ -352,9 +354,9 @@ test('prints progress of big files download', t => { stream$.push( output$.drop(2).take(1) .debug(output => t.equal(output, stripIndents` - Resolving: total 3, reused 0, downloaded 0 - Downloading ${pkgId1}: 7.34 MB/10.5 MB - Downloading ${pkgId3}: 19.9 MB/21 MB + Resolving: total ${hlValue('3')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} + Downloading ${hlPkgId(pkgId1)}: ${hlValue('7.34 MB')}/${hlValue('10.5 MB')} + Downloading ${hlPkgId(pkgId3)}: ${hlValue('19.9 MB')}/${hlValue('21 MB')} `)) ) @@ -369,9 +371,9 @@ test('prints progress of big files download', t => { stream$.push( output$.take(1) .debug(output => t.equal(output, stripIndents` - Downloading ${pkgId1}: 10.5 MB/10.5 MB, done - Resolving: total 3, reused 0, downloaded 0 - Downloading ${pkgId3}: 19.9 MB/21 MB + ${chalk.dim(`Downloading ${hlPkgId(pkgId1)}: ${hlValue('10.5 MB')}/${hlValue('10.5 MB')}, done`)} + Resolving: total ${hlValue('3')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} + Downloading ${hlPkgId(pkgId3)}: ${hlValue('19.9 MB')}/${hlValue('21 MB')} `)) ) From 5bf7502cfba4d31acc8cd7a20597c65399d13f25 Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 6 Sep 2017 22:58:35 +0300 Subject: [PATCH 057/196] feat: only tarballs that are bigger than 5 MB are logged --- src/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index d364b2656a..bf07a29510 100644 --- a/src/index.ts +++ b/src/index.ts @@ -19,6 +19,7 @@ import {EventEmitter} from 'events' import prettyBytes = require('pretty-bytes') const EOL = os.EOL +const BIG_TARBALL_SIZE = 1024 * 1024 * 5 // 5 MB const addedSign = chalk.green('+') const removedSign = chalk.red('-') @@ -99,7 +100,7 @@ export function toOutput$ (streamParser: Object): Stream { const tarballsProgressOutput$ = progressLog$ .filter(log => log.status === 'fetching_started' && - typeof log.size === 'number' && log.size >= 1024 * 1024) + typeof log.size === 'number' && log.size >= BIG_TARBALL_SIZE) .map(startedLog => { const size = prettyBytes(startedLog['size']) return progressLog$ From d12a62e3e107e4bfa9ca05a1d463cee08c176bc0 Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 6 Sep 2017 23:05:56 +0300 Subject: [PATCH 058/196] chore(release): 0.9.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c55216686..59cd567c8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.9.0", + "version": "0.9.1", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 9352eb993ad346357ac01fe6f3e81c6340f3861c Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 10 Sep 2017 15:57:43 +0300 Subject: [PATCH 059/196] feat: print "Already up-to-date" message --- src/index.ts | 25 ++++++++++++++++++++----- test/index.ts | 18 ++++++++++++++++++ 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/index.ts b/src/index.ts index bf07a29510..72c7452c00 100644 --- a/src/index.ts +++ b/src/index.ts @@ -55,10 +55,17 @@ export function toOutput$ (streamParser: Object): Stream { const progressLog$ = log$ .filter(log => log.name === 'pnpm:progress') as Stream + const resolutionDone$ = log$ + .filter(log => log.name === 'pnpm:stage' && log.message === 'resolution_done') + .mapTo(true) + .take(1) + .startWith(false) + const resolvingContentLog$ = progressLog$ .filter(log => log.status === 'resolving_content') .fold(R.inc, 0) .drop(1) + .endWhen(resolutionDone$.last()) const fedtchedLog$ = progressLog$ .filter(log => log.status === 'fetched') @@ -68,11 +75,18 @@ export function toOutput$ (streamParser: Object): Stream { .filter(log => log.status === 'found_in_store') .fold(R.inc, 0) - const resolutionDone$ = log$ - .filter(log => log.name === 'pnpm:stage' && log.message === 'resolution_done') - .mapTo(true) - .take(1) - .startWith(false) + const alreadyUpToDate$ = xs.of( + resolvingContentLog$ + .take(1) + .mapTo(false) + .startWith(true) + .last() + .filter(R.equals(true)) + .mapTo({ + fixed: false, + msg: 'Already up-to-date', + }) + ) const progressSummaryOutput$ = xs.of( xs.combine( @@ -243,6 +257,7 @@ export function toOutput$ (streamParser: Object): Stream { deprecationOutput$, miscOutput$, tarballsProgressOutput$, + alreadyUpToDate$, ) .map((log: Stream<{msg: string, fixed: boolean}>) => { let currentBlockNo = -1 diff --git a/test/index.ts b/test/index.ts index af95556541..b4293d849e 100644 --- a/test/index.ts +++ b/test/index.ts @@ -100,6 +100,24 @@ test('moves fixed line to the end', t => { }) }) +test('prints "Already up-to-date"', t => { + const output$ = toOutput$(createStreamParser()) + + stageLogger.debug('resolution_done') + + t.plan(1) + + output$.take(1).map(normalizeNewline).subscribe({ + next: output => { + t.equal(output, stripIndents` + Already up-to-date + `) + }, + complete: t.end, + error: t.end, + }) +}) + test('prints summary', t => { const output$ = toOutput$(createStreamParser()) From 9060d879f7e03a9fc36aa1a8261e519b8d944578 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 10 Sep 2017 16:10:34 +0300 Subject: [PATCH 060/196] docs(README): add badge and install/license sections --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index d26f77e3ed..8a3d5d1077 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,15 @@ # pnpm-default-reporter +[![Status](https://travis-ci.org/pnpm/pnpm-default-reporter.svg?branch=master)](https://travis-ci.org/pnpm/pnpm-default-reporter "See test builds") + > The default reporter of pnpm + +## Install + +``` +npm install pnpm-default-reporter +``` + +## License + +[MIT](LICENSE) From cc70d04bd5c3747c7fb8ff0e7958c4448300180e Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 12 Sep 2017 22:57:08 +0300 Subject: [PATCH 061/196] chore(release): 0.9.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 59cd567c8d..bbb21b35fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.9.1", + "version": "0.9.2", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 723fbc01cf7c4a15c299c1fa6957232442c0cb0f Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 15 Sep 2017 01:49:06 +0300 Subject: [PATCH 062/196] feat: group lifecycle logs --- package.json | 4 +-- shrinkwrap.yaml | 8 ++--- src/index.ts | 42 +++++++++++++++++++++----- test/index.ts | 79 +++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 114 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index bbb21b35fb..50543cf641 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "pnpm-logger": "^0.6.0" + "pnpm-logger": "^0.6.2" }, "dependencies": { "@types/chalk": "^0.4.31", @@ -47,7 +47,7 @@ "devDependencies": { "commitizen": "^2.9.5", "ghooks": "^2.0.0", - "pnpm-logger": "^0.6.0", + "pnpm-logger": "^0.6.2", "rimraf": "^2.5.4", "tslint": "^4.3.1", "typescript": "^2.1.5", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index cfadb528ef..ccae9cc6a6 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -13,7 +13,7 @@ dependencies: devDependencies: commitizen: 2.9.6 ghooks: 2.0.0 - pnpm-logger: 0.6.0 + pnpm-logger: 0.6.2 rimraf: 2.6.1 tslint: 4.5.1 typescript: 2.5.2 @@ -1050,14 +1050,14 @@ packages: dev: true resolution: integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= - /pnpm-logger/0.6.0: + /pnpm-logger/0.6.2: dependencies: '@types/node': 8.0.26 bole: 3.0.2 ndjson: 1.5.0 dev: true resolution: - integrity: sha512-nnfR7C8PzBfYCorvmIYDThBydWdBQOih51kQRSM5oi4bGQJd/DWpqORGolhdK5ZSdpVFokMmN2xJjpIXAc4Ysw== + integrity: sha512-VLlRExib18bl5lSFp74vFHeZV0iWuxTkdOvI7BIhfWpiP9EdrkAq/GnjE5pxjXmsvXyZlaBDwoEQygU8kbVr8g== /prepend-http/1.0.4: dev: true resolution: @@ -1466,7 +1466,7 @@ specifiers: ghooks: ^2.0.0 log-update: ^2.0.0 ndjson: ^1.5.0 - pnpm-logger: ^0.6.0 + pnpm-logger: ^0.6.2 pretty-bytes: ^4.0.2 ramda: ^0.24.1 rimraf: ^2.5.4 diff --git a/src/index.ts b/src/index.ts index 72c7452c00..61e6f522c1 100644 --- a/src/index.ts +++ b/src/index.ts @@ -211,11 +211,25 @@ export function toOutput$ (streamParser: Object): Stream { }) .map(xs.of) - const lifecycleOutput$ = log$ - .filter(log => log.name === 'pnpm:lifecycle') - .map(formatLifecycle) - .map(msg => ({msg})) - .map(xs.of) + const lifecycleMessages: {[pkgId: string]: {keep: boolean, output: string}} = {} + const lifecycleOutput$ = xs.of( + log$ + .filter(log => log.name === 'pnpm:lifecycle') + .map((log: LifecycleLog) => { + const key = `${log.script}:${log.pkgId}` + const keep = lifecycleMessages[key] && lifecycleMessages[key].keep || log.level === 'error' + const formattedLine = formatLifecycle(log) + const output = keep && lifecycleMessages[key] + ? `${lifecycleMessages[key].output}${EOL}${formattedLine}` + : formattedLine + lifecycleMessages[key] = { + keep, + output, + } + return R.values(lifecycleMessages).map(lm => lm['output']).join(EOL) + }) + .map(msg => ({msg})) + ) const installCheckOutput$ = log$ .filter(log => log.name === 'pnpm:install-check') @@ -343,10 +357,22 @@ function printDiffs (pkgsDiff: PackageDiff[]) { } function formatLifecycle (logObj: LifecycleLog) { - if (logObj.level === 'error') { - return `${chalk.blue(logObj.pkgId)}! ${chalk.gray(logObj.line)}` + const prefix = `Running ${hlValue(logObj.script)} for ${hlPkgId(logObj.pkgId)}` + if (logObj['exitCode'] === 0) { + return `${prefix}, done` } - return `${chalk.blue(logObj.pkgId)} ${chalk.gray(logObj.line)}` + const line = formatLine(logObj) + if (logObj.level === 'error') { + return `${prefix}! ${line}` + } + return `${prefix}: ${line}` +} + +function formatLine (logObj: LifecycleLog) { + if (typeof logObj['exitCode'] === 'number') return chalk.red(`Exited with ${logObj['exitCode']}`) + + const color = logObj.level === 'error' ? chalk.red : chalk.gray + return color(logObj['line']) } function formatInstallCheck (logObj: InstallCheckLog) { diff --git a/test/index.ts b/test/index.ts index b4293d849e..9f08eed572 100644 --- a/test/index.ts +++ b/test/index.ts @@ -23,6 +23,9 @@ const SUB = chalk.red('-') const h1 = chalk.blue const hlValue = chalk.blue const hlPkgId = chalk['whiteBright'] +const POSTINSTALL = hlValue('postinstall') +const PREINSTALL = hlValue('preinstall') +const INSTALL = hlValue('install') test('prints progress beginning', t => { const output$ = toOutput$(createStreamParser()) @@ -200,6 +203,65 @@ test('prints summary', t => { }) }) +test('groups lifecycle output', t => { + const output$ = toOutput$(createStreamParser()) + + const pkgId = 'registry.npmjs.org/foo/1.0.0' + + lifecycleLogger.debug({ + pkgId: 'registry.npmjs.org/foo/1.0.0', + line: 'foo', + script: 'preinstall', + }) + lifecycleLogger.debug({ + pkgId: 'registry.npmjs.org/foo/1.0.0', + line: 'foo I', + script: 'postinstall', + }) + lifecycleLogger.debug({ + pkgId: 'registry.npmjs.org/bar/1.0.0', + line: 'bar I', + script: 'postinstall', + }) + lifecycleLogger.debug({ + pkgId: 'registry.npmjs.org/foo/1.0.0', + line: 'foo II', + script: 'postinstall', + }) + lifecycleLogger.debug({ + pkgId: 'registry.npmjs.org/foo/1.0.0', + line: 'foo III', + script: 'postinstall', + }) + lifecycleLogger.debug({ + pkgId: 'registry.npmjs.org/qar/1.0.0', + line: '...', + script: 'install', + }) + lifecycleLogger.debug({ + pkgId: 'registry.npmjs.org/qar/1.0.0', + exitCode: 0, + script: 'install', + }) + + t.plan(1) + + const childOutputColor = chalk.grey + + output$.drop(6).take(1).map(normalizeNewline).subscribe({ + next: output => { + t.equal(output, stripIndents` + Running ${PREINSTALL} for ${hlPkgId('registry.npmjs.org/foo/1.0.0')}: ${childOutputColor('foo')} + Running ${POSTINSTALL} for ${hlPkgId('registry.npmjs.org/foo/1.0.0')}: ${childOutputColor('foo III')} + Running ${POSTINSTALL} for ${hlPkgId('registry.npmjs.org/bar/1.0.0')}: ${childOutputColor('bar I')} + Running ${INSTALL} for ${hlPkgId('registry.npmjs.org/qar/1.0.0')}, done + `) + }, + complete: t.end, + error: t.end, + }) +}) + test('prints lifecycle progress', t => { const output$ = toOutput$(createStreamParser()) @@ -208,32 +270,36 @@ test('prints lifecycle progress', t => { lifecycleLogger.debug({ pkgId: 'registry.npmjs.org/foo/1.0.0', line: 'foo I', + script: 'postinstall', }) lifecycleLogger.debug({ pkgId: 'registry.npmjs.org/bar/1.0.0', line: 'bar I', + script: 'postinstall', }) lifecycleLogger.error({ pkgId: 'registry.npmjs.org/foo/1.0.0', line: 'foo II', + script: 'postinstall', }) lifecycleLogger.debug({ pkgId: 'registry.npmjs.org/foo/1.0.0', line: 'foo III', + script: 'postinstall', }) t.plan(1) - const pkgIdColor = chalk.blue const childOutputColor = chalk.grey + const childOutputError = chalk.red output$.drop(3).take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - ${pkgIdColor('registry.npmjs.org/foo/1.0.0')} ${childOutputColor('foo I')} - ${pkgIdColor('registry.npmjs.org/bar/1.0.0')} ${childOutputColor('bar I')} - ${pkgIdColor('registry.npmjs.org/foo/1.0.0')}! ${childOutputColor('foo II')} - ${pkgIdColor('registry.npmjs.org/foo/1.0.0')} ${childOutputColor('foo III')} + Running ${POSTINSTALL} for ${hlPkgId('registry.npmjs.org/foo/1.0.0')}: ${childOutputColor('foo I')} + Running ${POSTINSTALL} for ${hlPkgId('registry.npmjs.org/foo/1.0.0')}! ${childOutputError('foo II')} + Running ${POSTINSTALL} for ${hlPkgId('registry.npmjs.org/foo/1.0.0')}: ${childOutputColor('foo III')} + Running ${POSTINSTALL} for ${hlPkgId('registry.npmjs.org/bar/1.0.0')}: ${childOutputColor('bar I')} `) }, complete: t.end, @@ -297,6 +363,7 @@ test('prints progress of big files download', t => { status: 'fetching_started', pkgId: pkgId1, size: 1024 * 1024 * 10, // 10 MB + attempt: 1, }) stream$.push( @@ -334,6 +401,7 @@ test('prints progress of big files download', t => { status: 'fetching_started', pkgId: pkgId1, size: 10, // 10 B + attempt: 1, }) progressLogger.debug({ @@ -361,6 +429,7 @@ test('prints progress of big files download', t => { status: 'fetching_started', pkgId: pkgId3, size: 1024 * 1024 * 20, // 20 MB + attempt: 1, }) progressLogger.debug({ From b4458f25308b10dc30cbbf45f38f99407a69652f Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 15 Sep 2017 01:49:15 +0300 Subject: [PATCH 063/196] chore(release): 0.9.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 50543cf641..4fbfa3edf7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.9.2", + "version": "0.9.3", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From c9bdb52e57d2a9055bbfde3a016ae6b9b6a06c27 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 17 Sep 2017 18:21:53 +0300 Subject: [PATCH 064/196] feat: highlight errors/warnings more --- src/index.ts | 5 ++++- src/reportError.ts | 2 +- test/index.ts | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/index.ts b/src/index.ts index 61e6f522c1..229a3feb4f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -387,5 +387,8 @@ function formatInstallCheck (logObj: InstallCheckLog) { } function formatWarn (message: string) { - return `${chalk.yellow('WARN')} ${message}` + // The \u2009 is the "thin space" unicode character + // It is used instead of ' ' because chalk (as of version 2.1.0) + // trims whitespace at the beginning + return `${chalk.bgYellow.black('\u2009WARN\u2009')} ${message}` } diff --git a/src/reportError.ts b/src/reportError.ts index a15b4a736e..e678a950f7 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -91,7 +91,7 @@ function formatRelatedSources (msg: Object) { } function formatErrorSummary (message: string) { - return `${chalk.red('ERROR')} ${message}` + return `${chalk.bgRed.black('\u2009ERROR\u2009')} ${chalk.red(message)}` } function reportModifiedDependency (err: Error, msg: Object) { diff --git a/test/index.ts b/test/index.ts index 9f08eed572..b3e661f4b9 100644 --- a/test/index.ts +++ b/test/index.ts @@ -14,8 +14,8 @@ import {stripIndents} from 'common-tags' import chalk = require('chalk') import xs, {Stream} from 'xstream' -const WARN = chalk.yellow('WARN') -const ERROR = chalk.red('ERROR') +const WARN = chalk.bgYellow.black('\u2009WARN\u2009') +const ERROR = chalk.bgRed.black('\u2009ERROR\u2009') const DEPRECATED = chalk.red('deprecated') const versionColor = chalk.grey const ADD = chalk.green('+') @@ -316,7 +316,7 @@ test('prints error', t => { output$.take(1).subscribe({ next: output => { - t.equal(output, `${ERROR} some error`) + t.equal(output, `${ERROR} ${chalk.red('some error')}`) }, complete: t.end, error: t.end, From b7f01bc7b99d21ce8586cf3dece84d1eba7248ea Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 17 Sep 2017 19:15:08 +0300 Subject: [PATCH 065/196] chore(release): 0.9.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4fbfa3edf7..16de702029 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.9.3", + "version": "0.9.4", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 03ab6be0c5bb18c93cdf6a49b7efa17e52f52972 Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 27 Sep 2017 01:27:50 +0300 Subject: [PATCH 066/196] feat: print stack trace when a generic error happens Ref https://github.com/pnpm/pnpm/issues/896 --- package.json | 1 + shrinkwrap.yaml | 73 ++++++++++++++++++++++++++++++++-------------- src/reportError.ts | 16 ++++++++-- test/index.ts | 11 +++++-- typings/local.d.ts | 5 ++++ 5 files changed, 79 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 16de702029..65f950635e 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "ndjson": "^1.5.0", "pretty-bytes": "^4.0.2", "ramda": "^0.24.1", + "stacktracey": "^1.0.59", "xstream": "^10.9.0" }, "devDependencies": { diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index ccae9cc6a6..2ad601bfa3 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,40 +1,40 @@ dependencies: '@types/chalk': 0.4.31 - '@types/common-tags': 1.2.5 + '@types/common-tags': 1.4.0 '@types/node': 7.0.43 - '@types/ramda': 0.24.9 + '@types/ramda': 0.24.14 chalk: 2.1.0 common-tags: 1.4.0 log-update: 2.1.0 ndjson: 1.5.0 pretty-bytes: 4.0.2 ramda: 0.24.1 + stacktracey: 1.0.66 xstream: 10.9.0 devDependencies: commitizen: 2.9.6 ghooks: 2.0.0 pnpm-logger: 0.6.2 - rimraf: 2.6.1 + rimraf: 2.6.2 tslint: 4.5.1 - typescript: 2.5.2 + typescript: 2.5.3 validate-commit-msg: 2.14.0 packages: /@types/chalk/0.4.31: resolution: integrity: sha1-ox10JBprHtu5c8822XooloNKUfk= - /@types/common-tags/1.2.5: + /@types/common-tags/1.4.0: resolution: - integrity: sha1-FPKYk5kusyVZS4PXOa8C8rZSD0Y= + integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== /@types/node/7.0.43: resolution: integrity: sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ== - /@types/node/8.0.26: - dev: true + /@types/node/8.0.31: resolution: - integrity: sha512-wbKN0MB4XsjdnSE04HiCzLoBDirGCM6zXrqavSj44nZnPFYpnrTF64E9O6Xmf0ca/IuKK/BHUcXwMiwk92gW6Q== - /@types/ramda/0.24.9: + integrity: sha512-R+LdMJHJQwRd/Ca0Nr5KnwbSWHxTD3DWz4ivqoPeNH+YPcuirMWK+Ti9Mx32jOecmPhHOCd+6CefU5e1eVq2Ew== + /@types/ramda/0.24.14: resolution: - integrity: sha512-VFBycWFpzbhDIK7afthxUiDSfXfhfsQ4uYzguflDiH/iMbAumzNS53mnE8bzvLay8bKuCCsZwt20c3SPs9nw6Q== + integrity: sha512-kxdtZ1MiYjwZxGHSFgNxbnYWgv/kfyhB21gLBQwp6jwYyq1Bifk4TQ4C2wKxGEqYxMRAskyetl0BgPxfJfJbCA== /ansi-align/2.0.0: dependencies: string-width: 2.1.1 @@ -78,6 +78,11 @@ packages: dev: true resolution: integrity: sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= + /as-table/1.0.24: + dependencies: + printable-characters: 1.0.33 + resolution: + integrity: sha1-grR/+dub8212v99dQ5boWjYufKc= /babel-code-frame/6.26.0: dependencies: chalk: 1.1.3 @@ -304,6 +309,11 @@ packages: dev: true resolution: integrity: sha1-K8oElkyJGbI/P9aonvXmAIsxs/g= + /data-uri-to-buffer/2.0.0: + dependencies: + '@types/node': 8.0.31 + resolution: + integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== /dedent/0.6.0: dev: true resolution: @@ -496,6 +506,12 @@ packages: dev: true resolution: integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + /get-source/1.0.21: + dependencies: + data-uri-to-buffer: 2.0.0 + source-map: 0.6.0 + resolution: + integrity: sha1-XPB9S9tDWZo0qV8fgHuc3qR9l7U= /get-stream/3.0.0: dev: true resolution: @@ -657,10 +673,10 @@ packages: dev: true resolution: integrity: sha1-TexvMvN+97sLLtPx0aXD9UUHSRg= - /interpret/1.0.3: + /interpret/1.0.4: dev: true resolution: - integrity: sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A= + integrity: sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA= /is-buffer/1.1.5: dev: true resolution: @@ -902,7 +918,7 @@ packages: dependencies: json-stringify-safe: 5.0.1 minimist: 1.2.0 - split2: 2.1.1 + split2: 2.2.0 through2: 2.0.3 resolution: integrity: sha1-rmA7NrE0vOw0e0UkIrC/mNWDLsg= @@ -1052,7 +1068,7 @@ packages: integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= /pnpm-logger/0.6.2: dependencies: - '@types/node': 8.0.26 + '@types/node': 8.0.31 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -1069,6 +1085,9 @@ packages: /pretty-bytes/4.0.2: resolution: integrity: sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk= + /printable-characters/1.0.33: + resolution: + integrity: sha1-wr8tGbiO2bglgja70Fk9+X42liM= /process-nextick-args/1.0.7: resolution: integrity: sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= @@ -1182,12 +1201,12 @@ packages: dev: true resolution: integrity: sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA= - /rimraf/2.6.1: + /rimraf/2.6.2: dependencies: glob: 7.1.2 dev: true resolution: - integrity: sha1-wjOOxkPfeht/5cVPqG9XQopV8z0= + integrity: sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w== /run-async/2.3.0: dependencies: is-promise: 2.1.0 @@ -1228,7 +1247,7 @@ packages: /shelljs/0.7.6: dependencies: glob: 7.1.2 - interpret: 1.0.3 + interpret: 1.0.4 rechoir: 0.6.2 dev: true resolution: @@ -1236,6 +1255,9 @@ packages: /signal-exit/3.0.2: resolution: integrity: sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + /source-map/0.6.0: + resolution: + integrity: sha512-mTozplhTX4tLKIHYji92OTZzVyZvi+Z1qRZDeBvQFI2XUB89wrRoj/xXad3c9NZ1GPJXXRvB+k41PQCPTMC+aA== /spawn-command/0.0.2: dev: true resolution: @@ -1251,11 +1273,17 @@ packages: dev: true resolution: integrity: sha1-sAeZVX63+wyDdsKdROih6mfldHY= - /split2/2.1.1: + /split2/2.2.0: dependencies: through2: 2.0.3 resolution: - integrity: sha1-eh9VHhdqkOzTNF9yRqDP4XXvT9A= + integrity: sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw== + /stacktracey/1.0.66: + dependencies: + as-table: 1.0.24 + get-source: 1.0.21 + resolution: + integrity: sha1-tl/QGOfmQ0ILWfd5cJLa7/uxcsU= /string-width/1.0.2: dependencies: code-point-at: 1.1.0 @@ -1354,10 +1382,10 @@ packages: dev: true resolution: integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - /typescript/2.5.2: + /typescript/2.5.3: dev: true resolution: - integrity: sha1-A4qV99m7tCCxvzW6MdTFwd0//jQ= + integrity: sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w== /unique-string/1.0.0: dependencies: crypto-random-string: 1.0.0 @@ -1470,6 +1498,7 @@ specifiers: pretty-bytes: ^4.0.2 ramda: ^0.24.1 rimraf: ^2.5.4 + stacktracey: ^1.0.59 tslint: ^4.3.1 typescript: ^2.1.5 validate-commit-msg: ^2.8.2 diff --git a/src/reportError.ts b/src/reportError.ts index e678a950f7..b807dbba71 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -2,15 +2,17 @@ import chalk = require('chalk') import {Log} from 'pnpm-logger' import commonTags = require('common-tags') import os = require('os') +import StackTracey = require('stacktracey') const stripIndent = commonTags.stripIndent +const stripIndents = commonTags.stripIndents const EOL = os.EOL const highlight = chalk.yellow const colorPath = chalk.gray export default function reportError (logObj: Log) { if (logObj['err']) { - const err = logObj['err'] + const err = logObj['err'] switch (err.code) { case 'UNEXPECTED_STORE': return reportUnexpectedStore(err, logObj['message']) @@ -23,7 +25,7 @@ export default function reportError (logObj: Log) { case 'SHRINKWRAP_BREAKING_CHANGE': return reportShrinkwrapBreakingChange(err, logObj['message']) default: - return formatErrorSummary(err.message || logObj['message']) + return formatGenericError(err.message || logObj['message'], err.stack) } } return formatErrorSummary(logObj['message']) @@ -90,6 +92,16 @@ function formatRelatedSources (msg: Object) { return output } +function formatGenericError (errorMessage: string, stack: Object) { + if (stack) { + return stripIndents` + ${formatErrorSummary(errorMessage)} + ${new StackTracey(stack).pretty} + ` + } + return formatErrorSummary(errorMessage) +} + function formatErrorSummary (message: string) { return `${chalk.bgRed.black('\u2009ERROR\u2009')} ${chalk.red(message)}` } diff --git a/test/index.ts b/test/index.ts index b3e661f4b9..1bc6d6ff5d 100644 --- a/test/index.ts +++ b/test/index.ts @@ -13,6 +13,7 @@ import {toOutput$} from '../src' import {stripIndents} from 'common-tags' import chalk = require('chalk') import xs, {Stream} from 'xstream' +import StackTracey = require('stacktracey') const WARN = chalk.bgYellow.black('\u2009WARN\u2009') const ERROR = chalk.bgRed.black('\u2009ERROR\u2009') @@ -307,16 +308,20 @@ test('prints lifecycle progress', t => { }) }) -test('prints error', t => { +test('prints generic error', t => { const output$ = toOutput$(createStreamParser()) - logger.error(new Error('some error')) + const err = new Error('some error') + logger.error(err) t.plan(1) output$.take(1).subscribe({ next: output => { - t.equal(output, `${ERROR} ${chalk.red('some error')}`) + t.equal(output, stripIndents` + ${ERROR} ${chalk.red('some error')} + ${new StackTracey(err.stack).pretty} + `) }, complete: t.end, error: t.end, diff --git a/typings/local.d.ts b/typings/local.d.ts index db14a3be5b..8e18f4f394 100644 --- a/typings/local.d.ts +++ b/typings/local.d.ts @@ -17,3 +17,8 @@ declare module 'pretty-bytes' { const anything: any; export = anything; } + +declare module 'stacktracey' { + const anything: any; + export = anything; +} From 3fb07fbde8a0991e995977cf8802bb74b15a3a0d Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 27 Sep 2017 20:45:59 +0300 Subject: [PATCH 067/196] chore(release): 0.9.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 65f950635e..a52a3e3bb5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.9.4", + "version": "0.9.5", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 785a0459a1e9dbd8d2f4edb3866ed570389299a5 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 1 Oct 2017 14:35:32 +0300 Subject: [PATCH 068/196] fix: print linking info --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 229a3feb4f..33feb6a1c2 100644 --- a/src/index.ts +++ b/src/index.ts @@ -244,7 +244,7 @@ export function toOutput$ (streamParser: Object): Stream { .map(xs.of) const miscOutput$ = log$ - .filter(log => log.name === 'pnpm') + .filter(log => log.name === 'pnpm' || (log.name as string) === 'pnpm:link') .map(obj => { if (obj.level === 'debug') return if (obj.level === 'warn') { From 390221293bc84b8e19c12a62201921e6fea4a0d1 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sun, 1 Oct 2017 17:07:10 +0300 Subject: [PATCH 069/196] chore(release): 0.9.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a52a3e3bb5..f91741503f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.9.5", + "version": "0.9.6", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From f78c87abbe1ac59d31c8fa1433f4e4611ca07698 Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 18 Oct 2017 23:00:04 +0300 Subject: [PATCH 070/196] feat: update dependencies --- package.json | 15 +- shrinkwrap.yaml | 659 ++++++++++++++++++++----------------------- src/index.ts | 2 +- src/reportError.ts | 2 +- test/index.ts | 2 +- test/shrinkwrap.yaml | 98 +++++++ 6 files changed, 410 insertions(+), 368 deletions(-) diff --git a/package.json b/package.json index f91741503f..dac9ec4f30 100644 --- a/package.json +++ b/package.json @@ -32,25 +32,24 @@ "pnpm-logger": "^0.6.2" }, "dependencies": { - "@types/chalk": "^0.4.31", "@types/common-tags": "^1.2.5", - "@types/node": "^7.0.0", - "@types/ramda": "^0.24.9", - "chalk": "^2.1.0", + "@types/node": "^8.0.44", + "@types/ramda": "^0.24.17", + "chalk": "^2.2.0", "common-tags": "^1.4.0", "log-update": "^2.0.0", "ndjson": "^1.5.0", "pretty-bytes": "^4.0.2", - "ramda": "^0.24.1", - "stacktracey": "^1.0.59", - "xstream": "^10.9.0" + "ramda": "^0.25.0", + "stacktracey": "^1.0.71", + "xstream": "^11.0.0" }, "devDependencies": { "commitizen": "^2.9.5", "ghooks": "^2.0.0", "pnpm-logger": "^0.6.2", "rimraf": "^2.5.4", - "tslint": "^4.3.1", + "tslint": "^5.7.0", "typescript": "^2.1.5", "validate-commit-msg": "^2.8.2" }, diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 2ad601bfa3..7565bf10e9 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,88 +1,97 @@ dependencies: - '@types/chalk': 0.4.31 '@types/common-tags': 1.4.0 - '@types/node': 7.0.43 - '@types/ramda': 0.24.14 - chalk: 2.1.0 + '@types/node': 8.0.44 + '@types/ramda': 0.24.17 + chalk: 2.2.0 common-tags: 1.4.0 log-update: 2.1.0 ndjson: 1.5.0 pretty-bytes: 4.0.2 - ramda: 0.24.1 - stacktracey: 1.0.66 - xstream: 10.9.0 + ramda: 0.25.0 + stacktracey: 1.0.71 + xstream: 11.0.0 devDependencies: commitizen: 2.9.6 ghooks: 2.0.0 pnpm-logger: 0.6.2 rimraf: 2.6.2 - tslint: 4.5.1 + tslint: 5.7.0 typescript: 2.5.3 validate-commit-msg: 2.14.0 packages: - /@types/chalk/0.4.31: - resolution: - integrity: sha1-ox10JBprHtu5c8822XooloNKUfk= /@types/common-tags/1.4.0: resolution: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== - /@types/node/7.0.43: - resolution: - integrity: sha512-7scYwwfHNppXvH/9JzakbVxk0o0QUILVk1Lv64GRaxwPuGpnF1QBiwdvhDpLcymb8BpomQL3KYoWKq3wUdDMhQ== /@types/node/8.0.31: + dev: true resolution: integrity: sha512-R+LdMJHJQwRd/Ca0Nr5KnwbSWHxTD3DWz4ivqoPeNH+YPcuirMWK+Ti9Mx32jOecmPhHOCd+6CefU5e1eVq2Ew== - /@types/ramda/0.24.14: + /@types/node/8.0.44: resolution: - integrity: sha512-kxdtZ1MiYjwZxGHSFgNxbnYWgv/kfyhB21gLBQwp6jwYyq1Bifk4TQ4C2wKxGEqYxMRAskyetl0BgPxfJfJbCA== - /ansi-align/2.0.0: - dependencies: - string-width: 2.1.1 - dev: true + integrity: sha512-56TeARKE2uMi7xWhpRRws/QdnpSVx9i7E8esGiPYoj90jnonGfmV1vwRLvHWYjPxF5u5l7p5fgdKwdse+VeAQQ== + /@types/ramda/0.24.17: resolution: - integrity: sha1-w2rsy6VjuJzrVW82kPCx2eNUf38= + integrity: sha512-1zj7HQqHEdzjueCIRMiTSZteGavafmc12SWV3hp4yseKbXdebCsWGGoc+a9ywrJ4c7hQCLOBsoGQjc6wRXJyVA== /ansi-escapes/1.4.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-06ioOzGapneTZisT52HHkRQiMG4= /ansi-escapes/2.0.0: + engines: + node: '>=4' resolution: integrity: sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs= /ansi-regex/2.1.1: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8= /ansi-regex/3.0.0: + engines: + node: '>=4' resolution: integrity: sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= /ansi-styles/2.2.1: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= /ansi-styles/3.2.0: dependencies: color-convert: 1.9.0 + engines: + node: '>=4' resolution: integrity: sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug== /arr-diff/2.0.0: dependencies: arr-flatten: 1.1.0 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= /arr-flatten/1.1.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== /array-unique/0.2.1: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= - /as-table/1.0.24: + /as-table/1.0.31: dependencies: - printable-characters: 1.0.33 + printable-characters: 1.0.38 resolution: - integrity: sha1-grR/+dub8212v99dQ5boWjYufKc= + integrity: sha1-0AGAAk7LttGnRxUN91HTcWrqgWY= /babel-code-frame/6.26.0: dependencies: chalk: 1.1.3 @@ -108,18 +117,6 @@ packages: dev: true resolution: integrity: sha1-vIpIPKlASdqbg3wa0Rzf6+5uBRQ= - /boxen/1.2.1: - dependencies: - ansi-align: 2.0.0 - camelcase: 4.1.0 - chalk: 2.1.0 - cli-boxes: 1.0.0 - string-width: 2.1.1 - term-size: 1.2.0 - widest-line: 1.0.0 - dev: true - resolution: - integrity: sha1-DxHn/jRO25OXl3/BPt5/ZNlWSB0= /brace-expansion/1.1.8: dependencies: balanced-match: 1.0.0 @@ -133,6 +130,8 @@ packages: preserve: 0.2.0 repeat-element: 1.1.2 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= /cachedir/1.1.1: @@ -141,14 +140,6 @@ packages: dev: true resolution: integrity: sha1-4TYwdeogahJ2fZK7cRyKL3ahD2I= - /camelcase/4.1.0: - dev: true - resolution: - integrity: sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= - /capture-stack-trace/1.0.0: - dev: true - resolution: - integrity: sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0= /chalk/1.1.3: dependencies: ansi-styles: 2.2.1 @@ -157,28 +148,32 @@ packages: strip-ansi: 3.0.1 supports-color: 2.0.0 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - /chalk/2.1.0: + /chalk/2.2.0: dependencies: ansi-styles: 3.2.0 escape-string-regexp: 1.0.5 - supports-color: 4.4.0 + supports-color: 4.5.0 + engines: + node: '>=4' resolution: - integrity: sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ== - /cli-boxes/1.0.0: - dev: true - resolution: - integrity: sha1-T6kXw+WclKAEzWH47lCdplFocUM= + integrity: sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g== /cli-cursor/1.0.2: dependencies: restore-cursor: 1.0.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc= /cli-cursor/2.1.0: dependencies: restore-cursor: 2.0.0 + engines: + node: '>=4' resolution: integrity: sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= /cli-width/2.2.0: @@ -187,6 +182,8 @@ packages: integrity: sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= /code-point-at/1.1.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= /color-convert/1.9.0: @@ -199,20 +196,32 @@ packages: integrity: sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= /colors/0.6.2: dev: true + engines: + node: '>=0.1.90' resolution: integrity: sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w= /colors/1.1.2: dev: true + engines: + node: '>=0.1.90' resolution: integrity: sha1-FopHAXVran9RoSzgyXv6KMCE7WM= /commander/2.1.0: dev: true + engines: + node: '>= 0.6.x' resolution: integrity: sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E= + /commander/2.11.0: + dev: true + resolution: + integrity: sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ== /commander/2.9.0: dependencies: graceful-readlink: 1.0.1 dev: true + engines: + node: '>= 0.6.x' resolution: integrity: sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= /commitizen/2.9.6: @@ -233,11 +242,15 @@ packages: shelljs: 0.7.6 strip-json-comments: 2.0.1 dev: true + engines: + node: '>= 0.12' resolution: integrity: sha1-wNAFNe8mTaf2Nzft/aQiiYP6IpE= /common-tags/1.4.0: dependencies: babel-runtime: 6.26.0 + engines: + node: '>=4.0.0' resolution: integrity: sha1-EYe+Tz1M8MBCfUP3Tu8fc1AWFMA= /concat-map/0.0.1: @@ -250,19 +263,10 @@ packages: readable-stream: 2.3.3 typedarray: 0.0.6 dev: true + engines: + '0': node >= 0.8 resolution: integrity: sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc= - /configstore/3.1.1: - dependencies: - dot-prop: 4.2.0 - graceful-fs: 4.1.11 - make-dir: 1.0.0 - unique-string: 1.0.0 - write-file-atomic: 2.3.0 - xdg-basedir: 3.0.0 - dev: true - resolution: - integrity: sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw== /conventional-commit-types/2.2.0: dev: true resolution: @@ -273,12 +277,6 @@ packages: /core-util-is/1.0.2: resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - /create-error-class/3.0.2: - dependencies: - capture-stack-trace: 1.0.0 - dev: true - resolution: - integrity: sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y= /cross-spawn-async/2.2.5: dependencies: lru-cache: 4.1.1 @@ -286,18 +284,6 @@ packages: dev: true resolution: integrity: sha1-hF/wwINKPe2dFg2sptOQkGuyiMw= - /cross-spawn/5.1.0: - dependencies: - lru-cache: 4.1.1 - shebang-command: 1.2.0 - which: 1.3.0 - dev: true - resolution: - integrity: sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= - /crypto-random-string/1.0.0: - dev: true - resolution: - integrity: sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4= /cz-conventional-changelog/1.2.0: dependencies: conventional-commit-types: 2.2.0 @@ -311,48 +297,44 @@ packages: integrity: sha1-K8oElkyJGbI/P9aonvXmAIsxs/g= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.0.31 + '@types/node': 8.0.44 resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== /dedent/0.6.0: dev: true resolution: integrity: sha1-Dm2o8M5Sg471zsXI+TlrDBtko8s= - /deep-extend/0.4.2: - dev: true - resolution: - integrity: sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8= /detect-file/0.1.0: dependencies: fs-exists-sync: 0.1.0 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-STXe39lIhkjgBrASlWbpOGcR6mM= /detect-indent/4.0.0: dependencies: repeating: 2.0.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-920GQ1LN9Docts5hnE7jqUdd4gg= - /diff/3.3.1: + /diff/3.4.0: dev: true + engines: + node: '>=0.3.1' resolution: - integrity: sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww== - /dot-prop/4.2.0: - dependencies: - is-obj: 1.0.1 - dev: true - resolution: - integrity: sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ== - /duplexer3/0.1.4: - dev: true - resolution: - integrity: sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + integrity: sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA== /escape-string-regexp/1.0.5: + engines: + node: '>=0.8.0' resolution: integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= /esutils/2.0.2: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= /execa/0.4.0: @@ -364,40 +346,38 @@ packages: path-key: 1.0.0 strip-eof: 1.0.0 dev: true + engines: + node: '>=0.12' resolution: integrity: sha1-TrZGejaglfq7KXD/nV4/t7zm68M= - /execa/0.7.0: - dependencies: - cross-spawn: 5.1.0 - get-stream: 3.0.0 - is-stream: 1.1.0 - npm-run-path: 2.0.2 - p-finally: 1.0.0 - signal-exit: 3.0.2 - strip-eof: 1.0.0 - dev: true - resolution: - integrity: sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= /exit-hook/1.1.1: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g= /expand-brackets/0.1.5: dependencies: is-posix-bracket: 0.1.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= /expand-range/1.8.2: dependencies: fill-range: 2.2.3 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= /expand-tilde/1.2.2: dependencies: os-homedir: 1.0.2 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-C4HrqJflo9MdHD0QL48BRB5VlEk= /extend/3.0.1: @@ -416,6 +396,8 @@ packages: dependencies: is-extglob: 1.0.0 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= /fast-safe-stringify/1.1.13: @@ -427,10 +409,14 @@ packages: escape-string-regexp: 1.0.5 object-assign: 4.1.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= /filename-regex/2.0.1: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= /fill-range/2.2.3: @@ -441,6 +427,8 @@ packages: repeat-element: 1.1.2 repeat-string: 1.6.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM= /find-node-modules/1.0.4: @@ -458,12 +446,6 @@ packages: dev: true resolution: integrity: sha1-li/yEaqyXGUg/u641ih/j26VgHo= - /findup-sync/0.3.0: - dependencies: - glob: 5.0.15 - dev: true - resolution: - integrity: sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY= /findup-sync/0.4.2: dependencies: detect-file: 0.1.0 @@ -471,6 +453,8 @@ packages: micromatch: 2.3.11 resolve-dir: 0.1.1 dev: true + engines: + node: '>= 0.8.0' resolution: integrity: sha1-qBF9D3MST1pFRoOVef5S1xKfteU= /findup/0.1.5: @@ -478,20 +462,28 @@ packages: colors: 0.6.2 commander: 2.1.0 dev: true + engines: + node: '>=0.6' resolution: integrity: sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs= /for-in/1.0.2: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= /for-own/0.1.5: dependencies: for-in: 1.0.2 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= /fs-exists-sync/0.1.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-mC1ok6+RjnLQjeyehnP/K1qNat0= /fs-extra/1.0.0: @@ -509,13 +501,9 @@ packages: /get-source/1.0.21: dependencies: data-uri-to-buffer: 2.0.0 - source-map: 0.6.0 + source-map: 0.6.1 resolution: integrity: sha1-XPB9S9tDWZo0qV8fgHuc3qR9l7U= - /get-stream/3.0.0: - dev: true - resolution: - integrity: sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= /ghooks/2.0.0: dependencies: execa: 0.4.0 @@ -533,6 +521,8 @@ packages: glob-parent: 2.0.0 is-glob: 2.0.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= /glob-parent/2.0.0: @@ -541,16 +531,6 @@ packages: dev: true resolution: integrity: sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= - /glob/5.0.15: - dependencies: - inflight: 1.0.6 - inherits: 2.0.3 - minimatch: 3.0.4 - once: 1.4.0 - path-is-absolute: 1.0.1 - dev: true - resolution: - integrity: sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E= /glob/7.1.1: dependencies: fs.realpath: 1.0.0 @@ -578,6 +558,8 @@ packages: global-prefix: 0.1.5 is-windows: 0.2.0 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0= /global-prefix/0.1.5: @@ -587,26 +569,14 @@ packages: is-windows: 0.2.0 which: 1.3.0 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-jTvGuNo8qBEqFg2NSW/wRiv+948= - /got/6.7.1: - dependencies: - create-error-class: 3.0.2 - duplexer3: 0.1.4 - get-stream: 3.0.0 - is-redirect: 1.0.0 - is-retry-allowed: 1.1.0 - is-stream: 1.1.0 - lowercase-keys: 1.0.0 - safe-buffer: 5.1.1 - timed-out: 4.0.1 - unzip-response: 2.0.1 - url-parse-lax: 1.0.0 - dev: true - resolution: - integrity: sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA= /graceful-fs/4.1.11: dev: true + engines: + node: '>=0.4.0' resolution: integrity: sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg= /graceful-readlink/1.0.1: @@ -617,25 +587,23 @@ packages: dependencies: ansi-regex: 2.1.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= /has-flag/2.0.0: + engines: + node: '>=0.10.0' resolution: integrity: sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= /homedir-polyfill/1.0.1: dependencies: parse-passwd: 1.0.0 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-TCu8inWJmP7r9e1oWA921GdotLw= - /import-lazy/2.1.0: - dev: true - resolution: - integrity: sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= - /imurmurhash/0.1.4: - dev: true - resolution: - integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o= /individual/3.0.0: dev: true resolution: @@ -683,89 +651,101 @@ packages: integrity: sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw= /is-dotfile/1.0.3: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= /is-equal-shallow/0.1.3: dependencies: is-primitive: 2.0.0 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= /is-extendable/0.1.1: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= /is-extglob/1.0.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= /is-finite/1.0.2: dependencies: number-is-nan: 1.0.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= /is-fullwidth-code-point/1.0.0: dependencies: number-is-nan: 1.0.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-754xOG8DGn8NZDr4L95QxFfvAMs= /is-fullwidth-code-point/2.0.0: + engines: + node: '>=4' resolution: integrity: sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= /is-glob/2.0.1: dependencies: is-extglob: 1.0.0 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= - /is-npm/1.0.0: - dev: true - resolution: - integrity: sha1-8vtjpl5JBbQGyGBydloaTceTufQ= /is-number/2.1.0: dependencies: kind-of: 3.2.2 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= /is-number/3.0.0: dependencies: kind-of: 3.2.2 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= - /is-obj/1.0.1: - dev: true - resolution: - integrity: sha1-PkcprB9f3gJc19g6iW2rn09n2w8= /is-posix-bracket/0.1.1: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= /is-primitive/2.0.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-IHurkWOEmcB7Kt8kCkGochADRXU= /is-promise/2.1.0: dev: true resolution: integrity: sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= - /is-redirect/1.0.0: - dev: true - resolution: - integrity: sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= - /is-retry-allowed/1.1.0: - dev: true - resolution: - integrity: sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= /is-stream/1.1.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-EtSj3U5o4Lec6428hBc66A2RykQ= /is-windows/0.2.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-3hqm1j6indJIc3tp8f+LgALSEIw= /isarray/1.0.0: @@ -779,6 +759,8 @@ packages: dependencies: isarray: 1.0.0 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= /js-tokens/3.0.2: @@ -798,12 +780,16 @@ packages: dependencies: is-buffer: 1.1.5 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= /kind-of/4.0.0: dependencies: is-buffer: 1.1.5 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-IIE989cSkosgc3hpGkUGb65y3Vc= /klaw/1.3.1: @@ -812,12 +798,6 @@ packages: graceful-fs: 4.1.11 resolution: integrity: sha1-QIhDO0azsbolnXh4XY6W9zugJDk= - /latest-version/3.1.0: - dependencies: - package-json: 4.0.1 - dev: true - resolution: - integrity: sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU= /lodash._baseclone/4.5.7: dev: true resolution: @@ -845,16 +825,16 @@ packages: ansi-escapes: 2.0.0 cli-cursor: 2.1.0 wrap-ansi: 3.0.1 + engines: + node: '>=4' resolution: integrity: sha1-6jcli1NU7bAuc7KRkAFsh9HIcUE= /longest/1.0.1: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc= - /lowercase-keys/1.0.0: - dev: true - resolution: - integrity: sha1-TjNms55/VFfjXxMkvfb4jQv8cwY= /lru-cache/4.1.1: dependencies: pseudomap: 1.0.2 @@ -862,12 +842,6 @@ packages: dev: true resolution: integrity: sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew== - /make-dir/1.0.0: - dependencies: - pify: 2.3.0 - dev: true - resolution: - integrity: sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg= /manage-path/2.0.0: dev: true resolution: @@ -892,9 +866,13 @@ packages: parse-glob: 3.0.4 regex-cache: 0.4.4 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= /mimic-fn/1.1.0: + engines: + node: '>=4' resolution: integrity: sha1-5md4PZLonb00KBi1IwudYqZyrRg= /minimatch/3.0.4: @@ -903,10 +881,6 @@ packages: dev: true resolution: integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - /minimist/0.0.10: - dev: true - resolution: - integrity: sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= /minimist/1.2.0: resolution: integrity: sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= @@ -926,26 +900,28 @@ packages: dependencies: remove-trailing-separator: 1.1.0 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= /npm-run-path/1.0.0: dependencies: path-key: 1.0.0 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-9cMr9ZX+ga6Sfa7FLoL4sACsPI8= - /npm-run-path/2.0.2: - dependencies: - path-key: 2.0.1 - dev: true - resolution: - integrity: sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= /number-is-nan/1.0.1: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= /object-assign/4.1.1: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= /object.omit/2.0.1: @@ -953,6 +929,8 @@ packages: for-own: 0.1.5 is-extendable: 0.1.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= /once/1.4.0: @@ -963,11 +941,15 @@ packages: integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E= /onetime/1.1.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= /onetime/2.0.1: dependencies: mimic-fn: 1.1.0 + engines: + node: '>=4' resolution: integrity: sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= /opt-cli/1.5.1: @@ -979,42 +961,30 @@ packages: dev: true resolution: integrity: sha1-BNtEexPJa5kusxaFJm9O0NlzbcI= - /optimist/0.6.1: - dependencies: - minimist: 0.0.10 - wordwrap: 0.0.3 - dev: true - resolution: - integrity: sha1-2j6nRob6IaGaERwybpDrFaAZZoY= /os-homedir/1.0.2: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-/7xJiDNuDoM94MFox+8VISGqf7M= /os-shim/0.1.3: dev: true + engines: + node: '>= 0.4.0' resolution: integrity: sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc= /os-tmpdir/1.0.2: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - /p-finally/1.0.0: - dev: true - resolution: - integrity: sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= - /package-json/4.0.1: - dependencies: - got: 6.7.1 - registry-auth-token: 3.3.1 - registry-url: 3.1.0 - semver: 5.4.1 - dev: true - resolution: - integrity: sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0= /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-b7ySQEXSRPKiokRQMGDTv8YAl3Q= /parse-glob/3.0.4: @@ -1024,46 +994,52 @@ packages: is-extglob: 1.0.0 is-glob: 2.0.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-ssN2z7EfNVE7rdFz7wu246OIORw= /parse-passwd/1.0.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= /path-exists/2.1.0: dependencies: pinkie-promise: 2.0.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= /path-is-absolute/1.0.1: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18= /path-key/1.0.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-XVPVeAGWRsDWiADbThRua9wqx68= - /path-key/2.0.1: - dev: true - resolution: - integrity: sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= /path-parse/1.0.5: dev: true resolution: integrity: sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME= - /pify/2.3.0: - dev: true - resolution: - integrity: sha1-7RQaasBDqEnqWISY59yosVMw6Qw= /pinkie-promise/2.0.1: dependencies: pinkie: 2.0.4 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-ITXW36ejWMBprJsXh3YogihFD/o= /pinkie/2.0.4: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= /pnpm-logger/0.6.2: @@ -1074,20 +1050,20 @@ packages: dev: true resolution: integrity: sha512-VLlRExib18bl5lSFp74vFHeZV0iWuxTkdOvI7BIhfWpiP9EdrkAq/GnjE5pxjXmsvXyZlaBDwoEQygU8kbVr8g== - /prepend-http/1.0.4: - dev: true - resolution: - integrity: sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= /preserve/0.2.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= /pretty-bytes/4.0.2: + engines: + node: '>=4' resolution: integrity: sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk= - /printable-characters/1.0.33: + /printable-characters/1.0.38: resolution: - integrity: sha1-wr8tGbiO2bglgja70Fk9+X42liM= + integrity: sha1-du+ErM/X+DZvtxOPuSRmqRbVmbw= /process-nextick-args/1.0.7: resolution: integrity: sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= @@ -1095,25 +1071,18 @@ packages: dev: true resolution: integrity: sha1-8FKijacOYYkX7wqKw0wa5aaChrM= - /ramda/0.24.1: + /ramda/0.25.0: resolution: - integrity: sha1-w7d1UZfzW43DUCIoJixMkd22uFc= + integrity: sha512-GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ== /randomatic/1.1.7: dependencies: is-number: 3.0.0 kind-of: 4.0.0 dev: true + engines: + node: '>= 0.10.0' resolution: integrity: sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how== - /rc/1.2.1: - dependencies: - deep-extend: 0.4.2 - ini: 1.3.4 - minimist: 1.2.0 - strip-json-comments: 2.0.1 - dev: true - resolution: - integrity: sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU= /readable-stream/2.3.3: dependencies: core-util-is: 1.0.2 @@ -1129,6 +1098,8 @@ packages: dependencies: resolve: 1.4.0 dev: true + engines: + node: '>= 0.10' resolution: integrity: sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= /regenerator-runtime/0.11.0: @@ -1138,37 +1109,32 @@ packages: dependencies: is-equal-shallow: 0.1.3 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ== - /registry-auth-token/3.3.1: - dependencies: - rc: 1.2.1 - safe-buffer: 5.1.1 - dev: true - resolution: - integrity: sha1-+w0yie4Nmtosu1KvXf5mywcNMAY= - /registry-url/3.1.0: - dependencies: - rc: 1.2.1 - dev: true - resolution: - integrity: sha1-PU74cPc93h138M+aOBQyRE4XSUI= /remove-trailing-separator/1.1.0: dev: true resolution: integrity: sha1-wkvOKig62tW8P1jg1IJJuSN52O8= /repeat-element/1.1.2: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-7wiaF40Ug7quTZPrmLT55OEdmQo= /repeat-string/1.6.1: dev: true + engines: + node: '>=0.10' resolution: integrity: sha1-jcrkcOHIirwtYA//Sndihtp15jc= /repeating/2.0.1: dependencies: is-finite: 1.0.2 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= /resolve-dir/0.1.1: @@ -1176,6 +1142,8 @@ packages: expand-tilde: 1.2.2 global-modules: 0.2.3 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-shklmlYC+sXFxJatiUpujMQwJh4= /resolve/1.4.0: @@ -1189,16 +1157,22 @@ packages: exit-hook: 1.1.1 onetime: 1.1.0 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-NGYfRohjJ/7SmRR5FSJS35LapUE= /restore-cursor/2.0.0: dependencies: onetime: 2.0.1 signal-exit: 3.0.2 + engines: + node: '>=4' resolution: integrity: sha1-n37ih/gv0ybU/RYpI9YhKe7g368= /right-pad/1.0.1: dev: true + engines: + node: '>= 0.10' resolution: integrity: sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA= /rimraf/2.6.2: @@ -1211,6 +1185,8 @@ packages: dependencies: is-promise: 2.1.0 dev: true + engines: + node: '>=0.12.0' resolution: integrity: sha1-A3GrSuC91yDUFm19/aZP96RFpsA= /rx/4.1.0: @@ -1220,44 +1196,34 @@ packages: /safe-buffer/5.1.1: resolution: integrity: sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== - /semver-diff/2.1.0: - dependencies: - semver: 5.4.1 - dev: true - resolution: - integrity: sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY= /semver-regex/1.0.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk= /semver/5.4.1: dev: true resolution: integrity: sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg== - /shebang-command/1.2.0: - dependencies: - shebang-regex: 1.0.0 - dev: true - resolution: - integrity: sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= - /shebang-regex/1.0.0: - dev: true - resolution: - integrity: sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= /shelljs/0.7.6: dependencies: glob: 7.1.2 interpret: 1.0.4 rechoir: 0.6.2 dev: true + engines: + node: '>=0.11.0' resolution: integrity: sha1-N5zM+1a5HIYB5HkzVutTgpJN6a0= /signal-exit/3.0.2: resolution: integrity: sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= - /source-map/0.6.0: + /source-map/0.6.1: + engines: + node: '>=0.10.0' resolution: - integrity: sha512-mTozplhTX4tLKIHYji92OTZzVyZvi+Z1qRZDeBvQFI2XUB89wrRoj/xXad3c9NZ1GPJXXRvB+k41PQCPTMC+aA== + integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== /spawn-command/0.0.2: dev: true resolution: @@ -1278,24 +1244,28 @@ packages: through2: 2.0.3 resolution: integrity: sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw== - /stacktracey/1.0.66: + /stacktracey/1.0.71: dependencies: - as-table: 1.0.24 + as-table: 1.0.31 get-source: 1.0.21 resolution: - integrity: sha1-tl/QGOfmQ0ILWfd5cJLa7/uxcsU= + integrity: sha1-yrTKjmh0JScu6cQoHSNhETK+XQo= /string-width/1.0.2: dependencies: code-point-at: 1.1.0 is-fullwidth-code-point: 1.0.0 strip-ansi: 3.0.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= /string-width/2.1.1: dependencies: is-fullwidth-code-point: 2.0.0 strip-ansi: 4.0.0 + engines: + node: '>=4' resolution: integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== /string_decoder/1.0.3: @@ -1307,39 +1277,47 @@ packages: dependencies: ansi-regex: 2.1.1 dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= /strip-ansi/4.0.0: dependencies: ansi-regex: 3.0.0 + engines: + node: '>=4' resolution: integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8= /strip-eof/1.0.0: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= /strip-json-comments/2.0.1: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= /supports-color/2.0.0: dev: true + engines: + node: '>=0.8.0' resolution: integrity: sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - /supports-color/4.4.0: + /supports-color/4.5.0: dependencies: has-flag: 2.0.0 + engines: + node: '>=4' resolution: - integrity: sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ== + integrity: sha1-vnoN5ITexcXN34s9WRJQRJEvY1s= /symbol-observable/1.0.4: + engines: + node: '>=0.10.0' resolution: integrity: sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0= - /term-size/1.2.0: - dependencies: - execa: 0.7.0 - dev: true - resolution: - integrity: sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk= /through/2.3.8: dev: true resolution: @@ -1350,71 +1328,55 @@ packages: xtend: 4.0.1 resolution: integrity: sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= - /timed-out/4.0.1: - dev: true - resolution: - integrity: sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= /tmp/0.0.29: dependencies: os-tmpdir: 1.0.2 dev: true + engines: + node: '>=0.4.0' resolution: integrity: sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA= - /tslint/4.5.1: + /tslib/1.8.0: + dev: true + resolution: + integrity: sha512-ymKWWZJST0/CkgduC2qkzjMOWr4bouhuURNXCn/inEX0L57BnRG6FhX76o7FOnsjHazCjfU2LKeSrlS2sIKQJg== + /tslint/5.7.0: dependencies: babel-code-frame: 6.26.0 colors: 1.1.2 - diff: 3.3.1 - findup-sync: 0.3.0 + commander: 2.11.0 + diff: 3.4.0 glob: 7.1.2 - optimist: 0.6.1 + minimatch: 3.0.4 resolve: 1.4.0 - tsutils: 1.9.1 - update-notifier: 2.2.0 + semver: 5.4.1 + tslib: 1.8.0 + tsutils: 2.12.1 dev: true + engines: + node: '>=4.1.2' + peerDependencies: + typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev' resolution: - integrity: sha1-BTVocb7yOkNJBnNABvwYgza6gks= - /tsutils/1.9.1: + integrity: sha1-wl4NDJL6EgHCvDDoROCOaCtPNVI= + /tsutils/2.12.1: + dependencies: + tslib: 1.8.0 dev: true + peerDependencies: + typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >= 2.4.0-dev || >= 2.5.0-dev || >= 2.6.0-dev || >= 2.7.0-dev' resolution: - integrity: sha1-ufmrROVa+WgYMdXyjQrur1x1DLA= + integrity: sha1-9Nlc4zkciXHkblTEzw7bCiHdWyQ= /typedarray/0.0.6: dev: true resolution: integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= /typescript/2.5.3: dev: true + engines: + node: '>=4.2.0' resolution: integrity: sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w== - /unique-string/1.0.0: - dependencies: - crypto-random-string: 1.0.0 - dev: true - resolution: - integrity: sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo= - /unzip-response/2.0.1: - dev: true - resolution: - integrity: sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c= - /update-notifier/2.2.0: - dependencies: - boxen: 1.2.1 - chalk: 1.1.3 - configstore: 3.1.1 - import-lazy: 2.1.0 - is-npm: 1.0.0 - latest-version: 3.1.0 - semver-diff: 2.1.0 - xdg-basedir: 3.0.0 - dev: true - resolution: - integrity: sha1-G1g3z5DAc22IYncytmHBOPht5y8= - /url-parse-lax/1.0.0: - dependencies: - prepend-http: 1.0.4 - dev: true - resolution: - integrity: sha1-evjzA2Rem9eaJy56FKxovAYJ2nM= /util-deprecate/1.0.2: resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= @@ -1433,48 +1395,32 @@ packages: dev: true resolution: integrity: sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg== - /widest-line/1.0.0: - dependencies: - string-width: 1.0.2 - dev: true - resolution: - integrity: sha1-DAnIXCqUaD0Nfq+O4JfVZL8OEFw= /word-wrap/1.2.3: dev: true + engines: + node: '>=0.10.0' resolution: integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== - /wordwrap/0.0.3: - dev: true - resolution: - integrity: sha1-o9XabNXAvAAI03I0u68b7WMFkQc= /wrap-ansi/3.0.1: dependencies: string-width: 2.1.1 strip-ansi: 4.0.0 + engines: + node: '>=4' resolution: integrity: sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= /wrappy/1.0.2: dev: true resolution: integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - /write-file-atomic/2.3.0: - dependencies: - graceful-fs: 4.1.11 - imurmurhash: 0.1.4 - signal-exit: 3.0.2 - dev: true - resolution: - integrity: sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA== - /xdg-basedir/3.0.0: - dev: true - resolution: - integrity: sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= - /xstream/10.9.0: + /xstream/11.0.0: dependencies: symbol-observable: 1.0.4 resolution: - integrity: sha1-23k0zsLaATYNQ6u7yHm4RSQ5e1U= + integrity: sha1-IBjDxOVz92tiuc+WoXpGh2qxIOA= /xtend/4.0.1: + engines: + node: '>=0.4' resolution: integrity: sha1-pcbVMr5lbiPbgg77lDofBJmNY68= /yallist/2.1.2: @@ -1484,11 +1430,10 @@ packages: registry: 'https://registry.npmjs.org/' shrinkwrapVersion: 3 specifiers: - '@types/chalk': ^0.4.31 '@types/common-tags': ^1.2.5 - '@types/node': ^7.0.0 - '@types/ramda': ^0.24.9 - chalk: ^2.1.0 + '@types/node': ^8.0.44 + '@types/ramda': ^0.24.17 + chalk: ^2.2.0 commitizen: ^2.9.5 common-tags: ^1.4.0 ghooks: ^2.0.0 @@ -1496,10 +1441,10 @@ specifiers: ndjson: ^1.5.0 pnpm-logger: ^0.6.2 pretty-bytes: ^4.0.2 - ramda: ^0.24.1 + ramda: ^0.25.0 rimraf: ^2.5.4 - stacktracey: ^1.0.59 - tslint: ^4.3.1 + stacktracey: ^1.0.71 + tslint: ^5.7.0 typescript: ^2.1.5 validate-commit-msg: ^2.8.2 - xstream: ^10.9.0 + xstream: ^11.0.0 diff --git a/src/index.ts b/src/index.ts index 33feb6a1c2..64109f5cd0 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,5 +1,5 @@ import logUpdate = require('log-update') -import chalk = require('chalk') +import chalk from 'chalk' import { ProgressLog, LifecycleLog, diff --git a/src/reportError.ts b/src/reportError.ts index b807dbba71..1dc4d79401 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -1,4 +1,4 @@ -import chalk = require('chalk') +import chalk from 'chalk' import {Log} from 'pnpm-logger' import commonTags = require('common-tags') import os = require('os') diff --git a/test/index.ts b/test/index.ts index 1bc6d6ff5d..cbcb179eb5 100644 --- a/test/index.ts +++ b/test/index.ts @@ -11,7 +11,7 @@ import logger, { import normalizeNewline = require('normalize-newline') import {toOutput$} from '../src' import {stripIndents} from 'common-tags' -import chalk = require('chalk') +import chalk from 'chalk' import xs, {Stream} from 'xstream' import StackTracey = require('stacktracey') diff --git a/test/shrinkwrap.yaml b/test/shrinkwrap.yaml index 3858022114..62d19dcd9a 100644 --- a/test/shrinkwrap.yaml +++ b/test/shrinkwrap.yaml @@ -14,20 +14,30 @@ packages: resolution: integrity: sha1-PBkXxN/W8nJxuZInclE1FbxsRrQ= /ansi-regex/0.2.1: + engines: + node: '>=0.10.0' resolution: integrity: sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk= /ansi-regex/2.1.1: + engines: + node: '>=0.10.0' resolution: integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8= /ansi-styles/1.1.0: + engines: + node: '>=0.10.0' resolution: integrity: sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94= /ansi-styles/2.2.1: + engines: + node: '>=0.10.0' resolution: integrity: sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= /ansi-styles/3.2.0: dependencies: color-convert: 1.9.0 + engines: + node: '>=4' resolution: integrity: sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug== /argparse/1.0.9: @@ -36,6 +46,8 @@ packages: resolution: integrity: sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY= /arrify/1.0.1: + engines: + node: '>=0.10.0' resolution: integrity: sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= /babel-runtime/6.26.0: @@ -60,6 +72,8 @@ packages: has-ansi: 0.1.0 strip-ansi: 0.3.0 supports-color: 0.2.0 + engines: + node: '>=0.10.0' resolution: integrity: sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ= /chalk/1.1.3: @@ -69,6 +83,8 @@ packages: has-ansi: 2.0.0 strip-ansi: 3.0.1 supports-color: 2.0.0 + engines: + node: '>=0.10.0' resolution: integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= /chalk/2.1.0: @@ -76,6 +92,8 @@ packages: ansi-styles: 3.2.0 escape-string-regexp: 1.0.5 supports-color: 4.4.0 + engines: + node: '>=4' resolution: integrity: sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ== /color-convert/1.9.0: @@ -102,15 +120,21 @@ packages: dependencies: foreach: 2.0.5 object-keys: 1.0.11 + engines: + node: '>= 0.4' resolution: integrity: sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ= /defined/1.0.0: resolution: integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= /diff/2.2.3: + engines: + node: '>=0.3.1' resolution: integrity: sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k= /diff/3.3.1: + engines: + node: '>=0.3.1' resolution: integrity: sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww== /duplexer/0.1.1: @@ -123,6 +147,8 @@ packages: has: 1.0.1 is-callable: 1.1.3 is-regex: 1.0.4 + engines: + node: '>= 0.4' resolution: integrity: sha512-G6pkMLdmxF3dh4hbuYuQiku29rRqo9p5+iRf7mZTEELT/xZ/D9Vzg04ddlvzJuJuCmZp1WBbfbVLZEeygYNkpw== /es-to-primitive/1.1.1: @@ -130,12 +156,18 @@ packages: is-callable: 1.1.3 is-date-object: 1.0.1 is-symbol: 1.0.1 + engines: + node: '>= 0.4' resolution: integrity: sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0= /escape-string-regexp/1.0.5: + engines: + node: '>=0.8.0' resolution: integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= /esprima/4.0.0: + engines: + node: '>=4' resolution: integrity: sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw== /events-to-array/1.1.2: @@ -145,6 +177,8 @@ packages: dependencies: escape-string-regexp: 1.0.5 object-assign: 4.1.1 + engines: + node: '>=0.10.0' resolution: integrity: sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= /for-each/0.3.2: @@ -174,19 +208,27 @@ packages: /has-ansi/0.1.0: dependencies: ansi-regex: 0.2.1 + engines: + node: '>=0.10.0' resolution: integrity: sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4= /has-ansi/2.0.0: dependencies: ansi-regex: 2.1.1 + engines: + node: '>=0.10.0' resolution: integrity: sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= /has-flag/2.0.0: + engines: + node: '>=0.10.0' resolution: integrity: sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= /has/1.0.1: dependencies: function-bind: 1.1.1 + engines: + node: '>= 0.8.0' resolution: integrity: sha1-hGFzP1OLCDfJNh45qauelwTcLyg= /inflight/1.0.6: @@ -199,14 +241,20 @@ packages: resolution: integrity: sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= /is-callable/1.1.3: + engines: + node: '>= 0.4' resolution: integrity: sha1-hut1OSgF3cM69xySoO7fdO52BLI= /is-date-object/1.0.1: + engines: + node: '>= 0.4' resolution: integrity: sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= /is-finite/1.0.2: dependencies: number-is-nan: 1.0.1 + engines: + node: '>=0.10.0' resolution: integrity: sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= /is-function/1.0.1: @@ -215,9 +263,13 @@ packages: /is-regex/1.0.4: dependencies: has: 1.0.1 + engines: + node: '>= 0.4' resolution: integrity: sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= /is-symbol/1.0.1: + engines: + node: '>= 0.4' resolution: integrity: sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI= /isarray/1.0.0: @@ -230,6 +282,7 @@ packages: resolution: integrity: sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww== /jsondiffpatch/0.1.43: + bundledDependencies: [] dependencies: chalk: 0.5.1 resolution: @@ -268,18 +321,26 @@ packages: resolution: integrity: sha1-NDOB0f2e1RljsLMVNbf9i64E/3A= /normalize-newline/3.0.0: + engines: + node: '>=4' resolution: integrity: sha1-HL6oBKukNgAfg5OKsh7AOdaa6dM= /number-is-nan/1.0.1: + engines: + node: '>=0.10.0' resolution: integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= /object-assign/4.1.1: + engines: + node: '>=0.10.0' resolution: integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= /object-inspect/1.3.0: resolution: integrity: sha512-OHHnLgLNXpM++GnJRyyhbr2bwl3pPVm4YvaraHrRvDt/N3r+s/gDVHciA7EJBTkijKXj61ssgSAikq1fb0IBRg== /object-keys/1.0.11: + engines: + node: '>= 0.4' resolution: integrity: sha1-xUYBd4rVYPEULODgG8yotW0TQm0= /once/1.4.0: @@ -288,15 +349,21 @@ packages: resolution: integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E= /parse-ms/1.0.1: + engines: + node: '>=0.10.0' resolution: integrity: sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0= /path-is-absolute/1.0.1: + engines: + node: '>=0.10.0' resolution: integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18= /path-parse/1.0.5: resolution: integrity: sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME= /plur/1.0.0: + engines: + node: '>=0.10.0' resolution: integrity: sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY= /pretty-ms/2.1.0: @@ -304,6 +371,8 @@ packages: is-finite: 1.0.2 parse-ms: 1.0.1 plur: 1.0.0 + engines: + node: '>=0.10.0' resolution: integrity: sha1-QlfCVt8/sLRR1q/6qwIYhBJpgdw= /process-nextick-args/1.0.7: @@ -342,6 +411,8 @@ packages: resolution: integrity: sha512-30c1Ch8FSjV0FwC253iftbbj0dU/OXoSg1LAEGZJUlGgjTNj6cu+DVqJWWIZJY5RXLWV4eFtR+4ouo0VIOYOTg== /source-map/0.5.7: + engines: + node: '>=0.10.0' resolution: integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= /sprintf-js/1.0.3: @@ -352,6 +423,8 @@ packages: define-properties: 1.1.2 es-abstract: 1.8.1 function-bind: 1.1.1 + engines: + node: '>= 0.4' resolution: integrity: sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo= /string_decoder/1.0.3: @@ -362,28 +435,42 @@ packages: /strip-ansi/0.3.0: dependencies: ansi-regex: 0.2.1 + engines: + node: '>=0.10.0' resolution: integrity: sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA= /strip-ansi/3.0.1: dependencies: ansi-regex: 2.1.1 + engines: + node: '>=0.10.0' resolution: integrity: sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= /strip-bom/3.0.0: + engines: + node: '>=4' resolution: integrity: sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= /strip-json-comments/2.0.1: + engines: + node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= /supports-color/0.2.0: + engines: + node: '>=0.10.0' resolution: integrity: sha1-2S3iaU6z9nMjlz1649i1W0wiGQo= /supports-color/2.0.0: + engines: + node: '>=0.8.0' resolution: integrity: sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= /supports-color/4.4.0: dependencies: has-flag: 2.0.0 + engines: + node: '>=4' resolution: integrity: sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ== /tap-parser/1.3.2: @@ -433,6 +520,8 @@ packages: tsconfig: 6.0.0 v8flags: 3.0.0 yn: 2.0.0 + engines: + node: '>=4.2.0' resolution: integrity: sha1-wTxqMCTjC+EYDdUwOPwgkonUv2k= /tsconfig/6.0.0: @@ -442,6 +531,8 @@ packages: resolution: integrity: sha1-aw6DdgA9evGGT434+J3QBZ/80DI= /user-home/1.1.1: + engines: + node: '>=0.10.0' resolution: integrity: sha1-K1viOjK2Onyd640PKNSFcko98ZA= /util-deprecate/1.0.2: @@ -450,18 +541,25 @@ packages: /v8flags/3.0.0: dependencies: user-home: 1.1.1 + engines: + node: '>= 0.10.0' resolution: integrity: sha512-AGl+C+4qpeSu2g3JxCD/mGFFOs/vVZ3XREkD3ibQXEqr4Y4zgIrPWW124/IKJFHOIVFIoH8miWrLf0o84HYjwA== /wrappy/1.0.2: resolution: integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= /xtend/4.0.1: + engines: + node: '>=0.4' resolution: integrity: sha1-pcbVMr5lbiPbgg77lDofBJmNY68= /yn/2.0.0: + engines: + node: '>=4' resolution: integrity: sha1-5a2ryKz0CPY4X8dklWhMiOavaJo= registry: 'https://registry.npmjs.org/' +shrinkwrapMinorVersion: 1 shrinkwrapVersion: 3 specifiers: '@types/tape': ^4.2.30 From 0707b5d0110f42d53ca08f1bb250e799c0c61b24 Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 18 Oct 2017 23:05:07 +0300 Subject: [PATCH 071/196] ci(travis): install pnpm via standalone script --- .travis.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c497bd0d5e..6998bbee39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,10 @@ language: node_js node_js: - 4 - 6 - - 7 - -cache: - directories: - - $HOME/.pnpm-store - + - 8 sudo: false before_install: - - npm install -g pnpm + - curl -L https://unpkg.com/@pnpm/self-installer | node install: - pnpm install script: From 41ee5c116b05c34c22884d9e44109a204306e47a Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 18 Oct 2017 23:06:31 +0300 Subject: [PATCH 072/196] docs: update author email --- LICENSE | 2 +- package.json | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 32aafa0db0..8bd573e32a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Zoltan Kochan +Copyright (c) 2017 Zoltan Kochan Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/package.json b/package.json index dac9ec4f30..52686a7ef5 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,12 @@ "keywords": [ "pnpm-reporter" ], - "author": "Zoltan Kochan", + "author": { + "name": "Zoltan Kochan", + "email": "z@kochan.io", + "url": "https://www.kochan.io/", + "twitter": "ZoltanKochan" + }, "license": "MIT", "bugs": { "url": "https://github.com/pnpm/pnpm-reporter-default/issues" From 7e851e8130a35c92ff84c87927503a7316a109ea Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 18 Oct 2017 23:07:49 +0300 Subject: [PATCH 073/196] chore(package): add engines field --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index 52686a7ef5..ee3a84962a 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,9 @@ "url": "https://www.kochan.io/", "twitter": "ZoltanKochan" }, + "engines": { + "node": ">=4" + }, "license": "MIT", "bugs": { "url": "https://github.com/pnpm/pnpm-reporter-default/issues" From e84a4bad2d8769888b6c80c87e5588818494a82b Mon Sep 17 00:00:00 2001 From: zkochan Date: Wed, 1 Nov 2017 22:53:42 +0200 Subject: [PATCH 074/196] chore: node separate package for tests --- package.json | 9 +- shrinkwrap.yaml | 411 +++++++++++++++++++++++++++++++ test/package.json | 13 - test/shrinkwrap.yaml | 569 ------------------------------------------- 4 files changed, 418 insertions(+), 584 deletions(-) delete mode 100644 test/package.json delete mode 100644 test/shrinkwrap.yaml diff --git a/package.json b/package.json index ee3a84962a..360886d421 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,9 @@ ], "bin": "lib/bin/pnpm-default-reporter.js", "scripts": { - "prepare": "cd test && pnpm install", "lint": "tslint -c tslint.json --project .", - "test": "npm run lint && cd test && npm t", + "pretty-test": "ts-node test | tap-diff", + "test": "npm run lint && ts-node test", "tsc": "rimraf lib && tsc", "prepublishOnly": "npm run tsc" }, @@ -53,10 +53,15 @@ "xstream": "^11.0.0" }, "devDependencies": { + "@types/tape": "^4.2.30", "commitizen": "^2.9.5", "ghooks": "^2.0.0", + "mos-tap-diff": "^1.0.0", + "normalize-newline": "^3.0.0", "pnpm-logger": "^0.6.2", "rimraf": "^2.5.4", + "tape": "^4.8.0", + "ts-node": "^3.3.0", "tslint": "^5.7.0", "typescript": "^2.1.5", "validate-commit-msg": "^2.8.2" diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 7565bf10e9..ffc36e5f68 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -11,15 +11,21 @@ dependencies: stacktracey: 1.0.71 xstream: 11.0.0 devDependencies: + '@types/tape': 4.2.31 commitizen: 2.9.6 ghooks: 2.0.0 + mos-tap-diff: 1.0.0 + normalize-newline: 3.0.0 pnpm-logger: 0.6.2 rimraf: 2.6.2 + tape: 4.8.0 + ts-node: 3.3.0 tslint: 5.7.0 typescript: 2.5.3 validate-commit-msg: 2.14.0 packages: /@types/common-tags/1.4.0: + dev: false resolution: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== /@types/node/8.0.31: @@ -27,11 +33,23 @@ packages: resolution: integrity: sha512-R+LdMJHJQwRd/Ca0Nr5KnwbSWHxTD3DWz4ivqoPeNH+YPcuirMWK+Ti9Mx32jOecmPhHOCd+6CefU5e1eVq2Ew== /@types/node/8.0.44: + dev: false resolution: integrity: sha512-56TeARKE2uMi7xWhpRRws/QdnpSVx9i7E8esGiPYoj90jnonGfmV1vwRLvHWYjPxF5u5l7p5fgdKwdse+VeAQQ== + /@types/node/8.0.47: + dev: true + resolution: + integrity: sha512-kOwL746WVvt/9Phf6/JgX/bsGQvbrK5iUgzyfwZNcKVFcjAUVSpF9HxevLTld2SG9aywYHOILj38arDdY1r/iQ== /@types/ramda/0.24.17: + dev: false resolution: integrity: sha512-1zj7HQqHEdzjueCIRMiTSZteGavafmc12SWV3hp4yseKbXdebCsWGGoc+a9ywrJ4c7hQCLOBsoGQjc6wRXJyVA== + /@types/tape/4.2.31: + dependencies: + '@types/node': 8.0.47 + dev: true + resolution: + integrity: sha512-DEPn8FJKQR6eeMHZ407TuAqlhBKQa54PTM3c7Z6pKOI1uHaPnidmpmOXYtNZTcDrL5hnZofSHPwX1AQ9HbaMUg== /ansi-escapes/1.4.0: dev: true engines: @@ -39,10 +57,17 @@ packages: resolution: integrity: sha1-06ioOzGapneTZisT52HHkRQiMG4= /ansi-escapes/2.0.0: + dev: false engines: node: '>=4' resolution: integrity: sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs= + /ansi-regex/0.2.1: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk= /ansi-regex/2.1.1: dev: true engines: @@ -50,10 +75,17 @@ packages: resolution: integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8= /ansi-regex/3.0.0: + dev: false engines: node: '>=4' resolution: integrity: sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + /ansi-styles/1.1.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94= /ansi-styles/2.2.1: dev: true engines: @@ -67,6 +99,12 @@ packages: node: '>=4' resolution: integrity: sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug== + /argparse/1.0.9: + dependencies: + sprintf-js: 1.0.3 + dev: true + resolution: + integrity: sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY= /arr-diff/2.0.0: dependencies: arr-flatten: 1.1.0 @@ -87,9 +125,16 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= + /arrify/1.0.1: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= /as-table/1.0.31: dependencies: printable-characters: 1.0.38 + dev: false resolution: integrity: sha1-0AGAAk7LttGnRxUN91HTcWrqgWY= /babel-code-frame/6.26.0: @@ -140,6 +185,18 @@ packages: dev: true resolution: integrity: sha1-4TYwdeogahJ2fZK7cRyKL3ahD2I= + /chalk/0.5.1: + dependencies: + ansi-styles: 1.1.0 + escape-string-regexp: 1.0.5 + has-ansi: 0.1.0 + strip-ansi: 0.3.0 + supports-color: 0.2.0 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ= /chalk/1.1.3: dependencies: ansi-styles: 2.2.1 @@ -157,10 +214,21 @@ packages: ansi-styles: 3.2.0 escape-string-regexp: 1.0.5 supports-color: 4.5.0 + dev: false engines: node: '>=4' resolution: integrity: sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g== + /chalk/2.3.0: + dependencies: + ansi-styles: 3.2.0 + escape-string-regexp: 1.0.5 + supports-color: 4.5.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q== /cli-cursor/1.0.2: dependencies: restore-cursor: 1.0.1 @@ -172,6 +240,7 @@ packages: /cli-cursor/2.1.0: dependencies: restore-cursor: 2.0.0 + dev: false engines: node: '>=4' resolution: @@ -249,6 +318,7 @@ packages: /common-tags/1.4.0: dependencies: babel-runtime: 6.26.0 + dev: false engines: node: '>=4.0.0' resolution: @@ -298,12 +368,30 @@ packages: /data-uri-to-buffer/2.0.0: dependencies: '@types/node': 8.0.44 + dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== /dedent/0.6.0: dev: true resolution: integrity: sha1-Dm2o8M5Sg471zsXI+TlrDBtko8s= + /deep-equal/1.0.1: + dev: true + resolution: + integrity: sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= + /define-properties/1.1.2: + dependencies: + foreach: 2.0.5 + object-keys: 1.0.11 + dev: true + engines: + node: '>= 0.4' + resolution: + integrity: sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ= + /defined/1.0.0: + dev: true + resolution: + integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= /detect-file/0.1.0: dependencies: fs-exists-sync: 0.1.0 @@ -320,23 +408,65 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-920GQ1LN9Docts5hnE7jqUdd4gg= + /diff/2.2.3: + dev: true + engines: + node: '>=0.3.1' + resolution: + integrity: sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k= /diff/3.4.0: dev: true engines: node: '>=0.3.1' resolution: integrity: sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA== + /duplexer/0.1.1: + dev: true + resolution: + integrity: sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= + /es-abstract/1.9.0: + dependencies: + es-to-primitive: 1.1.1 + function-bind: 1.1.1 + has: 1.0.1 + is-callable: 1.1.3 + is-regex: 1.0.4 + dev: true + engines: + node: '>= 0.4' + resolution: + integrity: sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q== + /es-to-primitive/1.1.1: + dependencies: + is-callable: 1.1.3 + is-date-object: 1.0.1 + is-symbol: 1.0.1 + dev: true + engines: + node: '>= 0.4' + resolution: + integrity: sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0= /escape-string-regexp/1.0.5: engines: node: '>=0.8.0' resolution: integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + /esprima/4.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw== /esutils/2.0.2: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= + /events-to-array/1.1.2: + dev: true + resolution: + integrity: sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y= /execa/0.4.0: dependencies: cross-spawn-async: 2.2.5 @@ -466,6 +596,12 @@ packages: node: '>=0.6' resolution: integrity: sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs= + /for-each/0.3.2: + dependencies: + is-function: 1.0.1 + dev: true + resolution: + integrity: sha1-LEBFC5NI6X8oEyJZO6lnBLmr1NQ= /for-in/1.0.2: dev: true engines: @@ -480,6 +616,10 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= + /foreach/2.0.5: + dev: true + resolution: + integrity: sha1-C+4AUBiusmDQo6865ljdATbsG5k= /fs-exists-sync/0.1.0: dev: true engines: @@ -498,10 +638,15 @@ packages: dev: true resolution: integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + /function-bind/1.1.1: + dev: true + resolution: + integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== /get-source/1.0.21: dependencies: data-uri-to-buffer: 2.0.0 source-map: 0.6.1 + dev: false resolution: integrity: sha1-XPB9S9tDWZo0qV8fgHuc3qR9l7U= /ghooks/2.0.0: @@ -583,6 +728,14 @@ packages: dev: true resolution: integrity: sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= + /has-ansi/0.1.0: + dependencies: + ansi-regex: 0.2.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4= /has-ansi/2.0.0: dependencies: ansi-regex: 2.1.1 @@ -596,6 +749,14 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= + /has/1.0.1: + dependencies: + function-bind: 1.1.1 + dev: true + engines: + node: '>= 0.8.0' + resolution: + integrity: sha1-hGFzP1OLCDfJNh45qauelwTcLyg= /homedir-polyfill/1.0.1: dependencies: parse-passwd: 1.0.0 @@ -649,6 +810,18 @@ packages: dev: true resolution: integrity: sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw= + /is-callable/1.1.3: + dev: true + engines: + node: '>= 0.4' + resolution: + integrity: sha1-hut1OSgF3cM69xySoO7fdO52BLI= + /is-date-object/1.0.1: + dev: true + engines: + node: '>= 0.4' + resolution: + integrity: sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= /is-dotfile/1.0.3: dev: true engines: @@ -692,10 +865,15 @@ packages: resolution: integrity: sha1-754xOG8DGn8NZDr4L95QxFfvAMs= /is-fullwidth-code-point/2.0.0: + dev: false engines: node: '>=4' resolution: integrity: sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + /is-function/1.0.1: + dev: true + resolution: + integrity: sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU= /is-glob/2.0.1: dependencies: is-extglob: 1.0.0 @@ -736,12 +914,26 @@ packages: dev: true resolution: integrity: sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= + /is-regex/1.0.4: + dependencies: + has: 1.0.1 + dev: true + engines: + node: '>= 0.4' + resolution: + integrity: sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= /is-stream/1.1.0: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + /is-symbol/1.0.1: + dev: true + engines: + node: '>= 0.4' + resolution: + integrity: sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI= /is-windows/0.2.0: dev: true engines: @@ -767,9 +959,23 @@ packages: dev: true resolution: integrity: sha1-mGbfOVECEw449/mWvOtlRDIJwls= + /js-yaml/3.10.0: + dependencies: + argparse: 1.0.9 + esprima: 4.0.0 + dev: true + resolution: + integrity: sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA== /json-stringify-safe/5.0.1: resolution: integrity: sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + /jsondiffpatch/0.1.43: + bundledDependencies: [] + dependencies: + chalk: 0.5.1 + dev: true + resolution: + integrity: sha1-wFKImpnvfroZ0AlfkPclz6cKVhE= /jsonfile/2.4.0: dev: true optionalDependencies: @@ -825,6 +1031,7 @@ packages: ansi-escapes: 2.0.0 cli-cursor: 2.1.0 wrap-ansi: 3.0.1 + dev: false engines: node: '>=4' resolution: @@ -842,6 +1049,10 @@ packages: dev: true resolution: integrity: sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew== + /make-error/1.3.0: + dev: true + resolution: + integrity: sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y= /manage-path/2.0.0: dev: true resolution: @@ -871,6 +1082,7 @@ packages: resolution: integrity: sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= /mimic-fn/1.1.0: + dev: false engines: node: '>=4' resolution: @@ -881,9 +1093,34 @@ packages: dev: true resolution: integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + /minimist/0.0.8: + dev: true + resolution: + integrity: sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= /minimist/1.2.0: resolution: integrity: sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + /mkdirp/0.5.1: + dependencies: + minimist: 0.0.8 + dev: true + resolution: + integrity: sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + /mos-tap-diff/1.0.0: + dependencies: + babel-runtime: 6.26.0 + chalk: 1.1.3 + core-js: 2.5.1 + diff: 2.2.3 + duplexer: 0.1.1 + figures: 1.7.0 + jsondiffpatch: 0.1.43 + pretty-ms: 2.1.0 + tap-parser: 1.3.2 + through2: 2.0.3 + dev: true + resolution: + integrity: sha1-NDOB0f2e1RljsLMVNbf9i64E/3A= /mute-stream/0.0.6: dev: true resolution: @@ -896,6 +1133,12 @@ packages: through2: 2.0.3 resolution: integrity: sha1-rmA7NrE0vOw0e0UkIrC/mNWDLsg= + /normalize-newline/3.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-HL6oBKukNgAfg5OKsh7AOdaa6dM= /normalize-path/2.1.1: dependencies: remove-trailing-separator: 1.1.0 @@ -924,6 +1167,16 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + /object-inspect/1.3.0: + dev: true + resolution: + integrity: sha512-OHHnLgLNXpM++GnJRyyhbr2bwl3pPVm4YvaraHrRvDt/N3r+s/gDVHciA7EJBTkijKXj61ssgSAikq1fb0IBRg== + /object-keys/1.0.11: + dev: true + engines: + node: '>= 0.4' + resolution: + integrity: sha1-xUYBd4rVYPEULODgG8yotW0TQm0= /object.omit/2.0.1: dependencies: for-own: 0.1.5 @@ -948,6 +1201,7 @@ packages: /onetime/2.0.1: dependencies: mimic-fn: 1.1.0 + dev: false engines: node: '>=4' resolution: @@ -998,6 +1252,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-ssN2z7EfNVE7rdFz7wu246OIORw= + /parse-ms/1.0.1: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0= /parse-passwd/1.0.0: dev: true engines: @@ -1042,6 +1302,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= + /plur/1.0.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY= /pnpm-logger/0.6.2: dependencies: '@types/node': 8.0.31 @@ -1057,11 +1323,23 @@ packages: resolution: integrity: sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= /pretty-bytes/4.0.2: + dev: false engines: node: '>=4' resolution: integrity: sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk= + /pretty-ms/2.1.0: + dependencies: + is-finite: 1.0.2 + parse-ms: 1.0.1 + plur: 1.0.0 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-QlfCVt8/sLRR1q/6qwIYhBJpgdw= /printable-characters/1.0.38: + dev: false resolution: integrity: sha1-du+ErM/X+DZvtxOPuSRmqRbVmbw= /process-nextick-args/1.0.7: @@ -1072,6 +1350,7 @@ packages: resolution: integrity: sha1-8FKijacOYYkX7wqKw0wa5aaChrM= /ramda/0.25.0: + dev: false resolution: integrity: sha512-GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ== /randomatic/1.1.7: @@ -1165,10 +1444,17 @@ packages: dependencies: onetime: 2.0.1 signal-exit: 3.0.2 + dev: false engines: node: '>=4' resolution: integrity: sha1-n37ih/gv0ybU/RYpI9YhKe7g368= + /resumer/0.0.0: + dependencies: + through: 2.3.8 + dev: true + resolution: + integrity: sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k= /right-pad/1.0.1: dev: true engines: @@ -1217,9 +1503,23 @@ packages: resolution: integrity: sha1-N5zM+1a5HIYB5HkzVutTgpJN6a0= /signal-exit/3.0.2: + dev: false resolution: integrity: sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + /source-map-support/0.4.18: + dependencies: + source-map: 0.5.7 + dev: true + resolution: + integrity: sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== + /source-map/0.5.7: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= /source-map/0.6.1: + dev: false engines: node: '>=0.10.0' resolution: @@ -1244,10 +1544,15 @@ packages: through2: 2.0.3 resolution: integrity: sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw== + /sprintf-js/1.0.3: + dev: true + resolution: + integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= /stacktracey/1.0.71: dependencies: as-table: 1.0.31 get-source: 1.0.21 + dev: false resolution: integrity: sha1-yrTKjmh0JScu6cQoHSNhETK+XQo= /string-width/1.0.2: @@ -1264,15 +1569,34 @@ packages: dependencies: is-fullwidth-code-point: 2.0.0 strip-ansi: 4.0.0 + dev: false engines: node: '>=4' resolution: integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== + /string.prototype.trim/1.1.2: + dependencies: + define-properties: 1.1.2 + es-abstract: 1.9.0 + function-bind: 1.1.1 + dev: true + engines: + node: '>= 0.4' + resolution: + integrity: sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo= /string_decoder/1.0.3: dependencies: safe-buffer: 5.1.1 resolution: integrity: sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== + /strip-ansi/0.3.0: + dependencies: + ansi-regex: 0.2.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA= /strip-ansi/3.0.1: dependencies: ansi-regex: 2.1.1 @@ -1288,6 +1612,12 @@ packages: node: '>=4' resolution: integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8= + /strip-bom/3.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= /strip-eof/1.0.0: dev: true engines: @@ -1300,6 +1630,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= + /supports-color/0.2.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-2S3iaU6z9nMjlz1649i1W0wiGQo= /supports-color/2.0.0: dev: true engines: @@ -1314,10 +1650,39 @@ packages: resolution: integrity: sha1-vnoN5ITexcXN34s9WRJQRJEvY1s= /symbol-observable/1.0.4: + dev: false engines: node: '>=0.10.0' resolution: integrity: sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0= + /tap-parser/1.3.2: + dependencies: + events-to-array: 1.1.2 + inherits: 2.0.3 + js-yaml: 3.10.0 + dev: true + optionalDependencies: + readable-stream: 2.3.3 + resolution: + integrity: sha1-EgxQiciMPIp5PvKIhn3jIeGPjCI= + /tape/4.8.0: + dependencies: + deep-equal: 1.0.1 + defined: 1.0.0 + for-each: 0.3.2 + function-bind: 1.1.1 + glob: 7.1.2 + has: 1.0.1 + inherits: 2.0.3 + minimist: 1.2.0 + object-inspect: 1.3.0 + resolve: 1.4.0 + resumer: 0.0.0 + string.prototype.trim: 1.1.2 + through: 2.3.8 + dev: true + resolution: + integrity: sha512-TWILfEnvO7I8mFe35d98F6T5fbLaEtbFTG/lxWvid8qDfFTxt19EBijWmB4j3+Hoh5TfHE2faWs73ua+EphuBA== /through/2.3.8: dev: true resolution: @@ -1336,6 +1701,30 @@ packages: node: '>=0.4.0' resolution: integrity: sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA= + /ts-node/3.3.0: + dependencies: + arrify: 1.0.1 + chalk: 2.3.0 + diff: 3.4.0 + make-error: 1.3.0 + minimist: 1.2.0 + mkdirp: 0.5.1 + source-map-support: 0.4.18 + tsconfig: 6.0.0 + v8flags: 3.0.1 + yn: 2.0.0 + dev: true + engines: + node: '>=4.2.0' + resolution: + integrity: sha1-wTxqMCTjC+EYDdUwOPwgkonUv2k= + /tsconfig/6.0.0: + dependencies: + strip-bom: 3.0.0 + strip-json-comments: 2.0.1 + dev: true + resolution: + integrity: sha1-aw6DdgA9evGGT434+J3QBZ/80DI= /tslib/1.8.0: dev: true resolution: @@ -1380,6 +1769,14 @@ packages: /util-deprecate/1.0.2: resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + /v8flags/3.0.1: + dependencies: + homedir-polyfill: 1.0.1 + dev: true + engines: + node: '>= 0.10.0' + resolution: + integrity: sha1-3Oj8N5wX2fLJ6e142JzgAFKxt2s= /validate-commit-msg/2.14.0: dependencies: conventional-commit-types: 2.2.0 @@ -1405,6 +1802,7 @@ packages: dependencies: string-width: 2.1.1 strip-ansi: 4.0.0 + dev: false engines: node: '>=4' resolution: @@ -1416,6 +1814,7 @@ packages: /xstream/11.0.0: dependencies: symbol-observable: 1.0.4 + dev: false resolution: integrity: sha1-IBjDxOVz92tiuc+WoXpGh2qxIOA= /xtend/4.0.1: @@ -1427,23 +1826,35 @@ packages: dev: true resolution: integrity: sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= + /yn/2.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-5a2ryKz0CPY4X8dklWhMiOavaJo= registry: 'https://registry.npmjs.org/' +shrinkwrapMinorVersion: 2 shrinkwrapVersion: 3 specifiers: '@types/common-tags': ^1.2.5 '@types/node': ^8.0.44 '@types/ramda': ^0.24.17 + '@types/tape': ^4.2.30 chalk: ^2.2.0 commitizen: ^2.9.5 common-tags: ^1.4.0 ghooks: ^2.0.0 log-update: ^2.0.0 + mos-tap-diff: ^1.0.0 ndjson: ^1.5.0 + normalize-newline: ^3.0.0 pnpm-logger: ^0.6.2 pretty-bytes: ^4.0.2 ramda: ^0.25.0 rimraf: ^2.5.4 stacktracey: ^1.0.71 + tape: ^4.8.0 + ts-node: ^3.3.0 tslint: ^5.7.0 typescript: ^2.1.5 validate-commit-msg: ^2.8.2 diff --git a/test/package.json b/test/package.json deleted file mode 100644 index 353962952a..0000000000 --- a/test/package.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "scripts": { - "test": "ts-node index.ts", - "pretty-test": "ts-node index.ts | tap-diff" - }, - "dependencies": { - "@types/tape": "^4.2.30", - "mos-tap-diff": "^1.0.0", - "normalize-newline": "^3.0.0", - "tape": "^4.8.0", - "ts-node": "^3.3.0" - } -} diff --git a/test/shrinkwrap.yaml b/test/shrinkwrap.yaml deleted file mode 100644 index 62d19dcd9a..0000000000 --- a/test/shrinkwrap.yaml +++ /dev/null @@ -1,569 +0,0 @@ -dependencies: - '@types/tape': 4.2.30 - mos-tap-diff: 1.0.0 - normalize-newline: 3.0.0 - tape: 4.8.0 - ts-node: 3.3.0 -packages: - /@types/node/8.0.26: - resolution: - integrity: sha512-wbKN0MB4XsjdnSE04HiCzLoBDirGCM6zXrqavSj44nZnPFYpnrTF64E9O6Xmf0ca/IuKK/BHUcXwMiwk92gW6Q== - /@types/tape/4.2.30: - dependencies: - '@types/node': 8.0.26 - resolution: - integrity: sha1-PBkXxN/W8nJxuZInclE1FbxsRrQ= - /ansi-regex/0.2.1: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk= - /ansi-regex/2.1.1: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - /ansi-styles/1.1.0: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94= - /ansi-styles/2.2.1: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= - /ansi-styles/3.2.0: - dependencies: - color-convert: 1.9.0 - engines: - node: '>=4' - resolution: - integrity: sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug== - /argparse/1.0.9: - dependencies: - sprintf-js: 1.0.3 - resolution: - integrity: sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY= - /arrify/1.0.1: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= - /babel-runtime/6.26.0: - dependencies: - core-js: 2.5.1 - regenerator-runtime: 0.11.0 - resolution: - integrity: sha1-llxwWGaOgrVde/4E/yM3vItWR/4= - /balanced-match/1.0.0: - resolution: - integrity: sha1-ibTRmasr7kneFk6gK4nORi1xt2c= - /brace-expansion/1.1.8: - dependencies: - balanced-match: 1.0.0 - concat-map: 0.0.1 - resolution: - integrity: sha1-wHshHHyVLsH479Uad+8NHTmQopI= - /chalk/0.5.1: - dependencies: - ansi-styles: 1.1.0 - escape-string-regexp: 1.0.5 - has-ansi: 0.1.0 - strip-ansi: 0.3.0 - supports-color: 0.2.0 - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ= - /chalk/1.1.3: - dependencies: - ansi-styles: 2.2.1 - escape-string-regexp: 1.0.5 - has-ansi: 2.0.0 - strip-ansi: 3.0.1 - supports-color: 2.0.0 - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - /chalk/2.1.0: - dependencies: - ansi-styles: 3.2.0 - escape-string-regexp: 1.0.5 - supports-color: 4.4.0 - engines: - node: '>=4' - resolution: - integrity: sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ== - /color-convert/1.9.0: - dependencies: - color-name: 1.1.3 - resolution: - integrity: sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o= - /color-name/1.1.3: - resolution: - integrity: sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - /concat-map/0.0.1: - resolution: - integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - /core-js/2.5.1: - resolution: - integrity: sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs= - /core-util-is/1.0.2: - resolution: - integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - /deep-equal/1.0.1: - resolution: - integrity: sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= - /define-properties/1.1.2: - dependencies: - foreach: 2.0.5 - object-keys: 1.0.11 - engines: - node: '>= 0.4' - resolution: - integrity: sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ= - /defined/1.0.0: - resolution: - integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= - /diff/2.2.3: - engines: - node: '>=0.3.1' - resolution: - integrity: sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k= - /diff/3.3.1: - engines: - node: '>=0.3.1' - resolution: - integrity: sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww== - /duplexer/0.1.1: - resolution: - integrity: sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= - /es-abstract/1.8.1: - dependencies: - es-to-primitive: 1.1.1 - function-bind: 1.1.1 - has: 1.0.1 - is-callable: 1.1.3 - is-regex: 1.0.4 - engines: - node: '>= 0.4' - resolution: - integrity: sha512-G6pkMLdmxF3dh4hbuYuQiku29rRqo9p5+iRf7mZTEELT/xZ/D9Vzg04ddlvzJuJuCmZp1WBbfbVLZEeygYNkpw== - /es-to-primitive/1.1.1: - dependencies: - is-callable: 1.1.3 - is-date-object: 1.0.1 - is-symbol: 1.0.1 - engines: - node: '>= 0.4' - resolution: - integrity: sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0= - /escape-string-regexp/1.0.5: - engines: - node: '>=0.8.0' - resolution: - integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - /esprima/4.0.0: - engines: - node: '>=4' - resolution: - integrity: sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw== - /events-to-array/1.1.2: - resolution: - integrity: sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y= - /figures/1.7.0: - dependencies: - escape-string-regexp: 1.0.5 - object-assign: 4.1.1 - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= - /for-each/0.3.2: - dependencies: - is-function: 1.0.1 - resolution: - integrity: sha1-LEBFC5NI6X8oEyJZO6lnBLmr1NQ= - /foreach/2.0.5: - resolution: - integrity: sha1-C+4AUBiusmDQo6865ljdATbsG5k= - /fs.realpath/1.0.0: - resolution: - integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - /function-bind/1.1.1: - resolution: - integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - /glob/7.1.2: - dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.3 - minimatch: 3.0.4 - once: 1.4.0 - path-is-absolute: 1.0.1 - resolution: - integrity: sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ== - /has-ansi/0.1.0: - dependencies: - ansi-regex: 0.2.1 - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4= - /has-ansi/2.0.0: - dependencies: - ansi-regex: 2.1.1 - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - /has-flag/2.0.0: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= - /has/1.0.1: - dependencies: - function-bind: 1.1.1 - engines: - node: '>= 0.8.0' - resolution: - integrity: sha1-hGFzP1OLCDfJNh45qauelwTcLyg= - /inflight/1.0.6: - dependencies: - once: 1.4.0 - wrappy: 1.0.2 - resolution: - integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - /inherits/2.0.3: - resolution: - integrity: sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - /is-callable/1.1.3: - engines: - node: '>= 0.4' - resolution: - integrity: sha1-hut1OSgF3cM69xySoO7fdO52BLI= - /is-date-object/1.0.1: - engines: - node: '>= 0.4' - resolution: - integrity: sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= - /is-finite/1.0.2: - dependencies: - number-is-nan: 1.0.1 - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko= - /is-function/1.0.1: - resolution: - integrity: sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU= - /is-regex/1.0.4: - dependencies: - has: 1.0.1 - engines: - node: '>= 0.4' - resolution: - integrity: sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= - /is-symbol/1.0.1: - engines: - node: '>= 0.4' - resolution: - integrity: sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI= - /isarray/1.0.0: - resolution: - integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - /js-yaml/3.9.1: - dependencies: - argparse: 1.0.9 - esprima: 4.0.0 - resolution: - integrity: sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww== - /jsondiffpatch/0.1.43: - bundledDependencies: [] - dependencies: - chalk: 0.5.1 - resolution: - integrity: sha1-wFKImpnvfroZ0AlfkPclz6cKVhE= - /make-error/1.3.0: - resolution: - integrity: sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y= - /minimatch/3.0.4: - dependencies: - brace-expansion: 1.1.8 - resolution: - integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - /minimist/0.0.8: - resolution: - integrity: sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - /minimist/1.2.0: - resolution: - integrity: sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= - /mkdirp/0.5.1: - dependencies: - minimist: 0.0.8 - resolution: - integrity: sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= - /mos-tap-diff/1.0.0: - dependencies: - babel-runtime: 6.26.0 - chalk: 1.1.3 - core-js: 2.5.1 - diff: 2.2.3 - duplexer: 0.1.1 - figures: 1.7.0 - jsondiffpatch: 0.1.43 - pretty-ms: 2.1.0 - tap-parser: 1.3.2 - through2: 2.0.3 - resolution: - integrity: sha1-NDOB0f2e1RljsLMVNbf9i64E/3A= - /normalize-newline/3.0.0: - engines: - node: '>=4' - resolution: - integrity: sha1-HL6oBKukNgAfg5OKsh7AOdaa6dM= - /number-is-nan/1.0.1: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - /object-assign/4.1.1: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - /object-inspect/1.3.0: - resolution: - integrity: sha512-OHHnLgLNXpM++GnJRyyhbr2bwl3pPVm4YvaraHrRvDt/N3r+s/gDVHciA7EJBTkijKXj61ssgSAikq1fb0IBRg== - /object-keys/1.0.11: - engines: - node: '>= 0.4' - resolution: - integrity: sha1-xUYBd4rVYPEULODgG8yotW0TQm0= - /once/1.4.0: - dependencies: - wrappy: 1.0.2 - resolution: - integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - /parse-ms/1.0.1: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0= - /path-is-absolute/1.0.1: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - /path-parse/1.0.5: - resolution: - integrity: sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME= - /plur/1.0.0: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY= - /pretty-ms/2.1.0: - dependencies: - is-finite: 1.0.2 - parse-ms: 1.0.1 - plur: 1.0.0 - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-QlfCVt8/sLRR1q/6qwIYhBJpgdw= - /process-nextick-args/1.0.7: - resolution: - integrity: sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= - /readable-stream/2.3.3: - dependencies: - core-util-is: 1.0.2 - inherits: 2.0.3 - isarray: 1.0.0 - process-nextick-args: 1.0.7 - safe-buffer: 5.1.1 - string_decoder: 1.0.3 - util-deprecate: 1.0.2 - resolution: - integrity: sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== - /regenerator-runtime/0.11.0: - resolution: - integrity: sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A== - /resolve/1.4.0: - dependencies: - path-parse: 1.0.5 - resolution: - integrity: sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q== - /resumer/0.0.0: - dependencies: - through: 2.3.8 - resolution: - integrity: sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k= - /safe-buffer/5.1.1: - resolution: - integrity: sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== - /source-map-support/0.4.17: - dependencies: - source-map: 0.5.7 - resolution: - integrity: sha512-30c1Ch8FSjV0FwC253iftbbj0dU/OXoSg1LAEGZJUlGgjTNj6cu+DVqJWWIZJY5RXLWV4eFtR+4ouo0VIOYOTg== - /source-map/0.5.7: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - /sprintf-js/1.0.3: - resolution: - integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - /string.prototype.trim/1.1.2: - dependencies: - define-properties: 1.1.2 - es-abstract: 1.8.1 - function-bind: 1.1.1 - engines: - node: '>= 0.4' - resolution: - integrity: sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo= - /string_decoder/1.0.3: - dependencies: - safe-buffer: 5.1.1 - resolution: - integrity: sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== - /strip-ansi/0.3.0: - dependencies: - ansi-regex: 0.2.1 - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA= - /strip-ansi/3.0.1: - dependencies: - ansi-regex: 2.1.1 - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - /strip-bom/3.0.0: - engines: - node: '>=4' - resolution: - integrity: sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= - /strip-json-comments/2.0.1: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supports-color/0.2.0: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-2S3iaU6z9nMjlz1649i1W0wiGQo= - /supports-color/2.0.0: - engines: - node: '>=0.8.0' - resolution: - integrity: sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - /supports-color/4.4.0: - dependencies: - has-flag: 2.0.0 - engines: - node: '>=4' - resolution: - integrity: sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ== - /tap-parser/1.3.2: - dependencies: - events-to-array: 1.1.2 - inherits: 2.0.3 - js-yaml: 3.9.1 - optionalDependencies: - readable-stream: 2.3.3 - resolution: - integrity: sha1-EgxQiciMPIp5PvKIhn3jIeGPjCI= - /tape/4.8.0: - dependencies: - deep-equal: 1.0.1 - defined: 1.0.0 - for-each: 0.3.2 - function-bind: 1.1.1 - glob: 7.1.2 - has: 1.0.1 - inherits: 2.0.3 - minimist: 1.2.0 - object-inspect: 1.3.0 - resolve: 1.4.0 - resumer: 0.0.0 - string.prototype.trim: 1.1.2 - through: 2.3.8 - resolution: - integrity: sha512-TWILfEnvO7I8mFe35d98F6T5fbLaEtbFTG/lxWvid8qDfFTxt19EBijWmB4j3+Hoh5TfHE2faWs73ua+EphuBA== - /through/2.3.8: - resolution: - integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - /through2/2.0.3: - dependencies: - readable-stream: 2.3.3 - xtend: 4.0.1 - resolution: - integrity: sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= - /ts-node/3.3.0: - dependencies: - arrify: 1.0.1 - chalk: 2.1.0 - diff: 3.3.1 - make-error: 1.3.0 - minimist: 1.2.0 - mkdirp: 0.5.1 - source-map-support: 0.4.17 - tsconfig: 6.0.0 - v8flags: 3.0.0 - yn: 2.0.0 - engines: - node: '>=4.2.0' - resolution: - integrity: sha1-wTxqMCTjC+EYDdUwOPwgkonUv2k= - /tsconfig/6.0.0: - dependencies: - strip-bom: 3.0.0 - strip-json-comments: 2.0.1 - resolution: - integrity: sha1-aw6DdgA9evGGT434+J3QBZ/80DI= - /user-home/1.1.1: - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-K1viOjK2Onyd640PKNSFcko98ZA= - /util-deprecate/1.0.2: - resolution: - integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - /v8flags/3.0.0: - dependencies: - user-home: 1.1.1 - engines: - node: '>= 0.10.0' - resolution: - integrity: sha512-AGl+C+4qpeSu2g3JxCD/mGFFOs/vVZ3XREkD3ibQXEqr4Y4zgIrPWW124/IKJFHOIVFIoH8miWrLf0o84HYjwA== - /wrappy/1.0.2: - resolution: - integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - /xtend/4.0.1: - engines: - node: '>=0.4' - resolution: - integrity: sha1-pcbVMr5lbiPbgg77lDofBJmNY68= - /yn/2.0.0: - engines: - node: '>=4' - resolution: - integrity: sha1-5a2ryKz0CPY4X8dklWhMiOavaJo= -registry: 'https://registry.npmjs.org/' -shrinkwrapMinorVersion: 1 -shrinkwrapVersion: 3 -specifiers: - '@types/tape': ^4.2.30 - mos-tap-diff: ^1.0.0 - normalize-newline: ^3.0.0 - tape: ^4.8.0 - ts-node: ^3.3.0 From 12e1f7d2f6ea3bc0701ba9f635de8c849116dca8 Mon Sep 17 00:00:00 2001 From: zkochan Date: Thu, 2 Nov 2017 00:20:25 +0200 Subject: [PATCH 075/196] chore: use package-preview --- package.json | 3 +- shrinkwrap.yaml | 662 ++++++++++++++++++++++++++++++++++++++++++++---- test/index.ts | 2 +- 3 files changed, 611 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index 360886d421..e0beef1fc1 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "scripts": { "lint": "tslint -c tslint.json --project .", "pretty-test": "ts-node test | tap-diff", - "test": "npm run lint && ts-node test", + "test": "npm run lint && npm run tsc && preview && ts-node test", "tsc": "rimraf lib && tsc", "prepublishOnly": "npm run tsc" }, @@ -58,6 +58,7 @@ "ghooks": "^2.0.0", "mos-tap-diff": "^1.0.0", "normalize-newline": "^3.0.0", + "package-preview": "^0.1.3", "pnpm-logger": "^0.6.2", "rimraf": "^2.5.4", "tape": "^4.8.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index ffc36e5f68..3dbf5e389c 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,14 +1,14 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 8.0.44 - '@types/ramda': 0.24.17 - chalk: 2.2.0 + '@types/node': 8.0.47 + '@types/ramda': 0.24.18 + chalk: 2.3.0 common-tags: 1.4.0 - log-update: 2.1.0 + log-update: 2.2.0 ndjson: 1.5.0 pretty-bytes: 4.0.2 ramda: 0.25.0 - stacktracey: 1.0.71 + stacktracey: 1.2.83 xstream: 11.0.0 devDependencies: '@types/tape': 4.2.31 @@ -16,52 +16,84 @@ devDependencies: ghooks: 2.0.0 mos-tap-diff: 1.0.0 normalize-newline: 3.0.0 + package-preview: 0.1.3 pnpm-logger: 0.6.2 rimraf: 2.6.2 tape: 4.8.0 ts-node: 3.3.0 - tslint: 5.7.0 - typescript: 2.5.3 + tslint: 5.8.0 + typescript: 2.6.1 validate-commit-msg: 2.14.0 packages: + /@pnpm/exec/1.0.2: + dependencies: + '@types/got': 7.1.4 + '@types/node': 8.0.47 + command-exists: 1.2.2 + cross-spawn: 5.1.0 + got: 7.1.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-BjVjPYfTXNBF75WFyOJRPNw6BLutvgx6lvShzGGTreEAde/sND0DAAeyr+t3Wc9YuFKZ7DG84b97H5of8JiMmw== /@types/common-tags/1.4.0: dev: false resolution: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== - /@types/node/8.0.31: + /@types/fs-extra/4.0.3: + dependencies: + '@types/node': 8.0.47 dev: true resolution: - integrity: sha512-R+LdMJHJQwRd/Ca0Nr5KnwbSWHxTD3DWz4ivqoPeNH+YPcuirMWK+Ti9Mx32jOecmPhHOCd+6CefU5e1eVq2Ew== - /@types/node/8.0.44: - dev: false + integrity: sha512-cUE7dc4RJsRPCk8mbrgMAaglugcJbf1Oxp7DYi/aOj4+ggCxzddDQFZwCKWnqrLv4LJ89apyNJ7Y3pN79tAPVg== + /@types/got/7.1.4: + dependencies: + '@types/node': 8.0.47 + dev: true resolution: - integrity: sha512-56TeARKE2uMi7xWhpRRws/QdnpSVx9i7E8esGiPYoj90jnonGfmV1vwRLvHWYjPxF5u5l7p5fgdKwdse+VeAQQ== + integrity: sha512-GSwGwxqqbGy470XcZEWIrflF/ADxN1DObpQe7sE8xxel+zFG5ZG5xc+JEyfC/9aGlVrSAcKD/iPdXjGH5MS5lA== + /@types/mz/0.0.31: + dependencies: + '@types/node': 8.0.47 + dev: true + resolution: + integrity: sha1-pNgMCC/v5x5Ap8DwfR5lVbu8e1I= + /@types/mz/0.0.32: + dependencies: + '@types/node': 8.0.47 + dev: true + resolution: + integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== /@types/node/8.0.47: - dev: true resolution: integrity: sha512-kOwL746WVvt/9Phf6/JgX/bsGQvbrK5iUgzyfwZNcKVFcjAUVSpF9HxevLTld2SG9aywYHOILj38arDdY1r/iQ== - /@types/ramda/0.24.17: + /@types/ramda/0.24.18: dev: false resolution: - integrity: sha512-1zj7HQqHEdzjueCIRMiTSZteGavafmc12SWV3hp4yseKbXdebCsWGGoc+a9ywrJ4c7hQCLOBsoGQjc6wRXJyVA== + integrity: sha512-37umDB+zS6tK+3j0YJxsl7O8T4aYHYO6s1UpADJ/nxMHFjmuSd5XRQryC4IXX3HQ4XzstqAqhk/D+cdxwvqtEQ== /@types/tape/4.2.31: dependencies: '@types/node': 8.0.47 dev: true resolution: integrity: sha512-DEPn8FJKQR6eeMHZ407TuAqlhBKQa54PTM3c7Z6pKOI1uHaPnidmpmOXYtNZTcDrL5hnZofSHPwX1AQ9HbaMUg== + /@types/write-json-file/2.2.1: + dev: true + resolution: + integrity: sha512-JdO/UpPm9RrtQBNVcZdt3M7j3mHO/kXaea9LBGx3UgWJd1f9BkIWP7jObLBG6ZtRyqp7KzLFEsaPhWcidVittA== /ansi-escapes/1.4.0: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-06ioOzGapneTZisT52HHkRQiMG4= - /ansi-escapes/2.0.0: + /ansi-escapes/3.0.0: dev: false engines: node: '>=4' resolution: - integrity: sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs= + integrity: sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ== /ansi-regex/0.2.1: dev: true engines: @@ -99,6 +131,10 @@ packages: node: '>=4' resolution: integrity: sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug== + /any-promise/1.3.0: + dev: true + resolution: + integrity: sha1-q8av7tzqUugJzcA3au0845Y10X8= /argparse/1.0.9: dependencies: sprintf-js: 1.0.3 @@ -155,6 +191,18 @@ packages: dev: true resolution: integrity: sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + /base64-js/0.0.8: + dev: true + engines: + node: '>= 0.4' + resolution: + integrity: sha1-EQHpVE9KdrG8OybUUsqW16NeeXg= + /bl/1.2.1: + dependencies: + readable-stream: 2.3.3 + dev: true + resolution: + integrity: sha1-ysMo977kVzDUBLaSID/LWQ4XLV4= /bole/3.0.2: dependencies: fast-safe-stringify: 1.1.13 @@ -179,6 +227,36 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= + /browserify-zlib/0.1.4: + dependencies: + pako: 0.2.9 + dev: true + resolution: + integrity: sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0= + /buffer/3.6.0: + dependencies: + base64-js: 0.0.8 + ieee754: 1.1.8 + isarray: 1.0.0 + dev: true + resolution: + integrity: sha1-pyyTb3e5a/UvX357RnGAYoVR3vs= + /builtin-modules/1.1.1: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= + /bzip2-maybe/1.0.0: + dependencies: + is-bzip2: 1.0.0 + peek-stream: 1.1.2 + pumpify: 1.3.5 + through2: 2.0.3 + unbzip2-stream: 1.2.5 + dev: true + resolution: + integrity: sha1-ya73AIprlDy+mcxhcSXrS9R4KWs= /cachedir/1.1.1: dependencies: os-homedir: 1.0.2 @@ -209,26 +287,19 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - /chalk/2.2.0: - dependencies: - ansi-styles: 3.2.0 - escape-string-regexp: 1.0.5 - supports-color: 4.5.0 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha512-0BMM/2hG3ZaoPfR6F+h/oWpZtsh3b/s62TjSM6MGCJWEbJDN1acqCXvyhhZsDSVFklpebUoQ5O1kKC7lOzrn9g== /chalk/2.3.0: dependencies: ansi-styles: 3.2.0 escape-string-regexp: 1.0.5 supports-color: 4.5.0 - dev: true engines: node: '>=4' resolution: integrity: sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q== + /chownr/1.0.1: + dev: true + resolution: + integrity: sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE= /cli-cursor/1.0.2: dependencies: restore-cursor: 1.0.1 @@ -269,12 +340,10 @@ packages: node: '>=0.1.90' resolution: integrity: sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w= - /colors/1.1.2: + /command-exists/1.2.2: dev: true - engines: - node: '>=0.1.90' resolution: - integrity: sha1-FopHAXVran9RoSzgyXv6KMCE7WM= + integrity: sha1-EoGcZPr5VEbsCuB/5sr7brNwiyI= /commander/2.1.0: dev: true engines: @@ -354,6 +423,14 @@ packages: dev: true resolution: integrity: sha1-hF/wwINKPe2dFg2sptOQkGuyiMw= + /cross-spawn/5.1.0: + dependencies: + lru-cache: 4.1.1 + shebang-command: 1.2.0 + which: 1.3.0 + dev: true + resolution: + integrity: sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= /cz-conventional-changelog/1.2.0: dependencies: conventional-commit-types: 2.2.0 @@ -367,10 +444,26 @@ packages: integrity: sha1-K8oElkyJGbI/P9aonvXmAIsxs/g= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.0.44 + '@types/node': 8.0.47 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== + /decompress-maybe/1.0.0: + dependencies: + bzip2-maybe: 1.0.0 + gunzip-maybe: 1.4.1 + pumpify: 1.3.5 + dev: true + resolution: + integrity: sha1-rf54xmzAaeZOgkvRQFuF515tHLs= + /decompress-response/3.3.0: + dependencies: + mimic-response: 1.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= /dedent/0.6.0: dev: true resolution: @@ -408,6 +501,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-920GQ1LN9Docts5hnE7jqUdd4gg= + /detect-indent/5.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-OHHMCmoALow+Wzz38zYmRnXwa50= /diff/2.2.3: dev: true engines: @@ -424,6 +523,25 @@ packages: dev: true resolution: integrity: sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= + /duplexer3/0.1.4: + dev: true + resolution: + integrity: sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + /duplexify/3.5.1: + dependencies: + end-of-stream: 1.4.0 + inherits: 2.0.3 + readable-stream: 2.3.3 + stream-shift: 1.0.0 + dev: true + resolution: + integrity: sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ== + /end-of-stream/1.4.0: + dependencies: + once: 1.4.0 + dev: true + resolution: + integrity: sha1-epDYM+/abPpurA9JSduw+tOmMgY= /es-abstract/1.9.0: dependencies: es-to-primitive: 1.1.1 @@ -561,6 +679,15 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM= + /find-down/0.1.4: + dependencies: + locate-path: 2.0.0 + next-path: 1.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-3lcasU5kFaqBp/IJ19lDRv5I0FG42J94s2oIP5r0KA5z5+ID0vocMylMUEuuGbXqJ5WLNZteQB9CAVIzUnk9bQ== /find-node-modules/1.0.4: dependencies: findup-sync: 0.4.2 @@ -634,6 +761,14 @@ packages: dev: true resolution: integrity: sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA= + /fs-extra/4.0.2: + dependencies: + graceful-fs: 4.1.11 + jsonfile: 4.0.0 + universalify: 0.1.1 + dev: true + resolution: + integrity: sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s= /fs.realpath/1.0.0: dev: true resolution: @@ -642,13 +777,19 @@ packages: dev: true resolution: integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - /get-source/1.0.21: + /get-source/1.0.22: dependencies: data-uri-to-buffer: 2.0.0 source-map: 0.6.1 dev: false resolution: - integrity: sha1-XPB9S9tDWZo0qV8fgHuc3qR9l7U= + integrity: sha1-M/EiVM8BxL2hcE9cQE0LvadPM/I= + /get-stream/3.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= /ghooks/2.0.0: dependencies: execa: 0.4.0 @@ -658,6 +799,7 @@ packages: opt-cli: 1.5.1 path-exists: 2.1.0 spawn-command: 0.0.2 + deprecated: 'Use npmjs.com/husky instead, see https://github.com/gtramontina/ghooks/issues/166' dev: true resolution: integrity: sha1-r/2Do26Lj73e2bhRRXxIrHTI6rg= @@ -718,6 +860,27 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-jTvGuNo8qBEqFg2NSW/wRiv+948= + /got/7.1.0: + dependencies: + decompress-response: 3.3.0 + duplexer3: 0.1.4 + get-stream: 3.0.0 + is-plain-obj: 1.1.0 + is-retry-allowed: 1.1.0 + is-stream: 1.1.0 + isurl: 1.0.0 + lowercase-keys: 1.0.0 + p-cancelable: 0.3.0 + p-timeout: 1.2.0 + safe-buffer: 5.1.1 + timed-out: 4.0.1 + url-parse-lax: 1.0.0 + url-to-options: 1.0.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw== /graceful-fs/4.1.11: dev: true engines: @@ -728,6 +891,17 @@ packages: dev: true resolution: integrity: sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= + /gunzip-maybe/1.4.1: + dependencies: + browserify-zlib: 0.1.4 + is-deflate: 1.0.0 + is-gzip: 1.0.0 + peek-stream: 1.1.2 + pumpify: 1.3.5 + through2: 2.0.3 + dev: true + resolution: + integrity: sha512-qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g== /has-ansi/0.1.0: dependencies: ansi-regex: 0.2.1 @@ -749,6 +923,16 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= + /has-symbol-support-x/1.4.1: + dev: true + resolution: + integrity: sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA== + /has-to-string-tag-x/1.4.1: + dependencies: + has-symbol-support-x: 1.4.1 + dev: true + resolution: + integrity: sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw== /has/1.0.1: dependencies: function-bind: 1.1.1 @@ -765,6 +949,16 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-TCu8inWJmP7r9e1oWA921GdotLw= + /ieee754/1.1.8: + dev: true + resolution: + integrity: sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q= + /imurmurhash/0.1.4: + dev: true + engines: + node: '>=0.8.19' + resolution: + integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o= /individual/3.0.0: dev: true resolution: @@ -806,10 +1000,16 @@ packages: dev: true resolution: integrity: sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA= - /is-buffer/1.1.5: + /is-buffer/1.1.6: dev: true resolution: - integrity: sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw= + integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + /is-bzip2/1.0.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-XuWOqlounIDiFAe+3yOuWsCRs/w= /is-callable/1.1.3: dev: true engines: @@ -822,6 +1022,10 @@ packages: node: '>= 0.4' resolution: integrity: sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= + /is-deflate/1.0.0: + dev: true + resolution: + integrity: sha1-yGKQHDwWH7CdrHzcfnhPgOmPLxQ= /is-dotfile/1.0.3: dev: true engines: @@ -882,6 +1086,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= + /is-gzip/1.0.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM= /is-number/2.1.0: dependencies: kind-of: 3.2.2 @@ -898,6 +1108,16 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + /is-object/1.0.1: + dev: true + resolution: + integrity: sha1-iVJojF7C/9awPsyF52ngKQMINHA= + /is-plain-obj/1.1.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-caUMhCnfync8kqOQpKA7OfzVHT4= /is-posix-bracket/0.1.1: dev: true engines: @@ -922,6 +1142,12 @@ packages: node: '>= 0.4' resolution: integrity: sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= + /is-retry-allowed/1.1.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= /is-stream/1.1.0: dev: true engines: @@ -940,6 +1166,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-3hqm1j6indJIc3tp8f+LgALSEIw= + /is-windows/1.0.1: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk= /isarray/1.0.0: resolution: integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= @@ -955,6 +1187,15 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + /isurl/1.0.0: + dependencies: + has-to-string-tag-x: 1.4.1 + is-object: 1.0.1 + dev: true + engines: + node: '>= 4' + resolution: + integrity: sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w== /js-tokens/3.0.2: dev: true resolution: @@ -982,9 +1223,15 @@ packages: graceful-fs: 4.1.11 resolution: integrity: sha1-NzaitCi4e72gzIO1P6PWM6NcKug= + /jsonfile/4.0.0: + dev: true + optionalDependencies: + graceful-fs: 4.1.11 + resolution: + integrity: sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= /kind-of/3.2.2: dependencies: - is-buffer: 1.1.5 + is-buffer: 1.1.6 dev: true engines: node: '>=0.10.0' @@ -992,7 +1239,7 @@ packages: integrity: sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= /kind-of/4.0.0: dependencies: - is-buffer: 1.1.5 + is-buffer: 1.1.6 dev: true engines: node: '>=0.10.0' @@ -1004,6 +1251,15 @@ packages: graceful-fs: 4.1.11 resolution: integrity: sha1-QIhDO0azsbolnXh4XY6W9zugJDk= + /locate-path/2.0.0: + dependencies: + p-locate: 2.0.0 + path-exists: 3.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= /lodash._baseclone/4.5.7: dev: true resolution: @@ -1026,22 +1282,28 @@ packages: dev: true resolution: integrity: sha1-eCA6TRwyiuHYbcpkYONptX9AVa4= - /log-update/2.1.0: + /log-update/2.2.0: dependencies: - ansi-escapes: 2.0.0 + ansi-escapes: 3.0.0 cli-cursor: 2.1.0 wrap-ansi: 3.0.1 dev: false engines: node: '>=4' resolution: - integrity: sha1-6jcli1NU7bAuc7KRkAFsh9HIcUE= + integrity: sha1-4bA01DJeNDbJ3xqn/ZycJDv7kZg= /longest/1.0.1: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc= + /lowercase-keys/1.0.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-TjNms55/VFfjXxMkvfb4jQv8cwY= /lru-cache/4.1.1: dependencies: pseudomap: 1.0.2 @@ -1049,6 +1311,14 @@ packages: dev: true resolution: integrity: sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew== + /make-dir/1.1.0: + dependencies: + pify: 3.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA== /make-error/1.3.0: dev: true resolution: @@ -1087,6 +1357,12 @@ packages: node: '>=4' resolution: integrity: sha1-5md4PZLonb00KBi1IwudYqZyrRg= + /mimic-response/1.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4= /minimatch/3.0.4: dependencies: brace-expansion: 1.1.8 @@ -1100,6 +1376,14 @@ packages: /minimist/1.2.0: resolution: integrity: sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + /mkdirp-promise/5.0.1: + dependencies: + mkdirp: 0.5.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-6bj2jlUsaKnBcTuEiD96HdA5uKE= /mkdirp/0.5.1: dependencies: minimist: 0.0.8 @@ -1125,6 +1409,14 @@ packages: dev: true resolution: integrity: sha1-SJYrGeFp/R38JAs/HnMXYnu8R9s= + /mz/2.7.0: + dependencies: + any-promise: 1.3.0 + object-assign: 4.1.1 + thenify-all: 1.6.0 + dev: true + resolution: + integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== /ndjson/1.5.0: dependencies: json-stringify-safe: 5.0.1 @@ -1133,6 +1425,12 @@ packages: through2: 2.0.3 resolution: integrity: sha1-rmA7NrE0vOw0e0UkIrC/mNWDLsg= + /next-path/1.0.0: + dev: true + engines: + node: '>=6' + resolution: + integrity: sha1-gixFgNer54PfGZZbeJYiyoAWA+Q= /normalize-newline/3.0.0: dev: true engines: @@ -1233,6 +1531,61 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + /p-cancelable/0.3.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw== + /p-finally/1.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= + /p-limit/1.1.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw= + /p-locate/2.0.0: + dependencies: + p-limit: 1.1.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= + /p-timeout/1.2.0: + dependencies: + p-finally: 1.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-mCD5lDTFgXhotPNICe5SkWYNW2w= + /package-preview/0.1.3: + dependencies: + '@pnpm/exec': 1.0.2 + '@types/fs-extra': 4.0.3 + '@types/mz': 0.0.32 + '@types/node': 8.0.47 + '@types/write-json-file': 2.2.1 + cross-spawn: 5.1.0 + find-down: 0.1.4 + fs-extra: 4.0.2 + graceful-fs: 4.1.11 + mz: 2.7.0 + rimraf-then: 1.0.1 + symlink-dir: 1.1.0 + unpack-stream: 2.1.1 + write-json-file: 2.3.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-+i0nm6AzPFFimHndbgRw+wQ2GAj8RNw+iFiccnSvCXROEcZZgEa1PYA+iAhR89KAzlHQNIqpu5KehMEpod3BVA== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -1241,6 +1594,10 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-b7ySQEXSRPKiokRQMGDTv8YAl3Q= + /pako/0.2.9: + dev: true + resolution: + integrity: sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU= /parse-glob/3.0.4: dependencies: glob-base: 0.3.0 @@ -1272,6 +1629,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-D+tsZPD8UY2adU3V77YscCJ2H0s= + /path-exists/3.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= /path-is-absolute/1.0.1: dev: true engines: @@ -1288,6 +1651,19 @@ packages: dev: true resolution: integrity: sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME= + /peek-stream/1.1.2: + dependencies: + duplexify: 3.5.1 + through2: 2.0.3 + dev: true + resolution: + integrity: sha1-l+t2NlvP2MieKH9VyLadTD6bzFI= + /pify/3.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= /pinkie-promise/2.0.1: dependencies: pinkie: 2.0.4 @@ -1310,12 +1686,18 @@ packages: integrity: sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY= /pnpm-logger/0.6.2: dependencies: - '@types/node': 8.0.31 + '@types/node': 8.0.47 bole: 3.0.2 ndjson: 1.5.0 dev: true resolution: integrity: sha512-VLlRExib18bl5lSFp74vFHeZV0iWuxTkdOvI7BIhfWpiP9EdrkAq/GnjE5pxjXmsvXyZlaBDwoEQygU8kbVr8g== + /prepend-http/1.0.4: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= /preserve/0.2.0: dev: true engines: @@ -1349,6 +1731,21 @@ packages: dev: true resolution: integrity: sha1-8FKijacOYYkX7wqKw0wa5aaChrM= + /pump/1.0.2: + dependencies: + end-of-stream: 1.4.0 + once: 1.4.0 + dev: true + resolution: + integrity: sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE= + /pumpify/1.3.5: + dependencies: + duplexify: 3.5.1 + inherits: 2.0.3 + pump: 1.0.2 + dev: true + resolution: + integrity: sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs= /ramda/0.25.0: dev: false resolution: @@ -1375,7 +1772,7 @@ packages: integrity: sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== /rechoir/0.6.2: dependencies: - resolve: 1.4.0 + resolve: 1.5.0 dev: true engines: node: '>= 0.10' @@ -1431,6 +1828,12 @@ packages: dev: true resolution: integrity: sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q== + /resolve/1.5.0: + dependencies: + path-parse: 1.0.5 + dev: true + resolution: + integrity: sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw== /restore-cursor/1.0.1: dependencies: exit-hook: 1.1.1 @@ -1461,6 +1864,13 @@ packages: node: '>= 0.10' resolution: integrity: sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA= + /rimraf-then/1.0.1: + dependencies: + any-promise: 1.3.0 + rimraf: 2.6.2 + dev: true + resolution: + integrity: sha1-vURYp561YbdUiq7ArDdT70Kf5ws= /rimraf/2.6.2: dependencies: glob: 7.1.2 @@ -1492,6 +1902,20 @@ packages: dev: true resolution: integrity: sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg== + /shebang-command/1.2.0: + dependencies: + shebang-regex: 1.0.0 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + /shebang-regex/1.0.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= /shelljs/0.7.6: dependencies: glob: 7.1.2 @@ -1503,9 +1927,16 @@ packages: resolution: integrity: sha1-N5zM+1a5HIYB5HkzVutTgpJN6a0= /signal-exit/3.0.2: - dev: false resolution: integrity: sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + /sort-keys/2.0.0: + dependencies: + is-plain-obj: 1.1.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= /source-map-support/0.4.18: dependencies: source-map: 0.5.7 @@ -1548,13 +1979,23 @@ packages: dev: true resolution: integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - /stacktracey/1.0.71: + /ssri/4.1.6: + dependencies: + safe-buffer: 5.1.1 + dev: true + resolution: + integrity: sha512-WUbCdgSAMQjTFZRWvSPpauryvREEA+Krn19rx67UlJEJx/M192ZHxMmJXjZ4tkdFm+Sb0SXGlENeQVlA5wY7kA== + /stacktracey/1.2.83: dependencies: as-table: 1.0.31 - get-source: 1.0.21 + get-source: 1.0.22 dev: false resolution: - integrity: sha1-yrTKjmh0JScu6cQoHSNhETK+XQo= + integrity: sha1-KEK/HZQu9y1tf5ffnm+ylv3AjNk= + /stream-shift/1.0.0: + dev: true + resolution: + integrity: sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= /string-width/1.0.2: dependencies: code-point-at: 1.1.0 @@ -1655,6 +2096,19 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0= + /symlink-dir/1.1.0: + dependencies: + '@types/mz': 0.0.31 + '@types/node': 8.0.47 + graceful-fs: 4.1.11 + is-windows: 1.0.1 + mkdirp-promise: 5.0.1 + mz: 2.7.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-HrQ50UhvdoWwwC62I82l0U2NTRx9dTQWs5/ay0bRwBqkJQ0f3ruVhQUyLH7hs6NekRsvQgK76fZyUFK7PZsm8A== /tap-parser/1.3.2: dependencies: events-to-array: 1.1.2 @@ -1683,6 +2137,40 @@ packages: dev: true resolution: integrity: sha512-TWILfEnvO7I8mFe35d98F6T5fbLaEtbFTG/lxWvid8qDfFTxt19EBijWmB4j3+Hoh5TfHE2faWs73ua+EphuBA== + /tar-fs/1.16.0: + dependencies: + chownr: 1.0.1 + mkdirp: 0.5.1 + pump: 1.0.2 + tar-stream: 1.5.4 + dev: true + resolution: + integrity: sha512-I9rb6v7mjWLtOfCau9eH5L7sLJyU2BnxtEZRQ5Mt+eRKmf1F0ohXmT/Jc3fr52kDvjJ/HV5MH3soQfPL5bQ0Yg== + /tar-stream/1.5.4: + dependencies: + bl: 1.2.1 + end-of-stream: 1.4.0 + readable-stream: 2.3.3 + xtend: 4.0.1 + dev: true + engines: + node: '>= 0.8.0' + resolution: + integrity: sha1-NlSc8E7RrumyowwBQyUiONr5QBY= + /thenify-all/1.6.0: + dependencies: + thenify: 3.3.0 + dev: true + engines: + node: '>=0.8' + resolution: + integrity: sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY= + /thenify/3.3.0: + dependencies: + any-promise: 1.3.0 + dev: true + resolution: + integrity: sha1-5p44obq+lpsBCCB5eLn2K4hgSDk= /through/2.3.8: dev: true resolution: @@ -1693,6 +2181,12 @@ packages: xtend: 4.0.1 resolution: integrity: sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= + /timed-out/4.0.1: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= /tmp/0.0.29: dependencies: os-tmpdir: 1.0.2 @@ -1729,15 +2223,16 @@ packages: dev: true resolution: integrity: sha512-ymKWWZJST0/CkgduC2qkzjMOWr4bouhuURNXCn/inEX0L57BnRG6FhX76o7FOnsjHazCjfU2LKeSrlS2sIKQJg== - /tslint/5.7.0: + /tslint/5.8.0: dependencies: babel-code-frame: 6.26.0 - colors: 1.1.2 + builtin-modules: 1.1.1 + chalk: 2.3.0 commander: 2.11.0 diff: 3.4.0 glob: 7.1.2 minimatch: 3.0.4 - resolve: 1.4.0 + resolve: 1.5.0 semver: 5.4.1 tslib: 1.8.0 tsutils: 2.12.1 @@ -1747,7 +2242,7 @@ packages: peerDependencies: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev' resolution: - integrity: sha1-wl4NDJL6EgHCvDDoROCOaCtPNVI= + integrity: sha1-H0mtWy53x2w69N3K5VKuTjYS6xM= /tsutils/2.12.1: dependencies: tslib: 1.8.0 @@ -1760,12 +2255,48 @@ packages: dev: true resolution: integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - /typescript/2.5.3: + /typescript/2.6.1: dev: true engines: node: '>=4.2.0' resolution: - integrity: sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w== + integrity: sha1-7znN6ierrAtQAkLWcmq5DgyEZjE= + /unbzip2-stream/1.2.5: + dependencies: + buffer: 3.6.0 + through: 2.3.8 + dev: true + resolution: + integrity: sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og== + /universalify/0.1.1: + dev: true + resolution: + integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= + /unpack-stream/2.1.1: + dependencies: + '@types/node': 8.0.47 + decompress-maybe: 1.0.0 + ssri: 4.1.6 + tar-fs: 1.16.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-FXMzqT/KD6ABYGrqCpKYQy2q7nM= + /url-parse-lax/1.0.0: + dependencies: + prepend-http: 1.0.4 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-evjzA2Rem9eaJy56FKxovAYJ2nM= + /url-to-options/1.0.1: + dev: true + engines: + node: '>= 4' + resolution: + integrity: sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k= /util-deprecate/1.0.2: resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= @@ -1783,6 +2314,7 @@ packages: find-parent-dir: 0.3.0 findup: 0.1.5 semver-regex: 1.0.0 + deprecated: Check out CommitLint which provides the same functionality with a more user-focused experience. dev: true resolution: integrity: sha1-5Tg2kQEsuycNzAvCpO/+vhSJDqw= @@ -1811,6 +2343,27 @@ packages: dev: true resolution: integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + /write-file-atomic/2.3.0: + dependencies: + graceful-fs: 4.1.11 + imurmurhash: 0.1.4 + signal-exit: 3.0.2 + dev: true + resolution: + integrity: sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA== + /write-json-file/2.3.0: + dependencies: + detect-indent: 5.0.0 + graceful-fs: 4.1.11 + make-dir: 1.1.0 + pify: 3.0.0 + sort-keys: 2.0.0 + write-file-atomic: 2.3.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8= /xstream/11.0.0: dependencies: symbol-observable: 1.0.4 @@ -1848,6 +2401,7 @@ specifiers: mos-tap-diff: ^1.0.0 ndjson: ^1.5.0 normalize-newline: ^3.0.0 + package-preview: ^0.1.3 pnpm-logger: ^0.6.2 pretty-bytes: ^4.0.2 ramda: ^0.25.0 diff --git a/test/index.ts b/test/index.ts index cbcb179eb5..cca6b0977b 100644 --- a/test/index.ts +++ b/test/index.ts @@ -9,7 +9,7 @@ import logger, { lifecycleLogger, } from 'pnpm-logger' import normalizeNewline = require('normalize-newline') -import {toOutput$} from '../src' +import {toOutput$} from 'pnpm-default-reporter' import {stripIndents} from 'common-tags' import chalk from 'chalk' import xs, {Stream} from 'xstream' From a5471e4fbc58f74ad24b856c7b8b47ebb65b9602 Mon Sep 17 00:00:00 2001 From: zkochan Date: Thu, 2 Nov 2017 00:22:30 +0200 Subject: [PATCH 076/196] chore: use in tsconfig.json --- tsconfig.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 03bde01b1b..e1c5b75154 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -14,17 +14,11 @@ "module": "commonjs", "moduleResolution": "node" }, - "filesGlob": [ + "include": [ "src/**/*.ts", "typings/**/*.d.ts" ], "atom": { "rewriteTsconfig": true - }, - "files": [ - "src/bin/pnpm-default-reporter.ts", - "src/index.ts", - "typings/index.d.ts", - "typings/local.d.ts" - ] + } } From 84ba9a7096a47e3eb3791567e692f39dc96813d8 Mon Sep 17 00:00:00 2001 From: zkochan Date: Thu, 2 Nov 2017 00:40:52 +0200 Subject: [PATCH 077/196] style: configure linting --- src/index.ts | 134 ++++++++++++++++++++++----------------------- src/reportError.ts | 22 ++++---- tslint.json | 3 + 3 files changed, 81 insertions(+), 78 deletions(-) diff --git a/src/index.ts b/src/index.ts index 64109f5cd0..784a018efc 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,22 +1,22 @@ -import logUpdate = require('log-update') import chalk from 'chalk' +import {EventEmitter} from 'events' +import logUpdate = require('log-update') +import os = require('os') import { - ProgressLog, + DeprecationLog, + InstallCheckLog, LifecycleLog, Log, - InstallCheckLog, - DeprecationLog, + ProgressLog, RegistryLog, } from 'pnpm-logger' -import reportError from './reportError' -import os = require('os') -import xs, {Stream} from 'xstream' -import flattenConcurrently from 'xstream/extra/flattenConcurrently' -import dropRepeats from 'xstream/extra/dropRepeats' -import fromEvent from 'xstream/extra/fromEvent' -import R = require('ramda') -import {EventEmitter} from 'events' import prettyBytes = require('pretty-bytes') +import R = require('ramda') +import xs, {Stream} from 'xstream' +import dropRepeats from 'xstream/extra/dropRepeats' +import flattenConcurrently from 'xstream/extra/flattenConcurrently' +import fromEvent from 'xstream/extra/fromEvent' +import reportError from './reportError' const EOL = os.EOL const BIG_TARBALL_SIZE = 1024 * 1024 * 5 // 5 MB @@ -26,7 +26,7 @@ const removedSign = chalk.red('-') const hlValue = chalk.blue const hlPkgId = chalk['whiteBright'] -type PackageDiff = { +interface PackageDiff { name: string, version?: string, added: boolean, @@ -34,45 +34,45 @@ type PackageDiff = { } const propertyByDependencyType = { - prod: 'dependencies', dev: 'devDependencies', optional: 'optionalDependencies', + prod: 'dependencies', } -export default function (streamParser: Object) { +export default function(streamParser: object) { toOutput$(streamParser) .subscribe({ + complete() {}, // tslint:disable-line:no-empty + error: (err) => logUpdate(err.message), next: logUpdate, - error: err => logUpdate(err.message), - complete () {}, }) } -export function toOutput$ (streamParser: Object): Stream { +export function toOutput$(streamParser: object): Stream { const obs = fromEvent(streamParser as EventEmitter, 'data') const log$ = xs.fromObservable(obs) const progressLog$ = log$ - .filter(log => log.name === 'pnpm:progress') as Stream + .filter((log) => log.name === 'pnpm:progress') as Stream const resolutionDone$ = log$ - .filter(log => log.name === 'pnpm:stage' && log.message === 'resolution_done') + .filter((log) => log.name === 'pnpm:stage' && log.message === 'resolution_done') .mapTo(true) .take(1) .startWith(false) const resolvingContentLog$ = progressLog$ - .filter(log => log.status === 'resolving_content') + .filter((log) => log.status === 'resolving_content') .fold(R.inc, 0) .drop(1) .endWhen(resolutionDone$.last()) const fedtchedLog$ = progressLog$ - .filter(log => log.status === 'fetched') + .filter((log) => log.status === 'fetched') .fold(R.inc, 0) const foundInStoreLog$ = progressLog$ - .filter(log => log.status === 'found_in_store') + .filter((log) => log.status === 'found_in_store') .fold(R.inc, 0) const alreadyUpToDate$ = xs.of( @@ -85,7 +85,7 @@ export function toOutput$ (streamParser: Object): Stream { .mapTo({ fixed: false, msg: 'Already up-to-date', - }) + }), ) const progressSummaryOutput$ = xs.of( @@ -93,7 +93,7 @@ export function toOutput$ (streamParser: Object): Stream { resolvingContentLog$, fedtchedLog$, foundInStoreLog$, - resolutionDone$ + resolutionDone$, ) .map( R.apply((resolving, fetched, foundInStore: number, resolutionDone) => { @@ -108,31 +108,31 @@ export function toOutput$ (streamParser: Object): Stream { fixed: true, msg, } - }) - ) + }), + ), ) const tarballsProgressOutput$ = progressLog$ - .filter(log => log.status === 'fetching_started' && + .filter((log) => log.status === 'fetching_started' && typeof log.size === 'number' && log.size >= BIG_TARBALL_SIZE) - .map(startedLog => { + .map((startedLog) => { const size = prettyBytes(startedLog['size']) return progressLog$ - .filter(log => log.status === 'fetching_progress' && log.pkgId === startedLog['pkgId']) - .map(log => log['downloaded']) + .filter((log) => log.status === 'fetching_progress' && log.pkgId === startedLog['pkgId']) + .map((log) => log['downloaded']) .startWith(0) - .map(downloadedRaw => { + .map((downloadedRaw) => { const done = startedLog['size'] === downloadedRaw const downloaded = prettyBytes(downloadedRaw) return { - msg: `Downloading ${hlPkgId(startedLog['pkgId'])}: ${hlValue(downloaded)}/${hlValue(size)}${done ? ', done' : ''}`, fixed: !done, + msg: `Downloading ${hlPkgId(startedLog['pkgId'])}: ${hlValue(downloaded)}/${hlValue(size)}${done ? ', done' : ''}`, } }) }) const deprecationLog$ = log$ - .filter(log => log.name === 'pnpm:deprecation') as Stream + .filter((log) => log.name === 'pnpm:deprecation') as Stream const deprecationSet$ = deprecationLog$ .fold((acc, log) => { @@ -140,52 +140,52 @@ export function toOutput$ (streamParser: Object): Stream { return acc }, new Set()) - const rootLog$ = log$.filter(log => log.name === 'pnpm:root') + const rootLog$ = log$.filter((log) => log.name === 'pnpm:root') const pkgsDiff$ = xs.combine( rootLog$, - deprecationSet$ + deprecationSet$, ) .fold((pkgsDiff, args) => { const rootLog = args[0] const deprecationSet = args[1] as Set if (rootLog['added']) { pkgsDiff[rootLog['added'].dependencyType].push({ + added: true, + deprecated: deprecationSet.has(rootLog['added'].id), name: rootLog['added'].name, version: rootLog['added'].version, - deprecated: deprecationSet.has(rootLog['added'].id), - added: true, }) return pkgsDiff } if (rootLog['removed']) { pkgsDiff[rootLog['removed'].dependencyType].push({ + added: false, name: rootLog['removed'].name, version: rootLog['removed'].version, - added: false, }) return pkgsDiff } return pkgsDiff }, { - prod: [], dev: [], optional: [], + prod: [], } as { - prod: PackageDiff[], dev: PackageDiff[], + prod: PackageDiff[], optional: PackageDiff[], }) const summaryLog$ = log$ - .filter(log => log.name === 'pnpm:summary') + .filter((log) => log.name === 'pnpm:summary') .take(1) const summaryOutput$ = xs.combine( pkgsDiff$, - summaryLog$ + summaryLog$, ) - .map(R.apply(pkgsDiff => { + .map(R.apply((pkgsDiff) => { let msg = '' for (const depType of ['prod', 'optional', 'dev']) { if (pkgsDiff[depType].length) { @@ -203,10 +203,10 @@ export function toOutput$ (streamParser: Object): Stream { const deprecationOutput$ = deprecationLog$ // print warnings only about deprecated packages from the root - .filter(log => log.depth === 0) - .map(log => { + .filter((log) => log.depth === 0) + .map((log) => { return { - msg: formatWarn(`${chalk.red('deprecated')} ${log.pkgName}@${log.pkgVersion}: ${log.deprecated}`) + msg: formatWarn(`${chalk.red('deprecated')} ${log.pkgName}@${log.pkgVersion}: ${log.deprecated}`), } }) .map(xs.of) @@ -214,7 +214,7 @@ export function toOutput$ (streamParser: Object): Stream { const lifecycleMessages: {[pkgId: string]: {keep: boolean, output: string}} = {} const lifecycleOutput$ = xs.of( log$ - .filter(log => log.name === 'pnpm:lifecycle') + .filter((log) => log.name === 'pnpm:lifecycle') .map((log: LifecycleLog) => { const key = `${log.script}:${log.pkgId}` const keep = lifecycleMessages[key] && lifecycleMessages[key].keep || log.level === 'error' @@ -226,26 +226,26 @@ export function toOutput$ (streamParser: Object): Stream { keep, output, } - return R.values(lifecycleMessages).map(lm => lm['output']).join(EOL) + return R.values(lifecycleMessages).map((lm) => lm['output']).join(EOL) }) - .map(msg => ({msg})) + .map((msg) => ({msg})), ) const installCheckOutput$ = log$ - .filter(log => log.name === 'pnpm:install-check') + .filter((log) => log.name === 'pnpm:install-check') .map(formatInstallCheck) .filter(Boolean) - .map(msg => ({msg})) + .map((msg) => ({msg})) .map(xs.of) as Stream> const registryOutput$ = log$ - .filter(log => log.name === 'pnpm:registry' && log.level === 'warn') + .filter((log) => log.name === 'pnpm:registry' && log.level === 'warn') .map((log: RegistryLog) => ({msg: formatWarn(log.message)})) .map(xs.of) const miscOutput$ = log$ - .filter(log => log.name === 'pnpm' || (log.name as string) === 'pnpm:link') - .map(obj => { + .filter((log) => log.name === 'pnpm' || (log.name as string) === 'pnpm:link') + .map((obj) => { if (obj.level === 'debug') return if (obj.level === 'warn') { return formatWarn(obj['message']) @@ -255,7 +255,7 @@ export function toOutput$ (streamParser: Object): Stream { } return obj['message'] }) - .map(msg => ({msg})) + .map((msg) => ({msg})) .map(xs.of) let blockNo = 0 @@ -279,7 +279,7 @@ export function toOutput$ (streamParser: Object): Stream { let calculated = false let fixedCalculated = false return log - .map(msg => { + .map((msg) => { if (msg['fixed']) { if (!fixedCalculated) { fixedCalculated = true @@ -296,13 +296,13 @@ export function toOutput$ (streamParser: Object): Stream { currentBlockNo = blockNo++ } return { - prevFixedBlockNo: currentFixedBlockNo, blockNo: currentBlockNo, fixed: false, msg: typeof msg === 'string' ? msg : msg.msg, + prevFixedBlockNo: currentFixedBlockNo, } }) - }) + }), ) .fold((acc, log) => { if (log.fixed === true) { @@ -313,7 +313,7 @@ export function toOutput$ (streamParser: Object): Stream { } return acc }, {fixedBlocks: [], blocks: []} as {fixedBlocks: string[], blocks: string[]}) - .map(sections => { + .map((sections) => { const fixedBlocks = sections.fixedBlocks.filter(Boolean) const nonFixedPart = sections.blocks.filter(Boolean).join(EOL) if (!fixedBlocks.length) { @@ -325,7 +325,7 @@ export function toOutput$ (streamParser: Object): Stream { } return chalk.dim(nonFixedPart) + EOL + fixedPart }) - .filter(msg => { + .filter((msg) => { if (started) { return true } @@ -336,13 +336,13 @@ export function toOutput$ (streamParser: Object): Stream { .compose(dropRepeats()) } -function printDiffs (pkgsDiff: PackageDiff[]) { +function printDiffs(pkgsDiff: PackageDiff[]) { // Sorts by alphabet then by removed/added // + ava 0.10.0 // - chalk 1.0.0 // + chalk 2.0.0 pkgsDiff.sort((a, b) => (a.name.localeCompare(b.name) * 10 + (Number(!b.added) - Number(!a.added)))) - const msg = pkgsDiff.map(pkg => { + const msg = pkgsDiff.map((pkg) => { let result = pkg.added ? addedSign : removedSign result += ` ${pkg.name}` if (pkg.version) { @@ -356,7 +356,7 @@ function printDiffs (pkgsDiff: PackageDiff[]) { return msg } -function formatLifecycle (logObj: LifecycleLog) { +function formatLifecycle(logObj: LifecycleLog) { const prefix = `Running ${hlValue(logObj.script)} for ${hlPkgId(logObj.pkgId)}` if (logObj['exitCode'] === 0) { return `${prefix}, done` @@ -368,14 +368,14 @@ function formatLifecycle (logObj: LifecycleLog) { return `${prefix}: ${line}` } -function formatLine (logObj: LifecycleLog) { +function formatLine(logObj: LifecycleLog) { if (typeof logObj['exitCode'] === 'number') return chalk.red(`Exited with ${logObj['exitCode']}`) const color = logObj.level === 'error' ? chalk.red : chalk.gray return color(logObj['line']) } -function formatInstallCheck (logObj: InstallCheckLog) { +function formatInstallCheck(logObj: InstallCheckLog) { switch (logObj.code) { case 'EBADPLATFORM': return formatWarn(`Unsupported system. Skipping dependency ${logObj.pkgId}`) @@ -386,7 +386,7 @@ function formatInstallCheck (logObj: InstallCheckLog) { } } -function formatWarn (message: string) { +function formatWarn(message: string) { // The \u2009 is the "thin space" unicode character // It is used instead of ' ' because chalk (as of version 2.1.0) // trims whitespace at the beginning diff --git a/src/reportError.ts b/src/reportError.ts index 1dc4d79401..baa33546a9 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -1,7 +1,7 @@ import chalk from 'chalk' -import {Log} from 'pnpm-logger' import commonTags = require('common-tags') import os = require('os') +import {Log} from 'pnpm-logger' import StackTracey = require('stacktracey') const stripIndent = commonTags.stripIndent @@ -10,9 +10,9 @@ const EOL = os.EOL const highlight = chalk.yellow const colorPath = chalk.gray -export default function reportError (logObj: Log) { +export default function reportError(logObj: Log) { if (logObj['err']) { - const err = logObj['err'] + const err = logObj['err'] as (Error & { code: string, stack: object }) switch (err.code) { case 'UNEXPECTED_STORE': return reportUnexpectedStore(err, logObj['message']) @@ -31,7 +31,7 @@ export default function reportError (logObj: Log) { return formatErrorSummary(logObj['message']) } -function reportUnexpectedStore (err: Error, msg: Object) { +function reportUnexpectedStore(err: Error, msg: object) { return stripIndent` ${formatErrorSummary(err.message)} @@ -42,7 +42,7 @@ function reportUnexpectedStore (err: Error, msg: Object) { ` } -function reportStoreBreakingChange (err: Error, msg: Object) { +function reportStoreBreakingChange(err: Error, msg: object) { let output = stripIndent` ${formatErrorSummary(`The store used for the current node_modules is incomatible with the current version of pnpm`)} Store path: ${colorPath(msg['storePath'])} @@ -58,7 +58,7 @@ function reportStoreBreakingChange (err: Error, msg: Object) { return output } -function reportModulesBreakingChange (err: Error, msg: Object) { +function reportModulesBreakingChange(err: Error, msg: object) { let output = stripIndent` ${formatErrorSummary(`The current version of pnpm is not compatible with the available node_modules structure`)} node_modules path: ${colorPath(msg['modulesPath'])} @@ -74,7 +74,7 @@ function reportModulesBreakingChange (err: Error, msg: Object) { return output } -function formatRelatedSources (msg: Object) { +function formatRelatedSources(msg: object) { let output = '' if (!msg['relatedIssue'] && !msg['relatedPR']) return output @@ -92,7 +92,7 @@ function formatRelatedSources (msg: Object) { return output } -function formatGenericError (errorMessage: string, stack: Object) { +function formatGenericError(errorMessage: string, stack: object) { if (stack) { return stripIndents` ${formatErrorSummary(errorMessage)} @@ -102,11 +102,11 @@ function formatGenericError (errorMessage: string, stack: Object) { return formatErrorSummary(errorMessage) } -function formatErrorSummary (message: string) { +function formatErrorSummary(message: string) { return `${chalk.bgRed.black('\u2009ERROR\u2009')} ${chalk.red(message)}` } -function reportModifiedDependency (err: Error, msg: Object) { +function reportModifiedDependency(err: Error, msg: object) { return stripIndent` ${formatErrorSummary('Packages in the store have been mutated')} @@ -117,7 +117,7 @@ function reportModifiedDependency (err: Error, msg: Object) { ` } -function reportShrinkwrapBreakingChange (err: Error, msg: Object) { +function reportShrinkwrapBreakingChange(err: Error, msg: object) { return stripIndent` ${formatErrorSummary(err.message)} diff --git a/tslint.json b/tslint.json index da373b90fd..249496f96e 100644 --- a/tslint.json +++ b/tslint.json @@ -1,4 +1,5 @@ { + "extends": "tslint:recommended", "rules": { "curly": false, "eofline": false, @@ -15,6 +16,8 @@ "no-use-before-declare": true, "no-var-requires": true, "no-require-imports": false, + "no-string-literal": false, + "interface-name": [true, "never-prefix"], "one-line": [true, "check-else", "check-whitespace", From b6da6dc0280c4fc7d3af5fc3398dbd50db578b1d Mon Sep 17 00:00:00 2001 From: zkochan Date: Thu, 2 Nov 2017 00:42:13 +0200 Subject: [PATCH 078/196] ci: test on Node.js 9 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6998bbee39..a3c58d35ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ node_js: - 4 - 6 - 8 + - 9 sudo: false before_install: - curl -L https://unpkg.com/@pnpm/self-installer | node From c201910ba0ff10de938d7e7da836193805c029c9 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 4 Nov 2017 00:02:12 +0200 Subject: [PATCH 079/196] feat: log changing the dependency type --- package.json | 2 +- shrinkwrap.yaml | 8 ++-- src/index.ts | 65 ++++------------------------ src/pkgsDiff.ts | 112 ++++++++++++++++++++++++++++++++++++++++++++++++ test/index.ts | 27 +++++++++++- tslint.json | 1 + 6 files changed, 152 insertions(+), 63 deletions(-) create mode 100644 src/pkgsDiff.ts diff --git a/package.json b/package.json index e0beef1fc1..57b960d2d5 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "mos-tap-diff": "^1.0.0", "normalize-newline": "^3.0.0", "package-preview": "^0.1.3", - "pnpm-logger": "^0.6.2", + "pnpm-logger": "^0.6.3", "rimraf": "^2.5.4", "tape": "^4.8.0", "ts-node": "^3.3.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 3dbf5e389c..2631571f2b 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -17,7 +17,7 @@ devDependencies: mos-tap-diff: 1.0.0 normalize-newline: 3.0.0 package-preview: 0.1.3 - pnpm-logger: 0.6.2 + pnpm-logger: 0.6.3 rimraf: 2.6.2 tape: 4.8.0 ts-node: 3.3.0 @@ -1684,14 +1684,14 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY= - /pnpm-logger/0.6.2: + /pnpm-logger/0.6.3: dependencies: '@types/node': 8.0.47 bole: 3.0.2 ndjson: 1.5.0 dev: true resolution: - integrity: sha512-VLlRExib18bl5lSFp74vFHeZV0iWuxTkdOvI7BIhfWpiP9EdrkAq/GnjE5pxjXmsvXyZlaBDwoEQygU8kbVr8g== + integrity: sha512-4yYX0Su4YjIM09fgIVlCGN0ToQ75VShF+RHIgIvASd7aF5JsGHaYMFJTqNOsaqc51pLwLvVrPayoMBMGFrULzQ== /prepend-http/1.0.4: dev: true engines: @@ -2402,7 +2402,7 @@ specifiers: ndjson: ^1.5.0 normalize-newline: ^3.0.0 package-preview: ^0.1.3 - pnpm-logger: ^0.6.2 + pnpm-logger: ^0.6.3 pretty-bytes: ^4.0.2 ramda: ^0.25.0 rimraf: ^2.5.4 diff --git a/src/index.ts b/src/index.ts index 784a018efc..d9a37784ca 100644 --- a/src/index.ts +++ b/src/index.ts @@ -16,6 +16,10 @@ import xs, {Stream} from 'xstream' import dropRepeats from 'xstream/extra/dropRepeats' import flattenConcurrently from 'xstream/extra/flattenConcurrently' import fromEvent from 'xstream/extra/fromEvent' +import getPkgsDiff, { + PackageDiff, + propertyByDependencyType, +} from './pkgsDiff' import reportError from './reportError' const EOL = os.EOL @@ -26,19 +30,6 @@ const removedSign = chalk.red('-') const hlValue = chalk.blue const hlPkgId = chalk['whiteBright'] -interface PackageDiff { - name: string, - version?: string, - added: boolean, - deprecated?: boolean, -} - -const propertyByDependencyType = { - dev: 'devDependencies', - optional: 'optionalDependencies', - prod: 'dependencies', -} - export default function(streamParser: object) { toOutput$(streamParser) .subscribe({ @@ -134,48 +125,7 @@ export function toOutput$(streamParser: object): Stream { const deprecationLog$ = log$ .filter((log) => log.name === 'pnpm:deprecation') as Stream - const deprecationSet$ = deprecationLog$ - .fold((acc, log) => { - acc.add(log.pkgId) - return acc - }, new Set()) - - const rootLog$ = log$.filter((log) => log.name === 'pnpm:root') - - const pkgsDiff$ = xs.combine( - rootLog$, - deprecationSet$, - ) - .fold((pkgsDiff, args) => { - const rootLog = args[0] - const deprecationSet = args[1] as Set - if (rootLog['added']) { - pkgsDiff[rootLog['added'].dependencyType].push({ - added: true, - deprecated: deprecationSet.has(rootLog['added'].id), - name: rootLog['added'].name, - version: rootLog['added'].version, - }) - return pkgsDiff - } - if (rootLog['removed']) { - pkgsDiff[rootLog['removed'].dependencyType].push({ - added: false, - name: rootLog['removed'].name, - version: rootLog['removed'].version, - }) - return pkgsDiff - } - return pkgsDiff - }, { - dev: [], - optional: [], - prod: [], - } as { - dev: PackageDiff[], - prod: PackageDiff[], - optional: PackageDiff[], - }) + const pkgsDiff$ = getPkgsDiff(log$, deprecationLog$) const summaryLog$ = log$ .filter((log) => log.name === 'pnpm:summary') @@ -188,11 +138,12 @@ export function toOutput$(streamParser: object): Stream { .map(R.apply((pkgsDiff) => { let msg = '' for (const depType of ['prod', 'optional', 'dev']) { - if (pkgsDiff[depType].length) { + const diffs = R.values(pkgsDiff[depType]) + if (diffs.length) { msg += EOL msg += chalk.blue(`${propertyByDependencyType[depType]}:`) msg += EOL - msg += printDiffs(pkgsDiff[depType]) + msg += printDiffs(diffs) msg += EOL } } diff --git a/src/pkgsDiff.ts b/src/pkgsDiff.ts new file mode 100644 index 0000000000..8f6048a1cd --- /dev/null +++ b/src/pkgsDiff.ts @@ -0,0 +1,112 @@ +import { + DeprecationLog, + Log, +} from 'pnpm-logger' +import R = require('ramda') +import xs, {Stream} from 'xstream' + +export interface PackageDiff { + name: string, + version?: string, + added: boolean, + deprecated?: boolean, +} + +interface Map { + [index: string]: T, +} + +export const propertyByDependencyType = { + dev: 'devDependencies', + optional: 'optionalDependencies', + prod: 'dependencies', +} + +export default (log$: xs, deprecationLog$: xs) => { + const rootLog$ = log$.filter((log) => log.name === 'pnpm:root') + + const deprecationSet$ = deprecationLog$ + .fold((acc, log) => { + acc.add(log.pkgId) + return acc + }, new Set()) + + const pkgsDiff$ = xs.combine( + rootLog$, + deprecationSet$, + ) + .fold((pkgsDiff, args) => { + const rootLog = args[0] + const deprecationSet = args[1] as Set + if (rootLog['added']) { + pkgsDiff[rootLog['added'].dependencyType][`+${rootLog['added'].name}`] = { + added: true, + deprecated: deprecationSet.has(rootLog['added'].id), + name: rootLog['added'].name, + version: rootLog['added'].version, + } + return pkgsDiff + } + if (rootLog['removed']) { + pkgsDiff[rootLog['removed'].dependencyType][`-${rootLog['removed'].name}`] = { + added: false, + name: rootLog['removed'].name, + version: rootLog['removed'].version, + } + return pkgsDiff + } + return pkgsDiff + }, { + dev: {}, + optional: {}, + prod: {}, + } as { + dev: Map, + prod: Map, + optional: Map, + }) + + const manifest$ = log$ + .filter((log) => log.name === 'pnpm:manifest') + .take(2) + .fold(R.merge, {}) + .last() + + return xs.combine(pkgsDiff$, manifest$) + .map(R.apply((pkgsDiff, manifests) => { + const initialManifest = manifests['initial'] + const updatedManifest = manifests['updated'] + + if (!initialManifest || !updatedManifest) return pkgsDiff + + for (const depType of ['prod', 'optional', 'dev']) { + const prop = propertyByDependencyType[depType] + const initialDeps = R.keys(initialManifest[prop]) + const updatedDeps = R.keys(updatedManifest[prop]) + const removedDeps = R.difference(initialDeps, updatedDeps) + + for (const removedDep of removedDeps) { + if (!pkgsDiff[depType][`-${removedDep}`]) { + pkgsDiff[depType][`-${removedDep}`] = { + added: false, + name: removedDep, + version: initialManifest[prop][removedDep], + } + } + } + + const addedDeps = R.difference(updatedDeps, initialDeps) + + for (const addedDep of addedDeps) { + if (!pkgsDiff[depType][`+${addedDep}`]) { + pkgsDiff[depType][`+${addedDep}`] = { + added: true, + name: addedDep, + version: updatedManifest[prop][addedDep], + } + } + } + } + return pkgsDiff + })) +} diff --git a/test/index.ts b/test/index.ts index cca6b0977b..e6989f5443 100644 --- a/test/index.ts +++ b/test/index.ts @@ -7,6 +7,7 @@ import logger, { deprecationLogger, summaryLogger, lifecycleLogger, + manifestLogger, } from 'pnpm-logger' import normalizeNewline = require('normalize-newline') import {toOutput$} from 'pnpm-default-reporter' @@ -125,6 +126,16 @@ test('prints "Already up-to-date"', t => { test('prints summary', t => { const output$ = toOutput$(createStreamParser()) + manifestLogger.debug({ + initial: { + dependencies: { + 'is-13': '^1.0.0', + }, + devDependencies: { + 'is-negative': '^1.0.0', + }, + }, + }) deprecationLogger.warn({ pkgName: 'bar', pkgVersion: '2.0.0', @@ -177,6 +188,16 @@ test('prints summary', t => { name: 'is-positive', }, }) + manifestLogger.debug({ + updated: { + dependencies: { + 'is-negative': '^1.0.0', + }, + devDependencies: { + 'is-13': '^1.0.0', + }, + } + }) summaryLogger.info(undefined) t.plan(1) @@ -190,14 +211,18 @@ test('prints summary', t => { ${ADD} bar ${versionColor('2.0.0')} ${DEPRECATED} ${SUB} foo ${versionColor('0.1.0')} ${ADD} foo ${versionColor('1.0.0')} + ${SUB} is-13 ${versionColor('^1.0.0')} + ${ADD} is-negative ${versionColor('^1.0.0')} ${h1('optionalDependencies:')} ${SUB} is-positive ${ADD} lala ${versionColor('1.1.0')} ${h1('devDependencies:')} + ${ADD} is-13 ${versionColor('^1.0.0')} + ${SUB} is-negative ${versionColor('^1.0.0')} ${ADD} qar ${versionColor('2.0.0')} - ` + '\n') + ` + '\n') }, complete: t.end, error: t.end, diff --git a/tslint.json b/tslint.json index 249496f96e..5f4e4a897d 100644 --- a/tslint.json +++ b/tslint.json @@ -17,6 +17,7 @@ "no-var-requires": true, "no-require-imports": false, "no-string-literal": false, + "no-console": false, "interface-name": [true, "never-prefix"], "one-line": [true, "check-else", From fd155b546de58251b8b3d9462a8d9fc33c235663 Mon Sep 17 00:00:00 2001 From: zkochan Date: Sat, 4 Nov 2017 00:02:32 +0200 Subject: [PATCH 080/196] chore(release): 0.9.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 57b960d2d5..ac0cdd5649 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.9.6", + "version": "0.9.7", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From d242cf712ac67b3351995e0ee9f4226662823f46 Mon Sep 17 00:00:00 2001 From: zkochan Date: Fri, 10 Nov 2017 01:44:01 +0200 Subject: [PATCH 081/196] feat: use pnpm-logger@0.7 and Log types from supi --- package.json | 3 +- shrinkwrap.yaml | 1348 +++++++++++++++++++++++++++++++++++++++++++- src/index.ts | 8 +- src/pkgsDiff.ts | 4 +- src/reportError.ts | 2 +- test/index.ts | 17 +- 6 files changed, 1354 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index ac0cdd5649..baa04a0182 100644 --- a/package.json +++ b/package.json @@ -59,8 +59,9 @@ "mos-tap-diff": "^1.0.0", "normalize-newline": "^3.0.0", "package-preview": "^0.1.3", - "pnpm-logger": "^0.6.3", + "pnpm-logger": "^0.7.1", "rimraf": "^2.5.4", + "supi": "^0.7.0-1", "tape": "^4.8.0", "ts-node": "^3.3.0", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 2631571f2b..9c404a4aa0 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -17,8 +17,9 @@ devDependencies: mos-tap-diff: 1.0.0 normalize-newline: 3.0.0 package-preview: 0.1.3 - pnpm-logger: 0.6.3 + pnpm-logger: 0.7.1 rimraf: 2.6.2 + supi: 0.7.0-1 tape: 4.8.0 ts-node: 3.3.0 tslint: 5.8.0 @@ -37,8 +38,17 @@ packages: node: '>=4' resolution: integrity: sha512-BjVjPYfTXNBF75WFyOJRPNw6BLutvgx6lvShzGGTreEAde/sND0DAAeyr+t3Wc9YuFKZ7DG84b97H5of8JiMmw== + /@pnpm/types/1.0.0: + dev: true + resolution: + integrity: sha512-2BQ/X7qS3bCWOFR+HMQ3ZR1qU1KZNGGjfF6fvMPbYq3kZBGr5i57je4XTHADuiVRv0t6wJ4Ev+X4bw6GktbFYQ== + /@types/byline/4.2.31: + dependencies: + '@types/node': 8.0.50 + dev: true + resolution: + integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= /@types/common-tags/1.4.0: - dev: false resolution: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== /@types/fs-extra/4.0.3: @@ -53,35 +63,121 @@ packages: dev: true resolution: integrity: sha512-GSwGwxqqbGy470XcZEWIrflF/ADxN1DObpQe7sE8xxel+zFG5ZG5xc+JEyfC/9aGlVrSAcKD/iPdXjGH5MS5lA== + /@types/load-json-file/2.0.7: + dev: true + resolution: + integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== /@types/mz/0.0.31: dependencies: - '@types/node': 8.0.47 + '@types/node': 8.0.50 dev: true resolution: integrity: sha1-pNgMCC/v5x5Ap8DwfR5lVbu8e1I= /@types/mz/0.0.32: dependencies: - '@types/node': 8.0.47 + '@types/node': 8.0.50 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== + /@types/node/7.0.46: + dev: true + resolution: + integrity: sha512-u+JAi1KtmaUoU/EHJkxoiuvzyo91FCE41Z9TZWWcOUU3P8oUdlDLdrGzCGWySPgbRMD17B0B+1aaJLYI9egQ6A== /@types/node/8.0.47: resolution: integrity: sha512-kOwL746WVvt/9Phf6/JgX/bsGQvbrK5iUgzyfwZNcKVFcjAUVSpF9HxevLTld2SG9aywYHOILj38arDdY1r/iQ== + /@types/node/8.0.50: + dev: true + resolution: + integrity: sha512-N9OVsMBspboNvYaLAQnLEhb2eQ96lavogMR5LoH5k8nb1PvBZHSBFhzhsq2LNzGTBBOtBviOc1GiSu+wlM/pGw== + /@types/nopt/3.0.29: + dev: true + resolution: + integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= + /@types/npm/2.0.29: + dependencies: + '@types/node': 8.0.50 + dev: true + resolution: + integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== + /@types/p-series/1.0.0: + dev: true + resolution: + integrity: sha512-Wg4K7QcdxvqgLGR+sTUtsDXNfHgHv/AzEv5bZXxAE9nvC7x+zmIEx5ZFUTE0c3e8naW70cinqOvk76LGGiYKZA== + /@types/ramda/0.0.11: + dev: true + resolution: + integrity: sha512-RcraK0229RAIJERTfgoCY/eSbxFEkPlj/TbUUb6aGSS9UfLj1THpt2Uj4uuCJsQrYRQUQB8tFlv7eTTWzE4QjQ== /@types/ramda/0.24.18: dev: false resolution: integrity: sha512-37umDB+zS6tK+3j0YJxsl7O8T4aYHYO6s1UpADJ/nxMHFjmuSd5XRQryC4IXX3HQ4XzstqAqhk/D+cdxwvqtEQ== + /@types/ramda/0.25.3: + dev: true + resolution: + integrity: sha512-wxs2s/qPon1Obr+0NSiBlF/6uHrFYmh+F14971ZIvpM9OUad2eMqDrPC6Cz5WZh50DNrKYz1C8dVIpWp7PVQ7w== + /@types/rc/0.0.1: + dev: true + resolution: + integrity: sha1-H1uKGzsaxtH+4TfFP6xfoPKK4Nc= + /@types/retry/0.10.2: + dev: true + resolution: + integrity: sha512-LqJkY4VQ7S09XhI7kA3ON71AxauROhSv74639VsNXC9ish4IWHnIi98if+nP1MxQV3RMPqXSCYgpPsDHjlg9UQ== + /@types/semver/5.4.0: + dev: true + resolution: + integrity: sha512-PBHCvO98hNec9A491vBbh0ZNDOVxccwKL1u2pm6fs9oDgm7SEnw0lEHqHfjsYryDxnE3zaf7LvERWEXjOp1hig== /@types/tape/4.2.31: dependencies: '@types/node': 8.0.47 dev: true resolution: integrity: sha512-DEPn8FJKQR6eeMHZ407TuAqlhBKQa54PTM3c7Z6pKOI1uHaPnidmpmOXYtNZTcDrL5hnZofSHPwX1AQ9HbaMUg== + /@types/update-notifier/1.0.2: + dev: true + resolution: + integrity: sha512-NwfqJ7OT7MgzgV+SiWJr7jMdBezFIWuBSmCOmScvesL/SV8A17SUQR0sCI+shxo+4THHPNGgzaLzfbjQMYLHFA== /@types/write-json-file/2.2.1: dev: true resolution: integrity: sha512-JdO/UpPm9RrtQBNVcZdt3M7j3mHO/kXaea9LBGx3UgWJd1f9BkIWP7jObLBG6ZtRyqp7KzLFEsaPhWcidVittA== + /@zkochan/cmd-shim/2.2.4: + dependencies: + is-windows: 1.0.1 + mkdirp-promise: 5.0.1 + mz: 2.7.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-BDy1oz6aFYyY73618IkXzJzFghnXwVZDc3SVa6MVKTrrk4RgubahAF5yKK+Mx4a78tfO0OHeZnJKPs0pNy5uNA== + /@zkochan/npm-lifecycle/0.0.6: + dependencies: + byline: 5.0.0 + graceful-fs: 4.1.11 + node-gyp: 3.6.2 + resolve-from: 4.0.0 + slide: 1.1.6 + uid-number: 0.0.6 + umask: 1.1.0 + which: 1.3.0 + dev: true + resolution: + integrity: sha512-j1OJrYOACRfIHESTnvCBUg8WkVr7nHjkF/0A64qD/kabVulXJYGxu27w6Z9wrJHGQchePPCR31xJWOta4uVqxw== + /abbrev/1.1.1: + dev: true + resolution: + integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== + /ajv/5.3.0: + dependencies: + co: 4.6.0 + fast-deep-equal: 1.0.0 + fast-json-stable-stringify: 2.0.0 + json-schema-traverse: 0.3.1 + dev: true + resolution: + integrity: sha1-RBT/dKUIecII7l/cgm4ywwNUnto= /ansi-escapes/1.4.0: dev: true engines: @@ -135,6 +231,17 @@ packages: dev: true resolution: integrity: sha1-q8av7tzqUugJzcA3au0845Y10X8= + /aproba/1.2.0: + dev: true + resolution: + integrity: sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== + /are-we-there-yet/1.1.4: + dependencies: + delegates: 1.0.0 + readable-stream: 2.3.3 + dev: true + resolution: + integrity: sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0= /argparse/1.0.9: dependencies: sprintf-js: 1.0.3 @@ -173,6 +280,28 @@ packages: dev: false resolution: integrity: sha1-0AGAAk7LttGnRxUN91HTcWrqgWY= + /asn1/0.2.3: + dev: true + resolution: + integrity: sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y= + /assert-plus/1.0.0: + dev: true + engines: + node: '>=0.8' + resolution: + integrity: sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + /asynckit/0.4.0: + dev: true + resolution: + integrity: sha1-x57Zf380y48robyXkLzDZkdLS3k= + /aws-sign2/0.7.0: + dev: true + resolution: + integrity: sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + /aws4/1.6.0: + dev: true + resolution: + integrity: sha1-g+9cqGCysy5KDe7e6MdxudtXRx4= /babel-code-frame/6.26.0: dependencies: chalk: 1.1.3 @@ -197,12 +326,36 @@ packages: node: '>= 0.4' resolution: integrity: sha1-EQHpVE9KdrG8OybUUsqW16NeeXg= + /bcrypt-pbkdf/1.0.1: + dependencies: + tweetnacl: 0.14.5 + dev: true + optional: true + resolution: + integrity: sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40= + /bindings/1.3.0: + dev: true + optional: true + resolution: + integrity: sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw== /bl/1.2.1: dependencies: readable-stream: 2.3.3 dev: true resolution: integrity: sha1-ysMo977kVzDUBLaSID/LWQ4XLV4= + /block-stream/0.0.9: + dependencies: + inherits: 2.0.3 + dev: true + engines: + node: 0.4 || >=0.5.8 + resolution: + integrity: sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= + /bluebird/3.5.1: + dev: true + resolution: + integrity: sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA== /bole/3.0.2: dependencies: fast-safe-stringify: 1.1.13 @@ -210,6 +363,22 @@ packages: dev: true resolution: integrity: sha1-vIpIPKlASdqbg3wa0Rzf6+5uBRQ= + /boom/4.3.1: + dependencies: + hoek: 4.2.0 + dev: true + engines: + node: '>=4.0.0' + resolution: + integrity: sha1-T4owBctKfjiJ90kDD9JbluAdLjE= + /boom/5.2.0: + dependencies: + hoek: 4.2.0 + dev: true + engines: + node: '>=4.0.0' + resolution: + integrity: sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw== /brace-expansion/1.1.8: dependencies: balanced-match: 1.0.0 @@ -247,6 +416,16 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= + /builtins/1.0.3: + dev: true + resolution: + integrity: sha1-y5T662HIaWRR2zZTThQi+U8K7og= + /byline/5.0.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-dBxSFkaOrcRXsDQQEYrXfejB3bE= /bzip2-maybe/1.0.0: dependencies: is-bzip2: 1.0.0 @@ -263,6 +442,10 @@ packages: dev: true resolution: integrity: sha1-4TYwdeogahJ2fZK7cRyKL3ahD2I= + /caseless/0.12.0: + dev: true + resolution: + integrity: sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= /chalk/0.5.1: dependencies: ansi-styles: 1.1.0 @@ -300,6 +483,10 @@ packages: dev: true resolution: integrity: sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE= + /ci-info/1.1.1: + dev: true + resolution: + integrity: sha512-vHDDF/bP9RYpTWtUhpJRhCFdvvp3iDWvEbuDbWgvjUrNGV1MXJrE0MPcwGtEled04m61iwdBLUIHZtDgzWS4ZQ== /cli-cursor/1.0.2: dependencies: restore-cursor: 1.0.1 @@ -320,6 +507,13 @@ packages: dev: true resolution: integrity: sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= + /co/4.6.0: + dev: true + engines: + iojs: '>= 1.0.0' + node: '>= 0.12.0' + resolution: + integrity: sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= /code-point-at/1.1.0: dev: true engines: @@ -340,6 +534,14 @@ packages: node: '>=0.1.90' resolution: integrity: sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w= + /combined-stream/1.0.5: + dependencies: + delayed-stream: 1.0.0 + dev: true + engines: + node: '>= 0.8' + resolution: + integrity: sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk= /command-exists/1.2.2: dev: true resolution: @@ -387,7 +589,6 @@ packages: /common-tags/1.4.0: dependencies: babel-runtime: 6.26.0 - dev: false engines: node: '>=4.0.0' resolution: @@ -406,6 +607,10 @@ packages: '0': node >= 0.8 resolution: integrity: sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc= + /console-control-strings/1.1.0: + dev: true + resolution: + integrity: sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= /conventional-commit-types/2.2.0: dev: true resolution: @@ -416,6 +621,12 @@ packages: /core-util-is/1.0.2: resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + /credentials-by-uri/1.0.0: + dependencies: + nerf-dart: 1.0.0 + dev: true + resolution: + integrity: sha512-WtoZkGQV2KgEfEqWKPetJ2btv+GxldzOe2vHVqAcyuiYdpIwCX7viL2+P9EaZLLfR+SFAZgPdP1+HZJ7MqRc2A== /cross-spawn-async/2.2.5: dependencies: lru-cache: 4.1.1 @@ -431,6 +642,14 @@ packages: dev: true resolution: integrity: sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= + /cryptiles/3.1.2: + dependencies: + boom: 5.2.0 + dev: true + engines: + node: '>=4.0.0' + resolution: + integrity: sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4= /cz-conventional-changelog/1.2.0: dependencies: conventional-commit-types: 2.2.0 @@ -442,12 +661,27 @@ packages: dev: true resolution: integrity: sha1-K8oElkyJGbI/P9aonvXmAIsxs/g= + /dashdash/1.14.1: + dependencies: + assert-plus: 1.0.0 + dev: true + engines: + node: '>=0.10' + resolution: + integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: '@types/node': 8.0.47 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== + /debug/3.1.0: + dependencies: + ms: 2.0.0 + dev: true + optional: true + resolution: + integrity: sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== /decompress-maybe/1.0.0: dependencies: bzip2-maybe: 1.0.0 @@ -472,6 +706,14 @@ packages: dev: true resolution: integrity: sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= + /deep-extend/0.4.2: + dev: true + engines: + iojs: '>=1.0.0' + node: '>=0.12.0' + optional: true + resolution: + integrity: sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8= /define-properties/1.1.2: dependencies: foreach: 2.0.5 @@ -485,6 +727,24 @@ packages: dev: true resolution: integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= + /delayed-stream/1.0.0: + dev: true + engines: + node: '>=0.4.0' + resolution: + integrity: sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + /delegates/1.0.0: + dev: true + resolution: + integrity: sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + /dependency-path/1.2.0: + dependencies: + '@types/semver': 5.4.0 + encode-registry: 1.0.0 + semver: 5.4.1 + dev: true + resolution: + integrity: sha512-WCVHx8m35ChWmemrAtp67EiXxp02Z0TRpJUYG1Kh7aloQcPdribxtcOm+GtMzhVnzgANj+mf0eo9aCtrxzzS3Q== /detect-file/0.1.0: dependencies: fs-exists-sync: 0.1.0 @@ -519,6 +779,44 @@ packages: node: '>=0.3.1' resolution: integrity: sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA== + /dint/1.0.0: + dependencies: + bluebird: 3.5.1 + graceful-fs: 4.1.11 + p-every: 1.0.2 + ssri: 4.1.6 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-S/7IGLOmVysyi96o0FHM1d5YDEQ= + /drive-by-path/1.0.0: + dependencies: + is-subdir: 1.0.2 + once: 1.4.0 + ramda: 0.24.1 + util.promisify: 1.0.0 + dev: true + engines: + node: '>=4' + optionalDependencies: + drivelist: 5.2.7 + resolution: + integrity: sha512-FSY6axBYIVfYz9Rj6c6ECzcSxoNgqZRfAQP0kDiCVa38gPDzVyPWcEvxfDnJ96xW4oXLZLpiOloxRnC1sUKksA== + /drivelist/5.2.7: + dependencies: + bindings: 1.3.0 + debug: 3.1.0 + js-yaml: 3.10.0 + lodash: 4.17.4 + nan: 2.7.0 + prebuild-install: 2.3.0 + dev: true + engines: + node: '>=4' + optional: true + resolution: + integrity: sha512-TslD6xoCLUUxlP9vNCixEkIwRv/aoCjVrdxiw5jd2iVWBS631DhashXYZaUek8TgfKnE59Sox4Wo12jVuM+XIg== /duplexer/0.1.1: dev: true resolution: @@ -536,12 +834,39 @@ packages: dev: true resolution: integrity: sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ== + /ecc-jsbn/0.1.1: + dependencies: + jsbn: 0.1.1 + dev: true + optional: true + resolution: + integrity: sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU= + /encode-registry/1.0.0: + dependencies: + mem: 1.1.0 + dev: true + resolution: + integrity: sha512-4DiPp5kmIDq9rHDU5C3r9clu+TVcnUXIMoLNiiJxHlGG+cMIApT/mOwLEpcEPN1a2PnNt/Ll3lcf39dyHf3n9w== + /encode-registry/1.1.0: + dependencies: + mem: 3.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-we1k9/KE1067YXEyJzPg+kXlNFLk9/LT2IFP3VZgmANNwf8Bx+KdAVd1wxLpG8y7v6EgplVGTstmVNICwiaCNA== /end-of-stream/1.4.0: dependencies: once: 1.4.0 dev: true resolution: integrity: sha1-epDYM+/abPpurA9JSduw+tOmMgY= + /error-ex/1.3.1: + dependencies: + is-arrayish: 0.2.1 + dev: true + resolution: + integrity: sha1-+FWobOYa3E6GIcPNoh56dhLDqNw= /es-abstract/1.9.0: dependencies: es-to-primitive: 1.1.1 @@ -598,6 +923,20 @@ packages: node: '>=0.12' resolution: integrity: sha1-TrZGejaglfq7KXD/nV4/t7zm68M= + /execa/0.8.0: + dependencies: + cross-spawn: 5.1.0 + get-stream: 3.0.0 + is-stream: 1.1.0 + npm-run-path: 2.0.2 + p-finally: 1.0.0 + signal-exit: 3.0.2 + strip-eof: 1.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-2NdrvBtVIX7RkP1t1J08d07PyNo= /exit-hook/1.1.1: dev: true engines: @@ -620,6 +959,11 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= + /expand-template/1.1.0: + dev: true + optional: true + resolution: + integrity: sha512-kkjwkMqj0h4w/sb32ERCDxCQkREMCAgS39DscDnSwDsbxnwwM1BTZySdC3Bn1lhY7vL08n9GoO/fVTynjDgRyQ== /expand-tilde/1.2.2: dependencies: os-homedir: 1.0.2 @@ -648,6 +992,20 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= + /extsprintf/1.3.0: + dev: true + engines: + '0': node >=0.6.0 + resolution: + integrity: sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + /fast-deep-equal/1.0.0: + dev: true + resolution: + integrity: sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8= + /fast-json-stable-stringify/2.0.0: + dev: true + resolution: + integrity: sha1-1RQsDK7msRifh9OnYREGT4bIu/I= /fast-safe-stringify/1.1.13: dev: true resolution: @@ -703,6 +1061,14 @@ packages: dev: true resolution: integrity: sha1-li/yEaqyXGUg/u641ih/j26VgHo= + /find-up/2.1.0: + dependencies: + locate-path: 2.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-RdG35QbHF93UgndaK3eSCjwMV6c= /findup-sync/0.4.2: dependencies: detect-file: 0.1.0 @@ -747,6 +1113,20 @@ packages: dev: true resolution: integrity: sha1-C+4AUBiusmDQo6865ljdATbsG5k= + /forever-agent/0.6.1: + dev: true + resolution: + integrity: sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + /form-data/2.3.1: + dependencies: + asynckit: 0.4.0 + combined-stream: 1.0.5 + mime-types: 2.1.17 + dev: true + engines: + node: '>= 0.12' + resolution: + integrity: sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8= /fs-exists-sync/0.1.0: dev: true engines: @@ -769,14 +1149,51 @@ packages: dev: true resolution: integrity: sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s= + /fs-write-stream-atomic/1.0.10: + dependencies: + graceful-fs: 4.1.11 + iferr: 0.1.5 + imurmurhash: 0.1.4 + readable-stream: 2.3.3 + dev: true + resolution: + integrity: sha1-tH31NJPvkR33VzHnCp3tAYnbQMk= /fs.realpath/1.0.0: dev: true resolution: integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + /fstream/1.0.11: + dependencies: + graceful-fs: 4.1.11 + inherits: 2.0.3 + mkdirp: 0.5.1 + rimraf: 2.6.2 + dev: true + engines: + node: '>=0.6' + resolution: + integrity: sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE= /function-bind/1.1.1: dev: true resolution: integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + /gauge/2.7.4: + dependencies: + aproba: 1.2.0 + console-control-strings: 1.1.0 + has-unicode: 2.0.1 + object-assign: 4.1.1 + signal-exit: 3.0.2 + string-width: 1.0.2 + strip-ansi: 3.0.1 + wide-align: 1.1.2 + dev: true + resolution: + integrity: sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + /get-npm-tarball-url/2.0.0: + dev: true + resolution: + integrity: sha1-Xr8eZAnPcxeszYfYLkHpNdEnJjg= /get-source/1.0.22: dependencies: data-uri-to-buffer: 2.0.0 @@ -790,6 +1207,12 @@ packages: node: '>=4' resolution: integrity: sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= + /getpass/0.1.7: + dependencies: + assert-plus: 1.0.0 + dev: true + resolution: + integrity: sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= /ghooks/2.0.0: dependencies: execa: 0.4.0 @@ -803,6 +1226,11 @@ packages: dev: true resolution: integrity: sha1-r/2Do26Lj73e2bhRRXxIrHTI6rg= + /github-from-package/0.0.0: + dev: true + optional: true + resolution: + integrity: sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= /glob-base/0.3.0: dependencies: glob-parent: 2.0.0 @@ -902,6 +1330,21 @@ packages: dev: true resolution: integrity: sha512-qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g== + /har-schema/2.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + /har-validator/5.0.3: + dependencies: + ajv: 5.3.0 + har-schema: 2.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0= /has-ansi/0.1.0: dependencies: ansi-regex: 0.2.1 @@ -933,6 +1376,10 @@ packages: dev: true resolution: integrity: sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw== + /has-unicode/2.0.1: + dev: true + resolution: + integrity: sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= /has/1.0.1: dependencies: function-bind: 1.1.1 @@ -941,6 +1388,23 @@ packages: node: '>= 0.8.0' resolution: integrity: sha1-hGFzP1OLCDfJNh45qauelwTcLyg= + /hawk/6.0.2: + dependencies: + boom: 4.3.1 + cryptiles: 3.1.2 + hoek: 4.2.0 + sntp: 2.1.0 + dev: true + engines: + node: '>=4.5.0' + resolution: + integrity: sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ== + /hoek/4.2.0: + dev: true + engines: + node: '>=4.0.0' + resolution: + integrity: sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ== /homedir-polyfill/1.0.1: dependencies: parse-passwd: 1.0.0 @@ -949,10 +1413,29 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-TCu8inWJmP7r9e1oWA921GdotLw= + /hosted-git-info/2.5.0: + dev: true + resolution: + integrity: sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg== + /http-signature/1.2.0: + dependencies: + assert-plus: 1.0.0 + jsprim: 1.4.1 + sshpk: 1.13.1 + dev: true + engines: + node: '>=0.8' + npm: '>=1.3.7' + resolution: + integrity: sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= /ieee754/1.1.8: dev: true resolution: integrity: sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q= + /iferr/0.1.5: + dev: true + resolution: + integrity: sha1-xg7taebY/bazEEofy8ocGS3FtQE= /imurmurhash/0.1.4: dev: true engines: @@ -1000,10 +1483,22 @@ packages: dev: true resolution: integrity: sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA= + /is-arrayish/0.2.1: + dev: true + resolution: + integrity: sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= /is-buffer/1.1.6: dev: true resolution: integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + /is-builtin-module/1.0.0: + dependencies: + builtin-modules: 1.1.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-VAVy0096wxGfj3bDDLwbHgN6/74= /is-bzip2/1.0.0: dev: true engines: @@ -1016,6 +1511,12 @@ packages: node: '>= 0.4' resolution: integrity: sha1-hut1OSgF3cM69xySoO7fdO52BLI= + /is-ci/1.0.10: + dependencies: + ci-info: 1.1.1 + dev: true + resolution: + integrity: sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4= /is-date-object/1.0.1: dev: true engines: @@ -1092,6 +1593,14 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM= + /is-inner-link/2.0.2: + dependencies: + graceful-fs: 4.1.11 + is-subdir: 1.0.2 + resolve-link-target: 1.0.0 + dev: true + resolution: + integrity: sha512-YS9RSUrRbskf/O6nMF5+dvoa8zoIwF2uXnJZN1X+gCEtA1cc3KqgbOmgPjIndHfrLJ8MCRaPoG2KBPTZqhy5ug== /is-number/2.1.0: dependencies: kind-of: 3.2.2 @@ -1148,18 +1657,36 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= + /is-ssh/1.3.0: + dependencies: + protocols: 1.4.6 + dev: true + resolution: + integrity: sha1-6+oRaaJhTaOSpjdANmw84EnY3/Y= /is-stream/1.1.0: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + /is-subdir/1.0.2: + dependencies: + is-windows: 1.0.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-2H3vM92ez7TjW6T2e4G7AQVm/1/UA/qikNO0/aIi2SkouUU2wXW2CQ5Owiz8oaaFQpjNl74B5LIjTcM1htr2mQ== /is-symbol/1.0.1: dev: true engines: node: '>= 0.4' resolution: integrity: sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI= + /is-typedarray/1.0.0: + dev: true + resolution: + integrity: sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= /is-windows/0.2.0: dev: true engines: @@ -1187,6 +1714,10 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + /isstream/0.1.2: + dev: true + resolution: + integrity: sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= /isurl/1.0.0: dependencies: has-to-string-tag-x: 1.4.1 @@ -1207,6 +1738,23 @@ packages: dev: true resolution: integrity: sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA== + /jsbn/0.1.1: + dev: true + optional: true + resolution: + integrity: sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + /json-parse-better-errors/1.0.1: + dev: true + resolution: + integrity: sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw== + /json-schema-traverse/0.3.1: + dev: true + resolution: + integrity: sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A= + /json-schema/0.2.3: + dev: true + resolution: + integrity: sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= /json-stringify-safe/5.0.1: resolution: integrity: sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= @@ -1229,6 +1777,17 @@ packages: graceful-fs: 4.1.11 resolution: integrity: sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + /jsprim/1.4.1: + dependencies: + assert-plus: 1.0.0 + extsprintf: 1.3.0 + json-schema: 0.2.3 + verror: 1.10.0 + dev: true + engines: + '0': node >=0.6.0 + resolution: + integrity: sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= /kind-of/3.2.2: dependencies: is-buffer: 1.1.6 @@ -1251,6 +1810,39 @@ packages: graceful-fs: 4.1.11 resolution: integrity: sha1-QIhDO0azsbolnXh4XY6W9zugJDk= + /load-json-file/3.0.0: + dependencies: + graceful-fs: 4.1.11 + parse-json: 3.0.0 + pify: 2.3.0 + strip-bom: 3.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-frNzXZg6ftImKt5P92mvU2nFxEA= + /load-json-file/4.0.0: + dependencies: + graceful-fs: 4.1.11 + parse-json: 4.0.0 + pify: 3.0.0 + strip-bom: 3.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-L19Fq5HjMhYjT9U62rZo607AmTs= + /load-yaml-file/0.1.0: + dependencies: + graceful-fs: 4.1.11 + js-yaml: 3.10.0 + pify: 2.3.0 + strip-bom: 3.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-9oAGbmkbPutFAXZy5KOVavW4O4k= /locate-path/2.0.0: dependencies: p-locate: 2.0.0 @@ -1327,6 +1919,23 @@ packages: dev: true resolution: integrity: sha1-9M+EV7km7u4qg7FzUBQUvHbrlZc= + /mem/1.1.0: + dependencies: + mimic-fn: 1.1.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y= + /mem/3.0.0: + dependencies: + mimic-fn: 1.1.0 + p-is-promise: 1.1.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-hOWK1N+99dEFsmtlSKOYsrOqiiE= /merge/1.2.0: dev: true resolution: @@ -1351,8 +1960,21 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= + /mime-db/1.30.0: + dev: true + engines: + node: '>= 0.6' + resolution: + integrity: sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE= + /mime-types/2.1.17: + dependencies: + mime-db: 1.30.0 + dev: true + engines: + node: '>= 0.6' + resolution: + integrity: sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo= /mimic-fn/1.1.0: - dev: false engines: node: '>=4' resolution: @@ -1405,6 +2027,11 @@ packages: dev: true resolution: integrity: sha1-NDOB0f2e1RljsLMVNbf9i64E/3A= + /ms/2.0.0: + dev: true + optional: true + resolution: + integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= /mute-stream/0.0.6: dev: true resolution: @@ -1417,6 +2044,15 @@ packages: dev: true resolution: integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== + /nan/2.7.0: + dev: true + optional: true + resolution: + integrity: sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY= + /ncp/2.0.0: + dev: true + resolution: + integrity: sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= /ndjson/1.5.0: dependencies: json-stringify-safe: 5.0.1 @@ -1425,18 +2061,69 @@ packages: through2: 2.0.3 resolution: integrity: sha1-rmA7NrE0vOw0e0UkIrC/mNWDLsg= + /nerf-dart/1.0.0: + dev: true + resolution: + integrity: sha1-5tq3/r9a2Bbqgc9cYpxaDr3nLBo= /next-path/1.0.0: dev: true engines: node: '>=6' resolution: integrity: sha1-gixFgNer54PfGZZbeJYiyoAWA+Q= + /node-abi/2.1.2: + dependencies: + semver: 5.4.1 + dev: true + optional: true + resolution: + integrity: sha512-hmUtb8m75RSi7N+zZLYqe75XDvZB+6LyTBPkj2DConvNgQet2e3BIqEwe1LLvqMrfyjabuT5ZOrTioLCH1HTdA== + /node-gyp/3.6.2: + dependencies: + fstream: 1.0.11 + glob: 7.1.2 + graceful-fs: 4.1.11 + minimatch: 3.0.4 + mkdirp: 0.5.1 + nopt: 3.0.6 + npmlog: 4.1.2 + osenv: 0.1.4 + request: 2.83.0 + rimraf: 2.6.2 + semver: 5.3.0 + tar: 2.2.1 + which: 1.3.0 + dev: true + engines: + node: '>= 0.8.0' + resolution: + integrity: sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA= + /noop-logger/0.1.1: + dev: true + optional: true + resolution: + integrity: sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= + /nopt/3.0.6: + dependencies: + abbrev: 1.1.1 + dev: true + resolution: + integrity: sha1-xkZdvwirzU2zWTF/eaxopkayj/k= /normalize-newline/3.0.0: dev: true engines: node: '>=4' resolution: integrity: sha1-HL6oBKukNgAfg5OKsh7AOdaa6dM= + /normalize-package-data/2.4.0: + dependencies: + hosted-git-info: 2.5.0 + is-builtin-module: 1.0.0 + semver: 5.4.1 + validate-npm-package-license: 3.0.1 + dev: true + resolution: + integrity: sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== /normalize-path/2.1.1: dependencies: remove-trailing-separator: 1.1.0 @@ -1445,6 +2132,43 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= + /normalize-registry-url/1.0.0: + dev: true + resolution: + integrity: sha512-0v6T4851b72ykk5zEtFoN4QX/Fqyk7pouIj9xZyAvAe9jlDhAwT4z6FlwsoQCHjeuK2EGUoAwy/F4y4B1uZq9A== + /normalize-ssh/1.0.0: + dependencies: + is-ssh: 1.3.0 + parse-url: 1.3.11 + dev: true + resolution: + integrity: sha1-Iqgwj6fNkyvbSa907KxkTPSmGWs= + /npm-package-arg/5.1.2: + dependencies: + hosted-git-info: 2.5.0 + osenv: 0.1.4 + semver: 5.4.1 + validate-npm-package-name: 3.0.0 + dev: true + resolution: + integrity: sha512-wJBsrf0qpypPT7A0LART18hCdyhpCMxeTtcb0X4IZO2jsP6Om7EHN1d9KSKiqD+KVH030RVNpWS9thk+pb7wzA== + /npm-registry-client/8.5.0: + dependencies: + concat-stream: 1.6.0 + graceful-fs: 4.1.11 + normalize-package-data: 2.4.0 + npm-package-arg: 5.1.2 + once: 1.4.0 + request: 2.83.0 + retry: 0.10.1 + semver: 5.4.1 + slide: 1.1.6 + ssri: 4.1.6 + dev: true + optionalDependencies: + npmlog: 4.1.2 + resolution: + integrity: sha512-Nkcw24bfECKFNt0FLDQ+PjVqSlKxMggcboXiUBIvjbCnA15xjRO4kCwRDluGNXZjHFLx/vPjN4+ESXyVjpXLbQ== /npm-run-path/1.0.0: dependencies: path-key: 1.0.0 @@ -1453,12 +2177,33 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-9cMr9ZX+ga6Sfa7FLoL4sACsPI8= + /npm-run-path/2.0.2: + dependencies: + path-key: 2.0.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= + /npmlog/4.1.2: + dependencies: + are-we-there-yet: 1.1.4 + console-control-strings: 1.1.0 + gauge: 2.7.4 + set-blocking: 2.0.0 + dev: true + resolution: + integrity: sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== /number-is-nan/1.0.1: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + /oauth-sign/0.8.2: + dev: true + resolution: + integrity: sha1-Rqarfwrq2N6unsBWV4C31O/rnUM= /object-assign/4.1.1: dev: true engines: @@ -1475,6 +2220,15 @@ packages: node: '>= 0.4' resolution: integrity: sha1-xUYBd4rVYPEULODgG8yotW0TQm0= + /object.getownpropertydescriptors/2.0.3: + dependencies: + define-properties: 1.1.2 + es-abstract: 1.9.0 + dev: true + engines: + node: '>= 0.8' + resolution: + integrity: sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY= /object.omit/2.0.1: dependencies: for-own: 0.1.5 @@ -1531,18 +2285,47 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + /osenv/0.1.4: + dependencies: + os-homedir: 1.0.2 + os-tmpdir: 1.0.2 + dev: true + resolution: + integrity: sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ= /p-cancelable/0.3.0: dev: true engines: node: '>=4' resolution: integrity: sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw== + /p-every/1.0.2: + dependencies: + p-map: 1.2.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-TgHYXCPaGe1xpK+6MZvbTZTIXgA= + /p-filter/1.0.0: + dependencies: + p-map: 1.2.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-Yp0xcVAgnI/VCLoTdxPvS7kg6ds= /p-finally/1.0.0: dev: true engines: node: '>=4' resolution: integrity: sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= + /p-is-promise/1.1.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4= /p-limit/1.1.0: dev: true engines: @@ -1557,6 +2340,32 @@ packages: node: '>=4' resolution: integrity: sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= + /p-map/1.2.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== + /p-queue/2.2.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-91EJ9kZK3/LzOP38ZD56jo5JfF7ISX4NuCYQGZZkZcE4lHwUxmwSjbQ609HwDVUXAWYo+5x4jQDBnePmiwKBzg== + /p-reduce/1.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-GMKw3ZNqRpClKfgjH1ig/bakffo= + /p-series/1.0.0: + dependencies: + p-reduce: 1.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-fsnntEBswyBmKYpvmGDlXpGzbgc= /p-timeout/1.2.0: dependencies: p-finally: 1.0.0 @@ -1586,6 +2395,49 @@ packages: node: '>=4' resolution: integrity: sha512-+i0nm6AzPFFimHndbgRw+wQ2GAj8RNw+iFiccnSvCXROEcZZgEa1PYA+iAhR89KAzlHQNIqpu5KehMEpod3BVA== + /package-store/0.5.0-1: + dependencies: + '@types/load-json-file': 2.0.7 + '@types/node': 8.0.50 + '@types/ramda': 0.25.3 + '@types/retry': 0.10.2 + '@types/semver': 5.4.0 + credentials-by-uri: 1.0.0 + dint: 1.0.0 + drive-by-path: 1.0.0 + encode-registry: 1.1.0 + execa: 0.8.0 + fs-write-stream-atomic: 1.0.10 + load-json-file: 4.0.0 + mkdirp-promise: 5.0.1 + mz: 2.7.0 + normalize-path: 2.1.1 + normalize-registry-url: 1.0.0 + normalize-ssh: 1.0.0 + os-homedir: 1.0.2 + p-limit: 1.1.0 + p-queue: 2.2.0 + parse-npm-tarball-url: 1.0.1 + path-absolute: 1.0.0 + path-exists: 3.0.0 + ramda: 0.25.0 + read-package-json: 2.0.12 + rename-overwrite: 1.0.0 + retry: 0.10.1 + rimraf-then: 1.0.1 + semver: 5.4.1 + ssri: 5.0.0 + symlink-dir: 1.1.0 + thenify: 3.3.0 + unpack-stream: 2.1.1 + write-json-file: 2.3.0 + dev: true + engines: + node: '>=4' + peerDependencies: + pnpm-logger: ^0.7.0 + resolution: + integrity: sha512-Z3H6A07pT9dMndlXi4qh6lLj8J82arF6Mcx5HhuZyX3/oczU1C3NZXoDZjTUA0gnlWSYkyJ6fofS2RS7aH9rjA== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -1609,18 +2461,55 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-ssN2z7EfNVE7rdFz7wu246OIORw= + /parse-json/3.0.0: + dependencies: + error-ex: 1.3.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-+m9HsY4jgm6tMvJj50TQ4ehH+xM= + /parse-json/4.0.0: + dependencies: + error-ex: 1.3.1 + json-parse-better-errors: 1.0.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= /parse-ms/1.0.1: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0= + /parse-npm-tarball-url/1.0.1: + dependencies: + '@types/node': 7.0.46 + semver-regex: 1.0.0 + dev: true + resolution: + integrity: sha1-TfHPBF05fvLZw59RMImKiqjgYuQ= /parse-passwd/1.0.0: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= + /parse-url/1.3.11: + dependencies: + is-ssh: 1.3.0 + protocols: 1.4.6 + dev: true + resolution: + integrity: sha1-V8FUKKuKiSsfQ4aWRccR0OFEtVQ= + /path-absolute/1.0.0: + dependencies: + os-homedir: 1.0.2 + dev: true + resolution: + integrity: sha512-s0wa8oTU0s+jtq9C/xfNIRDp/8s6E2oeRvsATw1b6EZ1GNKxUCapwyBKdSzVm/2wkARh4KnyxTt3avOP4MwvnQ== /path-exists/2.1.0: dependencies: pinkie-promise: 2.0.1 @@ -1647,6 +2536,16 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-XVPVeAGWRsDWiADbThRua9wqx68= + /path-key/2.0.1: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + /path-name/1.0.0: + dev: true + resolution: + integrity: sha1-jKBjpj3nmC36lXYO2v/RAhRJTyQ= /path-parse/1.0.5: dev: true resolution: @@ -1658,6 +2557,16 @@ packages: dev: true resolution: integrity: sha1-l+t2NlvP2MieKH9VyLadTD6bzFI= + /performance-now/2.1.0: + dev: true + resolution: + integrity: sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + /pify/2.3.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-7RQaasBDqEnqWISY59yosVMw6Qw= /pify/3.0.0: dev: true engines: @@ -1684,14 +2593,59 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY= - /pnpm-logger/0.6.3: + /pnpm-install-checks/1.1.0: + dependencies: + semver: 5.4.1 + dev: true + resolution: + integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= + /pnpm-logger/0.7.1: dependencies: '@types/node': 8.0.47 bole: 3.0.2 ndjson: 1.5.0 dev: true + engines: + node: '>=4' resolution: - integrity: sha512-4yYX0Su4YjIM09fgIVlCGN0ToQ75VShF+RHIgIvASd7aF5JsGHaYMFJTqNOsaqc51pLwLvVrPayoMBMGFrULzQ== + integrity: sha512-CXm+ueCzJkRFok4t7P6eu8Lg8QKKXu36zBMBkTYRdGWmJydEMDVODRjxVeS2o7lLGFDI48n++A59QlGzJiTrLg== + /pnpm-shrinkwrap/4.0.1: + dependencies: + '@types/node': 7.0.46 + '@types/ramda': 0.0.11 + dependency-path: 1.2.0 + js-yaml: 3.10.0 + load-yaml-file: 0.1.0 + mkdirp-promise: 5.0.1 + ramda: 0.24.1 + rimraf-then: 1.0.1 + thenify: 3.3.0 + write-file-atomic: 2.3.0 + dev: true + peerDependencies: + pnpm-logger: ^0.6.2 + resolution: + integrity: sha512-IOJhwMWoM2O9goa+0EleZCzrLYQmaBuNZeOmoFUV9WU54WHjQfeFJ1J+Qu7FRAGDlzWWIcuxL43Ap1XL4+OASw== + /prebuild-install/2.3.0: + dependencies: + expand-template: 1.1.0 + github-from-package: 0.0.0 + minimist: 1.2.0 + mkdirp: 0.5.1 + node-abi: 2.1.2 + noop-logger: 0.1.1 + npmlog: 4.1.2 + os-homedir: 1.0.2 + pump: 1.0.2 + rc: 1.2.2 + simple-get: 1.4.3 + tar-fs: 1.16.0 + tunnel-agent: 0.6.0 + xtend: 4.0.1 + dev: true + optional: true + resolution: + integrity: sha512-gzjq2oHB8oMbzJSsSh9MQ64zrXZGt092/uT4TLZlz2qnrPxpWqp4vYB7LZrDxnlxf5RfbCjkgDI/z0EIVuYzAw== /prepend-http/1.0.4: dev: true engines: @@ -1727,6 +2681,19 @@ packages: /process-nextick-args/1.0.7: resolution: integrity: sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= + /proper-lockfile/2.0.1: + dependencies: + graceful-fs: 4.1.11 + retry: 0.10.1 + dev: true + engines: + node: '>=4.0.0' + resolution: + integrity: sha1-FZ+wYZPTIAP0s2kd0uwaY0qoDR0= + /protocols/1.4.6: + dev: true + resolution: + integrity: sha1-+LsmPqG1/Xp2BNJri+Ob13Z4v4o= /pseudomap/1.0.2: dev: true resolution: @@ -1746,8 +2713,21 @@ packages: dev: true resolution: integrity: sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs= + /punycode/1.4.1: + dev: true + resolution: + integrity: sha1-wNWmOycYgArY4esPpSachN1BhF4= + /qs/6.5.1: + dev: true + engines: + node: '>=0.6' + resolution: + integrity: sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A== + /ramda/0.24.1: + dev: true + resolution: + integrity: sha1-w7d1UZfzW43DUCIoJixMkd22uFc= /ramda/0.25.0: - dev: false resolution: integrity: sha512-GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ== /randomatic/1.1.7: @@ -1759,6 +2739,27 @@ packages: node: '>= 0.10.0' resolution: integrity: sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how== + /rc/1.2.2: + dependencies: + deep-extend: 0.4.2 + ini: 1.3.4 + minimist: 1.2.0 + strip-json-comments: 2.0.1 + dev: true + optional: true + resolution: + integrity: sha1-2M6ctX6NZNnHut2YdsfDTL48cHc= + /read-package-json/2.0.12: + dependencies: + glob: 7.1.2 + json-parse-better-errors: 1.0.1 + normalize-package-data: 2.4.0 + slash: 1.0.0 + dev: true + optionalDependencies: + graceful-fs: 4.1.11 + resolution: + integrity: sha512-m7/I0+tP6D34EVvSlzCtuVA4D/dHL6OpLcn2e4XVP5X57pCKGUy1JjRSBVKHWpB+vUU91sL85h84qX0MdXzBSw== /readable-stream/2.3.3: dependencies: core-util-is: 1.0.2 @@ -1789,10 +2790,29 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ== + /remove-all-except-outer-links/1.0.3: + dependencies: + is-subdir: 1.0.2 + mz: 2.7.0 + p-filter: 1.0.0 + resolve-link-target: 1.0.0 + rimraf-then: 1.0.1 + dev: true + resolution: + integrity: sha512-h9Pl2xE1ZxYOhlKh0nYeMfzfv0GYUfglE5Eb0ILFFUiDnvVcbKwxGGukETEeIteR0JTVfesOaKqiwrOoUz1ajw== /remove-trailing-separator/1.1.0: dev: true resolution: integrity: sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + /rename-overwrite/1.0.0: + dependencies: + graceful-fs: 4.1.11 + rimraf: 2.6.2 + thenify: 3.3.0 + timeout-then: 1.1.0 + dev: true + resolution: + integrity: sha1-tFp0zrk9EHPjHFtwHEKN5XllI9g= /repeat-element/1.1.2: dev: true engines: @@ -1813,6 +2833,35 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= + /request/2.83.0: + dependencies: + aws-sign2: 0.7.0 + aws4: 1.6.0 + caseless: 0.12.0 + combined-stream: 1.0.5 + extend: 3.0.1 + forever-agent: 0.6.1 + form-data: 2.3.1 + har-validator: 5.0.3 + hawk: 6.0.2 + http-signature: 1.2.0 + is-typedarray: 1.0.0 + isstream: 0.1.2 + json-stringify-safe: 5.0.1 + mime-types: 2.1.17 + oauth-sign: 0.8.2 + performance-now: 2.1.0 + qs: 6.5.1 + safe-buffer: 5.1.1 + stringstream: 0.0.5 + tough-cookie: 2.3.3 + tunnel-agent: 0.6.0 + uuid: 3.1.0 + dev: true + engines: + node: '>= 4' + resolution: + integrity: sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw== /resolve-dir/0.1.1: dependencies: expand-tilde: 1.2.2 @@ -1822,6 +2871,18 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-shklmlYC+sXFxJatiUpujMQwJh4= + /resolve-from/4.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + /resolve-link-target/1.0.0: + dependencies: + graceful-fs: 4.1.11 + dev: true + resolution: + integrity: sha512-vCHlxVruR67GgAeTSxpMPMmJ+7oO9oGCPA5r0NEyqOcZP+lTwyMcaxhqMHs+b90tT+NTVKBaYjsc5cEgecULIw== /resolve/1.4.0: dependencies: path-parse: 1.0.5 @@ -1858,6 +2919,10 @@ packages: dev: true resolution: integrity: sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k= + /retry/0.10.1: + dev: true + resolution: + integrity: sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q= /right-pad/1.0.1: dev: true engines: @@ -1898,10 +2963,18 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk= + /semver/5.3.0: + dev: true + resolution: + integrity: sha1-myzl094C0XxgEq0yaqa00M9U+U8= /semver/5.4.1: dev: true resolution: integrity: sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg== + /set-blocking/2.0.0: + dev: true + resolution: + integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc= /shebang-command/1.2.0: dependencies: shebang-regex: 1.0.0 @@ -1929,6 +3002,33 @@ packages: /signal-exit/3.0.2: resolution: integrity: sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= + /simple-get/1.4.3: + dependencies: + once: 1.4.0 + unzip-response: 1.0.2 + xtend: 4.0.1 + dev: true + optional: true + resolution: + integrity: sha1-6XVe2kB+ltpAxeUVjJ6jezO+y+s= + /slash/1.0.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= + /slide/1.1.6: + dev: true + resolution: + integrity: sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= + /sntp/2.1.0: + dependencies: + hoek: 4.2.0 + dev: true + engines: + node: '>=4.0.0' + resolution: + integrity: sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg== /sort-keys/2.0.0: dependencies: is-plain-obj: 1.1.0 @@ -1970,6 +3070,20 @@ packages: dev: true resolution: integrity: sha1-sAeZVX63+wyDdsKdROih6mfldHY= + /spdx-correct/1.0.2: + dependencies: + spdx-license-ids: 1.2.2 + dev: true + resolution: + integrity: sha1-SzBz2TP/UfORLwOsVRlJikFQ20A= + /spdx-expression-parse/1.0.4: + dev: true + resolution: + integrity: sha1-m98vIOH0DtRH++JzJmGR/O1RYmw= + /spdx-license-ids/1.2.2: + dev: true + resolution: + integrity: sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc= /split2/2.2.0: dependencies: through2: 2.0.3 @@ -1979,12 +3093,34 @@ packages: dev: true resolution: integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + /sshpk/1.13.1: + dependencies: + asn1: 0.2.3 + assert-plus: 1.0.0 + dashdash: 1.14.1 + getpass: 0.1.7 + dev: true + engines: + node: '>=0.10.0' + optionalDependencies: + bcrypt-pbkdf: 1.0.1 + ecc-jsbn: 0.1.1 + jsbn: 0.1.1 + tweetnacl: 0.14.5 + resolution: + integrity: sha1-US322mKHFEMW3EwY/hzx2UBzm+M= /ssri/4.1.6: dependencies: safe-buffer: 5.1.1 dev: true resolution: integrity: sha512-WUbCdgSAMQjTFZRWvSPpauryvREEA+Krn19rx67UlJEJx/M192ZHxMmJXjZ4tkdFm+Sb0SXGlENeQVlA5wY7kA== + /ssri/5.0.0: + dependencies: + safe-buffer: 5.1.1 + dev: true + resolution: + integrity: sha512-728D4yoQcQm1ooZvSbywLkV1RjfITZXh0oWrhM/lnsx3nAHx7LsRGJWB/YyvoceAYRq98xqbstiN4JBv1/wNHg== /stacktracey/1.2.83: dependencies: as-table: 1.0.31 @@ -2030,6 +3166,10 @@ packages: safe-buffer: 5.1.1 resolution: integrity: sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== + /stringstream/0.0.5: + dev: true + resolution: + integrity: sha1-TkhM1N5aC7vuGORjB3EKioFiGHg= /strip-ansi/0.3.0: dependencies: ansi-regex: 0.2.1 @@ -2071,6 +3211,74 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= + /supi/0.7.0-1: + dependencies: + '@pnpm/types': 1.0.0 + '@types/byline': 4.2.31 + '@types/common-tags': 1.4.0 + '@types/load-json-file': 2.0.7 + '@types/mz': 0.0.32 + '@types/node': 8.0.50 + '@types/nopt': 3.0.29 + '@types/npm': 2.0.29 + '@types/p-series': 1.0.0 + '@types/ramda': 0.25.3 + '@types/rc': 0.0.1 + '@types/semver': 5.4.0 + '@types/update-notifier': 1.0.2 + '@zkochan/cmd-shim': 2.2.4 + '@zkochan/npm-lifecycle': 0.0.6 + arr-flatten: 1.1.0 + byline: 5.0.0 + common-tags: 1.4.0 + cross-spawn: 5.1.0 + dependency-path: 1.2.0 + encode-registry: 1.0.0 + execa: 0.8.0 + find-up: 2.1.0 + get-npm-tarball-url: 2.0.0 + graceful-fs: 4.1.11 + is-ci: 1.0.10 + is-inner-link: 2.0.2 + is-subdir: 1.0.2 + is-windows: 1.0.1 + load-json-file: 3.0.0 + load-yaml-file: 0.1.0 + mkdirp-promise: 5.0.1 + mz: 2.7.0 + ncp: 2.0.0 + node-gyp: 3.6.2 + normalize-path: 2.1.1 + normalize-registry-url: 1.0.0 + npm-package-arg: 5.1.2 + npm-registry-client: 8.5.0 + os-homedir: 1.0.2 + p-filter: 1.0.0 + p-limit: 1.1.0 + p-series: 1.0.0 + package-store: 0.5.0-1 + path-absolute: 1.0.0 + path-exists: 3.0.0 + path-name: 1.0.0 + pnpm-install-checks: 1.1.0 + pnpm-shrinkwrap: 4.0.1 + proper-lockfile: 2.0.1 + ramda: 0.25.0 + read-package-json: 2.0.12 + remove-all-except-outer-links: 1.0.3 + rimraf-then: 1.0.1 + semver: 5.4.1 + symlink-dir: 1.1.0 + thenify: 3.3.0 + write-pkg: 3.1.0 + write-yaml-file: 1.0.0 + dev: true + engines: + node: '>=4' + peerDependencies: + pnpm-logger: ^0.7.0 + resolution: + integrity: sha512-C/xz4z5TnyqvvcVJ7ReUJ/uXzKweKYiF9F0pThw7dzw+upkpThQHmtBnQnuW3nsv30WRkDYLsh+9RLiAZRVVMw== /supports-color/0.2.0: dev: true engines: @@ -2099,7 +3307,7 @@ packages: /symlink-dir/1.1.0: dependencies: '@types/mz': 0.0.31 - '@types/node': 8.0.47 + '@types/node': 8.0.50 graceful-fs: 4.1.11 is-windows: 1.0.1 mkdirp-promise: 5.0.1 @@ -2157,6 +3365,14 @@ packages: node: '>= 0.8.0' resolution: integrity: sha1-NlSc8E7RrumyowwBQyUiONr5QBY= + /tar/2.2.1: + dependencies: + block-stream: 0.0.9 + fstream: 1.0.11 + inherits: 2.0.3 + dev: true + resolution: + integrity: sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE= /thenify-all/1.6.0: dependencies: thenify: 3.3.0 @@ -2187,6 +3403,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= + /timeout-then/1.1.0: + dependencies: + any-promise: 1.3.0 + dev: true + resolution: + integrity: sha1-AUWwYHAVnBfiFG/SkrAaG9geX7w= /tmp/0.0.29: dependencies: os-tmpdir: 1.0.2 @@ -2195,6 +3417,14 @@ packages: node: '>=0.4.0' resolution: integrity: sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA= + /tough-cookie/2.3.3: + dependencies: + punycode: 1.4.1 + dev: true + engines: + node: '>=0.8' + resolution: + integrity: sha1-C2GKVWW23qkL80JdBNVe3EdadWE= /ts-node/3.3.0: dependencies: arrify: 1.0.1 @@ -2251,6 +3481,17 @@ packages: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >= 2.4.0-dev || >= 2.5.0-dev || >= 2.6.0-dev || >= 2.7.0-dev' resolution: integrity: sha1-9Nlc4zkciXHkblTEzw7bCiHdWyQ= + /tunnel-agent/0.6.0: + dependencies: + safe-buffer: 5.1.1 + dev: true + resolution: + integrity: sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + /tweetnacl/0.14.5: + dev: true + optional: true + resolution: + integrity: sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= /typedarray/0.0.6: dev: true resolution: @@ -2261,6 +3502,14 @@ packages: node: '>=4.2.0' resolution: integrity: sha1-7znN6ierrAtQAkLWcmq5DgyEZjE= + /uid-number/0.0.6: + dev: true + resolution: + integrity: sha1-DqEOgDXo61uOREnwbaHHMGY7qoE= + /umask/1.1.0: + dev: true + resolution: + integrity: sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0= /unbzip2-stream/1.2.5: dependencies: buffer: 3.6.0 @@ -2274,7 +3523,7 @@ packages: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= /unpack-stream/2.1.1: dependencies: - '@types/node': 8.0.47 + '@types/node': 8.0.50 decompress-maybe: 1.0.0 ssri: 4.1.6 tar-fs: 1.16.0 @@ -2283,6 +3532,13 @@ packages: node: '>=4' resolution: integrity: sha1-FXMzqT/KD6ABYGrqCpKYQy2q7nM= + /unzip-response/1.0.2: + dev: true + engines: + node: '>=0.10' + optional: true + resolution: + integrity: sha1-uYTwh3/AqJwsdzzB73tbIytbBv4= /url-parse-lax/1.0.0: dependencies: prepend-http: 1.0.4 @@ -2300,6 +3556,17 @@ packages: /util-deprecate/1.0.2: resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + /util.promisify/1.0.0: + dependencies: + define-properties: 1.1.2 + object.getownpropertydescriptors: 2.0.3 + dev: true + resolution: + integrity: sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA== + /uuid/3.1.0: + dev: true + resolution: + integrity: sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g== /v8flags/3.0.1: dependencies: homedir-polyfill: 1.0.1 @@ -2318,12 +3585,41 @@ packages: dev: true resolution: integrity: sha1-5Tg2kQEsuycNzAvCpO/+vhSJDqw= + /validate-npm-package-license/3.0.1: + dependencies: + spdx-correct: 1.0.2 + spdx-expression-parse: 1.0.4 + dev: true + resolution: + integrity: sha1-KAS6vnEq0zeUWaz74kdGqywwP7w= + /validate-npm-package-name/3.0.0: + dependencies: + builtins: 1.0.3 + dev: true + resolution: + integrity: sha1-X6kS2B630MdK/BQN5zF/DKffQ34= + /verror/1.10.0: + dependencies: + assert-plus: 1.0.0 + core-util-is: 1.0.2 + extsprintf: 1.3.0 + dev: true + engines: + '0': node >=0.6.0 + resolution: + integrity: sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= /which/1.3.0: dependencies: isexe: 2.0.0 dev: true resolution: integrity: sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg== + /wide-align/1.1.2: + dependencies: + string-width: 1.0.2 + dev: true + resolution: + integrity: sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w== /word-wrap/1.2.3: dev: true engines: @@ -2343,6 +3639,14 @@ packages: dev: true resolution: integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + /write-file-atomic/1.3.4: + dependencies: + graceful-fs: 4.1.11 + imurmurhash: 0.1.4 + slide: 1.1.6 + dev: true + resolution: + integrity: sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8= /write-file-atomic/2.3.0: dependencies: graceful-fs: 4.1.11 @@ -2364,6 +3668,25 @@ packages: node: '>=4' resolution: integrity: sha1-K2TIozAE1UuGmMdtWFp3zrYdoy8= + /write-pkg/3.1.0: + dependencies: + sort-keys: 2.0.0 + write-json-file: 2.3.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-AwqZlMyZk9JbTnWp8aGSNgcpHOk= + /write-yaml-file/1.0.0: + dependencies: + graceful-fs: 4.1.11 + js-yaml: 3.10.0 + mkdirp: 0.5.1 + pify: 2.3.0 + write-file-atomic: 1.3.4 + dev: true + resolution: + integrity: sha1-e0vQ33LKE/vp1rAXj9g8B3uOqGs= /xstream/11.0.0: dependencies: symbol-observable: 1.0.4 @@ -2402,11 +3725,12 @@ specifiers: ndjson: ^1.5.0 normalize-newline: ^3.0.0 package-preview: ^0.1.3 - pnpm-logger: ^0.6.3 + pnpm-logger: ^0.7.1 pretty-bytes: ^4.0.2 ramda: ^0.25.0 rimraf: ^2.5.4 stacktracey: ^1.0.71 + supi: ^0.7.0-1 tape: ^4.8.0 ts-node: ^3.3.0 tslint: ^5.7.0 diff --git a/src/index.ts b/src/index.ts index d9a37784ca..988a5acc14 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,6 +2,8 @@ import chalk from 'chalk' import {EventEmitter} from 'events' import logUpdate = require('log-update') import os = require('os') +import prettyBytes = require('pretty-bytes') +import R = require('ramda') import { DeprecationLog, InstallCheckLog, @@ -9,9 +11,7 @@ import { Log, ProgressLog, RegistryLog, -} from 'pnpm-logger' -import prettyBytes = require('pretty-bytes') -import R = require('ramda') +} from 'supi' import xs, {Stream} from 'xstream' import dropRepeats from 'xstream/extra/dropRepeats' import flattenConcurrently from 'xstream/extra/flattenConcurrently' @@ -195,7 +195,7 @@ export function toOutput$(streamParser: object): Stream { .map(xs.of) const miscOutput$ = log$ - .filter((log) => log.name === 'pnpm' || (log.name as string) === 'pnpm:link') + .filter((log) => log.name as string === 'pnpm' || log.name as string === 'pnpm:link') .map((obj) => { if (obj.level === 'debug') return if (obj.level === 'warn') { diff --git a/src/pkgsDiff.ts b/src/pkgsDiff.ts index 8f6048a1cd..f4f6da217a 100644 --- a/src/pkgsDiff.ts +++ b/src/pkgsDiff.ts @@ -1,8 +1,8 @@ +import R = require('ramda') import { DeprecationLog, Log, -} from 'pnpm-logger' -import R = require('ramda') +} from 'supi' import xs, {Stream} from 'xstream' export interface PackageDiff { diff --git a/src/reportError.ts b/src/reportError.ts index baa33546a9..348483dc88 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -1,8 +1,8 @@ import chalk from 'chalk' import commonTags = require('common-tags') import os = require('os') -import {Log} from 'pnpm-logger' import StackTracey = require('stacktracey') +import {Log} from 'supi' const stripIndent = commonTags.stripIndent const stripIndents = commonTags.stripIndents diff --git a/test/index.ts b/test/index.ts index e6989f5443..887e0ca055 100644 --- a/test/index.ts +++ b/test/index.ts @@ -1,13 +1,6 @@ import test = require('tape') import logger, { createStreamParser, - progressLogger, - stageLogger, - rootLogger, - deprecationLogger, - summaryLogger, - lifecycleLogger, - manifestLogger, } from 'pnpm-logger' import normalizeNewline = require('normalize-newline') import {toOutput$} from 'pnpm-default-reporter' @@ -29,6 +22,14 @@ const POSTINSTALL = hlValue('postinstall') const PREINSTALL = hlValue('preinstall') const INSTALL = hlValue('install') +const progressLogger = logger('progress') +const stageLogger = logger('stage') +const rootLogger = logger('root') +const deprecationLogger = logger('deprecation') +const summaryLogger = logger('summary') +const lifecycleLogger = logger('lifecycle') +const manifestLogger = logger('manifest') + test('prints progress beginning', t => { const output$ = toOutput$(createStreamParser()) @@ -198,7 +199,7 @@ test('prints summary', t => { }, } }) - summaryLogger.info(undefined) + summaryLogger.info() t.plan(1) From 806705448c9d33e4c694558f4077bb9df0f30104 Mon Sep 17 00:00:00 2001 From: zkochan Date: Fri, 10 Nov 2017 22:28:16 +0200 Subject: [PATCH 082/196] feat: update supi BREAKING CHANGE: peer dependencies updated --- package.json | 6 ++--- shrinkwrap.yaml | 58 ++++++++++++++++++++++++++----------------------- src/pkgsDiff.ts | 22 +++++++++---------- test/index.ts | 10 ++++----- 4 files changed, 50 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index baa04a0182..933cf302c2 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "pnpm-logger": "^0.6.2" + "supi": "^0.7.0" }, "dependencies": { "@types/common-tags": "^1.2.5", @@ -53,15 +53,15 @@ "xstream": "^11.0.0" }, "devDependencies": { + "@pnpm/logger": "^1.0.0", "@types/tape": "^4.2.30", "commitizen": "^2.9.5", "ghooks": "^2.0.0", "mos-tap-diff": "^1.0.0", "normalize-newline": "^3.0.0", "package-preview": "^0.1.3", - "pnpm-logger": "^0.7.1", "rimraf": "^2.5.4", - "supi": "^0.7.0-1", + "supi": "^0.7.0", "tape": "^4.8.0", "ts-node": "^3.3.0", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 9c404a4aa0..d383ab62ae 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -11,15 +11,15 @@ dependencies: stacktracey: 1.2.83 xstream: 11.0.0 devDependencies: + '@pnpm/logger': 1.0.0 '@types/tape': 4.2.31 commitizen: 2.9.6 ghooks: 2.0.0 mos-tap-diff: 1.0.0 normalize-newline: 3.0.0 package-preview: 0.1.3 - pnpm-logger: 0.7.1 rimraf: 2.6.2 - supi: 0.7.0-1 + supi: 0.7.0 tape: 4.8.0 ts-node: 3.3.0 tslint: 5.8.0 @@ -38,6 +38,16 @@ packages: node: '>=4' resolution: integrity: sha512-BjVjPYfTXNBF75WFyOJRPNw6BLutvgx6lvShzGGTreEAde/sND0DAAeyr+t3Wc9YuFKZ7DG84b97H5of8JiMmw== + /@pnpm/logger/1.0.0: + dependencies: + '@types/node': 8.0.51 + bole: 3.0.2 + ndjson: 1.5.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-VRqE5/SiuR7ZrwBmS+Af89BTXli5xBbiqu7WPq56gEtWT8dKf9rFLoimmmMBVeRq5LmVZIXlOxs29F9I+vgSvQ== /@pnpm/types/1.0.0: dev: true resolution: @@ -90,6 +100,10 @@ packages: dev: true resolution: integrity: sha512-N9OVsMBspboNvYaLAQnLEhb2eQ96lavogMR5LoH5k8nb1PvBZHSBFhzhsq2LNzGTBBOtBviOc1GiSu+wlM/pGw== + /@types/node/8.0.51: + dev: true + resolution: + integrity: sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ== /@types/nopt/3.0.29: dev: true resolution: @@ -2395,10 +2409,10 @@ packages: node: '>=4' resolution: integrity: sha512-+i0nm6AzPFFimHndbgRw+wQ2GAj8RNw+iFiccnSvCXROEcZZgEa1PYA+iAhR89KAzlHQNIqpu5KehMEpod3BVA== - /package-store/0.5.0-1: + /package-store/0.5.0: dependencies: '@types/load-json-file': 2.0.7 - '@types/node': 8.0.50 + '@types/node': 8.0.51 '@types/ramda': 0.25.3 '@types/retry': 0.10.2 '@types/semver': 5.4.0 @@ -2435,9 +2449,9 @@ packages: engines: node: '>=4' peerDependencies: - pnpm-logger: ^0.7.0 + '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-Z3H6A07pT9dMndlXi4qh6lLj8J82arF6Mcx5HhuZyX3/oczU1C3NZXoDZjTUA0gnlWSYkyJ6fofS2RS7aH9rjA== + integrity: sha512-sIVto6OxyetDz7sxi823qfVIm7pdpYVHr3ouYigzZm+11498wSa8xn6EnakMqpw61QX7b66fHGjyz0bA1XzQIg== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -2599,17 +2613,7 @@ packages: dev: true resolution: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= - /pnpm-logger/0.7.1: - dependencies: - '@types/node': 8.0.47 - bole: 3.0.2 - ndjson: 1.5.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha512-CXm+ueCzJkRFok4t7P6eu8Lg8QKKXu36zBMBkTYRdGWmJydEMDVODRjxVeS2o7lLGFDI48n++A59QlGzJiTrLg== - /pnpm-shrinkwrap/4.0.1: + /pnpm-shrinkwrap/5.0.0: dependencies: '@types/node': 7.0.46 '@types/ramda': 0.0.11 @@ -2623,9 +2627,9 @@ packages: write-file-atomic: 2.3.0 dev: true peerDependencies: - pnpm-logger: ^0.6.2 + '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-IOJhwMWoM2O9goa+0EleZCzrLYQmaBuNZeOmoFUV9WU54WHjQfeFJ1J+Qu7FRAGDlzWWIcuxL43Ap1XL4+OASw== + integrity: sha512-1flslfYroQpp2mseTwuifgOqjC64DRcqDXkjHmP89DE6/pkJoSmcG789wviHYQAZyo0KK06tF2FJf0z/XgjOlA== /prebuild-install/2.3.0: dependencies: expand-template: 1.1.0 @@ -3211,7 +3215,7 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.7.0-1: + /supi/0.7.0: dependencies: '@pnpm/types': 1.0.0 '@types/byline': 4.2.31 @@ -3256,12 +3260,12 @@ packages: p-filter: 1.0.0 p-limit: 1.1.0 p-series: 1.0.0 - package-store: 0.5.0-1 + package-store: 0.5.0 path-absolute: 1.0.0 path-exists: 3.0.0 path-name: 1.0.0 pnpm-install-checks: 1.1.0 - pnpm-shrinkwrap: 4.0.1 + pnpm-shrinkwrap: 5.0.0 proper-lockfile: 2.0.1 ramda: 0.25.0 read-package-json: 2.0.12 @@ -3276,9 +3280,9 @@ packages: engines: node: '>=4' peerDependencies: - pnpm-logger: ^0.7.0 + '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-C/xz4z5TnyqvvcVJ7ReUJ/uXzKweKYiF9F0pThw7dzw+upkpThQHmtBnQnuW3nsv30WRkDYLsh+9RLiAZRVVMw== + integrity: sha512-DSbrfDPWM00ulSXdh/7Egz6q13T7REb1jlHlDlgJVj/qPuI6KZ+kesfJGJMaKC0tAmdrPdEOqzt2KqfiyoDmNg== /supports-color/0.2.0: dev: true engines: @@ -3523,7 +3527,7 @@ packages: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= /unpack-stream/2.1.1: dependencies: - '@types/node': 8.0.50 + '@types/node': 8.0.51 decompress-maybe: 1.0.0 ssri: 4.1.6 tar-fs: 1.16.0 @@ -3712,6 +3716,7 @@ registry: 'https://registry.npmjs.org/' shrinkwrapMinorVersion: 2 shrinkwrapVersion: 3 specifiers: + '@pnpm/logger': ^1.0.0 '@types/common-tags': ^1.2.5 '@types/node': ^8.0.44 '@types/ramda': ^0.24.17 @@ -3725,12 +3730,11 @@ specifiers: ndjson: ^1.5.0 normalize-newline: ^3.0.0 package-preview: ^0.1.3 - pnpm-logger: ^0.7.1 pretty-bytes: ^4.0.2 ramda: ^0.25.0 rimraf: ^2.5.4 stacktracey: ^1.0.71 - supi: ^0.7.0-1 + supi: ^0.7.0 tape: ^4.8.0 ts-node: ^3.3.0 tslint: ^5.7.0 diff --git a/src/pkgsDiff.ts b/src/pkgsDiff.ts index f4f6da217a..7f4bba3984 100644 --- a/src/pkgsDiff.ts +++ b/src/pkgsDiff.ts @@ -66,23 +66,23 @@ export default (log$: xs, deprecationLog$: xs) => { optional: Map, }) - const manifest$ = log$ - .filter((log) => log.name === 'pnpm:manifest') + const packageJson$ = log$ + .filter((log) => log.name === 'pnpm:package-json') .take(2) .fold(R.merge, {}) .last() - return xs.combine(pkgsDiff$, manifest$) - .map(R.apply((pkgsDiff, manifests) => { - const initialManifest = manifests['initial'] - const updatedManifest = manifests['updated'] + return xs.combine(pkgsDiff$, packageJson$) + .map(R.apply((pkgsDiff, packageJsons) => { + const initialPackageJson = packageJsons['initial'] + const updatedPackageJson = packageJsons['updated'] - if (!initialManifest || !updatedManifest) return pkgsDiff + if (!initialPackageJson || !updatedPackageJson) return pkgsDiff for (const depType of ['prod', 'optional', 'dev']) { const prop = propertyByDependencyType[depType] - const initialDeps = R.keys(initialManifest[prop]) - const updatedDeps = R.keys(updatedManifest[prop]) + const initialDeps = R.keys(initialPackageJson[prop]) + const updatedDeps = R.keys(updatedPackageJson[prop]) const removedDeps = R.difference(initialDeps, updatedDeps) for (const removedDep of removedDeps) { @@ -90,7 +90,7 @@ export default (log$: xs, deprecationLog$: xs) => { pkgsDiff[depType][`-${removedDep}`] = { added: false, name: removedDep, - version: initialManifest[prop][removedDep], + version: initialPackageJson[prop][removedDep], } } } @@ -102,7 +102,7 @@ export default (log$: xs, deprecationLog$: xs) => { pkgsDiff[depType][`+${addedDep}`] = { added: true, name: addedDep, - version: updatedManifest[prop][addedDep], + version: updatedPackageJson[prop][addedDep], } } } diff --git a/test/index.ts b/test/index.ts index 887e0ca055..da93d067a4 100644 --- a/test/index.ts +++ b/test/index.ts @@ -1,7 +1,7 @@ -import test = require('tape') import logger, { createStreamParser, -} from 'pnpm-logger' +} from '@pnpm/logger' +import test = require('tape') import normalizeNewline = require('normalize-newline') import {toOutput$} from 'pnpm-default-reporter' import {stripIndents} from 'common-tags' @@ -28,7 +28,7 @@ const rootLogger = logger('root') const deprecationLogger = logger('deprecation') const summaryLogger = logger('summary') const lifecycleLogger = logger('lifecycle') -const manifestLogger = logger('manifest') +const packageJsonLogger = logger('package-json') test('prints progress beginning', t => { const output$ = toOutput$(createStreamParser()) @@ -127,7 +127,7 @@ test('prints "Already up-to-date"', t => { test('prints summary', t => { const output$ = toOutput$(createStreamParser()) - manifestLogger.debug({ + packageJsonLogger.debug({ initial: { dependencies: { 'is-13': '^1.0.0', @@ -189,7 +189,7 @@ test('prints summary', t => { name: 'is-positive', }, }) - manifestLogger.debug({ + packageJsonLogger.debug({ updated: { dependencies: { 'is-negative': '^1.0.0', From 8db3fc0d4afd43bfe8f2dec75864c588aa6166cb Mon Sep 17 00:00:00 2001 From: zkochan Date: Fri, 10 Nov 2017 22:31:14 +0200 Subject: [PATCH 083/196] chore(release): 0.10.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 933cf302c2..83458ba79d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.9.7", + "version": "0.10.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 05220e3ebe15062e70f74daa2b2c1d11d83cfb9f Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 12 Nov 2017 18:59:01 +0200 Subject: [PATCH 084/196] chore: update dependencies --- package.json | 10 +- shrinkwrap.yaml | 320 ++++++++++++++++++++++++++++++++++++------------ 2 files changed, 248 insertions(+), 82 deletions(-) diff --git a/package.json b/package.json index 83458ba79d..2adba4bf2f 100644 --- a/package.json +++ b/package.json @@ -41,15 +41,15 @@ }, "dependencies": { "@types/common-tags": "^1.2.5", - "@types/node": "^8.0.44", + "@types/node": "^8.0.51", "@types/ramda": "^0.24.17", "chalk": "^2.2.0", "common-tags": "^1.4.0", - "log-update": "^2.0.0", + "log-update": "^2.3.0", "ndjson": "^1.5.0", "pretty-bytes": "^4.0.2", "ramda": "^0.25.0", - "stacktracey": "^1.0.71", + "stacktracey": "^1.2.87", "xstream": "^11.0.0" }, "devDependencies": { @@ -59,9 +59,9 @@ "ghooks": "^2.0.0", "mos-tap-diff": "^1.0.0", "normalize-newline": "^3.0.0", - "package-preview": "^0.1.3", + "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.7.0", + "supi": "^0.7.3", "tape": "^4.8.0", "ts-node": "^3.3.0", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index d383ab62ae..229c45b50f 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,14 +1,14 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 8.0.47 + '@types/node': 8.0.51 '@types/ramda': 0.24.18 chalk: 2.3.0 common-tags: 1.4.0 - log-update: 2.2.0 + log-update: 2.3.0 ndjson: 1.5.0 pretty-bytes: 4.0.2 ramda: 0.25.0 - stacktracey: 1.2.83 + stacktracey: 1.2.87 xstream: 11.0.0 devDependencies: '@pnpm/logger': 1.0.0 @@ -17,19 +17,19 @@ devDependencies: ghooks: 2.0.0 mos-tap-diff: 1.0.0 normalize-newline: 3.0.0 - package-preview: 0.1.3 + package-preview: 1.0.0 rimraf: 2.6.2 - supi: 0.7.0 + supi: 0.7.3 tape: 4.8.0 ts-node: 3.3.0 tslint: 5.8.0 typescript: 2.6.1 validate-commit-msg: 2.14.0 packages: - /@pnpm/exec/1.0.2: + /@pnpm/exec/1.1.1: dependencies: - '@types/got': 7.1.4 - '@types/node': 8.0.47 + '@types/got': 7.1.5 + '@types/node': 8.0.51 command-exists: 1.2.2 cross-spawn: 5.1.0 got: 7.1.0 @@ -37,7 +37,7 @@ packages: engines: node: '>=4' resolution: - integrity: sha512-BjVjPYfTXNBF75WFyOJRPNw6BLutvgx6lvShzGGTreEAde/sND0DAAeyr+t3Wc9YuFKZ7DG84b97H5of8JiMmw== + integrity: sha512-1C2K+SXmyKqwojtk9EhLsN6sKDhLnJJfenUwkfcBBbP3ltDaIExZ8uEpCFE4cO2qK60dNgJYTF7FsPzJjYyx5w== /@pnpm/logger/1.0.0: dependencies: '@types/node': 8.0.51 @@ -54,38 +54,48 @@ packages: integrity: sha512-2BQ/X7qS3bCWOFR+HMQ3ZR1qU1KZNGGjfF6fvMPbYq3kZBGr5i57je4XTHADuiVRv0t6wJ4Ev+X4bw6GktbFYQ== /@types/byline/4.2.31: dependencies: - '@types/node': 8.0.50 + '@types/node': 8.0.51 dev: true resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= /@types/common-tags/1.4.0: resolution: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== - /@types/fs-extra/4.0.3: + /@types/fs-extra/4.0.4: dependencies: - '@types/node': 8.0.47 + '@types/node': 8.0.51 dev: true resolution: - integrity: sha512-cUE7dc4RJsRPCk8mbrgMAaglugcJbf1Oxp7DYi/aOj4+ggCxzddDQFZwCKWnqrLv4LJ89apyNJ7Y3pN79tAPVg== - /@types/got/7.1.4: + integrity: sha512-u2LUBibrqjpF/AJ9trGmpIZMBQ8zjLqDHO7f25gNfNHI+/cCvFjut7u2s7Dn6tbETFBgJEjb/INRDCbTF8nJUA== + /@types/got/7.1.5: dependencies: - '@types/node': 8.0.47 + '@types/node': 8.0.51 dev: true resolution: - integrity: sha512-GSwGwxqqbGy470XcZEWIrflF/ADxN1DObpQe7sE8xxel+zFG5ZG5xc+JEyfC/9aGlVrSAcKD/iPdXjGH5MS5lA== + integrity: sha512-fOby+9vGOB15+6GsNI3maUx/Ig4lW3hOH9is0OsrKRyyeJ42gk2mUn4UoRko3kXVPj44TSxDx81Th3EisXx8rg== /@types/load-json-file/2.0.7: dev: true resolution: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== + /@types/meow/3.6.2: + dependencies: + '@types/minimist': 1.2.0 + dev: true + resolution: + integrity: sha1-0Thn+X2LJYIA4U9Zxu0H8Is0KA4= + /@types/minimist/1.2.0: + dev: true + resolution: + integrity: sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY= /@types/mz/0.0.31: dependencies: - '@types/node': 8.0.50 + '@types/node': 8.0.51 dev: true resolution: integrity: sha1-pNgMCC/v5x5Ap8DwfR5lVbu8e1I= /@types/mz/0.0.32: dependencies: - '@types/node': 8.0.50 + '@types/node': 8.0.51 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== @@ -93,15 +103,7 @@ packages: dev: true resolution: integrity: sha512-u+JAi1KtmaUoU/EHJkxoiuvzyo91FCE41Z9TZWWcOUU3P8oUdlDLdrGzCGWySPgbRMD17B0B+1aaJLYI9egQ6A== - /@types/node/8.0.47: - resolution: - integrity: sha512-kOwL746WVvt/9Phf6/JgX/bsGQvbrK5iUgzyfwZNcKVFcjAUVSpF9HxevLTld2SG9aywYHOILj38arDdY1r/iQ== - /@types/node/8.0.50: - dev: true - resolution: - integrity: sha512-N9OVsMBspboNvYaLAQnLEhb2eQ96lavogMR5LoH5k8nb1PvBZHSBFhzhsq2LNzGTBBOtBviOc1GiSu+wlM/pGw== /@types/node/8.0.51: - dev: true resolution: integrity: sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ== /@types/nopt/3.0.29: @@ -110,14 +112,14 @@ packages: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 8.0.50 + '@types/node': 8.0.51 dev: true resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== - /@types/p-series/1.0.0: + /@types/p-series/1.0.1: dev: true resolution: - integrity: sha512-Wg4K7QcdxvqgLGR+sTUtsDXNfHgHv/AzEv5bZXxAE9nvC7x+zmIEx5ZFUTE0c3e8naW70cinqOvk76LGGiYKZA== + integrity: sha512-dwv960sf5inFWiufjhDfK7ZG3nYyHXt58I+14bJJBKV5MPlZm6Tu1sQS63NWEtLpIw6+RhbNbXjNStdMXxR8Nw== /@types/ramda/0.0.11: dev: true resolution: @@ -126,10 +128,10 @@ packages: dev: false resolution: integrity: sha512-37umDB+zS6tK+3j0YJxsl7O8T4aYHYO6s1UpADJ/nxMHFjmuSd5XRQryC4IXX3HQ4XzstqAqhk/D+cdxwvqtEQ== - /@types/ramda/0.25.3: + /@types/ramda/0.25.5: dev: true resolution: - integrity: sha512-wxs2s/qPon1Obr+0NSiBlF/6uHrFYmh+F14971ZIvpM9OUad2eMqDrPC6Cz5WZh50DNrKYz1C8dVIpWp7PVQ7w== + integrity: sha512-t0fA96x1DktA/yYfiDrX7sBaMR1JVP7xkluCuSvwGLEC3fX4/QUoq3zyvIt2Hn4QS1LPmQ5NCEvCtxYtbt8BFw== /@types/rc/0.0.1: dev: true resolution: @@ -144,7 +146,7 @@ packages: integrity: sha512-PBHCvO98hNec9A491vBbh0ZNDOVxccwKL1u2pm6fs9oDgm7SEnw0lEHqHfjsYryDxnE3zaf7LvERWEXjOp1hig== /@types/tape/4.2.31: dependencies: - '@types/node': 8.0.47 + '@types/node': 8.0.51 dev: true resolution: integrity: sha512-DEPn8FJKQR6eeMHZ407TuAqlhBKQa54PTM3c7Z6pKOI1uHaPnidmpmOXYtNZTcDrL5hnZofSHPwX1AQ9HbaMUg== @@ -236,7 +238,7 @@ packages: integrity: sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= /ansi-styles/3.2.0: dependencies: - color-convert: 1.9.0 + color-convert: 1.9.1 engines: node: '>=4' resolution: @@ -276,6 +278,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== + /array-find-index/1.0.2: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= /array-unique/0.2.1: dev: true engines: @@ -456,6 +464,21 @@ packages: dev: true resolution: integrity: sha1-4TYwdeogahJ2fZK7cRyKL3ahD2I= + /camelcase-keys/2.1.0: + dependencies: + camelcase: 2.1.1 + map-obj: 1.0.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-MIvur/3ygRkFHvodkyITyRuPkuc= + /camelcase/2.1.1: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= /caseless/0.12.0: dev: true resolution: @@ -534,11 +557,11 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - /color-convert/1.9.0: + /color-convert/1.9.1: dependencies: color-name: 1.1.3 resolution: - integrity: sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o= + integrity: sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ== /color-name/1.1.3: resolution: integrity: sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= @@ -664,6 +687,14 @@ packages: node: '>=4.0.0' resolution: integrity: sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4= + /currently-unhandled/0.4.1: + dependencies: + array-find-index: 1.0.2 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-mI3zP+qxke95mmE2nddsF635V+o= /cz-conventional-changelog/1.2.0: dependencies: conventional-commit-types: 2.2.0 @@ -685,7 +716,7 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.0.47 + '@types/node': 8.0.51 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -696,6 +727,12 @@ packages: optional: true resolution: integrity: sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + /decamelize/1.2.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= /decompress-maybe/1.0.0: dependencies: bzip2-maybe: 1.0.0 @@ -754,7 +791,7 @@ packages: /dependency-path/1.2.0: dependencies: '@types/semver': 5.4.0 - encode-registry: 1.0.0 + encode-registry: 1.1.0 semver: 5.4.1 dev: true resolution: @@ -855,12 +892,6 @@ packages: optional: true resolution: integrity: sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU= - /encode-registry/1.0.0: - dependencies: - mem: 1.1.0 - dev: true - resolution: - integrity: sha512-4DiPp5kmIDq9rHDU5C3r9clu+TVcnUXIMoLNiiJxHlGG+cMIApT/mOwLEpcEPN1a2PnNt/Ll3lcf39dyHf3n9w== /encode-registry/1.1.0: dependencies: mem: 3.0.0 @@ -1075,6 +1106,15 @@ packages: dev: true resolution: integrity: sha1-li/yEaqyXGUg/u641ih/j26VgHo= + /find-up/1.1.2: + dependencies: + path-exists: 2.1.0 + pinkie-promise: 2.0.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= /find-up/2.1.0: dependencies: locate-path: 2.0.0 @@ -1208,13 +1248,19 @@ packages: dev: true resolution: integrity: sha1-Xr8eZAnPcxeszYfYLkHpNdEnJjg= - /get-source/1.0.22: + /get-source/1.0.24: dependencies: data-uri-to-buffer: 2.0.0 source-map: 0.6.1 dev: false resolution: - integrity: sha1-M/EiVM8BxL2hcE9cQE0LvadPM/I= + integrity: sha1-iY3Me1WSrboC6LuCuNLNpgza5cU= + /get-stdin/4.0.1: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= /get-stream/3.0.0: dev: true engines: @@ -1456,6 +1502,14 @@ packages: node: '>=0.8.19' resolution: integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o= + /indent-string/2.1.0: + dependencies: + repeating: 2.0.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= /individual/3.0.0: dev: true resolution: @@ -1701,6 +1755,10 @@ packages: dev: true resolution: integrity: sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + /is-utf8/0.2.1: + dev: true + resolution: + integrity: sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= /is-windows/0.2.0: dev: true engines: @@ -1824,6 +1882,18 @@ packages: graceful-fs: 4.1.11 resolution: integrity: sha1-QIhDO0azsbolnXh4XY6W9zugJDk= + /load-json-file/1.1.0: + dependencies: + graceful-fs: 4.1.11 + parse-json: 2.2.0 + pify: 2.3.0 + pinkie-promise: 2.0.1 + strip-bom: 2.0.0 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= /load-json-file/3.0.0: dependencies: graceful-fs: 4.1.11 @@ -1888,7 +1958,7 @@ packages: dev: true resolution: integrity: sha1-eCA6TRwyiuHYbcpkYONptX9AVa4= - /log-update/2.2.0: + /log-update/2.3.0: dependencies: ansi-escapes: 3.0.0 cli-cursor: 2.1.0 @@ -1897,13 +1967,22 @@ packages: engines: node: '>=4' resolution: - integrity: sha1-4bA01DJeNDbJ3xqn/ZycJDv7kZg= + integrity: sha1-iDKP19HOeTiykoN0bwsbwSayRwg= /longest/1.0.1: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc= + /loud-rejection/1.6.0: + dependencies: + currently-unhandled: 0.4.1 + signal-exit: 3.0.2 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= /lowercase-keys/1.0.0: dev: true engines: @@ -1933,14 +2012,12 @@ packages: dev: true resolution: integrity: sha1-9M+EV7km7u4qg7FzUBQUvHbrlZc= - /mem/1.1.0: - dependencies: - mimic-fn: 1.1.0 + /map-obj/1.0.1: dev: true engines: - node: '>=4' + node: '>=0.10.0' resolution: - integrity: sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y= + integrity: sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= /mem/3.0.0: dependencies: mimic-fn: 1.1.0 @@ -1950,6 +2027,23 @@ packages: node: '>=4' resolution: integrity: sha1-hOWK1N+99dEFsmtlSKOYsrOqiiE= + /meow/3.7.0: + dependencies: + camelcase-keys: 2.1.0 + decamelize: 1.2.0 + loud-rejection: 1.6.0 + map-obj: 1.0.1 + minimist: 1.2.0 + normalize-package-data: 2.4.0 + object-assign: 4.1.1 + read-pkg-up: 1.0.1 + redent: 1.0.0 + trim-newlines: 1.0.0 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= /merge/1.2.0: dev: true resolution: @@ -2388,17 +2482,21 @@ packages: node: '>=4' resolution: integrity: sha1-mCD5lDTFgXhotPNICe5SkWYNW2w= - /package-preview/0.1.3: + /package-preview/1.0.0: dependencies: - '@pnpm/exec': 1.0.2 - '@types/fs-extra': 4.0.3 + '@pnpm/exec': 1.1.1 + '@types/fs-extra': 4.0.4 + '@types/load-json-file': 2.0.7 + '@types/meow': 3.6.2 '@types/mz': 0.0.32 - '@types/node': 8.0.47 + '@types/node': 8.0.51 '@types/write-json-file': 2.2.1 cross-spawn: 5.1.0 find-down: 0.1.4 fs-extra: 4.0.2 graceful-fs: 4.1.11 + load-json-file: 4.0.0 + meow: 3.7.0 mz: 2.7.0 rimraf-then: 1.0.1 symlink-dir: 1.1.0 @@ -2408,12 +2506,12 @@ packages: engines: node: '>=4' resolution: - integrity: sha512-+i0nm6AzPFFimHndbgRw+wQ2GAj8RNw+iFiccnSvCXROEcZZgEa1PYA+iAhR89KAzlHQNIqpu5KehMEpod3BVA== + integrity: sha512-OQbpubrdUPz5xJa98eri+Gf7zfhoLbtQACh4myRaUrCHPYzCrKvw+07v3DrV/n1aRv0/yibWkqSGC/v03ijUug== /package-store/0.5.0: dependencies: '@types/load-json-file': 2.0.7 '@types/node': 8.0.51 - '@types/ramda': 0.25.3 + '@types/ramda': 0.25.5 '@types/retry': 0.10.2 '@types/semver': 5.4.0 credentials-by-uri: 1.0.0 @@ -2475,6 +2573,14 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-ssN2z7EfNVE7rdFz7wu246OIORw= + /parse-json/2.2.0: + dependencies: + error-ex: 1.3.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= /parse-json/3.0.0: dependencies: error-ex: 1.3.1 @@ -2564,6 +2670,16 @@ packages: dev: true resolution: integrity: sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME= + /path-type/1.1.0: + dependencies: + graceful-fs: 4.1.11 + pify: 2.3.0 + pinkie-promise: 2.0.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= /peek-stream/1.1.2: dependencies: duplexify: 3.5.1 @@ -2764,6 +2880,25 @@ packages: graceful-fs: 4.1.11 resolution: integrity: sha512-m7/I0+tP6D34EVvSlzCtuVA4D/dHL6OpLcn2e4XVP5X57pCKGUy1JjRSBVKHWpB+vUU91sL85h84qX0MdXzBSw== + /read-pkg-up/1.0.1: + dependencies: + find-up: 1.1.2 + read-pkg: 1.1.0 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= + /read-pkg/1.1.0: + dependencies: + load-json-file: 1.1.0 + normalize-package-data: 2.4.0 + path-type: 1.1.0 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= /readable-stream/2.3.3: dependencies: core-util-is: 1.0.2 @@ -2783,6 +2918,15 @@ packages: node: '>= 0.10' resolution: integrity: sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= + /redent/1.0.0: + dependencies: + indent-string: 2.1.0 + strip-indent: 1.0.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= /regenerator-runtime/0.11.0: resolution: integrity: sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A== @@ -3125,13 +3269,13 @@ packages: dev: true resolution: integrity: sha512-728D4yoQcQm1ooZvSbywLkV1RjfITZXh0oWrhM/lnsx3nAHx7LsRGJWB/YyvoceAYRq98xqbstiN4JBv1/wNHg== - /stacktracey/1.2.83: + /stacktracey/1.2.87: dependencies: as-table: 1.0.31 - get-source: 1.0.22 + get-source: 1.0.24 dev: false resolution: - integrity: sha1-KEK/HZQu9y1tf5ffnm+ylv3AjNk= + integrity: sha1-5jFkdPtQPj88OCAw3YM8ey4JLe0= /stream-shift/1.0.0: dev: true resolution: @@ -3197,6 +3341,14 @@ packages: node: '>=4' resolution: integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8= + /strip-bom/2.0.0: + dependencies: + is-utf8: 0.2.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= /strip-bom/3.0.0: dev: true engines: @@ -3209,24 +3361,32 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + /strip-indent/1.0.1: + dependencies: + get-stdin: 4.0.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= /strip-json-comments/2.0.1: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.7.0: + /supi/0.7.3: dependencies: '@pnpm/types': 1.0.0 '@types/byline': 4.2.31 '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 8.0.50 + '@types/node': 8.0.51 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 - '@types/p-series': 1.0.0 - '@types/ramda': 0.25.3 + '@types/p-series': 1.0.1 + '@types/ramda': 0.25.5 '@types/rc': 0.0.1 '@types/semver': 5.4.0 '@types/update-notifier': 1.0.2 @@ -3237,7 +3397,7 @@ packages: common-tags: 1.4.0 cross-spawn: 5.1.0 dependency-path: 1.2.0 - encode-registry: 1.0.0 + encode-registry: 1.1.0 execa: 0.8.0 find-up: 2.1.0 get-npm-tarball-url: 2.0.0 @@ -3282,7 +3442,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-DSbrfDPWM00ulSXdh/7Egz6q13T7REb1jlHlDlgJVj/qPuI6KZ+kesfJGJMaKC0tAmdrPdEOqzt2KqfiyoDmNg== + integrity: sha512-Gb8TEan7VIXgKp3cd7NnUsVhH5MXNwWvP1LxQhqk5vDOECjXIXlkzdBP1KCq/hcvlo+3xds5kn4xejftGlLeig== /supports-color/0.2.0: dev: true engines: @@ -3311,7 +3471,7 @@ packages: /symlink-dir/1.1.0: dependencies: '@types/mz': 0.0.31 - '@types/node': 8.0.50 + '@types/node': 8.0.51 graceful-fs: 4.1.11 is-windows: 1.0.1 mkdirp-promise: 5.0.1 @@ -3429,6 +3589,12 @@ packages: node: '>=0.8' resolution: integrity: sha1-C2GKVWW23qkL80JdBNVe3EdadWE= + /trim-newlines/1.0.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-WIeWa7WCpFA6QetST301ARgVphM= /ts-node/3.3.0: dependencies: arrify: 1.0.1 @@ -3469,7 +3635,7 @@ packages: resolve: 1.5.0 semver: 5.4.1 tslib: 1.8.0 - tsutils: 2.12.1 + tsutils: 2.12.2 dev: true engines: node: '>=4.1.2' @@ -3477,14 +3643,14 @@ packages: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev' resolution: integrity: sha1-H0mtWy53x2w69N3K5VKuTjYS6xM= - /tsutils/2.12.1: + /tsutils/2.12.2: dependencies: tslib: 1.8.0 dev: true peerDependencies: - typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >= 2.4.0-dev || >= 2.5.0-dev || >= 2.6.0-dev || >= 2.7.0-dev' + typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >= 2.4.0-dev || >= 2.5.0-dev || >= 2.6.0-dev || >= 2.7.0-dev || >= 2.8.0-dev' resolution: - integrity: sha1-9Nlc4zkciXHkblTEzw7bCiHdWyQ= + integrity: sha1-rVikhl0X7D3bZjG2ylO+FKVlb/M= /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.1.1 @@ -3718,23 +3884,23 @@ shrinkwrapVersion: 3 specifiers: '@pnpm/logger': ^1.0.0 '@types/common-tags': ^1.2.5 - '@types/node': ^8.0.44 + '@types/node': ^8.0.51 '@types/ramda': ^0.24.17 '@types/tape': ^4.2.30 chalk: ^2.2.0 commitizen: ^2.9.5 common-tags: ^1.4.0 ghooks: ^2.0.0 - log-update: ^2.0.0 + log-update: ^2.3.0 mos-tap-diff: ^1.0.0 ndjson: ^1.5.0 normalize-newline: ^3.0.0 - package-preview: ^0.1.3 + package-preview: ^1.0.0 pretty-bytes: ^4.0.2 ramda: ^0.25.0 rimraf: ^2.5.4 - stacktracey: ^1.0.71 - supi: ^0.7.0 + stacktracey: ^1.2.87 + supi: ^0.7.3 tape: ^4.8.0 ts-node: ^3.3.0 tslint: ^5.7.0 From a9538994091e9304cbb668e00a7e0ecdc85e100e Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 12 Nov 2017 20:46:16 +0200 Subject: [PATCH 085/196] feat: show linked dependencies in installation summary ref https://github.com/pnpm/pnpm/issues/732 --- package.json | 2 +- shrinkwrap.yaml | 35 ++++++++++------------------------- src/index.ts | 10 +++++++++- src/pkgsDiff.ts | 13 ++++++++++++- test/index.ts | 10 ++++++++++ 5 files changed, 42 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 2adba4bf2f..4d0d2a2ab2 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.7.3", + "supi": "^0.7.4", "tape": "^4.8.0", "ts-node": "^3.3.0", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 229c45b50f..800fbdb0b7 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -19,7 +19,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.0 rimraf: 2.6.2 - supi: 0.7.3 + supi: 0.7.4 tape: 4.8.0 ts-node: 3.3.0 tslint: 5.8.0 @@ -128,6 +128,10 @@ packages: dev: false resolution: integrity: sha512-37umDB+zS6tK+3j0YJxsl7O8T4aYHYO6s1UpADJ/nxMHFjmuSd5XRQryC4IXX3HQ4XzstqAqhk/D+cdxwvqtEQ== + /@types/ramda/0.25.3: + dev: true + resolution: + integrity: sha512-wxs2s/qPon1Obr+0NSiBlF/6uHrFYmh+F14971ZIvpM9OUad2eMqDrPC6Cz5WZh50DNrKYz1C8dVIpWp7PVQ7w== /@types/ramda/0.25.5: dev: true resolution: @@ -1894,17 +1898,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= - /load-json-file/3.0.0: - dependencies: - graceful-fs: 4.1.11 - parse-json: 3.0.0 - pify: 2.3.0 - strip-bom: 3.0.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha1-frNzXZg6ftImKt5P92mvU2nFxEA= /load-json-file/4.0.0: dependencies: graceful-fs: 4.1.11 @@ -2581,14 +2574,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= - /parse-json/3.0.0: - dependencies: - error-ex: 1.3.1 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha1-+m9HsY4jgm6tMvJj50TQ4ehH+xM= /parse-json/4.0.0: dependencies: error-ex: 1.3.1 @@ -3375,7 +3360,7 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.7.3: + /supi/0.7.4: dependencies: '@pnpm/types': 1.0.0 '@types/byline': 4.2.31 @@ -3386,7 +3371,7 @@ packages: '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 - '@types/ramda': 0.25.5 + '@types/ramda': 0.25.3 '@types/rc': 0.0.1 '@types/semver': 5.4.0 '@types/update-notifier': 1.0.2 @@ -3406,7 +3391,7 @@ packages: is-inner-link: 2.0.2 is-subdir: 1.0.2 is-windows: 1.0.1 - load-json-file: 3.0.0 + load-json-file: 4.0.0 load-yaml-file: 0.1.0 mkdirp-promise: 5.0.1 mz: 2.7.0 @@ -3442,7 +3427,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-Gb8TEan7VIXgKp3cd7NnUsVhH5MXNwWvP1LxQhqk5vDOECjXIXlkzdBP1KCq/hcvlo+3xds5kn4xejftGlLeig== + integrity: sha512-rwa39F+gVe/yRyViqRSCifWL1ji19eVN6uyAUIQcDcmiGTTfMBglu7WCVLfFRBV1dUuAt6qdsVFI32NTYGNK7Q== /supports-color/0.2.0: dev: true engines: @@ -3900,7 +3885,7 @@ specifiers: ramda: ^0.25.0 rimraf: ^2.5.4 stacktracey: ^1.2.87 - supi: ^0.7.3 + supi: ^0.7.4 tape: ^4.8.0 ts-node: ^3.3.0 tslint: ^5.7.0 diff --git a/src/index.ts b/src/index.ts index 988a5acc14..3934c5840a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -27,6 +27,7 @@ const BIG_TARBALL_SIZE = 1024 * 1024 * 5 // 5 MB const addedSign = chalk.green('+') const removedSign = chalk.red('-') +const linkSign = chalk.magentaBright('#') const hlValue = chalk.blue const hlPkgId = chalk['whiteBright'] @@ -294,7 +295,11 @@ function printDiffs(pkgsDiff: PackageDiff[]) { // + chalk 2.0.0 pkgsDiff.sort((a, b) => (a.name.localeCompare(b.name) * 10 + (Number(!b.added) - Number(!a.added)))) const msg = pkgsDiff.map((pkg) => { - let result = pkg.added ? addedSign : removedSign + let result = pkg.added + ? addedSign + : pkg.linked + ? linkSign + : removedSign result += ` ${pkg.name}` if (pkg.version) { result += ` ${chalk.grey(pkg.version)}` @@ -302,6 +307,9 @@ function printDiffs(pkgsDiff: PackageDiff[]) { if (pkg.deprecated) { result += ` ${chalk.red('deprecated')}` } + if (pkg.linked) { + result += ` ${chalk.magentaBright('linked from')} ${chalk.grey(pkg.from || '???')}` + } return result }).join(EOL) return msg diff --git a/src/pkgsDiff.ts b/src/pkgsDiff.ts index 7f4bba3984..bd2c586c16 100644 --- a/src/pkgsDiff.ts +++ b/src/pkgsDiff.ts @@ -6,10 +6,12 @@ import { import xs, {Stream} from 'xstream' export interface PackageDiff { + added: boolean, + from?: string, name: string, version?: string, - added: boolean, deprecated?: boolean, + linked?: true, } interface Map { @@ -55,6 +57,15 @@ export default (log$: xs, deprecationLog$: xs) => { } return pkgsDiff } + if (rootLog['linked']) { + pkgsDiff[rootLog['linked'].dependencyType][`>${rootLog['linked'].name}`] = { + added: false, + from: rootLog['linked'].from, + linked: true, + name: rootLog['linked'].name, + } + return pkgsDiff + } return pkgsDiff }, { dev: {}, diff --git a/test/index.ts b/test/index.ts index da93d067a4..453aa63960 100644 --- a/test/index.ts +++ b/test/index.ts @@ -15,6 +15,7 @@ const DEPRECATED = chalk.red('deprecated') const versionColor = chalk.grey const ADD = chalk.green('+') const SUB = chalk.red('-') +const LINKED = chalk.magentaBright('#') const h1 = chalk.blue const hlValue = chalk.blue const hlPkgId = chalk['whiteBright'] @@ -189,6 +190,14 @@ test('prints summary', t => { name: 'is-positive', }, }) + rootLogger.debug({ + linked: { + dependencyType: 'optional', + from: '/src/is-linked', + name: 'is-linked', + to: '/src/project/node_modules' + }, + }) packageJsonLogger.debug({ updated: { dependencies: { @@ -216,6 +225,7 @@ test('prints summary', t => { ${ADD} is-negative ${versionColor('^1.0.0')} ${h1('optionalDependencies:')} + ${LINKED} is-linked ${chalk.magentaBright('linked from')} ${chalk.grey('/src/is-linked')} ${SUB} is-positive ${ADD} lala ${versionColor('1.1.0')} From 4e6fce9db14c310168bd43c41e830b6cf0ed517f Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 12 Nov 2017 20:53:25 +0200 Subject: [PATCH 086/196] feat: don't show all the stderr output Many libs use stderr for logging --- src/index.ts | 14 +++----------- test/index.ts | 3 ++- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/index.ts b/src/index.ts index 3934c5840a..e17e21032c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -163,22 +163,14 @@ export function toOutput$(streamParser: object): Stream { }) .map(xs.of) - const lifecycleMessages: {[pkgId: string]: {keep: boolean, output: string}} = {} + const lifecycleMessages: {[pkgId: string]: string} = {} const lifecycleOutput$ = xs.of( log$ .filter((log) => log.name === 'pnpm:lifecycle') .map((log: LifecycleLog) => { const key = `${log.script}:${log.pkgId}` - const keep = lifecycleMessages[key] && lifecycleMessages[key].keep || log.level === 'error' - const formattedLine = formatLifecycle(log) - const output = keep && lifecycleMessages[key] - ? `${lifecycleMessages[key].output}${EOL}${formattedLine}` - : formattedLine - lifecycleMessages[key] = { - keep, - output, - } - return R.values(lifecycleMessages).map((lm) => lm['output']).join(EOL) + lifecycleMessages[key] = formatLifecycle(log) + return R.values(lifecycleMessages).join(EOL) }) .map((msg) => ({msg})), ) diff --git a/test/index.ts b/test/index.ts index 453aa63960..4c07aedb78 100644 --- a/test/index.ts +++ b/test/index.ts @@ -299,7 +299,8 @@ test('groups lifecycle output', t => { }) }) -test('prints lifecycle progress', t => { +// Many libs use stderr for logging, so showing all stderr adds not much value +test['skip']('prints lifecycle progress', t => { const output$ = toOutput$(createStreamParser()) const pkgId = 'registry.npmjs.org/foo/1.0.0' From 4f9dc2ecff1a94a895ba8c4945e63f30376844a6 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 12 Nov 2017 21:33:06 +0200 Subject: [PATCH 087/196] chore(release): 0.10.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4d0d2a2ab2..3e9fcab030 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.10.0", + "version": "0.10.1", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 2bb6d7e1bc0c44895c0852ffc4c85d9ab8d28fc3 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 13 Nov 2017 01:16:41 +0200 Subject: [PATCH 088/196] feat: print notice about latest version in summary ref https://github.com/pnpm/pnpm/issues/921 --- package.json | 4 +++- shrinkwrap.yaml | 21 ++++++++++++--------- src/index.ts | 4 ++++ src/pkgsDiff.ts | 2 ++ test/index.ts | 4 +++- 5 files changed, 24 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 3e9fcab030..412afbaf4b 100644 --- a/package.json +++ b/package.json @@ -43,12 +43,14 @@ "@types/common-tags": "^1.2.5", "@types/node": "^8.0.51", "@types/ramda": "^0.24.17", + "@types/semver": "^5.4.0", "chalk": "^2.2.0", "common-tags": "^1.4.0", "log-update": "^2.3.0", "ndjson": "^1.5.0", "pretty-bytes": "^4.0.2", "ramda": "^0.25.0", + "semver": "^5.4.1", "stacktracey": "^1.2.87", "xstream": "^11.0.0" }, @@ -61,7 +63,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.7.4", + "supi": "^0.7.5", "tape": "^4.8.0", "ts-node": "^3.3.0", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 800fbdb0b7..26fe02941d 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -2,12 +2,14 @@ dependencies: '@types/common-tags': 1.4.0 '@types/node': 8.0.51 '@types/ramda': 0.24.18 + '@types/semver': 5.4.0 chalk: 2.3.0 common-tags: 1.4.0 log-update: 2.3.0 ndjson: 1.5.0 pretty-bytes: 4.0.2 ramda: 0.25.0 + semver: 5.4.1 stacktracey: 1.2.87 xstream: 11.0.0 devDependencies: @@ -19,7 +21,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.0 rimraf: 2.6.2 - supi: 0.7.4 + supi: 0.7.5 tape: 4.8.0 ts-node: 3.3.0 tslint: 5.8.0 @@ -145,7 +147,6 @@ packages: resolution: integrity: sha512-LqJkY4VQ7S09XhI7kA3ON71AxauROhSv74639VsNXC9ish4IWHnIi98if+nP1MxQV3RMPqXSCYgpPsDHjlg9UQ== /@types/semver/5.4.0: - dev: true resolution: integrity: sha512-PBHCvO98hNec9A491vBbh0ZNDOVxccwKL1u2pm6fs9oDgm7SEnw0lEHqHfjsYryDxnE3zaf7LvERWEXjOp1hig== /@types/tape/4.2.31: @@ -2500,8 +2501,9 @@ packages: node: '>=4' resolution: integrity: sha512-OQbpubrdUPz5xJa98eri+Gf7zfhoLbtQACh4myRaUrCHPYzCrKvw+07v3DrV/n1aRv0/yibWkqSGC/v03ijUug== - /package-store/0.5.0: + /package-store/0.5.1: dependencies: + '@pnpm/types': 1.0.0 '@types/load-json-file': 2.0.7 '@types/node': 8.0.51 '@types/ramda': 0.25.5 @@ -2542,7 +2544,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-sIVto6OxyetDz7sxi823qfVIm7pdpYVHr3ouYigzZm+11498wSa8xn6EnakMqpw61QX7b66fHGjyz0bA1XzQIg== + integrity: sha512-o7XZIy1Rxwyphw94z/p/2J8jPeRszF05YykmNt7EoIFJt56KY7gRryPaaZyV4K1splpntwHiJe9/6zCAmn4b2g== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -3101,7 +3103,6 @@ packages: resolution: integrity: sha1-myzl094C0XxgEq0yaqa00M9U+U8= /semver/5.4.1: - dev: true resolution: integrity: sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg== /set-blocking/2.0.0: @@ -3360,7 +3361,7 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.7.4: + /supi/0.7.5: dependencies: '@pnpm/types': 1.0.0 '@types/byline': 4.2.31 @@ -3405,7 +3406,7 @@ packages: p-filter: 1.0.0 p-limit: 1.1.0 p-series: 1.0.0 - package-store: 0.5.0 + package-store: 0.5.1 path-absolute: 1.0.0 path-exists: 3.0.0 path-name: 1.0.0 @@ -3427,7 +3428,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-rwa39F+gVe/yRyViqRSCifWL1ji19eVN6uyAUIQcDcmiGTTfMBglu7WCVLfFRBV1dUuAt6qdsVFI32NTYGNK7Q== + integrity: sha512-ruwD80VTUAfUTKw5Jo/RZqj17U1p8Q2ZWLzdBgrimRsw/Pe45edNVMv5kdS2wUtAjbLQj+uu/X4v29IwNelHEA== /supports-color/0.2.0: dev: true engines: @@ -3871,6 +3872,7 @@ specifiers: '@types/common-tags': ^1.2.5 '@types/node': ^8.0.51 '@types/ramda': ^0.24.17 + '@types/semver': ^5.4.0 '@types/tape': ^4.2.30 chalk: ^2.2.0 commitizen: ^2.9.5 @@ -3884,8 +3886,9 @@ specifiers: pretty-bytes: ^4.0.2 ramda: ^0.25.0 rimraf: ^2.5.4 + semver: ^5.4.1 stacktracey: ^1.2.87 - supi: ^0.7.4 + supi: ^0.7.5 tape: ^4.8.0 ts-node: ^3.3.0 tslint: ^5.7.0 diff --git a/src/index.ts b/src/index.ts index e17e21032c..16d09fa1ca 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,6 +4,7 @@ import logUpdate = require('log-update') import os = require('os') import prettyBytes = require('pretty-bytes') import R = require('ramda') +import semver = require('semver') import { DeprecationLog, InstallCheckLog, @@ -295,6 +296,9 @@ function printDiffs(pkgsDiff: PackageDiff[]) { result += ` ${pkg.name}` if (pkg.version) { result += ` ${chalk.grey(pkg.version)}` + if (pkg.latest && semver.lt(pkg.version, pkg.latest)) { + result += ` ${chalk.grey(`(${pkg.latest} is available)`)}` + } } if (pkg.deprecated) { result += ` ${chalk.red('deprecated')}` diff --git a/src/pkgsDiff.ts b/src/pkgsDiff.ts index bd2c586c16..a0725d0fcf 100644 --- a/src/pkgsDiff.ts +++ b/src/pkgsDiff.ts @@ -11,6 +11,7 @@ export interface PackageDiff { name: string, version?: string, deprecated?: boolean, + latest?: string, linked?: true, } @@ -44,6 +45,7 @@ export default (log$: xs, deprecationLog$: xs) => { pkgsDiff[rootLog['added'].dependencyType][`+${rootLog['added'].name}`] = { added: true, deprecated: deprecationSet.has(rootLog['added'].id), + latest: rootLog['added'].latest, name: rootLog['added'].name, version: rootLog['added'].version, } diff --git a/test/index.ts b/test/index.ts index 4c07aedb78..44f259dd5c 100644 --- a/test/index.ts +++ b/test/index.ts @@ -150,6 +150,7 @@ test('prints summary', t => { dependencyType: 'prod', name: 'foo', version: '1.0.0', + latest: '2.0.0', id: 'registry.npmjs.org/foo/1.0.0', }, }) @@ -158,6 +159,7 @@ test('prints summary', t => { dependencyType: 'prod', name: 'bar', version: '2.0.0', + latest: '1.0.0', // this won't be printed in summary because latest is less than current version id: 'registry.npmjs.org/bar/2.0.0', }, }) @@ -220,7 +222,7 @@ test('prints summary', t => { ${h1('dependencies:')} ${ADD} bar ${versionColor('2.0.0')} ${DEPRECATED} ${SUB} foo ${versionColor('0.1.0')} - ${ADD} foo ${versionColor('1.0.0')} + ${ADD} foo ${versionColor('1.0.0')} ${versionColor('(2.0.0 is available)')} ${SUB} is-13 ${versionColor('^1.0.0')} ${ADD} is-negative ${versionColor('^1.0.0')} From 8e3f6274f831261b0211a09935b0cbebae756e2c Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 13 Nov 2017 01:21:42 +0200 Subject: [PATCH 089/196] chore(release): 0.10.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 412afbaf4b..d45f375d7d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.10.1", + "version": "0.10.2", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From e6d9c73aa8d24f073c51cfcbb0d22301076e9d79 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 18 Nov 2017 15:59:36 +0200 Subject: [PATCH 090/196] feat: show package real names in summary ref https://github.com/pnpm/pnpm/issues/838 --- package.json | 2 +- shrinkwrap.yaml | 8 ++++---- src/index.ts | 6 +++++- src/pkgsDiff.ts | 2 ++ test/index.ts | 11 +++++++++++ 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d45f375d7d..cb8b6ef5df 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.7.5", + "supi": "^0.7.7", "tape": "^4.8.0", "ts-node": "^3.3.0", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 26fe02941d..effed52ae9 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -21,7 +21,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.0 rimraf: 2.6.2 - supi: 0.7.5 + supi: 0.7.7 tape: 4.8.0 ts-node: 3.3.0 tslint: 5.8.0 @@ -3361,7 +3361,7 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.7.5: + /supi/0.7.7: dependencies: '@pnpm/types': 1.0.0 '@types/byline': 4.2.31 @@ -3428,7 +3428,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-ruwD80VTUAfUTKw5Jo/RZqj17U1p8Q2ZWLzdBgrimRsw/Pe45edNVMv5kdS2wUtAjbLQj+uu/X4v29IwNelHEA== + integrity: sha512-rr+TvyCYBgE6wFSWSFt1tEw3u+D3kmgrz/1lT1IATJ3sFdkrfSGvE7z+STWendGAN9r/An2yymq1s10ykppntw== /supports-color/0.2.0: dev: true engines: @@ -3888,7 +3888,7 @@ specifiers: rimraf: ^2.5.4 semver: ^5.4.1 stacktracey: ^1.2.87 - supi: ^0.7.5 + supi: ^0.7.7 tape: ^4.8.0 ts-node: ^3.3.0 tslint: ^5.7.0 diff --git a/src/index.ts b/src/index.ts index 16d09fa1ca..083139ca03 100644 --- a/src/index.ts +++ b/src/index.ts @@ -293,7 +293,11 @@ function printDiffs(pkgsDiff: PackageDiff[]) { : pkg.linked ? linkSign : removedSign - result += ` ${pkg.name}` + if (!pkg.realName || pkg.name === pkg.realName) { + result += ` ${pkg.name}` + } else { + result += ` ${pkg.name} <- ${pkg.realName}` + } if (pkg.version) { result += ` ${chalk.grey(pkg.version)}` if (pkg.latest && semver.lt(pkg.version, pkg.latest)) { diff --git a/src/pkgsDiff.ts b/src/pkgsDiff.ts index a0725d0fcf..2bfe86f8a7 100644 --- a/src/pkgsDiff.ts +++ b/src/pkgsDiff.ts @@ -9,6 +9,7 @@ export interface PackageDiff { added: boolean, from?: string, name: string, + realName?: string, version?: string, deprecated?: boolean, latest?: string, @@ -47,6 +48,7 @@ export default (log$: xs, deprecationLog$: xs) => { deprecated: deprecationSet.has(rootLog['added'].id), latest: rootLog['added'].latest, name: rootLog['added'].name, + realName: rootLog['added'].realName, version: rootLog['added'].version, } return pkgsDiff diff --git a/test/index.ts b/test/index.ts index 44f259dd5c..5f883ad52d 100644 --- a/test/index.ts +++ b/test/index.ts @@ -200,6 +200,16 @@ test('prints summary', t => { to: '/src/project/node_modules' }, }) + rootLogger.info({ + added: { + dependencyType: 'prod', + name: 'winston', + realName: 'winst0n', + version: '1.0.0', + latest: '1.0.0', + id: 'registry.npmjs.org/winst0n/2.0.0', + }, + }) packageJsonLogger.debug({ updated: { dependencies: { @@ -225,6 +235,7 @@ test('prints summary', t => { ${ADD} foo ${versionColor('1.0.0')} ${versionColor('(2.0.0 is available)')} ${SUB} is-13 ${versionColor('^1.0.0')} ${ADD} is-negative ${versionColor('^1.0.0')} + ${ADD} winston <- winst0n ${versionColor('1.0.0')} ${h1('optionalDependencies:')} ${LINKED} is-linked ${chalk.magentaBright('linked from')} ${chalk.grey('/src/is-linked')} From b14de415b811cf965740351c5d37f0c311a66afe Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 18 Nov 2017 16:01:30 +0200 Subject: [PATCH 091/196] fix: update dependencies --- package.json | 2 +- shrinkwrap.yaml | 223 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 160 insertions(+), 65 deletions(-) diff --git a/package.json b/package.json index cb8b6ef5df..7a56da94ae 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "dependencies": { "@types/common-tags": "^1.2.5", "@types/node": "^8.0.51", - "@types/ramda": "^0.24.17", + "@types/ramda": "^0.25.6", "@types/semver": "^5.4.0", "chalk": "^2.2.0", "common-tags": "^1.4.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index effed52ae9..56772240d7 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,7 +1,7 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 8.0.51 - '@types/ramda': 0.24.18 + '@types/node': 8.0.53 + '@types/ramda': 0.25.6 '@types/semver': 5.4.0 chalk: 2.3.0 common-tags: 1.4.0 @@ -28,21 +28,21 @@ devDependencies: typescript: 2.6.1 validate-commit-msg: 2.14.0 packages: - /@pnpm/exec/1.1.1: + /@pnpm/exec/1.1.2: dependencies: '@types/got': 7.1.5 - '@types/node': 8.0.51 + '@types/node': 8.0.53 command-exists: 1.2.2 cross-spawn: 5.1.0 - got: 7.1.0 + got: 8.0.0 dev: true engines: node: '>=4' resolution: - integrity: sha512-1C2K+SXmyKqwojtk9EhLsN6sKDhLnJJfenUwkfcBBbP3ltDaIExZ8uEpCFE4cO2qK60dNgJYTF7FsPzJjYyx5w== + integrity: sha512-ZNaOAOvl9J45nhrnMcRxT9wd2G6hPzC444nRmo8Wk/GmY6dd8FVN/XG/nEdHPjcYPyyrW2UA3McNi+klB9oBHw== /@pnpm/logger/1.0.0: dependencies: - '@types/node': 8.0.51 + '@types/node': 8.0.53 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -56,22 +56,22 @@ packages: integrity: sha512-2BQ/X7qS3bCWOFR+HMQ3ZR1qU1KZNGGjfF6fvMPbYq3kZBGr5i57je4XTHADuiVRv0t6wJ4Ev+X4bw6GktbFYQ== /@types/byline/4.2.31: dependencies: - '@types/node': 8.0.51 + '@types/node': 8.0.53 dev: true resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= /@types/common-tags/1.4.0: resolution: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== - /@types/fs-extra/4.0.4: + /@types/fs-extra/4.0.5: dependencies: - '@types/node': 8.0.51 + '@types/node': 8.0.53 dev: true resolution: - integrity: sha512-u2LUBibrqjpF/AJ9trGmpIZMBQ8zjLqDHO7f25gNfNHI+/cCvFjut7u2s7Dn6tbETFBgJEjb/INRDCbTF8nJUA== + integrity: sha512-tIG0GpHum5IFb8Qze/cSv0w/0gNzHB+MUDftTQaxenx46z50g51/MPkNLssLz9+uZLzCDd35bT9qtWOTXZ21Gw== /@types/got/7.1.5: dependencies: - '@types/node': 8.0.51 + '@types/node': 8.0.53 dev: true resolution: integrity: sha512-fOby+9vGOB15+6GsNI3maUx/Ig4lW3hOH9is0OsrKRyyeJ42gk2mUn4UoRko3kXVPj44TSxDx81Th3EisXx8rg== @@ -91,30 +91,30 @@ packages: integrity: sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY= /@types/mz/0.0.31: dependencies: - '@types/node': 8.0.51 + '@types/node': 8.0.53 dev: true resolution: integrity: sha1-pNgMCC/v5x5Ap8DwfR5lVbu8e1I= /@types/mz/0.0.32: dependencies: - '@types/node': 8.0.51 + '@types/node': 8.0.53 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/7.0.46: + /@types/node/7.0.48: dev: true resolution: - integrity: sha512-u+JAi1KtmaUoU/EHJkxoiuvzyo91FCE41Z9TZWWcOUU3P8oUdlDLdrGzCGWySPgbRMD17B0B+1aaJLYI9egQ6A== - /@types/node/8.0.51: + integrity: sha512-LLlXafM3BD52MH056tHxTXO8JFCnpJJQkdzIU3+m8ew+CXJY/5zIXgDNb4TK/QFvlI8QexLS5tL+sE0Qhegr1w== + /@types/node/8.0.53: resolution: - integrity: sha512-El3+WJk2D/ppWNd2X05aiP5l2k4EwF7KwheknQZls+I26eSICoWRhRIJ56jGgw2dqNGQ5LtNajmBU2ajS28EvQ== + integrity: sha512-54Dm6NwYeiSQmRB1BLXKr5GELi0wFapR1npi8bnZhEcu84d/yQKqnwwXQ56hZ0RUbTG6L5nqDZaN3dgByQXQRQ== /@types/nopt/3.0.29: dev: true resolution: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 8.0.51 + '@types/node': 8.0.53 dev: true resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== @@ -126,18 +126,13 @@ packages: dev: true resolution: integrity: sha512-RcraK0229RAIJERTfgoCY/eSbxFEkPlj/TbUUb6aGSS9UfLj1THpt2Uj4uuCJsQrYRQUQB8tFlv7eTTWzE4QjQ== - /@types/ramda/0.24.18: - dev: false - resolution: - integrity: sha512-37umDB+zS6tK+3j0YJxsl7O8T4aYHYO6s1UpADJ/nxMHFjmuSd5XRQryC4IXX3HQ4XzstqAqhk/D+cdxwvqtEQ== /@types/ramda/0.25.3: dev: true resolution: integrity: sha512-wxs2s/qPon1Obr+0NSiBlF/6uHrFYmh+F14971ZIvpM9OUad2eMqDrPC6Cz5WZh50DNrKYz1C8dVIpWp7PVQ7w== - /@types/ramda/0.25.5: - dev: true + /@types/ramda/0.25.6: resolution: - integrity: sha512-t0fA96x1DktA/yYfiDrX7sBaMR1JVP7xkluCuSvwGLEC3fX4/QUoq3zyvIt2Hn4QS1LPmQ5NCEvCtxYtbt8BFw== + integrity: sha512-txqMN+JUsJqL8BMYgQkfll3jIIE1mgFoM+eJLnxRUOs0Q5zC+E1UB6+yGpVzYP4kmw1Ywf6F1pywkGpm2032oA== /@types/rc/0.0.1: dev: true resolution: @@ -151,7 +146,7 @@ packages: integrity: sha512-PBHCvO98hNec9A491vBbh0ZNDOVxccwKL1u2pm6fs9oDgm7SEnw0lEHqHfjsYryDxnE3zaf7LvERWEXjOp1hig== /@types/tape/4.2.31: dependencies: - '@types/node': 8.0.51 + '@types/node': 8.0.53 dev: true resolution: integrity: sha512-DEPn8FJKQR6eeMHZ407TuAqlhBKQa54PTM3c7Z6pKOI1uHaPnidmpmOXYtNZTcDrL5hnZofSHPwX1AQ9HbaMUg== @@ -463,6 +458,18 @@ packages: dev: true resolution: integrity: sha1-ya73AIprlDy+mcxhcSXrS9R4KWs= + /cacheable-request/2.1.1: + dependencies: + clone-response: 1.0.1 + get-stream: 3.0.0 + http-cache-semantics: 3.8.0 + keyv: 3.0.0 + lowercase-keys: 1.0.0 + normalize-url: 1.9.1 + responselike: 1.0.0 + dev: true + resolution: + integrity: sha1-qiBe4ofq5SCVD+w9xxxfQe5VUN0= /cachedir/1.1.1: dependencies: os-homedir: 1.0.2 @@ -525,10 +532,10 @@ packages: dev: true resolution: integrity: sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE= - /ci-info/1.1.1: + /ci-info/1.1.2: dev: true resolution: - integrity: sha512-vHDDF/bP9RYpTWtUhpJRhCFdvvp3iDWvEbuDbWgvjUrNGV1MXJrE0MPcwGtEled04m61iwdBLUIHZtDgzWS4ZQ== + integrity: sha512-uTGIPNx/nSpBdsF6xnseRXLLtfr9VLqkz8ZqHXr3Y7b6SftyRxBGjwMtJj1OhNbmlc1wZzLNAlAcvyIiE8a6ZA== /cli-cursor/1.0.2: dependencies: restore-cursor: 1.0.1 @@ -549,6 +556,12 @@ packages: dev: true resolution: integrity: sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= + /clone-response/1.0.1: + dependencies: + mimic-response: 1.0.0 + dev: true + resolution: + integrity: sha1-NezbYjX1oGSXmo7yYzJcx12m1A4= /co/4.6.0: dev: true engines: @@ -721,7 +734,7 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.0.51 + '@types/node': 8.0.53 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -865,7 +878,7 @@ packages: debug: 3.1.0 js-yaml: 3.10.0 lodash: 4.17.4 - nan: 2.7.0 + nan: 2.8.0 prebuild-install: 2.3.0 dev: true engines: @@ -1186,6 +1199,13 @@ packages: node: '>= 0.12' resolution: integrity: sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8= + /from2/2.3.0: + dependencies: + inherits: 2.0.3 + readable-stream: 2.3.3 + dev: true + resolution: + integrity: sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= /fs-exists-sync/0.1.0: dev: true engines: @@ -1353,27 +1373,31 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-jTvGuNo8qBEqFg2NSW/wRiv+948= - /got/7.1.0: + /got/8.0.0: dependencies: + cacheable-request: 2.1.1 decompress-response: 3.3.0 duplexer3: 0.1.4 get-stream: 3.0.0 + into-stream: 3.1.0 is-plain-obj: 1.1.0 is-retry-allowed: 1.1.0 is-stream: 1.1.0 isurl: 1.0.0 lowercase-keys: 1.0.0 + mimic-response: 1.0.0 p-cancelable: 0.3.0 p-timeout: 1.2.0 + pify: 3.0.0 safe-buffer: 5.1.1 timed-out: 4.0.1 - url-parse-lax: 1.0.0 + url-parse-lax: 3.0.0 url-to-options: 1.0.1 dev: true engines: node: '>=4' resolution: - integrity: sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw== + integrity: sha512-lqVA9ORcSGfJPHfMXh1RW451aYMP1NyXivpGqGggnfDqNz3QVfMl7MkuEz+dr70gK2X8dhLiS5YzHhCV3/3yOQ== /graceful-fs/4.1.11: dev: true engines: @@ -1482,6 +1506,10 @@ packages: dev: true resolution: integrity: sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg== + /http-cache-semantics/3.8.0: + dev: true + resolution: + integrity: sha512-HGQFfBdru2fj/dwPn1oLx1fy6QMPeTAD1yzKcxD4l5biw+5QVaui/ehCqxaitoKJC/vHMLKv3Yd+nTlxboOJig== /http-signature/1.2.0: dependencies: assert-plus: 1.0.0 @@ -1556,6 +1584,15 @@ packages: dev: true resolution: integrity: sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA= + /into-stream/3.1.0: + dependencies: + from2: 2.3.0 + p-is-promise: 1.1.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY= /is-arrayish/0.2.1: dev: true resolution: @@ -1586,7 +1623,7 @@ packages: integrity: sha1-hut1OSgF3cM69xySoO7fdO52BLI= /is-ci/1.0.10: dependencies: - ci-info: 1.1.1 + ci-info: 1.1.2 dev: true resolution: integrity: sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4= @@ -1670,7 +1707,7 @@ packages: dependencies: graceful-fs: 4.1.11 is-subdir: 1.0.2 - resolve-link-target: 1.0.0 + resolve-link-target: 1.0.1 dev: true resolution: integrity: sha512-YS9RSUrRbskf/O6nMF5+dvoa8zoIwF2uXnJZN1X+gCEtA1cc3KqgbOmgPjIndHfrLJ8MCRaPoG2KBPTZqhy5ug== @@ -1820,6 +1857,10 @@ packages: optional: true resolution: integrity: sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + /json-buffer/3.0.0: + dev: true + resolution: + integrity: sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= /json-parse-better-errors/1.0.1: dev: true resolution: @@ -1865,6 +1906,12 @@ packages: '0': node >=0.6.0 resolution: integrity: sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + /keyv/3.0.0: + dependencies: + json-buffer: 3.0.0 + dev: true + resolution: + integrity: sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA== /kind-of/3.2.2: dependencies: is-buffer: 1.1.6 @@ -2146,11 +2193,11 @@ packages: dev: true resolution: integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== - /nan/2.7.0: + /nan/2.8.0: dev: true optional: true resolution: - integrity: sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY= + integrity: sha1-7XFfP+neArV6XmJS2QqWZ14fCFo= /ncp/2.0.0: dev: true resolution: @@ -2245,6 +2292,17 @@ packages: dev: true resolution: integrity: sha1-Iqgwj6fNkyvbSa907KxkTPSmGWs= + /normalize-url/1.9.1: + dependencies: + object-assign: 4.1.1 + prepend-http: 1.0.4 + query-string: 4.3.4 + sort-keys: 1.1.2 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-LMDWazHqIwNkWENuNiDYWVTGbDw= /npm-package-arg/5.1.2: dependencies: hosted-git-info: 2.5.0 @@ -2478,12 +2536,12 @@ packages: integrity: sha1-mCD5lDTFgXhotPNICe5SkWYNW2w= /package-preview/1.0.0: dependencies: - '@pnpm/exec': 1.1.1 - '@types/fs-extra': 4.0.4 + '@pnpm/exec': 1.1.2 + '@types/fs-extra': 4.0.5 '@types/load-json-file': 2.0.7 '@types/meow': 3.6.2 '@types/mz': 0.0.32 - '@types/node': 8.0.51 + '@types/node': 8.0.53 '@types/write-json-file': 2.2.1 cross-spawn: 5.1.0 find-down: 0.1.4 @@ -2505,8 +2563,8 @@ packages: dependencies: '@pnpm/types': 1.0.0 '@types/load-json-file': 2.0.7 - '@types/node': 8.0.51 - '@types/ramda': 0.25.5 + '@types/node': 8.0.53 + '@types/ramda': 0.25.6 '@types/retry': 0.10.2 '@types/semver': 5.4.0 credentials-by-uri: 1.0.0 @@ -2593,7 +2651,7 @@ packages: integrity: sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0= /parse-npm-tarball-url/1.0.1: dependencies: - '@types/node': 7.0.46 + '@types/node': 7.0.48 semver-regex: 1.0.0 dev: true resolution: @@ -2718,7 +2776,7 @@ packages: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= /pnpm-shrinkwrap/5.0.0: dependencies: - '@types/node': 7.0.46 + '@types/node': 7.0.48 '@types/ramda': 0.0.11 dependency-path: 1.2.0 js-yaml: 3.10.0 @@ -2743,7 +2801,7 @@ packages: noop-logger: 0.1.1 npmlog: 4.1.2 os-homedir: 1.0.2 - pump: 1.0.2 + pump: 1.0.3 rc: 1.2.2 simple-get: 1.4.3 tar-fs: 1.16.0 @@ -2759,6 +2817,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= + /prepend-http/2.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= /preserve/0.2.0: dev: true engines: @@ -2805,18 +2869,18 @@ packages: dev: true resolution: integrity: sha1-8FKijacOYYkX7wqKw0wa5aaChrM= - /pump/1.0.2: + /pump/1.0.3: dependencies: end-of-stream: 1.4.0 once: 1.4.0 dev: true resolution: - integrity: sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE= + integrity: sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw== /pumpify/1.3.5: dependencies: duplexify: 3.5.1 inherits: 2.0.3 - pump: 1.0.2 + pump: 1.0.3 dev: true resolution: integrity: sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs= @@ -2830,6 +2894,15 @@ packages: node: '>=0.6' resolution: integrity: sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A== + /query-string/4.3.4: + dependencies: + object-assign: 4.1.1 + strict-uri-encode: 1.1.0 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-u7aTucqRXCMlFbIosaArYJBD2+s= /ramda/0.24.1: dev: true resolution: @@ -2930,7 +3003,7 @@ packages: is-subdir: 1.0.2 mz: 2.7.0 p-filter: 1.0.0 - resolve-link-target: 1.0.0 + resolve-link-target: 1.0.1 rimraf-then: 1.0.1 dev: true resolution: @@ -3012,12 +3085,14 @@ packages: node: '>=4' resolution: integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - /resolve-link-target/1.0.0: + /resolve-link-target/1.0.1: dependencies: graceful-fs: 4.1.11 dev: true + engines: + node: '>=4' resolution: - integrity: sha512-vCHlxVruR67GgAeTSxpMPMmJ+7oO9oGCPA5r0NEyqOcZP+lTwyMcaxhqMHs+b90tT+NTVKBaYjsc5cEgecULIw== + integrity: sha512-uid343+whX+g+LLUzwCYaZBOZPX8Hi3Y7qZBr0r1Rvb0y6WMWVLT32uuGllxD5uNQR+mddUE/Dx/wwvgGrZLSA== /resolve/1.4.0: dependencies: path-parse: 1.0.5 @@ -3030,6 +3105,12 @@ packages: dev: true resolution: integrity: sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw== + /responselike/1.0.0: + dependencies: + lowercase-keys: 1.0.0 + dev: true + resolution: + integrity: sha512-lBZecxOwpiohz05HLwKmE8tSTNta9RnpSaSM/n52gTGnFfzxg/Ffh2PpmQGl/stsQYyq5Noymvj+Ctwqemjuig== /restore-cursor/1.0.1: dependencies: exit-hook: 1.1.1 @@ -3163,6 +3244,14 @@ packages: node: '>=4.0.0' resolution: integrity: sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg== + /sort-keys/1.1.2: + dependencies: + is-plain-obj: 1.1.0 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-RBttTTRnmPG05J6JIK37oOVD+a0= /sort-keys/2.0.0: dependencies: is-plain-obj: 1.1.0 @@ -3266,6 +3355,12 @@ packages: dev: true resolution: integrity: sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= + /strict-uri-encode/1.1.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= /string-width/1.0.2: dependencies: code-point-at: 1.1.0 @@ -3368,7 +3463,7 @@ packages: '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 8.0.51 + '@types/node': 8.0.53 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 @@ -3457,7 +3552,7 @@ packages: /symlink-dir/1.1.0: dependencies: '@types/mz': 0.0.31 - '@types/node': 8.0.51 + '@types/node': 8.0.53 graceful-fs: 4.1.11 is-windows: 1.0.1 mkdirp-promise: 5.0.1 @@ -3499,12 +3594,12 @@ packages: dependencies: chownr: 1.0.1 mkdirp: 0.5.1 - pump: 1.0.2 - tar-stream: 1.5.4 + pump: 1.0.3 + tar-stream: 1.5.5 dev: true resolution: integrity: sha512-I9rb6v7mjWLtOfCau9eH5L7sLJyU2BnxtEZRQ5Mt+eRKmf1F0ohXmT/Jc3fr52kDvjJ/HV5MH3soQfPL5bQ0Yg== - /tar-stream/1.5.4: + /tar-stream/1.5.5: dependencies: bl: 1.2.1 end-of-stream: 1.4.0 @@ -3514,7 +3609,7 @@ packages: engines: node: '>= 0.8.0' resolution: - integrity: sha1-NlSc8E7RrumyowwBQyUiONr5QBY= + integrity: sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg== /tar/2.2.1: dependencies: block-stream: 0.0.9 @@ -3679,7 +3774,7 @@ packages: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= /unpack-stream/2.1.1: dependencies: - '@types/node': 8.0.51 + '@types/node': 8.0.53 decompress-maybe: 1.0.0 ssri: 4.1.6 tar-fs: 1.16.0 @@ -3695,14 +3790,14 @@ packages: optional: true resolution: integrity: sha1-uYTwh3/AqJwsdzzB73tbIytbBv4= - /url-parse-lax/1.0.0: + /url-parse-lax/3.0.0: dependencies: - prepend-http: 1.0.4 + prepend-http: 2.0.0 dev: true engines: - node: '>=0.10.0' + node: '>=4' resolution: - integrity: sha1-evjzA2Rem9eaJy56FKxovAYJ2nM= + integrity: sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= /url-to-options/1.0.1: dev: true engines: @@ -3871,7 +3966,7 @@ specifiers: '@pnpm/logger': ^1.0.0 '@types/common-tags': ^1.2.5 '@types/node': ^8.0.51 - '@types/ramda': ^0.24.17 + '@types/ramda': ^0.25.6 '@types/semver': ^5.4.0 '@types/tape': ^4.2.30 chalk: ^2.2.0 From 4801107ce8ddfbf52a87552d84ebb45bb1f618b9 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 18 Nov 2017 16:02:08 +0200 Subject: [PATCH 092/196] chore(release): 0.10.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7a56da94ae..bde30e65be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.10.2", + "version": "0.10.3", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From df3b516eedbc1d0626f0f284a2b688b52e993d1a Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 18 Dec 2017 21:42:07 +0200 Subject: [PATCH 093/196] chore: update dependencies --- package.json | 4 +- shrinkwrap.yaml | 1075 ++++++++++++++++++++++++++++++----------------- 2 files changed, 695 insertions(+), 384 deletions(-) diff --git a/package.json b/package.json index bde30e65be..1ee533763f 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "scripts": { "lint": "tslint -c tslint.json --project .", "pretty-test": "ts-node test | tap-diff", - "test": "npm run lint && npm run tsc && preview && ts-node test", + "test": "npm run lint && npm run tsc && preview && ts-node test --type-check", "tsc": "rimraf lib && tsc", "prepublishOnly": "npm run tsc" }, @@ -65,7 +65,7 @@ "rimraf": "^2.5.4", "supi": "^0.7.7", "tape": "^4.8.0", - "ts-node": "^3.3.0", + "ts-node": "^4.0.2", "tslint": "^5.7.0", "typescript": "^2.1.5", "validate-commit-msg": "^2.8.2" diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 56772240d7..155752d20c 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,48 +1,108 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 8.0.53 - '@types/ramda': 0.25.6 + '@types/node': 8.5.1 + '@types/ramda': 0.25.8 '@types/semver': 5.4.0 chalk: 2.3.0 - common-tags: 1.4.0 + common-tags: 1.5.1 log-update: 2.3.0 ndjson: 1.5.0 pretty-bytes: 4.0.2 ramda: 0.25.0 semver: 5.4.1 stacktracey: 1.2.87 - xstream: 11.0.0 + xstream: 11.1.0 devDependencies: '@pnpm/logger': 1.0.0 '@types/tape': 4.2.31 commitizen: 2.9.6 - ghooks: 2.0.0 + ghooks: 2.0.2 mos-tap-diff: 1.0.0 normalize-newline: 3.0.0 - package-preview: 1.0.0 + package-preview: 1.0.3 rimraf: 2.6.2 - supi: 0.7.7 + supi: 0.7.12 tape: 4.8.0 - ts-node: 3.3.0 + ts-node: 4.0.2 tslint: 5.8.0 - typescript: 2.6.1 + typescript: 2.6.2 validate-commit-msg: 2.14.0 packages: + /@pnpm/default-fetcher/0.3.0: + dependencies: + '@pnpm/git-fetcher': 0.2.0 + '@pnpm/tarball-fetcher': 0.3.1 + '@pnpm/types': 1.3.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-cgpFi6f0uJBhti7qqCO3uK7sw5tnOp6d4RfCRCDTEUqoWmOp7NwzflguSPnuPgD/sNrTCnj0SlGYnwEQlMhGOg== + /@pnpm/default-resolver/0.1.0: + dependencies: + '@pnpm/git-resolver': 0.3.0 + '@pnpm/local-resolver': 0.1.0 + '@pnpm/npm-resolver': 0.3.1 + '@pnpm/tarball-resolver': 0.1.0 + '@pnpm/types': 1.3.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-NeZBprWXvAM58LaHOhD8KrpjieW97SK+hWm4whmXjlsYDW3nNFAVvYUEz4E8vt3Y2LqCvux4G7xRAeSFYHqDhg== /@pnpm/exec/1.1.2: dependencies: - '@types/got': 7.1.5 - '@types/node': 8.0.53 + '@types/got': 7.1.6 + '@types/node': 8.5.1 command-exists: 1.2.2 cross-spawn: 5.1.0 - got: 8.0.0 + got: 8.0.1 dev: true engines: node: '>=4' resolution: integrity: sha512-ZNaOAOvl9J45nhrnMcRxT9wd2G6hPzC444nRmo8Wk/GmY6dd8FVN/XG/nEdHPjcYPyyrW2UA3McNi+klB9oBHw== + /@pnpm/git-fetcher/0.2.0: + dependencies: + '@types/node': 8.5.1 + dint: 2.0.0 + execa: 0.8.0 + rimraf-then: 1.0.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-IhFB0gZO38sf7hZAsIDuTcV3mtYggK20MHQjnPk0klCIMmJPpDlWQOQVOpmDTvXWrTl79bmjjvkwwfL/P7fUlQ== + /@pnpm/git-resolver/0.3.0: + dependencies: + '@types/node': 8.5.1 + got: 8.0.1 + graceful-git: 1.0.1 + hosted-git-info: 2.5.0 + normalize-ssh: 1.0.0 + dev: true + engines: + node: '>=4' + peerDependencies: + '@pnpm/logger': ^1.0.0 + resolution: + integrity: sha512-HBt5ySfGqXOKLk+mn9JVDJOmhc2sv9wZiOwgnX494Y0aYwf27lDjjJm5wbscsglMBnKpnybveWnc+6a/B08E+w== + /@pnpm/local-resolver/0.1.0: + dependencies: + '@pnpm/types': 1.3.0 + '@types/node': 8.5.1 + normalize-path: 2.1.1 + osenv: 0.1.4 + read-package-json: 2.0.12 + util.promisify: 1.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-CLtqpLDq06PLDMy8D1TJ+RW5gw7dXCcnN5wWkE29J5w8e025PKFKJEH8+dvr+zJCVTb2YHyk+Y+IwtOP6uMIIw== /@pnpm/logger/1.0.0: dependencies: - '@types/node': 8.0.53 + '@types/node': 8.5.1 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -50,74 +110,153 @@ packages: node: '>=4' resolution: integrity: sha512-VRqE5/SiuR7ZrwBmS+Af89BTXli5xBbiqu7WPq56gEtWT8dKf9rFLoimmmMBVeRq5LmVZIXlOxs29F9I+vgSvQ== - /@pnpm/types/1.0.0: + /@pnpm/npm-resolver/0.3.1: + dependencies: + '@pnpm/types': 1.3.0 + '@types/load-json-file': 2.0.7 + '@types/mem': 1.1.2 + '@types/node': 8.5.1 + '@types/semver': 5.4.0 + '@types/write-json-file': 2.2.1 + credentials-by-uri: 1.0.0 + encode-registry: 1.1.0 + fetch-from-npm-registry: 0.1.0 + load-json-file: 4.0.0 + mem: 3.0.0 + p-limit: 1.1.0 + semver: 5.4.1 + ssri: 5.0.0 + write-json-file: 2.3.0 + dev: true + engines: + node: '>=4' + peerDependencies: + '@pnpm/logger': ^1.0.0 + resolution: + integrity: sha512-9Ln3phdOdq0is/iVsqPQdB/JV9qtEi4Dq9kTMzHA1R898bSEsk8G3aSqbNFz6skTVYAuLMyiAdrVtJJ8FqJsgQ== + /@pnpm/package-requester/0.2.0: + dependencies: + '@pnpm/types': 1.3.0 + '@types/load-json-file': 2.0.7 + '@types/mz': 0.0.32 + '@types/p-queue': 1.1.0 + '@types/write-json-file': 2.2.1 + load-json-file: 4.0.0 + mkdirp-promise: 5.0.1 + mz: 2.7.0 + p-limit: 1.1.0 + p-queue: 2.3.0 + package-store: 0.10.1 + path-exists: 3.0.0 + read-package-json: 2.0.12 + rename-overwrite: 1.0.0 + rimraf-then: 1.0.1 + symlink-dir: 1.1.1 + unpack-stream: 2.2.0 + util.promisify: 1.0.0 + write-json-file: 2.3.0 + dev: true + engines: + node: '>=4' + peerDependencies: + '@pnpm/logger': ^1.0.0 + resolution: + integrity: sha512-boW7hvZzg/Od8+1OAP23Tsqk8bWvt8C28am5XcSIiEnfUZk20wk4fsfa9HePA7RopX17dy7Hs7bs5lfAUnhBLg== + /@pnpm/tarball-fetcher/0.3.1: + dependencies: + '@types/mem': 1.1.2 + '@types/mz': 0.0.32 + '@types/node': 8.5.1 + '@types/retry': 0.10.2 + credentials-by-uri: 1.0.0 + fetch-from-npm-registry: 0.1.0 + fs-write-stream-atomic: 1.0.10 + graceful-fs: 4.1.11 + mem: 3.0.0 + mkdirp-promise: 5.0.1 + mz: 2.7.0 + retry: 0.10.1 + ssri: 5.0.0 + unpack-stream: 3.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-gnh1si28RSaPqiaMKF7dlIOcrVrJOfjb7oIc9OPeIPE/1A5bxrEYpwU8G8c8pt3ELdgDGTQ35k6N1ioBFbuLPQ== + /@pnpm/tarball-resolver/0.1.0: + dependencies: + parse-npm-tarball-url: 1.0.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-Ieeu9Gg5qZkUdgnsHkjFlqr1Gp2z0LegDnCKe7l4l2klnH5Yp2fjqegfkebpM7Qut9YYe+aFsXFWxSCUk13Z8g== + /@pnpm/types/1.3.0: dev: true resolution: - integrity: sha512-2BQ/X7qS3bCWOFR+HMQ3ZR1qU1KZNGGjfF6fvMPbYq3kZBGr5i57je4XTHADuiVRv0t6wJ4Ev+X4bw6GktbFYQ== + integrity: sha512-dhW0tHPWT19r1lwgv2RMnt31oC6PcsNeGcUlIDYRmC+J7g7Rcm19tZ0xmIAqh9R+U2Uw3PecXsuz+jkC/r5h+A== + /@sindresorhus/is/0.6.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-OD9Faya8lseInwMyB59DWLFsWNw= /@types/byline/4.2.31: dependencies: - '@types/node': 8.0.53 + '@types/node': 8.5.1 dev: true resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= /@types/common-tags/1.4.0: resolution: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== - /@types/fs-extra/4.0.5: + /@types/fs-extra/4.0.7: dependencies: - '@types/node': 8.0.53 + '@types/node': 8.5.1 dev: true resolution: - integrity: sha512-tIG0GpHum5IFb8Qze/cSv0w/0gNzHB+MUDftTQaxenx46z50g51/MPkNLssLz9+uZLzCDd35bT9qtWOTXZ21Gw== - /@types/got/7.1.5: + integrity: sha512-BN48b/2F3kL0Ual7tjcHjj0Fl+nuYKtHa0G/xT3Q43HuCpN7rQD5vIx6Aqnl9x10oBI5xMJh8Ly+FQpP205JlA== + /@types/got/7.1.6: dependencies: - '@types/node': 8.0.53 + '@types/node': 8.5.1 dev: true resolution: - integrity: sha512-fOby+9vGOB15+6GsNI3maUx/Ig4lW3hOH9is0OsrKRyyeJ42gk2mUn4UoRko3kXVPj44TSxDx81Th3EisXx8rg== + integrity: sha512-MTgskaiThy9e07/V/gWj1PY3FWsfghgFQVgSLgEV+k7r+rTxvfKNDDNjIcFV/aDhDBCpUEaqdHAeaxjM9uaSKA== /@types/load-json-file/2.0.7: dev: true resolution: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== - /@types/meow/3.6.2: - dependencies: - '@types/minimist': 1.2.0 + /@types/mem/1.1.2: dev: true resolution: - integrity: sha1-0Thn+X2LJYIA4U9Zxu0H8Is0KA4= - /@types/minimist/1.2.0: - dev: true - resolution: - integrity: sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY= - /@types/mz/0.0.31: - dependencies: - '@types/node': 8.0.53 - dev: true - resolution: - integrity: sha1-pNgMCC/v5x5Ap8DwfR5lVbu8e1I= + integrity: sha1-48iwlfLyVjtRjwqtWd+f5qi4IGU= /@types/mz/0.0.32: dependencies: - '@types/node': 8.0.53 + '@types/node': 8.5.1 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/7.0.48: + /@types/node/7.0.50: dev: true resolution: - integrity: sha512-LLlXafM3BD52MH056tHxTXO8JFCnpJJQkdzIU3+m8ew+CXJY/5zIXgDNb4TK/QFvlI8QexLS5tL+sE0Qhegr1w== - /@types/node/8.0.53: + integrity: sha512-qtsQLhgNcooncOfFWpATbOI5Gw8chr5LQDmIbHBX9Nry1VThPid0jCMpsW8JTK27M11/nTTaKd74VYCxZRIGUg== + /@types/node/8.5.1: resolution: - integrity: sha512-54Dm6NwYeiSQmRB1BLXKr5GELi0wFapR1npi8bnZhEcu84d/yQKqnwwXQ56hZ0RUbTG6L5nqDZaN3dgByQXQRQ== + integrity: sha512-SrmAO+NhnsuG/6TychSl2VdxBZiw/d6V+8j+DFo8O3PwFi+QeYXWHhAw+b170aSc6zYab6/PjEWRZHIDN9mNUw== /@types/nopt/3.0.29: dev: true resolution: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 8.0.53 + '@types/node': 8.5.1 dev: true resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== + /@types/p-queue/1.1.0: + dev: true + resolution: + integrity: sha512-lLevmLuKQ9uquorlb+XUp+tmmVzbFF/p03vgiBdtgiKoAoWAuIrNcn9Fs/rpUZgSywfu9cl4lb93H8xO2sOAUA== /@types/p-series/1.0.1: dev: true resolution: @@ -130,9 +269,9 @@ packages: dev: true resolution: integrity: sha512-wxs2s/qPon1Obr+0NSiBlF/6uHrFYmh+F14971ZIvpM9OUad2eMqDrPC6Cz5WZh50DNrKYz1C8dVIpWp7PVQ7w== - /@types/ramda/0.25.6: + /@types/ramda/0.25.8: resolution: - integrity: sha512-txqMN+JUsJqL8BMYgQkfll3jIIE1mgFoM+eJLnxRUOs0Q5zC+E1UB6+yGpVzYP4kmw1Ywf6F1pywkGpm2032oA== + integrity: sha512-xLU94I8bn8pBAKdntp67DgSfvyHYqMjzSbUguScMywqKbrthrfsJcZX8hpp1Ih29cvUWWm26cdYtV5A+eF0QFQ== /@types/rc/0.0.1: dev: true resolution: @@ -144,9 +283,17 @@ packages: /@types/semver/5.4.0: resolution: integrity: sha512-PBHCvO98hNec9A491vBbh0ZNDOVxccwKL1u2pm6fs9oDgm7SEnw0lEHqHfjsYryDxnE3zaf7LvERWEXjOp1hig== + /@types/strip-bom/3.0.0: + dev: true + resolution: + integrity: sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I= + /@types/strip-json-comments/0.0.30: + dev: true + resolution: + integrity: sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ== /@types/tape/4.2.31: dependencies: - '@types/node': 8.0.53 + '@types/node': 8.5.1 dev: true resolution: integrity: sha512-DEPn8FJKQR6eeMHZ407TuAqlhBKQa54PTM3c7Z6pKOI1uHaPnidmpmOXYtNZTcDrL5hnZofSHPwX1AQ9HbaMUg== @@ -181,11 +328,36 @@ packages: dev: true resolution: integrity: sha512-j1OJrYOACRfIHESTnvCBUg8WkVr7nHjkF/0A64qD/kabVulXJYGxu27w6Z9wrJHGQchePPCR31xJWOta4uVqxw== + /@zkochan/npm-package-arg/1.0.0: + dependencies: + hosted-git-info: 2.5.0 + osenv: 0.1.4 + semver: 5.4.1 + validate-npm-package-name: 3.0.0 + dev: true + resolution: + integrity: sha512-ufMBw0x+4y7uaiPu1uhwMaHaysLB57+EJoo63DGf28FG+TIrYiIIE886qSNXuDqyhqt+PVsRLB9e8+QVGe+Dtg== /abbrev/1.1.1: dev: true resolution: integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - /ajv/5.3.0: + /agent-base/4.1.2: + dependencies: + es6-promisify: 5.0.0 + dev: true + engines: + node: '>= 4.0.0' + resolution: + integrity: sha512-VE6QoEdaugY86BohRtfGmTDabxdU5sCKOkbcPA6PXKJsRzEi/7A3RCTxJal1ft/4qSfPht5/iQLhMh/wzSkkNw== + /agentkeepalive/3.3.0: + dependencies: + humanize-ms: 1.2.1 + dev: true + engines: + node: '>= 4.0.0' + resolution: + integrity: sha512-9yhcpXti2ZQE7bxuCsjjWNIZoQOd9sZ1ZBovHG0YeCRohFv73SLvcm73PC9T3olM4GyozaQb+4MGdQpcD8m7NQ== + /ajv/5.5.2: dependencies: co: 4.6.0 fast-deep-equal: 1.0.0 @@ -193,7 +365,7 @@ packages: json-schema-traverse: 0.3.1 dev: true resolution: - integrity: sha1-RBT/dKUIecII7l/cgm4ywwNUnto= + integrity: sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU= /ansi-escapes/1.4.0: dev: true engines: @@ -334,8 +506,8 @@ packages: integrity: sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= /babel-runtime/6.26.0: dependencies: - core-js: 2.5.1 - regenerator-runtime: 0.11.0 + core-js: 2.5.3 + regenerator-runtime: 0.11.1 resolution: integrity: sha1-llxwWGaOgrVde/4E/yM3vItWR/4= /balanced-match/1.0.0: @@ -458,39 +630,58 @@ packages: dev: true resolution: integrity: sha1-ya73AIprlDy+mcxhcSXrS9R4KWs= - /cacheable-request/2.1.1: + /cacache/10.0.1: dependencies: - clone-response: 1.0.1 - get-stream: 3.0.0 - http-cache-semantics: 3.8.0 - keyv: 3.0.0 - lowercase-keys: 1.0.0 - normalize-url: 1.9.1 - responselike: 1.0.0 + bluebird: 3.5.1 + chownr: 1.0.1 + glob: 7.1.2 + graceful-fs: 4.1.11 + lru-cache: 4.1.1 + mississippi: 1.3.0 + mkdirp: 0.5.1 + move-concurrently: 1.0.1 + promise-inflight: 1.0.1 + rimraf: 2.6.2 + ssri: 5.0.0 + unique-filename: 1.1.0 + y18n: 3.2.1 dev: true resolution: - integrity: sha1-qiBe4ofq5SCVD+w9xxxfQe5VUN0= + integrity: sha512-dRHYcs9LvG9cHgdPzjiI+/eS7e1xRhULrcyOx04RZQsszNJXU2SL9CyG60yLnge282Qq5nwTv+ieK2fH+WPZmA== + /cacheable-request/2.1.3: + dependencies: + clone-response: 1.0.2 + get-stream: 3.0.0 + http-cache-semantics: 3.8.1 + keyv: 3.0.0 + lowercase-keys: 1.0.0 + normalize-url: 2.0.0 + responselike: 1.0.2 + dev: true + resolution: + integrity: sha1-uTVgfdKrKBKJi++yJPZqqGxTPbs= /cachedir/1.1.1: dependencies: os-homedir: 1.0.2 dev: true resolution: integrity: sha1-4TYwdeogahJ2fZK7cRyKL3ahD2I= - /camelcase-keys/2.1.0: + /camelcase-keys/4.2.0: dependencies: - camelcase: 2.1.1 - map-obj: 1.0.1 + camelcase: 4.1.0 + map-obj: 2.0.0 + quick-lru: 1.1.0 dev: true engines: - node: '>=0.10.0' + node: '>=4' resolution: - integrity: sha1-MIvur/3ygRkFHvodkyITyRuPkuc= - /camelcase/2.1.1: + integrity: sha1-oqpfsa9oh1glnDLBQUJteJI7m3c= + /camelcase/4.1.0: dev: true engines: - node: '>=0.10.0' + node: '>=4' resolution: - integrity: sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= + integrity: sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= /caseless/0.12.0: dev: true resolution: @@ -556,12 +747,12 @@ packages: dev: true resolution: integrity: sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= - /clone-response/1.0.1: + /clone-response/1.0.2: dependencies: mimic-response: 1.0.0 dev: true resolution: - integrity: sha1-NezbYjX1oGSXmo7yYzJcx12m1A4= + integrity: sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= /co/4.6.0: dev: true engines: @@ -607,10 +798,10 @@ packages: node: '>= 0.6.x' resolution: integrity: sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E= - /commander/2.11.0: + /commander/2.12.2: dev: true resolution: - integrity: sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ== + integrity: sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA== /commander/2.9.0: dependencies: graceful-readlink: 1.0.1 @@ -641,13 +832,13 @@ packages: node: '>= 0.12' resolution: integrity: sha1-wNAFNe8mTaf2Nzft/aQiiYP6IpE= - /common-tags/1.4.0: + /common-tags/1.5.1: dependencies: babel-runtime: 6.26.0 engines: node: '>=4.0.0' resolution: - integrity: sha1-EYe+Tz1M8MBCfUP3Tu8fc1AWFMA= + integrity: sha512-NrUYGY5TApAk9KB+IZXkR3GR4tA3g26HDsoiGt4kCMHZ727gOGkC+UNfq0Z22jE15bLkc/6RV5Jw1RBW6Usg6A== /concat-map/0.0.1: dev: true resolution: @@ -670,9 +861,20 @@ packages: dev: true resolution: integrity: sha1-XblXOdbCEqy+e29lahG5QLqmiUY= - /core-js/2.5.1: + /copy-concurrently/1.0.5: + dependencies: + aproba: 1.2.0 + fs-write-stream-atomic: 1.0.10 + iferr: 0.1.5 + mkdirp: 0.5.1 + rimraf: 2.6.2 + run-queue: 1.0.3 + dev: true resolution: - integrity: sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs= + integrity: sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== + /core-js/2.5.3: + resolution: + integrity: sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4= /core-util-is/1.0.2: resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= @@ -682,13 +884,6 @@ packages: dev: true resolution: integrity: sha512-WtoZkGQV2KgEfEqWKPetJ2btv+GxldzOe2vHVqAcyuiYdpIwCX7viL2+P9EaZLLfR+SFAZgPdP1+HZJ7MqRc2A== - /cross-spawn-async/2.2.5: - dependencies: - lru-cache: 4.1.1 - which: 1.3.0 - dev: true - resolution: - integrity: sha1-hF/wwINKPe2dFg2sptOQkGuyiMw= /cross-spawn/5.1.0: dependencies: lru-cache: 4.1.1 @@ -713,6 +908,10 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-mI3zP+qxke95mmE2nddsF635V+o= + /cyclist/0.2.2: + dev: true + resolution: + integrity: sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA= /cz-conventional-changelog/1.2.0: dependencies: conventional-commit-types: 2.2.0 @@ -734,23 +933,43 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.0.53 + '@types/node': 8.5.1 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== + /debug/2.6.9: + dependencies: + ms: 2.0.0 + dev: true + resolution: + integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== /debug/3.1.0: dependencies: ms: 2.0.0 dev: true - optional: true resolution: integrity: sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== + /decamelize-keys/1.1.0: + dependencies: + decamelize: 1.2.0 + map-obj: 1.0.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= /decamelize/1.2.0: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + /decode-uri-component/0.2.0: + dev: true + engines: + node: '>=0.10' + resolution: + integrity: sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= /decompress-maybe/1.0.0: dependencies: bzip2-maybe: 1.0.0 @@ -848,17 +1067,18 @@ packages: node: '>=0.3.1' resolution: integrity: sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA== - /dint/1.0.0: + /dint/2.0.0: dependencies: - bluebird: 3.5.1 graceful-fs: 4.1.11 + mz: 2.7.0 p-every: 1.0.2 - ssri: 4.1.6 + p-limit: 1.1.0 + ssri: 5.0.0 dev: true engines: node: '>=4' resolution: - integrity: sha1-S/7IGLOmVysyi96o0FHM1d5YDEQ= + integrity: sha512-lxYQEEebR4G/uGaubo5TBi9H6FJGSR8zJGyt5AhFHbmWyH73e+EenuntCytzKcDpPl2K2v2slXUTY9Ch39kKRQ== /drive-by-path/1.0.0: dependencies: is-subdir: 1.0.2 @@ -879,7 +1099,7 @@ packages: js-yaml: 3.10.0 lodash: 4.17.4 nan: 2.8.0 - prebuild-install: 2.3.0 + prebuild-install: 2.4.1 dev: true engines: node: '>=4' @@ -918,19 +1138,29 @@ packages: node: '>=4' resolution: integrity: sha512-we1k9/KE1067YXEyJzPg+kXlNFLk9/LT2IFP3VZgmANNwf8Bx+KdAVd1wxLpG8y7v6EgplVGTstmVNICwiaCNA== + /encoding/0.1.12: + dependencies: + iconv-lite: 0.4.19 + dev: true + resolution: + integrity: sha1-U4tm8+5izRq1HsMjgp0flIDHS+s= /end-of-stream/1.4.0: dependencies: once: 1.4.0 dev: true resolution: integrity: sha1-epDYM+/abPpurA9JSduw+tOmMgY= + /err-code/1.1.2: + dev: true + resolution: + integrity: sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= /error-ex/1.3.1: dependencies: is-arrayish: 0.2.1 dev: true resolution: integrity: sha1-+FWobOYa3E6GIcPNoh56dhLDqNw= - /es-abstract/1.9.0: + /es-abstract/1.10.0: dependencies: es-to-primitive: 1.1.1 function-bind: 1.1.1 @@ -941,7 +1171,7 @@ packages: engines: node: '>= 0.4' resolution: - integrity: sha512-kk3IJoKo7A3pWJc0OV8yZ/VEX2oSUytfekrJiqoxBlKJMFAJVJVpGdHClCCTdv+Fn2zHfpDHHIelMFhZVfef3Q== + integrity: sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ== /es-to-primitive/1.1.1: dependencies: is-callable: 1.1.3 @@ -952,6 +1182,16 @@ packages: node: '>= 0.4' resolution: integrity: sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0= + /es6-promise/4.1.1: + dev: true + resolution: + integrity: sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng== + /es6-promisify/5.0.0: + dependencies: + es6-promise: 4.1.1 + dev: true + resolution: + integrity: sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= /escape-string-regexp/1.0.5: engines: node: '>=0.8.0' @@ -973,19 +1213,6 @@ packages: dev: true resolution: integrity: sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y= - /execa/0.4.0: - dependencies: - cross-spawn-async: 2.2.5 - is-stream: 1.1.0 - npm-run-path: 1.0.0 - object-assign: 4.1.1 - path-key: 1.0.0 - strip-eof: 1.0.0 - dev: true - engines: - node: '>=0.12' - resolution: - integrity: sha1-TrZGejaglfq7KXD/nV4/t7zm68M= /execa/0.8.0: dependencies: cross-spawn: 5.1.0 @@ -1061,6 +1288,12 @@ packages: '0': node >=0.6.0 resolution: integrity: sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + /extsprintf/1.4.0: + dev: true + engines: + '0': node >=0.6.0 + resolution: + integrity: sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= /fast-deep-equal/1.0.0: dev: true resolution: @@ -1073,6 +1306,15 @@ packages: dev: true resolution: integrity: sha1-oB6c2cnkkXFcmKdaQtXwu9EH/3Y= + /fetch-from-npm-registry/0.1.0: + dependencies: + '@types/node': 8.5.1 + make-fetch-happen: 2.6.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-D6EKeLiF2gzSubC+kgS/LI8zEXfY9yRLIHxElV16yQ4zvC6LX91mJ3JrBbxce7oP82kheYMpNKX+iVhSuEdiRA== /figures/1.7.0: dependencies: escape-string-regexp: 1.0.5 @@ -1124,15 +1366,6 @@ packages: dev: true resolution: integrity: sha1-li/yEaqyXGUg/u641ih/j26VgHo= - /find-up/1.1.2: - dependencies: - path-exists: 2.1.0 - pinkie-promise: 2.0.1 - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8= /find-up/2.1.0: dependencies: locate-path: 2.0.0 @@ -1161,6 +1394,13 @@ packages: node: '>=0.6' resolution: integrity: sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs= + /flush-write-stream/1.0.2: + dependencies: + inherits: 2.0.3 + readable-stream: 2.3.3 + dev: true + resolution: + integrity: sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc= /for-each/0.3.2: dependencies: is-function: 1.0.1 @@ -1220,14 +1460,14 @@ packages: dev: true resolution: integrity: sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA= - /fs-extra/4.0.2: + /fs-extra/5.0.0: dependencies: graceful-fs: 4.1.11 jsonfile: 4.0.0 universalify: 0.1.1 dev: true resolution: - integrity: sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s= + integrity: sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ== /fs-write-stream-atomic/1.0.10: dependencies: graceful-fs: 4.1.11 @@ -1280,12 +1520,6 @@ packages: dev: false resolution: integrity: sha1-iY3Me1WSrboC6LuCuNLNpgza5cU= - /get-stdin/4.0.1: - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= /get-stream/3.0.0: dev: true engines: @@ -1298,19 +1532,17 @@ packages: dev: true resolution: integrity: sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - /ghooks/2.0.0: + /ghooks/2.0.2: dependencies: - execa: 0.4.0 findup: 0.1.5 - lodash.clone: 4.3.2 + lodash.clone: 4.5.0 manage-path: 2.0.0 opt-cli: 1.5.1 - path-exists: 2.1.0 + path-exists: 3.0.0 spawn-command: 0.0.2 - deprecated: 'Use npmjs.com/husky instead, see https://github.com/gtramontina/ghooks/issues/166' dev: true resolution: - integrity: sha1-r/2Do26Lj73e2bhRRXxIrHTI6rg= + integrity: sha1-sBruUk651u5zOe/CnNqVRRnxJVY= /github-from-package/0.0.0: dev: true optional: true @@ -1365,7 +1597,7 @@ packages: /global-prefix/0.1.5: dependencies: homedir-polyfill: 1.0.1 - ini: 1.3.4 + ini: 1.3.5 is-windows: 0.2.0 which: 1.3.0 dev: true @@ -1373,21 +1605,20 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-jTvGuNo8qBEqFg2NSW/wRiv+948= - /got/8.0.0: + /got/8.0.1: dependencies: - cacheable-request: 2.1.1 + '@sindresorhus/is': 0.6.0 + cacheable-request: 2.1.3 decompress-response: 3.3.0 duplexer3: 0.1.4 get-stream: 3.0.0 into-stream: 3.1.0 - is-plain-obj: 1.1.0 is-retry-allowed: 1.1.0 - is-stream: 1.1.0 isurl: 1.0.0 lowercase-keys: 1.0.0 mimic-response: 1.0.0 p-cancelable: 0.3.0 - p-timeout: 1.2.0 + p-timeout: 2.0.1 pify: 3.0.0 safe-buffer: 5.1.1 timed-out: 4.0.1 @@ -1397,13 +1628,22 @@ packages: engines: node: '>=4' resolution: - integrity: sha512-lqVA9ORcSGfJPHfMXh1RW451aYMP1NyXivpGqGggnfDqNz3QVfMl7MkuEz+dr70gK2X8dhLiS5YzHhCV3/3yOQ== + integrity: sha1-bX+Ls+uZ5a+RLv4moQRHZEHgjn8= /graceful-fs/4.1.11: dev: true engines: node: '>=0.4.0' resolution: integrity: sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg= + /graceful-git/1.0.1: + dependencies: + execa: 0.8.0 + retry: 0.10.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-tw+EeUeL5p8b312uJq6+Z6ld8M/rlkMSM7e3oGiRsfdDH3nH5I2u2aIhO5Sy6LWojzU92JTrZKP6T3D9YT6pwg== /graceful-readlink/1.0.1: dev: true resolution: @@ -1427,7 +1667,7 @@ packages: integrity: sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= /har-validator/5.0.3: dependencies: - ajv: 5.3.0 + ajv: 5.5.2 har-schema: 2.0.0 dev: true engines: @@ -1506,10 +1746,17 @@ packages: dev: true resolution: integrity: sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg== - /http-cache-semantics/3.8.0: + /http-cache-semantics/3.8.1: dev: true resolution: - integrity: sha512-HGQFfBdru2fj/dwPn1oLx1fy6QMPeTAD1yzKcxD4l5biw+5QVaui/ehCqxaitoKJC/vHMLKv3Yd+nTlxboOJig== + integrity: sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== + /http-proxy-agent/2.0.0: + dependencies: + agent-base: 4.1.2 + debug: 2.6.9 + dev: true + resolution: + integrity: sha1-RkgqLwUjpNYIJVFwn0acs+SoX/Q= /http-signature/1.2.0: dependencies: assert-plus: 1.0.0 @@ -1521,6 +1768,25 @@ packages: npm: '>=1.3.7' resolution: integrity: sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + /https-proxy-agent/2.1.1: + dependencies: + agent-base: 4.1.2 + debug: 3.1.0 + dev: true + resolution: + integrity: sha512-LK6tQUR/VOkTI6ygAfWUKKP95I+e6M1h7N3PncGu1CATHCnex+CAv9ttR0lbHu1Uk2PXm/WoAHFo6JCGwMjVMw== + /humanize-ms/1.2.1: + dependencies: + ms: 2.1.1 + dev: true + resolution: + integrity: sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= + /iconv-lite/0.4.19: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ== /ieee754/1.1.8: dev: true resolution: @@ -1535,14 +1801,12 @@ packages: node: '>=0.8.19' resolution: integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o= - /indent-string/2.1.0: - dependencies: - repeating: 2.0.1 + /indent-string/3.2.0: dev: true engines: - node: '>=0.10.0' + node: '>=4' resolution: - integrity: sha1-ji1INIdCEhtKghi3oTfppSBJ3IA= + integrity: sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= /individual/3.0.0: dev: true resolution: @@ -1557,10 +1821,10 @@ packages: /inherits/2.0.3: resolution: integrity: sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - /ini/1.3.4: + /ini/1.3.5: dev: true resolution: - integrity: sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4= + integrity: sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== /inquirer/1.2.3: dependencies: ansi-escapes: 1.4.0 @@ -1580,10 +1844,10 @@ packages: dev: true resolution: integrity: sha1-TexvMvN+97sLLtPx0aXD9UUHSRg= - /interpret/1.0.4: + /interpret/1.1.0: dev: true resolution: - integrity: sha1-ggzdWIuGj/sZGoCVBtbJyPISsbA= + integrity: sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ= /into-stream/3.1.0: dependencies: from2: 2.3.0 @@ -1593,6 +1857,10 @@ packages: node: '>=4' resolution: integrity: sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY= + /ip/1.1.5: + dev: true + resolution: + integrity: sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= /is-arrayish/0.2.1: dev: true resolution: @@ -1797,10 +2065,6 @@ packages: dev: true resolution: integrity: sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - /is-utf8/0.2.1: - dev: true - resolution: - integrity: sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI= /is-windows/0.2.0: dev: true engines: @@ -1934,18 +2198,6 @@ packages: graceful-fs: 4.1.11 resolution: integrity: sha1-QIhDO0azsbolnXh4XY6W9zugJDk= - /load-json-file/1.1.0: - dependencies: - graceful-fs: 4.1.11 - parse-json: 2.2.0 - pify: 2.3.0 - pinkie-promise: 2.0.1 - strip-bom: 2.0.0 - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA= /load-json-file/4.0.0: dependencies: graceful-fs: 4.1.11 @@ -1987,6 +2239,10 @@ packages: dev: true resolution: integrity: sha1-5WsXa2gjp93jj38r9Y3n1ZcSAOk= + /lodash.clone/4.5.0: + dev: true + resolution: + integrity: sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= /lodash.map/4.6.0: dev: true resolution: @@ -2049,6 +2305,22 @@ packages: dev: true resolution: integrity: sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y= + /make-fetch-happen/2.6.0: + dependencies: + agentkeepalive: 3.3.0 + cacache: 10.0.1 + http-cache-semantics: 3.8.1 + http-proxy-agent: 2.0.0 + https-proxy-agent: 2.1.1 + lru-cache: 4.1.1 + mississippi: 1.3.0 + node-fetch-npm: 2.0.2 + promise-retry: 1.1.1 + socks-proxy-agent: 3.0.1 + ssri: 5.0.0 + dev: true + resolution: + integrity: sha512-FFq0lNI0ax+n9IWzWpH8A4JdgYiAp2DDYIZ3rsaav8JDe8I+72CzK6PQW/oom15YDZpV5bYW/9INd6nIJ2ZfZw== /manage-path/2.0.0: dev: true resolution: @@ -2059,6 +2331,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= + /map-obj/2.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-plzSkIepJZi4eRJXpSPgISIqwfk= /mem/3.0.0: dependencies: mimic-fn: 1.1.0 @@ -2068,23 +2346,22 @@ packages: node: '>=4' resolution: integrity: sha1-hOWK1N+99dEFsmtlSKOYsrOqiiE= - /meow/3.7.0: + /meow/4.0.0: dependencies: - camelcase-keys: 2.1.0 - decamelize: 1.2.0 + camelcase-keys: 4.2.0 + decamelize-keys: 1.1.0 loud-rejection: 1.6.0 - map-obj: 1.0.1 minimist: 1.2.0 + minimist-options: 3.0.2 normalize-package-data: 2.4.0 - object-assign: 4.1.1 - read-pkg-up: 1.0.1 - redent: 1.0.0 - trim-newlines: 1.0.0 + read-pkg-up: 3.0.0 + redent: 2.0.0 + trim-newlines: 2.0.0 dev: true engines: - node: '>=0.10.0' + node: '>=4' resolution: - integrity: sha1-cstmi0JSKCkKu/qFaJJYcwioAfs= + integrity: sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw== /merge/1.2.0: dev: true resolution: @@ -2140,6 +2417,15 @@ packages: dev: true resolution: integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + /minimist-options/3.0.2: + dependencies: + arrify: 1.0.1 + is-plain-obj: 1.1.0 + dev: true + engines: + node: '>= 4' + resolution: + integrity: sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ== /minimist/0.0.8: dev: true resolution: @@ -2147,6 +2433,21 @@ packages: /minimist/1.2.0: resolution: integrity: sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= + /mississippi/1.3.0: + dependencies: + concat-stream: 1.6.0 + duplexify: 3.5.1 + end-of-stream: 1.4.0 + flush-write-stream: 1.0.2 + from2: 2.3.0 + parallel-transform: 1.1.0 + pump: 1.0.3 + pumpify: 1.3.5 + stream-each: 1.2.2 + through2: 2.0.3 + dev: true + resolution: + integrity: sha1-0gFYPrEjJ+PFwWQqQEqcrPlONPU= /mkdirp-promise/5.0.1: dependencies: mkdirp: 0.5.1 @@ -2165,7 +2466,7 @@ packages: dependencies: babel-runtime: 6.26.0 chalk: 1.1.3 - core-js: 2.5.1 + core-js: 2.5.3 diff: 2.2.3 duplexer: 0.1.1 figures: 1.7.0 @@ -2176,11 +2477,25 @@ packages: dev: true resolution: integrity: sha1-NDOB0f2e1RljsLMVNbf9i64E/3A= + /move-concurrently/1.0.1: + dependencies: + aproba: 1.2.0 + copy-concurrently: 1.0.5 + fs-write-stream-atomic: 1.0.10 + mkdirp: 0.5.1 + rimraf: 2.6.2 + run-queue: 1.0.3 + dev: true + resolution: + integrity: sha1-viwAX9oy4LKa8fBdfEszIUxwH5I= /ms/2.0.0: dev: true - optional: true resolution: integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + /ms/2.1.1: + dev: true + resolution: + integrity: sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== /mute-stream/0.0.6: dev: true resolution: @@ -2227,6 +2542,16 @@ packages: optional: true resolution: integrity: sha512-hmUtb8m75RSi7N+zZLYqe75XDvZB+6LyTBPkj2DConvNgQet2e3BIqEwe1LLvqMrfyjabuT5ZOrTioLCH1HTdA== + /node-fetch-npm/2.0.2: + dependencies: + encoding: 0.1.12 + json-parse-better-errors: 1.0.1 + safe-buffer: 5.1.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw== /node-gyp/3.6.2: dependencies: fstream: 1.0.11 @@ -2292,51 +2617,16 @@ packages: dev: true resolution: integrity: sha1-Iqgwj6fNkyvbSa907KxkTPSmGWs= - /normalize-url/1.9.1: + /normalize-url/2.0.0: dependencies: - object-assign: 4.1.1 - prepend-http: 1.0.4 - query-string: 4.3.4 - sort-keys: 1.1.2 + prepend-http: 2.0.0 + query-string: 5.0.1 + sort-keys: 2.0.0 dev: true engines: node: '>=4' resolution: - integrity: sha1-LMDWazHqIwNkWENuNiDYWVTGbDw= - /npm-package-arg/5.1.2: - dependencies: - hosted-git-info: 2.5.0 - osenv: 0.1.4 - semver: 5.4.1 - validate-npm-package-name: 3.0.0 - dev: true - resolution: - integrity: sha512-wJBsrf0qpypPT7A0LART18hCdyhpCMxeTtcb0X4IZO2jsP6Om7EHN1d9KSKiqD+KVH030RVNpWS9thk+pb7wzA== - /npm-registry-client/8.5.0: - dependencies: - concat-stream: 1.6.0 - graceful-fs: 4.1.11 - normalize-package-data: 2.4.0 - npm-package-arg: 5.1.2 - once: 1.4.0 - request: 2.83.0 - retry: 0.10.1 - semver: 5.4.1 - slide: 1.1.6 - ssri: 4.1.6 - dev: true - optionalDependencies: - npmlog: 4.1.2 - resolution: - integrity: sha512-Nkcw24bfECKFNt0FLDQ+PjVqSlKxMggcboXiUBIvjbCnA15xjRO4kCwRDluGNXZjHFLx/vPjN4+ESXyVjpXLbQ== - /npm-run-path/1.0.0: - dependencies: - path-key: 1.0.0 - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-9cMr9ZX+ga6Sfa7FLoL4sACsPI8= + integrity: sha1-4E2KNp86TK3IUKKFT4+w+KgSAyg= /npm-run-path/2.0.2: dependencies: path-key: 2.0.1 @@ -2383,7 +2673,7 @@ packages: /object.getownpropertydescriptors/2.0.3: dependencies: define-properties: 1.1.2 - es-abstract: 1.9.0 + es-abstract: 1.10.0 dev: true engines: node: '>= 0.8' @@ -2506,12 +2796,12 @@ packages: node: '>=4' resolution: integrity: sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== - /p-queue/2.2.0: + /p-queue/2.3.0: dev: true engines: node: '>=4' resolution: - integrity: sha512-91EJ9kZK3/LzOP38ZD56jo5JfF7ISX4NuCYQGZZkZcE4lHwUxmwSjbQ609HwDVUXAWYo+5x4jQDBnePmiwKBzg== + integrity: sha1-ZdVecbwVAPxBMSLamK5Ff/inwDg= /p-reduce/1.0.0: dev: true engines: @@ -2526,75 +2816,52 @@ packages: node: '>=4' resolution: integrity: sha1-fsnntEBswyBmKYpvmGDlXpGzbgc= - /p-timeout/1.2.0: + /p-timeout/2.0.1: dependencies: p-finally: 1.0.0 dev: true engines: node: '>=4' resolution: - integrity: sha1-mCD5lDTFgXhotPNICe5SkWYNW2w= - /package-preview/1.0.0: + integrity: sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA== + /package-preview/1.0.3: dependencies: '@pnpm/exec': 1.1.2 - '@types/fs-extra': 4.0.5 + '@types/fs-extra': 4.0.7 '@types/load-json-file': 2.0.7 - '@types/meow': 3.6.2 '@types/mz': 0.0.32 - '@types/node': 8.0.53 + '@types/node': 8.5.1 '@types/write-json-file': 2.2.1 cross-spawn: 5.1.0 find-down: 0.1.4 - fs-extra: 4.0.2 + fs-extra: 5.0.0 graceful-fs: 4.1.11 load-json-file: 4.0.0 - meow: 3.7.0 + meow: 4.0.0 mz: 2.7.0 rimraf-then: 1.0.1 - symlink-dir: 1.1.0 - unpack-stream: 2.1.1 + symlink-dir: 1.1.1 + unpack-stream: 3.0.0 write-json-file: 2.3.0 dev: true engines: node: '>=4' resolution: - integrity: sha512-OQbpubrdUPz5xJa98eri+Gf7zfhoLbtQACh4myRaUrCHPYzCrKvw+07v3DrV/n1aRv0/yibWkqSGC/v03ijUug== - /package-store/0.5.1: + integrity: sha512-nigldHuSWszV5IK53dfOdpgfLsG0++QwNAFIFo5bgv5MPm/F4tiDJX240CJ+wZVzftbPGBmk4bnN/UB8wHFoeA== + /package-store/0.10.1: dependencies: - '@pnpm/types': 1.0.0 '@types/load-json-file': 2.0.7 - '@types/node': 8.0.53 - '@types/ramda': 0.25.6 - '@types/retry': 0.10.2 - '@types/semver': 5.4.0 - credentials-by-uri: 1.0.0 - dint: 1.0.0 + '@types/node': 8.5.1 + '@types/ramda': 0.25.8 + dint: 2.0.0 drive-by-path: 1.0.0 encode-registry: 1.1.0 - execa: 0.8.0 - fs-write-stream-atomic: 1.0.10 load-json-file: 4.0.0 - mkdirp-promise: 5.0.1 mz: 2.7.0 normalize-path: 2.1.1 - normalize-registry-url: 1.0.0 - normalize-ssh: 1.0.0 os-homedir: 1.0.2 - p-limit: 1.1.0 - p-queue: 2.2.0 - parse-npm-tarball-url: 1.0.1 path-absolute: 1.0.0 - path-exists: 3.0.0 ramda: 0.25.0 - read-package-json: 2.0.12 - rename-overwrite: 1.0.0 - retry: 0.10.1 - rimraf-then: 1.0.1 - semver: 5.4.1 - ssri: 5.0.0 - symlink-dir: 1.1.0 - thenify: 3.3.0 - unpack-stream: 2.1.1 write-json-file: 2.3.0 dev: true engines: @@ -2602,7 +2869,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-o7XZIy1Rxwyphw94z/p/2J8jPeRszF05YykmNt7EoIFJt56KY7gRryPaaZyV4K1splpntwHiJe9/6zCAmn4b2g== + integrity: sha512-42OC/ytnVm+Tpzl3L8hdEAy+oAHd2wLcu85fnAL/4CEe7Zq/PjWHmrfmeJ3+YC6isMDD0avcIHaEhsbhEnyhvA== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -2615,6 +2882,14 @@ packages: dev: true resolution: integrity: sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU= + /parallel-transform/1.1.0: + dependencies: + cyclist: 0.2.2 + inherits: 2.0.3 + readable-stream: 2.3.3 + dev: true + resolution: + integrity: sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY= /parse-glob/3.0.4: dependencies: glob-base: 0.3.0 @@ -2626,14 +2901,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-ssN2z7EfNVE7rdFz7wu246OIORw= - /parse-json/2.2.0: - dependencies: - error-ex: 1.3.1 - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= /parse-json/4.0.0: dependencies: error-ex: 1.3.1 @@ -2651,7 +2918,7 @@ packages: integrity: sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0= /parse-npm-tarball-url/1.0.1: dependencies: - '@types/node': 7.0.48 + '@types/node': 7.0.50 semver-regex: 1.0.0 dev: true resolution: @@ -2695,12 +2962,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - /path-key/1.0.0: - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-XVPVeAGWRsDWiADbThRua9wqx68= /path-key/2.0.1: dev: true engines: @@ -2715,16 +2976,14 @@ packages: dev: true resolution: integrity: sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME= - /path-type/1.1.0: + /path-type/3.0.0: dependencies: - graceful-fs: 4.1.11 - pify: 2.3.0 - pinkie-promise: 2.0.1 + pify: 3.0.0 dev: true engines: - node: '>=0.10.0' + node: '>=4' resolution: - integrity: sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE= + integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== /peek-stream/1.1.2: dependencies: duplexify: 3.5.1 @@ -2776,7 +3035,7 @@ packages: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= /pnpm-shrinkwrap/5.0.0: dependencies: - '@types/node': 7.0.48 + '@types/node': 7.0.50 '@types/ramda': 0.0.11 dependency-path: 1.2.0 js-yaml: 3.10.0 @@ -2791,7 +3050,7 @@ packages: '@pnpm/logger': ^1.0.0 resolution: integrity: sha512-1flslfYroQpp2mseTwuifgOqjC64DRcqDXkjHmP89DE6/pkJoSmcG789wviHYQAZyo0KK06tF2FJf0z/XgjOlA== - /prebuild-install/2.3.0: + /prebuild-install/2.4.1: dependencies: expand-template: 1.1.0 github-from-package: 0.0.0 @@ -2810,13 +3069,7 @@ packages: dev: true optional: true resolution: - integrity: sha512-gzjq2oHB8oMbzJSsSh9MQ64zrXZGt092/uT4TLZlz2qnrPxpWqp4vYB7LZrDxnlxf5RfbCjkgDI/z0EIVuYzAw== - /prepend-http/1.0.4: - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= + integrity: sha512-99TyEFYTTkBWANT+mwSptmLb9ZCLQ6qKIUE36fXSIOtShB0JNprL2hzBD8F1yIuT9btjFrFEwbRHXhqDi1HmRA== /prepend-http/2.0.0: dev: true engines: @@ -2852,6 +3105,19 @@ packages: /process-nextick-args/1.0.7: resolution: integrity: sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= + /promise-inflight/1.0.1: + dev: true + resolution: + integrity: sha1-mEcocL8igTL8vdhoEputEsPAKeM= + /promise-retry/1.1.1: + dependencies: + err-code: 1.1.2 + retry: 0.10.1 + dev: true + engines: + node: '>=0.12' + resolution: + integrity: sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0= /proper-lockfile/2.0.1: dependencies: graceful-fs: 4.1.11 @@ -2894,15 +3160,22 @@ packages: node: '>=0.6' resolution: integrity: sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A== - /query-string/4.3.4: + /query-string/5.0.1: dependencies: + decode-uri-component: 0.2.0 object-assign: 4.1.1 strict-uri-encode: 1.1.0 dev: true engines: node: '>=0.10.0' resolution: - integrity: sha1-u7aTucqRXCMlFbIosaArYJBD2+s= + integrity: sha512-aM+MkQClojlNiKkO09tiN2Fv8jM/L7GWIjG2liWeKljlOdOPNWr+bW3KQ+w5V/uKprpezC7fAsAMsJtJ+2rLKA== + /quick-lru/1.1.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g= /ramda/0.24.1: dev: true resolution: @@ -2922,7 +3195,7 @@ packages: /rc/1.2.2: dependencies: deep-extend: 0.4.2 - ini: 1.3.4 + ini: 1.3.5 minimist: 1.2.0 strip-json-comments: 2.0.1 dev: true @@ -2940,25 +3213,25 @@ packages: graceful-fs: 4.1.11 resolution: integrity: sha512-m7/I0+tP6D34EVvSlzCtuVA4D/dHL6OpLcn2e4XVP5X57pCKGUy1JjRSBVKHWpB+vUU91sL85h84qX0MdXzBSw== - /read-pkg-up/1.0.1: + /read-pkg-up/3.0.0: dependencies: - find-up: 1.1.2 - read-pkg: 1.1.0 + find-up: 2.1.0 + read-pkg: 3.0.0 dev: true engines: - node: '>=0.10.0' + node: '>=4' resolution: - integrity: sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI= - /read-pkg/1.1.0: + integrity: sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= + /read-pkg/3.0.0: dependencies: - load-json-file: 1.1.0 + load-json-file: 4.0.0 normalize-package-data: 2.4.0 - path-type: 1.1.0 + path-type: 3.0.0 dev: true engines: - node: '>=0.10.0' + node: '>=4' resolution: - integrity: sha1-9f+qXs0pyzHAR0vKfXVra7KePyg= + integrity: sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= /readable-stream/2.3.3: dependencies: core-util-is: 1.0.2 @@ -2978,18 +3251,18 @@ packages: node: '>= 0.10' resolution: integrity: sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q= - /redent/1.0.0: + /redent/2.0.0: dependencies: - indent-string: 2.1.0 - strip-indent: 1.0.1 + indent-string: 3.2.0 + strip-indent: 2.0.0 dev: true engines: - node: '>=0.10.0' + node: '>=4' resolution: - integrity: sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94= - /regenerator-runtime/0.11.0: + integrity: sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo= + /regenerator-runtime/0.11.1: resolution: - integrity: sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A== + integrity: sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== /regex-cache/0.4.4: dependencies: is-equal-shallow: 0.1.3 @@ -3105,12 +3378,12 @@ packages: dev: true resolution: integrity: sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw== - /responselike/1.0.0: + /responselike/1.0.2: dependencies: lowercase-keys: 1.0.0 dev: true resolution: - integrity: sha512-lBZecxOwpiohz05HLwKmE8tSTNta9RnpSaSM/n52gTGnFfzxg/Ffh2PpmQGl/stsQYyq5Noymvj+Ctwqemjuig== + integrity: sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= /restore-cursor/1.0.1: dependencies: exit-hook: 1.1.1 @@ -3166,6 +3439,12 @@ packages: node: '>=0.12.0' resolution: integrity: sha1-A3GrSuC91yDUFm19/aZP96RFpsA= + /run-queue/1.0.3: + dependencies: + aproba: 1.2.0 + dev: true + resolution: + integrity: sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec= /rx/4.1.0: dev: true resolution: @@ -3207,7 +3486,7 @@ packages: /shelljs/0.7.6: dependencies: glob: 7.1.2 - interpret: 1.0.4 + interpret: 1.1.0 rechoir: 0.6.2 dev: true engines: @@ -3236,6 +3515,13 @@ packages: dev: true resolution: integrity: sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= + /smart-buffer/1.1.15: + dev: true + engines: + node: '>= 0.10.15' + npm: '>= 1.3.5' + resolution: + integrity: sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY= /sntp/2.1.0: dependencies: hoek: 4.2.0 @@ -3244,14 +3530,23 @@ packages: node: '>=4.0.0' resolution: integrity: sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg== - /sort-keys/1.1.2: + /socks-proxy-agent/3.0.1: dependencies: - is-plain-obj: 1.1.0 + agent-base: 4.1.2 + socks: 1.1.10 + dev: true + resolution: + integrity: sha512-ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA== + /socks/1.1.10: + dependencies: + ip: 1.1.5 + smart-buffer: 1.1.15 dev: true engines: - node: '>=0.10.0' + node: '>= 0.10.0' + npm: '>= 1.3.5' resolution: - integrity: sha1-RBttTTRnmPG05J6JIK37oOVD+a0= + integrity: sha1-W4t/x8jzQcU+0FbpKbe/Tei6e1o= /sort-keys/2.0.0: dependencies: is-plain-obj: 1.1.0 @@ -3260,20 +3555,13 @@ packages: node: '>=4' resolution: integrity: sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= - /source-map-support/0.4.18: + /source-map-support/0.5.0: dependencies: - source-map: 0.5.7 + source-map: 0.6.1 dev: true resolution: - integrity: sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== - /source-map/0.5.7: - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + integrity: sha512-vUoN3I7fHQe0R/SJLKRdKYuEdRGogsviXFkHHo17AWaTGv17VLnxw+CFXvqy+y4ORZ3doWLQcxRYfwKrsd/H7Q== /source-map/0.6.1: - dev: false engines: node: '>=0.10.0' resolution: @@ -3332,12 +3620,6 @@ packages: tweetnacl: 0.14.5 resolution: integrity: sha1-US322mKHFEMW3EwY/hzx2UBzm+M= - /ssri/4.1.6: - dependencies: - safe-buffer: 5.1.1 - dev: true - resolution: - integrity: sha512-WUbCdgSAMQjTFZRWvSPpauryvREEA+Krn19rx67UlJEJx/M192ZHxMmJXjZ4tkdFm+Sb0SXGlENeQVlA5wY7kA== /ssri/5.0.0: dependencies: safe-buffer: 5.1.1 @@ -3351,6 +3633,13 @@ packages: dev: false resolution: integrity: sha1-5jFkdPtQPj88OCAw3YM8ey4JLe0= + /stream-each/1.2.2: + dependencies: + end-of-stream: 1.4.0 + stream-shift: 1.0.0 + dev: true + resolution: + integrity: sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA== /stream-shift/1.0.0: dev: true resolution: @@ -3383,7 +3672,7 @@ packages: /string.prototype.trim/1.1.2: dependencies: define-properties: 1.1.2 - es-abstract: 1.9.0 + es-abstract: 1.10.0 function-bind: 1.1.1 dev: true engines: @@ -3422,14 +3711,6 @@ packages: node: '>=4' resolution: integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8= - /strip-bom/2.0.0: - dependencies: - is-utf8: 0.2.1 - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= /strip-bom/3.0.0: dev: true engines: @@ -3442,28 +3723,29 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= - /strip-indent/1.0.1: - dependencies: - get-stdin: 4.0.1 + /strip-indent/2.0.0: dev: true engines: - node: '>=0.10.0' + node: '>=4' resolution: - integrity: sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= + integrity: sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= /strip-json-comments/2.0.1: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.7.7: + /supi/0.7.12: dependencies: - '@pnpm/types': 1.0.0 + '@pnpm/default-fetcher': 0.3.0 + '@pnpm/default-resolver': 0.1.0 + '@pnpm/package-requester': 0.2.0 + '@pnpm/types': 1.3.0 '@types/byline': 4.2.31 '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 8.0.53 + '@types/node': 8.5.1 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 @@ -3473,9 +3755,10 @@ packages: '@types/update-notifier': 1.0.2 '@zkochan/cmd-shim': 2.2.4 '@zkochan/npm-lifecycle': 0.0.6 + '@zkochan/npm-package-arg': 1.0.0 arr-flatten: 1.1.0 byline: 5.0.0 - common-tags: 1.4.0 + common-tags: 1.5.1 cross-spawn: 5.1.0 dependency-path: 1.2.0 encode-registry: 1.1.0 @@ -3495,13 +3778,11 @@ packages: node-gyp: 3.6.2 normalize-path: 2.1.1 normalize-registry-url: 1.0.0 - npm-package-arg: 5.1.2 - npm-registry-client: 8.5.0 os-homedir: 1.0.2 p-filter: 1.0.0 p-limit: 1.1.0 p-series: 1.0.0 - package-store: 0.5.1 + package-store: 0.10.1 path-absolute: 1.0.0 path-exists: 3.0.0 path-name: 1.0.0 @@ -3513,8 +3794,9 @@ packages: remove-all-except-outer-links: 1.0.3 rimraf-then: 1.0.1 semver: 5.4.1 - symlink-dir: 1.1.0 + symlink-dir: 1.1.1 thenify: 3.3.0 + validate-npm-package-name: 3.0.0 write-pkg: 3.1.0 write-yaml-file: 1.0.0 dev: true @@ -3523,7 +3805,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-rr+TvyCYBgE6wFSWSFt1tEw3u+D3kmgrz/1lT1IATJ3sFdkrfSGvE7z+STWendGAN9r/An2yymq1s10ykppntw== + integrity: sha512-Xooh51cW1NAEH8t6+Guv+nTh+cO0OMps6jXszcWWmfL7g5SeiLypRwXF786595U5gO5RxmG4Gi34OqXsKoZvsQ== /supports-color/0.2.0: dev: true engines: @@ -3549,10 +3831,10 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0= - /symlink-dir/1.1.0: + /symlink-dir/1.1.1: dependencies: - '@types/mz': 0.0.31 - '@types/node': 8.0.53 + '@types/mz': 0.0.32 + '@types/node': 8.5.1 graceful-fs: 4.1.11 is-windows: 1.0.1 mkdirp-promise: 5.0.1 @@ -3561,7 +3843,7 @@ packages: engines: node: '>=4' resolution: - integrity: sha512-HrQ50UhvdoWwwC62I82l0U2NTRx9dTQWs5/ay0bRwBqkJQ0f3ruVhQUyLH7hs6NekRsvQgK76fZyUFK7PZsm8A== + integrity: sha512-jB7Y1uy6vUfQaSRngSZnAtCUe/jDfjZl/ZLfAoZlWvvOC0tos8vCFL1C5WNGSYPgpRIcnVc/UYdUQQPLCV3Z5g== /tap-parser/1.3.2: dependencies: events-to-array: 1.1.2 @@ -3670,13 +3952,13 @@ packages: node: '>=0.8' resolution: integrity: sha1-C2GKVWW23qkL80JdBNVe3EdadWE= - /trim-newlines/1.0.0: + /trim-newlines/2.0.0: dev: true engines: - node: '>=0.10.0' + node: '>=4' resolution: - integrity: sha1-WIeWa7WCpFA6QetST301ARgVphM= - /ts-node/3.3.0: + integrity: sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= + /ts-node/4.0.2: dependencies: arrify: 1.0.1 chalk: 2.3.0 @@ -3684,39 +3966,41 @@ packages: make-error: 1.3.0 minimist: 1.2.0 mkdirp: 0.5.1 - source-map-support: 0.4.18 - tsconfig: 6.0.0 + source-map-support: 0.5.0 + tsconfig: 7.0.0 v8flags: 3.0.1 yn: 2.0.0 dev: true engines: node: '>=4.2.0' resolution: - integrity: sha1-wTxqMCTjC+EYDdUwOPwgkonUv2k= - /tsconfig/6.0.0: + integrity: sha512-mg7l6ON8asjnfzkTi1LFWKaOGHl5Jf1+5ij0MQ502YfC6+4FBgh/idJgw9aN9kei1Rf4/pmFpNuFE1YbcQdOTA== + /tsconfig/7.0.0: dependencies: + '@types/strip-bom': 3.0.0 + '@types/strip-json-comments': 0.0.30 strip-bom: 3.0.0 strip-json-comments: 2.0.1 dev: true resolution: - integrity: sha1-aw6DdgA9evGGT434+J3QBZ/80DI= - /tslib/1.8.0: + integrity: sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw== + /tslib/1.8.1: dev: true resolution: - integrity: sha512-ymKWWZJST0/CkgduC2qkzjMOWr4bouhuURNXCn/inEX0L57BnRG6FhX76o7FOnsjHazCjfU2LKeSrlS2sIKQJg== + integrity: sha1-aUavLR1lGnsYY7Ux1uWvpBqkTqw= /tslint/5.8.0: dependencies: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 chalk: 2.3.0 - commander: 2.11.0 + commander: 2.12.2 diff: 3.4.0 glob: 7.1.2 minimatch: 3.0.4 resolve: 1.5.0 semver: 5.4.1 - tslib: 1.8.0 - tsutils: 2.12.2 + tslib: 1.8.1 + tsutils: 2.13.1 dev: true engines: node: '>=4.1.2' @@ -3724,14 +4008,14 @@ packages: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev' resolution: integrity: sha1-H0mtWy53x2w69N3K5VKuTjYS6xM= - /tsutils/2.12.2: + /tsutils/2.13.1: dependencies: - tslib: 1.8.0 + tslib: 1.8.1 dev: true peerDependencies: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >= 2.4.0-dev || >= 2.5.0-dev || >= 2.6.0-dev || >= 2.7.0-dev || >= 2.8.0-dev' resolution: - integrity: sha1-rVikhl0X7D3bZjG2ylO+FKVlb/M= + integrity: sha512-XMOEvc2TiYesVSOJMI7OYPnBMSgcvERuGW5Li/J+2A0TuH607BPQnOLQ82oSPZCssB8c9+QGi6qhTBa/f1xQRA== /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.1.1 @@ -3747,12 +4031,12 @@ packages: dev: true resolution: integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - /typescript/2.6.1: + /typescript/2.6.2: dev: true engines: node: '>=4.2.0' resolution: - integrity: sha1-7znN6ierrAtQAkLWcmq5DgyEZjE= + integrity: sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q= /uid-number/0.0.6: dev: true resolution: @@ -3768,21 +4052,44 @@ packages: dev: true resolution: integrity: sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og== + /unique-filename/1.1.0: + dependencies: + unique-slug: 2.0.0 + dev: true + resolution: + integrity: sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM= + /unique-slug/2.0.0: + dependencies: + imurmurhash: 0.1.4 + dev: true + resolution: + integrity: sha1-22Z258fMBimHj/GWCXx4hVrp9Ks= /universalify/0.1.1: dev: true resolution: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= - /unpack-stream/2.1.1: + /unpack-stream/2.2.0: dependencies: - '@types/node': 8.0.53 + '@types/node': 8.5.1 decompress-maybe: 1.0.0 - ssri: 4.1.6 + ssri: 5.0.0 tar-fs: 1.16.0 dev: true engines: node: '>=4' resolution: - integrity: sha1-FXMzqT/KD6ABYGrqCpKYQy2q7nM= + integrity: sha512-UU/97pTZMXBpWGRJLmmDq2mN3v3dBbFgrUNH26UpfvyVwbO1i0ZZnzQvm7YEoTcMJpFpuX9LWGYNu2rmh6K4Jg== + /unpack-stream/3.0.0: + dependencies: + '@types/node': 8.5.1 + decompress-maybe: 1.0.0 + ssri: 5.0.0 + tar-fs: 1.16.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-0BxD6HlX99YEQZheFAScgneWu35TGSNrKw7iNGqGZo3X+Zv7cW+NNOLvJz7sQr17hZSljUB4vqk0h1zm6xwtaA== /unzip-response/1.0.2: dev: true engines: @@ -3853,7 +4160,7 @@ packages: dependencies: assert-plus: 1.0.0 core-util-is: 1.0.2 - extsprintf: 1.3.0 + extsprintf: 1.4.0 dev: true engines: '0': node >=0.6.0 @@ -3938,17 +4245,21 @@ packages: dev: true resolution: integrity: sha1-e0vQ33LKE/vp1rAXj9g8B3uOqGs= - /xstream/11.0.0: + /xstream/11.1.0: dependencies: symbol-observable: 1.0.4 dev: false resolution: - integrity: sha1-IBjDxOVz92tiuc+WoXpGh2qxIOA= + integrity: sha512-3xFreYPNXbuEeWv0CP2FKP4u9QmCz63m8Fpqga5kujQRWn6k5yP2XIsFZmvE2ycb84I8sixpYCUMfmt8KIKn9g== /xtend/4.0.1: engines: node: '>=0.4' resolution: integrity: sha1-pcbVMr5lbiPbgg77lDofBJmNY68= + /y18n/3.2.1: + dev: true + resolution: + integrity: sha1-bRX7qITAhnnA136I53WegR4H+kE= /yallist/2.1.2: dev: true resolution: @@ -3960,7 +4271,7 @@ packages: resolution: integrity: sha1-5a2ryKz0CPY4X8dklWhMiOavaJo= registry: 'https://registry.npmjs.org/' -shrinkwrapMinorVersion: 2 +shrinkwrapMinorVersion: 4 shrinkwrapVersion: 3 specifiers: '@pnpm/logger': ^1.0.0 @@ -3985,7 +4296,7 @@ specifiers: stacktracey: ^1.2.87 supi: ^0.7.7 tape: ^4.8.0 - ts-node: ^3.3.0 + ts-node: ^4.0.2 tslint: ^5.7.0 typescript: ^2.1.5 validate-commit-msg: ^2.8.2 From 7d199a5ff0aa37c3ad80b28e2badd30812b5f970 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 18 Dec 2017 22:24:45 +0200 Subject: [PATCH 094/196] refactor: separate the output merging logic --- src/index.ts | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/index.ts b/src/index.ts index 083139ca03..8edefa2c0d 100644 --- a/src/index.ts +++ b/src/index.ts @@ -203,21 +203,25 @@ export function toOutput$(streamParser: object): Stream { .map((msg) => ({msg})) .map(xs.of) + return mergeOutputs([ + summaryOutput$, + progressSummaryOutput$, + registryOutput$, + installCheckOutput$, + lifecycleOutput$, + deprecationOutput$, + miscOutput$, + tarballsProgressOutput$, + alreadyUpToDate$, + ]) +} + +function mergeOutputs(outputs: Array>>): Stream { let blockNo = 0 let fixedBlockNo = 0 let started = false return flattenConcurrently( - xs.merge( - summaryOutput$, - progressSummaryOutput$, - registryOutput$, - installCheckOutput$, - lifecycleOutput$, - deprecationOutput$, - miscOutput$, - tarballsProgressOutput$, - alreadyUpToDate$, - ) + xs.merge(...outputs) .map((log: Stream<{msg: string, fixed: boolean}>) => { let currentBlockNo = -1 let currentFixedBlockNo = -1 From 073030eecd9e2b45a494e131115993364ea4c90a Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 18 Dec 2017 22:29:25 +0200 Subject: [PATCH 095/196] style: update --- src/index.ts | 18 +++++++++--------- src/reportError.ts | 18 +++++++++--------- tslint.json | 5 +++-- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/index.ts b/src/index.ts index 8edefa2c0d..060b2d4c4f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -32,16 +32,16 @@ const linkSign = chalk.magentaBright('#') const hlValue = chalk.blue const hlPkgId = chalk['whiteBright'] -export default function(streamParser: object) { +export default function (streamParser: object) { toOutput$(streamParser) .subscribe({ - complete() {}, // tslint:disable-line:no-empty + complete () {}, // tslint:disable-line:no-empty error: (err) => logUpdate(err.message), next: logUpdate, }) } -export function toOutput$(streamParser: object): Stream { +export function toOutput$ (streamParser: object): Stream { const obs = fromEvent(streamParser as EventEmitter, 'data') const log$ = xs.fromObservable(obs) @@ -216,7 +216,7 @@ export function toOutput$(streamParser: object): Stream { ]) } -function mergeOutputs(outputs: Array>>): Stream { +function mergeOutputs (outputs: Array>>): Stream { let blockNo = 0 let fixedBlockNo = 0 let started = false @@ -285,7 +285,7 @@ function mergeOutputs(outputs: Array>>): Stream { .compose(dropRepeats()) } -function printDiffs(pkgsDiff: PackageDiff[]) { +function printDiffs (pkgsDiff: PackageDiff[]) { // Sorts by alphabet then by removed/added // + ava 0.10.0 // - chalk 1.0.0 @@ -319,7 +319,7 @@ function printDiffs(pkgsDiff: PackageDiff[]) { return msg } -function formatLifecycle(logObj: LifecycleLog) { +function formatLifecycle (logObj: LifecycleLog) { const prefix = `Running ${hlValue(logObj.script)} for ${hlPkgId(logObj.pkgId)}` if (logObj['exitCode'] === 0) { return `${prefix}, done` @@ -331,14 +331,14 @@ function formatLifecycle(logObj: LifecycleLog) { return `${prefix}: ${line}` } -function formatLine(logObj: LifecycleLog) { +function formatLine (logObj: LifecycleLog) { if (typeof logObj['exitCode'] === 'number') return chalk.red(`Exited with ${logObj['exitCode']}`) const color = logObj.level === 'error' ? chalk.red : chalk.gray return color(logObj['line']) } -function formatInstallCheck(logObj: InstallCheckLog) { +function formatInstallCheck (logObj: InstallCheckLog) { switch (logObj.code) { case 'EBADPLATFORM': return formatWarn(`Unsupported system. Skipping dependency ${logObj.pkgId}`) @@ -349,7 +349,7 @@ function formatInstallCheck(logObj: InstallCheckLog) { } } -function formatWarn(message: string) { +function formatWarn (message: string) { // The \u2009 is the "thin space" unicode character // It is used instead of ' ' because chalk (as of version 2.1.0) // trims whitespace at the beginning diff --git a/src/reportError.ts b/src/reportError.ts index 348483dc88..b7eb113a17 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -10,7 +10,7 @@ const EOL = os.EOL const highlight = chalk.yellow const colorPath = chalk.gray -export default function reportError(logObj: Log) { +export default function reportError (logObj: Log) { if (logObj['err']) { const err = logObj['err'] as (Error & { code: string, stack: object }) switch (err.code) { @@ -31,7 +31,7 @@ export default function reportError(logObj: Log) { return formatErrorSummary(logObj['message']) } -function reportUnexpectedStore(err: Error, msg: object) { +function reportUnexpectedStore (err: Error, msg: object) { return stripIndent` ${formatErrorSummary(err.message)} @@ -42,7 +42,7 @@ function reportUnexpectedStore(err: Error, msg: object) { ` } -function reportStoreBreakingChange(err: Error, msg: object) { +function reportStoreBreakingChange (err: Error, msg: object) { let output = stripIndent` ${formatErrorSummary(`The store used for the current node_modules is incomatible with the current version of pnpm`)} Store path: ${colorPath(msg['storePath'])} @@ -58,7 +58,7 @@ function reportStoreBreakingChange(err: Error, msg: object) { return output } -function reportModulesBreakingChange(err: Error, msg: object) { +function reportModulesBreakingChange (err: Error, msg: object) { let output = stripIndent` ${formatErrorSummary(`The current version of pnpm is not compatible with the available node_modules structure`)} node_modules path: ${colorPath(msg['modulesPath'])} @@ -74,7 +74,7 @@ function reportModulesBreakingChange(err: Error, msg: object) { return output } -function formatRelatedSources(msg: object) { +function formatRelatedSources (msg: object) { let output = '' if (!msg['relatedIssue'] && !msg['relatedPR']) return output @@ -92,7 +92,7 @@ function formatRelatedSources(msg: object) { return output } -function formatGenericError(errorMessage: string, stack: object) { +function formatGenericError (errorMessage: string, stack: object) { if (stack) { return stripIndents` ${formatErrorSummary(errorMessage)} @@ -102,11 +102,11 @@ function formatGenericError(errorMessage: string, stack: object) { return formatErrorSummary(errorMessage) } -function formatErrorSummary(message: string) { +function formatErrorSummary (message: string) { return `${chalk.bgRed.black('\u2009ERROR\u2009')} ${chalk.red(message)}` } -function reportModifiedDependency(err: Error, msg: object) { +function reportModifiedDependency (err: Error, msg: object) { return stripIndent` ${formatErrorSummary('Packages in the store have been mutated')} @@ -117,7 +117,7 @@ function reportModifiedDependency(err: Error, msg: object) { ` } -function reportShrinkwrapBreakingChange(err: Error, msg: object) { +function reportShrinkwrapBreakingChange (err: Error, msg: object) { return stripIndent` ${formatErrorSummary(err.message)} diff --git a/tslint.json b/tslint.json index 5f4e4a897d..40a42fafc5 100644 --- a/tslint.json +++ b/tslint.json @@ -7,7 +7,7 @@ "class-name": true, "indent": [true, "spaces"], "max-line-length": false, - "no-any": false, + "no-any": true, "no-consecutive-blank-lines": true, "no-trailing-whitespace": true, "no-duplicate-variable": true, @@ -17,8 +17,9 @@ "no-var-requires": true, "no-require-imports": false, "no-string-literal": false, - "no-console": false, + "space-before-function-paren": [true, "always"], "interface-name": [true, "never-prefix"], + "no-console": false, "one-line": [true, "check-else", "check-whitespace", From 238fc576f96974d40b1b36953adcaa8f502882a2 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 18 Dec 2017 22:45:19 +0200 Subject: [PATCH 096/196] refactor: collect all outputs in one array --- src/index.ts | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/src/index.ts b/src/index.ts index 060b2d4c4f..bd251be499 100644 --- a/src/index.ts +++ b/src/index.ts @@ -44,6 +44,7 @@ export default function (streamParser: object) { export function toOutput$ (streamParser: object): Stream { const obs = fromEvent(streamParser as EventEmitter, 'data') const log$ = xs.fromObservable(obs) + const outputs: Array>> = [] const progressLog$ = log$ .filter((log) => log.name === 'pnpm:progress') as Stream @@ -81,6 +82,8 @@ export function toOutput$ (streamParser: object): Stream { }), ) + outputs.push(alreadyUpToDate$) + const progressSummaryOutput$ = xs.of( xs.combine( resolvingContentLog$, @@ -105,6 +108,8 @@ export function toOutput$ (streamParser: object): Stream { ), ) + outputs.push(progressSummaryOutput$) + const tarballsProgressOutput$ = progressLog$ .filter((log) => log.status === 'fetching_started' && typeof log.size === 'number' && log.size >= BIG_TARBALL_SIZE) @@ -124,6 +129,8 @@ export function toOutput$ (streamParser: object): Stream { }) }) + outputs.push(tarballsProgressOutput$) + const deprecationLog$ = log$ .filter((log) => log.name === 'pnpm:deprecation') as Stream @@ -154,6 +161,8 @@ export function toOutput$ (streamParser: object): Stream { .take(1) .map(xs.of) + outputs.push(summaryOutput$) + const deprecationOutput$ = deprecationLog$ // print warnings only about deprecated packages from the root .filter((log) => log.depth === 0) @@ -164,6 +173,8 @@ export function toOutput$ (streamParser: object): Stream { }) .map(xs.of) + outputs.push(deprecationOutput$) + const lifecycleMessages: {[pkgId: string]: string} = {} const lifecycleOutput$ = xs.of( log$ @@ -176,6 +187,8 @@ export function toOutput$ (streamParser: object): Stream { .map((msg) => ({msg})), ) + outputs.push(lifecycleOutput$) + const installCheckOutput$ = log$ .filter((log) => log.name === 'pnpm:install-check') .map(formatInstallCheck) @@ -183,11 +196,15 @@ export function toOutput$ (streamParser: object): Stream { .map((msg) => ({msg})) .map(xs.of) as Stream> + outputs.push(installCheckOutput$) + const registryOutput$ = log$ .filter((log) => log.name === 'pnpm:registry' && log.level === 'warn') .map((log: RegistryLog) => ({msg: formatWarn(log.message)})) .map(xs.of) + outputs.push(registryOutput$) + const miscOutput$ = log$ .filter((log) => log.name as string === 'pnpm' || log.name as string === 'pnpm:link') .map((obj) => { @@ -203,17 +220,9 @@ export function toOutput$ (streamParser: object): Stream { .map((msg) => ({msg})) .map(xs.of) - return mergeOutputs([ - summaryOutput$, - progressSummaryOutput$, - registryOutput$, - installCheckOutput$, - lifecycleOutput$, - deprecationOutput$, - miscOutput$, - tarballsProgressOutput$, - alreadyUpToDate$, - ]) + outputs.push(miscOutput$) + + return mergeOutputs(outputs) } function mergeOutputs (outputs: Array>>): Stream { From 3cab9927d52cdf9b3029a7a6dffc523575e25e73 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 18 Dec 2017 23:29:10 +0200 Subject: [PATCH 097/196] feat: less noisy output during concurrent installation --- src/index.ts | 107 +++++++++++++++++++++++++++++---------------------- 1 file changed, 60 insertions(+), 47 deletions(-) diff --git a/src/index.ts b/src/index.ts index bd251be499..ad114b82ac 100644 --- a/src/index.ts +++ b/src/index.ts @@ -32,8 +32,11 @@ const linkSign = chalk.magentaBright('#') const hlValue = chalk.blue const hlPkgId = chalk['whiteBright'] -export default function (streamParser: object) { - toOutput$(streamParser) +export default function ( + streamParser: object, + cmd?: string, // is optional only to be backward compatible +) { + toOutput$(streamParser, cmd) .subscribe({ complete () {}, // tslint:disable-line:no-empty error: (err) => logUpdate(err.message), @@ -41,7 +44,11 @@ export default function (streamParser: object) { }) } -export function toOutput$ (streamParser: object): Stream { +export function toOutput$ ( + streamParser: object, + cmd?: string, // is optional only to be backward compatible +): Stream { + const isRecursive = cmd === 'recursive' const obs = fromEvent(streamParser as EventEmitter, 'data') const log$ = xs.fromObservable(obs) const outputs: Array>> = [] @@ -49,11 +56,13 @@ export function toOutput$ (streamParser: object): Stream { const progressLog$ = log$ .filter((log) => log.name === 'pnpm:progress') as Stream - const resolutionDone$ = log$ - .filter((log) => log.name === 'pnpm:stage' && log.message === 'resolution_done') - .mapTo(true) - .take(1) - .startWith(false) + const resolutionDone$ = isRecursive + ? xs.never() + : log$ + .filter((log) => log.name === 'pnpm:stage' && log.message === 'resolution_done') + .mapTo(true) + .take(1) + .startWith(false) const resolvingContentLog$ = progressLog$ .filter((log) => log.status === 'resolving_content') @@ -69,27 +78,29 @@ export function toOutput$ (streamParser: object): Stream { .filter((log) => log.status === 'found_in_store') .fold(R.inc, 0) - const alreadyUpToDate$ = xs.of( - resolvingContentLog$ - .take(1) - .mapTo(false) - .startWith(true) - .last() - .filter(R.equals(true)) - .mapTo({ - fixed: false, - msg: 'Already up-to-date', - }), - ) + if (!isRecursive) { + const alreadyUpToDate$ = xs.of( + resolvingContentLog$ + .take(1) + .mapTo(false) + .startWith(true) + .last() + .filter(R.equals(true)) + .mapTo({ + fixed: false, + msg: 'Already up-to-date', + }), + ) - outputs.push(alreadyUpToDate$) + outputs.push(alreadyUpToDate$) + } const progressSummaryOutput$ = xs.of( xs.combine( resolvingContentLog$, fedtchedLog$, foundInStoreLog$, - resolutionDone$, + isRecursive ? xs.of(false) : resolutionDone$, ) .map( R.apply((resolving, fetched, foundInStore: number, resolutionDone) => { @@ -134,34 +145,36 @@ export function toOutput$ (streamParser: object): Stream { const deprecationLog$ = log$ .filter((log) => log.name === 'pnpm:deprecation') as Stream - const pkgsDiff$ = getPkgsDiff(log$, deprecationLog$) + if (!isRecursive) { + const pkgsDiff$ = getPkgsDiff(log$, deprecationLog$) - const summaryLog$ = log$ - .filter((log) => log.name === 'pnpm:summary') - .take(1) + const summaryLog$ = log$ + .filter((log) => log.name === 'pnpm:summary') + .take(1) - const summaryOutput$ = xs.combine( - pkgsDiff$, - summaryLog$, - ) - .map(R.apply((pkgsDiff) => { - let msg = '' - for (const depType of ['prod', 'optional', 'dev']) { - const diffs = R.values(pkgsDiff[depType]) - if (diffs.length) { - msg += EOL - msg += chalk.blue(`${propertyByDependencyType[depType]}:`) - msg += EOL - msg += printDiffs(diffs) - msg += EOL + const summaryOutput$ = xs.combine( + pkgsDiff$, + summaryLog$, + ) + .map(R.apply((pkgsDiff) => { + let msg = '' + for (const depType of ['prod', 'optional', 'dev']) { + const diffs = R.values(pkgsDiff[depType]) + if (diffs.length) { + msg += EOL + msg += chalk.blue(`${propertyByDependencyType[depType]}:`) + msg += EOL + msg += printDiffs(diffs) + msg += EOL + } } - } - return {msg} - })) - .take(1) - .map(xs.of) + return {msg} + })) + .take(1) + .map(xs.of) - outputs.push(summaryOutput$) + outputs.push(summaryOutput$) + } const deprecationOutput$ = deprecationLog$ // print warnings only about deprecated packages from the root @@ -206,7 +219,7 @@ export function toOutput$ (streamParser: object): Stream { outputs.push(registryOutput$) const miscOutput$ = log$ - .filter((log) => log.name as string === 'pnpm' || log.name as string === 'pnpm:link') + .filter((log) => log.name as string === 'pnpm' || !isRecursive && log.name as string === 'pnpm:link') .map((obj) => { if (obj.level === 'debug') return if (obj.level === 'warn') { From 8e1b954e8831868108d559f3b1050709178adf3e Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 18 Dec 2017 23:38:42 +0200 Subject: [PATCH 098/196] fix: use only Node.js 4 compatible syntax --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index ad114b82ac..acacc1b74e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -243,7 +243,7 @@ function mergeOutputs (outputs: Array>>): Stream { let fixedBlockNo = 0 let started = false return flattenConcurrently( - xs.merge(...outputs) + (xs.merge.apply(xs, outputs) as xs>) .map((log: Stream<{msg: string, fixed: boolean}>) => { let currentBlockNo = -1 let currentFixedBlockNo = -1 From 34b8eb9927d7b9e1a5722333aefbabb0d46c1c7e Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 18 Dec 2017 23:39:34 +0200 Subject: [PATCH 099/196] ci(travis): disable email notifications --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index a3c58d35ec..52694032c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,3 +11,5 @@ install: - pnpm install script: - npm test +notifications: + email: false From ff0e8dacf40322914bf463b1c8fdae8b5d117173 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 19 Dec 2017 22:13:34 +0200 Subject: [PATCH 100/196] feat: show less output during recursive installation --- src/index.ts | 86 +++++++++++++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/src/index.ts b/src/index.ts index acacc1b74e..98fd996275 100644 --- a/src/index.ts +++ b/src/index.ts @@ -142,10 +142,10 @@ export function toOutput$ ( outputs.push(tarballsProgressOutput$) - const deprecationLog$ = log$ - .filter((log) => log.name === 'pnpm:deprecation') as Stream - if (!isRecursive) { + const deprecationLog$ = log$ + .filter((log) => log.name === 'pnpm:deprecation') as Stream + const pkgsDiff$ = getPkgsDiff(log$, deprecationLog$) const summaryLog$ = log$ @@ -174,20 +174,20 @@ export function toOutput$ ( .map(xs.of) outputs.push(summaryOutput$) + + const deprecationOutput$ = deprecationLog$ + // print warnings only about deprecated packages from the root + .filter((log) => log.depth === 0) + .map((log) => { + return { + msg: formatWarn(`${chalk.red('deprecated')} ${log.pkgName}@${log.pkgVersion}: ${log.deprecated}`), + } + }) + .map(xs.of) + + outputs.push(deprecationOutput$) } - const deprecationOutput$ = deprecationLog$ - // print warnings only about deprecated packages from the root - .filter((log) => log.depth === 0) - .map((log) => { - return { - msg: formatWarn(`${chalk.red('deprecated')} ${log.pkgName}@${log.pkgVersion}: ${log.deprecated}`), - } - }) - .map(xs.of) - - outputs.push(deprecationOutput$) - const lifecycleMessages: {[pkgId: string]: string} = {} const lifecycleOutput$ = xs.of( log$ @@ -202,38 +202,40 @@ export function toOutput$ ( outputs.push(lifecycleOutput$) - const installCheckOutput$ = log$ - .filter((log) => log.name === 'pnpm:install-check') - .map(formatInstallCheck) - .filter(Boolean) - .map((msg) => ({msg})) - .map(xs.of) as Stream> + if (!isRecursive) { + const installCheckOutput$ = log$ + .filter((log) => log.name === 'pnpm:install-check') + .map(formatInstallCheck) + .filter(Boolean) + .map((msg) => ({msg})) + .map(xs.of) as Stream> - outputs.push(installCheckOutput$) + outputs.push(installCheckOutput$) - const registryOutput$ = log$ - .filter((log) => log.name === 'pnpm:registry' && log.level === 'warn') - .map((log: RegistryLog) => ({msg: formatWarn(log.message)})) - .map(xs.of) + const registryOutput$ = log$ + .filter((log) => log.name === 'pnpm:registry' && log.level === 'warn') + .map((log: RegistryLog) => ({msg: formatWarn(log.message)})) + .map(xs.of) - outputs.push(registryOutput$) + outputs.push(registryOutput$) - const miscOutput$ = log$ - .filter((log) => log.name as string === 'pnpm' || !isRecursive && log.name as string === 'pnpm:link') - .map((obj) => { - if (obj.level === 'debug') return - if (obj.level === 'warn') { - return formatWarn(obj['message']) - } - if (obj.level === 'error') { - return reportError(obj) - } - return obj['message'] - }) - .map((msg) => ({msg})) - .map(xs.of) + const miscOutput$ = log$ + .filter((log) => log.name as string === 'pnpm' || !isRecursive && log.name as string === 'pnpm:link') + .map((obj) => { + if (obj.level === 'debug') return + if (obj.level === 'warn') { + return formatWarn(obj['message']) + } + if (obj.level === 'error') { + return reportError(obj) + } + return obj['message'] + }) + .map((msg) => ({msg})) + .map(xs.of) - outputs.push(miscOutput$) + outputs.push(miscOutput$) + } return mergeOutputs(outputs) } From 4d46ee5925cd7b5f12db8048ecc6fd4be0351a76 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 19 Dec 2017 22:21:28 +0200 Subject: [PATCH 101/196] chore(release): 0.10.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1ee533763f..384aa95653 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.10.3", + "version": "0.10.4", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 3cf97dd446c4fd1249257dea9f41b0b00afe429e Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 22 Dec 2017 00:19:59 +0200 Subject: [PATCH 102/196] refactor: move reporter for client to separate file --- src/index.ts | 357 +-------------------------------------- src/mergeOutputs.ts | 76 +++++++++ src/reporterForClient.ts | 292 ++++++++++++++++++++++++++++++++ 3 files changed, 372 insertions(+), 353 deletions(-) create mode 100644 src/mergeOutputs.ts create mode 100644 src/reporterForClient.ts diff --git a/src/index.ts b/src/index.ts index 98fd996275..367491108f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,36 +1,11 @@ -import chalk from 'chalk' import {EventEmitter} from 'events' import logUpdate = require('log-update') -import os = require('os') -import prettyBytes = require('pretty-bytes') import R = require('ramda') -import semver = require('semver') -import { - DeprecationLog, - InstallCheckLog, - LifecycleLog, - Log, - ProgressLog, - RegistryLog, -} from 'supi' +import {Log} from 'supi' import xs, {Stream} from 'xstream' -import dropRepeats from 'xstream/extra/dropRepeats' -import flattenConcurrently from 'xstream/extra/flattenConcurrently' import fromEvent from 'xstream/extra/fromEvent' -import getPkgsDiff, { - PackageDiff, - propertyByDependencyType, -} from './pkgsDiff' -import reportError from './reportError' - -const EOL = os.EOL -const BIG_TARBALL_SIZE = 1024 * 1024 * 5 // 5 MB - -const addedSign = chalk.green('+') -const removedSign = chalk.red('-') -const linkSign = chalk.magentaBright('#') -const hlValue = chalk.blue -const hlPkgId = chalk['whiteBright'] +import mergeOutputs from './mergeOutputs' +import reporterForClient from './reporterForClient' export default function ( streamParser: object, @@ -51,331 +26,7 @@ export function toOutput$ ( const isRecursive = cmd === 'recursive' const obs = fromEvent(streamParser as EventEmitter, 'data') const log$ = xs.fromObservable(obs) - const outputs: Array>> = [] - - const progressLog$ = log$ - .filter((log) => log.name === 'pnpm:progress') as Stream - - const resolutionDone$ = isRecursive - ? xs.never() - : log$ - .filter((log) => log.name === 'pnpm:stage' && log.message === 'resolution_done') - .mapTo(true) - .take(1) - .startWith(false) - - const resolvingContentLog$ = progressLog$ - .filter((log) => log.status === 'resolving_content') - .fold(R.inc, 0) - .drop(1) - .endWhen(resolutionDone$.last()) - - const fedtchedLog$ = progressLog$ - .filter((log) => log.status === 'fetched') - .fold(R.inc, 0) - - const foundInStoreLog$ = progressLog$ - .filter((log) => log.status === 'found_in_store') - .fold(R.inc, 0) - - if (!isRecursive) { - const alreadyUpToDate$ = xs.of( - resolvingContentLog$ - .take(1) - .mapTo(false) - .startWith(true) - .last() - .filter(R.equals(true)) - .mapTo({ - fixed: false, - msg: 'Already up-to-date', - }), - ) - - outputs.push(alreadyUpToDate$) - } - - const progressSummaryOutput$ = xs.of( - xs.combine( - resolvingContentLog$, - fedtchedLog$, - foundInStoreLog$, - isRecursive ? xs.of(false) : resolutionDone$, - ) - .map( - R.apply((resolving, fetched, foundInStore: number, resolutionDone) => { - const msg = `Resolving: total ${hlValue(resolving.toString())}, reused ${hlValue(foundInStore.toString())}, downloaded ${hlValue(fetched.toString())}` - if (resolving === foundInStore + fetched && resolutionDone) { - return { - fixed: false, - msg: `${msg}, done`, - } - } - return { - fixed: true, - msg, - } - }), - ), - ) - - outputs.push(progressSummaryOutput$) - - const tarballsProgressOutput$ = progressLog$ - .filter((log) => log.status === 'fetching_started' && - typeof log.size === 'number' && log.size >= BIG_TARBALL_SIZE) - .map((startedLog) => { - const size = prettyBytes(startedLog['size']) - return progressLog$ - .filter((log) => log.status === 'fetching_progress' && log.pkgId === startedLog['pkgId']) - .map((log) => log['downloaded']) - .startWith(0) - .map((downloadedRaw) => { - const done = startedLog['size'] === downloadedRaw - const downloaded = prettyBytes(downloadedRaw) - return { - fixed: !done, - msg: `Downloading ${hlPkgId(startedLog['pkgId'])}: ${hlValue(downloaded)}/${hlValue(size)}${done ? ', done' : ''}`, - } - }) - }) - - outputs.push(tarballsProgressOutput$) - - if (!isRecursive) { - const deprecationLog$ = log$ - .filter((log) => log.name === 'pnpm:deprecation') as Stream - - const pkgsDiff$ = getPkgsDiff(log$, deprecationLog$) - - const summaryLog$ = log$ - .filter((log) => log.name === 'pnpm:summary') - .take(1) - - const summaryOutput$ = xs.combine( - pkgsDiff$, - summaryLog$, - ) - .map(R.apply((pkgsDiff) => { - let msg = '' - for (const depType of ['prod', 'optional', 'dev']) { - const diffs = R.values(pkgsDiff[depType]) - if (diffs.length) { - msg += EOL - msg += chalk.blue(`${propertyByDependencyType[depType]}:`) - msg += EOL - msg += printDiffs(diffs) - msg += EOL - } - } - return {msg} - })) - .take(1) - .map(xs.of) - - outputs.push(summaryOutput$) - - const deprecationOutput$ = deprecationLog$ - // print warnings only about deprecated packages from the root - .filter((log) => log.depth === 0) - .map((log) => { - return { - msg: formatWarn(`${chalk.red('deprecated')} ${log.pkgName}@${log.pkgVersion}: ${log.deprecated}`), - } - }) - .map(xs.of) - - outputs.push(deprecationOutput$) - } - - const lifecycleMessages: {[pkgId: string]: string} = {} - const lifecycleOutput$ = xs.of( - log$ - .filter((log) => log.name === 'pnpm:lifecycle') - .map((log: LifecycleLog) => { - const key = `${log.script}:${log.pkgId}` - lifecycleMessages[key] = formatLifecycle(log) - return R.values(lifecycleMessages).join(EOL) - }) - .map((msg) => ({msg})), - ) - - outputs.push(lifecycleOutput$) - - if (!isRecursive) { - const installCheckOutput$ = log$ - .filter((log) => log.name === 'pnpm:install-check') - .map(formatInstallCheck) - .filter(Boolean) - .map((msg) => ({msg})) - .map(xs.of) as Stream> - - outputs.push(installCheckOutput$) - - const registryOutput$ = log$ - .filter((log) => log.name === 'pnpm:registry' && log.level === 'warn') - .map((log: RegistryLog) => ({msg: formatWarn(log.message)})) - .map(xs.of) - - outputs.push(registryOutput$) - - const miscOutput$ = log$ - .filter((log) => log.name as string === 'pnpm' || !isRecursive && log.name as string === 'pnpm:link') - .map((obj) => { - if (obj.level === 'debug') return - if (obj.level === 'warn') { - return formatWarn(obj['message']) - } - if (obj.level === 'error') { - return reportError(obj) - } - return obj['message'] - }) - .map((msg) => ({msg})) - .map(xs.of) - - outputs.push(miscOutput$) - } + const outputs: Array>> = reporterForClient(log$, isRecursive) return mergeOutputs(outputs) } - -function mergeOutputs (outputs: Array>>): Stream { - let blockNo = 0 - let fixedBlockNo = 0 - let started = false - return flattenConcurrently( - (xs.merge.apply(xs, outputs) as xs>) - .map((log: Stream<{msg: string, fixed: boolean}>) => { - let currentBlockNo = -1 - let currentFixedBlockNo = -1 - let calculated = false - let fixedCalculated = false - return log - .map((msg) => { - if (msg['fixed']) { - if (!fixedCalculated) { - fixedCalculated = true - currentFixedBlockNo = fixedBlockNo++ - } - return { - blockNo: currentFixedBlockNo, - fixed: true, - msg: msg.msg, - } - } - if (!calculated) { - calculated = true - currentBlockNo = blockNo++ - } - return { - blockNo: currentBlockNo, - fixed: false, - msg: typeof msg === 'string' ? msg : msg.msg, - prevFixedBlockNo: currentFixedBlockNo, - } - }) - }), - ) - .fold((acc, log) => { - if (log.fixed === true) { - acc.fixedBlocks[log.blockNo] = log.msg - } else { - delete acc.fixedBlocks[log['prevFixedBlockNo']] - acc.blocks[log.blockNo] = log.msg - } - return acc - }, {fixedBlocks: [], blocks: []} as {fixedBlocks: string[], blocks: string[]}) - .map((sections) => { - const fixedBlocks = sections.fixedBlocks.filter(Boolean) - const nonFixedPart = sections.blocks.filter(Boolean).join(EOL) - if (!fixedBlocks.length) { - return nonFixedPart - } - const fixedPart = fixedBlocks.join(EOL) - if (!nonFixedPart) { - return fixedPart - } - return chalk.dim(nonFixedPart) + EOL + fixedPart - }) - .filter((msg) => { - if (started) { - return true - } - if (msg === '') return false - started = true - return true - }) - .compose(dropRepeats()) -} - -function printDiffs (pkgsDiff: PackageDiff[]) { - // Sorts by alphabet then by removed/added - // + ava 0.10.0 - // - chalk 1.0.0 - // + chalk 2.0.0 - pkgsDiff.sort((a, b) => (a.name.localeCompare(b.name) * 10 + (Number(!b.added) - Number(!a.added)))) - const msg = pkgsDiff.map((pkg) => { - let result = pkg.added - ? addedSign - : pkg.linked - ? linkSign - : removedSign - if (!pkg.realName || pkg.name === pkg.realName) { - result += ` ${pkg.name}` - } else { - result += ` ${pkg.name} <- ${pkg.realName}` - } - if (pkg.version) { - result += ` ${chalk.grey(pkg.version)}` - if (pkg.latest && semver.lt(pkg.version, pkg.latest)) { - result += ` ${chalk.grey(`(${pkg.latest} is available)`)}` - } - } - if (pkg.deprecated) { - result += ` ${chalk.red('deprecated')}` - } - if (pkg.linked) { - result += ` ${chalk.magentaBright('linked from')} ${chalk.grey(pkg.from || '???')}` - } - return result - }).join(EOL) - return msg -} - -function formatLifecycle (logObj: LifecycleLog) { - const prefix = `Running ${hlValue(logObj.script)} for ${hlPkgId(logObj.pkgId)}` - if (logObj['exitCode'] === 0) { - return `${prefix}, done` - } - const line = formatLine(logObj) - if (logObj.level === 'error') { - return `${prefix}! ${line}` - } - return `${prefix}: ${line}` -} - -function formatLine (logObj: LifecycleLog) { - if (typeof logObj['exitCode'] === 'number') return chalk.red(`Exited with ${logObj['exitCode']}`) - - const color = logObj.level === 'error' ? chalk.red : chalk.gray - return color(logObj['line']) -} - -function formatInstallCheck (logObj: InstallCheckLog) { - switch (logObj.code) { - case 'EBADPLATFORM': - return formatWarn(`Unsupported system. Skipping dependency ${logObj.pkgId}`) - case 'ENOTSUP': - return logObj.toString() - default: - return - } -} - -function formatWarn (message: string) { - // The \u2009 is the "thin space" unicode character - // It is used instead of ' ' because chalk (as of version 2.1.0) - // trims whitespace at the beginning - return `${chalk.bgYellow.black('\u2009WARN\u2009')} ${message}` -} diff --git a/src/mergeOutputs.ts b/src/mergeOutputs.ts new file mode 100644 index 0000000000..98b6cd1042 --- /dev/null +++ b/src/mergeOutputs.ts @@ -0,0 +1,76 @@ +import chalk from 'chalk' +import os = require('os') +import xs, {Stream} from 'xstream' +import dropRepeats from 'xstream/extra/dropRepeats' +import flattenConcurrently from 'xstream/extra/flattenConcurrently' + +const EOL = os.EOL + +export default function mergeOutputs (outputs: Array>>): Stream { + let blockNo = 0 + let fixedBlockNo = 0 + let started = false + return flattenConcurrently( + (xs.merge.apply(xs, outputs) as xs>) + .map((log: Stream<{msg: string, fixed: boolean}>) => { + let currentBlockNo = -1 + let currentFixedBlockNo = -1 + let calculated = false + let fixedCalculated = false + return log + .map((msg) => { + if (msg['fixed']) { + if (!fixedCalculated) { + fixedCalculated = true + currentFixedBlockNo = fixedBlockNo++ + } + return { + blockNo: currentFixedBlockNo, + fixed: true, + msg: msg.msg, + } + } + if (!calculated) { + calculated = true + currentBlockNo = blockNo++ + } + return { + blockNo: currentBlockNo, + fixed: false, + msg: typeof msg === 'string' ? msg : msg.msg, + prevFixedBlockNo: currentFixedBlockNo, + } + }) + }), + ) + .fold((acc, log) => { + if (log.fixed === true) { + acc.fixedBlocks[log.blockNo] = log.msg + } else { + delete acc.fixedBlocks[log['prevFixedBlockNo']] + acc.blocks[log.blockNo] = log.msg + } + return acc + }, {fixedBlocks: [], blocks: []} as {fixedBlocks: string[], blocks: string[]}) + .map((sections) => { + const fixedBlocks = sections.fixedBlocks.filter(Boolean) + const nonFixedPart = sections.blocks.filter(Boolean).join(EOL) + if (!fixedBlocks.length) { + return nonFixedPart + } + const fixedPart = fixedBlocks.join(EOL) + if (!nonFixedPart) { + return fixedPart + } + return chalk.dim(nonFixedPart) + EOL + fixedPart + }) + .filter((msg) => { + if (started) { + return true + } + if (msg === '') return false + started = true + return true + }) + .compose(dropRepeats()) +} diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts new file mode 100644 index 0000000000..1a544d4624 --- /dev/null +++ b/src/reporterForClient.ts @@ -0,0 +1,292 @@ +import chalk from 'chalk' +import os = require('os') +import prettyBytes = require('pretty-bytes') +import R = require('ramda') +import semver = require('semver') +import { + DeprecationLog, + InstallCheckLog, + LifecycleLog, + Log, + ProgressLog, + RegistryLog, +} from 'supi' +import xs, {Stream} from 'xstream' +import getPkgsDiff, { + PackageDiff, + propertyByDependencyType, +} from './pkgsDiff' +import reportError from './reportError' + +const EOL = os.EOL +const BIG_TARBALL_SIZE = 1024 * 1024 * 5 // 5 MB + +const addedSign = chalk.green('+') +const removedSign = chalk.red('-') +const linkSign = chalk.magentaBright('#') +const hlValue = chalk.blue +const hlPkgId = chalk['whiteBright'] + +export default function ( + log$: xs, + isRecursive: boolean, +): Array>> { + const outputs: Array>> = [] + + const progressLog$ = log$ + .filter((log) => log.name === 'pnpm:progress') as Stream + + const resolutionDone$ = isRecursive + ? xs.never() + : log$ + .filter((log) => log.name === 'pnpm:stage' && log.message === 'resolution_done') + .mapTo(true) + .take(1) + .startWith(false) + + const resolvingContentLog$ = progressLog$ + .filter((log) => log.status === 'resolving_content') + .fold(R.inc, 0) + .drop(1) + .endWhen(resolutionDone$.last()) + + const fedtchedLog$ = progressLog$ + .filter((log) => log.status === 'fetched') + .fold(R.inc, 0) + + const foundInStoreLog$ = progressLog$ + .filter((log) => log.status === 'found_in_store') + .fold(R.inc, 0) + + if (!isRecursive) { + const alreadyUpToDate$ = xs.of( + resolvingContentLog$ + .take(1) + .mapTo(false) + .startWith(true) + .last() + .filter(R.equals(true)) + .mapTo({ + fixed: false, + msg: 'Already up-to-date', + }), + ) + + outputs.push(alreadyUpToDate$) + } + + const progressSummaryOutput$ = xs.of( + xs.combine( + resolvingContentLog$, + fedtchedLog$, + foundInStoreLog$, + isRecursive ? xs.of(false) : resolutionDone$, + ) + .map( + R.apply((resolving, fetched, foundInStore: number, resolutionDone) => { + const msg = `Resolving: total ${hlValue(resolving.toString())}, reused ${hlValue(foundInStore.toString())}, downloaded ${hlValue(fetched.toString())}` + if (resolving === foundInStore + fetched && resolutionDone) { + return { + fixed: false, + msg: `${msg}, done`, + } + } + return { + fixed: true, + msg, + } + }), + ), + ) + + outputs.push(progressSummaryOutput$) + + const tarballsProgressOutput$ = progressLog$ + .filter((log) => log.status === 'fetching_started' && + typeof log.size === 'number' && log.size >= BIG_TARBALL_SIZE) + .map((startedLog) => { + const size = prettyBytes(startedLog['size']) + return progressLog$ + .filter((log) => log.status === 'fetching_progress' && log.pkgId === startedLog['pkgId']) + .map((log) => log['downloaded']) + .startWith(0) + .map((downloadedRaw) => { + const done = startedLog['size'] === downloadedRaw + const downloaded = prettyBytes(downloadedRaw) + return { + fixed: !done, + msg: `Downloading ${hlPkgId(startedLog['pkgId'])}: ${hlValue(downloaded)}/${hlValue(size)}${done ? ', done' : ''}`, + } + }) + }) + + outputs.push(tarballsProgressOutput$) + + if (!isRecursive) { + const deprecationLog$ = log$ + .filter((log) => log.name === 'pnpm:deprecation') as Stream + + const pkgsDiff$ = getPkgsDiff(log$, deprecationLog$) + + const summaryLog$ = log$ + .filter((log) => log.name === 'pnpm:summary') + .take(1) + + const summaryOutput$ = xs.combine( + pkgsDiff$, + summaryLog$, + ) + .map(R.apply((pkgsDiff) => { + let msg = '' + for (const depType of ['prod', 'optional', 'dev']) { + const diffs = R.values(pkgsDiff[depType]) + if (diffs.length) { + msg += EOL + msg += chalk.blue(`${propertyByDependencyType[depType]}:`) + msg += EOL + msg += printDiffs(diffs) + msg += EOL + } + } + return {msg} + })) + .take(1) + .map(xs.of) + + outputs.push(summaryOutput$) + + const deprecationOutput$ = deprecationLog$ + // print warnings only about deprecated packages from the root + .filter((log) => log.depth === 0) + .map((log) => { + return { + msg: formatWarn(`${chalk.red('deprecated')} ${log.pkgName}@${log.pkgVersion}: ${log.deprecated}`), + } + }) + .map(xs.of) + + outputs.push(deprecationOutput$) + } + + const lifecycleMessages: {[pkgId: string]: string} = {} + const lifecycleOutput$ = xs.of( + log$ + .filter((log) => log.name === 'pnpm:lifecycle') + .map((log: LifecycleLog) => { + const key = `${log.script}:${log.pkgId}` + lifecycleMessages[key] = formatLifecycle(log) + return R.values(lifecycleMessages).join(EOL) + }) + .map((msg) => ({msg})), + ) + + outputs.push(lifecycleOutput$) + + if (!isRecursive) { + const installCheckOutput$ = log$ + .filter((log) => log.name === 'pnpm:install-check') + .map(formatInstallCheck) + .filter(Boolean) + .map((msg) => ({msg})) + .map(xs.of) as Stream> + + outputs.push(installCheckOutput$) + + const registryOutput$ = log$ + .filter((log) => log.name === 'pnpm:registry' && log.level === 'warn') + .map((log: RegistryLog) => ({msg: formatWarn(log.message)})) + .map(xs.of) + + outputs.push(registryOutput$) + + const miscOutput$ = log$ + .filter((log) => log.name as string === 'pnpm' || !isRecursive && log.name as string === 'pnpm:link') + .map((obj) => { + if (obj.level === 'debug') return + if (obj.level === 'warn') { + return formatWarn(obj['message']) + } + if (obj.level === 'error') { + return reportError(obj) + } + return obj['message'] + }) + .map((msg) => ({msg})) + .map(xs.of) + + outputs.push(miscOutput$) + } + + return outputs +} + +function printDiffs (pkgsDiff: PackageDiff[]) { + // Sorts by alphabet then by removed/added + // + ava 0.10.0 + // - chalk 1.0.0 + // + chalk 2.0.0 + pkgsDiff.sort((a, b) => (a.name.localeCompare(b.name) * 10 + (Number(!b.added) - Number(!a.added)))) + const msg = pkgsDiff.map((pkg) => { + let result = pkg.added + ? addedSign + : pkg.linked + ? linkSign + : removedSign + if (!pkg.realName || pkg.name === pkg.realName) { + result += ` ${pkg.name}` + } else { + result += ` ${pkg.name} <- ${pkg.realName}` + } + if (pkg.version) { + result += ` ${chalk.grey(pkg.version)}` + if (pkg.latest && semver.lt(pkg.version, pkg.latest)) { + result += ` ${chalk.grey(`(${pkg.latest} is available)`)}` + } + } + if (pkg.deprecated) { + result += ` ${chalk.red('deprecated')}` + } + if (pkg.linked) { + result += ` ${chalk.magentaBright('linked from')} ${chalk.grey(pkg.from || '???')}` + } + return result + }).join(EOL) + return msg +} + +function formatLifecycle (logObj: LifecycleLog) { + const prefix = `Running ${hlValue(logObj.script)} for ${hlPkgId(logObj.pkgId)}` + if (logObj['exitCode'] === 0) { + return `${prefix}, done` + } + const line = formatLine(logObj) + if (logObj.level === 'error') { + return `${prefix}! ${line}` + } + return `${prefix}: ${line}` +} + +function formatLine (logObj: LifecycleLog) { + if (typeof logObj['exitCode'] === 'number') return chalk.red(`Exited with ${logObj['exitCode']}`) + + const color = logObj.level === 'error' ? chalk.red : chalk.gray + return color(logObj['line']) +} + +function formatInstallCheck (logObj: InstallCheckLog) { + switch (logObj.code) { + case 'EBADPLATFORM': + return formatWarn(`Unsupported system. Skipping dependency ${logObj.pkgId}`) + case 'ENOTSUP': + return logObj.toString() + default: + return + } +} + +function formatWarn (message: string) { + // The \u2009 is the "thin space" unicode character + // It is used instead of ' ' because chalk (as of version 2.1.0) + // trims whitespace at the beginning + return `${chalk.bgYellow.black('\u2009WARN\u2009')} ${message}` +} From 96d3661d03c15831dee36c8c51ddef634784f9bc Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 22 Dec 2017 00:44:58 +0200 Subject: [PATCH 103/196] feat: implement reporting for `pnpm server` --- src/index.ts | 7 +++++ src/reporterForServer.ts | 60 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 src/reporterForServer.ts diff --git a/src/index.ts b/src/index.ts index 367491108f..a8d4b00da4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,11 +6,18 @@ import xs, {Stream} from 'xstream' import fromEvent from 'xstream/extra/fromEvent' import mergeOutputs from './mergeOutputs' import reporterForClient from './reporterForClient' +import reporterForServer from './reporterForServer' export default function ( streamParser: object, cmd?: string, // is optional only to be backward compatible ) { + if (cmd === 'server') { + const obs = fromEvent(streamParser as EventEmitter, 'data') + const log$ = xs.fromObservable(obs) + reporterForServer(log$) + return + } toOutput$(streamParser, cmd) .subscribe({ complete () {}, // tslint:disable-line:no-empty diff --git a/src/reporterForServer.ts b/src/reporterForServer.ts new file mode 100644 index 0000000000..d164faa7a0 --- /dev/null +++ b/src/reporterForServer.ts @@ -0,0 +1,60 @@ +import chalk from 'chalk' +import os = require('os') +import prettyBytes = require('pretty-bytes') +import R = require('ramda') +import semver = require('semver') +import { + DeprecationLog, + InstallCheckLog, + LifecycleLog, + Log, + ProgressLog, + RegistryLog, +} from 'supi' +import xs, {Stream} from 'xstream' +import getPkgsDiff, { + PackageDiff, + propertyByDependencyType, +} from './pkgsDiff' +import reportError from './reportError' + +const EOL = os.EOL + +export default function ( + log$: xs, +) { + const outputs: Array>> = [] + + log$.addListener({ + next (log) { + if (log.name === 'pnpm:progress') { + switch (log.status) { + case 'fetched': + case 'fetching_started': + console.log(`${chalk.cyan(log.status)} ${log.pkgId}`) + } + return + } + switch (log.level) { + case 'warn': + console.log(formatWarn(log['message'])) + return + case 'error': + console.log(reportError(log)) + return + case 'debug': + return + default: + console.log(log['message']) + return + } + }, + }) +} + +function formatWarn (message: string) { + // The \u2009 is the "thin space" unicode character + // It is used instead of ' ' because chalk (as of version 2.1.0) + // trims whitespace at the beginning + return `${chalk.bgYellow.black('\u2009WARN\u2009')} ${message}` +} From b48b0be5be932cf9232a2b0e56b259049cbe3008 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 22 Dec 2017 00:49:19 +0200 Subject: [PATCH 104/196] chore(release): 0.10.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 384aa95653..f694e8fc04 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.10.4", + "version": "0.10.5", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 81720d74bd3df3f01134755133a7f0ab4a2b65ac Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 23 Dec 2017 00:12:28 +0200 Subject: [PATCH 105/196] test: output during recursive install --- test/index.ts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/index.ts b/test/index.ts index 5f883ad52d..63fca20d7b 100644 --- a/test/index.ts +++ b/test/index.ts @@ -52,6 +52,27 @@ test('prints progress beginning', t => { }) }) +test('prints progress beginning during recursive install', t => { + const output$ = toOutput$(createStreamParser(), 'recursive') + + const pkgId = 'registry.npmjs.org/foo/1.0.0' + + progressLogger.debug({ + status: 'resolving_content', + pkgId, + }) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, `Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')}`) + }, + error: t.end, + complete: t.end, + }) +}) + test('prints progress on first download', t => { const output$ = toOutput$(createStreamParser()) From 0ce791ed70912230afddc0609b2e2219e6706afd Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 29 Dec 2017 21:28:08 +0200 Subject: [PATCH 106/196] Using most instead of xstream and adding stats logging (#5) * feat: print install stats BREAKING CHANGE: depends on supi@0.8 * refactor: use zen-push * perf: use most instead of xstream * feat: dependends on supi@0.8 BREAKING CHANGE: peer dependency update * test: remove unnecessary comments * feat: printing added/removed for whole line * refactor: no newline before added/removed * feat: print at least 1 add/remove sign when != 0 --- package.json | 14 +- shrinkwrap.yaml | 214 ++++++++++++++++++-------- src/index.ts | 87 +++++++++-- src/mergeOutputs.ts | 24 ++- src/pkgsDiff.ts | 52 ++++--- src/reporterForClient.ts | 200 ++++++++++++++++--------- src/reporterForServer.ts | 10 +- test/index.ts | 315 +++++++++++++++++++++++++++------------ typings/local.d.ts | 5 + 9 files changed, 641 insertions(+), 280 deletions(-) diff --git a/package.json b/package.json index f694e8fc04..99c11e7d5d 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,8 @@ "scripts": { "lint": "tslint -c tslint.json --project .", "pretty-test": "ts-node test | tap-diff", - "test": "npm run lint && npm run tsc && preview && ts-node test --type-check", + "test": "npm run lint && npm run just-test", + "just-test": "preview && ts-node test --type-check", "tsc": "rimraf lib && tsc", "prepublishOnly": "npm run tsc" }, @@ -37,7 +38,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "supi": "^0.7.0" + "supi": "^0.8.0" }, "dependencies": { "@types/common-tags": "^1.2.5", @@ -47,27 +48,30 @@ "chalk": "^2.2.0", "common-tags": "^1.4.0", "log-update": "^2.3.0", + "most": "^1.7.2", + "most-last": "^1.0.0", "ndjson": "^1.5.0", "pretty-bytes": "^4.0.2", "ramda": "^0.25.0", "semver": "^5.4.1", "stacktracey": "^1.2.87", - "xstream": "^11.0.0" + "zen-push": "^0.2.1" }, "devDependencies": { "@pnpm/logger": "^1.0.0", "@types/tape": "^4.2.30", "commitizen": "^2.9.5", + "delay": "^2.0.0", "ghooks": "^2.0.0", "mos-tap-diff": "^1.0.0", "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.7.7", + "supi": "^0.8.0", "tape": "^4.8.0", "ts-node": "^4.0.2", "tslint": "^5.7.0", - "typescript": "^2.1.5", + "typescript": "^2.6.2", "validate-commit-msg": "^2.8.2" }, "config": { diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 155752d20c..0adf424b2e 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -6,28 +6,53 @@ dependencies: chalk: 2.3.0 common-tags: 1.5.1 log-update: 2.3.0 + most: 1.7.2 + most-last: 1.0.0 ndjson: 1.5.0 pretty-bytes: 4.0.2 ramda: 0.25.0 semver: 5.4.1 stacktracey: 1.2.87 - xstream: 11.1.0 + zen-push: 0.2.1 devDependencies: '@pnpm/logger': 1.0.0 '@types/tape': 4.2.31 commitizen: 2.9.6 + delay: 2.0.0 ghooks: 2.0.2 mos-tap-diff: 1.0.0 normalize-newline: 3.0.0 package-preview: 1.0.3 rimraf: 2.6.2 - supi: 0.7.12 + supi: 0.8.0 tape: 4.8.0 ts-node: 4.0.2 tslint: 5.8.0 typescript: 2.6.2 validate-commit-msg: 2.14.0 packages: + /@most/multicast/1.3.0: + dependencies: + '@most/prelude': 1.7.0 + dev: false + peerDependencies: + most: ^1.0.1 + resolution: + integrity: sha512-DWH8AShgp5bXn+auGzf5tzPxvpmEvQJd0CNsApOci1LDF4eAEcnw4HQOr2Jaa+L92NbDYFKBSXxll+i7r1ikvw== + /@most/prelude/1.7.0: + dev: false + resolution: + integrity: sha512-OlDCH0+u2/ro/AHeAg63zvbvCsQC930hSKC9Kc1qSev1JkWK8Yk0HDHJ4o62HSjPwWGXEUZG1WhQKQh4ypreGA== + /@pnpm/check-package/1.0.0: + dependencies: + '@types/load-json-file': 2.0.7 + dint: 2.0.0 + load-json-file: 4.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-rN+hiOjGtxwwus7c/E0xkCs9prBeXzZCSCW/Q3k2WdHGSRNLAepr777iv+i2eqTfz9vXlTF0rLZOGi62ujzwYA== /@pnpm/default-fetcher/0.3.0: dependencies: '@pnpm/git-fetcher': 0.2.0 @@ -62,6 +87,16 @@ packages: node: '>=4' resolution: integrity: sha512-ZNaOAOvl9J45nhrnMcRxT9wd2G6hPzC444nRmo8Wk/GmY6dd8FVN/XG/nEdHPjcYPyyrW2UA3McNi+klB9oBHw== + /@pnpm/fs-locker/1.0.0: + dependencies: + '@types/node': 8.5.2 + mkdirp-promise: 5.0.1 + proper-lockfile: 2.0.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-JRIhC8lBFJjuaDnTMgCfCaO8IEa04JHCrNMW4RAjNrCeWBdcw2sczxp7qjqZPDc90z1VgUMlkpkGzXePcS9flQ== /@pnpm/git-fetcher/0.2.0: dependencies: '@types/node': 8.5.1 @@ -134,9 +169,11 @@ packages: '@pnpm/logger': ^1.0.0 resolution: integrity: sha512-9Ln3phdOdq0is/iVsqPQdB/JV9qtEi4Dq9kTMzHA1R898bSEsk8G3aSqbNFz6skTVYAuLMyiAdrVtJJ8FqJsgQ== - /@pnpm/package-requester/0.2.0: + /@pnpm/package-requester/0.5.1: dependencies: - '@pnpm/types': 1.3.0 + '@pnpm/check-package': 1.0.0 + '@pnpm/pkgid-to-filename': 1.0.0 + '@pnpm/types': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 '@types/p-queue': 1.1.0 @@ -146,13 +183,12 @@ packages: mz: 2.7.0 p-limit: 1.1.0 p-queue: 2.3.0 - package-store: 0.10.1 path-exists: 3.0.0 read-package-json: 2.0.12 rename-overwrite: 1.0.0 rimraf-then: 1.0.1 symlink-dir: 1.1.1 - unpack-stream: 2.2.0 + unpack-stream: 3.0.0 util.promisify: 1.0.0 write-json-file: 2.3.0 dev: true @@ -161,7 +197,15 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-boW7hvZzg/Od8+1OAP23Tsqk8bWvt8C28am5XcSIiEnfUZk20wk4fsfa9HePA7RopX17dy7Hs7bs5lfAUnhBLg== + integrity: sha1-c6ojXfjzO02De4BKzOIUFPq2afg= + /@pnpm/pkgid-to-filename/1.0.0: + dependencies: + normalize-path: 2.1.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-HnWDy3ecIKBsbRR9bwf+GJpV1CWLQ9Injj7eLSEQIsXQ+CLXU0h1NaxBCW7zcJm+2kbwnm0E1aFdFIEJXhHiTg== /@pnpm/tarball-fetcher/0.3.1: dependencies: '@types/mem': 1.1.2 @@ -195,6 +239,10 @@ packages: dev: true resolution: integrity: sha512-dhW0tHPWT19r1lwgv2RMnt31oC6PcsNeGcUlIDYRmC+J7g7Rcm19tZ0xmIAqh9R+U2Uw3PecXsuz+jkC/r5h+A== + /@pnpm/types/1.4.0: + dev: true + resolution: + integrity: sha512-VghLLKj5eoPnxl2H0g4uDrDzvVyDc1iqwk4JJN7iQJ6XuVdJvJsU0ecyywAT/XZKI8YZQNYm+zLlwuD4u4jpqQ== /@sindresorhus/is/0.6.0: dev: true engines: @@ -243,6 +291,10 @@ packages: /@types/node/8.5.1: resolution: integrity: sha512-SrmAO+NhnsuG/6TychSl2VdxBZiw/d6V+8j+DFo8O3PwFi+QeYXWHhAw+b170aSc6zYab6/PjEWRZHIDN9mNUw== + /@types/node/8.5.2: + dev: true + resolution: + integrity: sha512-KA4GKOpgXnrqEH2eCVhiv2CsxgXGQJgV1X0vsGlh+WCnxbeAE1GT44ZsTU1IN5dEeV/gDupKa7gWo08V5IxWVQ== /@types/nopt/3.0.29: dev: true resolution: @@ -265,10 +317,10 @@ packages: dev: true resolution: integrity: sha512-RcraK0229RAIJERTfgoCY/eSbxFEkPlj/TbUUb6aGSS9UfLj1THpt2Uj4uuCJsQrYRQUQB8tFlv7eTTWzE4QjQ== - /@types/ramda/0.25.3: + /@types/ramda/0.25.11: dev: true resolution: - integrity: sha512-wxs2s/qPon1Obr+0NSiBlF/6uHrFYmh+F14971ZIvpM9OUad2eMqDrPC6Cz5WZh50DNrKYz1C8dVIpWp7PVQ7w== + integrity: sha512-QE+w/NlQyrk/P9Iji4vZJIiJg0HRU6KsHkgPm4VJiGGxuvq4VGymvHtW+364c/YmvR2zzSujCKzrsa0/hHeCQQ== /@types/ramda/0.25.8: resolution: integrity: sha512-xLU94I8bn8pBAKdntp67DgSfvyHYqMjzSbUguScMywqKbrthrfsJcZX8hpp1Ih29cvUWWm26cdYtV5A+eF0QFQ== @@ -315,19 +367,6 @@ packages: node: '>=4' resolution: integrity: sha512-BDy1oz6aFYyY73618IkXzJzFghnXwVZDc3SVa6MVKTrrk4RgubahAF5yKK+Mx4a78tfO0OHeZnJKPs0pNy5uNA== - /@zkochan/npm-lifecycle/0.0.6: - dependencies: - byline: 5.0.0 - graceful-fs: 4.1.11 - node-gyp: 3.6.2 - resolve-from: 4.0.0 - slide: 1.1.6 - uid-number: 0.0.6 - umask: 1.1.0 - which: 1.3.0 - dev: true - resolution: - integrity: sha512-j1OJrYOACRfIHESTnvCBUg8WkVr7nHjkF/0A64qD/kabVulXJYGxu27w6Z9wrJHGQchePPCR31xJWOta4uVqxw== /@zkochan/npm-package-arg/1.0.0: dependencies: hosted-git-info: 2.5.0 @@ -1015,6 +1054,14 @@ packages: dev: true resolution: integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= + /delay/2.0.0: + dependencies: + p-defer: 1.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-kRLq3APk7H4AKXM3iW8nO72R+uU= /delayed-stream/1.0.0: dev: true engines: @@ -2477,6 +2524,20 @@ packages: dev: true resolution: integrity: sha1-NDOB0f2e1RljsLMVNbf9i64E/3A= + /most-last/1.0.0: + dev: false + peerDependencies: + most: ^1.0.3 + resolution: + integrity: sha1-Tj8LKJwkz5C52DhGdt6Qom43YXE= + /most/1.7.2: + dependencies: + '@most/multicast': 1.3.0 + '@most/prelude': 1.7.0 + symbol-observable: 1.1.0 + dev: false + resolution: + integrity: sha512-jDSzUa7HPT79RqLEdrBnYpGZ5DXx8SSDYkS7W6ErBUgU0ewaNDLIdqLJ6GlzXK90eCaDzXm0B1C0KmfTT0XdZQ== /move-concurrently/1.0.1: dependencies: aproba: 1.2.0 @@ -2627,6 +2688,19 @@ packages: node: '>=4' resolution: integrity: sha1-4E2KNp86TK3IUKKFT4+w+KgSAyg= + /npm-lifecycle/2.0.0: + dependencies: + byline: 5.0.0 + graceful-fs: 4.1.11 + node-gyp: 3.6.2 + resolve-from: 4.0.0 + slide: 1.1.6 + uid-number: 0.0.6 + umask: 1.1.0 + which: 1.3.0 + dev: true + resolution: + integrity: sha512-aE7H012O01GKXT9BWnsGMLVci+MOgkhpSwq02ok20aXcNHxFs7enfampNMkiOV1DJEU0LynzemwdjbtXahXKcw== /npm-run-path/2.0.2: dependencies: path-key: 2.0.1 @@ -2748,6 +2822,12 @@ packages: node: '>=4' resolution: integrity: sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw== + /p-defer/1.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= /p-every/1.0.2: dependencies: p-map: 1.2.0 @@ -2848,20 +2928,24 @@ packages: node: '>=4' resolution: integrity: sha512-nigldHuSWszV5IK53dfOdpgfLsG0++QwNAFIFo5bgv5MPm/F4tiDJX240CJ+wZVzftbPGBmk4bnN/UB8wHFoeA== - /package-store/0.10.1: + /package-store/0.12.0: dependencies: + '@pnpm/fs-locker': 1.0.0 + '@pnpm/package-requester': 0.5.1 + '@pnpm/types': 1.4.0 '@types/load-json-file': 2.0.7 - '@types/node': 8.5.1 - '@types/ramda': 0.25.8 - dint: 2.0.0 + '@types/node': 8.5.2 + '@types/ramda': 0.25.11 drive-by-path: 1.0.0 encode-registry: 1.1.0 load-json-file: 4.0.0 - mz: 2.7.0 - normalize-path: 2.1.1 os-homedir: 1.0.2 + p-filter: 1.0.0 + p-limit: 1.1.0 path-absolute: 1.0.0 + path-exists: 3.0.0 ramda: 0.25.0 + rimraf-then: 1.0.1 write-json-file: 2.3.0 dev: true engines: @@ -2869,7 +2953,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-42OC/ytnVm+Tpzl3L8hdEAy+oAHd2wLcu85fnAL/4CEe7Zq/PjWHmrfmeJ3+YC6isMDD0avcIHaEhsbhEnyhvA== + integrity: sha512-7v7yN1cIzsRwJj/7sEc6XdVSUgpaHdYZkXQDm3nZViCLK0/J/gNRhzcY9wI5Fdy5RqY/RK+4gAO6MQ9OVSWQHg== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -3707,6 +3791,7 @@ packages: /strip-ansi/4.0.0: dependencies: ansi-regex: 3.0.0 + dev: false engines: node: '>=4' resolution: @@ -3735,12 +3820,15 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.7.12: + /supi/0.8.0: dependencies: + '@pnpm/check-package': 1.0.0 '@pnpm/default-fetcher': 0.3.0 '@pnpm/default-resolver': 0.1.0 - '@pnpm/package-requester': 0.2.0 - '@pnpm/types': 1.3.0 + '@pnpm/fs-locker': 1.0.0 + '@pnpm/package-requester': 0.5.1 + '@pnpm/pkgid-to-filename': 1.0.0 + '@pnpm/types': 1.4.0 '@types/byline': 4.2.31 '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 @@ -3749,12 +3837,11 @@ packages: '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 - '@types/ramda': 0.25.3 + '@types/ramda': 0.25.11 '@types/rc': 0.0.1 '@types/semver': 5.4.0 '@types/update-notifier': 1.0.2 '@zkochan/cmd-shim': 2.2.4 - '@zkochan/npm-lifecycle': 0.0.6 '@zkochan/npm-package-arg': 1.0.0 arr-flatten: 1.1.0 byline: 5.0.0 @@ -3763,7 +3850,6 @@ packages: dependency-path: 1.2.0 encode-registry: 1.1.0 execa: 0.8.0 - find-up: 2.1.0 get-npm-tarball-url: 2.0.0 graceful-fs: 4.1.11 is-ci: 1.0.10 @@ -3775,20 +3861,19 @@ packages: mkdirp-promise: 5.0.1 mz: 2.7.0 ncp: 2.0.0 - node-gyp: 3.6.2 normalize-path: 2.1.1 normalize-registry-url: 1.0.0 + npm-lifecycle: 2.0.0 os-homedir: 1.0.2 p-filter: 1.0.0 p-limit: 1.1.0 p-series: 1.0.0 - package-store: 0.10.1 + package-store: 0.12.0 path-absolute: 1.0.0 path-exists: 3.0.0 path-name: 1.0.0 pnpm-install-checks: 1.1.0 pnpm-shrinkwrap: 5.0.0 - proper-lockfile: 2.0.1 ramda: 0.25.0 read-package-json: 2.0.12 remove-all-except-outer-links: 1.0.3 @@ -3797,6 +3882,7 @@ packages: symlink-dir: 1.1.1 thenify: 3.3.0 validate-npm-package-name: 3.0.0 + version-selector-type: 2.0.0 write-pkg: 3.1.0 write-yaml-file: 1.0.0 dev: true @@ -3805,7 +3891,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-Xooh51cW1NAEH8t6+Guv+nTh+cO0OMps6jXszcWWmfL7g5SeiLypRwXF786595U5gO5RxmG4Gi34OqXsKoZvsQ== + integrity: sha512-01rDBr9USddexMH5hduSvX5usO5IRNSVd/ez4WkT6TvAIlqzKlPF3pbwCJhMmC7NoXnuYCCKIl42zpcqkaPTaA== /supports-color/0.2.0: dev: true engines: @@ -3825,12 +3911,12 @@ packages: node: '>=4' resolution: integrity: sha1-vnoN5ITexcXN34s9WRJQRJEvY1s= - /symbol-observable/1.0.4: + /symbol-observable/1.1.0: dev: false engines: node: '>=0.10.0' resolution: - integrity: sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0= + integrity: sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw== /symlink-dir/1.1.1: dependencies: '@types/mz': 0.0.32 @@ -4068,20 +4154,9 @@ packages: dev: true resolution: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= - /unpack-stream/2.2.0: - dependencies: - '@types/node': 8.5.1 - decompress-maybe: 1.0.0 - ssri: 5.0.0 - tar-fs: 1.16.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha512-UU/97pTZMXBpWGRJLmmDq2mN3v3dBbFgrUNH26UpfvyVwbO1i0ZZnzQvm7YEoTcMJpFpuX9LWGYNu2rmh6K4Jg== /unpack-stream/3.0.0: dependencies: - '@types/node': 8.5.1 + '@types/node': 8.5.2 decompress-maybe: 1.0.0 ssri: 5.0.0 tar-fs: 1.16.0 @@ -4166,6 +4241,14 @@ packages: '0': node >=0.6.0 resolution: integrity: sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + /version-selector-type/2.0.0: + dependencies: + semver: 5.4.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-FYMSYiI76Pd8twRTtV/DBmDkZcrMqET3ar5G+alR7/VQgo2iwnu1xlgzpvaWUCwdx5R+mq8HxgFeSnJpssV17A== /which/1.3.0: dependencies: isexe: 2.0.0 @@ -4245,12 +4328,6 @@ packages: dev: true resolution: integrity: sha1-e0vQ33LKE/vp1rAXj9g8B3uOqGs= - /xstream/11.1.0: - dependencies: - symbol-observable: 1.0.4 - dev: false - resolution: - integrity: sha512-3xFreYPNXbuEeWv0CP2FKP4u9QmCz63m8Fpqga5kujQRWn6k5yP2XIsFZmvE2ycb84I8sixpYCUMfmt8KIKn9g== /xtend/4.0.1: engines: node: '>=0.4' @@ -4270,6 +4347,16 @@ packages: node: '>=4' resolution: integrity: sha1-5a2ryKz0CPY4X8dklWhMiOavaJo= + /zen-observable/0.7.1: + dev: false + resolution: + integrity: sha512-OI6VMSe0yeqaouIXtedC+F55Sr6r9ppS7+wTbSexkYdHbdt4ctTuPNXP/rwm7GTVI63YBc+EBT0b0tl7YnJLRg== + /zen-push/0.2.1: + dependencies: + zen-observable: 0.7.1 + dev: false + resolution: + integrity: sha512-Qv4qvc8ZIue51B/0zmeIMxpIGDVhz4GhJALBvnKs/FRa2T7jy4Ori9wFwaHVt0zWV7MIFglKAHbgnVxVTw7U1w== registry: 'https://registry.npmjs.org/' shrinkwrapMinorVersion: 4 shrinkwrapVersion: 3 @@ -4283,9 +4370,12 @@ specifiers: chalk: ^2.2.0 commitizen: ^2.9.5 common-tags: ^1.4.0 + delay: ^2.0.0 ghooks: ^2.0.0 log-update: ^2.3.0 mos-tap-diff: ^1.0.0 + most: ^1.7.2 + most-last: ^1.0.0 ndjson: ^1.5.0 normalize-newline: ^3.0.0 package-preview: ^1.0.0 @@ -4294,10 +4384,10 @@ specifiers: rimraf: ^2.5.4 semver: ^5.4.1 stacktracey: ^1.2.87 - supi: ^0.7.7 + supi: ^0.8.0 tape: ^4.8.0 ts-node: ^4.0.2 tslint: ^5.7.0 - typescript: ^2.1.5 + typescript: ^2.6.2 validate-commit-msg: ^2.8.2 - xstream: ^11.0.0 + zen-push: ^0.2.1 diff --git a/src/index.ts b/src/index.ts index a8d4b00da4..0ad800a983 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,9 +1,9 @@ import {EventEmitter} from 'events' import logUpdate = require('log-update') +import most = require('most') import R = require('ramda') -import {Log} from 'supi' -import xs, {Stream} from 'xstream' -import fromEvent from 'xstream/extra/fromEvent' +import * as supi from 'supi' +import PushStream = require('zen-push') import mergeOutputs from './mergeOutputs' import reporterForClient from './reporterForClient' import reporterForServer from './reporterForServer' @@ -11,10 +11,10 @@ import reporterForServer from './reporterForServer' export default function ( streamParser: object, cmd?: string, // is optional only to be backward compatible + width?: number, ) { if (cmd === 'server') { - const obs = fromEvent(streamParser as EventEmitter, 'data') - const log$ = xs.fromObservable(obs) + const log$ = most.fromEvent('data', streamParser) reporterForServer(log$) return } @@ -29,11 +29,78 @@ export default function ( export function toOutput$ ( streamParser: object, cmd?: string, // is optional only to be backward compatible -): Stream { + width?: number, +): most.Stream { const isRecursive = cmd === 'recursive' - const obs = fromEvent(streamParser as EventEmitter, 'data') - const log$ = xs.fromObservable(obs) - const outputs: Array>> = reporterForClient(log$, isRecursive) + const progressPushStream = new PushStream() + const stagePushStream = new PushStream() + const deprecationPushStream = new PushStream() + const summaryPushStream = new PushStream() + const lifecyclePushStream = new PushStream() + const statsPushStream = new PushStream() + const installCheckPushStream = new PushStream() + const registryPushStream = new PushStream() + const rootPushStream = new PushStream() + const packageJsonPushStream = new PushStream() + const linkPushStream = new PushStream() + const otherPushStream = new PushStream() + setTimeout(() => { // setTimeout is a workaround for a strange bug in most https://github.com/cujojs/most/issues/491 + streamParser['on']('data', (log: supi.Log) => { + switch (log.name) { + case 'pnpm:progress': + progressPushStream.next(log as supi.ProgressLog) + break + case 'pnpm:stage': + stagePushStream.next(log as supi.StageLog) + break + case 'pnpm:deprecation': + deprecationPushStream.next(log as supi.DeprecationLog) + break + case 'pnpm:summary': + summaryPushStream.next(log) + break + case 'pnpm:lifecycle': + lifecyclePushStream.next(log as supi.LifecycleLog) + break + case 'pnpm:stats': + statsPushStream.next(log as supi.StatsLog) + break + case 'pnpm:install-check': + installCheckPushStream.next(log as supi.InstallCheckLog) + break + case 'pnpm:registry': + registryPushStream.next(log as supi.RegistryLog) + break + case 'pnpm:root': + rootPushStream.next(log as supi.RootLog) + break + case 'pnpm:package-json': + packageJsonPushStream.next(log as supi.PackageJsonLog) + break + case 'pnpm:link' as any: // tslint:disable-line + linkPushStream.next(log) + break + case 'pnpm' as any: // tslint:disable-line + otherPushStream.next(log) + break + } + }) + }, 0) + const log$ = { + deprecation: most.from(deprecationPushStream.observable), + installCheck: most.from(installCheckPushStream.observable), + lifecycle: most.from(lifecyclePushStream.observable), + link: most.from(linkPushStream.observable), + other: most.from(otherPushStream.observable), + packageJson: most.from(packageJsonPushStream.observable), + progress: most.from(progressPushStream.observable), + registry: most.from(registryPushStream.observable), + root: most.from(rootPushStream.observable), + stage: most.from(stagePushStream.observable), + stats: most.from(statsPushStream.observable), + summary: most.from(summaryPushStream.observable), + } + const outputs: Array>> = reporterForClient(log$, isRecursive, cmd, width) - return mergeOutputs(outputs) + return mergeOutputs(outputs).multicast() } diff --git a/src/mergeOutputs.ts b/src/mergeOutputs.ts index 98b6cd1042..fad181c5e7 100644 --- a/src/mergeOutputs.ts +++ b/src/mergeOutputs.ts @@ -1,27 +1,22 @@ import chalk from 'chalk' +import most = require('most') import os = require('os') -import xs, {Stream} from 'xstream' -import dropRepeats from 'xstream/extra/dropRepeats' -import flattenConcurrently from 'xstream/extra/flattenConcurrently' const EOL = os.EOL -export default function mergeOutputs (outputs: Array>>): Stream { +export default function mergeOutputs (outputs: Array>>): most.Stream { let blockNo = 0 let fixedBlockNo = 0 let started = false - return flattenConcurrently( - (xs.merge.apply(xs, outputs) as xs>) - .map((log: Stream<{msg: string, fixed: boolean}>) => { + return most.join( + most.mergeArray(outputs) + .map((log: most.Stream<{msg: string}>) => { let currentBlockNo = -1 let currentFixedBlockNo = -1 - let calculated = false - let fixedCalculated = false return log .map((msg) => { if (msg['fixed']) { - if (!fixedCalculated) { - fixedCalculated = true + if (currentFixedBlockNo === -1) { currentFixedBlockNo = fixedBlockNo++ } return { @@ -30,8 +25,7 @@ export default function mergeOutputs (outputs: Array>>): St msg: msg.msg, } } - if (!calculated) { - calculated = true + if (currentBlockNo === -1) { currentBlockNo = blockNo++ } return { @@ -43,7 +37,7 @@ export default function mergeOutputs (outputs: Array>>): St }) }), ) - .fold((acc, log) => { + .scan((acc, log) => { if (log.fixed === true) { acc.fixedBlocks[log.blockNo] = log.msg } else { @@ -72,5 +66,5 @@ export default function mergeOutputs (outputs: Array>>): St started = true return true }) - .compose(dropRepeats()) + .skipRepeats() } diff --git a/src/pkgsDiff.ts b/src/pkgsDiff.ts index 2bfe86f8a7..30afc8313f 100644 --- a/src/pkgsDiff.ts +++ b/src/pkgsDiff.ts @@ -1,9 +1,10 @@ +import most = require('most') import R = require('ramda') import { DeprecationLog, Log, } from 'supi' -import xs, {Stream} from 'xstream' +import * as supi from 'supi' export interface PackageDiff { added: boolean, @@ -16,7 +17,7 @@ export interface PackageDiff { linked?: true, } -interface Map { +export interface Map { [index: string]: T, } @@ -26,20 +27,34 @@ export const propertyByDependencyType = { prod: 'dependencies', } -export default (log$: xs, deprecationLog$: xs) => { - const rootLog$ = log$.filter((log) => log.name === 'pnpm:root') - - const deprecationSet$ = deprecationLog$ - .fold((acc, log) => { +export default function ( + log$: { + progress: most.Stream, + stage: most.Stream, + deprecation: most.Stream, + summary: most.Stream, + lifecycle: most.Stream, + stats: most.Stream, + installCheck: most.Stream, + registry: most.Stream, + root: most.Stream, + packageJson: most.Stream, + link: most.Stream, + other: most.Stream, + }, +) { + const deprecationSet$ = log$.deprecation + .scan((acc, log) => { acc.add(log.pkgId) return acc }, new Set()) - const pkgsDiff$ = xs.combine( - rootLog$, + const pkgsDiff$ = most.combine( + (rootLog, deprecationSet) => [rootLog, deprecationSet], + log$.root, deprecationSet$, ) - .fold((pkgsDiff, args) => { + .scan((pkgsDiff, args) => { const rootLog = args[0] const deprecationSet = args[1] as Set if (rootLog['added']) { @@ -81,14 +96,12 @@ export default (log$: xs, deprecationLog$: xs) => { optional: Map, }) - const packageJson$ = log$ - .filter((log) => log.name === 'pnpm:package-json') - .take(2) - .fold(R.merge, {}) - .last() + const packageJson$ = most.fromPromise( + log$.packageJson.take(2).reduce(R.merge, {}), + ) - return xs.combine(pkgsDiff$, packageJson$) - .map(R.apply((pkgsDiff, packageJsons) => { + return most.combine( + (pkgsDiff, packageJsons) => { const initialPackageJson = packageJsons['initial'] const updatedPackageJson = packageJsons['updated'] @@ -123,5 +136,8 @@ export default (log$: xs, deprecationLog$: xs) => { } } return pkgsDiff - })) + }, + pkgsDiff$, + packageJson$, + ) } diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 1a544d4624..dc56df9ada 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -1,4 +1,6 @@ import chalk from 'chalk' +import most = require('most') +import {last as mostLast} from 'most-last' import os = require('os') import prettyBytes = require('pretty-bytes') import R = require('ramda') @@ -11,7 +13,7 @@ import { ProgressLog, RegistryLog, } from 'supi' -import xs, {Stream} from 'xstream' +import * as supi from 'supi' import getPkgsDiff, { PackageDiff, propertyByDependencyType, @@ -28,45 +30,59 @@ const hlValue = chalk.blue const hlPkgId = chalk['whiteBright'] export default function ( - log$: xs, + log$: { + progress: most.Stream, + stage: most.Stream, + deprecation: most.Stream, + summary: most.Stream, + lifecycle: most.Stream, + stats: most.Stream, + installCheck: most.Stream, + registry: most.Stream, + root: most.Stream, + packageJson: most.Stream, + link: most.Stream, + other: most.Stream, + }, isRecursive: boolean, -): Array>> { - const outputs: Array>> = [] - - const progressLog$ = log$ - .filter((log) => log.name === 'pnpm:progress') as Stream + cmd?: string, // is optional only to be backward compatible + widthArg?: number, +): Array>> { + const width = widthArg || process.stdout.columns || 80 + const outputs: Array>> = [] const resolutionDone$ = isRecursive - ? xs.never() - : log$ - .filter((log) => log.name === 'pnpm:stage' && log.message === 'resolution_done') - .mapTo(true) + ? most.never() + : log$.stage + .filter((log) => log.message === 'resolution_done') + .constant(true) .take(1) .startWith(false) - const resolvingContentLog$ = progressLog$ + const resolvingContentLog$ = log$.progress .filter((log) => log.status === 'resolving_content') - .fold(R.inc, 0) - .drop(1) - .endWhen(resolutionDone$.last()) + .scan(R.inc, 0) + .skip(1) + .until(mostLast(resolutionDone$)) - const fedtchedLog$ = progressLog$ + const fedtchedLog$ = log$.progress .filter((log) => log.status === 'fetched') - .fold(R.inc, 0) + .scan(R.inc, 0) - const foundInStoreLog$ = progressLog$ + const foundInStoreLog$ = log$.progress .filter((log) => log.status === 'found_in_store') - .fold(R.inc, 0) + .scan(R.inc, 0) if (!isRecursive) { - const alreadyUpToDate$ = xs.of( - resolvingContentLog$ - .take(1) - .mapTo(false) - .startWith(true) - .last() + const alreadyUpToDate$ = most.of( + mostLast( + resolvingContentLog$ + .take(1) + .constant(false) + .startWith(true), + ) .filter(R.equals(true)) - .mapTo({ + .constant({ fixed: false, msg: 'Already up-to-date', }), @@ -75,15 +91,9 @@ export default function ( outputs.push(alreadyUpToDate$) } - const progressSummaryOutput$ = xs.of( - xs.combine( - resolvingContentLog$, - fedtchedLog$, - foundInStoreLog$, - isRecursive ? xs.of(false) : resolutionDone$, - ) - .map( - R.apply((resolving, fetched, foundInStore: number, resolutionDone) => { + const progressSummaryOutput$ = most.of( + most.combine( + (resolving, fetched, foundInStore: number, resolutionDone) => { const msg = `Resolving: total ${hlValue(resolving.toString())}, reused ${hlValue(foundInStore.toString())}, downloaded ${hlValue(fetched.toString())}` if (resolving === foundInStore + fetched && resolutionDone) { return { @@ -95,18 +105,22 @@ export default function ( fixed: true, msg, } - }), + }, + resolvingContentLog$, + fedtchedLog$, + foundInStoreLog$, + isRecursive ? most.of(false) : resolutionDone$, ), ) outputs.push(progressSummaryOutput$) - const tarballsProgressOutput$ = progressLog$ + const tarballsProgressOutput$ = log$.progress .filter((log) => log.status === 'fetching_started' && typeof log.size === 'number' && log.size >= BIG_TARBALL_SIZE) .map((startedLog) => { const size = prettyBytes(startedLog['size']) - return progressLog$ + return log$.progress .filter((log) => log.status === 'fetching_progress' && log.pkgId === startedLog['pkgId']) .map((log) => log['downloaded']) .startWith(0) @@ -123,39 +137,35 @@ export default function ( outputs.push(tarballsProgressOutput$) if (!isRecursive) { - const deprecationLog$ = log$ - .filter((log) => log.name === 'pnpm:deprecation') as Stream + const pkgsDiff$ = getPkgsDiff(log$) - const pkgsDiff$ = getPkgsDiff(log$, deprecationLog$) - - const summaryLog$ = log$ - .filter((log) => log.name === 'pnpm:summary') + const summaryLog$ = log$.summary .take(1) - const summaryOutput$ = xs.combine( + const summaryOutput$ = most.combine( + (pkgsDiff) => { + let msg = '' + for (const depType of ['prod', 'optional', 'dev']) { + const diffs = R.values(pkgsDiff[depType]) + if (diffs.length) { + msg += EOL + msg += chalk.blue(`${propertyByDependencyType[depType]}:`) + msg += EOL + msg += printDiffs(diffs) + msg += EOL + } + } + return {msg} + }, pkgsDiff$, summaryLog$, ) - .map(R.apply((pkgsDiff) => { - let msg = '' - for (const depType of ['prod', 'optional', 'dev']) { - const diffs = R.values(pkgsDiff[depType]) - if (diffs.length) { - msg += EOL - msg += chalk.blue(`${propertyByDependencyType[depType]}:`) - msg += EOL - msg += printDiffs(diffs) - msg += EOL - } - } - return {msg} - })) .take(1) - .map(xs.of) + .map(most.of) outputs.push(summaryOutput$) - const deprecationOutput$ = deprecationLog$ + const deprecationOutput$ = log$.deprecation // print warnings only about deprecated packages from the root .filter((log) => log.depth === 0) .map((log) => { @@ -163,14 +173,14 @@ export default function ( msg: formatWarn(`${chalk.red('deprecated')} ${log.pkgName}@${log.pkgVersion}: ${log.deprecated}`), } }) - .map(xs.of) + .map(most.of) outputs.push(deprecationOutput$) } const lifecycleMessages: {[pkgId: string]: string} = {} - const lifecycleOutput$ = xs.of( - log$ + const lifecycleOutput$ = most.of( + log$.lifecycle .filter((log) => log.name === 'pnpm:lifecycle') .map((log: LifecycleLog) => { const key = `${log.script}:${log.pkgId}` @@ -183,24 +193,68 @@ export default function ( outputs.push(lifecycleOutput$) if (!isRecursive) { - const installCheckOutput$ = log$ - .filter((log) => log.name === 'pnpm:install-check') + outputs.push( + most.fromPromise( + log$.stats + .take((cmd === 'install' || cmd === 'update') ? 2 : 1) + .reduce((acc, log) => { + if (typeof log['added'] === 'number') { + acc['added'] = log['added'] + } else if (typeof log['removed'] === 'number') { + acc['removed'] = log['removed'] + } + return acc + }, {}), + ) + .map((stats) => { + if (!stats['removed'] && !stats['added']) { + return most.empty() + } + + let addSigns = (stats['added'] || 0) + let removeSigns = (stats['removed'] || 0) + const changes = addSigns + removeSigns + if (changes > width) { + if (!addSigns) { + addSigns = 0 + removeSigns = width + } else if (!removedSign) { + addSigns = width + removeSigns = 0 + } else { + const p = width / changes + addSigns = Math.min(Math.max(Math.floor(addSigns * p), 1), width - 1) + removeSigns = width - addSigns + } + } + let msg = 'Packages:' + if (stats['removed']) { + msg += ' ' + chalk.red(`-${stats['removed']}`) + } + if (stats['added']) { + msg += ' ' + chalk.green(`+${stats['added']}`) + } + msg += EOL + R.repeat(removedSign, removeSigns).join('') + R.repeat(addedSign, addSigns).join('') + return most.of({msg}) + }), + ) + + const installCheckOutput$ = log$.installCheck .map(formatInstallCheck) .filter(Boolean) .map((msg) => ({msg})) - .map(xs.of) as Stream> + .map(most.of) as most.Stream> outputs.push(installCheckOutput$) - const registryOutput$ = log$ - .filter((log) => log.name === 'pnpm:registry' && log.level === 'warn') + const registryOutput$ = log$.registry + .filter((log) => log.level === 'warn') .map((log: RegistryLog) => ({msg: formatWarn(log.message)})) - .map(xs.of) + .map(most.of) outputs.push(registryOutput$) - const miscOutput$ = log$ - .filter((log) => log.name as string === 'pnpm' || !isRecursive && log.name as string === 'pnpm:link') + const miscOutput$ = (!isRecursive ? most.merge(log$.link, log$.other) : log$.other) .map((obj) => { if (obj.level === 'debug') return if (obj.level === 'warn') { @@ -212,7 +266,7 @@ export default function ( return obj['message'] }) .map((msg) => ({msg})) - .map(xs.of) + .map(most.of) outputs.push(miscOutput$) } diff --git a/src/reporterForServer.ts b/src/reporterForServer.ts index d164faa7a0..5b69cbc393 100644 --- a/src/reporterForServer.ts +++ b/src/reporterForServer.ts @@ -1,4 +1,5 @@ import chalk from 'chalk' +import most = require('most') import os = require('os') import prettyBytes = require('pretty-bytes') import R = require('ramda') @@ -11,7 +12,6 @@ import { ProgressLog, RegistryLog, } from 'supi' -import xs, {Stream} from 'xstream' import getPkgsDiff, { PackageDiff, propertyByDependencyType, @@ -21,11 +21,11 @@ import reportError from './reportError' const EOL = os.EOL export default function ( - log$: xs, + log$: most.Stream, ) { - const outputs: Array>> = [] - - log$.addListener({ + log$.subscribe({ + complete: () => undefined, + error: () => undefined, next (log) { if (log.name === 'pnpm:progress') { switch (log.status) { diff --git a/test/index.ts b/test/index.ts index 63fca20d7b..2a73054325 100644 --- a/test/index.ts +++ b/test/index.ts @@ -1,13 +1,15 @@ import logger, { createStreamParser, } from '@pnpm/logger' +import delay = require('delay') import test = require('tape') import normalizeNewline = require('normalize-newline') import {toOutput$} from 'pnpm-default-reporter' import {stripIndents} from 'common-tags' import chalk from 'chalk' -import xs, {Stream} from 'xstream' +import most = require('most') import StackTracey = require('stacktracey') +import R = require('ramda') const WARN = chalk.bgYellow.black('\u2009WARN\u2009') const ERROR = chalk.bgRed.black('\u2009ERROR\u2009') @@ -30,6 +32,7 @@ const deprecationLogger = logger('deprecation') const summaryLogger = logger('summary') const lifecycleLogger = logger('lifecycle') const packageJsonLogger = logger('package-json') +const statsLogger = logger('stats') test('prints progress beginning', t => { const output$ = toOutput$(createStreamParser()) @@ -48,7 +51,7 @@ test('prints progress beginning', t => { t.equal(output, `Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')}`) }, error: t.end, - complete: t.end, + complete: () => t.end(), }) }) @@ -69,7 +72,7 @@ test('prints progress beginning during recursive install', t => { t.equal(output, `Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')}`) }, error: t.end, - complete: t.end, + complete: () => t.end(), }) }) @@ -89,18 +92,29 @@ test('prints progress on first download', t => { t.plan(1) - output$.drop(1).take(1).subscribe({ + output$.skip(1).take(1).subscribe({ next: output => { t.equal(output, `Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('1')}`) }, - complete: t.end, + complete: () => t.end(), error: t.end, }) }) -test('moves fixed line to the end', t => { +test('moves fixed line to the end', async t => { const output$ = toOutput$(createStreamParser()) + output$.skip(3).take(1).map(normalizeNewline).subscribe({ + next: output => { + t.equal(output, stripIndents` + ${WARN} foo + Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('1')}, done + `) + }, + complete: v => t.end(), + error: t.end, + }) + const pkgId = 'registry.npmjs.org/foo/1.0.0' progressLogger.debug({ @@ -112,20 +126,12 @@ test('moves fixed line to the end', t => { pkgId, }) logger.warn('foo') + + await delay(0) // w/o delay warning goes below for some reason. Started to happen after switch to most + stageLogger.debug('resolution_done') t.plan(1) - - output$.drop(3).take(1).map(normalizeNewline).subscribe({ - next: output => { - t.equal(output, stripIndents` - ${WARN} foo - Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('1')}, done - `) - }, - complete: t.end, - error: t.end, - }) }) test('prints "Already up-to-date"', t => { @@ -141,7 +147,7 @@ test('prints "Already up-to-date"', t => { Already up-to-date `) }, - complete: t.end, + complete: () => t.end(), error: t.end, }) }) @@ -245,7 +251,7 @@ test('prints summary', t => { t.plan(1) - output$.drop(1).take(1).map(normalizeNewline).subscribe({ + output$.skip(1).take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` ${WARN} ${DEPRECATED} bar@2.0.0: This package was deprecated because bla bla bla @@ -269,7 +275,7 @@ test('prints summary', t => { ${ADD} qar ${versionColor('2.0.0')} ` + '\n') }, - complete: t.end, + complete: () => t.end(), error: t.end, }) }) @@ -319,7 +325,7 @@ test('groups lifecycle output', t => { const childOutputColor = chalk.grey - output$.drop(6).take(1).map(normalizeNewline).subscribe({ + output$.skip(6).take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` Running ${PREINSTALL} for ${hlPkgId('registry.npmjs.org/foo/1.0.0')}: ${childOutputColor('foo')} @@ -328,7 +334,7 @@ test('groups lifecycle output', t => { Running ${INSTALL} for ${hlPkgId('registry.npmjs.org/qar/1.0.0')}, done `) }, - complete: t.end, + complete: () => t.end(), error: t.end, }) }) @@ -365,7 +371,7 @@ test['skip']('prints lifecycle progress', t => { const childOutputColor = chalk.grey const childOutputError = chalk.red - output$.drop(3).take(1).map(normalizeNewline).subscribe({ + output$.skip(3).take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` Running ${POSTINSTALL} for ${hlPkgId('registry.npmjs.org/foo/1.0.0')}: ${childOutputColor('foo I')} @@ -374,7 +380,7 @@ test['skip']('prints lifecycle progress', t => { Running ${POSTINSTALL} for ${hlPkgId('registry.npmjs.org/bar/1.0.0')}: ${childOutputColor('bar I')} `) }, - complete: t.end, + complete: () => t.end(), error: t.end, }) }) @@ -394,7 +400,7 @@ test('prints generic error', t => { ${new StackTracey(err.stack).pretty} `) }, - complete: t.end, + complete: () => t.end(), error: t.end, }) }) @@ -410,31 +416,90 @@ test('prints info', t => { next: output => { t.equal(output, 'info message') }, - complete: t.end, + complete: () => t.end(), error: t.end, }) }) -test('prints progress of big files download', t => { - let output$ = toOutput$(createStreamParser()).map(normalizeNewline) as Stream - const stream$: Stream[] = [] +test('prints progress of big files download', async t => { + t.plan(6) + + let output$ = toOutput$(createStreamParser()).map(normalizeNewline) as most.Stream + const stream$: most.Stream[] = [] const pkgId1 = 'registry.npmjs.org/foo/1.0.0' const pkgId2 = 'registry.npmjs.org/bar/2.0.0' const pkgId3 = 'registry.npmjs.org/qar/3.0.0' + stream$.push( + output$.take(1) + .tap(output => t.equal(output, `Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')}`)) + ) + + output$ = output$.skip(1) + + stream$.push( + output$.take(1) + .tap(output => t.equal(output, stripIndents` + Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} + Downloading ${hlPkgId(pkgId1)}: ${hlValue('0 B')}/${hlValue('10.5 MB')} + `)) + ) + + output$ = output$.skip(1) + + stream$.push( + output$.take(1) + .tap(output => t.equal(output, stripIndents` + Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} + Downloading ${hlPkgId(pkgId1)}: ${hlValue('5.77 MB')}/${hlValue('10.5 MB')} + `)) + ) + + output$ = output$.skip(2) + + stream$.push( + output$.take(1) + .tap(output => t.equal(output, stripIndents` + Resolving: total ${hlValue('2')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} + Downloading ${hlPkgId(pkgId1)}: ${hlValue('7.34 MB')}/${hlValue('10.5 MB')} + `, 'downloading of small package not reported')) + ) + + output$ = output$.skip(3) + + stream$.push( + output$.take(1) + .tap(output => t.equal(output, stripIndents` + Resolving: total ${hlValue('3')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} + Downloading ${hlPkgId(pkgId1)}: ${hlValue('7.34 MB')}/${hlValue('10.5 MB')} + Downloading ${hlPkgId(pkgId3)}: ${hlValue('19.9 MB')}/${hlValue('21 MB')} + `)) + ) + + output$ = output$.skip(1) + + stream$.push( + output$.take(1) + .tap(output => t.equal(output, stripIndents` + ${chalk.dim(`Downloading ${hlPkgId(pkgId1)}: ${hlValue('10.5 MB')}/${hlValue('10.5 MB')}, done`)} + Resolving: total ${hlValue('3')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} + Downloading ${hlPkgId(pkgId3)}: ${hlValue('19.9 MB')}/${hlValue('21 MB')} + `)) + ) + + most.mergeArray(stream$) + .subscribe({ + next: () => undefined, + complete: () => t.end(), + error: t.end, + }) + progressLogger.debug({ status: 'resolving_content', pkgId: pkgId1, }) - stream$.push( - output$.take(1) - .debug(output => t.equal(output, `Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')}`)) - ) - - output$ = output$.drop(1) - progressLogger.debug({ status: 'fetching_started', pkgId: pkgId1, @@ -442,15 +507,7 @@ test('prints progress of big files download', t => { attempt: 1, }) - stream$.push( - output$.take(1) - .debug(output => t.equal(output, stripIndents` - Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} - Downloading ${hlPkgId(pkgId1)}: ${hlValue('0 B')}/${hlValue('10.5 MB')} - `)) - ) - - output$ = output$.drop(1) + await delay(0) progressLogger.debug({ status: 'fetching_progress', @@ -458,16 +515,6 @@ test('prints progress of big files download', t => { downloaded: 1024 * 1024 * 5.5, // 5.5 MB }) - stream$.push( - output$.take(1) - .debug(output => t.equal(output, stripIndents` - Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} - Downloading ${hlPkgId(pkgId1)}: ${hlValue('5.77 MB')}/${hlValue('10.5 MB')} - `)) - ) - - output$ = output$.drop(1) - progressLogger.debug({ status: 'resolving_content', pkgId: pkgId2, @@ -486,16 +533,6 @@ test('prints progress of big files download', t => { downloaded: 1024 * 1024 * 7, }) - stream$.push( - output$.drop(1).take(1) - .debug(output => t.equal(output, stripIndents` - Resolving: total ${hlValue('2')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} - Downloading ${hlPkgId(pkgId1)}: ${hlValue('7.34 MB')}/${hlValue('10.5 MB')} - `, 'downloading of small package not reported')) - ) - - output$ = output$.drop(2) - progressLogger.debug({ status: 'resolving_content', pkgId: pkgId3, @@ -508,42 +545,136 @@ test('prints progress of big files download', t => { attempt: 1, }) + await delay(0) + progressLogger.debug({ status: 'fetching_progress', pkgId: pkgId3, downloaded: 1024 * 1024 * 19, // 19 MB }) - stream$.push( - output$.drop(2).take(1) - .debug(output => t.equal(output, stripIndents` - Resolving: total ${hlValue('3')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} - Downloading ${hlPkgId(pkgId1)}: ${hlValue('7.34 MB')}/${hlValue('10.5 MB')} - Downloading ${hlPkgId(pkgId3)}: ${hlValue('19.9 MB')}/${hlValue('21 MB')} - `)) - ) - - output$ = output$.drop(3) - progressLogger.debug({ status: 'fetching_progress', pkgId: pkgId1, downloaded: 1024 * 1024 * 10, // 10 MB }) - - stream$.push( - output$.take(1) - .debug(output => t.equal(output, stripIndents` - ${chalk.dim(`Downloading ${hlPkgId(pkgId1)}: ${hlValue('10.5 MB')}/${hlValue('10.5 MB')}, done`)} - Resolving: total ${hlValue('3')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} - Downloading ${hlPkgId(pkgId3)}: ${hlValue('19.9 MB')}/${hlValue('21 MB')} - `)) - ) - - xs.combine - .apply(xs, stream$) - .subscribe({ - complete: t.end, - error: t.end, - }) +}) + +test('prints added/removed stats during installation', t => { + const output$ = toOutput$(createStreamParser(), 'install') + + statsLogger.debug({ added: 5 }) + statsLogger.debug({ removed: 1 }) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, stripIndents` + Packages: ${chalk.red('-1')} ${chalk.green('+5')} + ${SUB}${ADD + ADD + ADD + ADD + ADD}` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) + +test('prints added/removed stats during installation when 0 removed', t => { + const output$ = toOutput$(createStreamParser(), 'install') + + statsLogger.debug({ added: 2 }) + statsLogger.debug({ removed: 0 }) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, stripIndents` + Packages: ${chalk.green('+2')} + ${ADD + ADD}` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) + +test('prints only the added stats if nothing was removed', t => { + const output$ = toOutput$(createStreamParser(), 'install') + + statsLogger.debug({ removed: 0 }) + statsLogger.debug({ added: 1 }) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, stripIndents` + Packages: ${chalk.green('+1')} + ${ADD}` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) + +test('prints at least one remove sign when removed !== 0', t => { + const output$ = toOutput$(createStreamParser(), 'install', 20) + + statsLogger.debug({ removed: 1 }) + statsLogger.debug({ added: 100 }) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, stripIndents` + Packages: ${chalk.red('-1')} ${chalk.green('+100')} + ${SUB}${R.repeat(ADD, 19).join('')}` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) + +test('prints at least one add sign when added !== 0', t => { + const output$ = toOutput$(createStreamParser(), 'install', 20) + + statsLogger.debug({ removed: 100 }) + statsLogger.debug({ added: 1 }) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, stripIndents` + Packages: ${chalk.red('-100')} ${chalk.green('+1')} + ${R.repeat(SUB, 19).join('')}${ADD}` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) + +test('prints just removed during uninstallation', t => { + const output$ = toOutput$(createStreamParser(), 'uninstall') + + statsLogger.debug({ removed: 4 }) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, stripIndents` + Packages: ${chalk.red('-4')} + ${SUB + SUB + SUB + SUB}` + ) + }, + complete: () => t.end(), + error: t.end, + }) }) diff --git a/typings/local.d.ts b/typings/local.d.ts index 8e18f4f394..57f6b0df30 100644 --- a/typings/local.d.ts +++ b/typings/local.d.ts @@ -22,3 +22,8 @@ declare module 'stacktracey' { const anything: any; export = anything; } + +declare module 'zen-push' { + const anything: any; + export = anything; +} From 9846d61fd83ee7be90f68079029573d6b8ef8409 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 29 Dec 2017 21:29:29 +0200 Subject: [PATCH 107/196] chore(release): 0.11.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 99c11e7d5d..6875ab410d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.10.5", + "version": "0.11.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 47791a6ceddabe2747197108c6a05b4e2de767fc Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 29 Dec 2017 22:39:53 +0200 Subject: [PATCH 108/196] fix: don't print the remove sign when nothing was removed --- src/reporterForClient.ts | 2 +- test/index.ts | 60 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index dc56df9ada..4bfc731310 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -218,7 +218,7 @@ export default function ( if (!addSigns) { addSigns = 0 removeSigns = width - } else if (!removedSign) { + } else if (!removeSigns) { addSigns = width removeSigns = 0 } else { diff --git a/test/index.ts b/test/index.ts index 2a73054325..fdb8e2eb19 100644 --- a/test/index.ts +++ b/test/index.ts @@ -620,6 +620,66 @@ test('prints only the added stats if nothing was removed', t => { }) }) +test('prints only the removed stats if nothing was added', t => { + const output$ = toOutput$(createStreamParser(), 'install') + + statsLogger.debug({ removed: 1 }) + statsLogger.debug({ added: 0 }) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, stripIndents` + Packages: ${chalk.red('-1')} + ${SUB}` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) + +test('prints only the added stats if nothing was removed and a lot added', t => { + const output$ = toOutput$(createStreamParser(), 'install', 20) + + statsLogger.debug({ removed: 0 }) + statsLogger.debug({ added: 100 }) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, stripIndents` + Packages: ${chalk.green('+100')} + ${R.repeat(ADD, 20).join('')}` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) + +test('prints only the removed stats if nothing was added and a lot removed', t => { + const output$ = toOutput$(createStreamParser(), 'install', 20) + + statsLogger.debug({ removed: 100 }) + statsLogger.debug({ added: 0 }) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, stripIndents` + Packages: ${chalk.red('-100')} + ${R.repeat(SUB, 20).join('')}` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) + test('prints at least one remove sign when removed !== 0', t => { const output$ = toOutput$(createStreamParser(), 'install', 20) From 6ab3d163eb0eee674593834239f8234d6172377a Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 29 Dec 2017 22:39:58 +0200 Subject: [PATCH 109/196] chore(release): 0.11.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6875ab410d..ad9182fc7c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.11.0", + "version": "0.11.1", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 670e7de7bd2af839e252939254b797fe5d80ac9a Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 31 Dec 2017 16:17:14 +0200 Subject: [PATCH 110/196] fix: don't fail if can't create nice stacktrace --- src/reportError.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/reportError.ts b/src/reportError.ts index b7eb113a17..73d217cf04 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -94,10 +94,18 @@ function formatRelatedSources (msg: object) { function formatGenericError (errorMessage: string, stack: object) { if (stack) { - return stripIndents` - ${formatErrorSummary(errorMessage)} - ${new StackTracey(stack).pretty} - ` + let prettyStack: string | undefined + try { + prettyStack = new StackTracey(stack).pretty + } catch (err) { + prettyStack = undefined + } + if (prettyStack) { + return stripIndents` + ${formatErrorSummary(errorMessage)} + ${prettyStack} + ` + } } return formatErrorSummary(errorMessage) } From 2bbce77cfc59e14a2963c8fe17289eb74e8d4e04 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 31 Dec 2017 16:17:20 +0200 Subject: [PATCH 111/196] chore(release): 0.11.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad9182fc7c..6ae03a355e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.11.1", + "version": "0.11.2", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From ba218c71dfac41c7401033f3bafacbbe79330dc1 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 3 Jan 2018 21:02:42 +0200 Subject: [PATCH 112/196] fix: update peerDependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6ae03a355e..eb3ae48eaf 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "supi": "^0.8.0" + "supi": ">=0.8.0 <0.10.0" }, "dependencies": { "@types/common-tags": "^1.2.5", From 67b296a23ce4417cdf9f7ef3a123c278069dfa3f Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 3 Jan 2018 21:03:04 +0200 Subject: [PATCH 113/196] chore(release): 0.11.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb3ae48eaf..3ea0c26d87 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.11.2", + "version": "0.11.3", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From ed7fc14874c7ab8120a15f175a903b36fdb064f8 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 8 Jan 2018 01:30:16 +0200 Subject: [PATCH 114/196] fix: update peerDependencies Works with supi@0.10.0 --- package.json | 4 +- shrinkwrap.yaml | 540 +++++------------------------------------------- 2 files changed, 58 insertions(+), 486 deletions(-) diff --git a/package.json b/package.json index 3ea0c26d87..157549f40b 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "supi": ">=0.8.0 <0.10.0" + "supi": ">=0.8.0 <0.11.0" }, "dependencies": { "@types/common-tags": "^1.2.5", @@ -67,7 +67,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.8.0", + "supi": "^0.10.0", "tape": "^4.8.0", "ts-node": "^4.0.2", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 0adf424b2e..3b7646201f 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -24,7 +24,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.3 rimraf: 2.6.2 - supi: 0.8.0 + supi: 0.10.0 tape: 4.8.0 ts-node: 4.0.2 tslint: 5.8.0 @@ -53,28 +53,6 @@ packages: node: '>=4' resolution: integrity: sha512-rN+hiOjGtxwwus7c/E0xkCs9prBeXzZCSCW/Q3k2WdHGSRNLAepr777iv+i2eqTfz9vXlTF0rLZOGi62ujzwYA== - /@pnpm/default-fetcher/0.3.0: - dependencies: - '@pnpm/git-fetcher': 0.2.0 - '@pnpm/tarball-fetcher': 0.3.1 - '@pnpm/types': 1.3.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha512-cgpFi6f0uJBhti7qqCO3uK7sw5tnOp6d4RfCRCDTEUqoWmOp7NwzflguSPnuPgD/sNrTCnj0SlGYnwEQlMhGOg== - /@pnpm/default-resolver/0.1.0: - dependencies: - '@pnpm/git-resolver': 0.3.0 - '@pnpm/local-resolver': 0.1.0 - '@pnpm/npm-resolver': 0.3.1 - '@pnpm/tarball-resolver': 0.1.0 - '@pnpm/types': 1.3.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha512-NeZBprWXvAM58LaHOhD8KrpjieW97SK+hWm4whmXjlsYDW3nNFAVvYUEz4E8vt3Y2LqCvux4G7xRAeSFYHqDhg== /@pnpm/exec/1.1.2: dependencies: '@types/got': 7.1.6 @@ -97,44 +75,6 @@ packages: node: '>=4' resolution: integrity: sha512-JRIhC8lBFJjuaDnTMgCfCaO8IEa04JHCrNMW4RAjNrCeWBdcw2sczxp7qjqZPDc90z1VgUMlkpkGzXePcS9flQ== - /@pnpm/git-fetcher/0.2.0: - dependencies: - '@types/node': 8.5.1 - dint: 2.0.0 - execa: 0.8.0 - rimraf-then: 1.0.1 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha512-IhFB0gZO38sf7hZAsIDuTcV3mtYggK20MHQjnPk0klCIMmJPpDlWQOQVOpmDTvXWrTl79bmjjvkwwfL/P7fUlQ== - /@pnpm/git-resolver/0.3.0: - dependencies: - '@types/node': 8.5.1 - got: 8.0.1 - graceful-git: 1.0.1 - hosted-git-info: 2.5.0 - normalize-ssh: 1.0.0 - dev: true - engines: - node: '>=4' - peerDependencies: - '@pnpm/logger': ^1.0.0 - resolution: - integrity: sha512-HBt5ySfGqXOKLk+mn9JVDJOmhc2sv9wZiOwgnX494Y0aYwf27lDjjJm5wbscsglMBnKpnybveWnc+6a/B08E+w== - /@pnpm/local-resolver/0.1.0: - dependencies: - '@pnpm/types': 1.3.0 - '@types/node': 8.5.1 - normalize-path: 2.1.1 - osenv: 0.1.4 - read-package-json: 2.0.12 - util.promisify: 1.0.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha512-CLtqpLDq06PLDMy8D1TJ+RW5gw7dXCcnN5wWkE29J5w8e025PKFKJEH8+dvr+zJCVTb2YHyk+Y+IwtOP6uMIIw== /@pnpm/logger/1.0.0: dependencies: '@types/node': 8.5.1 @@ -145,35 +85,11 @@ packages: node: '>=4' resolution: integrity: sha512-VRqE5/SiuR7ZrwBmS+Af89BTXli5xBbiqu7WPq56gEtWT8dKf9rFLoimmmMBVeRq5LmVZIXlOxs29F9I+vgSvQ== - /@pnpm/npm-resolver/0.3.1: - dependencies: - '@pnpm/types': 1.3.0 - '@types/load-json-file': 2.0.7 - '@types/mem': 1.1.2 - '@types/node': 8.5.1 - '@types/semver': 5.4.0 - '@types/write-json-file': 2.2.1 - credentials-by-uri: 1.0.0 - encode-registry: 1.1.0 - fetch-from-npm-registry: 0.1.0 - load-json-file: 4.0.0 - mem: 3.0.0 - p-limit: 1.1.0 - semver: 5.4.1 - ssri: 5.0.0 - write-json-file: 2.3.0 - dev: true - engines: - node: '>=4' - peerDependencies: - '@pnpm/logger': ^1.0.0 - resolution: - integrity: sha512-9Ln3phdOdq0is/iVsqPQdB/JV9qtEi4Dq9kTMzHA1R898bSEsk8G3aSqbNFz6skTVYAuLMyiAdrVtJJ8FqJsgQ== - /@pnpm/package-requester/0.5.1: + /@pnpm/package-requester/0.6.2: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/pkgid-to-filename': 1.0.0 - '@pnpm/types': 1.4.0 + '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 '@types/p-queue': 1.1.0 @@ -181,7 +97,7 @@ packages: load-json-file: 4.0.0 mkdirp-promise: 5.0.1 mz: 2.7.0 - p-limit: 1.1.0 + p-limit: 1.2.0 p-queue: 2.3.0 path-exists: 3.0.0 read-package-json: 2.0.12 @@ -197,7 +113,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha1-c6ojXfjzO02De4BKzOIUFPq2afg= + integrity: sha512-BOWtAMXWUfr2AP/tX5NQmVM33dQSL4JRbVDfW1CsK5v38yR5Vm9DTObvbhKwLD+JFRdV3suqYubwvSdmJvLaqw== /@pnpm/pkgid-to-filename/1.0.0: dependencies: normalize-path: 2.1.1 @@ -206,43 +122,10 @@ packages: node: '>=4' resolution: integrity: sha512-HnWDy3ecIKBsbRR9bwf+GJpV1CWLQ9Injj7eLSEQIsXQ+CLXU0h1NaxBCW7zcJm+2kbwnm0E1aFdFIEJXhHiTg== - /@pnpm/tarball-fetcher/0.3.1: - dependencies: - '@types/mem': 1.1.2 - '@types/mz': 0.0.32 - '@types/node': 8.5.1 - '@types/retry': 0.10.2 - credentials-by-uri: 1.0.0 - fetch-from-npm-registry: 0.1.0 - fs-write-stream-atomic: 1.0.10 - graceful-fs: 4.1.11 - mem: 3.0.0 - mkdirp-promise: 5.0.1 - mz: 2.7.0 - retry: 0.10.1 - ssri: 5.0.0 - unpack-stream: 3.0.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha512-gnh1si28RSaPqiaMKF7dlIOcrVrJOfjb7oIc9OPeIPE/1A5bxrEYpwU8G8c8pt3ELdgDGTQ35k6N1ioBFbuLPQ== - /@pnpm/tarball-resolver/0.1.0: - dependencies: - parse-npm-tarball-url: 1.0.1 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha512-Ieeu9Gg5qZkUdgnsHkjFlqr1Gp2z0LegDnCKe7l4l2klnH5Yp2fjqegfkebpM7Qut9YYe+aFsXFWxSCUk13Z8g== - /@pnpm/types/1.3.0: + /@pnpm/types/1.7.0: dev: true resolution: - integrity: sha512-dhW0tHPWT19r1lwgv2RMnt31oC6PcsNeGcUlIDYRmC+J7g7Rcm19tZ0xmIAqh9R+U2Uw3PecXsuz+jkC/r5h+A== - /@pnpm/types/1.4.0: - dev: true - resolution: - integrity: sha512-VghLLKj5eoPnxl2H0g4uDrDzvVyDc1iqwk4JJN7iQJ6XuVdJvJsU0ecyywAT/XZKI8YZQNYm+zLlwuD4u4jpqQ== + integrity: sha512-pn7g4uxcofWTNG/cxmKvkMK2lxr4OUIhrQDrEVYEdVhW0WkWztsHkFrYjFgfNzPbYu3ITlB3T6aSVjCoJQTOlw== /@sindresorhus/is/0.6.0: dev: true engines: @@ -274,20 +157,12 @@ packages: dev: true resolution: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== - /@types/mem/1.1.2: - dev: true - resolution: - integrity: sha1-48iwlfLyVjtRjwqtWd+f5qi4IGU= /@types/mz/0.0.32: dependencies: '@types/node': 8.5.1 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/7.0.50: - dev: true - resolution: - integrity: sha512-qtsQLhgNcooncOfFWpATbOI5Gw8chr5LQDmIbHBX9Nry1VThPid0jCMpsW8JTK27M11/nTTaKd74VYCxZRIGUg== /@types/node/8.5.1: resolution: integrity: sha512-SrmAO+NhnsuG/6TychSl2VdxBZiw/d6V+8j+DFo8O3PwFi+QeYXWHhAw+b170aSc6zYab6/PjEWRZHIDN9mNUw== @@ -295,6 +170,10 @@ packages: dev: true resolution: integrity: sha512-KA4GKOpgXnrqEH2eCVhiv2CsxgXGQJgV1X0vsGlh+WCnxbeAE1GT44ZsTU1IN5dEeV/gDupKa7gWo08V5IxWVQ== + /@types/node/8.5.7: + dev: true + resolution: + integrity: sha512-+1ZfzGIq8Y3EV7hPF7bs3i+Gi2mqYOiEGGRxGYPrn+hTYLMmzg+/5TkMkCHiRtLB38XSNvr/43aQ9+cUq4BbBg== /@types/nopt/3.0.29: dev: true resolution: @@ -313,14 +192,14 @@ packages: dev: true resolution: integrity: sha512-dwv960sf5inFWiufjhDfK7ZG3nYyHXt58I+14bJJBKV5MPlZm6Tu1sQS63NWEtLpIw6+RhbNbXjNStdMXxR8Nw== - /@types/ramda/0.0.11: - dev: true - resolution: - integrity: sha512-RcraK0229RAIJERTfgoCY/eSbxFEkPlj/TbUUb6aGSS9UfLj1THpt2Uj4uuCJsQrYRQUQB8tFlv7eTTWzE4QjQ== /@types/ramda/0.25.11: dev: true resolution: integrity: sha512-QE+w/NlQyrk/P9Iji4vZJIiJg0HRU6KsHkgPm4VJiGGxuvq4VGymvHtW+364c/YmvR2zzSujCKzrsa0/hHeCQQ== + /@types/ramda/0.25.13: + dev: true + resolution: + integrity: sha512-kovbyOtiNtGggxZ1PhhMpPWJr+vZgw1P9aUSLpTu6OUfWHlMSobnt1/vhHVYnqGrTUyevofrjB19RobEN5ZlFQ== /@types/ramda/0.25.8: resolution: integrity: sha512-xLU94I8bn8pBAKdntp67DgSfvyHYqMjzSbUguScMywqKbrthrfsJcZX8hpp1Ih29cvUWWm26cdYtV5A+eF0QFQ== @@ -328,10 +207,6 @@ packages: dev: true resolution: integrity: sha1-H1uKGzsaxtH+4TfFP6xfoPKK4Nc= - /@types/retry/0.10.2: - dev: true - resolution: - integrity: sha512-LqJkY4VQ7S09XhI7kA3ON71AxauROhSv74639VsNXC9ish4IWHnIi98if+nP1MxQV3RMPqXSCYgpPsDHjlg9UQ== /@types/semver/5.4.0: resolution: integrity: sha512-PBHCvO98hNec9A491vBbh0ZNDOVxccwKL1u2pm6fs9oDgm7SEnw0lEHqHfjsYryDxnE3zaf7LvERWEXjOp1hig== @@ -380,22 +255,6 @@ packages: dev: true resolution: integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - /agent-base/4.1.2: - dependencies: - es6-promisify: 5.0.0 - dev: true - engines: - node: '>= 4.0.0' - resolution: - integrity: sha512-VE6QoEdaugY86BohRtfGmTDabxdU5sCKOkbcPA6PXKJsRzEi/7A3RCTxJal1ft/4qSfPht5/iQLhMh/wzSkkNw== - /agentkeepalive/3.3.0: - dependencies: - humanize-ms: 1.2.1 - dev: true - engines: - node: '>= 4.0.0' - resolution: - integrity: sha512-9yhcpXti2ZQE7bxuCsjjWNIZoQOd9sZ1ZBovHG0YeCRohFv73SLvcm73PC9T3olM4GyozaQb+4MGdQpcD8m7NQ== /ajv/5.5.2: dependencies: co: 4.6.0 @@ -585,10 +444,6 @@ packages: node: 0.4 || >=0.5.8 resolution: integrity: sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo= - /bluebird/3.5.1: - dev: true - resolution: - integrity: sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA== /bole/3.0.2: dependencies: fast-safe-stringify: 1.1.13 @@ -669,24 +524,6 @@ packages: dev: true resolution: integrity: sha1-ya73AIprlDy+mcxhcSXrS9R4KWs= - /cacache/10.0.1: - dependencies: - bluebird: 3.5.1 - chownr: 1.0.1 - glob: 7.1.2 - graceful-fs: 4.1.11 - lru-cache: 4.1.1 - mississippi: 1.3.0 - mkdirp: 0.5.1 - move-concurrently: 1.0.1 - promise-inflight: 1.0.1 - rimraf: 2.6.2 - ssri: 5.0.0 - unique-filename: 1.1.0 - y18n: 3.2.1 - dev: true - resolution: - integrity: sha512-dRHYcs9LvG9cHgdPzjiI+/eS7e1xRhULrcyOx04RZQsszNJXU2SL9CyG60yLnge282Qq5nwTv+ieK2fH+WPZmA== /cacheable-request/2.1.3: dependencies: clone-response: 1.0.2 @@ -900,29 +737,12 @@ packages: dev: true resolution: integrity: sha1-XblXOdbCEqy+e29lahG5QLqmiUY= - /copy-concurrently/1.0.5: - dependencies: - aproba: 1.2.0 - fs-write-stream-atomic: 1.0.10 - iferr: 0.1.5 - mkdirp: 0.5.1 - rimraf: 2.6.2 - run-queue: 1.0.3 - dev: true - resolution: - integrity: sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== /core-js/2.5.3: resolution: integrity: sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4= /core-util-is/1.0.2: resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - /credentials-by-uri/1.0.0: - dependencies: - nerf-dart: 1.0.0 - dev: true - resolution: - integrity: sha512-WtoZkGQV2KgEfEqWKPetJ2btv+GxldzOe2vHVqAcyuiYdpIwCX7viL2+P9EaZLLfR+SFAZgPdP1+HZJ7MqRc2A== /cross-spawn/5.1.0: dependencies: lru-cache: 4.1.1 @@ -947,10 +767,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-mI3zP+qxke95mmE2nddsF635V+o= - /cyclist/0.2.2: - dev: true - resolution: - integrity: sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA= /cz-conventional-changelog/1.2.0: dependencies: conventional-commit-types: 2.2.0 @@ -976,16 +792,11 @@ packages: dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== - /debug/2.6.9: - dependencies: - ms: 2.0.0 - dev: true - resolution: - integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== /debug/3.1.0: dependencies: ms: 2.0.0 dev: true + optional: true resolution: integrity: sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== /decamelize-keys/1.1.0: @@ -1136,15 +947,14 @@ packages: engines: node: '>=4' optionalDependencies: - drivelist: 5.2.7 + drivelist: 5.2.12 resolution: integrity: sha512-FSY6axBYIVfYz9Rj6c6ECzcSxoNgqZRfAQP0kDiCVa38gPDzVyPWcEvxfDnJ96xW4oXLZLpiOloxRnC1sUKksA== - /drivelist/5.2.7: + /drivelist/5.2.12: dependencies: bindings: 1.3.0 debug: 3.1.0 js-yaml: 3.10.0 - lodash: 4.17.4 nan: 2.8.0 prebuild-install: 2.4.1 dev: true @@ -1152,7 +962,7 @@ packages: node: '>=4' optional: true resolution: - integrity: sha512-TslD6xoCLUUxlP9vNCixEkIwRv/aoCjVrdxiw5jd2iVWBS631DhashXYZaUek8TgfKnE59Sox4Wo12jVuM+XIg== + integrity: sha512-l4IYMiPaLjUb+wDb/az0xHwLNVK0X1OcXBTHK3UzUgZA89qG4nLpQ1chyWNRaFgFhy+a7EMKfOy5rpMstcH/TQ== /duplexer/0.1.1: dev: true resolution: @@ -1185,22 +995,12 @@ packages: node: '>=4' resolution: integrity: sha512-we1k9/KE1067YXEyJzPg+kXlNFLk9/LT2IFP3VZgmANNwf8Bx+KdAVd1wxLpG8y7v6EgplVGTstmVNICwiaCNA== - /encoding/0.1.12: - dependencies: - iconv-lite: 0.4.19 - dev: true - resolution: - integrity: sha1-U4tm8+5izRq1HsMjgp0flIDHS+s= /end-of-stream/1.4.0: dependencies: once: 1.4.0 dev: true resolution: integrity: sha1-epDYM+/abPpurA9JSduw+tOmMgY= - /err-code/1.1.2: - dev: true - resolution: - integrity: sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= /error-ex/1.3.1: dependencies: is-arrayish: 0.2.1 @@ -1229,16 +1029,6 @@ packages: node: '>= 0.4' resolution: integrity: sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0= - /es6-promise/4.1.1: - dev: true - resolution: - integrity: sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng== - /es6-promisify/5.0.0: - dependencies: - es6-promise: 4.1.1 - dev: true - resolution: - integrity: sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= /escape-string-regexp/1.0.5: engines: node: '>=0.8.0' @@ -1353,15 +1143,6 @@ packages: dev: true resolution: integrity: sha1-oB6c2cnkkXFcmKdaQtXwu9EH/3Y= - /fetch-from-npm-registry/0.1.0: - dependencies: - '@types/node': 8.5.1 - make-fetch-happen: 2.6.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha512-D6EKeLiF2gzSubC+kgS/LI8zEXfY9yRLIHxElV16yQ4zvC6LX91mJ3JrBbxce7oP82kheYMpNKX+iVhSuEdiRA== /figures/1.7.0: dependencies: escape-string-regexp: 1.0.5 @@ -1441,13 +1222,6 @@ packages: node: '>=0.6' resolution: integrity: sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs= - /flush-write-stream/1.0.2: - dependencies: - inherits: 2.0.3 - readable-stream: 2.3.3 - dev: true - resolution: - integrity: sha1-yBuQ2HRnZvGmCaRoCZRsRd2K5Bc= /for-each/0.3.2: dependencies: is-function: 1.0.1 @@ -1515,15 +1289,6 @@ packages: dev: true resolution: integrity: sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ== - /fs-write-stream-atomic/1.0.10: - dependencies: - graceful-fs: 4.1.11 - iferr: 0.1.5 - imurmurhash: 0.1.4 - readable-stream: 2.3.3 - dev: true - resolution: - integrity: sha1-tH31NJPvkR33VzHnCp3tAYnbQMk= /fs.realpath/1.0.0: dev: true resolution: @@ -1682,15 +1447,6 @@ packages: node: '>=0.4.0' resolution: integrity: sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg= - /graceful-git/1.0.1: - dependencies: - execa: 0.8.0 - retry: 0.10.1 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha512-tw+EeUeL5p8b312uJq6+Z6ld8M/rlkMSM7e3oGiRsfdDH3nH5I2u2aIhO5Sy6LWojzU92JTrZKP6T3D9YT6pwg== /graceful-readlink/1.0.1: dev: true resolution: @@ -1797,13 +1553,6 @@ packages: dev: true resolution: integrity: sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== - /http-proxy-agent/2.0.0: - dependencies: - agent-base: 4.1.2 - debug: 2.6.9 - dev: true - resolution: - integrity: sha1-RkgqLwUjpNYIJVFwn0acs+SoX/Q= /http-signature/1.2.0: dependencies: assert-plus: 1.0.0 @@ -1815,33 +1564,10 @@ packages: npm: '>=1.3.7' resolution: integrity: sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - /https-proxy-agent/2.1.1: - dependencies: - agent-base: 4.1.2 - debug: 3.1.0 - dev: true - resolution: - integrity: sha512-LK6tQUR/VOkTI6ygAfWUKKP95I+e6M1h7N3PncGu1CATHCnex+CAv9ttR0lbHu1Uk2PXm/WoAHFo6JCGwMjVMw== - /humanize-ms/1.2.1: - dependencies: - ms: 2.1.1 - dev: true - resolution: - integrity: sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= - /iconv-lite/0.4.19: - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ== /ieee754/1.1.8: dev: true resolution: integrity: sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q= - /iferr/0.1.5: - dev: true - resolution: - integrity: sha1-xg7taebY/bazEEofy8ocGS3FtQE= /imurmurhash/0.1.4: dev: true engines: @@ -1904,10 +1630,6 @@ packages: node: '>=4' resolution: integrity: sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY= - /ip/1.1.5: - dev: true - resolution: - integrity: sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= /is-arrayish/0.2.1: dev: true resolution: @@ -2082,12 +1804,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= - /is-ssh/1.3.0: - dependencies: - protocols: 1.4.6 - dev: true - resolution: - integrity: sha1-6+oRaaJhTaOSpjdANmw84EnY3/Y= /is-stream/1.1.0: dev: true engines: @@ -2352,22 +2068,6 @@ packages: dev: true resolution: integrity: sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y= - /make-fetch-happen/2.6.0: - dependencies: - agentkeepalive: 3.3.0 - cacache: 10.0.1 - http-cache-semantics: 3.8.1 - http-proxy-agent: 2.0.0 - https-proxy-agent: 2.1.1 - lru-cache: 4.1.1 - mississippi: 1.3.0 - node-fetch-npm: 2.0.2 - promise-retry: 1.1.1 - socks-proxy-agent: 3.0.1 - ssri: 5.0.0 - dev: true - resolution: - integrity: sha512-FFq0lNI0ax+n9IWzWpH8A4JdgYiAp2DDYIZ3rsaav8JDe8I+72CzK6PQW/oom15YDZpV5bYW/9INd6nIJ2ZfZw== /manage-path/2.0.0: dev: true resolution: @@ -2480,21 +2180,6 @@ packages: /minimist/1.2.0: resolution: integrity: sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= - /mississippi/1.3.0: - dependencies: - concat-stream: 1.6.0 - duplexify: 3.5.1 - end-of-stream: 1.4.0 - flush-write-stream: 1.0.2 - from2: 2.3.0 - parallel-transform: 1.1.0 - pump: 1.0.3 - pumpify: 1.3.5 - stream-each: 1.2.2 - through2: 2.0.3 - dev: true - resolution: - integrity: sha1-0gFYPrEjJ+PFwWQqQEqcrPlONPU= /mkdirp-promise/5.0.1: dependencies: mkdirp: 0.5.1 @@ -2538,25 +2223,11 @@ packages: dev: false resolution: integrity: sha512-jDSzUa7HPT79RqLEdrBnYpGZ5DXx8SSDYkS7W6ErBUgU0ewaNDLIdqLJ6GlzXK90eCaDzXm0B1C0KmfTT0XdZQ== - /move-concurrently/1.0.1: - dependencies: - aproba: 1.2.0 - copy-concurrently: 1.0.5 - fs-write-stream-atomic: 1.0.10 - mkdirp: 0.5.1 - rimraf: 2.6.2 - run-queue: 1.0.3 - dev: true - resolution: - integrity: sha1-viwAX9oy4LKa8fBdfEszIUxwH5I= /ms/2.0.0: dev: true + optional: true resolution: integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - /ms/2.1.1: - dev: true - resolution: - integrity: sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== /mute-stream/0.0.6: dev: true resolution: @@ -2586,10 +2257,6 @@ packages: through2: 2.0.3 resolution: integrity: sha1-rmA7NrE0vOw0e0UkIrC/mNWDLsg= - /nerf-dart/1.0.0: - dev: true - resolution: - integrity: sha1-5tq3/r9a2Bbqgc9cYpxaDr3nLBo= /next-path/1.0.0: dev: true engines: @@ -2603,16 +2270,6 @@ packages: optional: true resolution: integrity: sha512-hmUtb8m75RSi7N+zZLYqe75XDvZB+6LyTBPkj2DConvNgQet2e3BIqEwe1LLvqMrfyjabuT5ZOrTioLCH1HTdA== - /node-fetch-npm/2.0.2: - dependencies: - encoding: 0.1.12 - json-parse-better-errors: 1.0.1 - safe-buffer: 5.1.1 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw== /node-gyp/3.6.2: dependencies: fstream: 1.0.11 @@ -2671,13 +2328,6 @@ packages: dev: true resolution: integrity: sha512-0v6T4851b72ykk5zEtFoN4QX/Fqyk7pouIj9xZyAvAe9jlDhAwT4z6FlwsoQCHjeuK2EGUoAwy/F4y4B1uZq9A== - /normalize-ssh/1.0.0: - dependencies: - is-ssh: 1.3.0 - parse-url: 1.3.11 - dev: true - resolution: - integrity: sha1-Iqgwj6fNkyvbSa907KxkTPSmGWs= /normalize-url/2.0.0: dependencies: prepend-http: 2.0.0 @@ -2862,6 +2512,14 @@ packages: node: '>=4' resolution: integrity: sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw= + /p-limit/1.2.0: + dependencies: + p-try: 1.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng== /p-locate/2.0.0: dependencies: p-limit: 1.1.0 @@ -2904,6 +2562,12 @@ packages: node: '>=4' resolution: integrity: sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA== + /p-try/1.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= /package-preview/1.0.3: dependencies: '@pnpm/exec': 1.1.2 @@ -2928,20 +2592,20 @@ packages: node: '>=4' resolution: integrity: sha512-nigldHuSWszV5IK53dfOdpgfLsG0++QwNAFIFo5bgv5MPm/F4tiDJX240CJ+wZVzftbPGBmk4bnN/UB8wHFoeA== - /package-store/0.12.0: + /package-store/0.13.1: dependencies: '@pnpm/fs-locker': 1.0.0 - '@pnpm/package-requester': 0.5.1 - '@pnpm/types': 1.4.0 + '@pnpm/package-requester': 0.6.2 + '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 - '@types/node': 8.5.2 - '@types/ramda': 0.25.11 + '@types/node': 8.5.7 + '@types/ramda': 0.25.13 drive-by-path: 1.0.0 encode-registry: 1.1.0 load-json-file: 4.0.0 os-homedir: 1.0.2 p-filter: 1.0.0 - p-limit: 1.1.0 + p-limit: 1.2.0 path-absolute: 1.0.0 path-exists: 3.0.0 ramda: 0.25.0 @@ -2953,7 +2617,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-7v7yN1cIzsRwJj/7sEc6XdVSUgpaHdYZkXQDm3nZViCLK0/J/gNRhzcY9wI5Fdy5RqY/RK+4gAO6MQ9OVSWQHg== + integrity: sha512-RUVNg1b5BsU4uhEd2nWoaGdI6A2SeeN5wb7psNYNVhY4AaDc4F5EjHa4PhBWaKact0LKkjiGQYoLWhWjXQtRlA== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -2966,14 +2630,6 @@ packages: dev: true resolution: integrity: sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU= - /parallel-transform/1.1.0: - dependencies: - cyclist: 0.2.2 - inherits: 2.0.3 - readable-stream: 2.3.3 - dev: true - resolution: - integrity: sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY= /parse-glob/3.0.4: dependencies: glob-base: 0.3.0 @@ -3000,26 +2656,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0= - /parse-npm-tarball-url/1.0.1: - dependencies: - '@types/node': 7.0.50 - semver-regex: 1.0.0 - dev: true - resolution: - integrity: sha1-TfHPBF05fvLZw59RMImKiqjgYuQ= /parse-passwd/1.0.0: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= - /parse-url/1.3.11: - dependencies: - is-ssh: 1.3.0 - protocols: 1.4.6 - dev: true - resolution: - integrity: sha1-V8FUKKuKiSsfQ4aWRccR0OFEtVQ= /path-absolute/1.0.0: dependencies: os-homedir: 1.0.2 @@ -3117,23 +2759,25 @@ packages: dev: true resolution: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= - /pnpm-shrinkwrap/5.0.0: + /pnpm-shrinkwrap/5.1.0: dependencies: - '@types/node': 7.0.50 - '@types/ramda': 0.0.11 + '@types/node': 8.5.7 + '@types/ramda': 0.25.13 dependency-path: 1.2.0 js-yaml: 3.10.0 load-yaml-file: 0.1.0 mkdirp-promise: 5.0.1 - ramda: 0.24.1 + ramda: 0.25.0 rimraf-then: 1.0.1 thenify: 3.3.0 write-file-atomic: 2.3.0 dev: true + engines: + node: '>=4' peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-1flslfYroQpp2mseTwuifgOqjC64DRcqDXkjHmP89DE6/pkJoSmcG789wviHYQAZyo0KK06tF2FJf0z/XgjOlA== + integrity: sha512-MJBeQGhEagO5UmZZ2SELaLKtRXM8ey+mn4MZhmPKNgjZFHOeR411iIM1cyI3zFVziebLCPiLbhk4td33aKjFeQ== /prebuild-install/2.4.1: dependencies: expand-template: 1.1.0 @@ -3189,19 +2833,6 @@ packages: /process-nextick-args/1.0.7: resolution: integrity: sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= - /promise-inflight/1.0.1: - dev: true - resolution: - integrity: sha1-mEcocL8igTL8vdhoEputEsPAKeM= - /promise-retry/1.1.1: - dependencies: - err-code: 1.1.2 - retry: 0.10.1 - dev: true - engines: - node: '>=0.12' - resolution: - integrity: sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0= /proper-lockfile/2.0.1: dependencies: graceful-fs: 4.1.11 @@ -3211,10 +2842,6 @@ packages: node: '>=4.0.0' resolution: integrity: sha1-FZ+wYZPTIAP0s2kd0uwaY0qoDR0= - /protocols/1.4.6: - dev: true - resolution: - integrity: sha1-+LsmPqG1/Xp2BNJri+Ob13Z4v4o= /pseudomap/1.0.2: dev: true resolution: @@ -3523,12 +3150,6 @@ packages: node: '>=0.12.0' resolution: integrity: sha1-A3GrSuC91yDUFm19/aZP96RFpsA= - /run-queue/1.0.3: - dependencies: - aproba: 1.2.0 - dev: true - resolution: - integrity: sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec= /rx/4.1.0: dev: true resolution: @@ -3599,13 +3220,6 @@ packages: dev: true resolution: integrity: sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= - /smart-buffer/1.1.15: - dev: true - engines: - node: '>= 0.10.15' - npm: '>= 1.3.5' - resolution: - integrity: sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY= /sntp/2.1.0: dependencies: hoek: 4.2.0 @@ -3614,23 +3228,6 @@ packages: node: '>=4.0.0' resolution: integrity: sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg== - /socks-proxy-agent/3.0.1: - dependencies: - agent-base: 4.1.2 - socks: 1.1.10 - dev: true - resolution: - integrity: sha512-ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA== - /socks/1.1.10: - dependencies: - ip: 1.1.5 - smart-buffer: 1.1.15 - dev: true - engines: - node: '>= 0.10.0' - npm: '>= 1.3.5' - resolution: - integrity: sha1-W4t/x8jzQcU+0FbpKbe/Tei6e1o= /sort-keys/2.0.0: dependencies: is-plain-obj: 1.1.0 @@ -3717,13 +3314,6 @@ packages: dev: false resolution: integrity: sha1-5jFkdPtQPj88OCAw3YM8ey4JLe0= - /stream-each/1.2.2: - dependencies: - end-of-stream: 1.4.0 - stream-shift: 1.0.0 - dev: true - resolution: - integrity: sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA== /stream-shift/1.0.0: dev: true resolution: @@ -3820,15 +3410,13 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.8.0: + /supi/0.10.0: dependencies: '@pnpm/check-package': 1.0.0 - '@pnpm/default-fetcher': 0.3.0 - '@pnpm/default-resolver': 0.1.0 '@pnpm/fs-locker': 1.0.0 - '@pnpm/package-requester': 0.5.1 + '@pnpm/package-requester': 0.6.2 '@pnpm/pkgid-to-filename': 1.0.0 - '@pnpm/types': 1.4.0 + '@pnpm/types': 1.7.0 '@types/byline': 4.2.31 '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 @@ -3868,12 +3456,12 @@ packages: p-filter: 1.0.0 p-limit: 1.1.0 p-series: 1.0.0 - package-store: 0.12.0 + package-store: 0.13.1 path-absolute: 1.0.0 path-exists: 3.0.0 path-name: 1.0.0 pnpm-install-checks: 1.1.0 - pnpm-shrinkwrap: 5.0.0 + pnpm-shrinkwrap: 5.1.0 ramda: 0.25.0 read-package-json: 2.0.12 remove-all-except-outer-links: 1.0.3 @@ -3891,7 +3479,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-01rDBr9USddexMH5hduSvX5usO5IRNSVd/ez4WkT6TvAIlqzKlPF3pbwCJhMmC7NoXnuYCCKIl42zpcqkaPTaA== + integrity: sha512-k1fsSAMxK5AjqPB45vXZrojz/UvY+BMSut1nrFBv5MM7uBIrncljDKEElsem5yEkFGxIiRpbCwgaMvny+85DsQ== /supports-color/0.2.0: dev: true engines: @@ -4138,25 +3726,13 @@ packages: dev: true resolution: integrity: sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og== - /unique-filename/1.1.0: - dependencies: - unique-slug: 2.0.0 - dev: true - resolution: - integrity: sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM= - /unique-slug/2.0.0: - dependencies: - imurmurhash: 0.1.4 - dev: true - resolution: - integrity: sha1-22Z258fMBimHj/GWCXx4hVrp9Ks= /universalify/0.1.1: dev: true resolution: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= /unpack-stream/3.0.0: dependencies: - '@types/node': 8.5.2 + '@types/node': 8.5.7 decompress-maybe: 1.0.0 ssri: 5.0.0 tar-fs: 1.16.0 @@ -4333,10 +3909,6 @@ packages: node: '>=0.4' resolution: integrity: sha1-pcbVMr5lbiPbgg77lDofBJmNY68= - /y18n/3.2.1: - dev: true - resolution: - integrity: sha1-bRX7qITAhnnA136I53WegR4H+kE= /yallist/2.1.2: dev: true resolution: @@ -4384,7 +3956,7 @@ specifiers: rimraf: ^2.5.4 semver: ^5.4.1 stacktracey: ^1.2.87 - supi: ^0.8.0 + supi: ^0.10.0 tape: ^4.8.0 ts-node: ^4.0.2 tslint: ^5.7.0 From e4038c31ad66431e9ae832a8896ed659696bf31d Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 8 Jan 2018 01:34:08 +0200 Subject: [PATCH 115/196] chore(release): 0.11.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 157549f40b..dba6c94b77 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.11.3", + "version": "0.11.4", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From ca715952fc685a4cc6cdf02f9bb263c4c4197de6 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 9 Jan 2018 02:03:29 +0200 Subject: [PATCH 116/196] fix: update peed dependencies --- package.json | 4 ++-- shrinkwrap.yaml | 40 ++++++++++++++++++++++++++-------------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index dba6c94b77..8eab0f75d5 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "supi": ">=0.8.0 <0.11.0" + "supi": ">=0.8.0 <0.12.0" }, "dependencies": { "@types/common-tags": "^1.2.5", @@ -67,7 +67,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.10.0", + "supi": "^0.11.0", "tape": "^4.8.0", "ts-node": "^4.0.2", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 3b7646201f..5fae069861 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -24,7 +24,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.3 rimraf: 2.6.2 - supi: 0.10.0 + supi: 0.11.0 tape: 4.8.0 ts-node: 4.0.2 tslint: 5.8.0 @@ -174,6 +174,10 @@ packages: dev: true resolution: integrity: sha512-+1ZfzGIq8Y3EV7hPF7bs3i+Gi2mqYOiEGGRxGYPrn+hTYLMmzg+/5TkMkCHiRtLB38XSNvr/43aQ9+cUq4BbBg== + /@types/node/9.3.0: + dev: true + resolution: + integrity: sha512-wNBfvNjzsJl4tswIZKXCFQY0lss9nKUyJnG6T94X/eqjRgI2jHZ4evdjhQYBSan/vGtF6XVXPApOmNH2rf0KKw== /@types/nopt/3.0.29: dev: true resolution: @@ -200,6 +204,10 @@ packages: dev: true resolution: integrity: sha512-kovbyOtiNtGggxZ1PhhMpPWJr+vZgw1P9aUSLpTu6OUfWHlMSobnt1/vhHVYnqGrTUyevofrjB19RobEN5ZlFQ== + /@types/ramda/0.25.14: + dev: true + resolution: + integrity: sha512-NEVi6tD+oYzmNCB05JQ6+jHa7J6oU1+rbUMD6nLLfExluGKpVHuzZo9skN1y9XAT4UTJIrUZ0+f3xiLtHXYTQA== /@types/ramda/0.25.8: resolution: integrity: sha512-xLU94I8bn8pBAKdntp67DgSfvyHYqMjzSbUguScMywqKbrthrfsJcZX8hpp1Ih29cvUWWm26cdYtV5A+eF0QFQ== @@ -2592,17 +2600,21 @@ packages: node: '>=4' resolution: integrity: sha512-nigldHuSWszV5IK53dfOdpgfLsG0++QwNAFIFo5bgv5MPm/F4tiDJX240CJ+wZVzftbPGBmk4bnN/UB8wHFoeA== - /package-store/0.13.1: + /package-store/0.14.0: dependencies: '@pnpm/fs-locker': 1.0.0 '@pnpm/package-requester': 0.6.2 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 - '@types/node': 8.5.7 - '@types/ramda': 0.25.13 + '@types/mz': 0.0.32 + '@types/node': 9.3.0 + '@types/ramda': 0.25.14 drive-by-path: 1.0.0 encode-registry: 1.1.0 load-json-file: 4.0.0 + mkdirp-promise: 5.0.1 + mz: 2.7.0 + ncp: 2.0.0 os-homedir: 1.0.2 p-filter: 1.0.0 p-limit: 1.2.0 @@ -2610,6 +2622,7 @@ packages: path-exists: 3.0.0 ramda: 0.25.0 rimraf-then: 1.0.1 + util.promisify: 1.0.0 write-json-file: 2.3.0 dev: true engines: @@ -2617,7 +2630,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-RUVNg1b5BsU4uhEd2nWoaGdI6A2SeeN5wb7psNYNVhY4AaDc4F5EjHa4PhBWaKact0LKkjiGQYoLWhWjXQtRlA== + integrity: sha512-UAdTQDuoDtjidwwBK+6e0iUnwZ+OOvoHKfkzgu+tQwqQNTonSkx3351ppI4WMLmSCxzb2iqnyO59W2qbLB6qZA== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -2789,7 +2802,7 @@ packages: npmlog: 4.1.2 os-homedir: 1.0.2 pump: 1.0.3 - rc: 1.2.2 + rc: 1.2.3 simple-get: 1.4.3 tar-fs: 1.16.0 tunnel-agent: 0.6.0 @@ -2903,7 +2916,7 @@ packages: node: '>= 0.10.0' resolution: integrity: sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how== - /rc/1.2.2: + /rc/1.2.3: dependencies: deep-extend: 0.4.2 ini: 1.3.5 @@ -2912,7 +2925,7 @@ packages: dev: true optional: true resolution: - integrity: sha1-2M6ctX6NZNnHut2YdsfDTL48cHc= + integrity: sha1-UVdakA+N1oOBxxC0cSwhVMPiA1s= /read-package-json/2.0.12: dependencies: glob: 7.1.2 @@ -3410,7 +3423,7 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.10.0: + /supi/0.11.0: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.0 @@ -3421,7 +3434,7 @@ packages: '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 8.5.1 + '@types/node': 9.3.0 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 @@ -3448,7 +3461,6 @@ packages: load-yaml-file: 0.1.0 mkdirp-promise: 5.0.1 mz: 2.7.0 - ncp: 2.0.0 normalize-path: 2.1.1 normalize-registry-url: 1.0.0 npm-lifecycle: 2.0.0 @@ -3456,7 +3468,7 @@ packages: p-filter: 1.0.0 p-limit: 1.1.0 p-series: 1.0.0 - package-store: 0.13.1 + package-store: 0.14.0 path-absolute: 1.0.0 path-exists: 3.0.0 path-name: 1.0.0 @@ -3479,7 +3491,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-k1fsSAMxK5AjqPB45vXZrojz/UvY+BMSut1nrFBv5MM7uBIrncljDKEElsem5yEkFGxIiRpbCwgaMvny+85DsQ== + integrity: sha512-K+obMwRFQAMZb54Jia82SjPdOyBQ4UX8DSowwWCVhzwJOnAxZZ7UsAEI8sH2R6GhFI9efNeH3VGgOLPdzkMTaA== /supports-color/0.2.0: dev: true engines: @@ -3956,7 +3968,7 @@ specifiers: rimraf: ^2.5.4 semver: ^5.4.1 stacktracey: ^1.2.87 - supi: ^0.10.0 + supi: ^0.11.0 tape: ^4.8.0 ts-node: ^4.0.2 tslint: ^5.7.0 From 7036b879efbd64547f6ef03ed9f756c011481b24 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 9 Jan 2018 02:03:33 +0200 Subject: [PATCH 117/196] chore(release): 0.11.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8eab0f75d5..53cbfaab48 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.11.4", + "version": "0.11.5", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From d8a5bc1e209784a9b7bfa26f4013a5d3032eb61e Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 13 Jan 2018 21:35:27 +0200 Subject: [PATCH 118/196] chore: fix shrinkwrap.yaml --- shrinkwrap.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 5fae069861..8d423b44c5 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -164,6 +164,7 @@ packages: resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== /@types/node/8.5.1: + dev: false resolution: integrity: sha512-SrmAO+NhnsuG/6TychSl2VdxBZiw/d6V+8j+DFo8O3PwFi+QeYXWHhAw+b170aSc6zYab6/PjEWRZHIDN9mNUw== /@types/node/8.5.2: @@ -209,6 +210,7 @@ packages: resolution: integrity: sha512-NEVi6tD+oYzmNCB05JQ6+jHa7J6oU1+rbUMD6nLLfExluGKpVHuzZo9skN1y9XAT4UTJIrUZ0+f3xiLtHXYTQA== /@types/ramda/0.25.8: + dev: false resolution: integrity: sha512-xLU94I8bn8pBAKdntp67DgSfvyHYqMjzSbUguScMywqKbrthrfsJcZX8hpp1Ih29cvUWWm26cdYtV5A+eF0QFQ== /@types/rc/0.0.1: @@ -749,6 +751,7 @@ packages: resolution: integrity: sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4= /core-util-is/1.0.2: + dev: false resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= /cross-spawn/5.1.0: @@ -1600,6 +1603,7 @@ packages: resolution: integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= /inherits/2.0.3: + dev: false resolution: integrity: sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= /ini/1.3.5: @@ -1849,6 +1853,7 @@ packages: resolution: integrity: sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk= /isarray/1.0.0: + dev: false resolution: integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= /isexe/2.0.0: @@ -2844,6 +2849,7 @@ packages: resolution: integrity: sha1-du+ErM/X+DZvtxOPuSRmqRbVmbw= /process-nextick-args/1.0.7: + dev: false resolution: integrity: sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= /proper-lockfile/2.0.1: @@ -2965,6 +2971,7 @@ packages: safe-buffer: 5.1.1 string_decoder: 1.0.3 util-deprecate: 1.0.2 + dev: false resolution: integrity: sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== /rechoir/0.6.2: @@ -3168,6 +3175,7 @@ packages: resolution: integrity: sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= /safe-buffer/5.1.1: + dev: false resolution: integrity: sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== /semver-regex/1.0.0: @@ -3369,6 +3377,7 @@ packages: /string_decoder/1.0.3: dependencies: safe-buffer: 5.1.1 + dev: false resolution: integrity: sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== /stringstream/0.0.5: @@ -3608,6 +3617,7 @@ packages: dependencies: readable-stream: 2.3.3 xtend: 4.0.1 + dev: false resolution: integrity: sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= /timed-out/4.0.1: @@ -3775,6 +3785,7 @@ packages: resolution: integrity: sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k= /util-deprecate/1.0.2: + dev: false resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= /util.promisify/1.0.0: @@ -3917,6 +3928,7 @@ packages: resolution: integrity: sha1-e0vQ33LKE/vp1rAXj9g8B3uOqGs= /xtend/4.0.1: + dev: false engines: node: '>=0.4' resolution: From 8200be883a27c5e1958cefcb0f1b46184b18ea5f Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 14 Jan 2018 13:48:44 +0200 Subject: [PATCH 119/196] feat: new option to write output only by appending it ref pnpm/pnpm#873 --- src/index.ts | 22 ++++++- src/reporterForClient.ts | 132 +++++++++++++++++++++------------------ 2 files changed, 91 insertions(+), 63 deletions(-) diff --git a/src/index.ts b/src/index.ts index 0ad800a983..c80d35b601 100644 --- a/src/index.ts +++ b/src/index.ts @@ -12,13 +12,24 @@ export default function ( streamParser: object, cmd?: string, // is optional only to be backward compatible width?: number, + appendOnly?: boolean, ) { if (cmd === 'server') { const log$ = most.fromEvent('data', streamParser) reporterForServer(log$) return } - toOutput$(streamParser, cmd) + const output$ = toOutput$(streamParser, cmd, undefined, appendOnly) + if (appendOnly) { + output$ + .subscribe({ + complete () {}, // tslint:disable-line:no-empty + error: (err) => console.error(err.message), + next: (line) => console.log(line), + }) + return + } + output$ .subscribe({ complete () {}, // tslint:disable-line:no-empty error: (err) => logUpdate(err.message), @@ -30,6 +41,7 @@ export function toOutput$ ( streamParser: object, cmd?: string, // is optional only to be backward compatible width?: number, + appendOnly?: boolean, ): most.Stream { const isRecursive = cmd === 'recursive' const progressPushStream = new PushStream() @@ -100,7 +112,13 @@ export function toOutput$ ( stats: most.from(statsPushStream.observable), summary: most.from(summaryPushStream.observable), } - const outputs: Array>> = reporterForClient(log$, isRecursive, cmd, width) + const outputs: Array>> = reporterForClient(log$, isRecursive, cmd, width, appendOnly) + if (appendOnly) { + return most.join( + most.mergeArray(outputs) + .map((log: most.Stream<{msg: string}>) => log.map((msg) => msg.msg)), + ) + } return mergeOutputs(outputs).multicast() } diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 4bfc731310..9c5e15eb65 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -47,6 +47,7 @@ export default function ( isRecursive: boolean, cmd?: string, // is optional only to be backward compatible widthArg?: number, + appendOnly?: boolean, ): Array>> { const width = widthArg || process.stdout.columns || 80 const outputs: Array>> = [] @@ -65,14 +66,6 @@ export default function ( .skip(1) .until(mostLast(resolutionDone$)) - const fedtchedLog$ = log$.progress - .filter((log) => log.status === 'fetched') - .scan(R.inc, 0) - - const foundInStoreLog$ = log$.progress - .filter((log) => log.status === 'found_in_store') - .scan(R.inc, 0) - if (!isRecursive) { const alreadyUpToDate$ = most.of( mostLast( @@ -91,50 +84,81 @@ export default function ( outputs.push(alreadyUpToDate$) } - const progressSummaryOutput$ = most.of( - most.combine( - (resolving, fetched, foundInStore: number, resolutionDone) => { - const msg = `Resolving: total ${hlValue(resolving.toString())}, reused ${hlValue(foundInStore.toString())}, downloaded ${hlValue(fetched.toString())}` - if (resolving === foundInStore + fetched && resolutionDone) { - return { - fixed: false, - msg: `${msg}, done`, - } - } - return { - fixed: true, - msg, - } - }, - resolvingContentLog$, - fedtchedLog$, - foundInStoreLog$, - isRecursive ? most.of(false) : resolutionDone$, - ), - ) + if (!appendOnly) { + const fedtchedLog$ = log$.progress + .filter((log) => log.status === 'fetched') + .scan(R.inc, 0) - outputs.push(progressSummaryOutput$) + const foundInStoreLog$ = log$.progress + .filter((log) => log.status === 'found_in_store') + .scan(R.inc, 0) - const tarballsProgressOutput$ = log$.progress - .filter((log) => log.status === 'fetching_started' && - typeof log.size === 'number' && log.size >= BIG_TARBALL_SIZE) - .map((startedLog) => { - const size = prettyBytes(startedLog['size']) - return log$.progress - .filter((log) => log.status === 'fetching_progress' && log.pkgId === startedLog['pkgId']) - .map((log) => log['downloaded']) - .startWith(0) - .map((downloadedRaw) => { - const done = startedLog['size'] === downloadedRaw - const downloaded = prettyBytes(downloadedRaw) - return { - fixed: !done, - msg: `Downloading ${hlPkgId(startedLog['pkgId'])}: ${hlValue(downloaded)}/${hlValue(size)}${done ? ', done' : ''}`, + const progressSummaryOutput$ = most.of( + most.combine( + (resolving, fetched, foundInStore: number, resolutionDone) => { + const msg = `Resolving: total ${hlValue(resolving.toString())}, reused ${hlValue(foundInStore.toString())}, downloaded ${hlValue(fetched.toString())}` + if (resolving === foundInStore + fetched && resolutionDone) { + return { + fixed: false, + msg: `${msg}, done`, + } } + return { + fixed: true, + msg, + } + }, + resolvingContentLog$, + fedtchedLog$, + foundInStoreLog$, + isRecursive ? most.of(false) : resolutionDone$, + ), + ) + + outputs.push(progressSummaryOutput$) + + const tarballsProgressOutput$ = log$.progress + .filter((log) => log.status === 'fetching_started' && + typeof log.size === 'number' && log.size >= BIG_TARBALL_SIZE) + .map((startedLog) => { + const size = prettyBytes(startedLog['size']) + return log$.progress + .filter((log) => log.status === 'fetching_progress' && log.pkgId === startedLog['pkgId']) + .map((log) => log['downloaded']) + .startWith(0) + .map((downloadedRaw) => { + const done = startedLog['size'] === downloadedRaw + const downloaded = prettyBytes(downloadedRaw) + return { + fixed: !done, + msg: `Downloading ${hlPkgId(startedLog['pkgId'])}: ${hlValue(downloaded)}/${hlValue(size)}${done ? ', done' : ''}`, + } + }) + }) + + outputs.push(tarballsProgressOutput$) + + const lifecycleMessages: {[pkgId: string]: string} = {} + const lifecycleOutput$ = most.of( + log$.lifecycle + .map((log: LifecycleLog) => { + const key = `${log.script}:${log.pkgId}` + lifecycleMessages[key] = formatLifecycle(log) + return R.values(lifecycleMessages).join(EOL) }) - }) + .map((msg) => ({msg})), + ) - outputs.push(tarballsProgressOutput$) + outputs.push(lifecycleOutput$) + } else { + const lifecycleMessages: {[pkgId: string]: string} = {} + const lifecycleOutput$ = most.of( + log$.lifecycle + .map((log: LifecycleLog) => ({ msg: formatLifecycle(log) })), + ) + + outputs.push(lifecycleOutput$) + } if (!isRecursive) { const pkgsDiff$ = getPkgsDiff(log$) @@ -178,20 +202,6 @@ export default function ( outputs.push(deprecationOutput$) } - const lifecycleMessages: {[pkgId: string]: string} = {} - const lifecycleOutput$ = most.of( - log$.lifecycle - .filter((log) => log.name === 'pnpm:lifecycle') - .map((log: LifecycleLog) => { - const key = `${log.script}:${log.pkgId}` - lifecycleMessages[key] = formatLifecycle(log) - return R.values(lifecycleMessages).join(EOL) - }) - .map((msg) => ({msg})), - ) - - outputs.push(lifecycleOutput$) - if (!isRecursive) { outputs.push( most.fromPromise( From b35e7b9f912df610164912a81ff55ca904c1774d Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 14 Jan 2018 13:49:38 +0200 Subject: [PATCH 120/196] docs(license): update years --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 8bd573e32a..2af900f32c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Zoltan Kochan +Copyright (c) 2017-2018 Zoltan Kochan Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 25b957e7bcfcbff4032523900376b989363693e3 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 14 Jan 2018 13:53:15 +0200 Subject: [PATCH 121/196] chore(release): 0.11.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 53cbfaab48..fe902fe209 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.11.5", + "version": "0.11.6", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From eed008cf1086a45d75680ed5f1c9dd62f54f0633 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 15 Jan 2018 22:13:27 +0200 Subject: [PATCH 122/196] chore(deps): configure renovate --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000..b7ad6712df --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "extends": [ + "config:base" + ], + "pinVersions": false +} From f7f7953f69d6bbc8f2d3d1a9e70b9f941ccf5aeb Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 15 Jan 2018 20:14:52 +0000 Subject: [PATCH 123/196] fix(deps): update dependency @types/node to ^9.3.0 --- package.json | 2 +- shrinkwrap.yaml | 473 +++++++++++++----------------------------------- 2 files changed, 131 insertions(+), 344 deletions(-) diff --git a/package.json b/package.json index fe902fe209..6ec9c7aa65 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@types/common-tags": "^1.2.5", - "@types/node": "^8.0.51", + "@types/node": "^9.3.0", "@types/ramda": "^0.25.6", "@types/semver": "^5.4.0", "chalk": "^2.2.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 8d423b44c5..d317bc758e 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,10 +1,10 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 8.5.1 - '@types/ramda': 0.25.8 + '@types/node': 9.3.0 + '@types/ramda': 0.25.15 '@types/semver': 5.4.0 chalk: 2.3.0 - common-tags: 1.5.1 + common-tags: 1.7.2 log-update: 2.3.0 most: 1.7.2 most-last: 1.0.0 @@ -12,7 +12,7 @@ dependencies: pretty-bytes: 4.0.2 ramda: 0.25.0 semver: 5.4.1 - stacktracey: 1.2.87 + stacktracey: 1.2.100 zen-push: 0.2.1 devDependencies: '@pnpm/logger': 1.0.0 @@ -22,12 +22,12 @@ devDependencies: ghooks: 2.0.2 mos-tap-diff: 1.0.0 normalize-newline: 3.0.0 - package-preview: 1.0.3 + package-preview: 1.0.4 rimraf: 2.6.2 - supi: 0.11.0 + supi: 0.11.2 tape: 4.8.0 - ts-node: 4.0.2 - tslint: 5.8.0 + ts-node: 4.1.0 + tslint: 5.9.1 typescript: 2.6.2 validate-commit-msg: 2.14.0 packages: @@ -53,21 +53,21 @@ packages: node: '>=4' resolution: integrity: sha512-rN+hiOjGtxwwus7c/E0xkCs9prBeXzZCSCW/Q3k2WdHGSRNLAepr777iv+i2eqTfz9vXlTF0rLZOGi62ujzwYA== - /@pnpm/exec/1.1.2: + /@pnpm/exec/1.1.4: dependencies: + '@pnpm/self-installer': 2.0.0 '@types/got': 7.1.6 - '@types/node': 8.5.1 + '@types/node': 9.3.0 command-exists: 1.2.2 cross-spawn: 5.1.0 - got: 8.0.1 dev: true engines: node: '>=4' resolution: - integrity: sha512-ZNaOAOvl9J45nhrnMcRxT9wd2G6hPzC444nRmo8Wk/GmY6dd8FVN/XG/nEdHPjcYPyyrW2UA3McNi+klB9oBHw== + integrity: sha512-sYJOXPxpQxFcTSACFRFCuIQdnZLNaOgTHGF+CQNYlKnlc2ZnmEW+lAZVTc0hJSU+8mnTY7ei39MbYpI5q+li+w== /@pnpm/fs-locker/1.0.0: dependencies: - '@types/node': 8.5.2 + '@types/node': 8.5.8 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: true @@ -77,7 +77,7 @@ packages: integrity: sha512-JRIhC8lBFJjuaDnTMgCfCaO8IEa04JHCrNMW4RAjNrCeWBdcw2sczxp7qjqZPDc90z1VgUMlkpkGzXePcS9flQ== /@pnpm/logger/1.0.0: dependencies: - '@types/node': 8.5.1 + '@types/node': 8.5.8 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -85,7 +85,7 @@ packages: node: '>=4' resolution: integrity: sha512-VRqE5/SiuR7ZrwBmS+Af89BTXli5xBbiqu7WPq56gEtWT8dKf9rFLoimmmMBVeRq5LmVZIXlOxs29F9I+vgSvQ== - /@pnpm/package-requester/0.6.2: + /@pnpm/package-requester/0.6.3: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/pkgid-to-filename': 1.0.0 @@ -103,8 +103,8 @@ packages: read-package-json: 2.0.12 rename-overwrite: 1.0.0 rimraf-then: 1.0.1 - symlink-dir: 1.1.1 - unpack-stream: 3.0.0 + symlink-dir: 1.1.2 + unpack-stream: 3.0.1 util.promisify: 1.0.0 write-json-file: 2.3.0 dev: true @@ -113,7 +113,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-BOWtAMXWUfr2AP/tX5NQmVM33dQSL4JRbVDfW1CsK5v38yR5Vm9DTObvbhKwLD+JFRdV3suqYubwvSdmJvLaqw== + integrity: sha512-HajmDYa0XnRS6EJ46wePxS3QTBLvKFVq8w3vO+p/b6WsOGBTU/d1b68AtgOB6AnyReaT4R72mq79EFJmQfMdHw== /@pnpm/pkgid-to-filename/1.0.0: dependencies: normalize-path: 2.1.1 @@ -122,34 +122,34 @@ packages: node: '>=4' resolution: integrity: sha512-HnWDy3ecIKBsbRR9bwf+GJpV1CWLQ9Injj7eLSEQIsXQ+CLXU0h1NaxBCW7zcJm+2kbwnm0E1aFdFIEJXhHiTg== - /@pnpm/types/1.7.0: - dev: true - resolution: - integrity: sha512-pn7g4uxcofWTNG/cxmKvkMK2lxr4OUIhrQDrEVYEdVhW0WkWztsHkFrYjFgfNzPbYu3ITlB3T6aSVjCoJQTOlw== - /@sindresorhus/is/0.6.0: + /@pnpm/self-installer/2.0.0: dev: true engines: node: '>=4' resolution: - integrity: sha1-OD9Faya8lseInwMyB59DWLFsWNw= + integrity: sha512-+Hg7mBqDOXUlH4UvYffXMJwln8EIfqpf0+y7ODYqbO9GF9Kc1GG7/tbl5cWyA1OKF04XQH9jugoIxtCOxN9/dg== + /@pnpm/types/1.7.0: + dev: true + resolution: + integrity: sha512-pn7g4uxcofWTNG/cxmKvkMK2lxr4OUIhrQDrEVYEdVhW0WkWztsHkFrYjFgfNzPbYu3ITlB3T6aSVjCoJQTOlw== /@types/byline/4.2.31: dependencies: - '@types/node': 8.5.1 + '@types/node': 9.3.0 dev: true resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= /@types/common-tags/1.4.0: resolution: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== - /@types/fs-extra/4.0.7: + /@types/fs-extra/5.0.0: dependencies: - '@types/node': 8.5.1 + '@types/node': 9.3.0 dev: true resolution: - integrity: sha512-BN48b/2F3kL0Ual7tjcHjj0Fl+nuYKtHa0G/xT3Q43HuCpN7rQD5vIx6Aqnl9x10oBI5xMJh8Ly+FQpP205JlA== + integrity: sha512-qtxDULQKUenuaDLW003CgC+0T0eiAfH3BrH+vSt87GLzbz5EZ6Ox6mv9rMttvhDOatbb9nYh0E1m7ydoYwUrAg== /@types/got/7.1.6: dependencies: - '@types/node': 8.5.1 + '@types/node': 9.3.0 dev: true resolution: integrity: sha512-MTgskaiThy9e07/V/gWj1PY3FWsfghgFQVgSLgEV+k7r+rTxvfKNDDNjIcFV/aDhDBCpUEaqdHAeaxjM9uaSKA== @@ -159,24 +159,14 @@ packages: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== /@types/mz/0.0.32: dependencies: - '@types/node': 8.5.1 + '@types/node': 9.3.0 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/8.5.1: - dev: false + /@types/node/8.5.8: resolution: - integrity: sha512-SrmAO+NhnsuG/6TychSl2VdxBZiw/d6V+8j+DFo8O3PwFi+QeYXWHhAw+b170aSc6zYab6/PjEWRZHIDN9mNUw== - /@types/node/8.5.2: - dev: true - resolution: - integrity: sha512-KA4GKOpgXnrqEH2eCVhiv2CsxgXGQJgV1X0vsGlh+WCnxbeAE1GT44ZsTU1IN5dEeV/gDupKa7gWo08V5IxWVQ== - /@types/node/8.5.7: - dev: true - resolution: - integrity: sha512-+1ZfzGIq8Y3EV7hPF7bs3i+Gi2mqYOiEGGRxGYPrn+hTYLMmzg+/5TkMkCHiRtLB38XSNvr/43aQ9+cUq4BbBg== + integrity: sha512-8KmlRxwbKZfjUHFIt3q8TF5S2B+/E5BaAoo/3mgc5h6FJzqxXkCK/VMetO+IRDtwtU6HUvovHMBn+XRj7SV9Qg== /@types/node/9.3.0: - dev: true resolution: integrity: sha512-wNBfvNjzsJl4tswIZKXCFQY0lss9nKUyJnG6T94X/eqjRgI2jHZ4evdjhQYBSan/vGtF6XVXPApOmNH2rf0KKw== /@types/nopt/3.0.29: @@ -185,7 +175,7 @@ packages: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 8.5.1 + '@types/node': 9.3.0 dev: true resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== @@ -197,22 +187,9 @@ packages: dev: true resolution: integrity: sha512-dwv960sf5inFWiufjhDfK7ZG3nYyHXt58I+14bJJBKV5MPlZm6Tu1sQS63NWEtLpIw6+RhbNbXjNStdMXxR8Nw== - /@types/ramda/0.25.11: - dev: true + /@types/ramda/0.25.15: resolution: - integrity: sha512-QE+w/NlQyrk/P9Iji4vZJIiJg0HRU6KsHkgPm4VJiGGxuvq4VGymvHtW+364c/YmvR2zzSujCKzrsa0/hHeCQQ== - /@types/ramda/0.25.13: - dev: true - resolution: - integrity: sha512-kovbyOtiNtGggxZ1PhhMpPWJr+vZgw1P9aUSLpTu6OUfWHlMSobnt1/vhHVYnqGrTUyevofrjB19RobEN5ZlFQ== - /@types/ramda/0.25.14: - dev: true - resolution: - integrity: sha512-NEVi6tD+oYzmNCB05JQ6+jHa7J6oU1+rbUMD6nLLfExluGKpVHuzZo9skN1y9XAT4UTJIrUZ0+f3xiLtHXYTQA== - /@types/ramda/0.25.8: - dev: false - resolution: - integrity: sha512-xLU94I8bn8pBAKdntp67DgSfvyHYqMjzSbUguScMywqKbrthrfsJcZX8hpp1Ih29cvUWWm26cdYtV5A+eF0QFQ== + integrity: sha512-KlGg8px5Kz70uH1S1Hr00oHBGa19TtjfIBt1gwjUzzxun6N/sxQIjOfqnrVq0TauHqldU7JEdQAWYRx+xnKWCA== /@types/rc/0.0.1: dev: true resolution: @@ -230,7 +207,7 @@ packages: integrity: sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ== /@types/tape/4.2.31: dependencies: - '@types/node': 8.5.1 + '@types/node': 9.3.0 dev: true resolution: integrity: sha512-DEPn8FJKQR6eeMHZ407TuAqlhBKQa54PTM3c7Z6pKOI1uHaPnidmpmOXYtNZTcDrL5hnZofSHPwX1AQ9HbaMUg== @@ -528,30 +505,18 @@ packages: dependencies: is-bzip2: 1.0.0 peek-stream: 1.1.2 - pumpify: 1.3.5 + pumpify: 1.3.6 through2: 2.0.3 unbzip2-stream: 1.2.5 dev: true resolution: integrity: sha1-ya73AIprlDy+mcxhcSXrS9R4KWs= - /cacheable-request/2.1.3: - dependencies: - clone-response: 1.0.2 - get-stream: 3.0.0 - http-cache-semantics: 3.8.1 - keyv: 3.0.0 - lowercase-keys: 1.0.0 - normalize-url: 2.0.0 - responselike: 1.0.2 - dev: true - resolution: - integrity: sha1-uTVgfdKrKBKJi++yJPZqqGxTPbs= - /cachedir/1.1.1: + /cachedir/1.2.0: dependencies: os-homedir: 1.0.2 dev: true resolution: - integrity: sha1-4TYwdeogahJ2fZK7cRyKL3ahD2I= + integrity: sha512-i3xIKd9U4ov0hWXYo08oJy0YVz0krZ9dbTZQim41xkg0IiScptkAK0UilZ5M1WE3gnWjXAa9+cMtrJ5dM+THbA== /camelcase-keys/4.2.0: dependencies: camelcase: 4.1.0 @@ -633,12 +598,6 @@ packages: dev: true resolution: integrity: sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= - /clone-response/1.0.2: - dependencies: - mimic-response: 1.0.0 - dev: true - resolution: - integrity: sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= /co/4.6.0: dev: true engines: @@ -684,10 +643,10 @@ packages: node: '>= 0.6.x' resolution: integrity: sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E= - /commander/2.12.2: + /commander/2.13.0: dev: true resolution: - integrity: sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA== + integrity: sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA== /commander/2.9.0: dependencies: graceful-readlink: 1.0.1 @@ -698,7 +657,7 @@ packages: integrity: sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q= /commitizen/2.9.6: dependencies: - cachedir: 1.1.1 + cachedir: 1.2.0 chalk: 1.1.3 cz-conventional-changelog: 1.2.0 dedent: 0.6.0 @@ -718,13 +677,13 @@ packages: node: '>= 0.12' resolution: integrity: sha1-wNAFNe8mTaf2Nzft/aQiiYP6IpE= - /common-tags/1.5.1: + /common-tags/1.7.2: dependencies: babel-runtime: 6.26.0 engines: node: '>=4.0.0' resolution: - integrity: sha512-NrUYGY5TApAk9KB+IZXkR3GR4tA3g26HDsoiGt4kCMHZ727gOGkC+UNfq0Z22jE15bLkc/6RV5Jw1RBW6Usg6A== + integrity: sha512-joj9ZlUOjCrwdbmiLqafeUSgkUM74NqhLsZtSqDmhKudaIY197zTrb8JMl31fMnCUuxwFT23eC/oWvrZzDLRJQ== /concat-map/0.0.1: dev: true resolution: @@ -799,7 +758,7 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.5.1 + '@types/node': 8.5.8 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -825,28 +784,14 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - /decode-uri-component/0.2.0: - dev: true - engines: - node: '>=0.10' - resolution: - integrity: sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= /decompress-maybe/1.0.0: dependencies: bzip2-maybe: 1.0.0 gunzip-maybe: 1.4.1 - pumpify: 1.3.5 + pumpify: 1.3.6 dev: true resolution: integrity: sha1-rf54xmzAaeZOgkvRQFuF515tHLs= - /decompress-response/3.3.0: - dependencies: - mimic-response: 1.0.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= /dedent/0.6.0: dev: true resolution: @@ -941,7 +886,7 @@ packages: graceful-fs: 4.1.11 mz: 2.7.0 p-every: 1.0.2 - p-limit: 1.1.0 + p-limit: 1.2.0 ssri: 5.0.0 dev: true engines: @@ -978,19 +923,15 @@ packages: dev: true resolution: integrity: sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= - /duplexer3/0.1.4: - dev: true - resolution: - integrity: sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= - /duplexify/3.5.1: + /duplexify/3.5.3: dependencies: - end-of-stream: 1.4.0 + end-of-stream: 1.4.1 inherits: 2.0.3 readable-stream: 2.3.3 stream-shift: 1.0.0 dev: true resolution: - integrity: sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ== + integrity: sha512-g8ID9OroF9hKt2POf8YLayy+9594PzmM3scI00/uBXocX3TWNgoB67hjzkFe9ITAbQOne/lLdBxHXvYUM4ZgGA== /ecc-jsbn/0.1.1: dependencies: jsbn: 0.1.1 @@ -1006,12 +947,12 @@ packages: node: '>=4' resolution: integrity: sha512-we1k9/KE1067YXEyJzPg+kXlNFLk9/LT2IFP3VZgmANNwf8Bx+KdAVd1wxLpG8y7v6EgplVGTstmVNICwiaCNA== - /end-of-stream/1.4.0: + /end-of-stream/1.4.1: dependencies: once: 1.4.0 dev: true resolution: - integrity: sha1-epDYM+/abPpurA9JSduw+tOmMgY= + integrity: sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q== /error-ex/1.3.1: dependencies: is-arrayish: 0.2.1 @@ -1271,13 +1212,6 @@ packages: node: '>= 0.12' resolution: integrity: sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8= - /from2/2.3.0: - dependencies: - inherits: 2.0.3 - readable-stream: 2.3.3 - dev: true - resolution: - integrity: sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= /fs-exists-sync/0.1.0: dev: true engines: @@ -1332,10 +1266,14 @@ packages: dev: true resolution: integrity: sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - /get-npm-tarball-url/2.0.0: + /get-npm-tarball-url/2.0.1: + dependencies: + normalize-registry-url: 1.0.0 dev: true + engines: + node: '>=4' resolution: - integrity: sha1-Xr8eZAnPcxeszYfYLkHpNdEnJjg= + integrity: sha512-POrVRGyS9X5w+855/H46JGVYBGuVgJXyIkbsTCzW+sv5x2qH+rfQjc7652DzkgOskF+cqLevA2En7V0hu0gZCg== /get-source/1.0.24: dependencies: data-uri-to-buffer: 2.0.0 @@ -1428,30 +1366,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-jTvGuNo8qBEqFg2NSW/wRiv+948= - /got/8.0.1: - dependencies: - '@sindresorhus/is': 0.6.0 - cacheable-request: 2.1.3 - decompress-response: 3.3.0 - duplexer3: 0.1.4 - get-stream: 3.0.0 - into-stream: 3.1.0 - is-retry-allowed: 1.1.0 - isurl: 1.0.0 - lowercase-keys: 1.0.0 - mimic-response: 1.0.0 - p-cancelable: 0.3.0 - p-timeout: 2.0.1 - pify: 3.0.0 - safe-buffer: 5.1.1 - timed-out: 4.0.1 - url-parse-lax: 3.0.0 - url-to-options: 1.0.1 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha1-bX+Ls+uZ5a+RLv4moQRHZEHgjn8= /graceful-fs/4.1.11: dev: true engines: @@ -1468,7 +1382,7 @@ packages: is-deflate: 1.0.0 is-gzip: 1.0.0 peek-stream: 1.1.2 - pumpify: 1.3.5 + pumpify: 1.3.6 through2: 2.0.3 dev: true resolution: @@ -1509,16 +1423,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= - /has-symbol-support-x/1.4.1: - dev: true - resolution: - integrity: sha512-JkaetveU7hFbqnAC1EV1sF4rlojU2D4Usc5CmS69l6NfmPDnpnFUegzFg33eDkkpNCxZ0mQp65HwUDrNFS/8MA== - /has-to-string-tag-x/1.4.1: - dependencies: - has-symbol-support-x: 1.4.1 - dev: true - resolution: - integrity: sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw== /has-unicode/2.0.1: dev: true resolution: @@ -1560,10 +1464,6 @@ packages: dev: true resolution: integrity: sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg== - /http-cache-semantics/3.8.1: - dev: true - resolution: - integrity: sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== /http-signature/1.2.0: dependencies: assert-plus: 1.0.0 @@ -1633,15 +1533,6 @@ packages: dev: true resolution: integrity: sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ= - /into-stream/3.1.0: - dependencies: - from2: 2.3.0 - p-is-promise: 1.1.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY= /is-arrayish/0.2.1: dev: true resolution: @@ -1670,12 +1561,12 @@ packages: node: '>= 0.4' resolution: integrity: sha1-hut1OSgF3cM69xySoO7fdO52BLI= - /is-ci/1.0.10: + /is-ci/1.1.0: dependencies: ci-info: 1.1.2 dev: true resolution: - integrity: sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4= + integrity: sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg== /is-date-object/1.0.1: dev: true engines: @@ -1776,10 +1667,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= - /is-object/1.0.1: - dev: true - resolution: - integrity: sha1-iVJojF7C/9awPsyF52ngKQMINHA= /is-plain-obj/1.1.0: dev: true engines: @@ -1810,12 +1697,6 @@ packages: node: '>= 0.4' resolution: integrity: sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= - /is-retry-allowed/1.1.0: - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= /is-stream/1.1.0: dev: true engines: @@ -1872,15 +1753,6 @@ packages: dev: true resolution: integrity: sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= - /isurl/1.0.0: - dependencies: - has-to-string-tag-x: 1.4.1 - is-object: 1.0.1 - dev: true - engines: - node: '>= 4' - resolution: - integrity: sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w== /js-tokens/3.0.2: dev: true resolution: @@ -1897,10 +1769,6 @@ packages: optional: true resolution: integrity: sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - /json-buffer/3.0.0: - dev: true - resolution: - integrity: sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= /json-parse-better-errors/1.0.1: dev: true resolution: @@ -1946,12 +1814,6 @@ packages: '0': node >=0.6.0 resolution: integrity: sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= - /keyv/3.0.0: - dependencies: - json-buffer: 3.0.0 - dev: true - resolution: - integrity: sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA== /kind-of/3.2.2: dependencies: is-buffer: 1.1.6 @@ -2056,12 +1918,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= - /lowercase-keys/1.0.0: - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-TjNms55/VFfjXxMkvfb4jQv8cwY= /lru-cache/4.1.1: dependencies: pseudomap: 1.0.2 @@ -2077,10 +1933,10 @@ packages: node: '>=4' resolution: integrity: sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA== - /make-error/1.3.0: + /make-error/1.3.2: dev: true resolution: - integrity: sha1-Uq06M5zPEM5itAQLcI/nByRLi5Y= + integrity: sha512-l9ra35l5VWLF24y75Tg8XgfGLX0ueRhph118WKM6H5denx4bB5QF59+4UAm9oJ2qsPQZas/CQUDdtDdfvYHBdQ== /manage-path/2.0.0: dev: true resolution: @@ -2165,12 +2021,6 @@ packages: node: '>=4' resolution: integrity: sha1-5md4PZLonb00KBi1IwudYqZyrRg= - /mimic-response/1.0.0: - dev: true - engines: - node: '>=4' - resolution: - integrity: sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4= /minimatch/3.0.4: dependencies: brace-expansion: 1.1.8 @@ -2341,16 +2191,6 @@ packages: dev: true resolution: integrity: sha512-0v6T4851b72ykk5zEtFoN4QX/Fqyk7pouIj9xZyAvAe9jlDhAwT4z6FlwsoQCHjeuK2EGUoAwy/F4y4B1uZq9A== - /normalize-url/2.0.0: - dependencies: - prepend-http: 2.0.0 - query-string: 5.0.1 - sort-keys: 2.0.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha1-4E2KNp86TK3IUKKFT4+w+KgSAyg= /npm-lifecycle/2.0.0: dependencies: byline: 5.0.0 @@ -2479,12 +2319,6 @@ packages: dev: true resolution: integrity: sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ= - /p-cancelable/0.3.0: - dev: true - engines: - node: '>=4' - resolution: - integrity: sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw== /p-defer/1.0.0: dev: true engines: @@ -2519,12 +2353,6 @@ packages: node: '>=4' resolution: integrity: sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4= - /p-limit/1.1.0: - dev: true - engines: - node: '>=4' - resolution: - integrity: sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw= /p-limit/1.2.0: dependencies: p-try: 1.0.0 @@ -2535,7 +2363,7 @@ packages: integrity: sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng== /p-locate/2.0.0: dependencies: - p-limit: 1.1.0 + p-limit: 1.2.0 dev: true engines: node: '>=4' @@ -2567,27 +2395,19 @@ packages: node: '>=4' resolution: integrity: sha1-fsnntEBswyBmKYpvmGDlXpGzbgc= - /p-timeout/2.0.1: - dependencies: - p-finally: 1.0.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA== /p-try/1.0.0: dev: true engines: node: '>=4' resolution: integrity: sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= - /package-preview/1.0.3: + /package-preview/1.0.4: dependencies: - '@pnpm/exec': 1.1.2 - '@types/fs-extra': 4.0.7 + '@pnpm/exec': 1.1.4 + '@types/fs-extra': 5.0.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 8.5.1 + '@types/node': 9.3.0 '@types/write-json-file': 2.2.1 cross-spawn: 5.1.0 find-down: 0.1.4 @@ -2597,23 +2417,23 @@ packages: meow: 4.0.0 mz: 2.7.0 rimraf-then: 1.0.1 - symlink-dir: 1.1.1 - unpack-stream: 3.0.0 + symlink-dir: 1.1.2 + unpack-stream: 3.0.1 write-json-file: 2.3.0 dev: true engines: node: '>=4' resolution: - integrity: sha512-nigldHuSWszV5IK53dfOdpgfLsG0++QwNAFIFo5bgv5MPm/F4tiDJX240CJ+wZVzftbPGBmk4bnN/UB8wHFoeA== + integrity: sha512-JFT3uudfk3qtNHpCb3GwOq/n3NrEisxeQC/yTJLk7GHStYleXaFur4yW/SXqOtGMaKAAq5qTrkeFWdXheX+GPA== /package-store/0.14.0: dependencies: '@pnpm/fs-locker': 1.0.0 - '@pnpm/package-requester': 0.6.2 + '@pnpm/package-requester': 0.6.3 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 '@types/node': 9.3.0 - '@types/ramda': 0.25.14 + '@types/ramda': 0.25.15 drive-by-path: 1.0.0 encode-registry: 1.1.0 load-json-file: 4.0.0 @@ -2730,7 +2550,7 @@ packages: integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== /peek-stream/1.1.2: dependencies: - duplexify: 3.5.1 + duplexify: 3.5.3 through2: 2.0.3 dev: true resolution: @@ -2777,10 +2597,10 @@ packages: dev: true resolution: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= - /pnpm-shrinkwrap/5.1.0: + /pnpm-shrinkwrap/5.1.1: dependencies: - '@types/node': 8.5.7 - '@types/ramda': 0.25.13 + '@types/node': 9.3.0 + '@types/ramda': 0.25.15 dependency-path: 1.2.0 js-yaml: 3.10.0 load-yaml-file: 0.1.0 @@ -2795,7 +2615,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-MJBeQGhEagO5UmZZ2SELaLKtRXM8ey+mn4MZhmPKNgjZFHOeR411iIM1cyI3zFVziebLCPiLbhk4td33aKjFeQ== + integrity: sha512-rTDk5r3OKdOU+6P/QDh0RZX9fohf4iUs5Wa4T3mTIF0Wb4TH9jJlvQVI4XSidwlgWIZHHbDiHWgIHACOTS+bLQ== /prebuild-install/2.4.1: dependencies: expand-template: 1.1.0 @@ -2816,12 +2636,6 @@ packages: optional: true resolution: integrity: sha512-99TyEFYTTkBWANT+mwSptmLb9ZCLQ6qKIUE36fXSIOtShB0JNprL2hzBD8F1yIuT9btjFrFEwbRHXhqDi1HmRA== - /prepend-http/2.0.0: - dev: true - engines: - node: '>=4' - resolution: - integrity: sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= /preserve/0.2.0: dev: true engines: @@ -2867,19 +2681,26 @@ packages: integrity: sha1-8FKijacOYYkX7wqKw0wa5aaChrM= /pump/1.0.3: dependencies: - end-of-stream: 1.4.0 + end-of-stream: 1.4.1 once: 1.4.0 dev: true resolution: integrity: sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw== - /pumpify/1.3.5: + /pump/2.0.0: dependencies: - duplexify: 3.5.1 - inherits: 2.0.3 - pump: 1.0.3 + end-of-stream: 1.4.1 + once: 1.4.0 dev: true resolution: - integrity: sha1-G2ccYZlAq8rqwK0OOjwWS+dgmTs= + integrity: sha512-6MYypjOvtiXhBSTOD0Zs5eNjCGfnqi5mPsCsW+dgKTxrZzQMZQNpBo3XRkLx7id753f3EeyHLBqzqqUymIolgw== + /pumpify/1.3.6: + dependencies: + duplexify: 3.5.3 + inherits: 2.0.3 + pump: 2.0.0 + dev: true + resolution: + integrity: sha512-BurGAcvezsINL5US9T9wGHHcLNrG6MCp//ECtxron3vcR+Rfx5Anqq7HbZXNJvFQli8FGVsWCAvywEJFV5Hx/Q== /punycode/1.4.1: dev: true resolution: @@ -2890,16 +2711,6 @@ packages: node: '>=0.6' resolution: integrity: sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A== - /query-string/5.0.1: - dependencies: - decode-uri-component: 0.2.0 - object-assign: 4.1.1 - strict-uri-encode: 1.1.0 - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha512-aM+MkQClojlNiKkO09tiN2Fv8jM/L7GWIjG2liWeKljlOdOPNWr+bW3KQ+w5V/uKprpezC7fAsAMsJtJ+2rLKA== /quick-lru/1.1.0: dev: true engines: @@ -3045,6 +2856,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= + /replace-string/1.1.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-hwYhF/gj/lgAwwa6yyz6NZuTX+o= /request/2.83.0: dependencies: aws-sign2: 0.7.0 @@ -3109,12 +2926,6 @@ packages: dev: true resolution: integrity: sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw== - /responselike/1.0.2: - dependencies: - lowercase-keys: 1.0.0 - dev: true - resolution: - integrity: sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= /restore-cursor/1.0.1: dependencies: exit-hook: 1.1.1 @@ -3328,23 +3139,17 @@ packages: dev: true resolution: integrity: sha512-728D4yoQcQm1ooZvSbywLkV1RjfITZXh0oWrhM/lnsx3nAHx7LsRGJWB/YyvoceAYRq98xqbstiN4JBv1/wNHg== - /stacktracey/1.2.87: + /stacktracey/1.2.100: dependencies: as-table: 1.0.31 get-source: 1.0.24 dev: false resolution: - integrity: sha1-5jFkdPtQPj88OCAw3YM8ey4JLe0= + integrity: sha1-njLHp/pkPq9pqPlXI2Ezmor7a1k= /stream-shift/1.0.0: dev: true resolution: integrity: sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= - /strict-uri-encode/1.1.0: - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= /string-width/1.0.2: dependencies: code-point-at: 1.1.0 @@ -3432,11 +3237,11 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.11.0: + /supi/0.11.2: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.0 - '@pnpm/package-requester': 0.6.2 + '@pnpm/package-requester': 0.6.3 '@pnpm/pkgid-to-filename': 1.0.0 '@pnpm/types': 1.7.0 '@types/byline': 4.2.31 @@ -3447,7 +3252,7 @@ packages: '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 - '@types/ramda': 0.25.11 + '@types/ramda': 0.25.15 '@types/rc': 0.0.1 '@types/semver': 5.4.0 '@types/update-notifier': 1.0.2 @@ -3455,14 +3260,14 @@ packages: '@zkochan/npm-package-arg': 1.0.0 arr-flatten: 1.1.0 byline: 5.0.0 - common-tags: 1.5.1 + common-tags: 1.7.2 cross-spawn: 5.1.0 dependency-path: 1.2.0 encode-registry: 1.1.0 execa: 0.8.0 - get-npm-tarball-url: 2.0.0 + get-npm-tarball-url: 2.0.1 graceful-fs: 4.1.11 - is-ci: 1.0.10 + is-ci: 1.1.0 is-inner-link: 2.0.2 is-subdir: 1.0.2 is-windows: 1.0.1 @@ -3475,20 +3280,21 @@ packages: npm-lifecycle: 2.0.0 os-homedir: 1.0.2 p-filter: 1.0.0 - p-limit: 1.1.0 + p-limit: 1.2.0 p-series: 1.0.0 package-store: 0.14.0 path-absolute: 1.0.0 path-exists: 3.0.0 path-name: 1.0.0 pnpm-install-checks: 1.1.0 - pnpm-shrinkwrap: 5.1.0 + pnpm-shrinkwrap: 5.1.1 ramda: 0.25.0 read-package-json: 2.0.12 remove-all-except-outer-links: 1.0.3 + replace-string: 1.1.0 rimraf-then: 1.0.1 semver: 5.4.1 - symlink-dir: 1.1.1 + symlink-dir: 1.1.2 thenify: 3.3.0 validate-npm-package-name: 3.0.0 version-selector-type: 2.0.0 @@ -3500,7 +3306,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-K+obMwRFQAMZb54Jia82SjPdOyBQ4UX8DSowwWCVhzwJOnAxZZ7UsAEI8sH2R6GhFI9efNeH3VGgOLPdzkMTaA== + integrity: sha512-V3Mh9+9VuiQZcLveMaotr+KvCC87kk7Z4qUqLD4Nzjz7LLetP9WxxHJaZyRAQi9mwkvmfHrDRk9ToiLZ2b6T7Q== /supports-color/0.2.0: dev: true engines: @@ -3526,10 +3332,10 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw== - /symlink-dir/1.1.1: + /symlink-dir/1.1.2: dependencies: '@types/mz': 0.0.32 - '@types/node': 8.5.1 + '@types/node': 9.3.0 graceful-fs: 4.1.11 is-windows: 1.0.1 mkdirp-promise: 5.0.1 @@ -3538,7 +3344,7 @@ packages: engines: node: '>=4' resolution: - integrity: sha512-jB7Y1uy6vUfQaSRngSZnAtCUe/jDfjZl/ZLfAoZlWvvOC0tos8vCFL1C5WNGSYPgpRIcnVc/UYdUQQPLCV3Z5g== + integrity: sha512-GXEvwF1zpalvovqO+x18H7k+4adCXn9NU6vjfEQ+cVS7Ltq7YXFQyitdl7WoQqNUMce3RGMPo037GJrtM7f7lw== /tap-parser/1.3.2: dependencies: events-to-array: 1.1.2 @@ -3579,7 +3385,7 @@ packages: /tar-stream/1.5.5: dependencies: bl: 1.2.1 - end-of-stream: 1.4.0 + end-of-stream: 1.4.1 readable-stream: 2.3.3 xtend: 4.0.1 dev: true @@ -3620,12 +3426,6 @@ packages: dev: false resolution: integrity: sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= - /timed-out/4.0.1: - dev: true - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= /timeout-then/1.1.0: dependencies: any-promise: 1.3.0 @@ -3654,12 +3454,12 @@ packages: node: '>=4' resolution: integrity: sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= - /ts-node/4.0.2: + /ts-node/4.1.0: dependencies: arrify: 1.0.1 chalk: 2.3.0 diff: 3.4.0 - make-error: 1.3.0 + make-error: 1.3.2 minimist: 1.2.0 mkdirp: 0.5.1 source-map-support: 0.5.0 @@ -3670,7 +3470,7 @@ packages: engines: node: '>=4.2.0' resolution: - integrity: sha512-mg7l6ON8asjnfzkTi1LFWKaOGHl5Jf1+5ij0MQ502YfC6+4FBgh/idJgw9aN9kei1Rf4/pmFpNuFE1YbcQdOTA== + integrity: sha512-xcZH12oVg9PShKhy3UHyDmuDLV3y7iKwX25aMVPt1SIXSuAfWkFiGPEkg+th8R4YKW/QCxDoW7lJdb15lx6QWg== /tsconfig/7.0.0: dependencies: '@types/strip-bom': 3.0.0 @@ -3684,34 +3484,35 @@ packages: dev: true resolution: integrity: sha1-aUavLR1lGnsYY7Ux1uWvpBqkTqw= - /tslint/5.8.0: + /tslint/5.9.1: dependencies: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 chalk: 2.3.0 - commander: 2.12.2 + commander: 2.13.0 diff: 3.4.0 glob: 7.1.2 + js-yaml: 3.10.0 minimatch: 3.0.4 resolve: 1.5.0 semver: 5.4.1 tslib: 1.8.1 - tsutils: 2.13.1 + tsutils: 2.18.0 dev: true engines: - node: '>=4.1.2' + node: '>=4.8.0' peerDependencies: - typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev' + typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev' resolution: - integrity: sha1-H0mtWy53x2w69N3K5VKuTjYS6xM= - /tsutils/2.13.1: + integrity: sha1-ElX4ej/1frCw4fDmEKi0dIBGya4= + /tsutils/2.18.0: dependencies: tslib: 1.8.1 dev: true peerDependencies: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >= 2.4.0-dev || >= 2.5.0-dev || >= 2.6.0-dev || >= 2.7.0-dev || >= 2.8.0-dev' resolution: - integrity: sha512-XMOEvc2TiYesVSOJMI7OYPnBMSgcvERuGW5Li/J+2A0TuH607BPQnOLQ82oSPZCssB8c9+QGi6qhTBa/f1xQRA== + integrity: sha512-y0CUDPPb0ygkUkmK8kAeLibag7OEAO0dxbtqAhzP+5w/VY5JdGnPiafhYxzRzWzkAGQGPJV99xrxngJYVLtrMg== /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.1.1 @@ -3752,9 +3553,9 @@ packages: dev: true resolution: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= - /unpack-stream/3.0.0: + /unpack-stream/3.0.1: dependencies: - '@types/node': 8.5.7 + '@types/node': 9.3.0 decompress-maybe: 1.0.0 ssri: 5.0.0 tar-fs: 1.16.0 @@ -3762,7 +3563,7 @@ packages: engines: node: '>=4' resolution: - integrity: sha512-0BxD6HlX99YEQZheFAScgneWu35TGSNrKw7iNGqGZo3X+Zv7cW+NNOLvJz7sQr17hZSljUB4vqk0h1zm6xwtaA== + integrity: sha512-yaG8wkdx7b9Cza2GGQ6YleqxLZwPaNsGYp9zJY61nZgRjl5ATXpfHaZzE1joL4/PlUu8rQiDV4bApqB2iPwz6g== /unzip-response/1.0.2: dev: true engines: @@ -3770,20 +3571,6 @@ packages: optional: true resolution: integrity: sha1-uYTwh3/AqJwsdzzB73tbIytbBv4= - /url-parse-lax/3.0.0: - dependencies: - prepend-http: 2.0.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= - /url-to-options/1.0.1: - dev: true - engines: - node: '>= 4' - resolution: - integrity: sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k= /util-deprecate/1.0.2: dev: false resolution: @@ -3959,7 +3746,7 @@ shrinkwrapVersion: 3 specifiers: '@pnpm/logger': ^1.0.0 '@types/common-tags': ^1.2.5 - '@types/node': ^8.0.51 + '@types/node': ^9.3.0 '@types/ramda': ^0.25.6 '@types/semver': ^5.4.0 '@types/tape': ^4.2.30 From d0a3ee9f3f83a53b09934fbfed22ef6a0338b366 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 15 Jan 2018 22:22:17 +0200 Subject: [PATCH 124/196] chore(release): 0.11.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6ec9c7aa65..cae985405f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.11.6", + "version": "0.11.7", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 46765a28fe94dda833e8cd8a44c1f05dbe197159 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 22 Jan 2018 00:13:27 +0000 Subject: [PATCH 125/196] chore(deps): update dependency supi to ^0.12.0 --- package.json | 2 +- shrinkwrap.yaml | 143 ++++++++++++++++++++++++------------------------ 2 files changed, 73 insertions(+), 72 deletions(-) diff --git a/package.json b/package.json index cae985405f..0cb6d26c9d 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.11.0", + "supi": "^0.12.0", "tape": "^4.8.0", "ts-node": "^4.0.2", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index d317bc758e..92223bc5ba 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,7 +1,7 @@ dependencies: '@types/common-tags': 1.4.0 '@types/node': 9.3.0 - '@types/ramda': 0.25.15 + '@types/ramda': 0.25.16 '@types/semver': 5.4.0 chalk: 2.3.0 common-tags: 1.7.2 @@ -11,7 +11,7 @@ dependencies: ndjson: 1.5.0 pretty-bytes: 4.0.2 ramda: 0.25.0 - semver: 5.4.1 + semver: 5.5.0 stacktracey: 1.2.100 zen-push: 0.2.1 devDependencies: @@ -24,7 +24,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.4 rimraf: 2.6.2 - supi: 0.11.2 + supi: 0.12.0 tape: 4.8.0 ts-node: 4.1.0 tslint: 5.9.1 @@ -46,7 +46,7 @@ packages: /@pnpm/check-package/1.0.0: dependencies: '@types/load-json-file': 2.0.7 - dint: 2.0.0 + dint: 2.0.2 load-json-file: 4.0.0 dev: true engines: @@ -65,19 +65,19 @@ packages: node: '>=4' resolution: integrity: sha512-sYJOXPxpQxFcTSACFRFCuIQdnZLNaOgTHGF+CQNYlKnlc2ZnmEW+lAZVTc0hJSU+8mnTY7ei39MbYpI5q+li+w== - /@pnpm/fs-locker/1.0.0: + /@pnpm/fs-locker/1.0.1: dependencies: - '@types/node': 8.5.8 + '@types/node': 9.3.0 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: true engines: node: '>=4' resolution: - integrity: sha512-JRIhC8lBFJjuaDnTMgCfCaO8IEa04JHCrNMW4RAjNrCeWBdcw2sczxp7qjqZPDc90z1VgUMlkpkGzXePcS9flQ== + integrity: sha512-gmM3SM6fBpssvbSD1U8wJbArNPiQchFzt90ICkfawo0OGQBYY6mgt+sqxF93E9yLfNY7WGtPJYhAQW3Uht6m7A== /@pnpm/logger/1.0.0: dependencies: - '@types/node': 8.5.8 + '@types/node': 8.5.9 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -85,7 +85,7 @@ packages: node: '>=4' resolution: integrity: sha512-VRqE5/SiuR7ZrwBmS+Af89BTXli5xBbiqu7WPq56gEtWT8dKf9rFLoimmmMBVeRq5LmVZIXlOxs29F9I+vgSvQ== - /@pnpm/package-requester/0.6.3: + /@pnpm/package-requester/0.7.1: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/pkgid-to-filename': 1.0.0 @@ -113,7 +113,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-HajmDYa0XnRS6EJ46wePxS3QTBLvKFVq8w3vO+p/b6WsOGBTU/d1b68AtgOB6AnyReaT4R72mq79EFJmQfMdHw== + integrity: sha512-31lHzW6kydRT7Gg/GAWMSNlxWKc+0BhU3CnQ0i70t44YjVggGOLJJU6g9jHv6+0reldcLqG28D7aFQYq1rqvEg== /@pnpm/pkgid-to-filename/1.0.0: dependencies: normalize-path: 2.1.1 @@ -163,9 +163,9 @@ packages: dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/8.5.8: + /@types/node/8.5.9: resolution: - integrity: sha512-8KmlRxwbKZfjUHFIt3q8TF5S2B+/E5BaAoo/3mgc5h6FJzqxXkCK/VMetO+IRDtwtU6HUvovHMBn+XRj7SV9Qg== + integrity: sha512-s+c3AjymyAccTI4hcgNFK4mToH8l+hyPDhu4LIkn71lRy56FLijGu00fyLgldjM/846Pmk9N4KFUs2P8GDs0pA== /@types/node/9.3.0: resolution: integrity: sha512-wNBfvNjzsJl4tswIZKXCFQY0lss9nKUyJnG6T94X/eqjRgI2jHZ4evdjhQYBSan/vGtF6XVXPApOmNH2rf0KKw== @@ -187,9 +187,9 @@ packages: dev: true resolution: integrity: sha512-dwv960sf5inFWiufjhDfK7ZG3nYyHXt58I+14bJJBKV5MPlZm6Tu1sQS63NWEtLpIw6+RhbNbXjNStdMXxR8Nw== - /@types/ramda/0.25.15: + /@types/ramda/0.25.16: resolution: - integrity: sha512-KlGg8px5Kz70uH1S1Hr00oHBGa19TtjfIBt1gwjUzzxun6N/sxQIjOfqnrVq0TauHqldU7JEdQAWYRx+xnKWCA== + integrity: sha512-jNxaEg+kSJ58iaM9bBawJugDxexXVPnLU245yEI1p2BTcfR5pcgM6mpsyBhRRo2ozyfJUvTmasL2Ft+C6BNkVQ== /@types/rc/0.0.1: dev: true resolution: @@ -211,10 +211,10 @@ packages: dev: true resolution: integrity: sha512-DEPn8FJKQR6eeMHZ407TuAqlhBKQa54PTM3c7Z6pKOI1uHaPnidmpmOXYtNZTcDrL5hnZofSHPwX1AQ9HbaMUg== - /@types/update-notifier/1.0.2: + /@types/update-notifier/1.0.3: dev: true resolution: - integrity: sha512-NwfqJ7OT7MgzgV+SiWJr7jMdBezFIWuBSmCOmScvesL/SV8A17SUQR0sCI+shxo+4THHPNGgzaLzfbjQMYLHFA== + integrity: sha512-BLStNhP2DFF7funARwTcoD6tetRte8NK3Sc59mn7GNALCN975jOlKX3dGvsFxXr/HwQMxxCuRn9IWB3WQ7odHQ== /@types/write-json-file/2.2.1: dev: true resolution: @@ -233,7 +233,7 @@ packages: dependencies: hosted-git-info: 2.5.0 osenv: 0.1.4 - semver: 5.4.1 + semver: 5.5.0 validate-npm-package-name: 3.0.0 dev: true resolution: @@ -505,7 +505,7 @@ packages: dependencies: is-bzip2: 1.0.0 peek-stream: 1.1.2 - pumpify: 1.3.6 + pumpify: 1.4.0 through2: 2.0.3 unbzip2-stream: 1.2.5 dev: true @@ -758,7 +758,7 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.5.8 + '@types/node': 8.5.9 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -788,7 +788,7 @@ packages: dependencies: bzip2-maybe: 1.0.0 gunzip-maybe: 1.4.1 - pumpify: 1.3.6 + pumpify: 1.4.0 dev: true resolution: integrity: sha1-rf54xmzAaeZOgkvRQFuF515tHLs= @@ -843,7 +843,7 @@ packages: dependencies: '@types/semver': 5.4.0 encode-registry: 1.1.0 - semver: 5.4.1 + semver: 5.5.0 dev: true resolution: integrity: sha512-WCVHx8m35ChWmemrAtp67EiXxp02Z0TRpJUYG1Kh7aloQcPdribxtcOm+GtMzhVnzgANj+mf0eo9aCtrxzzS3Q== @@ -881,18 +881,18 @@ packages: node: '>=0.3.1' resolution: integrity: sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA== - /dint/2.0.0: + /dint/2.0.2: dependencies: graceful-fs: 4.1.11 mz: 2.7.0 p-every: 1.0.2 p-limit: 1.2.0 - ssri: 5.0.0 + ssri: 5.1.0 dev: true engines: node: '>=4' resolution: - integrity: sha512-lxYQEEebR4G/uGaubo5TBi9H6FJGSR8zJGyt5AhFHbmWyH73e+EenuntCytzKcDpPl2K2v2slXUTY9Ch39kKRQ== + integrity: sha512-O7ma/wc+Sf6ETmKtH678v94d1zx3EqHoiwIGKlF2zArUzXItQ1ZXrKZY7RGl4RuFr7eYyK8bEeZkOX4dEv8iZw== /drive-by-path/1.0.0: dependencies: is-subdir: 1.0.2 @@ -1002,7 +1002,7 @@ packages: dev: true resolution: integrity: sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y= - /execa/0.8.0: + /execa/0.9.0: dependencies: cross-spawn: 5.1.0 get-stream: 3.0.0 @@ -1015,7 +1015,7 @@ packages: engines: node: '>=4' resolution: - integrity: sha1-2NdrvBtVIX7RkP1t1J08d07PyNo= + integrity: sha512-BbUMBiX4hqiHZUA5+JujIjNb6TyAlp2D5KLheMjMluwOuzcnylDL4AxZYLLn1n2AGB49eSWwyKvvEQoRpnAtmA== /exit-hook/1.1.1: dev: true engines: @@ -1382,7 +1382,7 @@ packages: is-deflate: 1.0.0 is-gzip: 1.0.0 peek-stream: 1.1.2 - pumpify: 1.3.6 + pumpify: 1.4.0 through2: 2.0.3 dev: true resolution: @@ -2128,7 +2128,7 @@ packages: integrity: sha1-gixFgNer54PfGZZbeJYiyoAWA+Q= /node-abi/2.1.2: dependencies: - semver: 5.4.1 + semver: 5.5.0 dev: true optional: true resolution: @@ -2174,7 +2174,7 @@ packages: dependencies: hosted-git-info: 2.5.0 is-builtin-module: 1.0.0 - semver: 5.4.1 + semver: 5.5.0 validate-npm-package-license: 3.0.1 dev: true resolution: @@ -2425,15 +2425,15 @@ packages: node: '>=4' resolution: integrity: sha512-JFT3uudfk3qtNHpCb3GwOq/n3NrEisxeQC/yTJLk7GHStYleXaFur4yW/SXqOtGMaKAAq5qTrkeFWdXheX+GPA== - /package-store/0.14.0: + /package-store/0.15.1: dependencies: - '@pnpm/fs-locker': 1.0.0 - '@pnpm/package-requester': 0.6.3 + '@pnpm/fs-locker': 1.0.1 + '@pnpm/package-requester': 0.7.1 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 '@types/node': 9.3.0 - '@types/ramda': 0.25.15 + '@types/ramda': 0.25.16 drive-by-path: 1.0.0 encode-registry: 1.1.0 load-json-file: 4.0.0 @@ -2446,6 +2446,7 @@ packages: path-absolute: 1.0.0 path-exists: 3.0.0 ramda: 0.25.0 + rename-overwrite: 1.0.0 rimraf-then: 1.0.1 util.promisify: 1.0.0 write-json-file: 2.3.0 @@ -2455,7 +2456,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-UAdTQDuoDtjidwwBK+6e0iUnwZ+OOvoHKfkzgu+tQwqQNTonSkx3351ppI4WMLmSCxzb2iqnyO59W2qbLB6qZA== + integrity: sha512-xd1DKf+4PaZcbxCeIoVrzwM9ChebldLc4RJBcwGVAOcEaKUBCB2aUC9VK76IA3Yw4xcx4cOA1QAe2uZC66kVsw== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -2593,14 +2594,14 @@ packages: integrity: sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY= /pnpm-install-checks/1.1.0: dependencies: - semver: 5.4.1 + semver: 5.5.0 dev: true resolution: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= /pnpm-shrinkwrap/5.1.1: dependencies: '@types/node': 9.3.0 - '@types/ramda': 0.25.15 + '@types/ramda': 0.25.16 dependency-path: 1.2.0 js-yaml: 3.10.0 load-yaml-file: 0.1.0 @@ -2627,7 +2628,7 @@ packages: npmlog: 4.1.2 os-homedir: 1.0.2 pump: 1.0.3 - rc: 1.2.3 + rc: 1.2.4 simple-get: 1.4.3 tar-fs: 1.16.0 tunnel-agent: 0.6.0 @@ -2693,14 +2694,14 @@ packages: dev: true resolution: integrity: sha512-6MYypjOvtiXhBSTOD0Zs5eNjCGfnqi5mPsCsW+dgKTxrZzQMZQNpBo3XRkLx7id753f3EeyHLBqzqqUymIolgw== - /pumpify/1.3.6: + /pumpify/1.4.0: dependencies: duplexify: 3.5.3 inherits: 2.0.3 pump: 2.0.0 dev: true resolution: - integrity: sha512-BurGAcvezsINL5US9T9wGHHcLNrG6MCp//ECtxron3vcR+Rfx5Anqq7HbZXNJvFQli8FGVsWCAvywEJFV5Hx/Q== + integrity: sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA== /punycode/1.4.1: dev: true resolution: @@ -2733,7 +2734,7 @@ packages: node: '>= 0.10.0' resolution: integrity: sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how== - /rc/1.2.3: + /rc/1.2.4: dependencies: deep-extend: 0.4.2 ini: 1.3.5 @@ -2742,7 +2743,7 @@ packages: dev: true optional: true resolution: - integrity: sha1-UVdakA+N1oOBxxC0cSwhVMPiA1s= + integrity: sha1-oPYGyq4qO4YrvQ74VILAElsxX6M= /read-package-json/2.0.12: dependencies: glob: 7.1.2 @@ -2885,7 +2886,7 @@ packages: stringstream: 0.0.5 tough-cookie: 2.3.3 tunnel-agent: 0.6.0 - uuid: 3.1.0 + uuid: 3.2.1 dev: true engines: node: '>= 4' @@ -2999,9 +3000,9 @@ packages: dev: true resolution: integrity: sha1-myzl094C0XxgEq0yaqa00M9U+U8= - /semver/5.4.1: + /semver/5.5.0: resolution: - integrity: sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg== + integrity: sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== /set-blocking/2.0.0: dev: true resolution: @@ -3068,12 +3069,12 @@ packages: node: '>=4' resolution: integrity: sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= - /source-map-support/0.5.0: + /source-map-support/0.5.2: dependencies: source-map: 0.6.1 dev: true resolution: - integrity: sha512-vUoN3I7fHQe0R/SJLKRdKYuEdRGogsviXFkHHo17AWaTGv17VLnxw+CFXvqy+y4ORZ3doWLQcxRYfwKrsd/H7Q== + integrity: sha512-9zHceZbQwERaMK1MiFguvx1dL9GQPLXInr2D/wUxAsuV6ZKc9F0DHYWeloMcalkYRbtanwqUakoDjvj55cL/4A== /source-map/0.6.1: engines: node: '>=0.10.0' @@ -3133,12 +3134,12 @@ packages: tweetnacl: 0.14.5 resolution: integrity: sha1-US322mKHFEMW3EwY/hzx2UBzm+M= - /ssri/5.0.0: + /ssri/5.1.0: dependencies: safe-buffer: 5.1.1 dev: true resolution: - integrity: sha512-728D4yoQcQm1ooZvSbywLkV1RjfITZXh0oWrhM/lnsx3nAHx7LsRGJWB/YyvoceAYRq98xqbstiN4JBv1/wNHg== + integrity: sha512-TevC8fgxQKTfQ1nWtM9GNzr3q5rrHNntG9CDMH1k3QhSZI6Kb+NbjLRs8oPFZa2Hgo7zoekL+UTvoEk7tsbjQg== /stacktracey/1.2.100: dependencies: as-table: 1.0.31 @@ -3237,11 +3238,11 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.11.2: + /supi/0.12.0: dependencies: '@pnpm/check-package': 1.0.0 - '@pnpm/fs-locker': 1.0.0 - '@pnpm/package-requester': 0.6.3 + '@pnpm/fs-locker': 1.0.1 + '@pnpm/package-requester': 0.7.1 '@pnpm/pkgid-to-filename': 1.0.0 '@pnpm/types': 1.7.0 '@types/byline': 4.2.31 @@ -3252,10 +3253,10 @@ packages: '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 - '@types/ramda': 0.25.15 + '@types/ramda': 0.25.16 '@types/rc': 0.0.1 '@types/semver': 5.4.0 - '@types/update-notifier': 1.0.2 + '@types/update-notifier': 1.0.3 '@zkochan/cmd-shim': 2.2.4 '@zkochan/npm-package-arg': 1.0.0 arr-flatten: 1.1.0 @@ -3264,7 +3265,7 @@ packages: cross-spawn: 5.1.0 dependency-path: 1.2.0 encode-registry: 1.1.0 - execa: 0.8.0 + execa: 0.9.0 get-npm-tarball-url: 2.0.1 graceful-fs: 4.1.11 is-ci: 1.1.0 @@ -3282,7 +3283,7 @@ packages: p-filter: 1.0.0 p-limit: 1.2.0 p-series: 1.0.0 - package-store: 0.14.0 + package-store: 0.15.1 path-absolute: 1.0.0 path-exists: 3.0.0 path-name: 1.0.0 @@ -3293,7 +3294,7 @@ packages: remove-all-except-outer-links: 1.0.3 replace-string: 1.1.0 rimraf-then: 1.0.1 - semver: 5.4.1 + semver: 5.5.0 symlink-dir: 1.1.2 thenify: 3.3.0 validate-npm-package-name: 3.0.0 @@ -3306,7 +3307,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-V3Mh9+9VuiQZcLveMaotr+KvCC87kk7Z4qUqLD4Nzjz7LLetP9WxxHJaZyRAQi9mwkvmfHrDRk9ToiLZ2b6T7Q== + integrity: sha512-Qlvz0SKvR6gspUmzvuGrM7f/4xnuc3roEBXV4HtclgESp9wS53TMgCQYAcTUSrw7IP1cLkSZsaUn0kqPCU9WjA== /supports-color/0.2.0: dev: true engines: @@ -3462,7 +3463,7 @@ packages: make-error: 1.3.2 minimist: 1.2.0 mkdirp: 0.5.1 - source-map-support: 0.5.0 + source-map-support: 0.5.2 tsconfig: 7.0.0 v8flags: 3.0.1 yn: 2.0.0 @@ -3480,10 +3481,10 @@ packages: dev: true resolution: integrity: sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw== - /tslib/1.8.1: + /tslib/1.9.0: dev: true resolution: - integrity: sha1-aUavLR1lGnsYY7Ux1uWvpBqkTqw= + integrity: sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ== /tslint/5.9.1: dependencies: babel-code-frame: 6.26.0 @@ -3495,9 +3496,9 @@ packages: js-yaml: 3.10.0 minimatch: 3.0.4 resolve: 1.5.0 - semver: 5.4.1 - tslib: 1.8.1 - tsutils: 2.18.0 + semver: 5.5.0 + tslib: 1.9.0 + tsutils: 2.19.1 dev: true engines: node: '>=4.8.0' @@ -3505,14 +3506,14 @@ packages: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev' resolution: integrity: sha1-ElX4ej/1frCw4fDmEKi0dIBGya4= - /tsutils/2.18.0: + /tsutils/2.19.1: dependencies: - tslib: 1.8.1 + tslib: 1.9.0 dev: true peerDependencies: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >= 2.4.0-dev || >= 2.5.0-dev || >= 2.6.0-dev || >= 2.7.0-dev || >= 2.8.0-dev' resolution: - integrity: sha512-y0CUDPPb0ygkUkmK8kAeLibag7OEAO0dxbtqAhzP+5w/VY5JdGnPiafhYxzRzWzkAGQGPJV99xrxngJYVLtrMg== + integrity: sha512-1B3z4H4HddgzWptqLzwrJloDEsyBt8DvZhnFO14k7A4RsQL/UhEfQjD4hpcY5NpF3veBkjJhQJ8Bl7Xp96cN+A== /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.1.1 @@ -3557,7 +3558,7 @@ packages: dependencies: '@types/node': 9.3.0 decompress-maybe: 1.0.0 - ssri: 5.0.0 + ssri: 5.1.0 tar-fs: 1.16.0 dev: true engines: @@ -3582,10 +3583,10 @@ packages: dev: true resolution: integrity: sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA== - /uuid/3.1.0: + /uuid/3.2.1: dev: true resolution: - integrity: sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g== + integrity: sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA== /v8flags/3.0.1: dependencies: homedir-polyfill: 1.0.1 @@ -3629,7 +3630,7 @@ packages: integrity: sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= /version-selector-type/2.0.0: dependencies: - semver: 5.4.1 + semver: 5.5.0 dev: true engines: node: '>=4' @@ -3767,7 +3768,7 @@ specifiers: rimraf: ^2.5.4 semver: ^5.4.1 stacktracey: ^1.2.87 - supi: ^0.11.0 + supi: ^0.12.0 tape: ^4.8.0 ts-node: ^4.0.2 tslint: ^5.7.0 From c59dac1e3ee94fb5559b8c765a875c765befa72f Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 22 Jan 2018 02:20:02 +0200 Subject: [PATCH 126/196] fix: update peer dependencies --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0cb6d26c9d..f8adf60414 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "supi": ">=0.8.0 <0.12.0" + "supi": ">=0.8.0 <0.13.0" }, "dependencies": { "@types/common-tags": "^1.2.5", From 499757bbfcd755af9b9cfe779eed12deceaa1665 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 22 Jan 2018 02:20:07 +0200 Subject: [PATCH 127/196] chore(release): 0.11.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f8adf60414..cd1554d7b1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.11.7", + "version": "0.11.8", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 2df6718720572b1893b9f6e15535d9014181d0aa Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 26 Jan 2018 22:18:56 +0200 Subject: [PATCH 128/196] fix: fatal error should be reporter during recursive install --- src/reporterForClient.ts | 15 ++++++++++++++- test/index.ts | 22 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 9c5e15eb65..4419480ee3 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -264,7 +264,7 @@ export default function ( outputs.push(registryOutput$) - const miscOutput$ = (!isRecursive ? most.merge(log$.link, log$.other) : log$.other) + const miscOutput$ = most.merge(log$.link, log$.other) .map((obj) => { if (obj.level === 'debug') return if (obj.level === 'warn') { @@ -278,6 +278,19 @@ export default function ( .map((msg) => ({msg})) .map(most.of) + outputs.push(miscOutput$) + } else { + const miscOutput$ = log$.other + .filter((obj) => obj.level === 'error') + .map((obj) => { + if (obj['message']['prefix']) { + return obj['message']['prefix'] + ':' + os.EOL + reportError(obj) + } + return reportError(obj) + }) + .map((msg) => ({msg})) + .map(most.of) + outputs.push(miscOutput$) } diff --git a/test/index.ts b/test/index.ts index fdb8e2eb19..d275feca89 100644 --- a/test/index.ts +++ b/test/index.ts @@ -405,6 +405,28 @@ test('prints generic error', t => { }) }) +test('prints generic error when recursive install fails', t => { + const output$ = toOutput$(createStreamParser(), 'recursive') + + const err = new Error('some error') + err['prefix'] = '/home/src/' + logger.error(err, err) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, stripIndents` + /home/src/: + ${ERROR} ${chalk.red('some error')} + ${new StackTracey(err.stack).pretty} + `) + }, + complete: () => t.end(), + error: t.end, + }) +}) + test('prints info', t => { const output$ = toOutput$(createStreamParser()) From 260c63d388cdf785c031e3650883a7c5fc72da63 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 26 Jan 2018 23:55:45 +0200 Subject: [PATCH 129/196] chore(release): 0.11.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cd1554d7b1..6e87ea0158 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.11.8", + "version": "0.11.9", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From b90778b065a438814fddcfd0798eb56aacf074fa Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 29 Jan 2018 22:31:54 +0200 Subject: [PATCH 130/196] chore: fix shrinkwrap.yaml --- shrinkwrap.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 92223bc5ba..c60c5264b3 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -710,7 +710,6 @@ packages: resolution: integrity: sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4= /core-util-is/1.0.2: - dev: false resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= /cross-spawn/5.1.0: @@ -1503,7 +1502,6 @@ packages: resolution: integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= /inherits/2.0.3: - dev: false resolution: integrity: sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= /ini/1.3.5: @@ -1734,7 +1732,6 @@ packages: resolution: integrity: sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk= /isarray/1.0.0: - dev: false resolution: integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= /isexe/2.0.0: @@ -2664,7 +2661,6 @@ packages: resolution: integrity: sha1-du+ErM/X+DZvtxOPuSRmqRbVmbw= /process-nextick-args/1.0.7: - dev: false resolution: integrity: sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= /proper-lockfile/2.0.1: @@ -2783,7 +2779,6 @@ packages: safe-buffer: 5.1.1 string_decoder: 1.0.3 util-deprecate: 1.0.2 - dev: false resolution: integrity: sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== /rechoir/0.6.2: @@ -2987,7 +2982,6 @@ packages: resolution: integrity: sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= /safe-buffer/5.1.1: - dev: false resolution: integrity: sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== /semver-regex/1.0.0: @@ -3183,7 +3177,6 @@ packages: /string_decoder/1.0.3: dependencies: safe-buffer: 5.1.1 - dev: false resolution: integrity: sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== /stringstream/0.0.5: @@ -3424,7 +3417,6 @@ packages: dependencies: readable-stream: 2.3.3 xtend: 4.0.1 - dev: false resolution: integrity: sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= /timeout-then/1.1.0: @@ -3573,7 +3565,6 @@ packages: resolution: integrity: sha1-uYTwh3/AqJwsdzzB73tbIytbBv4= /util-deprecate/1.0.2: - dev: false resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= /util.promisify/1.0.0: @@ -3716,7 +3707,6 @@ packages: resolution: integrity: sha1-e0vQ33LKE/vp1rAXj9g8B3uOqGs= /xtend/4.0.1: - dev: false engines: node: '>=0.4' resolution: From 278feb71e987d570dee8546a668953e0ca8c6fdd Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 30 Jan 2018 00:41:45 +0200 Subject: [PATCH 131/196] perf: throttle reporting of resolution/fetching progress BREAKING CHANGE: programmatic API changed ref pnpm/pnpm#1017 --- src/bin/pnpm-default-reporter.ts | 2 +- src/index.ts | 31 +++++++++++++++++++------------ src/reporterForClient.ts | 4 +++- test/index.ts | 29 +++++++++++++++-------------- 4 files changed, 38 insertions(+), 28 deletions(-) diff --git a/src/bin/pnpm-default-reporter.ts b/src/bin/pnpm-default-reporter.ts index 4f6710b3f4..eca3404015 100644 --- a/src/bin/pnpm-default-reporter.ts +++ b/src/bin/pnpm-default-reporter.ts @@ -6,4 +6,4 @@ process.stdin.resume() process.stdin.setEncoding('utf8') const streamParser = process.stdin .pipe(ndjson.parse()) -reporter(streamParser) +reporter(streamParser, {cmd: 'install'}) // TODO: make it smarter diff --git a/src/index.ts b/src/index.ts index c80d35b601..d4334006c5 100644 --- a/src/index.ts +++ b/src/index.ts @@ -10,17 +10,20 @@ import reporterForServer from './reporterForServer' export default function ( streamParser: object, - cmd?: string, // is optional only to be backward compatible - width?: number, - appendOnly?: boolean, + opts: { + cmd: string, + appendOnly?: boolean, + throttleProgress?: number, + width?: number, + }, ) { - if (cmd === 'server') { + if (opts.cmd === 'server') { const log$ = most.fromEvent('data', streamParser) reporterForServer(log$) return } - const output$ = toOutput$(streamParser, cmd, undefined, appendOnly) - if (appendOnly) { + const output$ = toOutput$(streamParser, opts) + if (opts.appendOnly) { output$ .subscribe({ complete () {}, // tslint:disable-line:no-empty @@ -39,11 +42,15 @@ export default function ( export function toOutput$ ( streamParser: object, - cmd?: string, // is optional only to be backward compatible - width?: number, - appendOnly?: boolean, + opts: { + cmd: string, + appendOnly?: boolean, + throttleProgress?: number, + width?: number, + }, ): most.Stream { - const isRecursive = cmd === 'recursive' + opts = opts || {} + const isRecursive = opts.cmd === 'recursive' const progressPushStream = new PushStream() const stagePushStream = new PushStream() const deprecationPushStream = new PushStream() @@ -112,9 +119,9 @@ export function toOutput$ ( stats: most.from(statsPushStream.observable), summary: most.from(summaryPushStream.observable), } - const outputs: Array>> = reporterForClient(log$, isRecursive, cmd, width, appendOnly) + const outputs: Array>> = reporterForClient(log$, isRecursive, opts.cmd, opts.width, opts.appendOnly, opts.throttleProgress) - if (appendOnly) { + if (opts.appendOnly) { return most.join( most.mergeArray(outputs) .map((log: most.Stream<{msg: string}>) => log.map((msg) => msg.msg)), diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 4419480ee3..eea6ac005c 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -48,6 +48,7 @@ export default function ( cmd?: string, // is optional only to be backward compatible widthArg?: number, appendOnly?: boolean, + throttleProgress?: number, ): Array>> { const width = widthArg || process.stdout.columns || 80 const outputs: Array>> = [] @@ -112,7 +113,8 @@ export default function ( fedtchedLog$, foundInStoreLog$, isRecursive ? most.of(false) : resolutionDone$, - ), + ) + .throttle(typeof throttleProgress === 'number' ? throttleProgress : 200), ) outputs.push(progressSummaryOutput$) diff --git a/test/index.ts b/test/index.ts index d275feca89..e6164421dc 100644 --- a/test/index.ts +++ b/test/index.ts @@ -56,7 +56,7 @@ test('prints progress beginning', t => { }) test('prints progress beginning during recursive install', t => { - const output$ = toOutput$(createStreamParser(), 'recursive') + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive'}) const pkgId = 'registry.npmjs.org/foo/1.0.0' @@ -77,7 +77,7 @@ test('prints progress beginning during recursive install', t => { }) test('prints progress on first download', t => { - const output$ = toOutput$(createStreamParser()) + const output$ = toOutput$(createStreamParser(), {throttleProgress: 0}) const pkgId = 'registry.npmjs.org/foo/1.0.0' @@ -102,7 +102,7 @@ test('prints progress on first download', t => { }) test('moves fixed line to the end', async t => { - const output$ = toOutput$(createStreamParser()) + const output$ = toOutput$(createStreamParser(), {throttleProgress: 0}) output$.skip(3).take(1).map(normalizeNewline).subscribe({ next: output => { @@ -406,7 +406,7 @@ test('prints generic error', t => { }) test('prints generic error when recursive install fails', t => { - const output$ = toOutput$(createStreamParser(), 'recursive') + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive'}) const err = new Error('some error') err['prefix'] = '/home/src/' @@ -446,7 +446,8 @@ test('prints info', t => { test('prints progress of big files download', async t => { t.plan(6) - let output$ = toOutput$(createStreamParser()).map(normalizeNewline) as most.Stream + let output$ = toOutput$(createStreamParser(), {throttleProgress: 0}) + .map(normalizeNewline) as most.Stream const stream$: most.Stream[] = [] const pkgId1 = 'registry.npmjs.org/foo/1.0.0' @@ -583,7 +584,7 @@ test('prints progress of big files download', async t => { }) test('prints added/removed stats during installation', t => { - const output$ = toOutput$(createStreamParser(), 'install') + const output$ = toOutput$(createStreamParser(), {cmd: 'install'}) statsLogger.debug({ added: 5 }) statsLogger.debug({ removed: 1 }) @@ -603,7 +604,7 @@ test('prints added/removed stats during installation', t => { }) test('prints added/removed stats during installation when 0 removed', t => { - const output$ = toOutput$(createStreamParser(), 'install') + const output$ = toOutput$(createStreamParser(), {cmd: 'install'}) statsLogger.debug({ added: 2 }) statsLogger.debug({ removed: 0 }) @@ -623,7 +624,7 @@ test('prints added/removed stats during installation when 0 removed', t => { }) test('prints only the added stats if nothing was removed', t => { - const output$ = toOutput$(createStreamParser(), 'install') + const output$ = toOutput$(createStreamParser(), {cmd: 'install'}) statsLogger.debug({ removed: 0 }) statsLogger.debug({ added: 1 }) @@ -643,7 +644,7 @@ test('prints only the added stats if nothing was removed', t => { }) test('prints only the removed stats if nothing was added', t => { - const output$ = toOutput$(createStreamParser(), 'install') + const output$ = toOutput$(createStreamParser(), {cmd: 'install'}) statsLogger.debug({ removed: 1 }) statsLogger.debug({ added: 0 }) @@ -663,7 +664,7 @@ test('prints only the removed stats if nothing was added', t => { }) test('prints only the added stats if nothing was removed and a lot added', t => { - const output$ = toOutput$(createStreamParser(), 'install', 20) + const output$ = toOutput$(createStreamParser(), {cmd: 'install', width: 20}) statsLogger.debug({ removed: 0 }) statsLogger.debug({ added: 100 }) @@ -683,7 +684,7 @@ test('prints only the added stats if nothing was removed and a lot added', t => }) test('prints only the removed stats if nothing was added and a lot removed', t => { - const output$ = toOutput$(createStreamParser(), 'install', 20) + const output$ = toOutput$(createStreamParser(), {cmd: 'install', width: 20}) statsLogger.debug({ removed: 100 }) statsLogger.debug({ added: 0 }) @@ -703,7 +704,7 @@ test('prints only the removed stats if nothing was added and a lot removed', t = }) test('prints at least one remove sign when removed !== 0', t => { - const output$ = toOutput$(createStreamParser(), 'install', 20) + const output$ = toOutput$(createStreamParser(), {cmd: 'install', width: 20}) statsLogger.debug({ removed: 1 }) statsLogger.debug({ added: 100 }) @@ -723,7 +724,7 @@ test('prints at least one remove sign when removed !== 0', t => { }) test('prints at least one add sign when added !== 0', t => { - const output$ = toOutput$(createStreamParser(), 'install', 20) + const output$ = toOutput$(createStreamParser(), {cmd: 'install', width: 20}) statsLogger.debug({ removed: 100 }) statsLogger.debug({ added: 1 }) @@ -743,7 +744,7 @@ test('prints at least one add sign when added !== 0', t => { }) test('prints just removed during uninstallation', t => { - const output$ = toOutput$(createStreamParser(), 'uninstall') + const output$ = toOutput$(createStreamParser(), {cmd: 'uninstall'}) statsLogger.debug({ removed: 4 }) From 9127c5b9adeb20fc200ae664a855627b57982062 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 30 Jan 2018 00:50:31 +0200 Subject: [PATCH 132/196] chore(release): 0.12.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e87ea0158..ad522ed32a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.11.9", + "version": "0.12.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From e07013f91a17ec6e3b548d1e57d19a9e2d7a019b Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 30 Jan 2018 23:00:40 +0200 Subject: [PATCH 133/196] fix: always report the final progress BREAKING CHANGE: requires supi@0.12.4 ref pnpm/pnpm#1017 --- package.json | 4 +- shrinkwrap.yaml | 88 ++++++++++++++++++++++------------------ src/reporterForClient.ts | 56 ++++++++++++++++--------- 3 files changed, 87 insertions(+), 61 deletions(-) diff --git a/package.json b/package.json index ad522ed32a..813709527f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "supi": ">=0.8.0 <0.13.0" + "supi": ">=0.12.4 <0.13.0" }, "dependencies": { "@types/common-tags": "^1.2.5", @@ -67,7 +67,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.12.0", + "supi": "^0.12.4", "tape": "^4.8.0", "ts-node": "^4.0.2", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index c60c5264b3..8530eee63a 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -24,7 +24,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.4 rimraf: 2.6.2 - supi: 0.12.0 + supi: 0.12.4 tape: 4.8.0 ts-node: 4.1.0 tslint: 5.9.1 @@ -85,7 +85,7 @@ packages: node: '>=4' resolution: integrity: sha512-VRqE5/SiuR7ZrwBmS+Af89BTXli5xBbiqu7WPq56gEtWT8dKf9rFLoimmmMBVeRq5LmVZIXlOxs29F9I+vgSvQ== - /@pnpm/package-requester/0.7.1: + /@pnpm/package-requester/0.7.3: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/pkgid-to-filename': 1.0.0 @@ -101,7 +101,7 @@ packages: p-queue: 2.3.0 path-exists: 3.0.0 read-package-json: 2.0.12 - rename-overwrite: 1.0.0 + rename-overwrite: 1.0.1 rimraf-then: 1.0.1 symlink-dir: 1.1.2 unpack-stream: 3.0.1 @@ -113,7 +113,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-31lHzW6kydRT7Gg/GAWMSNlxWKc+0BhU3CnQ0i70t44YjVggGOLJJU6g9jHv6+0reldcLqG28D7aFQYq1rqvEg== + integrity: sha512-kXjzsbpk91zmMy+SeGjclFehEhWWGRobYeUyG/Rk8HkVNMo50JHP15eQSKvZdkrn9II/MUeKcs2p3wxyb1kP/Q== /@pnpm/pkgid-to-filename/1.0.0: dependencies: normalize-path: 2.1.1 @@ -169,6 +169,10 @@ packages: /@types/node/9.3.0: resolution: integrity: sha512-wNBfvNjzsJl4tswIZKXCFQY0lss9nKUyJnG6T94X/eqjRgI2jHZ4evdjhQYBSan/vGtF6XVXPApOmNH2rf0KKw== + /@types/node/9.4.0: + dev: true + resolution: + integrity: sha512-zkYho6/4wZyX6o9UQ8rd0ReEaiEYNNCqYFIAACe2Tf9DrYlgzWW27OigYHnnztnnZQwVRpwWmZKegFmDpinIsA== /@types/nopt/3.0.29: dev: true resolution: @@ -868,6 +872,13 @@ packages: node: '>=4' resolution: integrity: sha1-OHHMCmoALow+Wzz38zYmRnXwa50= + /detect-libc/1.0.3: + dev: true + engines: + node: '>=0.10' + optional: true + resolution: + integrity: sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= /diff/2.2.3: dev: true engines: @@ -911,7 +922,7 @@ packages: debug: 3.1.0 js-yaml: 3.10.0 nan: 2.8.0 - prebuild-install: 2.4.1 + prebuild-install: 2.5.0 dev: true engines: node: '>=4' @@ -2123,13 +2134,13 @@ packages: node: '>=6' resolution: integrity: sha1-gixFgNer54PfGZZbeJYiyoAWA+Q= - /node-abi/2.1.2: + /node-abi/2.2.0: dependencies: semver: 5.5.0 dev: true optional: true resolution: - integrity: sha512-hmUtb8m75RSi7N+zZLYqe75XDvZB+6LyTBPkj2DConvNgQet2e3BIqEwe1LLvqMrfyjabuT5ZOrTioLCH1HTdA== + integrity: sha512-FqVC0WNNL8fQWQK3GYTESfwZXZKDbSIiEEIvufq7HV6Lj0IDDZRVa4CU/KTA0JVlqY9eTDSuPiC8FS9UfGVuzA== /node-gyp/3.6.2: dependencies: fstream: 1.0.11 @@ -2422,14 +2433,14 @@ packages: node: '>=4' resolution: integrity: sha512-JFT3uudfk3qtNHpCb3GwOq/n3NrEisxeQC/yTJLk7GHStYleXaFur4yW/SXqOtGMaKAAq5qTrkeFWdXheX+GPA== - /package-store/0.15.1: + /package-store/0.15.3: dependencies: '@pnpm/fs-locker': 1.0.1 - '@pnpm/package-requester': 0.7.1 + '@pnpm/package-requester': 0.7.3 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.3.0 + '@types/node': 9.4.0 '@types/ramda': 0.25.16 drive-by-path: 1.0.0 encode-registry: 1.1.0 @@ -2443,7 +2454,7 @@ packages: path-absolute: 1.0.0 path-exists: 3.0.0 ramda: 0.25.0 - rename-overwrite: 1.0.0 + rename-overwrite: 1.0.1 rimraf-then: 1.0.1 util.promisify: 1.0.0 write-json-file: 2.3.0 @@ -2453,7 +2464,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-xd1DKf+4PaZcbxCeIoVrzwM9ChebldLc4RJBcwGVAOcEaKUBCB2aUC9VK76IA3Yw4xcx4cOA1QAe2uZC66kVsw== + integrity: sha512-8MpzcMFFHdSt1hTBgmGtOFkt61+ATRbc3wyVOA35yaxFYMezuyd/DiiSfJCZIG0DRTCqCx6oeIs58YpLVAW/nw== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -2595,9 +2606,9 @@ packages: dev: true resolution: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= - /pnpm-shrinkwrap/5.1.1: + /pnpm-shrinkwrap/5.1.2: dependencies: - '@types/node': 9.3.0 + '@types/node': 9.4.0 '@types/ramda': 0.25.16 dependency-path: 1.2.0 js-yaml: 3.10.0 @@ -2605,7 +2616,7 @@ packages: mkdirp-promise: 5.0.1 ramda: 0.25.0 rimraf-then: 1.0.1 - thenify: 3.3.0 + util.promisify: 1.0.0 write-file-atomic: 2.3.0 dev: true engines: @@ -2613,14 +2624,15 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-rTDk5r3OKdOU+6P/QDh0RZX9fohf4iUs5Wa4T3mTIF0Wb4TH9jJlvQVI4XSidwlgWIZHHbDiHWgIHACOTS+bLQ== - /prebuild-install/2.4.1: + integrity: sha512-lSKx5YE9iSda7CWHIyUVpI9jTa1zpvqPJfeu4nwR2+phpw6VdBFeeNagXcUV7l6H2w2Bf+dXTDO7srH12BPB8g== + /prebuild-install/2.5.0: dependencies: + detect-libc: 1.0.3 expand-template: 1.1.0 github-from-package: 0.0.0 minimist: 1.2.0 mkdirp: 0.5.1 - node-abi: 2.1.2 + node-abi: 2.2.0 noop-logger: 0.1.1 npmlog: 4.1.2 os-homedir: 1.0.2 @@ -2633,7 +2645,7 @@ packages: dev: true optional: true resolution: - integrity: sha512-99TyEFYTTkBWANT+mwSptmLb9ZCLQ6qKIUE36fXSIOtShB0JNprL2hzBD8F1yIuT9btjFrFEwbRHXhqDi1HmRA== + integrity: sha512-3wlyZgmkeeyduOR8Ursu5gKr3yWAYObACa5aJOtt2farRRFV/+zXk/Y3wM6yQRMqmqHh+pHAwyKp5r82K699Rg== /preserve/0.2.0: dev: true engines: @@ -2683,18 +2695,18 @@ packages: dev: true resolution: integrity: sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw== - /pump/2.0.0: + /pump/2.0.1: dependencies: end-of-stream: 1.4.1 once: 1.4.0 dev: true resolution: - integrity: sha512-6MYypjOvtiXhBSTOD0Zs5eNjCGfnqi5mPsCsW+dgKTxrZzQMZQNpBo3XRkLx7id753f3EeyHLBqzqqUymIolgw== + integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== /pumpify/1.4.0: dependencies: duplexify: 3.5.3 inherits: 2.0.3 - pump: 2.0.0 + pump: 2.0.1 dev: true resolution: integrity: sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA== @@ -2823,15 +2835,17 @@ packages: dev: true resolution: integrity: sha1-wkvOKig62tW8P1jg1IJJuSN52O8= - /rename-overwrite/1.0.0: + /rename-overwrite/1.0.1: dependencies: + delay: 2.0.0 graceful-fs: 4.1.11 rimraf: 2.6.2 - thenify: 3.3.0 - timeout-then: 1.1.0 + util.promisify: 1.0.0 dev: true + engines: + node: '>=4' resolution: - integrity: sha1-tFp0zrk9EHPjHFtwHEKN5XllI9g= + integrity: sha512-T/7u/iSRX4RcuQ15QYvZh8uZMQkYLPBuJjIddmYpYQ/RWBEoRUay/Xy3qf6s8DSQ4TQ55ToJJnlCaJ3tV6Se4w== /repeat-element/1.1.2: dev: true engines: @@ -3231,11 +3245,11 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.12.0: + /supi/0.12.4: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/package-requester': 0.7.1 + '@pnpm/package-requester': 0.7.3 '@pnpm/pkgid-to-filename': 1.0.0 '@pnpm/types': 1.7.0 '@types/byline': 4.2.31 @@ -3276,12 +3290,12 @@ packages: p-filter: 1.0.0 p-limit: 1.2.0 p-series: 1.0.0 - package-store: 0.15.1 + package-store: 0.15.3 path-absolute: 1.0.0 path-exists: 3.0.0 path-name: 1.0.0 pnpm-install-checks: 1.1.0 - pnpm-shrinkwrap: 5.1.1 + pnpm-shrinkwrap: 5.1.2 ramda: 0.25.0 read-package-json: 2.0.12 remove-all-except-outer-links: 1.0.3 @@ -3289,7 +3303,7 @@ packages: rimraf-then: 1.0.1 semver: 5.5.0 symlink-dir: 1.1.2 - thenify: 3.3.0 + util.promisify: 1.0.0 validate-npm-package-name: 3.0.0 version-selector-type: 2.0.0 write-pkg: 3.1.0 @@ -3300,7 +3314,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-Qlvz0SKvR6gspUmzvuGrM7f/4xnuc3roEBXV4HtclgESp9wS53TMgCQYAcTUSrw7IP1cLkSZsaUn0kqPCU9WjA== + integrity: sha512-3NDsiSNxAGdUmgepehpozPGx/sS4DHlmCAiGBxN6HnXZxnrClBrRmIhrJKkNikmE7AaoMMmMCntw8bfeVq0Mog== /supports-color/0.2.0: dev: true engines: @@ -3419,12 +3433,6 @@ packages: xtend: 4.0.1 resolution: integrity: sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= - /timeout-then/1.1.0: - dependencies: - any-promise: 1.3.0 - dev: true - resolution: - integrity: sha1-AUWwYHAVnBfiFG/SkrAaG9geX7w= /tmp/0.0.29: dependencies: os-tmpdir: 1.0.2 @@ -3548,7 +3556,7 @@ packages: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= /unpack-stream/3.0.1: dependencies: - '@types/node': 9.3.0 + '@types/node': 9.4.0 decompress-maybe: 1.0.0 ssri: 5.1.0 tar-fs: 1.16.0 @@ -3758,7 +3766,7 @@ specifiers: rimraf: ^2.5.4 semver: ^5.4.1 stacktracey: ^1.2.87 - supi: ^0.12.0 + supi: ^0.12.4 tape: ^4.8.0 ts-node: ^4.0.2 tslint: ^5.7.0 diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index eea6ac005c..546a446260 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -94,30 +94,48 @@ export default function ( .filter((log) => log.status === 'found_in_store') .scan(R.inc, 0) - const progressSummaryOutput$ = most.of( - most.combine( - (resolving, fetched, foundInStore: number, resolutionDone) => { - const msg = `Resolving: total ${hlValue(resolving.toString())}, reused ${hlValue(foundInStore.toString())}, downloaded ${hlValue(fetched.toString())}` - if (resolving === foundInStore + fetched && resolutionDone) { - return { - fixed: false, - msg: `${msg}, done`, - } - } - return { - fixed: true, - msg, - } - }, + function createStatusMessage (resolving: number, fetched: number, foundInStore: number, resolutionDone: boolean) { + const msg = `Resolving: total ${hlValue(resolving.toString())}, reused ${hlValue(foundInStore.toString())}, downloaded ${hlValue(fetched.toString())}` + if (resolving === foundInStore + fetched && resolutionDone) { + return { + fixed: false, + msg: `${msg}, done`, + } + } + return { + fixed: true, + msg, + } + } + + if (!isRecursive && typeof throttleProgress === 'number' && throttleProgress > 0) { + const importingDone$ = log$.stage.filter((log) => log.message === 'importing_done').multicast() + + // Reporting is done every `throttleProgress` milliseconds + // and once all packages are fetched. + const sampler = most.merge( + most.periodic(throttleProgress).until(importingDone$), + importingDone$, + ) + const progress = most.sample( + createStatusMessage, + sampler, + resolvingContentLog$, + fedtchedLog$, + foundInStoreLog$, + resolutionDone$, + ) + outputs.push(most.of(progress)) + } else { + const progress = most.combine( + createStatusMessage, resolvingContentLog$, fedtchedLog$, foundInStoreLog$, isRecursive ? most.of(false) : resolutionDone$, ) - .throttle(typeof throttleProgress === 'number' ? throttleProgress : 200), - ) - - outputs.push(progressSummaryOutput$) + outputs.push(most.of(progress)) + } const tarballsProgressOutput$ = log$.progress .filter((log) => log.status === 'fetching_started' && From b8bf778027cb41b18fee85a0ed1f20ea11cbf67e Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 30 Jan 2018 23:05:33 +0200 Subject: [PATCH 134/196] chore(release): 0.13.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 813709527f..d3dfa50a5b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.12.0", + "version": "0.13.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From dfdc37efb3a7e93fbacd266e3d9f0ad276784924 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 31 Jan 2018 01:35:46 +0200 Subject: [PATCH 135/196] fix: don't hang when progress reporting did not start BREAKING CHANGE: depends on supi >= 0.12.5 --- package.json | 4 ++-- shrinkwrap.yaml | 8 ++++---- src/index.ts | 5 +++++ src/reporterForClient.ts | 7 +++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index d3dfa50a5b..b3c7a5e1dd 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "supi": ">=0.12.4 <0.13.0" + "supi": ">=0.12.5 <0.13.0" }, "dependencies": { "@types/common-tags": "^1.2.5", @@ -67,7 +67,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.12.4", + "supi": "^0.12.5", "tape": "^4.8.0", "ts-node": "^4.0.2", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 8530eee63a..81b689ec38 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -24,7 +24,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.4 rimraf: 2.6.2 - supi: 0.12.4 + supi: 0.12.5 tape: 4.8.0 ts-node: 4.1.0 tslint: 5.9.1 @@ -3245,7 +3245,7 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.12.4: + /supi/0.12.5: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 @@ -3314,7 +3314,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-3NDsiSNxAGdUmgepehpozPGx/sS4DHlmCAiGBxN6HnXZxnrClBrRmIhrJKkNikmE7AaoMMmMCntw8bfeVq0Mog== + integrity: sha512-AFHV/TiBu7RBQkVnAmuRyOjDtCL+SIijg9WYb7RGeBGvGALr74ESspfYltN+EA8vDdeBa2qRVh6T0pooy+t0+Q== /supports-color/0.2.0: dev: true engines: @@ -3766,7 +3766,7 @@ specifiers: rimraf: ^2.5.4 semver: ^5.4.1 stacktracey: ^1.2.87 - supi: ^0.12.4 + supi: ^0.12.5 tape: ^4.8.0 ts-node: ^4.0.2 tslint: ^5.7.0 diff --git a/src/index.ts b/src/index.ts index d4334006c5..7d3da2ba08 100644 --- a/src/index.ts +++ b/src/index.ts @@ -62,6 +62,7 @@ export function toOutput$ ( const rootPushStream = new PushStream() const packageJsonPushStream = new PushStream() const linkPushStream = new PushStream() + const cliPushStream = new PushStream() const otherPushStream = new PushStream() setTimeout(() => { // setTimeout is a workaround for a strange bug in most https://github.com/cujojs/most/issues/491 streamParser['on']('data', (log: supi.Log) => { @@ -99,6 +100,9 @@ export function toOutput$ ( case 'pnpm:link' as any: // tslint:disable-line linkPushStream.next(log) break + case 'pnpm:cli' as any: // tslint:disable-line + cliPushStream.next(log) + break case 'pnpm' as any: // tslint:disable-line otherPushStream.next(log) break @@ -106,6 +110,7 @@ export function toOutput$ ( }) }, 0) const log$ = { + cli: most.from(cliPushStream.observable), deprecation: most.from(deprecationPushStream.observable), installCheck: most.from(installCheckPushStream.observable), lifecycle: most.from(lifecyclePushStream.observable), diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 546a446260..0fe05de48e 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -43,9 +43,10 @@ export default function ( packageJson: most.Stream, link: most.Stream, other: most.Stream, + cli: most.Stream, }, isRecursive: boolean, - cmd?: string, // is optional only to be backward compatible + cmd: string, widthArg?: number, appendOnly?: boolean, throttleProgress?: number, @@ -110,11 +111,13 @@ export default function ( if (!isRecursive && typeof throttleProgress === 'number' && throttleProgress > 0) { const importingDone$ = log$.stage.filter((log) => log.message === 'importing_done').multicast() + const resolutionStarted$ = log$.stage.filter((log) => log.message === 'resolution_started') + const commandDone$ = log$.cli.filter((log) => log['message'] === 'command_done') // Reporting is done every `throttleProgress` milliseconds // and once all packages are fetched. const sampler = most.merge( - most.periodic(throttleProgress).until(importingDone$), + most.periodic(throttleProgress).since(resolutionStarted$).until(most.merge(importingDone$, commandDone$)), importingDone$, ) const progress = most.sample( From ca16101da9ba248219965b014a909f61b69a934a Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 31 Jan 2018 01:44:29 +0200 Subject: [PATCH 136/196] chore(release): 0.14.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b3c7a5e1dd..9fe0ddc3fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.13.0", + "version": "0.14.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From c665df14c498998c98fc1474b53d110964b9ffbd Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 3 Feb 2018 16:32:49 +0200 Subject: [PATCH 137/196] test: should pass on Windows --- test/index.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/index.ts b/test/index.ts index e6164421dc..adddec6162 100644 --- a/test/index.ts +++ b/test/index.ts @@ -393,7 +393,7 @@ test('prints generic error', t => { t.plan(1) - output$.take(1).subscribe({ + output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` ${ERROR} ${chalk.red('some error')} @@ -414,7 +414,7 @@ test('prints generic error when recursive install fails', t => { t.plan(1) - output$.take(1).subscribe({ + output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` /home/src/: @@ -434,7 +434,7 @@ test('prints info', t => { t.plan(1) - output$.take(1).subscribe({ + output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, 'info message') }, @@ -591,7 +591,7 @@ test('prints added/removed stats during installation', t => { t.plan(1) - output$.take(1).subscribe({ + output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` Packages: ${chalk.red('-1')} ${chalk.green('+5')} @@ -611,7 +611,7 @@ test('prints added/removed stats during installation when 0 removed', t => { t.plan(1) - output$.take(1).subscribe({ + output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` Packages: ${chalk.green('+2')} @@ -631,7 +631,7 @@ test('prints only the added stats if nothing was removed', t => { t.plan(1) - output$.take(1).subscribe({ + output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` Packages: ${chalk.green('+1')} @@ -651,7 +651,7 @@ test('prints only the removed stats if nothing was added', t => { t.plan(1) - output$.take(1).subscribe({ + output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` Packages: ${chalk.red('-1')} @@ -671,7 +671,7 @@ test('prints only the added stats if nothing was removed and a lot added', t => t.plan(1) - output$.take(1).subscribe({ + output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` Packages: ${chalk.green('+100')} @@ -691,7 +691,7 @@ test('prints only the removed stats if nothing was added and a lot removed', t = t.plan(1) - output$.take(1).subscribe({ + output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` Packages: ${chalk.red('-100')} @@ -711,7 +711,7 @@ test('prints at least one remove sign when removed !== 0', t => { t.plan(1) - output$.take(1).subscribe({ + output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` Packages: ${chalk.red('-1')} ${chalk.green('+100')} @@ -731,7 +731,7 @@ test('prints at least one add sign when added !== 0', t => { t.plan(1) - output$.take(1).subscribe({ + output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` Packages: ${chalk.red('-100')} ${chalk.green('+1')} @@ -750,7 +750,7 @@ test('prints just removed during uninstallation', t => { t.plan(1) - output$.take(1).subscribe({ + output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` Packages: ${chalk.red('-4')} From ab204ea239bee134da2dcdae8de49a2762d7434b Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 3 Feb 2018 17:24:58 +0200 Subject: [PATCH 138/196] feat: eliminate flickering by using ansi-diff ref pnpm/pnpm#1017 --- package.json | 3 +- shrinkwrap.yaml | 75 +++++++++++++++------------------------------ src/index.ts | 13 ++++++-- src/mergeOutputs.ts | 3 +- test/index.ts | 2 +- typings/local.d.ts | 7 ++++- 6 files changed, 45 insertions(+), 58 deletions(-) diff --git a/package.json b/package.json index 9fe0ddc3fc..d1a6ac7665 100644 --- a/package.json +++ b/package.json @@ -45,9 +45,10 @@ "@types/node": "^9.3.0", "@types/ramda": "^0.25.6", "@types/semver": "^5.4.0", + "ansi-diff": "^1.0.10", "chalk": "^2.2.0", + "cli-cursor": "^2.1.0", "common-tags": "^1.4.0", - "log-update": "^2.3.0", "most": "^1.7.2", "most-last": "^1.0.0", "ndjson": "^1.5.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 81b689ec38..570bd22753 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -3,9 +3,10 @@ dependencies: '@types/node': 9.3.0 '@types/ramda': 0.25.16 '@types/semver': 5.4.0 + ansi-diff: 1.0.10 chalk: 2.3.0 + cli-cursor: 2.1.0 common-tags: 1.7.2 - log-update: 2.3.0 most: 1.7.2 most-last: 1.0.0 ndjson: 1.5.0 @@ -255,18 +256,18 @@ packages: dev: true resolution: integrity: sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU= + /ansi-diff/1.0.10: + dependencies: + ansi-split: 1.0.1 + dev: false + resolution: + integrity: sha512-pgsU9HUWzN2JqNBcuhn5vIDtSwfKetdjy6EQl3UsTRluyIL3S2tINgFZO8SERS13uB0/5/stxf5pVCNLcSW99w== /ansi-escapes/1.4.0: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-06ioOzGapneTZisT52HHkRQiMG4= - /ansi-escapes/3.0.0: - dev: false - engines: - node: '>=4' - resolution: - integrity: sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ== /ansi-regex/0.2.1: dev: true engines: @@ -285,6 +286,12 @@ packages: node: '>=4' resolution: integrity: sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + /ansi-split/1.0.1: + dependencies: + ansi-regex: 3.0.0 + dev: false + resolution: + integrity: sha512-RRxQym4DFtDNmHIkW6aeFVvrXURb11lGAEPXNiryjCe8bK8RsANjzJ0M2aGOkvBYwP4Bl/xZ8ijtr6D3j1x/eg== /ansi-styles/1.1.0: dev: true engines: @@ -1628,12 +1635,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - /is-fullwidth-code-point/2.0.0: - dev: false - engines: - node: '>=4' - resolution: - integrity: sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= /is-function/1.0.1: dev: true resolution: @@ -1901,16 +1902,6 @@ packages: dev: true resolution: integrity: sha1-eCA6TRwyiuHYbcpkYONptX9AVa4= - /log-update/2.3.0: - dependencies: - ansi-escapes: 3.0.0 - cli-cursor: 2.1.0 - wrap-ansi: 3.0.1 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha1-iDKP19HOeTiykoN0bwsbwSayRwg= /longest/1.0.1: dev: true engines: @@ -2025,10 +2016,17 @@ packages: resolution: integrity: sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo= /mimic-fn/1.1.0: + dev: true engines: node: '>=4' resolution: integrity: sha1-5md4PZLonb00KBi1IwudYqZyrRg= + /mimic-fn/1.2.0: + dev: false + engines: + node: '>=4' + resolution: + integrity: sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== /minimatch/3.0.4: dependencies: brace-expansion: 1.1.8 @@ -2287,7 +2285,7 @@ packages: integrity: sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= /onetime/2.0.1: dependencies: - mimic-fn: 1.1.0 + mimic-fn: 1.2.0 dev: false engines: node: '>=4' @@ -3169,15 +3167,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - /string-width/2.1.1: - dependencies: - is-fullwidth-code-point: 2.0.0 - strip-ansi: 4.0.0 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== /string.prototype.trim/1.1.2: dependencies: define-properties: 1.1.2 @@ -3213,14 +3202,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - /strip-ansi/4.0.0: - dependencies: - ansi-regex: 3.0.0 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8= /strip-bom/3.0.0: dev: true engines: @@ -3653,15 +3634,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== - /wrap-ansi/3.0.1: - dependencies: - string-width: 2.1.1 - strip-ansi: 4.0.0 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= /wrappy/1.0.2: dev: true resolution: @@ -3749,12 +3721,13 @@ specifiers: '@types/ramda': ^0.25.6 '@types/semver': ^5.4.0 '@types/tape': ^4.2.30 + ansi-diff: ^1.0.10 chalk: ^2.2.0 + cli-cursor: ^2.1.0 commitizen: ^2.9.5 common-tags: ^1.4.0 delay: ^2.0.0 ghooks: ^2.0.0 - log-update: ^2.3.0 mos-tap-diff: ^1.0.0 most: ^1.7.2 most-last: ^1.0.0 diff --git a/src/index.ts b/src/index.ts index 7d3da2ba08..b4f71bd2aa 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,6 +1,7 @@ -import {EventEmitter} from 'events' -import logUpdate = require('log-update') +import createDiffer = require('ansi-diff') +import cliCursor = require('cli-cursor') import most = require('most') +import os = require('os') import R = require('ramda') import * as supi from 'supi' import PushStream = require('zen-push') @@ -32,12 +33,20 @@ export default function ( }) return } + cliCursor.hide() + const diff = createDiffer({ + height: process.stdout.rows, + width: process.stdout.columns, + }) output$ .subscribe({ complete () {}, // tslint:disable-line:no-empty error: (err) => logUpdate(err.message), next: logUpdate, }) + function logUpdate (view: string) { + process.stdout.write(diff.update(`${view}${os.EOL}`)) + } } export function toOutput$ ( diff --git a/src/mergeOutputs.ts b/src/mergeOutputs.ts index fad181c5e7..85bf95922f 100644 --- a/src/mergeOutputs.ts +++ b/src/mergeOutputs.ts @@ -1,4 +1,3 @@ -import chalk from 'chalk' import most = require('most') import os = require('os') @@ -56,7 +55,7 @@ export default function mergeOutputs (outputs: Array { if (started) { diff --git a/test/index.ts b/test/index.ts index adddec6162..0da544dc83 100644 --- a/test/index.ts +++ b/test/index.ts @@ -505,7 +505,7 @@ test('prints progress of big files download', async t => { stream$.push( output$.take(1) .tap(output => t.equal(output, stripIndents` - ${chalk.dim(`Downloading ${hlPkgId(pkgId1)}: ${hlValue('10.5 MB')}/${hlValue('10.5 MB')}, done`)} + Downloading ${hlPkgId(pkgId1)}: ${hlValue('10.5 MB')}/${hlValue('10.5 MB')}, done Resolving: total ${hlValue('3')}, reused ${hlValue('0')}, downloaded ${hlValue('0')} Downloading ${hlPkgId(pkgId3)}: ${hlValue('19.9 MB')}/${hlValue('21 MB')} `)) diff --git a/typings/local.d.ts b/typings/local.d.ts index 57f6b0df30..800b5776f9 100644 --- a/typings/local.d.ts +++ b/typings/local.d.ts @@ -1,4 +1,9 @@ -declare module 'log-update' { +declare module 'ansi-diff' { + const anything: any; + export = anything; +} + +declare module 'cli-cursor' { const anything: any; export = anything; } From 91111713939d4a8f62642c08b6b3de598eb47fea Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 3 Feb 2018 22:19:17 +0200 Subject: [PATCH 139/196] fix: always use \n as EOL --- src/constants.ts | 3 +++ src/index.ts | 4 ++-- src/mergeOutputs.ts | 4 +--- src/reportError.ts | 3 +-- src/reporterForClient.ts | 2 +- src/reporterForServer.ts | 3 --- 6 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 src/constants.ts diff --git a/src/constants.ts b/src/constants.ts new file mode 100644 index 0000000000..5f5c0a6cbd --- /dev/null +++ b/src/constants.ts @@ -0,0 +1,3 @@ +// In terminals, always Unix line endings are used +// even on Windows +export const EOL = '\n' diff --git a/src/index.ts b/src/index.ts index b4f71bd2aa..1d3f1db054 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,10 +1,10 @@ import createDiffer = require('ansi-diff') import cliCursor = require('cli-cursor') import most = require('most') -import os = require('os') import R = require('ramda') import * as supi from 'supi' import PushStream = require('zen-push') +import {EOL} from './constants' import mergeOutputs from './mergeOutputs' import reporterForClient from './reporterForClient' import reporterForServer from './reporterForServer' @@ -45,7 +45,7 @@ export default function ( next: logUpdate, }) function logUpdate (view: string) { - process.stdout.write(diff.update(`${view}${os.EOL}`)) + process.stdout.write(diff.update(`${view}${EOL}`)) } } diff --git a/src/mergeOutputs.ts b/src/mergeOutputs.ts index 85bf95922f..e8b81ccf47 100644 --- a/src/mergeOutputs.ts +++ b/src/mergeOutputs.ts @@ -1,7 +1,5 @@ import most = require('most') -import os = require('os') - -const EOL = os.EOL +import {EOL} from './constants' export default function mergeOutputs (outputs: Array>>): most.Stream { let blockNo = 0 diff --git a/src/reportError.ts b/src/reportError.ts index 73d217cf04..136e257de7 100644 --- a/src/reportError.ts +++ b/src/reportError.ts @@ -1,12 +1,11 @@ import chalk from 'chalk' import commonTags = require('common-tags') -import os = require('os') import StackTracey = require('stacktracey') import {Log} from 'supi' +import {EOL} from './constants' const stripIndent = commonTags.stripIndent const stripIndents = commonTags.stripIndents -const EOL = os.EOL const highlight = chalk.yellow const colorPath = chalk.gray diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 0fe05de48e..82cdfddba8 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -14,13 +14,13 @@ import { RegistryLog, } from 'supi' import * as supi from 'supi' +import {EOL} from './constants' import getPkgsDiff, { PackageDiff, propertyByDependencyType, } from './pkgsDiff' import reportError from './reportError' -const EOL = os.EOL const BIG_TARBALL_SIZE = 1024 * 1024 * 5 // 5 MB const addedSign = chalk.green('+') diff --git a/src/reporterForServer.ts b/src/reporterForServer.ts index 5b69cbc393..37655c13dc 100644 --- a/src/reporterForServer.ts +++ b/src/reporterForServer.ts @@ -1,6 +1,5 @@ import chalk from 'chalk' import most = require('most') -import os = require('os') import prettyBytes = require('pretty-bytes') import R = require('ramda') import semver = require('semver') @@ -18,8 +17,6 @@ import getPkgsDiff, { } from './pkgsDiff' import reportError from './reportError' -const EOL = os.EOL - export default function ( log$: most.Stream, ) { From 03d325fb927334da860df63c5ef7f42b30fce262 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 3 Feb 2018 22:28:42 +0200 Subject: [PATCH 140/196] fix: use a smaller viewport width to fix windows issue --- src/index.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index 1d3f1db054..3e269f116f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -23,7 +23,8 @@ export default function ( reporterForServer(log$) return } - const output$ = toOutput$(streamParser, opts) + const width = opts.width || process.stdout.columns && process.stdout.columns - 2 || 80 + const output$ = toOutput$(streamParser, {...opts, width}) if (opts.appendOnly) { output$ .subscribe({ @@ -36,7 +37,7 @@ export default function ( cliCursor.hide() const diff = createDiffer({ height: process.stdout.rows, - width: process.stdout.columns, + width, }) output$ .subscribe({ From f2897865006b026af9558fc6d31aaef52ceafae6 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 4 Feb 2018 02:00:51 +0200 Subject: [PATCH 141/196] chore(release): 0.14.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d1a6ac7665..861adaec0f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.14.0", + "version": "0.14.1", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 756e66a015f9f876e4b413c0b67d2be935d4f179 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 10 Feb 2018 22:18:38 +0200 Subject: [PATCH 142/196] chore(deps): updated shrinkwrap.yaml --- shrinkwrap.yaml | 344 ++++++++++++++++++++++++++------------------ src/mergeOutputs.ts | 2 +- 2 files changed, 207 insertions(+), 139 deletions(-) diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 570bd22753..2f165cc49f 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,13 +1,13 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 9.3.0 - '@types/ramda': 0.25.16 - '@types/semver': 5.4.0 + '@types/node': 9.4.4 + '@types/ramda': 0.25.17 + '@types/semver': 5.5.0 ansi-diff: 1.0.10 chalk: 2.3.0 cli-cursor: 2.1.0 common-tags: 1.7.2 - most: 1.7.2 + most: 1.7.3 most-last: 1.0.0 ndjson: 1.5.0 pretty-bytes: 4.0.2 @@ -16,20 +16,20 @@ dependencies: stacktracey: 1.2.100 zen-push: 0.2.1 devDependencies: - '@pnpm/logger': 1.0.0 + '@pnpm/logger': 1.0.1 '@types/tape': 4.2.31 commitizen: 2.9.6 delay: 2.0.0 ghooks: 2.0.2 mos-tap-diff: 1.0.0 normalize-newline: 3.0.0 - package-preview: 1.0.4 + package-preview: 1.0.5 rimraf: 2.6.2 - supi: 0.12.5 + supi: 0.12.7 tape: 4.8.0 ts-node: 4.1.0 tslint: 5.9.1 - typescript: 2.6.2 + typescript: 2.7.1 validate-commit-msg: 2.14.0 packages: /@most/multicast/1.3.0: @@ -58,7 +58,7 @@ packages: dependencies: '@pnpm/self-installer': 2.0.0 '@types/got': 7.1.6 - '@types/node': 9.3.0 + '@types/node': 9.4.4 command-exists: 1.2.2 cross-spawn: 5.1.0 dev: true @@ -66,9 +66,17 @@ packages: node: '>=4' resolution: integrity: sha512-sYJOXPxpQxFcTSACFRFCuIQdnZLNaOgTHGF+CQNYlKnlc2ZnmEW+lAZVTc0hJSU+8mnTY7ei39MbYpI5q+li+w== + /@pnpm/fetcher-base/1.0.0: + dependencies: + '@pnpm/resolver-base': 1.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== /@pnpm/fs-locker/1.0.1: dependencies: - '@types/node': 9.3.0 + '@types/node': 9.4.4 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: true @@ -76,24 +84,26 @@ packages: node: '>=4' resolution: integrity: sha512-gmM3SM6fBpssvbSD1U8wJbArNPiQchFzt90ICkfawo0OGQBYY6mgt+sqxF93E9yLfNY7WGtPJYhAQW3Uht6m7A== - /@pnpm/logger/1.0.0: + /@pnpm/logger/1.0.1: dependencies: - '@types/node': 8.5.9 + '@types/node': 9.4.4 bole: 3.0.2 ndjson: 1.5.0 dev: true engines: node: '>=4' resolution: - integrity: sha512-VRqE5/SiuR7ZrwBmS+Af89BTXli5xBbiqu7WPq56gEtWT8dKf9rFLoimmmMBVeRq5LmVZIXlOxs29F9I+vgSvQ== - /@pnpm/package-requester/0.7.3: + integrity: sha512-23FWOXgCkJ9q73mIqS5H/x98uaZcvO7ov/nt0HZGgLci3MHsqBgEfh3UzZiLZIxlxmA3XoUp4fgbjM7S96pBRg== + /@pnpm/package-requester/0.8.0: dependencies: '@pnpm/check-package': 1.0.0 + '@pnpm/fetcher-base': 1.0.0 '@pnpm/pkgid-to-filename': 1.0.0 + '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/p-queue': 1.1.0 + '@types/p-queue': 2.3.1 '@types/write-json-file': 2.2.1 load-json-file: 4.0.0 mkdirp-promise: 5.0.1 @@ -102,10 +112,9 @@ packages: p-queue: 2.3.0 path-exists: 3.0.0 read-package-json: 2.0.12 - rename-overwrite: 1.0.1 + rename-overwrite: 1.0.2 rimraf-then: 1.0.1 symlink-dir: 1.1.2 - unpack-stream: 3.0.1 util.promisify: 1.0.0 write-json-file: 2.3.0 dev: true @@ -114,7 +123,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-kXjzsbpk91zmMy+SeGjclFehEhWWGRobYeUyG/Rk8HkVNMo50JHP15eQSKvZdkrn9II/MUeKcs2p3wxyb1kP/Q== + integrity: sha512-eEsiVag69B/owb5HqoWEBPoqpVf2hQk49hNlgM6+jxDA28t09r1ohRfUIRnMle6OlbjKoB/SCW/DfbKo+pd6dQ== /@pnpm/pkgid-to-filename/1.0.0: dependencies: normalize-path: 2.1.1 @@ -123,6 +132,14 @@ packages: node: '>=4' resolution: integrity: sha512-HnWDy3ecIKBsbRR9bwf+GJpV1CWLQ9Injj7eLSEQIsXQ+CLXU0h1NaxBCW7zcJm+2kbwnm0E1aFdFIEJXhHiTg== + /@pnpm/resolver-base/1.0.0: + dependencies: + '@pnpm/types': 1.7.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-+y47No75LZFnkN7VAnoEtkIzDgOuc8ZT4QjyhuNIBVLx4oqFa/R16DpSyRjmaTZMCSREXunObULKL/hoLipNDA== /@pnpm/self-installer/2.0.0: dev: true engines: @@ -135,7 +152,7 @@ packages: integrity: sha512-pn7g4uxcofWTNG/cxmKvkMK2lxr4OUIhrQDrEVYEdVhW0WkWztsHkFrYjFgfNzPbYu3ITlB3T6aSVjCoJQTOlw== /@types/byline/4.2.31: dependencies: - '@types/node': 9.3.0 + '@types/node': 9.4.4 dev: true resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= @@ -144,13 +161,13 @@ packages: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== /@types/fs-extra/5.0.0: dependencies: - '@types/node': 9.3.0 + '@types/node': 9.4.4 dev: true resolution: integrity: sha512-qtxDULQKUenuaDLW003CgC+0T0eiAfH3BrH+vSt87GLzbz5EZ6Ox6mv9rMttvhDOatbb9nYh0E1m7ydoYwUrAg== /@types/got/7.1.6: dependencies: - '@types/node': 9.3.0 + '@types/node': 9.4.4 dev: true resolution: integrity: sha512-MTgskaiThy9e07/V/gWj1PY3FWsfghgFQVgSLgEV+k7r+rTxvfKNDDNjIcFV/aDhDBCpUEaqdHAeaxjM9uaSKA== @@ -160,48 +177,45 @@ packages: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== /@types/mz/0.0.32: dependencies: - '@types/node': 9.3.0 + '@types/node': 9.4.4 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/8.5.9: + /@types/node/8.9.2: + dev: false resolution: - integrity: sha512-s+c3AjymyAccTI4hcgNFK4mToH8l+hyPDhu4LIkn71lRy56FLijGu00fyLgldjM/846Pmk9N4KFUs2P8GDs0pA== - /@types/node/9.3.0: + integrity: sha512-+IIOUfGkGIUu310djXpOZNR1jHftzr/W7DwoUPiRfzhZWFLXdRt80ePYUjSEYVEs4hJUK4ikXWWo7eHd10RQlA== + /@types/node/9.4.4: resolution: - integrity: sha512-wNBfvNjzsJl4tswIZKXCFQY0lss9nKUyJnG6T94X/eqjRgI2jHZ4evdjhQYBSan/vGtF6XVXPApOmNH2rf0KKw== - /@types/node/9.4.0: - dev: true - resolution: - integrity: sha512-zkYho6/4wZyX6o9UQ8rd0ReEaiEYNNCqYFIAACe2Tf9DrYlgzWW27OigYHnnztnnZQwVRpwWmZKegFmDpinIsA== + integrity: sha512-pTi6f79uELOTQ2TtXxWcjmJ+iZa1C3ypm6pGNU/viOQX/VfBXLmsZEcJPk1rm+lia+GP6GpgFGUkCvLJ7JOKDA== /@types/nopt/3.0.29: dev: true resolution: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 9.3.0 + '@types/node': 9.4.4 dev: true resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== - /@types/p-queue/1.1.0: + /@types/p-queue/2.3.1: dev: true resolution: - integrity: sha512-lLevmLuKQ9uquorlb+XUp+tmmVzbFF/p03vgiBdtgiKoAoWAuIrNcn9Fs/rpUZgSywfu9cl4lb93H8xO2sOAUA== + integrity: sha512-JyO7uMAtkcMMULmsTQ4t/lCC8nxirTtweGG1xAFNNIAoC1RemmeIxq8PiKghuEy99XdbS6Lwx4zpbXUjfeSSAA== /@types/p-series/1.0.1: dev: true resolution: integrity: sha512-dwv960sf5inFWiufjhDfK7ZG3nYyHXt58I+14bJJBKV5MPlZm6Tu1sQS63NWEtLpIw6+RhbNbXjNStdMXxR8Nw== - /@types/ramda/0.25.16: + /@types/ramda/0.25.17: resolution: - integrity: sha512-jNxaEg+kSJ58iaM9bBawJugDxexXVPnLU245yEI1p2BTcfR5pcgM6mpsyBhRRo2ozyfJUvTmasL2Ft+C6BNkVQ== + integrity: sha512-CNPC7KqhmOYhTtD4zFJDkmZ+i8UcCoVOXKq1MDpjduxkoP6aCWVdnZQTaeN8qtz89bMxkCHcMu4mUTqwuKlyYw== /@types/rc/0.0.1: dev: true resolution: integrity: sha1-H1uKGzsaxtH+4TfFP6xfoPKK4Nc= - /@types/semver/5.4.0: + /@types/semver/5.5.0: resolution: - integrity: sha512-PBHCvO98hNec9A491vBbh0ZNDOVxccwKL1u2pm6fs9oDgm7SEnw0lEHqHfjsYryDxnE3zaf7LvERWEXjOp1hig== + integrity: sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== /@types/strip-bom/3.0.0: dev: true resolution: @@ -212,7 +226,7 @@ packages: integrity: sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ== /@types/tape/4.2.31: dependencies: - '@types/node': 9.3.0 + '@types/node': 9.4.4 dev: true resolution: integrity: sha512-DEPn8FJKQR6eeMHZ407TuAqlhBKQa54PTM3c7Z6pKOI1uHaPnidmpmOXYtNZTcDrL5hnZofSHPwX1AQ9HbaMUg== @@ -322,7 +336,7 @@ packages: /are-we-there-yet/1.1.4: dependencies: delegates: 1.0.0 - readable-stream: 2.3.3 + readable-stream: 2.3.4 dev: true resolution: integrity: sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0= @@ -430,7 +444,7 @@ packages: integrity: sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw== /bl/1.2.1: dependencies: - readable-stream: 2.3.3 + readable-stream: 2.3.4 dev: true resolution: integrity: sha1-ysMo977kVzDUBLaSID/LWQ4XLV4= @@ -465,13 +479,13 @@ packages: node: '>=4.0.0' resolution: integrity: sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw== - /brace-expansion/1.1.8: + /brace-expansion/1.1.11: dependencies: balanced-match: 1.0.0 concat-map: 0.0.1 dev: true resolution: - integrity: sha1-wHshHHyVLsH479Uad+8NHTmQopI= + integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== /braces/1.8.5: dependencies: expand-range: 1.8.2 @@ -654,10 +668,10 @@ packages: node: '>= 0.6.x' resolution: integrity: sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E= - /commander/2.13.0: + /commander/2.14.1: dev: true resolution: - integrity: sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA== + integrity: sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw== /commander/2.9.0: dependencies: graceful-readlink: 1.0.1 @@ -702,7 +716,7 @@ packages: /concat-stream/1.6.0: dependencies: inherits: 2.0.3 - readable-stream: 2.3.3 + readable-stream: 2.3.4 typedarray: 0.0.6 dev: true engines: @@ -731,6 +745,18 @@ packages: dev: true resolution: integrity: sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= + /cross-spawn/6.0.4: + dependencies: + nice-try: 1.0.4 + path-key: 2.0.1 + semver: 5.5.0 + shebang-command: 1.2.0 + which: 1.3.0 + dev: true + engines: + node: '>=4.8' + resolution: + integrity: sha512-LDYnK41m8td+nBTk5Jmn55aGVP18iYuUqoM1X3u+ptt7M/g9FPS8C38PNoJTMfjoNx4fmiwWToPpiZklGRLbIA== /cryptiles/3.1.2: dependencies: boom: 5.2.0 @@ -739,6 +765,12 @@ packages: node: '>=4.0.0' resolution: integrity: sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4= + /crypto-random-string/1.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4= /currently-unhandled/0.4.1: dependencies: array-find-index: 1.0.2 @@ -768,7 +800,7 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.5.9 + '@types/node': 8.9.2 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -802,6 +834,15 @@ packages: dev: true resolution: integrity: sha1-rf54xmzAaeZOgkvRQFuF515tHLs= + /decompress-response/3.3.0: + dependencies: + mimic-response: 1.0.0 + dev: true + engines: + node: '>=4' + optional: true + resolution: + integrity: sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= /dedent/0.6.0: dev: true resolution: @@ -851,7 +892,7 @@ packages: integrity: sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= /dependency-path/1.2.0: dependencies: - '@types/semver': 5.4.0 + '@types/semver': 5.5.0 encode-registry: 1.1.0 semver: 5.5.0 dev: true @@ -904,7 +945,7 @@ packages: mz: 2.7.0 p-every: 1.0.2 p-limit: 1.2.0 - ssri: 5.1.0 + ssri: 5.2.1 dev: true engines: node: '>=4' @@ -929,7 +970,7 @@ packages: debug: 3.1.0 js-yaml: 3.10.0 nan: 2.8.0 - prebuild-install: 2.5.0 + prebuild-install: 2.5.1 dev: true engines: node: '>=4' @@ -944,7 +985,7 @@ packages: dependencies: end-of-stream: 1.4.1 inherits: 2.0.3 - readable-stream: 2.3.3 + readable-stream: 2.3.4 stream-shift: 1.0.0 dev: true resolution: @@ -1534,7 +1575,7 @@ packages: cli-width: 2.2.0 external-editor: 1.1.1 figures: 1.7.0 - lodash: 4.17.4 + lodash: 4.17.5 mute-stream: 0.0.6 pinkie-promise: 2.0.1 run-async: 2.3.0 @@ -1898,10 +1939,10 @@ packages: dev: true resolution: integrity: sha1-NKMFW6vgTOQkZ7YH1wAHLH/2v0I= - /lodash/4.17.4: + /lodash/4.17.5: dev: true resolution: - integrity: sha1-eCA6TRwyiuHYbcpkYONptX9AVa4= + integrity: sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw== /longest/1.0.1: dev: true engines: @@ -1932,10 +1973,10 @@ packages: node: '>=4' resolution: integrity: sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA== - /make-error/1.3.2: + /make-error/1.3.3: dev: true resolution: - integrity: sha512-l9ra35l5VWLF24y75Tg8XgfGLX0ueRhph118WKM6H5denx4bB5QF59+4UAm9oJ2qsPQZas/CQUDdtDdfvYHBdQ== + integrity: sha512-j3dZCri3cCd23wgPqK/0/KvTN8R+W6fXDqQe8BNLbTpONjbA8SPaRr+q0BQq9bx3Q/+g68/gDIh9FW3by702Tg== /manage-path/2.0.0: dev: true resolution: @@ -1954,7 +1995,7 @@ packages: integrity: sha1-plzSkIepJZi4eRJXpSPgISIqwfk= /mem/3.0.0: dependencies: - mimic-fn: 1.1.0 + mimic-fn: 1.2.0 p-is-promise: 1.1.0 dev: true engines: @@ -2015,21 +2056,21 @@ packages: node: '>= 0.6' resolution: integrity: sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo= - /mimic-fn/1.1.0: - dev: true - engines: - node: '>=4' - resolution: - integrity: sha1-5md4PZLonb00KBi1IwudYqZyrRg= /mimic-fn/1.2.0: - dev: false engines: node: '>=4' resolution: integrity: sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== + /mimic-response/1.0.0: + dev: true + engines: + node: '>=4' + optional: true + resolution: + integrity: sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4= /minimatch/3.0.4: dependencies: - brace-expansion: 1.1.8 + brace-expansion: 1.1.11 dev: true resolution: integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== @@ -2084,14 +2125,14 @@ packages: most: ^1.0.3 resolution: integrity: sha1-Tj8LKJwkz5C52DhGdt6Qom43YXE= - /most/1.7.2: + /most/1.7.3: dependencies: '@most/multicast': 1.3.0 '@most/prelude': 1.7.0 - symbol-observable: 1.1.0 + symbol-observable: 1.2.0 dev: false resolution: - integrity: sha512-jDSzUa7HPT79RqLEdrBnYpGZ5DXx8SSDYkS7W6ErBUgU0ewaNDLIdqLJ6GlzXK90eCaDzXm0B1C0KmfTT0XdZQ== + integrity: sha512-mk68SM/ptK8WSo3l03raXcWy02Hl7jbzxVozMuvyYxohn4yteh2THhl3+XABF5cunWE8eXHAsLbv+RCJI5y+jg== /ms/2.0.0: dev: true optional: true @@ -2132,6 +2173,10 @@ packages: node: '>=6' resolution: integrity: sha1-gixFgNer54PfGZZbeJYiyoAWA+Q= + /nice-try/1.0.4: + dev: true + resolution: + integrity: sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA== /node-abi/2.2.0: dependencies: semver: 5.5.0 @@ -2407,15 +2452,15 @@ packages: node: '>=4' resolution: integrity: sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= - /package-preview/1.0.4: + /package-preview/1.0.5: dependencies: '@pnpm/exec': 1.1.4 '@types/fs-extra': 5.0.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.3.0 + '@types/node': 9.4.4 '@types/write-json-file': 2.2.1 - cross-spawn: 5.1.0 + cross-spawn: 6.0.4 find-down: 0.1.4 fs-extra: 5.0.0 graceful-fs: 4.1.11 @@ -2430,16 +2475,18 @@ packages: engines: node: '>=4' resolution: - integrity: sha512-JFT3uudfk3qtNHpCb3GwOq/n3NrEisxeQC/yTJLk7GHStYleXaFur4yW/SXqOtGMaKAAq5qTrkeFWdXheX+GPA== - /package-store/0.15.3: + integrity: sha512-Qmhr23K9e2jI4LK4MU2be4xWX0CyniBDwmyCi6K+3lTZtryd2r29Wh6wPXo6wdP++jNsJ5ayZT4yJlZWVHnluQ== + /package-store/0.16.0: dependencies: + '@pnpm/fetcher-base': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/package-requester': 0.7.3 + '@pnpm/package-requester': 0.8.0 + '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.4.0 - '@types/ramda': 0.25.16 + '@types/node': 9.4.4 + '@types/ramda': 0.25.17 drive-by-path: 1.0.0 encode-registry: 1.1.0 load-json-file: 4.0.0 @@ -2451,8 +2498,9 @@ packages: p-limit: 1.2.0 path-absolute: 1.0.0 path-exists: 3.0.0 + path-temp: 1.0.0 ramda: 0.25.0 - rename-overwrite: 1.0.1 + rename-overwrite: 1.0.2 rimraf-then: 1.0.1 util.promisify: 1.0.0 write-json-file: 2.3.0 @@ -2462,7 +2510,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-8MpzcMFFHdSt1hTBgmGtOFkt61+ATRbc3wyVOA35yaxFYMezuyd/DiiSfJCZIG0DRTCqCx6oeIs58YpLVAW/nw== + integrity: sha512-FWv5/zrZf9t9Ryo8aAoVG15D/R5ou3qhdxNXuU33gTUbIMbbLopo9SVUQmSZRcRcWmJ6idwintntakqoIBRQNg== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -2547,6 +2595,14 @@ packages: dev: true resolution: integrity: sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME= + /path-temp/1.0.0: + dependencies: + unique-string: 1.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-TeQgoH67RYUT3xt6WaRASbWyJmvrUnpeToQQT7RW+uighCh/gfs4VCO2/P8mIpjt6JsyJ6DxE6Q1FOJXVc3ANg== /path-type/3.0.0: dependencies: pify: 3.0.0 @@ -2604,10 +2660,10 @@ packages: dev: true resolution: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= - /pnpm-shrinkwrap/5.1.2: + /pnpm-shrinkwrap/5.3.0: dependencies: - '@types/node': 9.4.0 - '@types/ramda': 0.25.16 + '@types/node': 9.4.4 + '@types/ramda': 0.25.17 dependency-path: 1.2.0 js-yaml: 3.10.0 load-yaml-file: 0.1.0 @@ -2622,8 +2678,8 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-lSKx5YE9iSda7CWHIyUVpI9jTa1zpvqPJfeu4nwR2+phpw6VdBFeeNagXcUV7l6H2w2Bf+dXTDO7srH12BPB8g== - /prebuild-install/2.5.0: + integrity: sha512-WdBYsVsaRbKLnU7Vb7QAk2SE9UAD0j0AaWcv5VTX1ky2bJWqF1JE5NJSpedyL/rTr3eBNQiqM5nzV+WbzX0mUQ== + /prebuild-install/2.5.1: dependencies: detect-libc: 1.0.3 expand-template: 1.1.0 @@ -2634,16 +2690,16 @@ packages: noop-logger: 0.1.1 npmlog: 4.1.2 os-homedir: 1.0.2 - pump: 1.0.3 - rc: 1.2.4 - simple-get: 1.4.3 + pump: 2.0.1 + rc: 1.2.5 + simple-get: 2.7.0 tar-fs: 1.16.0 tunnel-agent: 0.6.0 - xtend: 4.0.1 + which-pm-runs: 1.0.0 dev: true optional: true resolution: - integrity: sha512-3wlyZgmkeeyduOR8Ursu5gKr3yWAYObACa5aJOtt2farRRFV/+zXk/Y3wM6yQRMqmqHh+pHAwyKp5r82K699Rg== + integrity: sha512-3DX9L6pzwc1m1ksMkW3Ky2WLgPQUBiySOfXVl3WZyAeJSyJb4wtoH9OmeRGcubAWsMlLiL8BTHbwfm/jPQE9Ag== /preserve/0.2.0: dev: true engines: @@ -2670,9 +2726,9 @@ packages: dev: false resolution: integrity: sha1-du+ErM/X+DZvtxOPuSRmqRbVmbw= - /process-nextick-args/1.0.7: + /process-nextick-args/2.0.0: resolution: - integrity: sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M= + integrity: sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== /proper-lockfile/2.0.1: dependencies: graceful-fs: 4.1.11 @@ -2740,7 +2796,7 @@ packages: node: '>= 0.10.0' resolution: integrity: sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how== - /rc/1.2.4: + /rc/1.2.5: dependencies: deep-extend: 0.4.2 ini: 1.3.5 @@ -2749,7 +2805,7 @@ packages: dev: true optional: true resolution: - integrity: sha1-oPYGyq4qO4YrvQ74VILAElsxX6M= + integrity: sha1-J1zWh/bjs2zHVrqibf7oCnkDAf0= /read-package-json/2.0.12: dependencies: glob: 7.1.2 @@ -2780,17 +2836,17 @@ packages: node: '>=4' resolution: integrity: sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= - /readable-stream/2.3.3: + /readable-stream/2.3.4: dependencies: core-util-is: 1.0.2 inherits: 2.0.3 isarray: 1.0.0 - process-nextick-args: 1.0.7 + process-nextick-args: 2.0.0 safe-buffer: 5.1.1 string_decoder: 1.0.3 util-deprecate: 1.0.2 resolution: - integrity: sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ== + integrity: sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ== /rechoir/0.6.2: dependencies: resolve: 1.5.0 @@ -2833,7 +2889,7 @@ packages: dev: true resolution: integrity: sha1-wkvOKig62tW8P1jg1IJJuSN52O8= - /rename-overwrite/1.0.1: + /rename-overwrite/1.0.2: dependencies: delay: 2.0.0 graceful-fs: 4.1.11 @@ -2843,7 +2899,7 @@ packages: engines: node: '>=4' resolution: - integrity: sha512-T/7u/iSRX4RcuQ15QYvZh8uZMQkYLPBuJjIddmYpYQ/RWBEoRUay/Xy3qf6s8DSQ4TQ55ToJJnlCaJ3tV6Se4w== + integrity: sha512-H7bHUSiUG9xIAtGAoP7MrpQYGxpkcnIWuDBlMWXdYra+NvkL8kQnjnLlseuSdRFRgwxs61So+qsX8AHQaWCTmg== /repeat-element/1.1.2: dev: true engines: @@ -3040,15 +3096,20 @@ packages: /signal-exit/3.0.2: resolution: integrity: sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= - /simple-get/1.4.3: - dependencies: - once: 1.4.0 - unzip-response: 1.0.2 - xtend: 4.0.1 + /simple-concat/1.0.0: dev: true optional: true resolution: - integrity: sha1-6XVe2kB+ltpAxeUVjJ6jezO+y+s= + integrity: sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY= + /simple-get/2.7.0: + dependencies: + decompress-response: 3.3.0 + once: 1.4.0 + simple-concat: 1.0.0 + dev: true + optional: true + resolution: + integrity: sha512-RkE9rGPHcxYZ/baYmgJtOSM63vH0Vyq+ma5TijBcLla41SWlh8t6XYIGMR/oeZcmr+/G8k+zrClkkVrtnQ0esg== /slash/1.0.0: dev: true engines: @@ -3075,12 +3136,12 @@ packages: node: '>=4' resolution: integrity: sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= - /source-map-support/0.5.2: + /source-map-support/0.5.3: dependencies: source-map: 0.6.1 dev: true resolution: - integrity: sha512-9zHceZbQwERaMK1MiFguvx1dL9GQPLXInr2D/wUxAsuV6ZKc9F0DHYWeloMcalkYRbtanwqUakoDjvj55cL/4A== + integrity: sha512-eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w== /source-map/0.6.1: engines: node: '>=0.10.0' @@ -3140,12 +3201,12 @@ packages: tweetnacl: 0.14.5 resolution: integrity: sha1-US322mKHFEMW3EwY/hzx2UBzm+M= - /ssri/5.1.0: + /ssri/5.2.1: dependencies: safe-buffer: 5.1.1 dev: true resolution: - integrity: sha512-TevC8fgxQKTfQ1nWtM9GNzr3q5rrHNntG9CDMH1k3QhSZI6Kb+NbjLRs8oPFZa2Hgo7zoekL+UTvoEk7tsbjQg== + integrity: sha512-y4PjOWlAuxt+yAcXitQYOnOzZpKaH3+f/qGV3OWxbyC2noC9FA9GNC9uILnVdV7jruA1aDKr4OKz3ZDBcVZwFQ== /stacktracey/1.2.100: dependencies: as-table: 1.0.31 @@ -3226,24 +3287,25 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.12.5: + /supi/0.12.7: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/package-requester': 0.7.3 + '@pnpm/package-requester': 0.8.0 '@pnpm/pkgid-to-filename': 1.0.0 + '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 '@types/byline': 4.2.31 '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.3.0 + '@types/node': 9.4.4 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 - '@types/ramda': 0.25.16 + '@types/ramda': 0.25.17 '@types/rc': 0.0.1 - '@types/semver': 5.4.0 + '@types/semver': 5.5.0 '@types/update-notifier': 1.0.3 '@zkochan/cmd-shim': 2.2.4 '@zkochan/npm-package-arg': 1.0.0 @@ -3271,12 +3333,12 @@ packages: p-filter: 1.0.0 p-limit: 1.2.0 p-series: 1.0.0 - package-store: 0.15.3 + package-store: 0.16.0 path-absolute: 1.0.0 path-exists: 3.0.0 path-name: 1.0.0 pnpm-install-checks: 1.1.0 - pnpm-shrinkwrap: 5.1.2 + pnpm-shrinkwrap: 5.3.0 ramda: 0.25.0 read-package-json: 2.0.12 remove-all-except-outer-links: 1.0.3 @@ -3295,7 +3357,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-AFHV/TiBu7RBQkVnAmuRyOjDtCL+SIijg9WYb7RGeBGvGALr74ESspfYltN+EA8vDdeBa2qRVh6T0pooy+t0+Q== + integrity: sha512-SFU94ACNjwbz++/i5eGezHZkpScJCQ+dqPowN7it3h9MoV1w9cNGA0Bip8N3wtHF/mb7PhKGHMepxIFjbkL91Q== /supports-color/0.2.0: dev: true engines: @@ -3315,16 +3377,16 @@ packages: node: '>=4' resolution: integrity: sha1-vnoN5ITexcXN34s9WRJQRJEvY1s= - /symbol-observable/1.1.0: + /symbol-observable/1.2.0: dev: false engines: node: '>=0.10.0' resolution: - integrity: sha512-dQoid9tqQ+uotGhuTKEY11X4xhyYePVnqGSoSm3OGKh2E8LZ6RPULp1uXTctk33IeERlrRJYoVSBglsL05F5Uw== + integrity: sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== /symlink-dir/1.1.2: dependencies: '@types/mz': 0.0.32 - '@types/node': 9.3.0 + '@types/node': 9.4.4 graceful-fs: 4.1.11 is-windows: 1.0.1 mkdirp-promise: 5.0.1 @@ -3341,7 +3403,7 @@ packages: js-yaml: 3.10.0 dev: true optionalDependencies: - readable-stream: 2.3.3 + readable-stream: 2.3.4 resolution: integrity: sha1-EgxQiciMPIp5PvKIhn3jIeGPjCI= /tape/4.8.0: @@ -3375,7 +3437,7 @@ packages: dependencies: bl: 1.2.1 end-of-stream: 1.4.1 - readable-stream: 2.3.3 + readable-stream: 2.3.4 xtend: 4.0.1 dev: true engines: @@ -3410,7 +3472,7 @@ packages: integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= /through2/2.0.3: dependencies: - readable-stream: 2.3.3 + readable-stream: 2.3.4 xtend: 4.0.1 resolution: integrity: sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= @@ -3441,10 +3503,10 @@ packages: arrify: 1.0.1 chalk: 2.3.0 diff: 3.4.0 - make-error: 1.3.2 + make-error: 1.3.3 minimist: 1.2.0 mkdirp: 0.5.1 - source-map-support: 0.5.2 + source-map-support: 0.5.3 tsconfig: 7.0.0 v8flags: 3.0.1 yn: 2.0.0 @@ -3471,7 +3533,7 @@ packages: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 chalk: 2.3.0 - commander: 2.13.0 + commander: 2.14.1 diff: 3.4.0 glob: 7.1.2 js-yaml: 3.10.0 @@ -3479,7 +3541,7 @@ packages: resolve: 1.5.0 semver: 5.5.0 tslib: 1.9.0 - tsutils: 2.19.1 + tsutils: 2.21.0 dev: true engines: node: '>=4.8.0' @@ -3487,14 +3549,14 @@ packages: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev' resolution: integrity: sha1-ElX4ej/1frCw4fDmEKi0dIBGya4= - /tsutils/2.19.1: + /tsutils/2.21.0: dependencies: tslib: 1.9.0 dev: true peerDependencies: - typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >= 2.4.0-dev || >= 2.5.0-dev || >= 2.6.0-dev || >= 2.7.0-dev || >= 2.8.0-dev' + typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev' resolution: - integrity: sha512-1B3z4H4HddgzWptqLzwrJloDEsyBt8DvZhnFO14k7A4RsQL/UhEfQjD4hpcY5NpF3veBkjJhQJ8Bl7Xp96cN+A== + integrity: sha512-zlOHTYtTwvTiKxUyAU8wiKzPpAgwZrGjb7AY18VUlxuCgBiTMVorIl5HjrCT8V64Hm34RI1BZITJMVQpBLMxVg== /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.1.1 @@ -3510,12 +3572,12 @@ packages: dev: true resolution: integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - /typescript/2.6.2: + /typescript/2.7.1: dev: true engines: node: '>=4.2.0' resolution: - integrity: sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q= + integrity: sha512-bqB1yS6o9TNA9ZC/MJxM0FZzPnZdtHj0xWK/IZ5khzVqdpGul/R/EIiHRgFXlwTD7PSIaYVnGKq1QgMCu2mnqw== /uid-number/0.0.6: dev: true resolution: @@ -3531,28 +3593,29 @@ packages: dev: true resolution: integrity: sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og== + /unique-string/1.0.0: + dependencies: + crypto-random-string: 1.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo= /universalify/0.1.1: dev: true resolution: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= /unpack-stream/3.0.1: dependencies: - '@types/node': 9.4.0 + '@types/node': 9.4.4 decompress-maybe: 1.0.0 - ssri: 5.1.0 + ssri: 5.2.1 tar-fs: 1.16.0 dev: true engines: node: '>=4' resolution: integrity: sha512-yaG8wkdx7b9Cza2GGQ6YleqxLZwPaNsGYp9zJY61nZgRjl5ATXpfHaZzE1joL4/PlUu8rQiDV4bApqB2iPwz6g== - /unzip-response/1.0.2: - dev: true - engines: - node: '>=0.10' - optional: true - resolution: - integrity: sha1-uYTwh3/AqJwsdzzB73tbIytbBv4= /util-deprecate/1.0.2: resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= @@ -3616,6 +3679,11 @@ packages: node: '>=4' resolution: integrity: sha512-FYMSYiI76Pd8twRTtV/DBmDkZcrMqET3ar5G+alR7/VQgo2iwnu1xlgzpvaWUCwdx5R+mq8HxgFeSnJpssV17A== + /which-pm-runs/1.0.0: + dev: true + optional: true + resolution: + integrity: sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= /which/1.3.0: dependencies: isexe: 2.0.0 diff --git a/src/mergeOutputs.ts b/src/mergeOutputs.ts index e8b81ccf47..b6e9c49f9b 100644 --- a/src/mergeOutputs.ts +++ b/src/mergeOutputs.ts @@ -38,7 +38,7 @@ export default function mergeOutputs (outputs: Array Date: Sat, 10 Feb 2018 22:25:50 +0200 Subject: [PATCH 143/196] feat: print progress in append-only mode ref pnpm/pnpm#1028 --- src/reporterForClient.ts | 94 ++++++++++++++++++++-------------------- test/index.ts | 21 +++++++++ 2 files changed, 68 insertions(+), 47 deletions(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 82cdfddba8..dfd4f66098 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -86,60 +86,60 @@ export default function ( outputs.push(alreadyUpToDate$) } - if (!appendOnly) { - const fedtchedLog$ = log$.progress - .filter((log) => log.status === 'fetched') - .scan(R.inc, 0) + const fedtchedLog$ = log$.progress + .filter((log) => log.status === 'fetched') + .scan(R.inc, 0) - const foundInStoreLog$ = log$.progress - .filter((log) => log.status === 'found_in_store') - .scan(R.inc, 0) + const foundInStoreLog$ = log$.progress + .filter((log) => log.status === 'found_in_store') + .scan(R.inc, 0) - function createStatusMessage (resolving: number, fetched: number, foundInStore: number, resolutionDone: boolean) { - const msg = `Resolving: total ${hlValue(resolving.toString())}, reused ${hlValue(foundInStore.toString())}, downloaded ${hlValue(fetched.toString())}` - if (resolving === foundInStore + fetched && resolutionDone) { - return { - fixed: false, - msg: `${msg}, done`, - } - } + function createStatusMessage (resolving: number, fetched: number, foundInStore: number, resolutionDone: boolean) { + const msg = `Resolving: total ${hlValue(resolving.toString())}, reused ${hlValue(foundInStore.toString())}, downloaded ${hlValue(fetched.toString())}` + if (resolving === foundInStore + fetched && resolutionDone) { return { - fixed: true, - msg, + fixed: false, + msg: `${msg}, done`, } } - - if (!isRecursive && typeof throttleProgress === 'number' && throttleProgress > 0) { - const importingDone$ = log$.stage.filter((log) => log.message === 'importing_done').multicast() - const resolutionStarted$ = log$.stage.filter((log) => log.message === 'resolution_started') - const commandDone$ = log$.cli.filter((log) => log['message'] === 'command_done') - - // Reporting is done every `throttleProgress` milliseconds - // and once all packages are fetched. - const sampler = most.merge( - most.periodic(throttleProgress).since(resolutionStarted$).until(most.merge(importingDone$, commandDone$)), - importingDone$, - ) - const progress = most.sample( - createStatusMessage, - sampler, - resolvingContentLog$, - fedtchedLog$, - foundInStoreLog$, - resolutionDone$, - ) - outputs.push(most.of(progress)) - } else { - const progress = most.combine( - createStatusMessage, - resolvingContentLog$, - fedtchedLog$, - foundInStoreLog$, - isRecursive ? most.of(false) : resolutionDone$, - ) - outputs.push(most.of(progress)) + return { + fixed: true, + msg, } + } + if (!isRecursive && typeof throttleProgress === 'number' && throttleProgress > 0) { + const importingDone$ = log$.stage.filter((log) => log.message === 'importing_done').multicast() + const resolutionStarted$ = log$.stage.filter((log) => log.message === 'resolution_started') + const commandDone$ = log$.cli.filter((log) => log['message'] === 'command_done') + + // Reporting is done every `throttleProgress` milliseconds + // and once all packages are fetched. + const sampler = most.merge( + most.periodic(throttleProgress).since(resolutionStarted$).until(most.merge(importingDone$, commandDone$)), + importingDone$, + ) + const progress = most.sample( + createStatusMessage, + sampler, + resolvingContentLog$, + fedtchedLog$, + foundInStoreLog$, + resolutionDone$, + ) + outputs.push(most.of(progress)) + } else { + const progress = most.combine( + createStatusMessage, + resolvingContentLog$, + fedtchedLog$, + foundInStoreLog$, + isRecursive ? most.of(false) : resolutionDone$, + ) + outputs.push(most.of(progress)) + } + + if (!appendOnly) { const tarballsProgressOutput$ = log$.progress .filter((log) => log.status === 'fetching_started' && typeof log.size === 'number' && log.size >= BIG_TARBALL_SIZE) diff --git a/test/index.ts b/test/index.ts index 0da544dc83..79ea375ec4 100644 --- a/test/index.ts +++ b/test/index.ts @@ -55,6 +55,27 @@ test('prints progress beginning', t => { }) }) +test('prints progress beginning when appendOnly is true', t => { + const output$ = toOutput$(createStreamParser(), {appendOnly: true}) + + const pkgId = 'registry.npmjs.org/foo/1.0.0' + + progressLogger.debug({ + status: 'resolving_content', + pkgId, + }) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, `Resolving: total ${hlValue('1')}, reused ${hlValue('0')}, downloaded ${hlValue('0')}`) + }, + error: t.end, + complete: () => t.end(), + }) +}) + test('prints progress beginning during recursive install', t => { const output$ = toOutput$(createStreamParser(), {cmd: 'recursive'}) From 504aaa1e619c0df6025f44a8f21e85823be80663 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 10 Feb 2018 22:28:09 +0200 Subject: [PATCH 144/196] chore(release): 0.14.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 861adaec0f..e2f805b5ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.14.1", + "version": "0.14.2", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From f0cc92b7389107ab73714ae2a32a5415699f0e51 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 19 Feb 2018 22:45:52 +0000 Subject: [PATCH 145/196] chore(deps): update dependency ts-node to ^5.0.0 --- package.json | 2 +- shrinkwrap.yaml | 421 +++++++++++++----------------------------------- 2 files changed, 116 insertions(+), 307 deletions(-) diff --git a/package.json b/package.json index e2f805b5ab..6f4eb2c615 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "rimraf": "^2.5.4", "supi": "^0.12.5", "tape": "^4.8.0", - "ts-node": "^4.0.2", + "ts-node": "^5.0.0", "tslint": "^5.7.0", "typescript": "^2.6.2", "validate-commit-msg": "^2.8.2" diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 2f165cc49f..9264d978a4 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,10 +1,10 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 9.4.4 - '@types/ramda': 0.25.17 + '@types/node': 9.4.6 + '@types/ramda': 0.25.18 '@types/semver': 5.5.0 ansi-diff: 1.0.10 - chalk: 2.3.0 + chalk: 2.3.1 cli-cursor: 2.1.0 common-tags: 1.7.2 most: 1.7.3 @@ -25,11 +25,11 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.5 rimraf: 2.6.2 - supi: 0.12.7 - tape: 4.8.0 - ts-node: 4.1.0 + supi: 0.12.9 + tape: 4.9.0 + ts-node: 5.0.0 tslint: 5.9.1 - typescript: 2.7.1 + typescript: 2.7.2 validate-commit-msg: 2.14.0 packages: /@most/multicast/1.3.0: @@ -56,9 +56,9 @@ packages: integrity: sha512-rN+hiOjGtxwwus7c/E0xkCs9prBeXzZCSCW/Q3k2WdHGSRNLAepr777iv+i2eqTfz9vXlTF0rLZOGi62ujzwYA== /@pnpm/exec/1.1.4: dependencies: - '@pnpm/self-installer': 2.0.0 - '@types/got': 7.1.6 - '@types/node': 9.4.4 + '@pnpm/self-installer': 2.0.1 + '@types/got': 7.1.7 + '@types/node': 9.4.6 command-exists: 1.2.2 cross-spawn: 5.1.0 dev: true @@ -76,7 +76,7 @@ packages: integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== /@pnpm/fs-locker/1.0.1: dependencies: - '@types/node': 9.4.4 + '@types/node': 9.4.6 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: true @@ -86,7 +86,7 @@ packages: integrity: sha512-gmM3SM6fBpssvbSD1U8wJbArNPiQchFzt90ICkfawo0OGQBYY6mgt+sqxF93E9yLfNY7WGtPJYhAQW3Uht6m7A== /@pnpm/logger/1.0.1: dependencies: - '@types/node': 9.4.4 + '@types/node': 9.4.6 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -94,7 +94,7 @@ packages: node: '>=4' resolution: integrity: sha512-23FWOXgCkJ9q73mIqS5H/x98uaZcvO7ov/nt0HZGgLci3MHsqBgEfh3UzZiLZIxlxmA3XoUp4fgbjM7S96pBRg== - /@pnpm/package-requester/0.8.0: + /@pnpm/package-requester/0.8.1: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fetcher-base': 1.0.0 @@ -123,7 +123,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-eEsiVag69B/owb5HqoWEBPoqpVf2hQk49hNlgM6+jxDA28t09r1ohRfUIRnMle6OlbjKoB/SCW/DfbKo+pd6dQ== + integrity: sha512-F8unfpTfTDp4LF3bCeBnJvkhM90goad1sYCe2gzcD0nHtzhJXy2wKxdE2odhr59J0GF4scn4X7lQquX3wt+mtw== /@pnpm/pkgid-to-filename/1.0.0: dependencies: normalize-path: 2.1.1 @@ -140,19 +140,19 @@ packages: node: '>=4' resolution: integrity: sha512-+y47No75LZFnkN7VAnoEtkIzDgOuc8ZT4QjyhuNIBVLx4oqFa/R16DpSyRjmaTZMCSREXunObULKL/hoLipNDA== - /@pnpm/self-installer/2.0.0: + /@pnpm/self-installer/2.0.1: dev: true engines: node: '>=4' resolution: - integrity: sha512-+Hg7mBqDOXUlH4UvYffXMJwln8EIfqpf0+y7ODYqbO9GF9Kc1GG7/tbl5cWyA1OKF04XQH9jugoIxtCOxN9/dg== + integrity: sha512-ZnWWMPCCewTSI+1cNrRNCAGsVsdzFvN1+WU8GkjtvwAW2lnBpIVZm4MHQBI3basFYn7DWCs4lBihGuH1DiCAAg== /@pnpm/types/1.7.0: dev: true resolution: integrity: sha512-pn7g4uxcofWTNG/cxmKvkMK2lxr4OUIhrQDrEVYEdVhW0WkWztsHkFrYjFgfNzPbYu3ITlB3T6aSVjCoJQTOlw== /@types/byline/4.2.31: dependencies: - '@types/node': 9.4.4 + '@types/node': 9.4.6 dev: true resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= @@ -161,40 +161,40 @@ packages: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== /@types/fs-extra/5.0.0: dependencies: - '@types/node': 9.4.4 + '@types/node': 9.4.6 dev: true resolution: integrity: sha512-qtxDULQKUenuaDLW003CgC+0T0eiAfH3BrH+vSt87GLzbz5EZ6Ox6mv9rMttvhDOatbb9nYh0E1m7ydoYwUrAg== - /@types/got/7.1.6: + /@types/got/7.1.7: dependencies: - '@types/node': 9.4.4 + '@types/node': 9.4.6 dev: true resolution: - integrity: sha512-MTgskaiThy9e07/V/gWj1PY3FWsfghgFQVgSLgEV+k7r+rTxvfKNDDNjIcFV/aDhDBCpUEaqdHAeaxjM9uaSKA== + integrity: sha512-quhlNPGIkaRyO4PnEuP9pEkUPktjfrvPESENGOhiEzgOUNbunETSQXY5bkZY+Bb/J9V5p/f50Rh1eDklD4Z2FQ== /@types/load-json-file/2.0.7: dev: true resolution: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== /@types/mz/0.0.32: dependencies: - '@types/node': 9.4.4 + '@types/node': 9.4.6 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/8.9.2: + /@types/node/8.9.4: dev: false resolution: - integrity: sha512-+IIOUfGkGIUu310djXpOZNR1jHftzr/W7DwoUPiRfzhZWFLXdRt80ePYUjSEYVEs4hJUK4ikXWWo7eHd10RQlA== - /@types/node/9.4.4: + integrity: sha512-dSvD36qnQs78G1BPsrZFdPpvLgMW/dnvr5+nTW2csMs5TiP9MOXrjUbnMZOEwnIuBklXtn7b6TPA2Cuq07bDHA== + /@types/node/9.4.6: resolution: - integrity: sha512-pTi6f79uELOTQ2TtXxWcjmJ+iZa1C3ypm6pGNU/viOQX/VfBXLmsZEcJPk1rm+lia+GP6GpgFGUkCvLJ7JOKDA== + integrity: sha512-CTUtLb6WqCCgp6P59QintjHWqzf4VL1uPA27bipLAPxFqrtK1gEYllePzTICGqQ8rYsCbpnsNypXjjDzGAAjEQ== /@types/nopt/3.0.29: dev: true resolution: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 9.4.4 + '@types/node': 9.4.6 dev: true resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== @@ -206,9 +206,9 @@ packages: dev: true resolution: integrity: sha512-dwv960sf5inFWiufjhDfK7ZG3nYyHXt58I+14bJJBKV5MPlZm6Tu1sQS63NWEtLpIw6+RhbNbXjNStdMXxR8Nw== - /@types/ramda/0.25.17: + /@types/ramda/0.25.18: resolution: - integrity: sha512-CNPC7KqhmOYhTtD4zFJDkmZ+i8UcCoVOXKq1MDpjduxkoP6aCWVdnZQTaeN8qtz89bMxkCHcMu4mUTqwuKlyYw== + integrity: sha512-oNWqu5shcOj+R7Co9jLFqo4r37hy5qjKrOUEtMhwHa9rnxX8u60h1SF7ShdFluXyNaRkai0PLFCXOiolOWA+3g== /@types/rc/0.0.1: dev: true resolution: @@ -216,17 +216,9 @@ packages: /@types/semver/5.5.0: resolution: integrity: sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== - /@types/strip-bom/3.0.0: - dev: true - resolution: - integrity: sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I= - /@types/strip-json-comments/0.0.30: - dev: true - resolution: - integrity: sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ== /@types/tape/4.2.31: dependencies: - '@types/node': 9.4.4 + '@types/node': 9.4.6 dev: true resolution: integrity: sha512-DEPn8FJKQR6eeMHZ407TuAqlhBKQa54PTM3c7Z6pKOI1uHaPnidmpmOXYtNZTcDrL5hnZofSHPwX1AQ9HbaMUg== @@ -240,7 +232,7 @@ packages: integrity: sha512-JdO/UpPm9RrtQBNVcZdt3M7j3mHO/kXaea9LBGx3UgWJd1f9BkIWP7jObLBG6ZtRyqp7KzLFEsaPhWcidVittA== /@zkochan/cmd-shim/2.2.4: dependencies: - is-windows: 1.0.1 + is-windows: 1.0.2 mkdirp-promise: 5.0.1 mz: 2.7.0 dev: true @@ -251,7 +243,7 @@ packages: /@zkochan/npm-package-arg/1.0.0: dependencies: hosted-git-info: 2.5.0 - osenv: 0.1.4 + osenv: 0.1.5 semver: 5.5.0 validate-npm-package-name: 3.0.0 dev: true @@ -340,12 +332,12 @@ packages: dev: true resolution: integrity: sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0= - /argparse/1.0.9: + /argparse/1.0.10: dependencies: sprintf-js: 1.0.3 dev: true resolution: - integrity: sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY= + integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== /arr-diff/2.0.0: dependencies: arr-flatten: 1.1.0 @@ -437,11 +429,6 @@ packages: optional: true resolution: integrity: sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40= - /bindings/1.3.0: - dev: true - optional: true - resolution: - integrity: sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw== /bl/1.2.1: dependencies: readable-stream: 2.3.4 @@ -465,7 +452,7 @@ packages: integrity: sha1-vIpIPKlASdqbg3wa0Rzf6+5uBRQ= /boom/4.3.1: dependencies: - hoek: 4.2.0 + hoek: 4.2.1 dev: true engines: node: '>=4.0.0' @@ -473,7 +460,7 @@ packages: integrity: sha1-T4owBctKfjiJ90kDD9JbluAdLjE= /boom/5.2.0: dependencies: - hoek: 4.2.0 + hoek: 4.2.1 dev: true engines: node: '>=4.0.0' @@ -586,15 +573,15 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - /chalk/2.3.0: + /chalk/2.3.1: dependencies: ansi-styles: 3.2.0 escape-string-regexp: 1.0.5 - supports-color: 4.5.0 + supports-color: 5.2.0 engines: node: '>=4' resolution: - integrity: sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q== + integrity: sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g== /chownr/1.0.1: dev: true resolution: @@ -650,14 +637,14 @@ packages: node: '>=0.1.90' resolution: integrity: sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w= - /combined-stream/1.0.5: + /combined-stream/1.0.6: dependencies: delayed-stream: 1.0.0 dev: true engines: node: '>= 0.8' resolution: - integrity: sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk= + integrity: sha1-cj599ugBrFYTETp+RFqbactjKBg= /command-exists/1.2.2: dev: true resolution: @@ -800,17 +787,10 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.9.2 + '@types/node': 8.9.4 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== - /debug/3.1.0: - dependencies: - ms: 2.0.0 - dev: true - optional: true - resolution: - integrity: sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== /decamelize-keys/1.1.0: dependencies: decamelize: 1.2.0 @@ -834,15 +814,6 @@ packages: dev: true resolution: integrity: sha1-rf54xmzAaeZOgkvRQFuF515tHLs= - /decompress-response/3.3.0: - dependencies: - mimic-response: 1.0.0 - dev: true - engines: - node: '>=4' - optional: true - resolution: - integrity: sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= /dedent/0.6.0: dev: true resolution: @@ -851,14 +822,6 @@ packages: dev: true resolution: integrity: sha1-9dJgKStmDghO/0zbyfCK0yR0SLU= - /deep-extend/0.4.2: - dev: true - engines: - iojs: '>=1.0.0' - node: '>=0.12.0' - optional: true - resolution: - integrity: sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8= /define-properties/1.1.2: dependencies: foreach: 2.0.5 @@ -920,13 +883,6 @@ packages: node: '>=4' resolution: integrity: sha1-OHHMCmoALow+Wzz38zYmRnXwa50= - /detect-libc/1.0.3: - dev: true - engines: - node: '>=0.10' - optional: true - resolution: - integrity: sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= /diff/2.2.3: dev: true engines: @@ -945,38 +901,12 @@ packages: mz: 2.7.0 p-every: 1.0.2 p-limit: 1.2.0 - ssri: 5.2.1 + ssri: 5.2.4 dev: true engines: node: '>=4' resolution: integrity: sha512-O7ma/wc+Sf6ETmKtH678v94d1zx3EqHoiwIGKlF2zArUzXItQ1ZXrKZY7RGl4RuFr7eYyK8bEeZkOX4dEv8iZw== - /drive-by-path/1.0.0: - dependencies: - is-subdir: 1.0.2 - once: 1.4.0 - ramda: 0.24.1 - util.promisify: 1.0.0 - dev: true - engines: - node: '>=4' - optionalDependencies: - drivelist: 5.2.12 - resolution: - integrity: sha512-FSY6axBYIVfYz9Rj6c6ECzcSxoNgqZRfAQP0kDiCVa38gPDzVyPWcEvxfDnJ96xW4oXLZLpiOloxRnC1sUKksA== - /drivelist/5.2.12: - dependencies: - bindings: 1.3.0 - debug: 3.1.0 - js-yaml: 3.10.0 - nan: 2.8.0 - prebuild-install: 2.5.1 - dev: true - engines: - node: '>=4' - optional: true - resolution: - integrity: sha512-l4IYMiPaLjUb+wDb/az0xHwLNVK0X1OcXBTHK3UzUgZA89qG4nLpQ1chyWNRaFgFhy+a7EMKfOy5rpMstcH/TQ== /duplexer/0.1.1: dev: true resolution: @@ -1096,11 +1026,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= - /expand-template/1.1.0: - dev: true - optional: true - resolution: - integrity: sha512-kkjwkMqj0h4w/sb32ERCDxCQkREMCAgS39DscDnSwDsbxnwwM1BTZySdC3Bn1lhY7vL08n9GoO/fVTynjDgRyQ== /expand-tilde/1.2.2: dependencies: os-homedir: 1.0.2 @@ -1260,16 +1185,16 @@ packages: dev: true resolution: integrity: sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= - /form-data/2.3.1: + /form-data/2.3.2: dependencies: asynckit: 0.4.0 - combined-stream: 1.0.5 - mime-types: 2.1.17 + combined-stream: 1.0.6 + mime-types: 2.1.18 dev: true engines: node: '>= 0.12' resolution: - integrity: sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8= + integrity: sha1-SXBJi+YEwgwAXU9cI67NIda0kJk= /fs-exists-sync/0.1.0: dev: true engines: @@ -1362,11 +1287,6 @@ packages: dev: true resolution: integrity: sha1-sBruUk651u5zOe/CnNqVRRnxJVY= - /github-from-package/0.0.0: - dev: true - optional: true - resolution: - integrity: sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= /glob-base/0.3.0: dependencies: glob-parent: 2.0.0 @@ -1476,11 +1396,11 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - /has-flag/2.0.0: + /has-flag/3.0.0: engines: - node: '>=0.10.0' + node: '>=4' resolution: - integrity: sha1-6CB68cx7MNRGzHC3NLXovhj4jVE= + integrity: sha1-tdRU3CGZriJWmfNGfloH87lVuv0= /has-unicode/2.0.1: dev: true resolution: @@ -1497,19 +1417,19 @@ packages: dependencies: boom: 4.3.1 cryptiles: 3.1.2 - hoek: 4.2.0 + hoek: 4.2.1 sntp: 2.1.0 dev: true engines: node: '>=4.5.0' resolution: integrity: sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ== - /hoek/4.2.0: + /hoek/4.2.1: dev: true engines: node: '>=4.0.0' resolution: - integrity: sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ== + integrity: sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA== /homedir-polyfill/1.0.1: dependencies: parse-passwd: 1.0.0 @@ -1756,7 +1676,7 @@ packages: integrity: sha1-EtSj3U5o4Lec6428hBc66A2RykQ= /is-subdir/1.0.2: dependencies: - is-windows: 1.0.1 + is-windows: 1.0.2 dev: true engines: node: '>=4' @@ -1778,12 +1698,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-3hqm1j6indJIc3tp8f+LgALSEIw= - /is-windows/1.0.1: + /is-windows/1.0.2: dev: true engines: node: '>=0.10.0' resolution: - integrity: sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk= + integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== /isarray/1.0.0: resolution: integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= @@ -1809,7 +1729,7 @@ packages: integrity: sha1-mGbfOVECEw449/mWvOtlRDIJwls= /js-yaml/3.10.0: dependencies: - argparse: 1.0.9 + argparse: 1.0.10 esprima: 4.0.0 dev: true resolution: @@ -1965,18 +1885,18 @@ packages: dev: true resolution: integrity: sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew== - /make-dir/1.1.0: + /make-dir/1.2.0: dependencies: pify: 3.0.0 dev: true engines: node: '>=4' resolution: - integrity: sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA== - /make-error/1.3.3: + integrity: sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw== + /make-error/1.3.4: dev: true resolution: - integrity: sha512-j3dZCri3cCd23wgPqK/0/KvTN8R+W6fXDqQe8BNLbTpONjbA8SPaRr+q0BQq9bx3Q/+g68/gDIh9FW3by702Tg== + integrity: sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g== /manage-path/2.0.0: dev: true resolution: @@ -2042,32 +1962,25 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= - /mime-db/1.30.0: + /mime-db/1.33.0: dev: true engines: node: '>= 0.6' resolution: - integrity: sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE= - /mime-types/2.1.17: + integrity: sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ== + /mime-types/2.1.18: dependencies: - mime-db: 1.30.0 + mime-db: 1.33.0 dev: true engines: node: '>= 0.6' resolution: - integrity: sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo= + integrity: sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ== /mimic-fn/1.2.0: engines: node: '>=4' resolution: integrity: sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== - /mimic-response/1.0.0: - dev: true - engines: - node: '>=4' - optional: true - resolution: - integrity: sha1-3z02Uqc/3ta5sLJBRub9BSNTRY4= /minimatch/3.0.4: dependencies: brace-expansion: 1.1.11 @@ -2133,11 +2046,6 @@ packages: dev: false resolution: integrity: sha512-mk68SM/ptK8WSo3l03raXcWy02Hl7jbzxVozMuvyYxohn4yteh2THhl3+XABF5cunWE8eXHAsLbv+RCJI5y+jg== - /ms/2.0.0: - dev: true - optional: true - resolution: - integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= /mute-stream/0.0.6: dev: true resolution: @@ -2150,11 +2058,6 @@ packages: dev: true resolution: integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q== - /nan/2.8.0: - dev: true - optional: true - resolution: - integrity: sha1-7XFfP+neArV6XmJS2QqWZ14fCFo= /ncp/2.0.0: dev: true resolution: @@ -2177,13 +2080,6 @@ packages: dev: true resolution: integrity: sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA== - /node-abi/2.2.0: - dependencies: - semver: 5.5.0 - dev: true - optional: true - resolution: - integrity: sha512-FqVC0WNNL8fQWQK3GYTESfwZXZKDbSIiEEIvufq7HV6Lj0IDDZRVa4CU/KTA0JVlqY9eTDSuPiC8FS9UfGVuzA== /node-gyp/3.6.2: dependencies: fstream: 1.0.11 @@ -2193,7 +2089,7 @@ packages: mkdirp: 0.5.1 nopt: 3.0.6 npmlog: 4.1.2 - osenv: 0.1.4 + osenv: 0.1.5 request: 2.83.0 rimraf: 2.6.2 semver: 5.3.0 @@ -2204,11 +2100,6 @@ packages: node: '>= 0.8.0' resolution: integrity: sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA= - /noop-logger/0.1.1: - dev: true - optional: true - resolution: - integrity: sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= /nopt/3.0.6: dependencies: abbrev: 1.1.1 @@ -2288,10 +2179,10 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - /object-inspect/1.3.0: + /object-inspect/1.5.0: dev: true resolution: - integrity: sha512-OHHnLgLNXpM++GnJRyyhbr2bwl3pPVm4YvaraHrRvDt/N3r+s/gDVHciA7EJBTkijKXj61ssgSAikq1fb0IBRg== + integrity: sha512-UmOFbHbwvv+XHj7BerrhVq+knjceBdkvU5AriwLMvhv2qi+e7DJzxfBeFpILEjVzCp+xA+W/pIf06RGPWlZNfw== /object-keys/1.0.11: dev: true engines: @@ -2363,13 +2254,13 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - /osenv/0.1.4: + /osenv/0.1.5: dependencies: os-homedir: 1.0.2 os-tmpdir: 1.0.2 dev: true resolution: - integrity: sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ= + integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== /p-defer/1.0.0: dev: true engines: @@ -2458,7 +2349,7 @@ packages: '@types/fs-extra': 5.0.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.4.4 + '@types/node': 9.4.6 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.4 find-down: 0.1.4 @@ -2476,27 +2367,24 @@ packages: node: '>=4' resolution: integrity: sha512-Qmhr23K9e2jI4LK4MU2be4xWX0CyniBDwmyCi6K+3lTZtryd2r29Wh6wPXo6wdP++jNsJ5ayZT4yJlZWVHnluQ== - /package-store/0.16.0: + /package-store/0.17.1: dependencies: '@pnpm/fetcher-base': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/package-requester': 0.8.0 + '@pnpm/package-requester': 0.8.1 '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.4.4 - '@types/ramda': 0.25.17 - drive-by-path: 1.0.0 + '@types/node': 9.4.6 + '@types/ramda': 0.25.18 encode-registry: 1.1.0 load-json-file: 4.0.0 mkdirp-promise: 5.0.1 mz: 2.7.0 ncp: 2.0.0 - os-homedir: 1.0.2 p-filter: 1.0.0 p-limit: 1.2.0 - path-absolute: 1.0.0 path-exists: 3.0.0 path-temp: 1.0.0 ramda: 0.25.0 @@ -2510,7 +2398,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-FWv5/zrZf9t9Ryo8aAoVG15D/R5ou3qhdxNXuU33gTUbIMbbLopo9SVUQmSZRcRcWmJ6idwintntakqoIBRQNg== + integrity: sha512-hDvHXUR0D5r5fXQpR+HVgHBuinWs4s8WsQ42WtYLq3anOdR14B2zs7aG9YVUw3UXZpBuiJ1HYplsiQWhYRPl1Q== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -2662,8 +2550,8 @@ packages: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= /pnpm-shrinkwrap/5.3.0: dependencies: - '@types/node': 9.4.4 - '@types/ramda': 0.25.17 + '@types/node': 9.4.6 + '@types/ramda': 0.25.18 dependency-path: 1.2.0 js-yaml: 3.10.0 load-yaml-file: 0.1.0 @@ -2679,27 +2567,6 @@ packages: '@pnpm/logger': ^1.0.0 resolution: integrity: sha512-WdBYsVsaRbKLnU7Vb7QAk2SE9UAD0j0AaWcv5VTX1ky2bJWqF1JE5NJSpedyL/rTr3eBNQiqM5nzV+WbzX0mUQ== - /prebuild-install/2.5.1: - dependencies: - detect-libc: 1.0.3 - expand-template: 1.1.0 - github-from-package: 0.0.0 - minimist: 1.2.0 - mkdirp: 0.5.1 - node-abi: 2.2.0 - noop-logger: 0.1.1 - npmlog: 4.1.2 - os-homedir: 1.0.2 - pump: 2.0.1 - rc: 1.2.5 - simple-get: 2.7.0 - tar-fs: 1.16.0 - tunnel-agent: 0.6.0 - which-pm-runs: 1.0.0 - dev: true - optional: true - resolution: - integrity: sha512-3DX9L6pzwc1m1ksMkW3Ky2WLgPQUBiySOfXVl3WZyAeJSyJb4wtoH9OmeRGcubAWsMlLiL8BTHbwfm/jPQE9Ag== /preserve/0.2.0: dev: true engines: @@ -2780,10 +2647,6 @@ packages: node: '>=4' resolution: integrity: sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g= - /ramda/0.24.1: - dev: true - resolution: - integrity: sha1-w7d1UZfzW43DUCIoJixMkd22uFc= /ramda/0.25.0: resolution: integrity: sha512-GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ== @@ -2796,16 +2659,6 @@ packages: node: '>= 0.10.0' resolution: integrity: sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how== - /rc/1.2.5: - dependencies: - deep-extend: 0.4.2 - ini: 1.3.5 - minimist: 1.2.0 - strip-json-comments: 2.0.1 - dev: true - optional: true - resolution: - integrity: sha1-J1zWh/bjs2zHVrqibf7oCnkDAf0= /read-package-json/2.0.12: dependencies: glob: 7.1.2 @@ -2931,17 +2784,17 @@ packages: aws-sign2: 0.7.0 aws4: 1.6.0 caseless: 0.12.0 - combined-stream: 1.0.5 + combined-stream: 1.0.6 extend: 3.0.1 forever-agent: 0.6.1 - form-data: 2.3.1 + form-data: 2.3.2 har-validator: 5.0.3 hawk: 6.0.2 http-signature: 1.2.0 is-typedarray: 1.0.0 isstream: 0.1.2 json-stringify-safe: 5.0.1 - mime-types: 2.1.17 + mime-types: 2.1.18 oauth-sign: 0.8.2 performance-now: 2.1.0 qs: 6.5.1 @@ -2978,12 +2831,6 @@ packages: node: '>=4' resolution: integrity: sha512-uid343+whX+g+LLUzwCYaZBOZPX8Hi3Y7qZBr0r1Rvb0y6WMWVLT32uuGllxD5uNQR+mddUE/Dx/wwvgGrZLSA== - /resolve/1.4.0: - dependencies: - path-parse: 1.0.5 - dev: true - resolution: - integrity: sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q== /resolve/1.5.0: dependencies: path-parse: 1.0.5 @@ -3096,20 +2943,6 @@ packages: /signal-exit/3.0.2: resolution: integrity: sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= - /simple-concat/1.0.0: - dev: true - optional: true - resolution: - integrity: sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY= - /simple-get/2.7.0: - dependencies: - decompress-response: 3.3.0 - once: 1.4.0 - simple-concat: 1.0.0 - dev: true - optional: true - resolution: - integrity: sha512-RkE9rGPHcxYZ/baYmgJtOSM63vH0Vyq+ma5TijBcLla41SWlh8t6XYIGMR/oeZcmr+/G8k+zrClkkVrtnQ0esg== /slash/1.0.0: dev: true engines: @@ -3122,7 +2955,7 @@ packages: integrity: sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= /sntp/2.1.0: dependencies: - hoek: 4.2.0 + hoek: 4.2.1 dev: true engines: node: '>=4.0.0' @@ -3201,12 +3034,12 @@ packages: tweetnacl: 0.14.5 resolution: integrity: sha1-US322mKHFEMW3EwY/hzx2UBzm+M= - /ssri/5.2.1: + /ssri/5.2.4: dependencies: safe-buffer: 5.1.1 dev: true resolution: - integrity: sha512-y4PjOWlAuxt+yAcXitQYOnOzZpKaH3+f/qGV3OWxbyC2noC9FA9GNC9uILnVdV7jruA1aDKr4OKz3ZDBcVZwFQ== + integrity: sha512-UnEAgMZa15973iH7cUi0AHjJn1ACDIkaMyZILoqwN6yzt+4P81I8tBc5Hl+qwi5auMplZtPQsHrPBR5vJLcQtQ== /stacktracey/1.2.100: dependencies: as-table: 1.0.31 @@ -3287,11 +3120,11 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.12.7: + /supi/0.12.9: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/package-requester': 0.8.0 + '@pnpm/package-requester': 0.8.1 '@pnpm/pkgid-to-filename': 1.0.0 '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 @@ -3299,11 +3132,11 @@ packages: '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.4.4 + '@types/node': 9.4.6 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 - '@types/ramda': 0.25.17 + '@types/ramda': 0.25.18 '@types/rc': 0.0.1 '@types/semver': 5.5.0 '@types/update-notifier': 1.0.3 @@ -3321,7 +3154,7 @@ packages: is-ci: 1.1.0 is-inner-link: 2.0.2 is-subdir: 1.0.2 - is-windows: 1.0.1 + is-windows: 1.0.2 load-json-file: 4.0.0 load-yaml-file: 0.1.0 mkdirp-promise: 5.0.1 @@ -3333,7 +3166,7 @@ packages: p-filter: 1.0.0 p-limit: 1.2.0 p-series: 1.0.0 - package-store: 0.16.0 + package-store: 0.17.1 path-absolute: 1.0.0 path-exists: 3.0.0 path-name: 1.0.0 @@ -3357,7 +3190,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-SFU94ACNjwbz++/i5eGezHZkpScJCQ+dqPowN7it3h9MoV1w9cNGA0Bip8N3wtHF/mb7PhKGHMepxIFjbkL91Q== + integrity: sha512-LElHPa9VBu/4WpaHMWSrTbQ7EBYXaPTrki4MFKfvM755cfhAwt79DHICDlcidOQluiKJGul8l1SZQ9XMQmiVag== /supports-color/0.2.0: dev: true engines: @@ -3370,13 +3203,13 @@ packages: node: '>=0.8.0' resolution: integrity: sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - /supports-color/4.5.0: + /supports-color/5.2.0: dependencies: - has-flag: 2.0.0 + has-flag: 3.0.0 engines: node: '>=4' resolution: - integrity: sha1-vnoN5ITexcXN34s9WRJQRJEvY1s= + integrity: sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q== /symbol-observable/1.2.0: dev: false engines: @@ -3386,9 +3219,9 @@ packages: /symlink-dir/1.1.2: dependencies: '@types/mz': 0.0.32 - '@types/node': 9.4.4 + '@types/node': 9.4.6 graceful-fs: 4.1.11 - is-windows: 1.0.1 + is-windows: 1.0.2 mkdirp-promise: 5.0.1 mz: 2.7.0 dev: true @@ -3406,7 +3239,7 @@ packages: readable-stream: 2.3.4 resolution: integrity: sha1-EgxQiciMPIp5PvKIhn3jIeGPjCI= - /tape/4.8.0: + /tape/4.9.0: dependencies: deep-equal: 1.0.1 defined: 1.0.0 @@ -3416,14 +3249,14 @@ packages: has: 1.0.1 inherits: 2.0.3 minimist: 1.2.0 - object-inspect: 1.3.0 - resolve: 1.4.0 + object-inspect: 1.5.0 + resolve: 1.5.0 resumer: 0.0.0 string.prototype.trim: 1.1.2 through: 2.3.8 dev: true resolution: - integrity: sha512-TWILfEnvO7I8mFe35d98F6T5fbLaEtbFTG/lxWvid8qDfFTxt19EBijWmB4j3+Hoh5TfHE2faWs73ua+EphuBA== + integrity: sha512-j0jO9BiScfqtPBb9QmPLL0qvxXMz98xjkMb7x8lKipFlJZwNJkqkWPou+NU4V6T9RnVh1kuSthLE8gLrN8bBfw== /tar-fs/1.16.0: dependencies: chownr: 1.0.1 @@ -3498,32 +3331,21 @@ packages: node: '>=4' resolution: integrity: sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= - /ts-node/4.1.0: + /ts-node/5.0.0: dependencies: arrify: 1.0.1 - chalk: 2.3.0 + chalk: 2.3.1 diff: 3.4.0 - make-error: 1.3.3 + make-error: 1.3.4 minimist: 1.2.0 mkdirp: 0.5.1 source-map-support: 0.5.3 - tsconfig: 7.0.0 - v8flags: 3.0.1 yn: 2.0.0 dev: true engines: node: '>=4.2.0' resolution: - integrity: sha512-xcZH12oVg9PShKhy3UHyDmuDLV3y7iKwX25aMVPt1SIXSuAfWkFiGPEkg+th8R4YKW/QCxDoW7lJdb15lx6QWg== - /tsconfig/7.0.0: - dependencies: - '@types/strip-bom': 3.0.0 - '@types/strip-json-comments': 0.0.30 - strip-bom: 3.0.0 - strip-json-comments: 2.0.1 - dev: true - resolution: - integrity: sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw== + integrity: sha512-mlSim/sQS1s5iT3KZEKXRaqsGC7xM2QoxkrhfznZJyou18dl47PTnY7/KMmbGqiVoQrO9Hk53CYpcychF5TNrQ== /tslib/1.9.0: dev: true resolution: @@ -3532,7 +3354,7 @@ packages: dependencies: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 - chalk: 2.3.0 + chalk: 2.3.1 commander: 2.14.1 diff: 3.4.0 glob: 7.1.2 @@ -3541,7 +3363,7 @@ packages: resolve: 1.5.0 semver: 5.5.0 tslib: 1.9.0 - tsutils: 2.21.0 + tsutils: 2.21.1 dev: true engines: node: '>=4.8.0' @@ -3549,14 +3371,14 @@ packages: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev' resolution: integrity: sha1-ElX4ej/1frCw4fDmEKi0dIBGya4= - /tsutils/2.21.0: + /tsutils/2.21.1: dependencies: tslib: 1.9.0 dev: true peerDependencies: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev' resolution: - integrity: sha512-zlOHTYtTwvTiKxUyAU8wiKzPpAgwZrGjb7AY18VUlxuCgBiTMVorIl5HjrCT8V64Hm34RI1BZITJMVQpBLMxVg== + integrity: sha512-heMkdeQ9iUc90ynfiNo5Y+GXrEEGy86KMvnSTfHO+Q40AuNQ1lZGXcv58fuU9XTUxI0V7YIN9xPN+CO9b1Gn3w== /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.1.1 @@ -3572,12 +3394,12 @@ packages: dev: true resolution: integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - /typescript/2.7.1: + /typescript/2.7.2: dev: true engines: node: '>=4.2.0' resolution: - integrity: sha512-bqB1yS6o9TNA9ZC/MJxM0FZzPnZdtHj0xWK/IZ5khzVqdpGul/R/EIiHRgFXlwTD7PSIaYVnGKq1QgMCu2mnqw== + integrity: sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw== /uid-number/0.0.6: dev: true resolution: @@ -3607,9 +3429,9 @@ packages: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= /unpack-stream/3.0.1: dependencies: - '@types/node': 9.4.4 + '@types/node': 9.4.6 decompress-maybe: 1.0.0 - ssri: 5.2.1 + ssri: 5.2.4 tar-fs: 1.16.0 dev: true engines: @@ -3630,14 +3452,6 @@ packages: dev: true resolution: integrity: sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA== - /v8flags/3.0.1: - dependencies: - homedir-polyfill: 1.0.1 - dev: true - engines: - node: '>= 0.10.0' - resolution: - integrity: sha1-3Oj8N5wX2fLJ6e142JzgAFKxt2s= /validate-commit-msg/2.14.0: dependencies: conventional-commit-types: 2.2.0 @@ -3679,11 +3493,6 @@ packages: node: '>=4' resolution: integrity: sha512-FYMSYiI76Pd8twRTtV/DBmDkZcrMqET3ar5G+alR7/VQgo2iwnu1xlgzpvaWUCwdx5R+mq8HxgFeSnJpssV17A== - /which-pm-runs/1.0.0: - dev: true - optional: true - resolution: - integrity: sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= /which/1.3.0: dependencies: isexe: 2.0.0 @@ -3726,7 +3535,7 @@ packages: dependencies: detect-indent: 5.0.0 graceful-fs: 4.1.11 - make-dir: 1.1.0 + make-dir: 1.2.0 pify: 3.0.0 sort-keys: 2.0.0 write-file-atomic: 2.3.0 @@ -3809,7 +3618,7 @@ specifiers: stacktracey: ^1.2.87 supi: ^0.12.5 tape: ^4.8.0 - ts-node: ^4.0.2 + ts-node: ^5.0.0 tslint: ^5.7.0 typescript: ^2.6.2 validate-commit-msg: ^2.8.2 From afcbe410d93ea908cbc7b6c6a3697ea826ea0581 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 28 Feb 2018 02:19:25 +0200 Subject: [PATCH 146/196] fix: add supi@0.13 to the peer dependency range --- package.json | 2 +- shrinkwrap.yaml | 89 +++++++++++++++++++++++++++---------------------- 2 files changed, 50 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index 6f4eb2c615..851a8f3b09 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "supi": ">=0.12.5 <0.13.0" + "supi": ">=0.12.5 <0.14.0" }, "dependencies": { "@types/common-tags": "^1.2.5", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 9264d978a4..a522360480 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,7 +1,7 @@ dependencies: '@types/common-tags': 1.4.0 '@types/node': 9.4.6 - '@types/ramda': 0.25.18 + '@types/ramda': 0.25.19 '@types/semver': 5.5.0 ansi-diff: 1.0.10 chalk: 2.3.1 @@ -25,7 +25,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.5 rimraf: 2.6.2 - supi: 0.12.9 + supi: 0.12.14 tape: 4.9.0 ts-node: 5.0.0 tslint: 5.9.1 @@ -94,7 +94,7 @@ packages: node: '>=4' resolution: integrity: sha512-23FWOXgCkJ9q73mIqS5H/x98uaZcvO7ov/nt0HZGgLci3MHsqBgEfh3UzZiLZIxlxmA3XoUp4fgbjM7S96pBRg== - /@pnpm/package-requester/0.8.1: + /@pnpm/package-requester/0.8.3: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fetcher-base': 1.0.0 @@ -123,7 +123,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-F8unfpTfTDp4LF3bCeBnJvkhM90goad1sYCe2gzcD0nHtzhJXy2wKxdE2odhr59J0GF4scn4X7lQquX3wt+mtw== + integrity: sha512-vZbp8MP3xpAtXlzknUvTTFer6szfDbQiUwf3DKMYcNu30n16SplLYZV4hoLr5SsXwGuyY7SG+ypKyQAOHr/yLQ== /@pnpm/pkgid-to-filename/1.0.0: dependencies: normalize-path: 2.1.1 @@ -159,12 +159,12 @@ packages: /@types/common-tags/1.4.0: resolution: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== - /@types/fs-extra/5.0.0: + /@types/fs-extra/5.0.1: dependencies: '@types/node': 9.4.6 dev: true resolution: - integrity: sha512-qtxDULQKUenuaDLW003CgC+0T0eiAfH3BrH+vSt87GLzbz5EZ6Ox6mv9rMttvhDOatbb9nYh0E1m7ydoYwUrAg== + integrity: sha512-h3wnflb+jMTipvbbZnClgA2BexrT4w0GcfoCz5qyxd0IRsbqhLSyesM6mqZTAnhbVmhyTm5tuxfRu9R+8l+lGw== /@types/got/7.1.7: dependencies: '@types/node': 9.4.6 @@ -206,9 +206,9 @@ packages: dev: true resolution: integrity: sha512-dwv960sf5inFWiufjhDfK7ZG3nYyHXt58I+14bJJBKV5MPlZm6Tu1sQS63NWEtLpIw6+RhbNbXjNStdMXxR8Nw== - /@types/ramda/0.25.18: + /@types/ramda/0.25.19: resolution: - integrity: sha512-oNWqu5shcOj+R7Co9jLFqo4r37hy5qjKrOUEtMhwHa9rnxX8u60h1SF7ShdFluXyNaRkai0PLFCXOiolOWA+3g== + integrity: sha512-vbUI5wJQyboG/7G/IYBd6Qfla3woTh6eRETYBYjBcJZ1PO+QNnLWjV57sTANiwABsYqNe2shx0Xz3EQmbd0CKA== /@types/rc/0.0.1: dev: true resolution: @@ -256,7 +256,7 @@ packages: /ajv/5.5.2: dependencies: co: 4.6.0 - fast-deep-equal: 1.0.0 + fast-deep-equal: 1.1.0 fast-json-stable-stringify: 2.0.0 json-schema-traverse: 0.3.1 dev: true @@ -1066,10 +1066,10 @@ packages: '0': node >=0.6.0 resolution: integrity: sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= - /fast-deep-equal/1.0.0: + /fast-deep-equal/1.1.0: dev: true resolution: - integrity: sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8= + integrity: sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ= /fast-json-stable-stringify/2.0.0: dev: true resolution: @@ -2117,7 +2117,7 @@ packages: hosted-git-info: 2.5.0 is-builtin-module: 1.0.0 semver: 5.5.0 - validate-npm-package-license: 3.0.1 + validate-npm-package-license: 3.0.3 dev: true resolution: integrity: sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== @@ -2346,7 +2346,7 @@ packages: /package-preview/1.0.5: dependencies: '@pnpm/exec': 1.1.4 - '@types/fs-extra': 5.0.0 + '@types/fs-extra': 5.0.1 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 '@types/node': 9.4.6 @@ -2367,17 +2367,17 @@ packages: node: '>=4' resolution: integrity: sha512-Qmhr23K9e2jI4LK4MU2be4xWX0CyniBDwmyCi6K+3lTZtryd2r29Wh6wPXo6wdP++jNsJ5ayZT4yJlZWVHnluQ== - /package-store/0.17.1: + /package-store/0.17.2: dependencies: '@pnpm/fetcher-base': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/package-requester': 0.8.1 + '@pnpm/package-requester': 0.8.3 '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 '@types/node': 9.4.6 - '@types/ramda': 0.25.18 + '@types/ramda': 0.25.19 encode-registry: 1.1.0 load-json-file: 4.0.0 mkdirp-promise: 5.0.1 @@ -2398,7 +2398,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-hDvHXUR0D5r5fXQpR+HVgHBuinWs4s8WsQ42WtYLq3anOdR14B2zs7aG9YVUw3UXZpBuiJ1HYplsiQWhYRPl1Q== + integrity: sha512-k3nJjNtVlUKZtzTNrXwni/GigzYtNj13uXc77fnWx8+fJXbNd3E0rqt8Wh557fO3ENTUOwV3aG1XWWowXOn+cA== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -2551,7 +2551,7 @@ packages: /pnpm-shrinkwrap/5.3.0: dependencies: '@types/node': 9.4.6 - '@types/ramda': 0.25.18 + '@types/ramda': 0.25.19 dependency-path: 1.2.0 js-yaml: 3.10.0 load-yaml-file: 0.1.0 @@ -2800,7 +2800,7 @@ packages: qs: 6.5.1 safe-buffer: 5.1.1 stringstream: 0.0.5 - tough-cookie: 2.3.3 + tough-cookie: 2.3.4 tunnel-agent: 0.6.0 uuid: 3.2.1 dev: true @@ -2995,20 +2995,28 @@ packages: dev: true resolution: integrity: sha1-sAeZVX63+wyDdsKdROih6mfldHY= - /spdx-correct/1.0.2: + /spdx-correct/3.0.0: dependencies: - spdx-license-ids: 1.2.2 + spdx-expression-parse: 3.0.0 + spdx-license-ids: 3.0.0 dev: true resolution: - integrity: sha1-SzBz2TP/UfORLwOsVRlJikFQ20A= - /spdx-expression-parse/1.0.4: + integrity: sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g== + /spdx-exceptions/2.1.0: dev: true resolution: - integrity: sha1-m98vIOH0DtRH++JzJmGR/O1RYmw= - /spdx-license-ids/1.2.2: + integrity: sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg== + /spdx-expression-parse/3.0.0: + dependencies: + spdx-exceptions: 2.1.0 + spdx-license-ids: 3.0.0 dev: true resolution: - integrity: sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc= + integrity: sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== + /spdx-license-ids/3.0.0: + dev: true + resolution: + integrity: sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA== /split2/2.2.0: dependencies: through2: 2.0.3 @@ -3120,11 +3128,11 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.12.9: + /supi/0.12.14: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/package-requester': 0.8.1 + '@pnpm/package-requester': 0.8.3 '@pnpm/pkgid-to-filename': 1.0.0 '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 @@ -3136,7 +3144,7 @@ packages: '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 - '@types/ramda': 0.25.18 + '@types/ramda': 0.25.19 '@types/rc': 0.0.1 '@types/semver': 5.5.0 '@types/update-notifier': 1.0.3 @@ -3166,7 +3174,7 @@ packages: p-filter: 1.0.0 p-limit: 1.2.0 p-series: 1.0.0 - package-store: 0.17.1 + package-store: 0.17.2 path-absolute: 1.0.0 path-exists: 3.0.0 path-name: 1.0.0 @@ -3176,6 +3184,7 @@ packages: read-package-json: 2.0.12 remove-all-except-outer-links: 1.0.3 replace-string: 1.1.0 + resolve-link-target: 1.0.1 rimraf-then: 1.0.1 semver: 5.5.0 symlink-dir: 1.1.2 @@ -3190,7 +3199,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-LElHPa9VBu/4WpaHMWSrTbQ7EBYXaPTrki4MFKfvM755cfhAwt79DHICDlcidOQluiKJGul8l1SZQ9XMQmiVag== + integrity: sha512-PL/sRzHC1JnqLyiprH9tUurpeetkjRVDM8zbrE1RrFOdNOMuoEA63vJtLgHlFyJB6RmPsx3W2ZeIrmwwk8SwHw== /supports-color/0.2.0: dev: true engines: @@ -3317,14 +3326,14 @@ packages: node: '>=0.4.0' resolution: integrity: sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA= - /tough-cookie/2.3.3: + /tough-cookie/2.3.4: dependencies: punycode: 1.4.1 dev: true engines: node: '>=0.8' resolution: - integrity: sha1-C2GKVWW23qkL80JdBNVe3EdadWE= + integrity: sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA== /trim-newlines/2.0.0: dev: true engines: @@ -3363,7 +3372,7 @@ packages: resolve: 1.5.0 semver: 5.5.0 tslib: 1.9.0 - tsutils: 2.21.1 + tsutils: 2.21.2 dev: true engines: node: '>=4.8.0' @@ -3371,14 +3380,14 @@ packages: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev' resolution: integrity: sha1-ElX4ej/1frCw4fDmEKi0dIBGya4= - /tsutils/2.21.1: + /tsutils/2.21.2: dependencies: tslib: 1.9.0 dev: true peerDependencies: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev' resolution: - integrity: sha512-heMkdeQ9iUc90ynfiNo5Y+GXrEEGy86KMvnSTfHO+Q40AuNQ1lZGXcv58fuU9XTUxI0V7YIN9xPN+CO9b1Gn3w== + integrity: sha512-iaIuyjIUeFLdD39MYdzqBuY7Zv6+uGxSwRH4mf+HuzsnznjFz0R2tGrAe0/JvtNh91WrN8UN/DZRFTZNDuVekA== /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.1.1 @@ -3462,13 +3471,13 @@ packages: dev: true resolution: integrity: sha1-5Tg2kQEsuycNzAvCpO/+vhSJDqw= - /validate-npm-package-license/3.0.1: + /validate-npm-package-license/3.0.3: dependencies: - spdx-correct: 1.0.2 - spdx-expression-parse: 1.0.4 + spdx-correct: 3.0.0 + spdx-expression-parse: 3.0.0 dev: true resolution: - integrity: sha1-KAS6vnEq0zeUWaz74kdGqywwP7w= + integrity: sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g== /validate-npm-package-name/3.0.0: dependencies: builtins: 1.0.3 From 352c58b51305d264a20d8a91157d3d4ca3eeded4 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 28 Feb 2018 02:19:49 +0200 Subject: [PATCH 147/196] chore(release): 0.14.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 851a8f3b09..55faaaab5f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.14.2", + "version": "0.14.3", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 4af760d2737a99379a87a29a13781559b39760f0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 28 Feb 2018 00:22:04 +0000 Subject: [PATCH 148/196] chore(deps): update dependency supi to ^0.13.0 --- package.json | 2 +- shrinkwrap.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 55faaaab5f..650e164736 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.12.5", + "supi": "^0.13.0", "tape": "^4.8.0", "ts-node": "^5.0.0", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index a522360480..2fb77b98f6 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -25,7 +25,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.5 rimraf: 2.6.2 - supi: 0.12.14 + supi: 0.13.0 tape: 4.9.0 ts-node: 5.0.0 tslint: 5.9.1 @@ -3128,7 +3128,7 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.12.14: + /supi/0.13.0: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 @@ -3199,7 +3199,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-PL/sRzHC1JnqLyiprH9tUurpeetkjRVDM8zbrE1RrFOdNOMuoEA63vJtLgHlFyJB6RmPsx3W2ZeIrmwwk8SwHw== + integrity: sha512-6JxN85Kv7VNSHbW6lKmqxxSWJTnwqK6u+DuGyvTU2rWn0TtkXPZSB8OCa9s+ohf52QmlsHVCQWDKLc5gpNO8Vg== /supports-color/0.2.0: dev: true engines: @@ -3625,7 +3625,7 @@ specifiers: rimraf: ^2.5.4 semver: ^5.4.1 stacktracey: ^1.2.87 - supi: ^0.12.5 + supi: ^0.13.0 tape: ^4.8.0 ts-node: ^5.0.0 tslint: ^5.7.0 From 847ef8ab2bd51ddf948debe8dd2fdc0c77b8deb4 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 5 Mar 2018 07:51:47 +0000 Subject: [PATCH 149/196] chore(deps): update dependency supi to >=0.12.5 <0.15.0 --- package.json | 4 +- shrinkwrap.yaml | 100 ++++++++++++++++++++++++------------------------ 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index 650e164736..728bc0dca6 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "supi": ">=0.12.5 <0.14.0" + "supi": ">=0.12.5 <0.15.0" }, "dependencies": { "@types/common-tags": "^1.2.5", @@ -68,7 +68,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.13.0", + "supi": "^0.14.0", "tape": "^4.8.0", "ts-node": "^5.0.0", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 2fb77b98f6..ae77acb7ff 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -4,7 +4,7 @@ dependencies: '@types/ramda': 0.25.19 '@types/semver': 5.5.0 ansi-diff: 1.0.10 - chalk: 2.3.1 + chalk: 2.3.2 cli-cursor: 2.1.0 common-tags: 1.7.2 most: 1.7.3 @@ -25,9 +25,9 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.5 rimraf: 2.6.2 - supi: 0.13.0 + supi: 0.14.0 tape: 4.9.0 - ts-node: 5.0.0 + ts-node: 5.0.1 tslint: 5.9.1 typescript: 2.7.2 validate-commit-msg: 2.14.0 @@ -56,7 +56,7 @@ packages: integrity: sha512-rN+hiOjGtxwwus7c/E0xkCs9prBeXzZCSCW/Q3k2WdHGSRNLAepr777iv+i2eqTfz9vXlTF0rLZOGi62ujzwYA== /@pnpm/exec/1.1.4: dependencies: - '@pnpm/self-installer': 2.0.1 + '@pnpm/self-installer': 2.0.2 '@types/got': 7.1.7 '@types/node': 9.4.6 command-exists: 1.2.2 @@ -140,12 +140,12 @@ packages: node: '>=4' resolution: integrity: sha512-+y47No75LZFnkN7VAnoEtkIzDgOuc8ZT4QjyhuNIBVLx4oqFa/R16DpSyRjmaTZMCSREXunObULKL/hoLipNDA== - /@pnpm/self-installer/2.0.1: + /@pnpm/self-installer/2.0.2: dev: true engines: node: '>=4' resolution: - integrity: sha512-ZnWWMPCCewTSI+1cNrRNCAGsVsdzFvN1+WU8GkjtvwAW2lnBpIVZm4MHQBI3basFYn7DWCs4lBihGuH1DiCAAg== + integrity: sha1-hbuHZMfM0iOZn2FCGQBixibo8oc= /@pnpm/types/1.7.0: dev: true resolution: @@ -310,13 +310,13 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= - /ansi-styles/3.2.0: + /ansi-styles/3.2.1: dependencies: color-convert: 1.9.1 engines: node: '>=4' resolution: - integrity: sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug== + integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== /any-promise/1.3.0: dev: true resolution: @@ -328,7 +328,7 @@ packages: /are-we-there-yet/1.1.4: dependencies: delegates: 1.0.0 - readable-stream: 2.3.4 + readable-stream: 2.3.5 dev: true resolution: integrity: sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0= @@ -431,7 +431,7 @@ packages: integrity: sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40= /bl/1.2.1: dependencies: - readable-stream: 2.3.4 + readable-stream: 2.3.5 dev: true resolution: integrity: sha1-ysMo977kVzDUBLaSID/LWQ4XLV4= @@ -573,15 +573,15 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - /chalk/2.3.1: + /chalk/2.3.2: dependencies: - ansi-styles: 3.2.0 + ansi-styles: 3.2.1 escape-string-regexp: 1.0.5 - supports-color: 5.2.0 + supports-color: 5.3.0 engines: node: '>=4' resolution: - integrity: sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g== + integrity: sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ== /chownr/1.0.1: dev: true resolution: @@ -700,16 +700,16 @@ packages: dev: true resolution: integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - /concat-stream/1.6.0: + /concat-stream/1.6.1: dependencies: inherits: 2.0.3 - readable-stream: 2.3.4 + readable-stream: 2.3.5 typedarray: 0.0.6 dev: true engines: '0': node >= 0.8 resolution: - integrity: sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc= + integrity: sha512-gslSSJx03QKa59cIKqeJO9HQ/WZMotvYJCuaUULrLpjj8oG40kV2Z+gz82pVxlTkOADi4PJxQPPfhl1ELYrrXw== /console-control-strings/1.1.0: dev: true resolution: @@ -732,7 +732,7 @@ packages: dev: true resolution: integrity: sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= - /cross-spawn/6.0.4: + /cross-spawn/6.0.5: dependencies: nice-try: 1.0.4 path-key: 2.0.1 @@ -743,7 +743,7 @@ packages: engines: node: '>=4.8' resolution: - integrity: sha512-LDYnK41m8td+nBTk5Jmn55aGVP18iYuUqoM1X3u+ptt7M/g9FPS8C38PNoJTMfjoNx4fmiwWToPpiZklGRLbIA== + integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== /cryptiles/3.1.2: dependencies: boom: 5.2.0 @@ -889,12 +889,12 @@ packages: node: '>=0.3.1' resolution: integrity: sha1-YOr9DSjukG5Oj/ClLBIpUhAzv5k= - /diff/3.4.0: + /diff/3.5.0: dev: true engines: node: '>=0.3.1' resolution: - integrity: sha512-QpVuMTEoJMF7cKzi6bvWhRulU1fZqZnvyVQgNhPaxxuTYwyjn/j1v9falseQ/uXWwPnO56RBfwtg4h/EQXmucA== + integrity: sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA== /dint/2.0.2: dependencies: graceful-fs: 4.1.11 @@ -911,15 +911,15 @@ packages: dev: true resolution: integrity: sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= - /duplexify/3.5.3: + /duplexify/3.5.4: dependencies: end-of-stream: 1.4.1 inherits: 2.0.3 - readable-stream: 2.3.4 + readable-stream: 2.3.5 stream-shift: 1.0.0 dev: true resolution: - integrity: sha512-g8ID9OroF9hKt2POf8YLayy+9594PzmM3scI00/uBXocX3TWNgoB67hjzkFe9ITAbQOne/lLdBxHXvYUM4ZgGA== + integrity: sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA== /ecc-jsbn/0.1.1: dependencies: jsbn: 0.1.1 @@ -2351,7 +2351,7 @@ packages: '@types/mz': 0.0.32 '@types/node': 9.4.6 '@types/write-json-file': 2.2.1 - cross-spawn: 6.0.4 + cross-spawn: 6.0.5 find-down: 0.1.4 fs-extra: 5.0.0 graceful-fs: 4.1.11 @@ -2501,7 +2501,7 @@ packages: integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== /peek-stream/1.1.2: dependencies: - duplexify: 3.5.3 + duplexify: 3.5.4 through2: 2.0.3 dev: true resolution: @@ -2548,7 +2548,7 @@ packages: dev: true resolution: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= - /pnpm-shrinkwrap/5.3.0: + /pnpm-shrinkwrap/6.0.0: dependencies: '@types/node': 9.4.6 '@types/ramda': 0.25.19 @@ -2566,7 +2566,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-WdBYsVsaRbKLnU7Vb7QAk2SE9UAD0j0AaWcv5VTX1ky2bJWqF1JE5NJSpedyL/rTr3eBNQiqM5nzV+WbzX0mUQ== + integrity: sha512-c+GWM0deEHpp5nb2RG6FXyl2jX04lwiOAG14+hMhtYg6BwyDqdK9gURIxCwcgXZFifj2X5rze+6eOAYUSkghtQ== /preserve/0.2.0: dev: true engines: @@ -2625,7 +2625,7 @@ packages: integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== /pumpify/1.4.0: dependencies: - duplexify: 3.5.3 + duplexify: 3.5.4 inherits: 2.0.3 pump: 2.0.1 dev: true @@ -2689,7 +2689,7 @@ packages: node: '>=4' resolution: integrity: sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= - /readable-stream/2.3.4: + /readable-stream/2.3.5: dependencies: core-util-is: 1.0.2 inherits: 2.0.3 @@ -2699,7 +2699,7 @@ packages: string_decoder: 1.0.3 util-deprecate: 1.0.2 resolution: - integrity: sha512-vuYxeWYM+fde14+rajzqgeohAI7YoJcHE7kXDAc4Nk0EbuKnJfqtY9YtRkLo/tqkuF7MsBQRhPnPeyjYITp3ZQ== + integrity: sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw== /rechoir/0.6.2: dependencies: resolve: 1.5.0 @@ -2990,7 +2990,7 @@ packages: integrity: sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A= /spawn-sync/1.0.15: dependencies: - concat-stream: 1.6.0 + concat-stream: 1.6.1 os-shim: 0.1.3 dev: true resolution: @@ -3128,7 +3128,7 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.13.0: + /supi/0.14.0: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 @@ -3179,7 +3179,7 @@ packages: path-exists: 3.0.0 path-name: 1.0.0 pnpm-install-checks: 1.1.0 - pnpm-shrinkwrap: 5.3.0 + pnpm-shrinkwrap: 6.0.0 ramda: 0.25.0 read-package-json: 2.0.12 remove-all-except-outer-links: 1.0.3 @@ -3199,7 +3199,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-6JxN85Kv7VNSHbW6lKmqxxSWJTnwqK6u+DuGyvTU2rWn0TtkXPZSB8OCa9s+ohf52QmlsHVCQWDKLc5gpNO8Vg== + integrity: sha512-daxMDjqsq0WbUmgM2zaSiRblwPovPP8qtLAMZp2xeFxSbRwIXgBAAAkeJxAoMwKPL5EeKR8RfK0dBLTYKVOxQg== /supports-color/0.2.0: dev: true engines: @@ -3212,13 +3212,13 @@ packages: node: '>=0.8.0' resolution: integrity: sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - /supports-color/5.2.0: + /supports-color/5.3.0: dependencies: has-flag: 3.0.0 engines: node: '>=4' resolution: - integrity: sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q== + integrity: sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg== /symbol-observable/1.2.0: dev: false engines: @@ -3245,7 +3245,7 @@ packages: js-yaml: 3.10.0 dev: true optionalDependencies: - readable-stream: 2.3.4 + readable-stream: 2.3.5 resolution: integrity: sha1-EgxQiciMPIp5PvKIhn3jIeGPjCI= /tape/4.9.0: @@ -3279,7 +3279,7 @@ packages: dependencies: bl: 1.2.1 end-of-stream: 1.4.1 - readable-stream: 2.3.4 + readable-stream: 2.3.5 xtend: 4.0.1 dev: true engines: @@ -3314,7 +3314,7 @@ packages: integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= /through2/2.0.3: dependencies: - readable-stream: 2.3.4 + readable-stream: 2.3.5 xtend: 4.0.1 resolution: integrity: sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= @@ -3340,11 +3340,11 @@ packages: node: '>=4' resolution: integrity: sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= - /ts-node/5.0.0: + /ts-node/5.0.1: dependencies: arrify: 1.0.1 - chalk: 2.3.1 - diff: 3.4.0 + chalk: 2.3.2 + diff: 3.5.0 make-error: 1.3.4 minimist: 1.2.0 mkdirp: 0.5.1 @@ -3354,7 +3354,7 @@ packages: engines: node: '>=4.2.0' resolution: - integrity: sha512-mlSim/sQS1s5iT3KZEKXRaqsGC7xM2QoxkrhfznZJyou18dl47PTnY7/KMmbGqiVoQrO9Hk53CYpcychF5TNrQ== + integrity: sha512-XK7QmDcNHVmZkVtkiwNDWiERRHPyU8nBqZB1+iv2UhOG0q3RQ9HsZ2CMqISlFbxjrYFGfG2mX7bW4dAyxBVzUw== /tslib/1.9.0: dev: true resolution: @@ -3363,16 +3363,16 @@ packages: dependencies: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 - chalk: 2.3.1 + chalk: 2.3.2 commander: 2.14.1 - diff: 3.4.0 + diff: 3.5.0 glob: 7.1.2 js-yaml: 3.10.0 minimatch: 3.0.4 resolve: 1.5.0 semver: 5.5.0 tslib: 1.9.0 - tsutils: 2.21.2 + tsutils: 2.22.2 dev: true engines: node: '>=4.8.0' @@ -3380,14 +3380,14 @@ packages: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev' resolution: integrity: sha1-ElX4ej/1frCw4fDmEKi0dIBGya4= - /tsutils/2.21.2: + /tsutils/2.22.2: dependencies: tslib: 1.9.0 dev: true peerDependencies: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev' resolution: - integrity: sha512-iaIuyjIUeFLdD39MYdzqBuY7Zv6+uGxSwRH4mf+HuzsnznjFz0R2tGrAe0/JvtNh91WrN8UN/DZRFTZNDuVekA== + integrity: sha512-u06FUSulCJ+Y8a2ftuqZN6kIGqdP2yJjUPEngXqmdPND4UQfb04igcotH+dw+IFr417yP6muCLE8/5/Qlfnx0w== /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.1.1 @@ -3625,7 +3625,7 @@ specifiers: rimraf: ^2.5.4 semver: ^5.4.1 stacktracey: ^1.2.87 - supi: ^0.13.0 + supi: ^0.14.0 tape: ^4.8.0 ts-node: ^5.0.0 tslint: ^5.7.0 From 5d25ad9dbb16b449dd4dab1bd770723b2935c1b4 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 5 Mar 2018 10:16:55 +0200 Subject: [PATCH 150/196] chore(release): 0.14.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 728bc0dca6..5e0ab77dca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.14.3", + "version": "0.14.4", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From c0148344b7533aee5fd208de13f2cecd7b81a353 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Thu, 8 Mar 2018 23:54:08 +0200 Subject: [PATCH 151/196] fix: make no progress logs after all downloaded ref pnpm/pnpm#1028 --- src/reporterForClient.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index dfd4f66098..a3b566b513 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -98,6 +98,7 @@ export default function ( const msg = `Resolving: total ${hlValue(resolving.toString())}, reused ${hlValue(foundInStore.toString())}, downloaded ${hlValue(fetched.toString())}` if (resolving === foundInStore + fetched && resolutionDone) { return { + done: true, fixed: false, msg: `${msg}, done`, } @@ -127,6 +128,10 @@ export default function ( foundInStoreLog$, resolutionDone$, ) + // Avoid logs after all resolved packages were downloaded. + // Related issue: https://github.com/pnpm/pnpm/issues/1028#issuecomment-364782901 + .skipAfter((msg) => msg.done === true) + outputs.push(most.of(progress)) } else { const progress = most.combine( From 7ae659608b7cbcdc0d1ded00c9776e51427cfa5e Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 9 Mar 2018 00:00:04 +0200 Subject: [PATCH 152/196] chore(release): 0.14.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5e0ab77dca..9c9a9b1861 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.14.4", + "version": "0.14.5", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From f6e9f1b904c67b6a5b76072e6115f2daf9391fcf Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 9 Mar 2018 02:08:45 +0200 Subject: [PATCH 153/196] fix: when retrying download, keep the existing progress line ref pnpm/pnpm#1013 --- src/reporterForClient.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index a3b566b513..79238bbc77 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -147,7 +147,10 @@ export default function ( if (!appendOnly) { const tarballsProgressOutput$ = log$.progress .filter((log) => log.status === 'fetching_started' && - typeof log.size === 'number' && log.size >= BIG_TARBALL_SIZE) + typeof log.size === 'number' && log.size >= BIG_TARBALL_SIZE && + // When retrying the download, keep the existing progress line. + // Fixing issue: https://github.com/pnpm/pnpm/issues/1013 + log.attempt === 1) .map((startedLog) => { const size = prettyBytes(startedLog['size']) return log$.progress From a8ce209a619a4b45ee014550a8b8eab6025f04f7 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 9 Mar 2018 02:09:06 +0200 Subject: [PATCH 154/196] refactore: update comment --- src/reporterForClient.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 79238bbc77..7d073a6e09 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -129,7 +129,7 @@ export default function ( resolutionDone$, ) // Avoid logs after all resolved packages were downloaded. - // Related issue: https://github.com/pnpm/pnpm/issues/1028#issuecomment-364782901 + // Fixing issue: https://github.com/pnpm/pnpm/issues/1028#issuecomment-364782901 .skipAfter((msg) => msg.done === true) outputs.push(most.of(progress)) From 19180f18964b132e5b97018cd75acc4402a06645 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 9 Mar 2018 02:09:27 +0200 Subject: [PATCH 155/196] chore: update shrinkwrap.yaml --- shrinkwrap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index ae77acb7ff..4a5b35a833 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -10,6 +10,7 @@ dependencies: most: 1.7.3 most-last: 1.0.0 ndjson: 1.5.0 + pnpm-default-reporter: 'link:../__package_previews__/pnpm-default-reporter/pnpm-default-reporter' pretty-bytes: 4.0.2 ramda: 0.25.0 semver: 5.5.0 From 0e2a14d827fccf9fdf60997446e71119797c7e70 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 9 Mar 2018 02:14:07 +0200 Subject: [PATCH 156/196] chore(release): 0.14.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9c9a9b1861..6e983e1790 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.14.5", + "version": "0.14.6", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 8515ad1f883ae6b05b7340488f1959501c08ec3b Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 17 Mar 2018 14:26:41 +0200 Subject: [PATCH 157/196] fix: print summary even if update package not logged --- src/pkgsDiff.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pkgsDiff.ts b/src/pkgsDiff.ts index 30afc8313f..9414f2fa1b 100644 --- a/src/pkgsDiff.ts +++ b/src/pkgsDiff.ts @@ -97,7 +97,12 @@ export default function ( }) const packageJson$ = most.fromPromise( - log$.packageJson.take(2).reduce(R.merge, {}), + most.merge( + log$.packageJson, + log$.summary.constant({}), + ) + .take(2) + .reduce(R.merge, {}), ) return most.combine( From 6d8e5cbb27f611a6ed146b97b7d62550d1a3e4c7 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 17 Mar 2018 14:37:24 +0200 Subject: [PATCH 158/196] fix: "Already up-to-date" message relies on stats --- src/reporterForClient.ts | 20 +------------------- test/index.ts | 3 ++- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 7d073a6e09..e6c07457a2 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -68,24 +68,6 @@ export default function ( .skip(1) .until(mostLast(resolutionDone$)) - if (!isRecursive) { - const alreadyUpToDate$ = most.of( - mostLast( - resolvingContentLog$ - .take(1) - .constant(false) - .startWith(true), - ) - .filter(R.equals(true)) - .constant({ - fixed: false, - msg: 'Already up-to-date', - }), - ) - - outputs.push(alreadyUpToDate$) - } - const fedtchedLog$ = log$.progress .filter((log) => log.status === 'fetched') .scan(R.inc, 0) @@ -249,7 +231,7 @@ export default function ( ) .map((stats) => { if (!stats['removed'] && !stats['added']) { - return most.empty() + return most.of({msg: 'Already up-to-date'}) } let addSigns = (stats['added'] || 0) diff --git a/test/index.ts b/test/index.ts index 79ea375ec4..2466ee2f4e 100644 --- a/test/index.ts +++ b/test/index.ts @@ -158,7 +158,8 @@ test('moves fixed line to the end', async t => { test('prints "Already up-to-date"', t => { const output$ = toOutput$(createStreamParser()) - stageLogger.debug('resolution_done') + statsLogger.debug({ added: 0 }) + statsLogger.debug({ removed: 0 }) t.plan(1) From b7a4929d64f157f8a42c45de427f4f2afd16e7c5 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 17 Mar 2018 15:29:58 +0200 Subject: [PATCH 159/196] fix: progress logging ends when importing is done --- src/reporterForClient.ts | 25 ++++++++++++++----------- test/index.ts | 1 + 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index e6c07457a2..db6d5ffaf3 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -58,15 +58,12 @@ export default function ( ? most.never() : log$.stage .filter((log) => log.message === 'resolution_done') - .constant(true) - .take(1) - .startWith(false) const resolvingContentLog$ = log$.progress .filter((log) => log.status === 'resolving_content') .scan(R.inc, 0) .skip(1) - .until(mostLast(resolutionDone$)) + .until(resolutionDone$) const fedtchedLog$ = log$.progress .filter((log) => log.status === 'fetched') @@ -76,9 +73,9 @@ export default function ( .filter((log) => log.status === 'found_in_store') .scan(R.inc, 0) - function createStatusMessage (resolving: number, fetched: number, foundInStore: number, resolutionDone: boolean) { + function createStatusMessage (resolving: number, fetched: number, foundInStore: number, importingDone: boolean) { const msg = `Resolving: total ${hlValue(resolving.toString())}, reused ${hlValue(foundInStore.toString())}, downloaded ${hlValue(fetched.toString())}` - if (resolving === foundInStore + fetched && resolutionDone) { + if (importingDone) { return { done: true, fixed: false, @@ -91,15 +88,21 @@ export default function ( } } + const importingDone$ = log$.stage.filter((log) => log.message === 'importing_done') + .constant(true) + .take(1) + .startWith(false) + .multicast() + if (!isRecursive && typeof throttleProgress === 'number' && throttleProgress > 0) { - const importingDone$ = log$.stage.filter((log) => log.message === 'importing_done').multicast() - const resolutionStarted$ = log$.stage.filter((log) => log.message === 'resolution_started') + const resolutionStarted$ = log$.stage + .filter((log) => log.message === 'resolution_started' || log.message === 'importing_started').take(1) const commandDone$ = log$.cli.filter((log) => log['message'] === 'command_done') // Reporting is done every `throttleProgress` milliseconds // and once all packages are fetched. const sampler = most.merge( - most.periodic(throttleProgress).since(resolutionStarted$).until(most.merge(importingDone$, commandDone$)), + most.periodic(throttleProgress).since(resolutionStarted$).until(most.merge<{}>(importingDone$.skip(1), commandDone$)), importingDone$, ) const progress = most.sample( @@ -108,7 +111,7 @@ export default function ( resolvingContentLog$, fedtchedLog$, foundInStoreLog$, - resolutionDone$, + importingDone$, ) // Avoid logs after all resolved packages were downloaded. // Fixing issue: https://github.com/pnpm/pnpm/issues/1028#issuecomment-364782901 @@ -121,7 +124,7 @@ export default function ( resolvingContentLog$, fedtchedLog$, foundInStoreLog$, - isRecursive ? most.of(false) : resolutionDone$, + isRecursive ? most.of(false) : importingDone$, ) outputs.push(most.of(progress)) } diff --git a/test/index.ts b/test/index.ts index 2466ee2f4e..c2a0992086 100644 --- a/test/index.ts +++ b/test/index.ts @@ -151,6 +151,7 @@ test('moves fixed line to the end', async t => { await delay(0) // w/o delay warning goes below for some reason. Started to happen after switch to most stageLogger.debug('resolution_done') + stageLogger.debug('importing_done') t.plan(1) }) From 33c74c6e9cf7ea5743805e2bed2e24ba7188a1da Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 24 Mar 2018 15:22:51 +0200 Subject: [PATCH 160/196] chore(release): 0.14.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e983e1790..9ebe1bbfc2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.14.6", + "version": "0.14.7", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 9bffa92f81d9c5ba50fe1a4d0438683b56f24cff Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 3 Apr 2018 00:25:34 +0300 Subject: [PATCH 161/196] feat: better reporting for recursive operations BREAKING CHANGE: requires supi v0.15.0 ref pnpm/pnpm#1039 --- package.json | 7 +- shrinkwrap.yaml | 477 ++++++++++++++++++++++++--------------- src/reporterForClient.ts | 71 ++++-- test/index.ts | 106 +++++++++ typings/local.d.ts | 5 + 5 files changed, 464 insertions(+), 202 deletions(-) diff --git a/package.json b/package.json index 9ebe1bbfc2..b476674e36 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,14 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "supi": ">=0.12.5 <0.15.0" + "supi": ">=0.15.0 <0.16.0" }, "dependencies": { "@types/common-tags": "^1.2.5", "@types/node": "^9.3.0", "@types/ramda": "^0.25.6", "@types/semver": "^5.4.0", + "@types/strip-ansi": "^3.0.0", "ansi-diff": "^1.0.10", "chalk": "^2.2.0", "cli-cursor": "^2.1.0", @@ -54,8 +55,10 @@ "ndjson": "^1.5.0", "pretty-bytes": "^4.0.2", "ramda": "^0.25.0", + "right-pad": "^1.0.1", "semver": "^5.4.1", "stacktracey": "^1.2.87", + "strip-ansi": "^4.0.0", "zen-push": "^0.2.1" }, "devDependencies": { @@ -68,7 +71,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.14.0", + "supi": "^0.15.0", "tape": "^4.8.0", "ts-node": "^5.0.0", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 4a5b35a833..130c311bbc 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,9 +1,10 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 9.4.6 - '@types/ramda': 0.25.19 + '@types/node': 9.6.1 + '@types/ramda': 0.25.21 '@types/semver': 5.5.0 - ansi-diff: 1.0.10 + '@types/strip-ansi': 3.0.0 + ansi-diff: 1.1.0 chalk: 2.3.2 cli-cursor: 2.1.0 common-tags: 1.7.2 @@ -13,12 +14,14 @@ dependencies: pnpm-default-reporter: 'link:../__package_previews__/pnpm-default-reporter/pnpm-default-reporter' pretty-bytes: 4.0.2 ramda: 0.25.0 + right-pad: 1.0.1 semver: 5.5.0 stacktracey: 1.2.100 + strip-ansi: 4.0.0 zen-push: 0.2.1 devDependencies: '@pnpm/logger': 1.0.1 - '@types/tape': 4.2.31 + '@types/tape': 4.2.32 commitizen: 2.9.6 delay: 2.0.0 ghooks: 2.0.2 @@ -26,11 +29,11 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.5 rimraf: 2.6.2 - supi: 0.14.0 + supi: 0.15.0 tape: 4.9.0 ts-node: 5.0.1 tslint: 5.9.1 - typescript: 2.7.2 + typescript: 2.8.1 validate-commit-msg: 2.14.0 packages: /@most/multicast/1.3.0: @@ -58,8 +61,8 @@ packages: /@pnpm/exec/1.1.4: dependencies: '@pnpm/self-installer': 2.0.2 - '@types/got': 7.1.7 - '@types/node': 9.4.6 + '@types/got': 7.1.8 + '@types/node': 9.6.1 command-exists: 1.2.2 cross-spawn: 5.1.0 dev: true @@ -77,7 +80,7 @@ packages: integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== /@pnpm/fs-locker/1.0.1: dependencies: - '@types/node': 9.4.6 + '@types/node': 9.6.1 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: true @@ -85,9 +88,72 @@ packages: node: '>=4' resolution: integrity: sha512-gmM3SM6fBpssvbSD1U8wJbArNPiQchFzt90ICkfawo0OGQBYY6mgt+sqxF93E9yLfNY7WGtPJYhAQW3Uht6m7A== + /@pnpm/headless/0.1.10: + dependencies: + '@pnpm/lifecycle': 1.0.1 + '@pnpm/link-bins': 1.0.1 + '@pnpm/modules-yaml': 1.0.0 + '@pnpm/package-requester': 0.8.5 + '@pnpm/pkgid-to-filename': 1.0.0 + '@pnpm/types': 1.7.0 + '@types/ramda': 0.25.21 + dependency-path: 1.2.1 + graph-sequencer: 2.0.0 + p-limit: 1.2.0 + package-store: 0.18.0 + path-exists: 3.0.0 + pnpm-shrinkwrap: 6.2.4 + ramda: 0.25.0 + read-package-json: 2.0.13 + supi: 0.15.0 + symlink-dir: 1.1.2 + util.promisify: 1.0.0 + dev: true + engines: + node: '>=4' + peerDependencies: + '@pnpm/logger': ^1.0.0 + resolution: + integrity: sha512-LIWuQU5Ee0ijBs1nsJobdbIxUon6WOcOWpVgEM6gsHKKYEz7oncVHkg+Ode5IJGhVwXfA3DPs6IZb/eIWqyzUA== + /@pnpm/lifecycle/1.0.1: + dependencies: + '@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 + dev: true + engines: + node: '>=4' + peerDependencies: + '@pnpm/logger': ^1.0.0 + resolution: + integrity: sha512-/N3Oxfi6JMFVejmDvZqQO3kQfRZdClyznO5J+NMIFzembDHYC6wMzvhXAmlcrNC3TlyfK59gg0Qhaigb10tPHQ== + /@pnpm/link-bins/1.0.1: + dependencies: + '@pnpm/package-bins': 1.0.0 + '@pnpm/types': 1.7.0 + '@types/mz': 0.0.32 + '@types/ramda': 0.25.21 + '@zkochan/cmd-shim': 2.2.4 + arr-flatten: 1.1.0 + is-windows: 1.0.2 + mkdirp-promise: 5.0.1 + mz: 2.7.0 + normalize-path: 2.1.1 + p-filter: 1.0.0 + ramda: 0.25.0 + read-package-json: 2.0.13 + dev: true + engines: + node: '>=4' + peerDependencies: + '@pnpm/logger': ^1.0.0 + resolution: + integrity: sha512-6hHV7qwIxYizwpSfcSR5A/ChBkTdJYVvAxB70WYbdbj6Wc0enS2sOSuFWO8yhOUDpzBph6T+qTWYeZrlpFTqzA== /@pnpm/logger/1.0.1: dependencies: - '@types/node': 9.4.6 + '@types/node': 9.6.1 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -95,7 +161,27 @@ packages: node: '>=4' resolution: integrity: sha512-23FWOXgCkJ9q73mIqS5H/x98uaZcvO7ov/nt0HZGgLci3MHsqBgEfh3UzZiLZIxlxmA3XoUp4fgbjM7S96pBRg== - /@pnpm/package-requester/0.8.3: + /@pnpm/modules-yaml/1.0.0: + dependencies: + load-yaml-file: 0.1.0 + write-yaml-file: 1.0.1 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-bl9TPt2UObSEpGPQHZ2soXSSwz+/0XZqK+afBRJ4L78NKV41oZTUnrLjeNbeNEVwIG9icrQ3ZeSslIvQy4L+Dw== + /@pnpm/package-bins/1.0.0: + dependencies: + '@pnpm/types': 1.7.0 + '@types/mz': 0.0.32 + mz: 2.7.0 + p-filter: 1.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-ZqVfIXK3r5AsP5VAhPHrhf3isF+T4yEuUpJTF9T03oFTJ9LBnkKvx8F7P7biKEManxSGOkSpNoIBdsura9pY5Q== + /@pnpm/package-requester/0.8.5: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fetcher-base': 1.0.0 @@ -110,9 +196,9 @@ packages: mkdirp-promise: 5.0.1 mz: 2.7.0 p-limit: 1.2.0 - p-queue: 2.3.0 + p-queue: 2.3.1 path-exists: 3.0.0 - read-package-json: 2.0.12 + read-package-json: 2.0.13 rename-overwrite: 1.0.2 rimraf-then: 1.0.1 symlink-dir: 1.1.2 @@ -124,7 +210,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-vZbp8MP3xpAtXlzknUvTTFer6szfDbQiUwf3DKMYcNu30n16SplLYZV4hoLr5SsXwGuyY7SG+ypKyQAOHr/yLQ== + integrity: sha512-y2JRHtpmRnh18ew24BozxPsrZQBMYzF8SNx0yYPLYRB/tR/JUR33f9HFAIgMb2eH69rAVifNtH45BqmXdQ+gSg== /@pnpm/pkgid-to-filename/1.0.0: dependencies: normalize-path: 2.1.1 @@ -153,7 +239,7 @@ packages: integrity: sha512-pn7g4uxcofWTNG/cxmKvkMK2lxr4OUIhrQDrEVYEdVhW0WkWztsHkFrYjFgfNzPbYu3ITlB3T6aSVjCoJQTOlw== /@types/byline/4.2.31: dependencies: - '@types/node': 9.4.6 + '@types/node': 9.6.1 dev: true resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= @@ -162,40 +248,44 @@ packages: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== /@types/fs-extra/5.0.1: dependencies: - '@types/node': 9.4.6 + '@types/node': 9.6.1 dev: true resolution: integrity: sha512-h3wnflb+jMTipvbbZnClgA2BexrT4w0GcfoCz5qyxd0IRsbqhLSyesM6mqZTAnhbVmhyTm5tuxfRu9R+8l+lGw== - /@types/got/7.1.7: + /@types/got/7.1.8: dependencies: - '@types/node': 9.4.6 + '@types/node': 9.6.1 dev: true resolution: - integrity: sha512-quhlNPGIkaRyO4PnEuP9pEkUPktjfrvPESENGOhiEzgOUNbunETSQXY5bkZY+Bb/J9V5p/f50Rh1eDklD4Z2FQ== + integrity: sha512-QxcSkx9PjHH7uqbzqKTKOAjGbayyo+dECnnqM3BBMC0WjYAqx0e6Qi9AFR4jluvx91e7qzgz4aGka7AhCTHYRw== + /@types/js-yaml/3.11.1: + dev: true + resolution: + integrity: sha512-M5qhhfuTt4fwHGqqANNQilp3Htb5cHwBxlMHDUw/TYRVkEp3s3IIFSH3Fe9HIAeEtnO4p3SSowLmCVavdRYfpw== /@types/load-json-file/2.0.7: dev: true resolution: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== /@types/mz/0.0.32: dependencies: - '@types/node': 9.4.6 + '@types/node': 9.6.1 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/8.9.4: + /@types/node/8.10.1: dev: false resolution: - integrity: sha512-dSvD36qnQs78G1BPsrZFdPpvLgMW/dnvr5+nTW2csMs5TiP9MOXrjUbnMZOEwnIuBklXtn7b6TPA2Cuq07bDHA== - /@types/node/9.4.6: + integrity: sha512-X/pIUOcgpX7xxKsmdPCMKeDBefsGH/4D/IuJ1gIHbqgWI0qEy/yMKeqaN/sT+rzV9UpAXAfd0kLOVExRmZrXIg== + /@types/node/9.6.1: resolution: - integrity: sha512-CTUtLb6WqCCgp6P59QintjHWqzf4VL1uPA27bipLAPxFqrtK1gEYllePzTICGqQ8rYsCbpnsNypXjjDzGAAjEQ== + integrity: sha512-xwlHq5DXQFRpe+u6hmmNkzYk/3oxxqDp71a/AJMupOQYmxyaBetqrVMqdNlSQfbg7XTJYD8vARjf3Op06OzdtQ== /@types/nopt/3.0.29: dev: true resolution: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 9.4.6 + '@types/node': 9.6.1 dev: true resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== @@ -207,9 +297,9 @@ packages: dev: true resolution: integrity: sha512-dwv960sf5inFWiufjhDfK7ZG3nYyHXt58I+14bJJBKV5MPlZm6Tu1sQS63NWEtLpIw6+RhbNbXjNStdMXxR8Nw== - /@types/ramda/0.25.19: + /@types/ramda/0.25.21: resolution: - integrity: sha512-vbUI5wJQyboG/7G/IYBd6Qfla3woTh6eRETYBYjBcJZ1PO+QNnLWjV57sTANiwABsYqNe2shx0Xz3EQmbd0CKA== + integrity: sha512-y4Dx3t+EA5Y+s87cwUoIzo0Tsj9z7QCu4gaXrdFln4wQRgk9igBskEEe7gZ0PG8dSXtQb29oA3RS//3XquHdiw== /@types/rc/0.0.1: dev: true resolution: @@ -217,16 +307,16 @@ packages: /@types/semver/5.5.0: resolution: integrity: sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== - /@types/tape/4.2.31: + /@types/strip-ansi/3.0.0: + dev: false + resolution: + integrity: sha1-m2PUU6a1SqhJGCIHcRoIvo7qSK4= + /@types/tape/4.2.32: dependencies: - '@types/node': 9.4.6 + '@types/node': 9.6.1 dev: true resolution: - integrity: sha512-DEPn8FJKQR6eeMHZ407TuAqlhBKQa54PTM3c7Z6pKOI1uHaPnidmpmOXYtNZTcDrL5hnZofSHPwX1AQ9HbaMUg== - /@types/update-notifier/1.0.3: - dev: true - resolution: - integrity: sha512-BLStNhP2DFF7funARwTcoD6tetRte8NK3Sc59mn7GNALCN975jOlKX3dGvsFxXr/HwQMxxCuRn9IWB3WQ7odHQ== + integrity: sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ== /@types/write-json-file/2.2.1: dev: true resolution: @@ -243,7 +333,7 @@ packages: integrity: sha512-BDy1oz6aFYyY73618IkXzJzFghnXwVZDc3SVa6MVKTrrk4RgubahAF5yKK+Mx4a78tfO0OHeZnJKPs0pNy5uNA== /@zkochan/npm-package-arg/1.0.0: dependencies: - hosted-git-info: 2.5.0 + hosted-git-info: 2.6.0 osenv: 0.1.5 semver: 5.5.0 validate-npm-package-name: 3.0.0 @@ -263,12 +353,12 @@ packages: dev: true resolution: integrity: sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU= - /ansi-diff/1.0.10: + /ansi-diff/1.1.0: dependencies: ansi-split: 1.0.1 dev: false resolution: - integrity: sha512-pgsU9HUWzN2JqNBcuhn5vIDtSwfKetdjy6EQl3UsTRluyIL3S2tINgFZO8SERS13uB0/5/stxf5pVCNLcSW99w== + integrity: sha512-fBcvTGkqVSdJNEBk6mL+1FCcbfI5pyWARjHdM4pfLpHeJUfOmN4SIJ4XWGEzKJNYBATbEOISTLuGAX9jqSrpFA== /ansi-escapes/1.4.0: dev: true engines: @@ -359,6 +449,19 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= + /array-flatten/2.1.1: + dev: true + resolution: + integrity: sha1-Qmu52oQJDBg42BLIFQryCoMx4pY= + /array-includes/3.0.3: + dependencies: + define-properties: 1.1.2 + es-abstract: 1.11.0 + dev: true + engines: + node: '>= 0.4' + resolution: + integrity: sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0= /array-unique/0.2.1: dev: true engines: @@ -409,7 +512,7 @@ packages: integrity: sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= /babel-runtime/6.26.0: dependencies: - core-js: 2.5.3 + core-js: 2.5.4 regenerator-runtime: 0.11.1 resolution: integrity: sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -430,12 +533,13 @@ packages: optional: true resolution: integrity: sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40= - /bl/1.2.1: + /bl/1.2.2: dependencies: readable-stream: 2.3.5 + safe-buffer: 5.1.1 dev: true resolution: - integrity: sha1-ysMo977kVzDUBLaSID/LWQ4XLV4= + integrity: sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA== /block-stream/0.0.9: dependencies: inherits: 2.0.3 @@ -490,10 +594,14 @@ packages: dev: true resolution: integrity: sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0= + /buffer-from/1.0.0: + dev: true + resolution: + integrity: sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA== /buffer/3.6.0: dependencies: base64-js: 0.0.8 - ieee754: 1.1.8 + ieee754: 1.1.11 isarray: 1.0.0 dev: true resolution: @@ -517,7 +625,7 @@ packages: /bzip2-maybe/1.0.0: dependencies: is-bzip2: 1.0.0 - peek-stream: 1.1.2 + peek-stream: 1.1.3 pumpify: 1.4.0 through2: 2.0.3 unbzip2-stream: 1.2.5 @@ -587,10 +695,10 @@ packages: dev: true resolution: integrity: sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE= - /ci-info/1.1.2: + /ci-info/1.1.3: dev: true resolution: - integrity: sha512-uTGIPNx/nSpBdsF6xnseRXLLtfr9VLqkz8ZqHXr3Y7b6SftyRxBGjwMtJj1OhNbmlc1wZzLNAlAcvyIiE8a6ZA== + integrity: sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg== /cli-cursor/1.0.2: dependencies: restore-cursor: 1.0.1 @@ -656,10 +764,10 @@ packages: node: '>= 0.6.x' resolution: integrity: sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E= - /commander/2.14.1: + /commander/2.15.1: dev: true resolution: - integrity: sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw== + integrity: sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== /commander/2.9.0: dependencies: graceful-readlink: 1.0.1 @@ -701,8 +809,9 @@ packages: dev: true resolution: integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - /concat-stream/1.6.1: + /concat-stream/1.6.2: dependencies: + buffer-from: 1.0.0 inherits: 2.0.3 readable-stream: 2.3.5 typedarray: 0.0.6 @@ -710,7 +819,7 @@ packages: engines: '0': node >= 0.8 resolution: - integrity: sha512-gslSSJx03QKa59cIKqeJO9HQ/WZMotvYJCuaUULrLpjj8oG40kV2Z+gz82pVxlTkOADi4PJxQPPfhl1ELYrrXw== + integrity: sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== /console-control-strings/1.1.0: dev: true resolution: @@ -719,15 +828,15 @@ packages: dev: true resolution: integrity: sha1-XblXOdbCEqy+e29lahG5QLqmiUY= - /core-js/2.5.3: + /core-js/2.5.4: resolution: - integrity: sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4= + integrity: sha1-8si/GB8qgLkvNgEhQpzmOi8K6uA= /core-util-is/1.0.2: resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= /cross-spawn/5.1.0: dependencies: - lru-cache: 4.1.1 + lru-cache: 4.1.2 shebang-command: 1.2.0 which: 1.3.0 dev: true @@ -788,7 +897,7 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.9.4 + '@types/node': 8.10.1 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -854,14 +963,16 @@ packages: dev: true resolution: integrity: sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - /dependency-path/1.2.0: + /dependency-path/1.2.1: dependencies: '@types/semver': 5.5.0 encode-registry: 1.1.0 semver: 5.5.0 dev: true + engines: + node: '>=4' resolution: - integrity: sha512-WCVHx8m35ChWmemrAtp67EiXxp02Z0TRpJUYG1Kh7aloQcPdribxtcOm+GtMzhVnzgANj+mf0eo9aCtrxzzS3Q== + integrity: sha512-VcFlKHsD8EoTuVeRY/cKXHhbUDOVLboIaleqEh9qbzpRW9eAhMdbhT7yID274qtq6UvTdpxMxNocfG8Mtg+i0Q== /detect-file/0.1.0: dependencies: fs-exists-sync: 0.1.0 @@ -902,7 +1013,7 @@ packages: mz: 2.7.0 p-every: 1.0.2 p-limit: 1.2.0 - ssri: 5.2.4 + ssri: 5.3.0 dev: true engines: node: '>=4' @@ -948,7 +1059,7 @@ packages: dev: true resolution: integrity: sha1-+FWobOYa3E6GIcPNoh56dhLDqNw= - /es-abstract/1.10.0: + /es-abstract/1.11.0: dependencies: es-to-primitive: 1.1.1 function-bind: 1.1.1 @@ -959,7 +1070,7 @@ packages: engines: node: '>= 0.4' resolution: - integrity: sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ== + integrity: sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA== /es-to-primitive/1.1.1: dependencies: is-callable: 1.1.3 @@ -991,9 +1102,9 @@ packages: dev: true resolution: integrity: sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y= - /execa/0.9.0: + /execa/0.10.0: dependencies: - cross-spawn: 5.1.0 + cross-spawn: 6.0.5 get-stream: 3.0.0 is-stream: 1.1.0 npm-run-path: 2.0.2 @@ -1004,7 +1115,7 @@ packages: engines: node: '>=4' resolution: - integrity: sha512-BbUMBiX4hqiHZUA5+JujIjNb6TyAlp2D5KLheMjMluwOuzcnylDL4AxZYLLn1n2AGB49eSWwyKvvEQoRpnAtmA== + integrity: sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw== /exit-hook/1.1.1: dev: true engines: @@ -1355,12 +1466,19 @@ packages: dev: true resolution: integrity: sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= + /graph-sequencer/2.0.0: + dependencies: + array-flatten: 2.1.1 + array-includes: 3.0.3 + dev: true + resolution: + integrity: sha1-v7gJuK9YT29Sh83OUHow1K6m7nA= /gunzip-maybe/1.4.1: dependencies: browserify-zlib: 0.1.4 is-deflate: 1.0.0 is-gzip: 1.0.0 - peek-stream: 1.1.2 + peek-stream: 1.1.3 pumpify: 1.4.0 through2: 2.0.3 dev: true @@ -1439,25 +1557,27 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-TCu8inWJmP7r9e1oWA921GdotLw= - /hosted-git-info/2.5.0: + /hosted-git-info/2.6.0: dev: true + engines: + node: '>=4' resolution: - integrity: sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg== + integrity: sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw== /http-signature/1.2.0: dependencies: assert-plus: 1.0.0 jsprim: 1.4.1 - sshpk: 1.13.1 + sshpk: 1.14.1 dev: true engines: node: '>=0.8' npm: '>=1.3.7' resolution: integrity: sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - /ieee754/1.1.8: + /ieee754/1.1.11: dev: true resolution: - integrity: sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q= + integrity: sha512-VhDzCKN7K8ufStx/CLj5/PDTMgph+qwN5Pkd5i0sGnVwk56zJ0lkT8Qzi1xqWLS0Wp29DgDtNeS7v8/wMoZeHg== /imurmurhash/0.1.4: dev: true engines: @@ -1541,7 +1661,7 @@ packages: integrity: sha1-hut1OSgF3cM69xySoO7fdO52BLI= /is-ci/1.1.0: dependencies: - ci-info: 1.1.2 + ci-info: 1.1.3 dev: true resolution: integrity: sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg== @@ -1728,22 +1848,22 @@ packages: dev: true resolution: integrity: sha1-mGbfOVECEw449/mWvOtlRDIJwls= - /js-yaml/3.10.0: + /js-yaml/3.11.0: dependencies: argparse: 1.0.10 esprima: 4.0.0 dev: true resolution: - integrity: sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA== + integrity: sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw== /jsbn/0.1.1: dev: true optional: true resolution: integrity: sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - /json-parse-better-errors/1.0.1: + /json-parse-better-errors/1.0.2: dev: true resolution: - integrity: sha512-xyQpxeWWMKyJps9CuGJYeng6ssI5bpqS9ltQpdVQ90t4ql6NdnxFKh95JcRt2cun/DjMVNrdjniLPuMA69xmCw== + integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== /json-schema-traverse/0.3.1: dev: true resolution: @@ -1821,7 +1941,7 @@ packages: /load-yaml-file/0.1.0: dependencies: graceful-fs: 4.1.11 - js-yaml: 3.10.0 + js-yaml: 3.11.0 pify: 2.3.0 strip-bom: 3.0.0 dev: true @@ -1879,13 +1999,13 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= - /lru-cache/4.1.1: + /lru-cache/4.1.2: dependencies: pseudomap: 1.0.2 yallist: 2.1.2 dev: true resolution: - integrity: sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew== + integrity: sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ== /make-dir/1.2.0: dependencies: pify: 3.0.0 @@ -2022,7 +2142,7 @@ packages: dependencies: babel-runtime: 6.26.0 chalk: 1.1.3 - core-js: 2.5.3 + core-js: 2.5.4 diff: 2.2.3 duplexer: 0.1.1 figures: 1.7.0 @@ -2091,7 +2211,7 @@ packages: nopt: 3.0.6 npmlog: 4.1.2 osenv: 0.1.5 - request: 2.83.0 + request: 2.85.0 rimraf: 2.6.2 semver: 5.3.0 tar: 2.2.1 @@ -2115,7 +2235,7 @@ packages: integrity: sha1-HL6oBKukNgAfg5OKsh7AOdaa6dM= /normalize-package-data/2.4.0: dependencies: - hosted-git-info: 2.5.0 + hosted-git-info: 2.6.0 is-builtin-module: 1.0.0 semver: 5.5.0 validate-npm-package-license: 3.0.3 @@ -2134,7 +2254,7 @@ packages: dev: true resolution: integrity: sha512-0v6T4851b72ykk5zEtFoN4QX/Fqyk7pouIj9xZyAvAe9jlDhAwT4z6FlwsoQCHjeuK2EGUoAwy/F4y4B1uZq9A== - /npm-lifecycle/2.0.0: + /npm-lifecycle/2.0.1: dependencies: byline: 5.0.0 graceful-fs: 4.1.11 @@ -2146,7 +2266,7 @@ packages: which: 1.3.0 dev: true resolution: - integrity: sha512-aE7H012O01GKXT9BWnsGMLVci+MOgkhpSwq02ok20aXcNHxFs7enfampNMkiOV1DJEU0LynzemwdjbtXahXKcw== + integrity: sha512-6CypRO6iNsSfrWOUajeQnesouUgkeh7clByYDORUV6AhwRaGfHYh+5rFdDCIqzmMqomGlyDsSpazthNPG2BAOA== /npm-run-path/2.0.2: dependencies: path-key: 2.0.1 @@ -2193,7 +2313,7 @@ packages: /object.getownpropertydescriptors/2.0.3: dependencies: define-properties: 1.1.2 - es-abstract: 1.10.0 + es-abstract: 1.11.0 dev: true engines: node: '>= 0.8' @@ -2318,26 +2438,12 @@ packages: node: '>=4' resolution: integrity: sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== - /p-queue/2.3.0: + /p-queue/2.3.1: dev: true engines: node: '>=4' resolution: - integrity: sha1-ZdVecbwVAPxBMSLamK5Ff/inwDg= - /p-reduce/1.0.0: - dev: true - engines: - node: '>=4' - resolution: - integrity: sha1-GMKw3ZNqRpClKfgjH1ig/bakffo= - /p-series/1.0.0: - dependencies: - p-reduce: 1.0.0 - dev: true - engines: - node: '>=4' - resolution: - integrity: sha1-fsnntEBswyBmKYpvmGDlXpGzbgc= + integrity: sha512-MJGD2eVNHhtCsGLBDsfNzhBDlWxBFb5BvVXhJFbmlXH76Llo792ylwqEYJguLo+BnxZpos/Qw9dq0voyQRD3pg== /p-try/1.0.0: dev: true engines: @@ -2350,7 +2456,7 @@ packages: '@types/fs-extra': 5.0.1 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.4.6 + '@types/node': 9.6.1 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.5 find-down: 0.1.4 @@ -2361,24 +2467,24 @@ packages: mz: 2.7.0 rimraf-then: 1.0.1 symlink-dir: 1.1.2 - unpack-stream: 3.0.1 + unpack-stream: 3.0.2 write-json-file: 2.3.0 dev: true engines: node: '>=4' resolution: integrity: sha512-Qmhr23K9e2jI4LK4MU2be4xWX0CyniBDwmyCi6K+3lTZtryd2r29Wh6wPXo6wdP++jNsJ5ayZT4yJlZWVHnluQ== - /package-store/0.17.2: + /package-store/0.18.0: dependencies: '@pnpm/fetcher-base': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/package-requester': 0.8.3 + '@pnpm/package-requester': 0.8.5 '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.4.6 - '@types/ramda': 0.25.19 + '@types/node': 9.6.1 + '@types/ramda': 0.25.21 encode-registry: 1.1.0 load-json-file: 4.0.0 mkdirp-promise: 5.0.1 @@ -2399,7 +2505,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-k3nJjNtVlUKZtzTNrXwni/GigzYtNj13uXc77fnWx8+fJXbNd3E0rqt8Wh557fO3ENTUOwV3aG1XWWowXOn+cA== + integrity: sha512-R3ffooDanlH6nBoxOlsjrHDClK2whLDQcqxdZJ9qJGKNuO5uxYTdUXquupCVCL1o+rJmJ06o/x7FJIbpzLkYTA== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -2426,7 +2532,7 @@ packages: /parse-json/4.0.0: dependencies: error-ex: 1.3.1 - json-parse-better-errors: 1.0.1 + json-parse-better-errors: 1.0.2 dev: true engines: node: '>=4' @@ -2476,10 +2582,6 @@ packages: node: '>=4' resolution: integrity: sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - /path-name/1.0.0: - dev: true - resolution: - integrity: sha1-jKBjpj3nmC36lXYO2v/RAhRJTyQ= /path-parse/1.0.5: dev: true resolution: @@ -2500,13 +2602,14 @@ packages: node: '>=4' resolution: integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== - /peek-stream/1.1.2: + /peek-stream/1.1.3: dependencies: + buffer-from: 1.0.0 duplexify: 3.5.4 through2: 2.0.3 dev: true resolution: - integrity: sha1-l+t2NlvP2MieKH9VyLadTD6bzFI= + integrity: sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA== /performance-now/2.1.0: dev: true resolution: @@ -2549,12 +2652,15 @@ packages: dev: true resolution: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= - /pnpm-shrinkwrap/6.0.0: + /pnpm-shrinkwrap/6.2.4: dependencies: - '@types/node': 9.4.6 - '@types/ramda': 0.25.19 - dependency-path: 1.2.0 - js-yaml: 3.10.0 + '@pnpm/resolver-base': 1.0.0 + '@types/js-yaml': 3.11.1 + '@types/node': 9.6.1 + '@types/ramda': 0.25.21 + dependency-path: 1.2.1 + get-npm-tarball-url: 2.0.1 + js-yaml: 3.11.0 load-yaml-file: 0.1.0 mkdirp-promise: 5.0.1 ramda: 0.25.0 @@ -2567,7 +2673,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-c+GWM0deEHpp5nb2RG6FXyl2jX04lwiOAG14+hMhtYg6BwyDqdK9gURIxCwcgXZFifj2X5rze+6eOAYUSkghtQ== + integrity: sha512-6jS1RYFe5vfaoo2+JRQ9xIQ91oDOsYp6xCrJyCkmweKJ5ezXd2PNiYhOpZkwvVNj1NoBRN9IWS4L0/Ld2rIQcg== /preserve/0.2.0: dev: true engines: @@ -2660,17 +2766,17 @@ packages: node: '>= 0.10.0' resolution: integrity: sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how== - /read-package-json/2.0.12: + /read-package-json/2.0.13: dependencies: glob: 7.1.2 - json-parse-better-errors: 1.0.1 + json-parse-better-errors: 1.0.2 normalize-package-data: 2.4.0 slash: 1.0.0 dev: true optionalDependencies: graceful-fs: 4.1.11 resolution: - integrity: sha512-m7/I0+tP6D34EVvSlzCtuVA4D/dHL6OpLcn2e4XVP5X57pCKGUy1JjRSBVKHWpB+vUU91sL85h84qX0MdXzBSw== + integrity: sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg== /read-pkg-up/3.0.0: dependencies: find-up: 2.1.0 @@ -2703,7 +2809,7 @@ packages: integrity: sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw== /rechoir/0.6.2: dependencies: - resolve: 1.5.0 + resolve: 1.6.0 dev: true engines: node: '>= 0.10' @@ -2780,7 +2886,7 @@ packages: node: '>=4' resolution: integrity: sha1-hwYhF/gj/lgAwwa6yyz6NZuTX+o= - /request/2.83.0: + /request/2.85.0: dependencies: aws-sign2: 0.7.0 aws4: 1.6.0 @@ -2808,7 +2914,7 @@ packages: engines: node: '>= 4' resolution: - integrity: sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw== + integrity: sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg== /resolve-dir/0.1.1: dependencies: expand-tilde: 1.2.2 @@ -2838,6 +2944,12 @@ packages: dev: true resolution: integrity: sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw== + /resolve/1.6.0: + dependencies: + path-parse: 1.0.5 + dev: true + resolution: + integrity: sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw== /restore-cursor/1.0.1: dependencies: exit-hook: 1.1.1 @@ -2867,7 +2979,6 @@ packages: resolution: integrity: sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q= /right-pad/1.0.1: - dev: true engines: node: '>= 0.10' resolution: @@ -2970,12 +3081,12 @@ packages: node: '>=4' resolution: integrity: sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= - /source-map-support/0.5.3: + /source-map-support/0.5.4: dependencies: source-map: 0.6.1 dev: true resolution: - integrity: sha512-eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w== + integrity: sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg== /source-map/0.6.1: engines: node: '>=0.10.0' @@ -2991,7 +3102,7 @@ packages: integrity: sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A= /spawn-sync/1.0.15: dependencies: - concat-stream: 1.6.1 + concat-stream: 1.6.2 os-shim: 0.1.3 dev: true resolution: @@ -3027,7 +3138,7 @@ packages: dev: true resolution: integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - /sshpk/1.13.1: + /sshpk/1.14.1: dependencies: asn1: 0.2.3 assert-plus: 1.0.0 @@ -3042,13 +3153,13 @@ packages: jsbn: 0.1.1 tweetnacl: 0.14.5 resolution: - integrity: sha1-US322mKHFEMW3EwY/hzx2UBzm+M= - /ssri/5.2.4: + integrity: sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s= + /ssri/5.3.0: dependencies: safe-buffer: 5.1.1 dev: true resolution: - integrity: sha512-UnEAgMZa15973iH7cUi0AHjJn1ACDIkaMyZILoqwN6yzt+4P81I8tBc5Hl+qwi5auMplZtPQsHrPBR5vJLcQtQ== + integrity: sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ== /stacktracey/1.2.100: dependencies: as-table: 1.0.31 @@ -3073,7 +3184,7 @@ packages: /string.prototype.trim/1.1.2: dependencies: define-properties: 1.1.2 - es-abstract: 1.10.0 + es-abstract: 1.11.0 function-bind: 1.1.1 dev: true engines: @@ -3105,6 +3216,14 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + /strip-ansi/4.0.0: + dependencies: + ansi-regex: 3.0.0 + dev: false + engines: + node: '>=4' + resolution: + integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8= /strip-bom/3.0.0: dev: true engines: @@ -3129,11 +3248,16 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.14.0: + /supi/0.15.0: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/package-requester': 0.8.3 + '@pnpm/headless': 0.1.10 + '@pnpm/lifecycle': 1.0.1 + '@pnpm/link-bins': 1.0.1 + '@pnpm/modules-yaml': 1.0.0 + '@pnpm/package-bins': 1.0.0 + '@pnpm/package-requester': 0.8.5 '@pnpm/pkgid-to-filename': 1.0.0 '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 @@ -3141,48 +3265,39 @@ packages: '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.4.6 + '@types/node': 9.6.1 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 - '@types/ramda': 0.25.19 + '@types/ramda': 0.25.21 '@types/rc': 0.0.1 '@types/semver': 5.5.0 - '@types/update-notifier': 1.0.3 - '@zkochan/cmd-shim': 2.2.4 '@zkochan/npm-package-arg': 1.0.0 - arr-flatten: 1.1.0 - byline: 5.0.0 common-tags: 1.7.2 - cross-spawn: 5.1.0 - dependency-path: 1.2.0 + dependency-path: 1.2.1 encode-registry: 1.1.0 - execa: 0.9.0 + execa: 0.10.0 get-npm-tarball-url: 2.0.1 graceful-fs: 4.1.11 + graph-sequencer: 2.0.0 is-ci: 1.1.0 is-inner-link: 2.0.2 is-subdir: 1.0.2 - is-windows: 1.0.2 load-json-file: 4.0.0 - load-yaml-file: 0.1.0 mkdirp-promise: 5.0.1 mz: 2.7.0 normalize-path: 2.1.1 normalize-registry-url: 1.0.0 - npm-lifecycle: 2.0.0 os-homedir: 1.0.2 p-filter: 1.0.0 p-limit: 1.2.0 - p-series: 1.0.0 - package-store: 0.17.2 + package-store: 0.18.0 path-absolute: 1.0.0 path-exists: 3.0.0 - path-name: 1.0.0 pnpm-install-checks: 1.1.0 - pnpm-shrinkwrap: 6.0.0 + pnpm-shrinkwrap: 6.2.4 ramda: 0.25.0 - read-package-json: 2.0.12 + read-package-json: 2.0.13 remove-all-except-outer-links: 1.0.3 replace-string: 1.1.0 resolve-link-target: 1.0.1 @@ -3193,14 +3308,13 @@ packages: validate-npm-package-name: 3.0.0 version-selector-type: 2.0.0 write-pkg: 3.1.0 - write-yaml-file: 1.0.0 dev: true engines: node: '>=4' peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-daxMDjqsq0WbUmgM2zaSiRblwPovPP8qtLAMZp2xeFxSbRwIXgBAAAkeJxAoMwKPL5EeKR8RfK0dBLTYKVOxQg== + integrity: sha512-0BCOBT2ADxdojhy35ZV3idKq/E8bfib+0lJRLVGE/d+d6Tf63xiZfHhOJtxNBRNsaGl966awbEvgBSZJlHuFaQ== /supports-color/0.2.0: dev: true engines: @@ -3229,7 +3343,7 @@ packages: /symlink-dir/1.1.2: dependencies: '@types/mz': 0.0.32 - '@types/node': 9.4.6 + '@types/node': 9.6.1 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -3243,7 +3357,7 @@ packages: dependencies: events-to-array: 1.1.2 inherits: 2.0.3 - js-yaml: 3.10.0 + js-yaml: 3.11.0 dev: true optionalDependencies: readable-stream: 2.3.5 @@ -3278,7 +3392,7 @@ packages: integrity: sha512-I9rb6v7mjWLtOfCau9eH5L7sLJyU2BnxtEZRQ5Mt+eRKmf1F0ohXmT/Jc3fr52kDvjJ/HV5MH3soQfPL5bQ0Yg== /tar-stream/1.5.5: dependencies: - bl: 1.2.1 + bl: 1.2.2 end-of-stream: 1.4.1 readable-stream: 2.3.5 xtend: 4.0.1 @@ -3349,7 +3463,7 @@ packages: make-error: 1.3.4 minimist: 1.2.0 mkdirp: 0.5.1 - source-map-support: 0.5.3 + source-map-support: 0.5.4 yn: 2.0.0 dev: true engines: @@ -3365,15 +3479,15 @@ packages: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 chalk: 2.3.2 - commander: 2.14.1 + commander: 2.15.1 diff: 3.5.0 glob: 7.1.2 - js-yaml: 3.10.0 + js-yaml: 3.11.0 minimatch: 3.0.4 - resolve: 1.5.0 + resolve: 1.6.0 semver: 5.5.0 tslib: 1.9.0 - tsutils: 2.22.2 + tsutils: 2.25.1 dev: true engines: node: '>=4.8.0' @@ -3381,14 +3495,14 @@ packages: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev' resolution: integrity: sha1-ElX4ej/1frCw4fDmEKi0dIBGya4= - /tsutils/2.22.2: + /tsutils/2.25.1: dependencies: tslib: 1.9.0 dev: true peerDependencies: - typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev' + typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 2.10.0-dev' resolution: - integrity: sha512-u06FUSulCJ+Y8a2ftuqZN6kIGqdP2yJjUPEngXqmdPND4UQfb04igcotH+dw+IFr417yP6muCLE8/5/Qlfnx0w== + integrity: sha512-xHiTER5XIRYlWbylk4vpGZSYo8FUTVn32bAxxM1rJopXs2DYG7lWp40LqNvM3iMNpXa50wmnC9bFXsPTV6xAiQ== /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.1.1 @@ -3404,12 +3518,12 @@ packages: dev: true resolution: integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - /typescript/2.7.2: + /typescript/2.8.1: dev: true engines: node: '>=4.2.0' resolution: - integrity: sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw== + integrity: sha512-Ao/f6d/4EPLq0YwzsQz8iXflezpTkQzqAyenTiw4kCUGr1uPiFLC3+fZ+gMZz6eeI/qdRUqvC+HxIJzUAzEFdg== /uid-number/0.0.6: dev: true resolution: @@ -3437,17 +3551,17 @@ packages: dev: true resolution: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= - /unpack-stream/3.0.1: + /unpack-stream/3.0.2: dependencies: - '@types/node': 9.4.6 + '@types/node': 9.6.1 decompress-maybe: 1.0.0 - ssri: 5.2.4 + ssri: 5.3.0 tar-fs: 1.16.0 dev: true engines: node: '>=4' resolution: - integrity: sha512-yaG8wkdx7b9Cza2GGQ6YleqxLZwPaNsGYp9zJY61nZgRjl5ATXpfHaZzE1joL4/PlUu8rQiDV4bApqB2iPwz6g== + integrity: sha512-mdQv3N9fkxG04/4G8HLg3Q/whJscMTUikRQU2pTr4ISU9t59xoRGUEeqpUwpj78jZUPB7LN6oabkyZJ574MleA== /util-deprecate/1.0.2: resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= @@ -3525,14 +3639,6 @@ packages: dev: true resolution: integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - /write-file-atomic/1.3.4: - dependencies: - graceful-fs: 4.1.11 - imurmurhash: 0.1.4 - slide: 1.1.6 - dev: true - resolution: - integrity: sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8= /write-file-atomic/2.3.0: dependencies: graceful-fs: 4.1.11 @@ -3563,16 +3669,18 @@ packages: node: '>=4' resolution: integrity: sha1-AwqZlMyZk9JbTnWp8aGSNgcpHOk= - /write-yaml-file/1.0.0: + /write-yaml-file/1.0.1: dependencies: graceful-fs: 4.1.11 - js-yaml: 3.10.0 + js-yaml: 3.11.0 mkdirp: 0.5.1 - pify: 2.3.0 - write-file-atomic: 1.3.4 + pify: 3.0.0 + write-file-atomic: 2.3.0 dev: true + engines: + node: '>=4' resolution: - integrity: sha1-e0vQ33LKE/vp1rAXj9g8B3uOqGs= + integrity: sha1-oesea6vricAQNNSrA1wn1Pt34qE= /xtend/4.0.1: engines: node: '>=0.4' @@ -3607,6 +3715,7 @@ specifiers: '@types/node': ^9.3.0 '@types/ramda': ^0.25.6 '@types/semver': ^5.4.0 + '@types/strip-ansi': ^3.0.0 '@types/tape': ^4.2.30 ansi-diff: ^1.0.10 chalk: ^2.2.0 @@ -3623,10 +3732,12 @@ specifiers: package-preview: ^1.0.0 pretty-bytes: ^4.0.2 ramda: ^0.25.0 + right-pad: ^1.0.1 rimraf: ^2.5.4 semver: ^5.4.1 stacktracey: ^1.2.87 - supi: ^0.14.0 + strip-ansi: ^4.0.0 + supi: ^0.15.0 tape: ^4.8.0 ts-node: ^5.0.0 tslint: ^5.7.0 diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index db6d5ffaf3..f37c410925 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -4,7 +4,9 @@ import {last as mostLast} from 'most-last' import os = require('os') import prettyBytes = require('pretty-bytes') import R = require('ramda') +import rightPad = require('right-pad') import semver = require('semver') +import stripAnsi = require('strip-ansi') import { DeprecationLog, InstallCheckLog, @@ -28,6 +30,7 @@ const removedSign = chalk.red('-') const linkSign = chalk.magentaBright('#') const hlValue = chalk.blue const hlPkgId = chalk['whiteBright'] +const PREFIX_MAX_LENGTH = 30 export default function ( log$: { @@ -237,22 +240,6 @@ export default function ( return most.of({msg: 'Already up-to-date'}) } - let addSigns = (stats['added'] || 0) - let removeSigns = (stats['removed'] || 0) - const changes = addSigns + removeSigns - if (changes > width) { - if (!addSigns) { - addSigns = 0 - removeSigns = width - } else if (!removeSigns) { - addSigns = width - removeSigns = 0 - } else { - const p = width / changes - addSigns = Math.min(Math.max(Math.floor(addSigns * p), 1), width - 1) - removeSigns = width - addSigns - } - } let msg = 'Packages:' if (stats['removed']) { msg += ' ' + chalk.red(`-${stats['removed']}`) @@ -260,7 +247,7 @@ export default function ( if (stats['added']) { msg += ' ' + chalk.green(`+${stats['added']}`) } - msg += EOL + R.repeat(removedSign, removeSigns).join('') + R.repeat(addedSign, addSigns).join('') + msg += EOL + printPlusesAndMinuses(width, (stats['added'] || 0), (stats['removed'] || 0)) return most.of({msg}) }), ) @@ -296,6 +283,38 @@ export default function ( outputs.push(miscOutput$) } else { + outputs.push( + log$.stats + .loop((stats, log) => { + if (stats[log.prefix]) { + const value = {...stats[log.prefix], ...log} + delete stats[log.prefix] + return {seed: stats, value} + } + stats[log.prefix] = log + return {seed: stats, value: null} + }, {}) + .filter((stats) => stats !== null && (stats['removed'] || stats['added'])) + .map((stats) => { + const prefix = stats['prefix'].length <= PREFIX_MAX_LENGTH + ? stats['prefix'] + : `...${stats['prefix'].substr(-PREFIX_MAX_LENGTH)}` + + let msg = `${rightPad(prefix, PREFIX_MAX_LENGTH)} |` + + if (stats['removed']) { + msg += ' ' + chalk.red(`-${stats['removed']}`) + } + if (stats['added']) { + msg += ' ' + chalk.green(`+${stats['added']}`) + } + + const rest = Math.max(0, width - 1 - stripAnsi(msg).length) + msg += ' ' + printPlusesAndMinuses(rest, (stats['added'] || 0), (stats['removed'] || 0)) + return most.of({msg}) + }), + ) + const miscOutput$ = log$.other .filter((obj) => obj.level === 'error') .map((obj) => { @@ -313,6 +332,24 @@ export default function ( return outputs } +function printPlusesAndMinuses (maxWidth: number, addSigns: number, removeSigns: number) { + const changes = addSigns + removeSigns + if (changes > maxWidth) { + if (!addSigns) { + addSigns = 0 + removeSigns = maxWidth + } else if (!removeSigns) { + addSigns = maxWidth + removeSigns = 0 + } else { + const p = maxWidth / changes + addSigns = Math.min(Math.max(Math.floor(addSigns * p), 1), maxWidth - 1) + removeSigns = maxWidth - addSigns + } + } + return R.repeat(removedSign, removeSigns).join('') + R.repeat(addedSign, addSigns).join('') +} + function printDiffs (pkgsDiff: PackageDiff[]) { // Sorts by alphabet then by removed/added // + ava 0.10.0 diff --git a/test/index.ts b/test/index.ts index c2a0992086..af4b754803 100644 --- a/test/index.ts +++ b/test/index.ts @@ -784,3 +784,109 @@ test('prints just removed during uninstallation', t => { error: t.end, }) }) + +test('prints added/removed stats during recursive installation', t => { + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive'}) + + statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-5' }) + statsLogger.debug({ added: 0, prefix: '/home/jane/repo/pkg-5' }) + statsLogger.debug({ added: 2, prefix: '/home/jane/repo/pkg-2' }) + statsLogger.debug({ added: 5, prefix: '/home/jane/repo/pkg-1' }) + statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/pkg-1' }) + statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-2' }) + statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-3' }) + statsLogger.debug({ added: 1, prefix: '/home/jane/repo/pkg-3' }) + statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/loooooooooooooong/pkg-4' }) + statsLogger.debug({ added: 0, prefix: '/home/jane/repo/loooooooooooooong/pkg-4' }) + + t.plan(1) + + output$.skip(3).take(1).map(normalizeNewline).subscribe({ + next: output => { + t.equal(output, stripIndents` + /home/jane/repo/pkg-1 | ${chalk.red('-1')} ${chalk.green('+5')} ${SUB}${ADD + ADD + ADD + ADD + ADD} + /home/jane/repo/pkg-2 | ${chalk.green('+2')} ${ADD + ADD} + /home/jane/repo/pkg-3 | ${chalk.green('+1')} ${ADD} + ...e/repo/loooooooooooooong/pkg-4 | ${chalk.red('-1')} ${SUB}` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) + +test('recursive installation: prints only the added stats if nothing was removed and a lot added', t => { + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50}) + + statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-1' }) + statsLogger.debug({ added: 100, prefix: '/home/jane/repo/pkg-1' }) + + t.plan(1) + + output$.take(1).map(normalizeNewline).subscribe({ + next: output => { + t.equal(output, stripIndents` + /home/jane/repo/pkg-1 | ${chalk.green('+100')} ${R.repeat(ADD, 12).join('')}` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) + +test('recursive installation: prints only the removed stats if nothing was added and a lot removed', t => { + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50}) + + statsLogger.debug({ removed: 100, prefix: '/home/jane/repo/pkg-1' }) + statsLogger.debug({ added: 0, prefix: '/home/jane/repo/pkg-1' }) + + t.plan(1) + + output$.take(1).map(normalizeNewline).subscribe({ + next: output => { + t.equal(output, stripIndents` + /home/jane/repo/pkg-1 | ${chalk.red('-100')} ${R.repeat(SUB, 12).join('')}` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) + +test('recursive installation: prints at least one remove sign when removed !== 0', t => { + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50}) + + statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/pkg-1' }) + statsLogger.debug({ added: 100, prefix: '/home/jane/repo/pkg-1' }) + + t.plan(1) + + output$.take(1).map(normalizeNewline).subscribe({ + next: output => { + t.equal(output, stripIndents` + /home/jane/repo/pkg-1 | ${chalk.red('-1')} ${chalk.green('+100')} ${SUB}${R.repeat(ADD, 8).join('')}` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) + +test('recursive installation: prints at least one add sign when added !== 0', t => { + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50}) + + statsLogger.debug({ removed: 100, prefix: '/home/jane/repo/pkg-1' }) + statsLogger.debug({ added: 1, prefix: '/home/jane/repo/pkg-1' }) + + t.plan(1) + + output$.take(1).map(normalizeNewline).subscribe({ + next: output => { + t.equal(output, stripIndents` + /home/jane/repo/pkg-1 | ${chalk.red('-100')} ${chalk.green('+1')} ${R.repeat(SUB, 8).join('')}${ADD}` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) diff --git a/typings/local.d.ts b/typings/local.d.ts index 800b5776f9..8d62091a09 100644 --- a/typings/local.d.ts +++ b/typings/local.d.ts @@ -32,3 +32,8 @@ declare module 'zen-push' { const anything: any; export = anything; } + +declare module 'right-pad' { + const anything: any; + export = anything; +} From f9e5daa6d8ca1b6f0c884eac26a528fe45d9b5f3 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 3 Apr 2018 01:51:24 +0300 Subject: [PATCH 162/196] chore(release): 0.15.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b476674e36..c4dbbb9634 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.14.7", + "version": "0.15.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 373dd0a7781c16d918639edb80722333033d07ec Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 3 Apr 2018 10:34:40 +0300 Subject: [PATCH 163/196] feat: improve reporting for recursive commands --- src/index.ts | 4 +++- src/reporterForClient.ts | 21 ++++++++++++++++----- test/index.ts | 30 +++++++++++++++--------------- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/index.ts b/src/index.ts index 3e269f116f..2020056e20 100644 --- a/src/index.ts +++ b/src/index.ts @@ -13,6 +13,7 @@ export default function ( streamParser: object, opts: { cmd: string, + cwd?: string, appendOnly?: boolean, throttleProgress?: number, width?: number, @@ -54,6 +55,7 @@ export function toOutput$ ( streamParser: object, opts: { cmd: string, + cwd?: string, appendOnly?: boolean, throttleProgress?: number, width?: number, @@ -134,7 +136,7 @@ export function toOutput$ ( stats: most.from(statsPushStream.observable), summary: most.from(summaryPushStream.observable), } - const outputs: Array>> = reporterForClient(log$, isRecursive, opts.cmd, opts.width, opts.appendOnly, opts.throttleProgress) + const outputs: Array>> = reporterForClient(log$, isRecursive, opts.cmd, opts.width, opts.appendOnly, opts.throttleProgress, opts.cwd) if (opts.appendOnly) { return most.join( diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index f37c410925..2eb08e68a9 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -2,6 +2,7 @@ import chalk from 'chalk' import most = require('most') import {last as mostLast} from 'most-last' import os = require('os') +import path = require('path') import prettyBytes = require('pretty-bytes') import R = require('ramda') import rightPad = require('right-pad') @@ -53,9 +54,11 @@ export default function ( widthArg?: number, appendOnly?: boolean, throttleProgress?: number, + cwdArg?: string, ): Array>> { const width = widthArg || process.stdout.columns || 80 const outputs: Array>> = [] + const cwd = cwdArg || process.cwd() const resolutionDone$ = isRecursive ? most.never() @@ -296,19 +299,27 @@ export default function ( }, {}) .filter((stats) => stats !== null && (stats['removed'] || stats['added'])) .map((stats) => { - const prefix = stats['prefix'].length <= PREFIX_MAX_LENGTH - ? stats['prefix'] - : `...${stats['prefix'].substr(-PREFIX_MAX_LENGTH)}` + let prefix = path.relative(cwd, stats['prefix']) + prefix = prefix.length <= PREFIX_MAX_LENGTH + ? prefix + : `...${prefix.substr(-PREFIX_MAX_LENGTH)}` let msg = `${rightPad(prefix, PREFIX_MAX_LENGTH)} |` + let statsChunk = '' if (stats['removed']) { - msg += ' ' + chalk.red(`-${stats['removed']}`) + statsChunk += ' ' + chalk.red(`-${stats['removed']}`) } if (stats['added']) { - msg += ' ' + chalk.green(`+${stats['added']}`) + statsChunk += ' ' + chalk.green(`+${stats['added']}`) } + if (stripAnsi(statsChunk).length < 5) { + msg += R.repeat(' ', 5 - stripAnsi(statsChunk).length).join('') + } + + msg += statsChunk + const rest = Math.max(0, width - 1 - stripAnsi(msg).length) msg += ' ' + printPlusesAndMinuses(rest, (stats['added'] || 0), (stats['removed'] || 0)) return most.of({msg}) diff --git a/test/index.ts b/test/index.ts index af4b754803..2d2a09fd28 100644 --- a/test/index.ts +++ b/test/index.ts @@ -786,7 +786,7 @@ test('prints just removed during uninstallation', t => { }) test('prints added/removed stats during recursive installation', t => { - const output$ = toOutput$(createStreamParser(), {cmd: 'recursive'}) + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', cwd: '/home/jane/repo'}) statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-5' }) statsLogger.debug({ added: 0, prefix: '/home/jane/repo/pkg-5' }) @@ -796,18 +796,18 @@ test('prints added/removed stats during recursive installation', t => { statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-2' }) statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-3' }) statsLogger.debug({ added: 1, prefix: '/home/jane/repo/pkg-3' }) - statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/loooooooooooooong/pkg-4' }) - statsLogger.debug({ added: 0, prefix: '/home/jane/repo/loooooooooooooong/pkg-4' }) + statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/loooooooooooooooooooooooong/pkg-4' }) + statsLogger.debug({ added: 0, prefix: '/home/jane/repo/loooooooooooooooooooooooong/pkg-4' }) t.plan(1) output$.skip(3).take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - /home/jane/repo/pkg-1 | ${chalk.red('-1')} ${chalk.green('+5')} ${SUB}${ADD + ADD + ADD + ADD + ADD} - /home/jane/repo/pkg-2 | ${chalk.green('+2')} ${ADD + ADD} - /home/jane/repo/pkg-3 | ${chalk.green('+1')} ${ADD} - ...e/repo/loooooooooooooong/pkg-4 | ${chalk.red('-1')} ${SUB}` + pkg-1 | ${chalk.red('-1')} ${chalk.green('+5')} ${SUB}${ADD + ADD + ADD + ADD + ADD} + pkg-2 | ${chalk.green('+2')} ${ADD + ADD} + pkg-3 | ${chalk.green('+1')} ${ADD} + ...oooooooooooooooooooooong/pkg-4 | ${chalk.red('-1')} ${SUB}` ) }, complete: () => t.end(), @@ -816,7 +816,7 @@ test('prints added/removed stats during recursive installation', t => { }) test('recursive installation: prints only the added stats if nothing was removed and a lot added', t => { - const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50}) + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50, cwd: '/home/jane/repo'}) statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ added: 100, prefix: '/home/jane/repo/pkg-1' }) @@ -826,7 +826,7 @@ test('recursive installation: prints only the added stats if nothing was removed output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - /home/jane/repo/pkg-1 | ${chalk.green('+100')} ${R.repeat(ADD, 12).join('')}` + pkg-1 | ${chalk.green('+100')} ${R.repeat(ADD, 12).join('')}` ) }, complete: () => t.end(), @@ -835,7 +835,7 @@ test('recursive installation: prints only the added stats if nothing was removed }) test('recursive installation: prints only the removed stats if nothing was added and a lot removed', t => { - const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50}) + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50, cwd: '/home/jane/repo'}) statsLogger.debug({ removed: 100, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ added: 0, prefix: '/home/jane/repo/pkg-1' }) @@ -845,7 +845,7 @@ test('recursive installation: prints only the removed stats if nothing was added output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - /home/jane/repo/pkg-1 | ${chalk.red('-100')} ${R.repeat(SUB, 12).join('')}` + pkg-1 | ${chalk.red('-100')} ${R.repeat(SUB, 12).join('')}` ) }, complete: () => t.end(), @@ -854,7 +854,7 @@ test('recursive installation: prints only the removed stats if nothing was added }) test('recursive installation: prints at least one remove sign when removed !== 0', t => { - const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50}) + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50, cwd: '/home/jane/repo'}) statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ added: 100, prefix: '/home/jane/repo/pkg-1' }) @@ -864,7 +864,7 @@ test('recursive installation: prints at least one remove sign when removed !== 0 output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - /home/jane/repo/pkg-1 | ${chalk.red('-1')} ${chalk.green('+100')} ${SUB}${R.repeat(ADD, 8).join('')}` + pkg-1 | ${chalk.red('-1')} ${chalk.green('+100')} ${SUB}${R.repeat(ADD, 8).join('')}` ) }, complete: () => t.end(), @@ -873,7 +873,7 @@ test('recursive installation: prints at least one remove sign when removed !== 0 }) test('recursive installation: prints at least one add sign when added !== 0', t => { - const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50}) + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50, cwd: '/home/jane/repo'}) statsLogger.debug({ removed: 100, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ added: 1, prefix: '/home/jane/repo/pkg-1' }) @@ -883,7 +883,7 @@ test('recursive installation: prints at least one add sign when added !== 0', t output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - /home/jane/repo/pkg-1 | ${chalk.red('-100')} ${chalk.green('+1')} ${R.repeat(SUB, 8).join('')}${ADD}` + pkg-1 | ${chalk.red('-100')} ${chalk.green('+1')} ${R.repeat(SUB, 8).join('')}${ADD}` ) }, complete: () => t.end(), From aaad20391d9a4220b8ab5f340a0d312732e70642 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 3 Apr 2018 21:35:19 +0300 Subject: [PATCH 164/196] fix: prefix length in stats view --- package.json | 2 +- shrinkwrap.yaml | 19 +++++++++++++++++-- src/reporterForClient.ts | 11 ++++++----- test/index.ts | 2 +- typings/local.d.ts | 5 +++++ 5 files changed, 30 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index c4dbbb9634..434b3a06b5 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "right-pad": "^1.0.1", "semver": "^5.4.1", "stacktracey": "^1.2.87", - "strip-ansi": "^4.0.0", + "string-length": "^2.0.0", "zen-push": "^0.2.1" }, "devDependencies": { diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 130c311bbc..d6b8afd331 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -17,7 +17,7 @@ dependencies: right-pad: 1.0.1 semver: 5.5.0 stacktracey: 1.2.100 - strip-ansi: 4.0.0 + string-length: 2.0.0 zen-push: 0.2.1 devDependencies: '@pnpm/logger': 1.0.1 @@ -490,6 +490,12 @@ packages: node: '>=0.8' resolution: integrity: sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + /astral-regex/1.0.0: + dev: false + engines: + node: '>=4' + resolution: + integrity: sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== /asynckit/0.4.0: dev: true resolution: @@ -3171,6 +3177,15 @@ packages: dev: true resolution: integrity: sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= + /string-length/2.0.0: + dependencies: + astral-regex: 1.0.0 + strip-ansi: 4.0.0 + dev: false + engines: + node: '>=4' + resolution: + integrity: sha1-1A27aGo6zpYMHP/KVivyxF+DY+0= /string-width/1.0.2: dependencies: code-point-at: 1.1.0 @@ -3736,7 +3751,7 @@ specifiers: rimraf: ^2.5.4 semver: ^5.4.1 stacktracey: ^1.2.87 - strip-ansi: ^4.0.0 + string-length: ^2.0.0 supi: ^0.15.0 tape: ^4.8.0 ts-node: ^5.0.0 diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 2eb08e68a9..e2f23202a1 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -7,7 +7,7 @@ import prettyBytes = require('pretty-bytes') import R = require('ramda') import rightPad = require('right-pad') import semver = require('semver') -import stripAnsi = require('strip-ansi') +import stringLength = require('string-length') import { DeprecationLog, InstallCheckLog, @@ -302,7 +302,7 @@ export default function ( let prefix = path.relative(cwd, stats['prefix']) prefix = prefix.length <= PREFIX_MAX_LENGTH ? prefix - : `...${prefix.substr(-PREFIX_MAX_LENGTH)}` + : `...${prefix.substr(-PREFIX_MAX_LENGTH + 3)}` let msg = `${rightPad(prefix, PREFIX_MAX_LENGTH)} |` @@ -314,13 +314,14 @@ export default function ( statsChunk += ' ' + chalk.green(`+${stats['added']}`) } - if (stripAnsi(statsChunk).length < 5) { - msg += R.repeat(' ', 5 - stripAnsi(statsChunk).length).join('') + const statsChunkLength = stringLength(statsChunk) + if (statsChunkLength < 5) { + msg += R.repeat(' ', 5 - statsChunkLength).join('') } msg += statsChunk - const rest = Math.max(0, width - 1 - stripAnsi(msg).length) + const rest = Math.max(0, width - 1 - stringLength(msg)) msg += ' ' + printPlusesAndMinuses(rest, (stats['added'] || 0), (stats['removed'] || 0)) return most.of({msg}) }), diff --git a/test/index.ts b/test/index.ts index 2d2a09fd28..e3e9ea6fd9 100644 --- a/test/index.ts +++ b/test/index.ts @@ -807,7 +807,7 @@ test('prints added/removed stats during recursive installation', t => { pkg-1 | ${chalk.red('-1')} ${chalk.green('+5')} ${SUB}${ADD + ADD + ADD + ADD + ADD} pkg-2 | ${chalk.green('+2')} ${ADD + ADD} pkg-3 | ${chalk.green('+1')} ${ADD} - ...oooooooooooooooooooooong/pkg-4 | ${chalk.red('-1')} ${SUB}` + ...ooooooooooooooooooong/pkg-4 | ${chalk.red('-1')} ${SUB}` ) }, complete: () => t.end(), diff --git a/typings/local.d.ts b/typings/local.d.ts index 8d62091a09..df73df8dfa 100644 --- a/typings/local.d.ts +++ b/typings/local.d.ts @@ -37,3 +37,8 @@ declare module 'right-pad' { const anything: any; export = anything; } + +declare module 'string-length' { + function stringLength (s: string): number; + export = stringLength; +} From 9e140a3c1a6ff0f50909fa301551e6a77c3e346e Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 3 Apr 2018 22:00:22 +0300 Subject: [PATCH 165/196] fix: try to cut path by dir --- package.json | 3 ++- shrinkwrap.yaml | 4 ++-- src/reporterForClient.ts | 24 ++++++++++++++++++++---- test/index.ts | 18 +++++++++--------- typings/local.d.ts | 5 +++++ 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 434b3a06b5..49eb6aba6b 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "bin": "lib/bin/pnpm-default-reporter.js", "scripts": { "lint": "tslint -c tslint.json --project .", - "pretty-test": "ts-node test | tap-diff", + "pretty-test": "preview && ts-node test | tap-diff", "test": "npm run lint && npm run just-test", "just-test": "preview && ts-node test --type-check", "tsc": "rimraf lib && tsc", @@ -53,6 +53,7 @@ "most": "^1.7.2", "most-last": "^1.0.0", "ndjson": "^1.5.0", + "normalize-path": "^2.1.1", "pretty-bytes": "^4.0.2", "ramda": "^0.25.0", "right-pad": "^1.0.1", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index d6b8afd331..f0431d52d0 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -11,6 +11,7 @@ dependencies: most: 1.7.3 most-last: 1.0.0 ndjson: 1.5.0 + normalize-path: 2.1.1 pnpm-default-reporter: 'link:../__package_previews__/pnpm-default-reporter/pnpm-default-reporter' pretty-bytes: 4.0.2 ramda: 0.25.0 @@ -2251,7 +2252,6 @@ packages: /normalize-path/2.1.1: dependencies: remove-trailing-separator: 1.1.0 - dev: true engines: node: '>=0.10.0' resolution: @@ -2852,7 +2852,6 @@ packages: resolution: integrity: sha512-h9Pl2xE1ZxYOhlKh0nYeMfzfv0GYUfglE5Eb0ILFFUiDnvVcbKwxGGukETEeIteR0JTVfesOaKqiwrOoUz1ajw== /remove-trailing-separator/1.1.0: - dev: true resolution: integrity: sha1-wkvOKig62tW8P1jg1IJJuSN52O8= /rename-overwrite/1.0.2: @@ -3744,6 +3743,7 @@ specifiers: most-last: ^1.0.0 ndjson: ^1.5.0 normalize-newline: ^3.0.0 + normalize-path: ^2.1.1 package-preview: ^1.0.0 pretty-bytes: ^4.0.2 ramda: ^0.25.0 diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index e2f23202a1..4c889aac96 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -1,6 +1,7 @@ import chalk from 'chalk' import most = require('most') import {last as mostLast} from 'most-last' +import normalize = require('normalize-path') import os = require('os') import path = require('path') import prettyBytes = require('pretty-bytes') @@ -299,10 +300,7 @@ export default function ( }, {}) .filter((stats) => stats !== null && (stats['removed'] || stats['added'])) .map((stats) => { - let prefix = path.relative(cwd, stats['prefix']) - prefix = prefix.length <= PREFIX_MAX_LENGTH - ? prefix - : `...${prefix.substr(-PREFIX_MAX_LENGTH + 3)}` + const prefix = formatPrefix(cwd, stats['prefix']) let msg = `${rightPad(prefix, PREFIX_MAX_LENGTH)} |` @@ -344,6 +342,24 @@ export default function ( return outputs } +function formatPrefix (cwd: string, prefix: string) { + prefix = normalize(path.relative(cwd, prefix)) + + if (prefix.length <= PREFIX_MAX_LENGTH) { + return prefix + } + + const shortPrefix = prefix.substr(-PREFIX_MAX_LENGTH + 3) + + const separatorLocation = shortPrefix.indexOf('/') + + if (separatorLocation <= 0) { + return `...${shortPrefix}` + } + + return `...${shortPrefix.substr(separatorLocation)}` +} + function printPlusesAndMinuses (maxWidth: number, addSigns: number, removeSigns: number) { const changes = addSigns + removeSigns if (changes > maxWidth) { diff --git a/test/index.ts b/test/index.ts index e3e9ea6fd9..64c53ddce8 100644 --- a/test/index.ts +++ b/test/index.ts @@ -790,14 +790,14 @@ test('prints added/removed stats during recursive installation', t => { statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-5' }) statsLogger.debug({ added: 0, prefix: '/home/jane/repo/pkg-5' }) - statsLogger.debug({ added: 2, prefix: '/home/jane/repo/pkg-2' }) + statsLogger.debug({ added: 2, prefix: '/home/jane/repo/dir/pkg-2' }) statsLogger.debug({ added: 5, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/pkg-1' }) - statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-2' }) - statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-3' }) - statsLogger.debug({ added: 1, prefix: '/home/jane/repo/pkg-3' }) - statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/loooooooooooooooooooooooong/pkg-4' }) - statsLogger.debug({ added: 0, prefix: '/home/jane/repo/loooooooooooooooooooooooong/pkg-4' }) + statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/dir/pkg-2' }) + statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/loooooooooooooooooooooooong/pkg-3' }) + statsLogger.debug({ added: 1, prefix: '/home/jane/repo/loooooooooooooooooooooooong/pkg-3' }) + statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/loooooooooooooooooooooooong-pkg-4' }) + statsLogger.debug({ added: 0, prefix: '/home/jane/repo/loooooooooooooooooooooooong-pkg-4' }) t.plan(1) @@ -805,9 +805,9 @@ test('prints added/removed stats during recursive installation', t => { next: output => { t.equal(output, stripIndents` pkg-1 | ${chalk.red('-1')} ${chalk.green('+5')} ${SUB}${ADD + ADD + ADD + ADD + ADD} - pkg-2 | ${chalk.green('+2')} ${ADD + ADD} - pkg-3 | ${chalk.green('+1')} ${ADD} - ...ooooooooooooooooooong/pkg-4 | ${chalk.red('-1')} ${SUB}` + dir/pkg-2 | ${chalk.green('+2')} ${ADD + ADD} + .../pkg-3 | ${chalk.green('+1')} ${ADD} + ...ooooooooooooooooooong-pkg-4 | ${chalk.red('-1')} ${SUB}` ) }, complete: () => t.end(), diff --git a/typings/local.d.ts b/typings/local.d.ts index df73df8dfa..4c2479a7f6 100644 --- a/typings/local.d.ts +++ b/typings/local.d.ts @@ -42,3 +42,8 @@ declare module 'string-length' { function stringLength (s: string): number; export = stringLength; } + +declare module 'normalize-path' { + function normalize (path: string): string; + export = normalize; +} From 35ffae8902c8b12e543c31d0c32be2373fd4f03b Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 3 Apr 2018 22:07:42 +0300 Subject: [PATCH 166/196] feat: print one +/- per 10 pkgs when showing stats for recursive --- src/reporterForClient.ts | 7 ++++++- test/index.ts | 12 ++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 4c889aac96..8743a41e77 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -320,7 +320,7 @@ export default function ( msg += statsChunk const rest = Math.max(0, width - 1 - stringLength(msg)) - msg += ' ' + printPlusesAndMinuses(rest, (stats['added'] || 0), (stats['removed'] || 0)) + msg += ' ' + printPlusesAndMinuses(rest, roundStats(stats['added'] || 0), roundStats(stats['removed'] || 0)) return most.of({msg}) }), ) @@ -342,6 +342,11 @@ export default function ( return outputs } +function roundStats (stat: number): number { + if (stat === 0) return 0 + return Math.max(1, Math.round(stat / 10)) +} + function formatPrefix (cwd: string, prefix: string) { prefix = normalize(path.relative(cwd, prefix)) diff --git a/test/index.ts b/test/index.ts index 64c53ddce8..3c1eb69a38 100644 --- a/test/index.ts +++ b/test/index.ts @@ -804,8 +804,8 @@ test('prints added/removed stats during recursive installation', t => { output$.skip(3).take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - pkg-1 | ${chalk.red('-1')} ${chalk.green('+5')} ${SUB}${ADD + ADD + ADD + ADD + ADD} - dir/pkg-2 | ${chalk.green('+2')} ${ADD + ADD} + pkg-1 | ${chalk.red('-1')} ${chalk.green('+5')} ${SUB}${ADD} + dir/pkg-2 | ${chalk.green('+2')} ${ADD} .../pkg-3 | ${chalk.green('+1')} ${ADD} ...ooooooooooooooooooong-pkg-4 | ${chalk.red('-1')} ${SUB}` ) @@ -819,14 +819,14 @@ test('recursive installation: prints only the added stats if nothing was removed const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50, cwd: '/home/jane/repo'}) statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-1' }) - statsLogger.debug({ added: 100, prefix: '/home/jane/repo/pkg-1' }) + statsLogger.debug({ added: 190, prefix: '/home/jane/repo/pkg-1' }) t.plan(1) output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - pkg-1 | ${chalk.green('+100')} ${R.repeat(ADD, 12).join('')}` + pkg-1 | ${chalk.green('+190')} ${R.repeat(ADD, 12).join('')}` ) }, complete: () => t.end(), @@ -837,7 +837,7 @@ test('recursive installation: prints only the added stats if nothing was removed test('recursive installation: prints only the removed stats if nothing was added and a lot removed', t => { const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50, cwd: '/home/jane/repo'}) - statsLogger.debug({ removed: 100, prefix: '/home/jane/repo/pkg-1' }) + statsLogger.debug({ removed: 190, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ added: 0, prefix: '/home/jane/repo/pkg-1' }) t.plan(1) @@ -845,7 +845,7 @@ test('recursive installation: prints only the removed stats if nothing was added output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - pkg-1 | ${chalk.red('-100')} ${R.repeat(SUB, 12).join('')}` + pkg-1 | ${chalk.red('-190')} ${R.repeat(SUB, 12).join('')}` ) }, complete: () => t.end(), From 7526a9a06decde22b794ddaec979f7a9420f6e11 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 3 Apr 2018 22:31:12 +0300 Subject: [PATCH 167/196] feat: use more consistent spacings in stats --- src/reporterForClient.ts | 21 +++++++++++---------- test/index.ts | 10 +++++----- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 8743a41e77..87a4cf4fdd 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -304,21 +304,13 @@ export default function ( let msg = `${rightPad(prefix, PREFIX_MAX_LENGTH)} |` - let statsChunk = '' if (stats['removed']) { - statsChunk += ' ' + chalk.red(`-${stats['removed']}`) + msg += ` ${padStep(chalk.red(`-${stats['removed']}`), 4)}` } if (stats['added']) { - statsChunk += ' ' + chalk.green(`+${stats['added']}`) + msg += ` ${padStep(chalk.green(`+${stats['added']}`), 4)}` } - const statsChunkLength = stringLength(statsChunk) - if (statsChunkLength < 5) { - msg += R.repeat(' ', 5 - statsChunkLength).join('') - } - - msg += statsChunk - const rest = Math.max(0, width - 1 - stringLength(msg)) msg += ' ' + printPlusesAndMinuses(rest, roundStats(stats['added'] || 0), roundStats(stats['removed'] || 0)) return most.of({msg}) @@ -342,6 +334,15 @@ export default function ( return outputs } +function padStep (s: string, step: number) { + const sLength = stringLength(s) + const placeholderLength = Math.ceil(sLength / step) * step + if (sLength < placeholderLength) { + return R.repeat(' ', placeholderLength - sLength).join('') + s + } + return s +} + function roundStats (stat: number): number { if (stat === 0) return 0 return Math.max(1, Math.round(stat / 10)) diff --git a/test/index.ts b/test/index.ts index 3c1eb69a38..7efcb1f6b7 100644 --- a/test/index.ts +++ b/test/index.ts @@ -804,7 +804,7 @@ test('prints added/removed stats during recursive installation', t => { output$.skip(3).take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - pkg-1 | ${chalk.red('-1')} ${chalk.green('+5')} ${SUB}${ADD} + pkg-1 | ${chalk.red('-1')} ${chalk.green('+5')} ${SUB}${ADD} dir/pkg-2 | ${chalk.green('+2')} ${ADD} .../pkg-3 | ${chalk.green('+1')} ${ADD} ...ooooooooooooooooooong-pkg-4 | ${chalk.red('-1')} ${SUB}` @@ -854,7 +854,7 @@ test('recursive installation: prints only the removed stats if nothing was added }) test('recursive installation: prints at least one remove sign when removed !== 0', t => { - const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50, cwd: '/home/jane/repo'}) + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 52, cwd: '/home/jane/repo'}) statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ added: 100, prefix: '/home/jane/repo/pkg-1' }) @@ -864,7 +864,7 @@ test('recursive installation: prints at least one remove sign when removed !== 0 output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - pkg-1 | ${chalk.red('-1')} ${chalk.green('+100')} ${SUB}${R.repeat(ADD, 8).join('')}` + pkg-1 | ${chalk.red('-1')} ${chalk.green('+100')} ${SUB}${R.repeat(ADD, 8).join('')}` ) }, complete: () => t.end(), @@ -873,7 +873,7 @@ test('recursive installation: prints at least one remove sign when removed !== 0 }) test('recursive installation: prints at least one add sign when added !== 0', t => { - const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50, cwd: '/home/jane/repo'}) + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 52, cwd: '/home/jane/repo'}) statsLogger.debug({ removed: 100, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ added: 1, prefix: '/home/jane/repo/pkg-1' }) @@ -883,7 +883,7 @@ test('recursive installation: prints at least one add sign when added !== 0', t output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - pkg-1 | ${chalk.red('-100')} ${chalk.green('+1')} ${R.repeat(SUB, 8).join('')}${ADD}` + pkg-1 | ${chalk.red('-100')} ${chalk.green('+1')} ${R.repeat(SUB, 8).join('')}${ADD}` ) }, complete: () => t.end(), From a06b9a9a1b35bf6b1c74cbd2ff166bccc725ad46 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 3 Apr 2018 22:58:25 +0300 Subject: [PATCH 168/196] feat: increase path placeholder to 40 chars --- src/reporterForClient.ts | 3 ++- test/index.ts | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 87a4cf4fdd..6023d8057d 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -32,7 +32,7 @@ const removedSign = chalk.red('-') const linkSign = chalk.magentaBright('#') const hlValue = chalk.blue const hlPkgId = chalk['whiteBright'] -const PREFIX_MAX_LENGTH = 30 +const PREFIX_MAX_LENGTH = 40 export default function ( log$: { @@ -367,6 +367,7 @@ function formatPrefix (cwd: string, prefix: string) { } function printPlusesAndMinuses (maxWidth: number, addSigns: number, removeSigns: number) { + if (maxWidth === 0) return '' const changes = addSigns + removeSigns if (changes > maxWidth) { if (!addSigns) { diff --git a/test/index.ts b/test/index.ts index 7efcb1f6b7..dcb85a2177 100644 --- a/test/index.ts +++ b/test/index.ts @@ -794,20 +794,20 @@ test('prints added/removed stats during recursive installation', t => { statsLogger.debug({ added: 5, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/dir/pkg-2' }) - statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/loooooooooooooooooooooooong/pkg-3' }) - statsLogger.debug({ added: 1, prefix: '/home/jane/repo/loooooooooooooooooooooooong/pkg-3' }) - statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/loooooooooooooooooooooooong-pkg-4' }) - statsLogger.debug({ added: 0, prefix: '/home/jane/repo/loooooooooooooooooooooooong-pkg-4' }) + statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/loooooooooooooooooooooooooooooooooong/pkg-3' }) + statsLogger.debug({ added: 1, prefix: '/home/jane/repo/loooooooooooooooooooooooooooooooooong/pkg-3' }) + statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/loooooooooooooooooooooooooooooooooong-pkg-4' }) + statsLogger.debug({ added: 0, prefix: '/home/jane/repo/loooooooooooooooooooooooooooooooooong-pkg-4' }) t.plan(1) output$.skip(3).take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - pkg-1 | ${chalk.red('-1')} ${chalk.green('+5')} ${SUB}${ADD} - dir/pkg-2 | ${chalk.green('+2')} ${ADD} - .../pkg-3 | ${chalk.green('+1')} ${ADD} - ...ooooooooooooooooooong-pkg-4 | ${chalk.red('-1')} ${SUB}` + pkg-1 | ${chalk.red('-1')} ${chalk.green('+5')} ${SUB}${ADD} + dir/pkg-2 | ${chalk.green('+2')} ${ADD} + .../pkg-3 | ${chalk.green('+1')} ${ADD} + ...ooooooooooooooooooooooooooooong-pkg-4 | ${chalk.red('-1')} ${SUB}` ) }, complete: () => t.end(), @@ -816,7 +816,7 @@ test('prints added/removed stats during recursive installation', t => { }) test('recursive installation: prints only the added stats if nothing was removed and a lot added', t => { - const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50, cwd: '/home/jane/repo'}) + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 60, cwd: '/home/jane/repo'}) statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ added: 190, prefix: '/home/jane/repo/pkg-1' }) @@ -826,7 +826,7 @@ test('recursive installation: prints only the added stats if nothing was removed output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - pkg-1 | ${chalk.green('+190')} ${R.repeat(ADD, 12).join('')}` + pkg-1 | ${chalk.green('+190')} ${R.repeat(ADD, 12).join('')}` ) }, complete: () => t.end(), @@ -835,7 +835,7 @@ test('recursive installation: prints only the added stats if nothing was removed }) test('recursive installation: prints only the removed stats if nothing was added and a lot removed', t => { - const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 50, cwd: '/home/jane/repo'}) + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 60, cwd: '/home/jane/repo'}) statsLogger.debug({ removed: 190, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ added: 0, prefix: '/home/jane/repo/pkg-1' }) @@ -845,7 +845,7 @@ test('recursive installation: prints only the removed stats if nothing was added output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - pkg-1 | ${chalk.red('-190')} ${R.repeat(SUB, 12).join('')}` + pkg-1 | ${chalk.red('-190')} ${R.repeat(SUB, 12).join('')}` ) }, complete: () => t.end(), @@ -854,7 +854,7 @@ test('recursive installation: prints only the removed stats if nothing was added }) test('recursive installation: prints at least one remove sign when removed !== 0', t => { - const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 52, cwd: '/home/jane/repo'}) + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 62, cwd: '/home/jane/repo'}) statsLogger.debug({ removed: 1, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ added: 100, prefix: '/home/jane/repo/pkg-1' }) @@ -864,7 +864,7 @@ test('recursive installation: prints at least one remove sign when removed !== 0 output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - pkg-1 | ${chalk.red('-1')} ${chalk.green('+100')} ${SUB}${R.repeat(ADD, 8).join('')}` + pkg-1 | ${chalk.red('-1')} ${chalk.green('+100')} ${SUB}${R.repeat(ADD, 8).join('')}` ) }, complete: () => t.end(), @@ -873,7 +873,7 @@ test('recursive installation: prints at least one remove sign when removed !== 0 }) test('recursive installation: prints at least one add sign when added !== 0', t => { - const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 52, cwd: '/home/jane/repo'}) + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', width: 62, cwd: '/home/jane/repo'}) statsLogger.debug({ removed: 100, prefix: '/home/jane/repo/pkg-1' }) statsLogger.debug({ added: 1, prefix: '/home/jane/repo/pkg-1' }) @@ -883,7 +883,7 @@ test('recursive installation: prints at least one add sign when added !== 0', t output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - pkg-1 | ${chalk.red('-100')} ${chalk.green('+1')} ${R.repeat(SUB, 8).join('')}${ADD}` + pkg-1 | ${chalk.red('-100')} ${chalk.green('+1')} ${R.repeat(SUB, 8).join('')}${ADD}` ) }, complete: () => t.end(), From 822a6a980cfdce70db28c8026c8a4972bddf873f Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 3 Apr 2018 22:58:31 +0300 Subject: [PATCH 169/196] chore(release): 0.15.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49eb6aba6b..e70c38cab2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.15.0", + "version": "0.15.1", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 70703f7282bb3827fd59ddf09683577dae28c823 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 4 Apr 2018 01:21:18 +0300 Subject: [PATCH 170/196] fix: should not fail when recursive installing cwd package --- src/reporterForClient.ts | 2 +- test/index.ts | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 6023d8057d..db6ba69a5c 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -349,7 +349,7 @@ function roundStats (stat: number): number { } function formatPrefix (cwd: string, prefix: string) { - prefix = normalize(path.relative(cwd, prefix)) + prefix = normalize(path.relative(cwd, prefix) || '.') if (prefix.length <= PREFIX_MAX_LENGTH) { return prefix diff --git a/test/index.ts b/test/index.ts index dcb85a2177..541ce72fb6 100644 --- a/test/index.ts +++ b/test/index.ts @@ -788,6 +788,8 @@ test('prints just removed during uninstallation', t => { test('prints added/removed stats during recursive installation', t => { const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', cwd: '/home/jane/repo'}) + statsLogger.debug({ removed: 1, prefix: '/home/jane/repo' }) + statsLogger.debug({ added: 0, prefix: '/home/jane/repo' }) statsLogger.debug({ removed: 0, prefix: '/home/jane/repo/pkg-5' }) statsLogger.debug({ added: 0, prefix: '/home/jane/repo/pkg-5' }) statsLogger.debug({ added: 2, prefix: '/home/jane/repo/dir/pkg-2' }) @@ -801,9 +803,10 @@ test('prints added/removed stats during recursive installation', t => { t.plan(1) - output$.skip(3).take(1).map(normalizeNewline).subscribe({ + output$.skip(4).take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` + . | ${chalk.red('-1')} ${SUB} pkg-1 | ${chalk.red('-1')} ${chalk.green('+5')} ${SUB}${ADD} dir/pkg-2 | ${chalk.green('+2')} ${ADD} .../pkg-3 | ${chalk.green('+1')} ${ADD} From e521c90a51e11577cbbfee56a89476c663dc6800 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 4 Apr 2018 01:25:02 +0300 Subject: [PATCH 171/196] chore(release): 0.15.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e70c38cab2..d00f13bc4f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.15.1", + "version": "0.15.2", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 74caa4a915db615616d4151d0d607d239b1d253c Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 7 Apr 2018 00:24:12 +0300 Subject: [PATCH 172/196] feat: print added stats before removed, like git does it --- src/reporterForClient.ts | 14 +++++++------- test/index.ts | 18 +++++++++--------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index db6ba69a5c..80220b2364 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -245,12 +245,12 @@ export default function ( } let msg = 'Packages:' - if (stats['removed']) { - msg += ' ' + chalk.red(`-${stats['removed']}`) - } if (stats['added']) { msg += ' ' + chalk.green(`+${stats['added']}`) } + if (stats['removed']) { + msg += ' ' + chalk.red(`-${stats['removed']}`) + } msg += EOL + printPlusesAndMinuses(width, (stats['added'] || 0), (stats['removed'] || 0)) return most.of({msg}) }), @@ -304,12 +304,12 @@ export default function ( let msg = `${rightPad(prefix, PREFIX_MAX_LENGTH)} |` - if (stats['removed']) { - msg += ` ${padStep(chalk.red(`-${stats['removed']}`), 4)}` - } if (stats['added']) { msg += ` ${padStep(chalk.green(`+${stats['added']}`), 4)}` } + if (stats['removed']) { + msg += ` ${padStep(chalk.red(`-${stats['removed']}`), 4)}` + } const rest = Math.max(0, width - 1 - stringLength(msg)) msg += ' ' + printPlusesAndMinuses(rest, roundStats(stats['added'] || 0), roundStats(stats['removed'] || 0)) @@ -382,7 +382,7 @@ function printPlusesAndMinuses (maxWidth: number, addSigns: number, removeSigns: removeSigns = maxWidth - addSigns } } - return R.repeat(removedSign, removeSigns).join('') + R.repeat(addedSign, addSigns).join('') + return R.repeat(addedSign, addSigns).join('') + R.repeat(removedSign, removeSigns).join('') } function printDiffs (pkgsDiff: PackageDiff[]) { diff --git a/test/index.ts b/test/index.ts index 541ce72fb6..a0c08b3f95 100644 --- a/test/index.ts +++ b/test/index.ts @@ -617,8 +617,8 @@ test('prints added/removed stats during installation', t => { output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - Packages: ${chalk.red('-1')} ${chalk.green('+5')} - ${SUB}${ADD + ADD + ADD + ADD + ADD}` + Packages: ${chalk.green('+5')} ${chalk.red('-1')} + ${ADD + ADD + ADD + ADD + ADD + SUB}` ) }, complete: () => t.end(), @@ -737,8 +737,8 @@ test('prints at least one remove sign when removed !== 0', t => { output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - Packages: ${chalk.red('-1')} ${chalk.green('+100')} - ${SUB}${R.repeat(ADD, 19).join('')}` + Packages: ${chalk.green('+100')} ${chalk.red('-1')} + ${R.repeat(ADD, 19).join('') + SUB}` ) }, complete: () => t.end(), @@ -757,8 +757,8 @@ test('prints at least one add sign when added !== 0', t => { output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - Packages: ${chalk.red('-100')} ${chalk.green('+1')} - ${R.repeat(SUB, 19).join('')}${ADD}` + Packages: ${chalk.green('+1')} ${chalk.red('-100')} + ${ADD + R.repeat(SUB, 19).join('')}` ) }, complete: () => t.end(), @@ -807,7 +807,7 @@ test('prints added/removed stats during recursive installation', t => { next: output => { t.equal(output, stripIndents` . | ${chalk.red('-1')} ${SUB} - pkg-1 | ${chalk.red('-1')} ${chalk.green('+5')} ${SUB}${ADD} + pkg-1 | ${chalk.green('+5')} ${chalk.red('-1')} ${ADD + SUB} dir/pkg-2 | ${chalk.green('+2')} ${ADD} .../pkg-3 | ${chalk.green('+1')} ${ADD} ...ooooooooooooooooooooooooooooong-pkg-4 | ${chalk.red('-1')} ${SUB}` @@ -867,7 +867,7 @@ test('recursive installation: prints at least one remove sign when removed !== 0 output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - pkg-1 | ${chalk.red('-1')} ${chalk.green('+100')} ${SUB}${R.repeat(ADD, 8).join('')}` + pkg-1 | ${chalk.green('+100')} ${chalk.red('-1')} ${R.repeat(ADD, 8).join('') + SUB}` ) }, complete: () => t.end(), @@ -886,7 +886,7 @@ test('recursive installation: prints at least one add sign when added !== 0', t output$.take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - pkg-1 | ${chalk.red('-100')} ${chalk.green('+1')} ${R.repeat(SUB, 8).join('')}${ADD}` + pkg-1 | ${chalk.green('+1')} ${chalk.red('-100')} ${ADD + R.repeat(SUB, 8).join('')}` ) }, complete: () => t.end(), From 806c0997925c1951078a87735793396d083c6ad9 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 7 Apr 2018 01:47:05 +0300 Subject: [PATCH 173/196] chore(release): 0.15.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d00f13bc4f..df73a38a13 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.15.2", + "version": "0.15.3", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 253a888c48bc6d276c5b9031372b18962c8dd1a6 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 7 Apr 2018 21:37:14 +0300 Subject: [PATCH 174/196] refactor: better naming of variables --- src/reporterForClient.ts | 42 +++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 80220b2364..7a7ac2e6e2 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -27,12 +27,13 @@ import reportError from './reportError' const BIG_TARBALL_SIZE = 1024 * 1024 * 5 // 5 MB -const addedSign = chalk.green('+') -const removedSign = chalk.red('-') -const linkSign = chalk.magentaBright('#') +const ADDED_CHAR = chalk.green('+') +const REMOVED_CHAR = chalk.red('-') +const LINKED_CHAR = chalk.magentaBright('#') +const PREFIX_MAX_LENGTH = 40 + const hlValue = chalk.blue const hlPkgId = chalk['whiteBright'] -const PREFIX_MAX_LENGTH = 40 export default function ( log$: { @@ -366,23 +367,28 @@ function formatPrefix (cwd: string, prefix: string) { return `...${shortPrefix.substr(separatorLocation)}` } -function printPlusesAndMinuses (maxWidth: number, addSigns: number, removeSigns: number) { +function printPlusesAndMinuses (maxWidth: number, added: number, removed: number) { if (maxWidth === 0) return '' - const changes = addSigns + removeSigns + const changes = added + removed + let addedChars: number + let removedChars: number if (changes > maxWidth) { - if (!addSigns) { - addSigns = 0 - removeSigns = maxWidth - } else if (!removeSigns) { - addSigns = maxWidth - removeSigns = 0 + if (!added) { + addedChars = 0 + removedChars = maxWidth + } else if (!removed) { + addedChars = maxWidth + removedChars = 0 } else { const p = maxWidth / changes - addSigns = Math.min(Math.max(Math.floor(addSigns * p), 1), maxWidth - 1) - removeSigns = maxWidth - addSigns + addedChars = Math.min(Math.max(Math.floor(added * p), 1), maxWidth - 1) + removedChars = maxWidth - addedChars } + } else { + addedChars = added + removedChars = removed } - return R.repeat(addedSign, addSigns).join('') + R.repeat(removedSign, removeSigns).join('') + return `${R.repeat(ADDED_CHAR, addedChars).join('')}${R.repeat(REMOVED_CHAR, removedChars).join('')}` } function printDiffs (pkgsDiff: PackageDiff[]) { @@ -393,10 +399,10 @@ function printDiffs (pkgsDiff: PackageDiff[]) { pkgsDiff.sort((a, b) => (a.name.localeCompare(b.name) * 10 + (Number(!b.added) - Number(!a.added)))) const msg = pkgsDiff.map((pkg) => { let result = pkg.added - ? addedSign + ? ADDED_CHAR : pkg.linked - ? linkSign - : removedSign + ? LINKED_CHAR + : REMOVED_CHAR if (!pkg.realName || pkg.name === pkg.realName) { result += ` ${pkg.name}` } else { From aebf13333eea9c01dc5321c773a61bda74b92888 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sat, 7 Apr 2018 23:18:49 +0300 Subject: [PATCH 175/196] feat: lifecycle reporting prints 3 lines of the output --- package.json | 1 + shrinkwrap.yaml | 23 ++++++++++++----------- src/reporterForClient.ts | 27 ++++++++++++++++++--------- test/index.ts | 24 ++++++++++++------------ typings/local.d.ts | 5 +++++ 5 files changed, 48 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index df73a38a13..e9f21b35fa 100644 --- a/package.json +++ b/package.json @@ -60,6 +60,7 @@ "semver": "^5.4.1", "stacktracey": "^1.2.87", "string-length": "^2.0.0", + "string.prototype.padstart": "^3.0.0", "zen-push": "^0.2.1" }, "devDependencies": { diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index f0431d52d0..2d837c4a08 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -19,6 +19,7 @@ dependencies: semver: 5.5.0 stacktracey: 1.2.100 string-length: 2.0.0 + string.prototype.padstart: 3.0.0 zen-push: 0.2.1 devDependencies: '@pnpm/logger': 1.0.1 @@ -943,7 +944,6 @@ packages: dependencies: foreach: 2.0.5 object-keys: 1.0.11 - dev: true engines: node: '>= 0.4' resolution: @@ -1073,7 +1073,6 @@ packages: has: 1.0.1 is-callable: 1.1.3 is-regex: 1.0.4 - dev: true engines: node: '>= 0.4' resolution: @@ -1083,7 +1082,6 @@ packages: is-callable: 1.1.3 is-date-object: 1.0.1 is-symbol: 1.0.1 - dev: true engines: node: '>= 0.4' resolution: @@ -1297,7 +1295,6 @@ packages: resolution: integrity: sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= /foreach/2.0.5: - dev: true resolution: integrity: sha1-C+4AUBiusmDQo6865ljdATbsG5k= /forever-agent/0.6.1: @@ -1352,7 +1349,6 @@ packages: resolution: integrity: sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE= /function-bind/1.1.1: - dev: true resolution: integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== /gauge/2.7.4: @@ -1534,7 +1530,6 @@ packages: /has/1.0.1: dependencies: function-bind: 1.1.1 - dev: true engines: node: '>= 0.8.0' resolution: @@ -1661,7 +1656,6 @@ packages: resolution: integrity: sha1-XuWOqlounIDiFAe+3yOuWsCRs/w= /is-callable/1.1.3: - dev: true engines: node: '>= 0.4' resolution: @@ -1673,7 +1667,6 @@ packages: resolution: integrity: sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg== /is-date-object/1.0.1: - dev: true engines: node: '>= 0.4' resolution: @@ -1791,7 +1784,6 @@ packages: /is-regex/1.0.4: dependencies: has: 1.0.1 - dev: true engines: node: '>= 0.4' resolution: @@ -1811,7 +1803,6 @@ packages: resolution: integrity: sha512-2H3vM92ez7TjW6T2e4G7AQVm/1/UA/qikNO0/aIi2SkouUU2wXW2CQ5Owiz8oaaFQpjNl74B5LIjTcM1htr2mQ== /is-symbol/1.0.1: - dev: true engines: node: '>= 0.4' resolution: @@ -2311,7 +2302,6 @@ packages: resolution: integrity: sha512-UmOFbHbwvv+XHj7BerrhVq+knjceBdkvU5AriwLMvhv2qi+e7DJzxfBeFpILEjVzCp+xA+W/pIf06RGPWlZNfw== /object-keys/1.0.11: - dev: true engines: node: '>= 0.4' resolution: @@ -3195,6 +3185,16 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + /string.prototype.padstart/3.0.0: + dependencies: + define-properties: 1.1.2 + es-abstract: 1.11.0 + function-bind: 1.1.1 + dev: false + engines: + node: '>= 0.4' + resolution: + integrity: sha1-W8+tOfRkm7LQMSkuGbzwtRDUskI= /string.prototype.trim/1.1.2: dependencies: define-properties: 1.1.2 @@ -3752,6 +3752,7 @@ specifiers: semver: ^5.4.1 stacktracey: ^1.2.87 string-length: ^2.0.0 + string.prototype.padstart: ^3.0.0 supi: ^0.15.0 tape: ^4.8.0 ts-node: ^5.0.0 diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 7a7ac2e6e2..60fdcde9fe 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -9,6 +9,7 @@ import R = require('ramda') import rightPad = require('right-pad') import semver = require('semver') import stringLength = require('string-length') +import padStart = require('string.prototype.padstart') import { DeprecationLog, InstallCheckLog, @@ -162,13 +163,19 @@ export default function ( outputs.push(tarballsProgressOutput$) - const lifecycleMessages: {[pkgId: string]: string} = {} + const lifecycleMessages: {[pkgId: string]: string[]} = {} const lifecycleOutput$ = most.of( log$.lifecycle .map((log: LifecycleLog) => { const key = `${log.script}:${log.pkgId}` - lifecycleMessages[key] = formatLifecycle(log) - return R.values(lifecycleMessages).join(EOL) + lifecycleMessages[key] = lifecycleMessages[key] || [] + if (!lifecycleMessages[key].length || log['exitCode'] !== 0) { + lifecycleMessages[key].push(formatLifecycle(log)) + } + if (lifecycleMessages[key].length > 3) { + lifecycleMessages[key].shift() + } + return R.unnest(R.values(lifecycleMessages)).join(EOL) }) .map((msg) => ({msg})), ) @@ -426,22 +433,24 @@ function printDiffs (pkgsDiff: PackageDiff[]) { } function formatLifecycle (logObj: LifecycleLog) { - const prefix = `Running ${hlValue(logObj.script)} for ${hlPkgId(logObj.pkgId)}` + const prefix = `${rightPad(logObj.pkgId, PREFIX_MAX_LENGTH)} | ${hlValue(padStart(logObj.script, 11))}: ` if (logObj['exitCode'] === 0) { - return `${prefix}, done` + return `${prefix}done` } const line = formatLine(logObj) if (logObj.level === 'error') { - return `${prefix}! ${line}` + return `${prefix}${line}` } - return `${prefix}: ${line}` + return `${prefix}${line}` } function formatLine (logObj: LifecycleLog) { if (typeof logObj['exitCode'] === 'number') return chalk.red(`Exited with ${logObj['exitCode']}`) - const color = logObj.level === 'error' ? chalk.red : chalk.gray - return color(logObj['line']) + if (logObj.level === 'error') { + return chalk.gray(logObj['line']) + } + return logObj['line'] } function formatInstallCheck (logObj: InstallCheckLog) { diff --git a/test/index.ts b/test/index.ts index a0c08b3f95..5fc4cc19a1 100644 --- a/test/index.ts +++ b/test/index.ts @@ -22,8 +22,8 @@ const h1 = chalk.blue const hlValue = chalk.blue const hlPkgId = chalk['whiteBright'] const POSTINSTALL = hlValue('postinstall') -const PREINSTALL = hlValue('preinstall') -const INSTALL = hlValue('install') +const PREINSTALL = hlValue(' preinstall') +const INSTALL = hlValue(' install') const progressLogger = logger('progress') const stageLogger = logger('stage') @@ -335,26 +335,26 @@ test('groups lifecycle output', t => { }) lifecycleLogger.debug({ pkgId: 'registry.npmjs.org/qar/1.0.0', - line: '...', + exitCode: 0, script: 'install', }) lifecycleLogger.debug({ - pkgId: 'registry.npmjs.org/qar/1.0.0', + pkgId: 'registry.npmjs.org/foo/1.0.0', exitCode: 0, - script: 'install', + script: 'postinstall', }) t.plan(1) - const childOutputColor = chalk.grey - - output$.skip(6).take(1).map(normalizeNewline).subscribe({ + output$.skip(5).take(1).map(normalizeNewline).subscribe({ next: output => { t.equal(output, stripIndents` - Running ${PREINSTALL} for ${hlPkgId('registry.npmjs.org/foo/1.0.0')}: ${childOutputColor('foo')} - Running ${POSTINSTALL} for ${hlPkgId('registry.npmjs.org/foo/1.0.0')}: ${childOutputColor('foo III')} - Running ${POSTINSTALL} for ${hlPkgId('registry.npmjs.org/bar/1.0.0')}: ${childOutputColor('bar I')} - Running ${INSTALL} for ${hlPkgId('registry.npmjs.org/qar/1.0.0')}, done + registry.npmjs.org/foo/1.0.0 | ${PREINSTALL}: foo + registry.npmjs.org/foo/1.0.0 | ${POSTINSTALL}: foo I + registry.npmjs.org/foo/1.0.0 | ${POSTINSTALL}: foo II + registry.npmjs.org/foo/1.0.0 | ${POSTINSTALL}: foo III + registry.npmjs.org/bar/1.0.0 | ${POSTINSTALL}: bar I + registry.npmjs.org/qar/1.0.0 | ${INSTALL}: done `) }, complete: () => t.end(), diff --git a/typings/local.d.ts b/typings/local.d.ts index 4c2479a7f6..2f737b0acd 100644 --- a/typings/local.d.ts +++ b/typings/local.d.ts @@ -47,3 +47,8 @@ declare module 'normalize-path' { function normalize (path: string): string; export = normalize; } + +declare module 'string.prototype.padstart' { + function padStart (s: string, targetLength: number, padString?: string): string; + export = padStart; +} From 66ac4324d8fbb8ceaa13e3c2e27de4fe6ce09f9b Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 8 Apr 2018 01:16:23 +0300 Subject: [PATCH 176/196] feat: require supi@0.16 BREAKING CHANGE: supi@0.16 is required --- package.json | 4 +- shrinkwrap.yaml | 204 ++++++++++++++++++++++++++++++--------- src/reporterForClient.ts | 4 +- test/index.ts | 28 +++--- 4 files changed, 174 insertions(+), 66 deletions(-) diff --git a/package.json b/package.json index e9f21b35fa..774033846a 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "supi": ">=0.15.0 <0.16.0" + "supi": ">=0.16.0 <0.17.0" }, "dependencies": { "@types/common-tags": "^1.2.5", @@ -73,7 +73,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.15.0", + "supi": "^0.16.0", "tape": "^4.8.0", "ts-node": "^5.0.0", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 2d837c4a08..775c371e33 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,6 +1,6 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 9.6.1 + '@types/node': 9.6.2 '@types/ramda': 0.25.21 '@types/semver': 5.5.0 '@types/strip-ansi': 3.0.0 @@ -31,7 +31,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.5 rimraf: 2.6.2 - supi: 0.15.0 + supi: 0.16.0 tape: 4.9.0 ts-node: 5.0.1 tslint: 5.9.1 @@ -64,7 +64,7 @@ packages: dependencies: '@pnpm/self-installer': 2.0.2 '@types/got': 7.1.8 - '@types/node': 9.6.1 + '@types/node': 9.6.2 command-exists: 1.2.2 cross-spawn: 5.1.0 dev: true @@ -82,7 +82,7 @@ packages: integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== /@pnpm/fs-locker/1.0.1: dependencies: - '@types/node': 9.6.1 + '@types/node': 9.6.2 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: true @@ -90,7 +90,7 @@ packages: node: '>=4' resolution: integrity: sha512-gmM3SM6fBpssvbSD1U8wJbArNPiQchFzt90ICkfawo0OGQBYY6mgt+sqxF93E9yLfNY7WGtPJYhAQW3Uht6m7A== - /@pnpm/headless/0.1.10: + /@pnpm/headless/0.1.12: dependencies: '@pnpm/lifecycle': 1.0.1 '@pnpm/link-bins': 1.0.1 @@ -116,7 +116,34 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-LIWuQU5Ee0ijBs1nsJobdbIxUon6WOcOWpVgEM6gsHKKYEz7oncVHkg+Ode5IJGhVwXfA3DPs6IZb/eIWqyzUA== + integrity: sha512-pqTBT6BIvRppb6e8f4hNZhLb0PVSnXE8cTEVIqSc6cKiOTt8HriUNUt3zPlDeg6o+eS53h1k6spQsN36rbwA/Q== + /@pnpm/headless/0.2.0: + dependencies: + '@pnpm/lifecycle': 2.0.0 + '@pnpm/link-bins': 1.0.1 + '@pnpm/modules-yaml': 1.0.0 + '@pnpm/package-requester': 0.8.5 + '@pnpm/pkgid-to-filename': 1.0.0 + '@pnpm/types': 1.7.0 + '@types/ramda': 0.25.21 + dependency-path: 1.2.1 + graph-sequencer: 2.0.0 + p-limit: 1.2.0 + package-store: 0.18.0 + path-exists: 3.0.0 + pnpm-shrinkwrap: 6.2.4 + ramda: 0.25.0 + read-package-json: 2.0.13 + supi: 0.15.0 + symlink-dir: 1.1.2 + util.promisify: 1.0.0 + dev: true + engines: + node: '>=4' + peerDependencies: + '@pnpm/logger': ^1.0.0 + resolution: + integrity: sha512-rzs+dUqbFb7TYy5GJItM8wVNtpXhy7b9/CBM0kRFdrc/Wz/YVBYYMuk9BNmJb6xVRpKnkI13klge+ZJ22P8mdg== /@pnpm/lifecycle/1.0.1: dependencies: '@pnpm/types': 1.7.0 @@ -131,6 +158,20 @@ packages: '@pnpm/logger': ^1.0.0 resolution: integrity: sha512-/N3Oxfi6JMFVejmDvZqQO3kQfRZdClyznO5J+NMIFzembDHYC6wMzvhXAmlcrNC3TlyfK59gg0Qhaigb10tPHQ== + /@pnpm/lifecycle/2.0.0: + dependencies: + '@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 + dev: true + engines: + node: '>=4' + peerDependencies: + '@pnpm/logger': ^1.0.0 + resolution: + integrity: sha512-cpMTqHaT89FSKEXrhXkXUYf5/K4XkZls7xdXj/EsvD3GlHN1tG0kKxR/cSpHuPSHb4Vq0oQi17I8Z3CfzTgz+w== /@pnpm/link-bins/1.0.1: dependencies: '@pnpm/package-bins': 1.0.0 @@ -155,7 +196,7 @@ packages: integrity: sha512-6hHV7qwIxYizwpSfcSR5A/ChBkTdJYVvAxB70WYbdbj6Wc0enS2sOSuFWO8yhOUDpzBph6T+qTWYeZrlpFTqzA== /@pnpm/logger/1.0.1: dependencies: - '@types/node': 9.6.1 + '@types/node': 9.6.2 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -198,7 +239,7 @@ packages: mkdirp-promise: 5.0.1 mz: 2.7.0 p-limit: 1.2.0 - p-queue: 2.3.1 + p-queue: 2.4.0 path-exists: 3.0.0 read-package-json: 2.0.13 rename-overwrite: 1.0.2 @@ -241,7 +282,7 @@ packages: integrity: sha512-pn7g4uxcofWTNG/cxmKvkMK2lxr4OUIhrQDrEVYEdVhW0WkWztsHkFrYjFgfNzPbYu3ITlB3T6aSVjCoJQTOlw== /@types/byline/4.2.31: dependencies: - '@types/node': 9.6.1 + '@types/node': 9.6.2 dev: true resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= @@ -250,13 +291,13 @@ packages: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== /@types/fs-extra/5.0.1: dependencies: - '@types/node': 9.6.1 + '@types/node': 9.6.2 dev: true resolution: integrity: sha512-h3wnflb+jMTipvbbZnClgA2BexrT4w0GcfoCz5qyxd0IRsbqhLSyesM6mqZTAnhbVmhyTm5tuxfRu9R+8l+lGw== /@types/got/7.1.8: dependencies: - '@types/node': 9.6.1 + '@types/node': 9.6.2 dev: true resolution: integrity: sha512-QxcSkx9PjHH7uqbzqKTKOAjGbayyo+dECnnqM3BBMC0WjYAqx0e6Qi9AFR4jluvx91e7qzgz4aGka7AhCTHYRw== @@ -270,24 +311,24 @@ packages: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== /@types/mz/0.0.32: dependencies: - '@types/node': 9.6.1 + '@types/node': 9.6.2 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/8.10.1: + /@types/node/8.10.3: dev: false resolution: - integrity: sha512-X/pIUOcgpX7xxKsmdPCMKeDBefsGH/4D/IuJ1gIHbqgWI0qEy/yMKeqaN/sT+rzV9UpAXAfd0kLOVExRmZrXIg== - /@types/node/9.6.1: + integrity: sha512-vjiRZkhKEyZndtFOz/FtIp0CqPbgOOki8o9IcPOLTqlzcnvFLToYdERshLaI6TCz7pDWoKlmvgftqB4xlltn9g== + /@types/node/9.6.2: resolution: - integrity: sha512-xwlHq5DXQFRpe+u6hmmNkzYk/3oxxqDp71a/AJMupOQYmxyaBetqrVMqdNlSQfbg7XTJYD8vARjf3Op06OzdtQ== + integrity: sha512-UWkRY9X7RQHp5OhhRIIka58/gVVycL1zHZu0OTsT5LI86ABaMOSbUjAl+b0FeDhQcxclrkyft3kW5QWdMRs8wQ== /@types/nopt/3.0.29: dev: true resolution: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 9.6.1 + '@types/node': 9.6.2 dev: true resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== @@ -315,7 +356,7 @@ packages: integrity: sha1-m2PUU6a1SqhJGCIHcRoIvo7qSK4= /@types/tape/4.2.32: dependencies: - '@types/node': 9.6.1 + '@types/node': 9.6.2 dev: true resolution: integrity: sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ== @@ -421,7 +462,7 @@ packages: /are-we-there-yet/1.1.4: dependencies: delegates: 1.0.0 - readable-stream: 2.3.5 + readable-stream: 2.3.6 dev: true resolution: integrity: sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0= @@ -543,7 +584,7 @@ packages: integrity: sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40= /bl/1.2.2: dependencies: - readable-stream: 2.3.5 + readable-stream: 2.3.6 safe-buffer: 5.1.1 dev: true resolution: @@ -821,7 +862,7 @@ packages: dependencies: buffer-from: 1.0.0 inherits: 2.0.3 - readable-stream: 2.3.5 + readable-stream: 2.3.6 typedarray: 0.0.6 dev: true engines: @@ -905,7 +946,7 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.10.1 + '@types/node': 8.10.3 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -1034,7 +1075,7 @@ packages: dependencies: end-of-stream: 1.4.1 inherits: 2.0.3 - readable-stream: 2.3.5 + readable-stream: 2.3.6 stream-shift: 1.0.0 dev: true resolution: @@ -2434,12 +2475,12 @@ packages: node: '>=4' resolution: integrity: sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== - /p-queue/2.3.1: + /p-queue/2.4.0: dev: true engines: node: '>=4' resolution: - integrity: sha512-MJGD2eVNHhtCsGLBDsfNzhBDlWxBFb5BvVXhJFbmlXH76Llo792ylwqEYJguLo+BnxZpos/Qw9dq0voyQRD3pg== + integrity: sha512-ZXisZuQjnDcRd4/Np7lNrE2f3qq2Cy8Ikg8T2gbLjQZbRnSVqOr9cQUMbyVJJuIDUJYWMOZ+Q/5fJbYJtMbZ2A== /p-try/1.0.0: dev: true engines: @@ -2452,7 +2493,7 @@ packages: '@types/fs-extra': 5.0.1 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.1 + '@types/node': 9.6.2 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.5 find-down: 0.1.4 @@ -2479,7 +2520,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.1 + '@types/node': 9.6.2 '@types/ramda': 0.25.21 encode-registry: 1.1.0 load-json-file: 4.0.0 @@ -2652,7 +2693,7 @@ packages: dependencies: '@pnpm/resolver-base': 1.0.0 '@types/js-yaml': 3.11.1 - '@types/node': 9.6.1 + '@types/node': 9.6.2 '@types/ramda': 0.25.21 dependency-path: 1.2.1 get-npm-tarball-url: 2.0.1 @@ -2792,20 +2833,20 @@ packages: node: '>=4' resolution: integrity: sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= - /readable-stream/2.3.5: + /readable-stream/2.3.6: dependencies: core-util-is: 1.0.2 inherits: 2.0.3 isarray: 1.0.0 process-nextick-args: 2.0.0 safe-buffer: 5.1.1 - string_decoder: 1.0.3 + string_decoder: 1.1.1 util-deprecate: 1.0.2 resolution: - integrity: sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw== + integrity: sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== /rechoir/0.6.2: dependencies: - resolve: 1.6.0 + resolve: 1.7.0 dev: true engines: node: '>= 0.10' @@ -2939,12 +2980,12 @@ packages: dev: true resolution: integrity: sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw== - /resolve/1.6.0: + /resolve/1.7.0: dependencies: path-parse: 1.0.5 dev: true resolution: - integrity: sha512-mw7JQNu5ExIkcw4LPih0owX/TZXjD/ZUF/ZQ/pDnkw3ZKhDcZZw5klmBlj6gVMwjQ3Pz5Jgu7F3d0jcDVuEWdw== + integrity: sha512-QdgZ5bjR1WAlpLaO5yHepFvC+o3rCr6wpfE2tpJNMkXdulf2jKomQBdNRQITF3ZKHNlT71syG98yQP03gasgnA== /restore-cursor/1.0.1: dependencies: exit-hook: 1.1.1 @@ -3205,11 +3246,11 @@ packages: node: '>= 0.4' resolution: integrity: sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo= - /string_decoder/1.0.3: + /string_decoder/1.1.1: dependencies: safe-buffer: 5.1.1 resolution: - integrity: sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ== + integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== /stringstream/0.0.5: dev: true resolution: @@ -3266,7 +3307,7 @@ packages: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/headless': 0.1.10 + '@pnpm/headless': 0.1.12 '@pnpm/lifecycle': 1.0.1 '@pnpm/link-bins': 1.0.1 '@pnpm/modules-yaml': 1.0.0 @@ -3279,7 +3320,7 @@ packages: '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.1 + '@types/node': 9.6.2 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 @@ -3329,6 +3370,73 @@ packages: '@pnpm/logger': ^1.0.0 resolution: integrity: sha512-0BCOBT2ADxdojhy35ZV3idKq/E8bfib+0lJRLVGE/d+d6Tf63xiZfHhOJtxNBRNsaGl966awbEvgBSZJlHuFaQ== + /supi/0.16.0: + dependencies: + '@pnpm/check-package': 1.0.0 + '@pnpm/fs-locker': 1.0.1 + '@pnpm/headless': 0.2.0 + '@pnpm/lifecycle': 2.0.0 + '@pnpm/link-bins': 1.0.1 + '@pnpm/modules-yaml': 1.0.0 + '@pnpm/package-bins': 1.0.0 + '@pnpm/package-requester': 0.8.5 + '@pnpm/pkgid-to-filename': 1.0.0 + '@pnpm/resolver-base': 1.0.0 + '@pnpm/types': 1.7.0 + '@types/byline': 4.2.31 + '@types/common-tags': 1.4.0 + '@types/load-json-file': 2.0.7 + '@types/mz': 0.0.32 + '@types/node': 9.6.2 + '@types/nopt': 3.0.29 + '@types/npm': 2.0.29 + '@types/p-series': 1.0.1 + '@types/ramda': 0.25.21 + '@types/rc': 0.0.1 + '@types/semver': 5.5.0 + '@zkochan/npm-package-arg': 1.0.0 + common-tags: 1.7.2 + dependency-path: 1.2.1 + encode-registry: 1.1.0 + execa: 0.10.0 + get-npm-tarball-url: 2.0.1 + graceful-fs: 4.1.11 + graph-sequencer: 2.0.0 + is-ci: 1.1.0 + is-inner-link: 2.0.2 + is-subdir: 1.0.2 + load-json-file: 4.0.0 + mkdirp-promise: 5.0.1 + mz: 2.7.0 + normalize-path: 2.1.1 + normalize-registry-url: 1.0.0 + os-homedir: 1.0.2 + p-filter: 1.0.0 + p-limit: 1.2.0 + package-store: 0.18.0 + path-absolute: 1.0.0 + path-exists: 3.0.0 + pnpm-install-checks: 1.1.0 + pnpm-shrinkwrap: 6.2.4 + ramda: 0.25.0 + read-package-json: 2.0.13 + remove-all-except-outer-links: 1.0.3 + replace-string: 1.1.0 + resolve-link-target: 1.0.1 + rimraf-then: 1.0.1 + semver: 5.5.0 + symlink-dir: 1.1.2 + util.promisify: 1.0.0 + validate-npm-package-name: 3.0.0 + version-selector-type: 2.0.0 + write-pkg: 3.1.0 + dev: true + engines: + node: '>=4' + peerDependencies: + '@pnpm/logger': ^1.0.0 + resolution: + integrity: sha512-UmGdch9EnzRUYtp/3CEgyXMZ5Vgh5RBJjsEOj57OkoP/Z6ybZgjub0zzQHYw3kcXEKSAXmPlbKn7SnB0uCh4lA== /supports-color/0.2.0: dev: true engines: @@ -3357,7 +3465,7 @@ packages: /symlink-dir/1.1.2: dependencies: '@types/mz': 0.0.32 - '@types/node': 9.6.1 + '@types/node': 9.6.2 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -3374,7 +3482,7 @@ packages: js-yaml: 3.11.0 dev: true optionalDependencies: - readable-stream: 2.3.5 + readable-stream: 2.3.6 resolution: integrity: sha1-EgxQiciMPIp5PvKIhn3jIeGPjCI= /tape/4.9.0: @@ -3408,7 +3516,7 @@ packages: dependencies: bl: 1.2.2 end-of-stream: 1.4.1 - readable-stream: 2.3.5 + readable-stream: 2.3.6 xtend: 4.0.1 dev: true engines: @@ -3443,7 +3551,7 @@ packages: integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= /through2/2.0.3: dependencies: - readable-stream: 2.3.5 + readable-stream: 2.3.6 xtend: 4.0.1 resolution: integrity: sha1-AARWmzfHx0ujnEPzzteNGtlBQL4= @@ -3498,10 +3606,10 @@ packages: glob: 7.1.2 js-yaml: 3.11.0 minimatch: 3.0.4 - resolve: 1.6.0 + resolve: 1.7.0 semver: 5.5.0 tslib: 1.9.0 - tsutils: 2.25.1 + tsutils: 2.26.1 dev: true engines: node: '>=4.8.0' @@ -3509,14 +3617,14 @@ packages: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev' resolution: integrity: sha1-ElX4ej/1frCw4fDmEKi0dIBGya4= - /tsutils/2.25.1: + /tsutils/2.26.1: dependencies: tslib: 1.9.0 dev: true peerDependencies: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 2.10.0-dev' resolution: - integrity: sha512-xHiTER5XIRYlWbylk4vpGZSYo8FUTVn32bAxxM1rJopXs2DYG7lWp40LqNvM3iMNpXa50wmnC9bFXsPTV6xAiQ== + integrity: sha512-bnm9bcjOqOr1UljleL94wVCDlpa6KjfGaTkefeLch4GRafgDkROxPizbB/FxTEdI++5JqhxczRy/Qub0syNqZA== /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.1.1 @@ -3567,7 +3675,7 @@ packages: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= /unpack-stream/3.0.2: dependencies: - '@types/node': 9.6.1 + '@types/node': 9.6.2 decompress-maybe: 1.0.0 ssri: 5.3.0 tar-fs: 1.16.0 @@ -3753,7 +3861,7 @@ specifiers: stacktracey: ^1.2.87 string-length: ^2.0.0 string.prototype.padstart: ^3.0.0 - supi: ^0.15.0 + supi: ^0.16.0 tape: ^4.8.0 ts-node: ^5.0.0 tslint: ^5.7.0 diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 60fdcde9fe..05d384b260 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -167,7 +167,7 @@ export default function ( const lifecycleOutput$ = most.of( log$.lifecycle .map((log: LifecycleLog) => { - const key = `${log.script}:${log.pkgId}` + const key = `${log.stage}:${log.depPath}` lifecycleMessages[key] = lifecycleMessages[key] || [] if (!lifecycleMessages[key].length || log['exitCode'] !== 0) { lifecycleMessages[key].push(formatLifecycle(log)) @@ -433,7 +433,7 @@ function printDiffs (pkgsDiff: PackageDiff[]) { } function formatLifecycle (logObj: LifecycleLog) { - const prefix = `${rightPad(logObj.pkgId, PREFIX_MAX_LENGTH)} | ${hlValue(padStart(logObj.script, 11))}: ` + const prefix = `${rightPad(logObj.depPath, PREFIX_MAX_LENGTH)} | ${hlValue(padStart(logObj.stage, 11))}: ` if (logObj['exitCode'] === 0) { return `${prefix}done` } diff --git a/test/index.ts b/test/index.ts index 5fc4cc19a1..f23da3911e 100644 --- a/test/index.ts +++ b/test/index.ts @@ -309,39 +309,39 @@ test('groups lifecycle output', t => { const pkgId = 'registry.npmjs.org/foo/1.0.0' lifecycleLogger.debug({ - pkgId: 'registry.npmjs.org/foo/1.0.0', + depPath: 'registry.npmjs.org/foo/1.0.0', line: 'foo', - script: 'preinstall', + stage: 'preinstall', }) lifecycleLogger.debug({ - pkgId: 'registry.npmjs.org/foo/1.0.0', + depPath: 'registry.npmjs.org/foo/1.0.0', line: 'foo I', - script: 'postinstall', + stage: 'postinstall', }) lifecycleLogger.debug({ - pkgId: 'registry.npmjs.org/bar/1.0.0', + depPath: 'registry.npmjs.org/bar/1.0.0', line: 'bar I', - script: 'postinstall', + stage: 'postinstall', }) lifecycleLogger.debug({ - pkgId: 'registry.npmjs.org/foo/1.0.0', + depPath: 'registry.npmjs.org/foo/1.0.0', line: 'foo II', - script: 'postinstall', + stage: 'postinstall', }) lifecycleLogger.debug({ - pkgId: 'registry.npmjs.org/foo/1.0.0', + depPath: 'registry.npmjs.org/foo/1.0.0', line: 'foo III', - script: 'postinstall', + stage: 'postinstall', }) lifecycleLogger.debug({ - pkgId: 'registry.npmjs.org/qar/1.0.0', + depPath: 'registry.npmjs.org/qar/1.0.0', exitCode: 0, - script: 'install', + stage: 'install', }) lifecycleLogger.debug({ - pkgId: 'registry.npmjs.org/foo/1.0.0', + depPath: 'registry.npmjs.org/foo/1.0.0', exitCode: 0, - script: 'postinstall', + stage: 'postinstall', }) t.plan(1) From 50ed4ae0c7956c51e21158ad83e4de309c428cbb Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 8 Apr 2018 11:39:07 +0300 Subject: [PATCH 177/196] feat: print the run lifecycle script --- src/reporterForClient.ts | 31 +++++++++++++++++++------------ test/index.ts | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 14 deletions(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 05d384b260..5d74c5949c 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -163,19 +163,23 @@ export default function ( outputs.push(tarballsProgressOutput$) - const lifecycleMessages: {[pkgId: string]: string[]} = {} + const lifecycleMessages: {[pkgId: string]: {output: string[], script: string}} = {} const lifecycleOutput$ = most.of( log$.lifecycle .map((log: LifecycleLog) => { const key = `${log.stage}:${log.depPath}` - lifecycleMessages[key] = lifecycleMessages[key] || [] - if (!lifecycleMessages[key].length || log['exitCode'] !== 0) { - lifecycleMessages[key].push(formatLifecycle(log)) + lifecycleMessages[key] = lifecycleMessages[key] || {output: []} + if (log['script']) { + lifecycleMessages[key].script = formatLifecycle(log) + } else { + if (!lifecycleMessages[key].output.length || log['exitCode'] !== 0) { + lifecycleMessages[key].output.push(formatLifecycle(log)) + } + if (lifecycleMessages[key].output.length > 3) { + lifecycleMessages[key].output.shift() + } } - if (lifecycleMessages[key].length > 3) { - lifecycleMessages[key].shift() - } - return R.unnest(R.values(lifecycleMessages)).join(EOL) + return EOL + EOL + R.values(lifecycleMessages).map((msg) => [msg.script].concat(msg.output).join(EOL)).join(EOL + EOL + EOL) }) .map((msg) => ({msg})), ) @@ -433,15 +437,18 @@ function printDiffs (pkgsDiff: PackageDiff[]) { } function formatLifecycle (logObj: LifecycleLog) { - const prefix = `${rightPad(logObj.depPath, PREFIX_MAX_LENGTH)} | ${hlValue(padStart(logObj.stage, 11))}: ` + const prefix = `${rightPad(logObj.depPath, PREFIX_MAX_LENGTH)} | ${hlValue(padStart(logObj.stage, 11))}` + if (logObj['script']) { + return `${prefix}$ ${logObj['script']}` + } if (logObj['exitCode'] === 0) { - return `${prefix}done` + return `${prefix}: done` } const line = formatLine(logObj) if (logObj.level === 'error') { - return `${prefix}${line}` + return `${prefix}: ${line}` } - return `${prefix}${line}` + return `${prefix}: ${line}` } function formatLine (logObj: LifecycleLog) { diff --git a/test/index.ts b/test/index.ts index f23da3911e..0577f92e9c 100644 --- a/test/index.ts +++ b/test/index.ts @@ -33,6 +33,7 @@ const summaryLogger = logger('summary') const lifecycleLogger = logger('lifecycle') const packageJsonLogger = logger('package-json') const statsLogger = logger('stats') +const EOL = '\n' test('prints progress beginning', t => { const output$ = toOutput$(createStreamParser()) @@ -308,16 +309,31 @@ test('groups lifecycle output', t => { const pkgId = 'registry.npmjs.org/foo/1.0.0' + lifecycleLogger.debug({ + depPath: 'registry.npmjs.org/foo/1.0.0', + script: 'node foo', + stage: 'preinstall', + }) lifecycleLogger.debug({ depPath: 'registry.npmjs.org/foo/1.0.0', line: 'foo', stage: 'preinstall', }) + lifecycleLogger.debug({ + depPath: 'registry.npmjs.org/foo/1.0.0', + script: 'node foo', + stage: 'postinstall', + }) lifecycleLogger.debug({ depPath: 'registry.npmjs.org/foo/1.0.0', line: 'foo I', stage: 'postinstall', }) + lifecycleLogger.debug({ + depPath: 'registry.npmjs.org/bar/1.0.0', + script: 'node bar', + stage: 'postinstall', + }) lifecycleLogger.debug({ depPath: 'registry.npmjs.org/bar/1.0.0', line: 'bar I', @@ -333,6 +349,11 @@ test('groups lifecycle output', t => { line: 'foo III', stage: 'postinstall', }) + lifecycleLogger.debug({ + depPath: 'registry.npmjs.org/qar/1.0.0', + script: 'node qar', + stage: 'install', + }) lifecycleLogger.debug({ depPath: 'registry.npmjs.org/qar/1.0.0', exitCode: 0, @@ -346,14 +367,24 @@ test('groups lifecycle output', t => { t.plan(1) - output$.skip(5).take(1).map(normalizeNewline).subscribe({ + output$.skip(9).take(1).map(normalizeNewline).subscribe({ next: output => { - t.equal(output, stripIndents` + t.equal(output, EOL + EOL + stripIndents` + registry.npmjs.org/foo/1.0.0 | ${PREINSTALL}$ node foo registry.npmjs.org/foo/1.0.0 | ${PREINSTALL}: foo + + + registry.npmjs.org/foo/1.0.0 | ${POSTINSTALL}$ node foo registry.npmjs.org/foo/1.0.0 | ${POSTINSTALL}: foo I registry.npmjs.org/foo/1.0.0 | ${POSTINSTALL}: foo II registry.npmjs.org/foo/1.0.0 | ${POSTINSTALL}: foo III + + + registry.npmjs.org/bar/1.0.0 | ${POSTINSTALL}$ node bar registry.npmjs.org/bar/1.0.0 | ${POSTINSTALL}: bar I + + + registry.npmjs.org/qar/1.0.0 | ${INSTALL}$ node qar registry.npmjs.org/qar/1.0.0 | ${INSTALL}: done `) }, From 9096c09078f654a6361da51b66ee67241d5cbbd8 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 8 Apr 2018 20:47:16 +0300 Subject: [PATCH 178/196] chore(release): 0.16.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 774033846a..fbe0b58494 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.15.3", + "version": "0.16.0", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 498746d058c0661fec98303c0d958dedf2e2728f Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 9 Apr 2018 14:35:15 +0300 Subject: [PATCH 179/196] fix: group lifecycle outputs separately for each hook --- src/reporterForClient.ts | 62 ++++++++++++++++++++++++++-------------- 1 file changed, 41 insertions(+), 21 deletions(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 5d74c5949c..86299caab9 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -19,6 +19,7 @@ import { RegistryLog, } from 'supi' import * as supi from 'supi' +import PushStream = require('zen-push') import {EOL} from './constants' import getPkgsDiff, { PackageDiff, @@ -163,28 +164,47 @@ export default function ( outputs.push(tarballsProgressOutput$) - const lifecycleMessages: {[pkgId: string]: {output: string[], script: string}} = {} - const lifecycleOutput$ = most.of( - log$.lifecycle - .map((log: LifecycleLog) => { - const key = `${log.stage}:${log.depPath}` - lifecycleMessages[key] = lifecycleMessages[key] || {output: []} - if (log['script']) { - lifecycleMessages[key].script = formatLifecycle(log) - } else { - if (!lifecycleMessages[key].output.length || log['exitCode'] !== 0) { - lifecycleMessages[key].output.push(formatLifecycle(log)) - } - if (lifecycleMessages[key].output.length > 3) { - lifecycleMessages[key].output.shift() - } - } - return EOL + EOL + R.values(lifecycleMessages).map((msg) => [msg.script].concat(msg.output).join(EOL)).join(EOL + EOL + EOL) - }) - .map((msg) => ({msg})), - ) + const lifecycleMessages: { + [depPath: string]: { + output: string[], + script: string, + }, + } = {} + const lifecycleStreamByDepPath: { + [depPath: string]: { + observable: most.Observable<{msg: string}>, + complete (): void, + next (obj: object): void, + }, + } = {} + const lifecyclePushStream = new PushStream() + outputs.push(most.from(lifecyclePushStream.observable)) - outputs.push(lifecycleOutput$) + log$.lifecycle + .forEach((log: LifecycleLog) => { + const key = `${log.stage}:${log.depPath}` + lifecycleMessages[key] = lifecycleMessages[key] || {output: []} + if (log['script']) { + lifecycleMessages[key].script = formatLifecycle(log) + } else { + if (!lifecycleMessages[key].output.length || log['exitCode'] !== 0) { + lifecycleMessages[key].output.push(formatLifecycle(log)) + } + if (lifecycleMessages[key].output.length > 3) { + lifecycleMessages[key].output.shift() + } + } + if (!lifecycleStreamByDepPath[key]) { + lifecycleStreamByDepPath[key] = new PushStream() + lifecyclePushStream.next(most.from(lifecycleStreamByDepPath[key].observable)) + } + lifecycleStreamByDepPath[key].next({ + msg: EOL + EOL + [lifecycleMessages[key].script].concat(lifecycleMessages[key].output).join(EOL), + }) + if (typeof log['exitCode'] === 'number') { + lifecycleStreamByDepPath[key].complete() + } + }) } else { const lifecycleMessages: {[pkgId: string]: string} = {} const lifecycleOutput$ = most.of( From 251e19d8f3f41fa52f3abbec69abfffbb28519f3 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 9 Apr 2018 15:11:22 +0300 Subject: [PATCH 180/196] fix: always print a newline before summary --- src/reporterForClient.ts | 2 +- test/index.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 86299caab9..aedb17d514 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -223,7 +223,7 @@ export default function ( const summaryOutput$ = most.combine( (pkgsDiff) => { - let msg = '' + let msg = EOL for (const depType of ['prod', 'optional', 'dev']) { const diffs = R.values(pkgsDiff[depType]) if (diffs.length) { diff --git a/test/index.ts b/test/index.ts index 0577f92e9c..8bb0bbb80b 100644 --- a/test/index.ts +++ b/test/index.ts @@ -280,6 +280,7 @@ test('prints summary', t => { t.equal(output, stripIndents` ${WARN} ${DEPRECATED} bar@2.0.0: This package was deprecated because bla bla bla + ${h1('dependencies:')} ${ADD} bar ${versionColor('2.0.0')} ${DEPRECATED} ${SUB} foo ${versionColor('0.1.0')} From 079dc629e81d7ac85a5d5973d359e49a34c7b923 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 9 Apr 2018 15:35:11 +0300 Subject: [PATCH 181/196] fix: strip ANSI escape codes from child output --- package.json | 1 + shrinkwrap.yaml | 2 ++ src/reporterForClient.ts | 6 ++++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index fbe0b58494..1ff66fd4f8 100644 --- a/package.json +++ b/package.json @@ -61,6 +61,7 @@ "stacktracey": "^1.2.87", "string-length": "^2.0.0", "string.prototype.padstart": "^3.0.0", + "strip-ansi": "^4.0.0", "zen-push": "^0.2.1" }, "devDependencies": { diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 775c371e33..023b5aa8eb 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -20,6 +20,7 @@ dependencies: stacktracey: 1.2.100 string-length: 2.0.0 string.prototype.padstart: 3.0.0 + strip-ansi: 4.0.0 zen-push: 0.2.1 devDependencies: '@pnpm/logger': 1.0.1 @@ -3861,6 +3862,7 @@ specifiers: stacktracey: ^1.2.87 string-length: ^2.0.0 string.prototype.padstart: ^3.0.0 + strip-ansi: ^4.0.0 supi: ^0.16.0 tape: ^4.8.0 ts-node: ^5.0.0 diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index aedb17d514..0574e0336d 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -10,6 +10,7 @@ import rightPad = require('right-pad') import semver = require('semver') import stringLength = require('string-length') import padStart = require('string.prototype.padstart') +import stripAnsi = require('strip-ansi') import { DeprecationLog, InstallCheckLog, @@ -474,10 +475,11 @@ function formatLifecycle (logObj: LifecycleLog) { function formatLine (logObj: LifecycleLog) { if (typeof logObj['exitCode'] === 'number') return chalk.red(`Exited with ${logObj['exitCode']}`) + // TODO: strip only the non-color/style ansi escape codes if (logObj.level === 'error') { - return chalk.gray(logObj['line']) + return chalk.gray(stripAnsi(logObj['line'])) } - return logObj['line'] + return stripAnsi(logObj['line']) } function formatInstallCheck (logObj: InstallCheckLog) { From 4c91f41c283e4d4c15a3c870dcfd290340ede298 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 10 Apr 2018 00:55:54 +0300 Subject: [PATCH 182/196] feat: show shorter prefix for project lifecycle output --- shrinkwrap.yaml | 156 ++++++--------------------------------- src/reporterForClient.ts | 14 ++-- 2 files changed, 33 insertions(+), 137 deletions(-) diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 023b5aa8eb..aa273c37e3 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -9,7 +9,7 @@ dependencies: cli-cursor: 2.1.0 common-tags: 1.7.2 most: 1.7.3 - most-last: 1.0.0 + most-last: 1.0.1 ndjson: 1.5.0 normalize-path: 2.1.1 pnpm-default-reporter: 'link:../__package_previews__/pnpm-default-reporter/pnpm-default-reporter' @@ -32,7 +32,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.5 rimraf: 2.6.2 - supi: 0.16.0 + supi: 0.16.1 tape: 4.9.0 ts-node: 5.0.1 tslint: 5.9.1 @@ -91,9 +91,9 @@ packages: node: '>=4' resolution: integrity: sha512-gmM3SM6fBpssvbSD1U8wJbArNPiQchFzt90ICkfawo0OGQBYY6mgt+sqxF93E9yLfNY7WGtPJYhAQW3Uht6m7A== - /@pnpm/headless/0.1.12: + /@pnpm/headless/0.2.2: dependencies: - '@pnpm/lifecycle': 1.0.1 + '@pnpm/lifecycle': 2.1.0 '@pnpm/link-bins': 1.0.1 '@pnpm/modules-yaml': 1.0.0 '@pnpm/package-requester': 0.8.5 @@ -108,7 +108,7 @@ packages: pnpm-shrinkwrap: 6.2.4 ramda: 0.25.0 read-package-json: 2.0.13 - supi: 0.15.0 + supi: 0.16.1 symlink-dir: 1.1.2 util.promisify: 1.0.0 dev: true @@ -117,35 +117,8 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-pqTBT6BIvRppb6e8f4hNZhLb0PVSnXE8cTEVIqSc6cKiOTt8HriUNUt3zPlDeg6o+eS53h1k6spQsN36rbwA/Q== - /@pnpm/headless/0.2.0: - dependencies: - '@pnpm/lifecycle': 2.0.0 - '@pnpm/link-bins': 1.0.1 - '@pnpm/modules-yaml': 1.0.0 - '@pnpm/package-requester': 0.8.5 - '@pnpm/pkgid-to-filename': 1.0.0 - '@pnpm/types': 1.7.0 - '@types/ramda': 0.25.21 - dependency-path: 1.2.1 - graph-sequencer: 2.0.0 - p-limit: 1.2.0 - package-store: 0.18.0 - path-exists: 3.0.0 - pnpm-shrinkwrap: 6.2.4 - ramda: 0.25.0 - read-package-json: 2.0.13 - supi: 0.15.0 - symlink-dir: 1.1.2 - util.promisify: 1.0.0 - dev: true - engines: - node: '>=4' - peerDependencies: - '@pnpm/logger': ^1.0.0 - resolution: - integrity: sha512-rzs+dUqbFb7TYy5GJItM8wVNtpXhy7b9/CBM0kRFdrc/Wz/YVBYYMuk9BNmJb6xVRpKnkI13klge+ZJ22P8mdg== - /@pnpm/lifecycle/1.0.1: + integrity: sha512-X5fI89Dp6dCuKpdEBqi9LZrTW6rVmfJVCEHE+Djqgf7fskEjn+DGLF3jDkefzcGQYTnRoYiVNxxQHOAEu9XxQQ== + /@pnpm/lifecycle/2.1.0: dependencies: '@pnpm/types': 1.7.0 npm-lifecycle: 2.0.1 @@ -158,21 +131,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-/N3Oxfi6JMFVejmDvZqQO3kQfRZdClyznO5J+NMIFzembDHYC6wMzvhXAmlcrNC3TlyfK59gg0Qhaigb10tPHQ== - /@pnpm/lifecycle/2.0.0: - dependencies: - '@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 - dev: true - engines: - node: '>=4' - peerDependencies: - '@pnpm/logger': ^1.0.0 - resolution: - integrity: sha512-cpMTqHaT89FSKEXrhXkXUYf5/K4XkZls7xdXj/EsvD3GlHN1tG0kKxR/cSpHuPSHb4Vq0oQi17I8Z3CfzTgz+w== + integrity: sha512-f/Dtu0kUDlzZI2+8QVOvFbBra82aa5VLXpTOLEndJzddCooY/Qhva7Rc0xULfciy83BohBF9sp8OFZCTugnMVQ== /@pnpm/link-bins/1.0.1: dependencies: '@pnpm/package-bins': 1.0.0 @@ -316,10 +275,10 @@ packages: dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/8.10.3: + /@types/node/8.10.4: dev: false resolution: - integrity: sha512-vjiRZkhKEyZndtFOz/FtIp0CqPbgOOki8o9IcPOLTqlzcnvFLToYdERshLaI6TCz7pDWoKlmvgftqB4xlltn9g== + integrity: sha512-FqpMm0l/JUCXK6HziUoXaxtuiefsyoeQtNy8CSOq31F/m16UNKRG40PezM6hbsUONZohzKnAHa7lEkieyx1ayA== /@types/node/9.6.2: resolution: integrity: sha512-UWkRY9X7RQHp5OhhRIIka58/gVVycL1zHZu0OTsT5LI86ABaMOSbUjAl+b0FeDhQcxclrkyft3kW5QWdMRs8wQ== @@ -548,10 +507,10 @@ packages: dev: true resolution: integrity: sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= - /aws4/1.6.0: + /aws4/1.7.0: dev: true resolution: - integrity: sha1-g+9cqGCysy5KDe7e6MdxudtXRx4= + integrity: sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w== /babel-code-frame/6.26.0: dependencies: chalk: 1.1.3 @@ -562,7 +521,7 @@ packages: integrity: sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= /babel-runtime/6.26.0: dependencies: - core-js: 2.5.4 + core-js: 2.5.5 regenerator-runtime: 0.11.1 resolution: integrity: sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -878,9 +837,9 @@ packages: dev: true resolution: integrity: sha1-XblXOdbCEqy+e29lahG5QLqmiUY= - /core-js/2.5.4: + /core-js/2.5.5: resolution: - integrity: sha1-8si/GB8qgLkvNgEhQpzmOi8K6uA= + integrity: sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs= /core-util-is/1.0.2: resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= @@ -947,7 +906,7 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.10.3 + '@types/node': 8.10.4 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -2182,7 +2141,7 @@ packages: dependencies: babel-runtime: 6.26.0 chalk: 1.1.3 - core-js: 2.5.4 + core-js: 2.5.5 diff: 2.2.3 duplexer: 0.1.1 figures: 1.7.0 @@ -2193,12 +2152,12 @@ packages: dev: true resolution: integrity: sha1-NDOB0f2e1RljsLMVNbf9i64E/3A= - /most-last/1.0.0: + /most-last/1.0.1: dev: false peerDependencies: most: ^1.0.3 resolution: - integrity: sha1-Tj8LKJwkz5C52DhGdt6Qom43YXE= + integrity: sha512-ycc+leSrXoGRjxhsZJW/l+Sk0CXj9e/z6EP5ebZ8A+zDWGRq1v/oeNkyQF4TG95LnT5Q0ysG+5piJYSR86k58A== /most/1.7.3: dependencies: '@most/multicast': 1.3.0 @@ -2926,7 +2885,7 @@ packages: /request/2.85.0: dependencies: aws-sign2: 0.7.0 - aws4: 1.6.0 + aws4: 1.7.0 caseless: 0.12.0 combined-stream: 1.0.6 extend: 3.0.1 @@ -3304,12 +3263,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.15.0: + /supi/0.16.1: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/headless': 0.1.12 - '@pnpm/lifecycle': 1.0.1 + '@pnpm/headless': 0.2.2 + '@pnpm/lifecycle': 2.1.0 '@pnpm/link-bins': 1.0.1 '@pnpm/modules-yaml': 1.0.0 '@pnpm/package-bins': 1.0.0 @@ -3370,74 +3329,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-0BCOBT2ADxdojhy35ZV3idKq/E8bfib+0lJRLVGE/d+d6Tf63xiZfHhOJtxNBRNsaGl966awbEvgBSZJlHuFaQ== - /supi/0.16.0: - dependencies: - '@pnpm/check-package': 1.0.0 - '@pnpm/fs-locker': 1.0.1 - '@pnpm/headless': 0.2.0 - '@pnpm/lifecycle': 2.0.0 - '@pnpm/link-bins': 1.0.1 - '@pnpm/modules-yaml': 1.0.0 - '@pnpm/package-bins': 1.0.0 - '@pnpm/package-requester': 0.8.5 - '@pnpm/pkgid-to-filename': 1.0.0 - '@pnpm/resolver-base': 1.0.0 - '@pnpm/types': 1.7.0 - '@types/byline': 4.2.31 - '@types/common-tags': 1.4.0 - '@types/load-json-file': 2.0.7 - '@types/mz': 0.0.32 - '@types/node': 9.6.2 - '@types/nopt': 3.0.29 - '@types/npm': 2.0.29 - '@types/p-series': 1.0.1 - '@types/ramda': 0.25.21 - '@types/rc': 0.0.1 - '@types/semver': 5.5.0 - '@zkochan/npm-package-arg': 1.0.0 - common-tags: 1.7.2 - dependency-path: 1.2.1 - encode-registry: 1.1.0 - execa: 0.10.0 - get-npm-tarball-url: 2.0.1 - graceful-fs: 4.1.11 - graph-sequencer: 2.0.0 - is-ci: 1.1.0 - is-inner-link: 2.0.2 - is-subdir: 1.0.2 - load-json-file: 4.0.0 - mkdirp-promise: 5.0.1 - mz: 2.7.0 - normalize-path: 2.1.1 - normalize-registry-url: 1.0.0 - os-homedir: 1.0.2 - p-filter: 1.0.0 - p-limit: 1.2.0 - package-store: 0.18.0 - path-absolute: 1.0.0 - path-exists: 3.0.0 - pnpm-install-checks: 1.1.0 - pnpm-shrinkwrap: 6.2.4 - ramda: 0.25.0 - read-package-json: 2.0.13 - remove-all-except-outer-links: 1.0.3 - replace-string: 1.1.0 - resolve-link-target: 1.0.1 - rimraf-then: 1.0.1 - semver: 5.5.0 - symlink-dir: 1.1.2 - util.promisify: 1.0.0 - validate-npm-package-name: 3.0.0 - version-selector-type: 2.0.0 - write-pkg: 3.1.0 - dev: true - engines: - node: '>=4' - peerDependencies: - '@pnpm/logger': ^1.0.0 - resolution: - integrity: sha512-UmGdch9EnzRUYtp/3CEgyXMZ5Vgh5RBJjsEOj57OkoP/Z6ybZgjub0zzQHYw3kcXEKSAXmPlbKn7SnB0uCh4lA== + integrity: sha512-6lfpFdNx4epbgxQt7Sp78sUzY2f2mq2J4qXB54JVFlQkiwOnd4LgMphaDesEbzyQnvMJu2G//RqoUR6I7A06sA== /supports-color/0.2.0: dev: true engines: diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 0574e0336d..8be7f80065 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -186,10 +186,10 @@ export default function ( const key = `${log.stage}:${log.depPath}` lifecycleMessages[key] = lifecycleMessages[key] || {output: []} if (log['script']) { - lifecycleMessages[key].script = formatLifecycle(log) + lifecycleMessages[key].script = formatLifecycle(cwd, log) } else { if (!lifecycleMessages[key].output.length || log['exitCode'] !== 0) { - lifecycleMessages[key].output.push(formatLifecycle(log)) + lifecycleMessages[key].output.push(formatLifecycle(cwd, log)) } if (lifecycleMessages[key].output.length > 3) { lifecycleMessages[key].output.shift() @@ -210,7 +210,7 @@ export default function ( const lifecycleMessages: {[pkgId: string]: string} = {} const lifecycleOutput$ = most.of( log$.lifecycle - .map((log: LifecycleLog) => ({ msg: formatLifecycle(log) })), + .map((log: LifecycleLog) => ({ msg: formatLifecycle(cwd, log) })), ) outputs.push(lifecycleOutput$) @@ -457,8 +457,12 @@ function printDiffs (pkgsDiff: PackageDiff[]) { return msg } -function formatLifecycle (logObj: LifecycleLog) { - const prefix = `${rightPad(logObj.depPath, PREFIX_MAX_LENGTH)} | ${hlValue(padStart(logObj.stage, 11))}` +function formatLifecycle (cwd: string, logObj: LifecycleLog) { + const prefix = `${ + logObj.wd === logObj.depPath + ? rightPad(formatPrefix(cwd, logObj.wd), PREFIX_MAX_LENGTH) + : rightPad(logObj.depPath, PREFIX_MAX_LENGTH) + } | ${hlValue(padStart(logObj.stage, 11))}` if (logObj['script']) { return `${prefix}$ ${logObj['script']}` } From 73d33324df380f814e1ce3471ac0d1e2087e34bd Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 10 Apr 2018 00:59:14 +0300 Subject: [PATCH 183/196] fix: less newlines between lifecycle logs --- src/reporterForClient.ts | 4 ++-- test/index.ts | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 8be7f80065..5e85eee4a5 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -200,7 +200,7 @@ export default function ( lifecyclePushStream.next(most.from(lifecycleStreamByDepPath[key].observable)) } lifecycleStreamByDepPath[key].next({ - msg: EOL + EOL + [lifecycleMessages[key].script].concat(lifecycleMessages[key].output).join(EOL), + msg: EOL + [lifecycleMessages[key].script].concat(lifecycleMessages[key].output).join(EOL), }) if (typeof log['exitCode'] === 'number') { lifecycleStreamByDepPath[key].complete() @@ -224,7 +224,7 @@ export default function ( const summaryOutput$ = most.combine( (pkgsDiff) => { - let msg = EOL + let msg = '' for (const depType of ['prod', 'optional', 'dev']) { const diffs = R.values(pkgsDiff[depType]) if (diffs.length) { diff --git a/test/index.ts b/test/index.ts index 8bb0bbb80b..57f9028632 100644 --- a/test/index.ts +++ b/test/index.ts @@ -280,7 +280,6 @@ test('prints summary', t => { t.equal(output, stripIndents` ${WARN} ${DEPRECATED} bar@2.0.0: This package was deprecated because bla bla bla - ${h1('dependencies:')} ${ADD} bar ${versionColor('2.0.0')} ${DEPRECATED} ${SUB} foo ${versionColor('0.1.0')} @@ -370,21 +369,18 @@ test('groups lifecycle output', t => { output$.skip(9).take(1).map(normalizeNewline).subscribe({ next: output => { - t.equal(output, EOL + EOL + stripIndents` + t.equal(output, EOL + stripIndents` registry.npmjs.org/foo/1.0.0 | ${PREINSTALL}$ node foo registry.npmjs.org/foo/1.0.0 | ${PREINSTALL}: foo - registry.npmjs.org/foo/1.0.0 | ${POSTINSTALL}$ node foo registry.npmjs.org/foo/1.0.0 | ${POSTINSTALL}: foo I registry.npmjs.org/foo/1.0.0 | ${POSTINSTALL}: foo II registry.npmjs.org/foo/1.0.0 | ${POSTINSTALL}: foo III - registry.npmjs.org/bar/1.0.0 | ${POSTINSTALL}$ node bar registry.npmjs.org/bar/1.0.0 | ${POSTINSTALL}: bar I - registry.npmjs.org/qar/1.0.0 | ${INSTALL}$ node qar registry.npmjs.org/qar/1.0.0 | ${INSTALL}: done `) From d4aa4a5bad0f980748df79c8fc69b0416bf7ce60 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Tue, 10 Apr 2018 00:59:19 +0300 Subject: [PATCH 184/196] chore(release): 0.16.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1ff66fd4f8..3a6927c3aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.16.0", + "version": "0.16.1", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 89a72fd2748c027926d777cad52083cf57be9993 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 16 Apr 2018 23:00:54 +0300 Subject: [PATCH 185/196] feat: print logs from pnpmfile.js ref pnpm/pnpm#1074 --- shrinkwrap.yaml | 112 ++++++++++++++++++++------------------- src/index.ts | 5 ++ src/reporterForClient.ts | 17 ++++++ test/index.ts | 47 ++++++++++++++++ 4 files changed, 126 insertions(+), 55 deletions(-) diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index aa273c37e3..dbde827980 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,6 +1,6 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 9.6.2 + '@types/node': 9.6.5 '@types/ramda': 0.25.21 '@types/semver': 5.5.0 '@types/strip-ansi': 3.0.0 @@ -27,12 +27,12 @@ devDependencies: '@types/tape': 4.2.32 commitizen: 2.9.6 delay: 2.0.0 - ghooks: 2.0.2 + ghooks: 2.0.3 mos-tap-diff: 1.0.0 normalize-newline: 3.0.0 package-preview: 1.0.5 rimraf: 2.6.2 - supi: 0.16.1 + supi: 0.16.5 tape: 4.9.0 ts-node: 5.0.1 tslint: 5.9.1 @@ -65,8 +65,8 @@ packages: dependencies: '@pnpm/self-installer': 2.0.2 '@types/got': 7.1.8 - '@types/node': 9.6.2 - command-exists: 1.2.2 + '@types/node': 9.6.5 + command-exists: 1.2.6 cross-spawn: 5.1.0 dev: true engines: @@ -83,7 +83,7 @@ packages: integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== /@pnpm/fs-locker/1.0.1: dependencies: - '@types/node': 9.6.2 + '@types/node': 9.6.5 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: true @@ -91,24 +91,24 @@ packages: node: '>=4' resolution: integrity: sha512-gmM3SM6fBpssvbSD1U8wJbArNPiQchFzt90ICkfawo0OGQBYY6mgt+sqxF93E9yLfNY7WGtPJYhAQW3Uht6m7A== - /@pnpm/headless/0.2.2: + /@pnpm/headless/0.2.4: dependencies: '@pnpm/lifecycle': 2.1.0 '@pnpm/link-bins': 1.0.1 '@pnpm/modules-yaml': 1.0.0 - '@pnpm/package-requester': 0.8.5 + '@pnpm/package-requester': 0.8.6 '@pnpm/pkgid-to-filename': 1.0.0 '@pnpm/types': 1.7.0 '@types/ramda': 0.25.21 dependency-path: 1.2.1 graph-sequencer: 2.0.0 p-limit: 1.2.0 - package-store: 0.18.0 + package-store: 0.18.1 path-exists: 3.0.0 - pnpm-shrinkwrap: 6.2.4 + pnpm-shrinkwrap: 6.3.2 ramda: 0.25.0 read-package-json: 2.0.13 - supi: 0.16.1 + supi: 0.16.5 symlink-dir: 1.1.2 util.promisify: 1.0.0 dev: true @@ -117,7 +117,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-X5fI89Dp6dCuKpdEBqi9LZrTW6rVmfJVCEHE+Djqgf7fskEjn+DGLF3jDkefzcGQYTnRoYiVNxxQHOAEu9XxQQ== + integrity: sha512-G2uU3IUcoClz9yxVdNXTLQLppD3AyeDKEBEFT3uImwhRDZ7YCRiBh6IDVY1hNi/cxH17E19ahR7bWQ7QzHffcg== /@pnpm/lifecycle/2.1.0: dependencies: '@pnpm/types': 1.7.0 @@ -156,7 +156,7 @@ packages: integrity: sha512-6hHV7qwIxYizwpSfcSR5A/ChBkTdJYVvAxB70WYbdbj6Wc0enS2sOSuFWO8yhOUDpzBph6T+qTWYeZrlpFTqzA== /@pnpm/logger/1.0.1: dependencies: - '@types/node': 9.6.2 + '@types/node': 9.6.5 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -184,7 +184,7 @@ packages: node: '>=4' resolution: integrity: sha512-ZqVfIXK3r5AsP5VAhPHrhf3isF+T4yEuUpJTF9T03oFTJ9LBnkKvx8F7P7biKEManxSGOkSpNoIBdsura9pY5Q== - /@pnpm/package-requester/0.8.5: + /@pnpm/package-requester/0.8.6: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fetcher-base': 1.0.0 @@ -213,7 +213,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-y2JRHtpmRnh18ew24BozxPsrZQBMYzF8SNx0yYPLYRB/tR/JUR33f9HFAIgMb2eH69rAVifNtH45BqmXdQ+gSg== + integrity: sha512-1K9V9w/fogs4ZJ2JJF0YvhZu1ehRvQ/h3lD07DhzHOX/GrfRLyT34M2PwPHtmXjxpGYJPPz+4zVx8TScjS9yfw== /@pnpm/pkgid-to-filename/1.0.0: dependencies: normalize-path: 2.1.1 @@ -242,22 +242,22 @@ packages: integrity: sha512-pn7g4uxcofWTNG/cxmKvkMK2lxr4OUIhrQDrEVYEdVhW0WkWztsHkFrYjFgfNzPbYu3ITlB3T6aSVjCoJQTOlw== /@types/byline/4.2.31: dependencies: - '@types/node': 9.6.2 + '@types/node': 9.6.5 dev: true resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= /@types/common-tags/1.4.0: resolution: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== - /@types/fs-extra/5.0.1: + /@types/fs-extra/5.0.2: dependencies: - '@types/node': 9.6.2 + '@types/node': 9.6.5 dev: true resolution: - integrity: sha512-h3wnflb+jMTipvbbZnClgA2BexrT4w0GcfoCz5qyxd0IRsbqhLSyesM6mqZTAnhbVmhyTm5tuxfRu9R+8l+lGw== + integrity: sha512-Q3FWsbdmkQd1ib11A4XNWQvRD//5KpPoGawA8aB2DR7pWKoW9XQv3+dGxD/Z1eVFze23Okdo27ZQytVFlweKvQ== /@types/got/7.1.8: dependencies: - '@types/node': 9.6.2 + '@types/node': 9.6.5 dev: true resolution: integrity: sha512-QxcSkx9PjHH7uqbzqKTKOAjGbayyo+dECnnqM3BBMC0WjYAqx0e6Qi9AFR4jluvx91e7qzgz4aGka7AhCTHYRw== @@ -271,24 +271,24 @@ packages: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== /@types/mz/0.0.32: dependencies: - '@types/node': 9.6.2 + '@types/node': 9.6.5 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/8.10.4: + /@types/node/8.10.8: dev: false resolution: - integrity: sha512-FqpMm0l/JUCXK6HziUoXaxtuiefsyoeQtNy8CSOq31F/m16UNKRG40PezM6hbsUONZohzKnAHa7lEkieyx1ayA== - /@types/node/9.6.2: + integrity: sha512-BvcUxNZe9JgiiUVivtiQt3NrPVu9OAQzkxR1Ko9ESftCYU7V6Np5kpDzQwxd+34lsop7SNRdL292Flv52OvCaw== + /@types/node/9.6.5: resolution: - integrity: sha512-UWkRY9X7RQHp5OhhRIIka58/gVVycL1zHZu0OTsT5LI86ABaMOSbUjAl+b0FeDhQcxclrkyft3kW5QWdMRs8wQ== + integrity: sha512-NOLEgsT6UiDTjnWG5Hd2Mg25LRyz/oe8ql3wbjzgSFeRzRROhPmtlsvIrei4B46UjERF0td9SZ1ZXPLOdcrBHg== /@types/nopt/3.0.29: dev: true resolution: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 9.6.2 + '@types/node': 9.6.5 dev: true resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== @@ -316,7 +316,7 @@ packages: integrity: sha1-m2PUU6a1SqhJGCIHcRoIvo7qSK4= /@types/tape/4.2.32: dependencies: - '@types/node': 9.6.2 + '@types/node': 9.6.5 dev: true resolution: integrity: sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ== @@ -763,10 +763,10 @@ packages: node: '>= 0.8' resolution: integrity: sha1-cj599ugBrFYTETp+RFqbactjKBg= - /command-exists/1.2.2: + /command-exists/1.2.6: dev: true resolution: - integrity: sha1-EoGcZPr5VEbsCuB/5sr7brNwiyI= + integrity: sha512-Qst/zUUNmS/z3WziPxyqjrcz09pm+2Knbs5mAZL4VAE0sSrNY1/w8+/YxeHcoBTsO6iojA6BW7eFf27Eg2MRuw== /commander/2.1.0: dev: true engines: @@ -906,7 +906,7 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.10.4 + '@types/node': 8.10.8 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -1392,7 +1392,7 @@ packages: dev: true resolution: integrity: sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - /ghooks/2.0.2: + /ghooks/2.0.3: dependencies: findup: 0.1.5 lodash.clone: 4.5.0 @@ -1401,8 +1401,9 @@ packages: path-exists: 3.0.0 spawn-command: 0.0.2 dev: true + requiresBuild: true resolution: - integrity: sha1-sBruUk651u5zOe/CnNqVRRnxJVY= + integrity: sha1-vXySV6yuPyYWw3ecRUfTdTfLBQU= /glob-base/0.3.0: dependencies: glob-parent: 2.0.0 @@ -2450,10 +2451,10 @@ packages: /package-preview/1.0.5: dependencies: '@pnpm/exec': 1.1.4 - '@types/fs-extra': 5.0.1 + '@types/fs-extra': 5.0.2 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.2 + '@types/node': 9.6.5 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.5 find-down: 0.1.4 @@ -2471,16 +2472,16 @@ packages: node: '>=4' resolution: integrity: sha512-Qmhr23K9e2jI4LK4MU2be4xWX0CyniBDwmyCi6K+3lTZtryd2r29Wh6wPXo6wdP++jNsJ5ayZT4yJlZWVHnluQ== - /package-store/0.18.0: + /package-store/0.18.1: dependencies: '@pnpm/fetcher-base': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/package-requester': 0.8.5 + '@pnpm/package-requester': 0.8.6 '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.2 + '@types/node': 9.6.5 '@types/ramda': 0.25.21 encode-registry: 1.1.0 load-json-file: 4.0.0 @@ -2502,7 +2503,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-R3ffooDanlH6nBoxOlsjrHDClK2whLDQcqxdZJ9qJGKNuO5uxYTdUXquupCVCL1o+rJmJ06o/x7FJIbpzLkYTA== + integrity: sha512-Ia2uG5IMfNhTZtN+xynG3nyP2Hn12/Zg76OJZMhQZpGRQXXL+MPMXw/A2UCeFbBXVdb2SC75L2xfKb9TCI3rmg== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -2649,11 +2650,11 @@ packages: dev: true resolution: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= - /pnpm-shrinkwrap/6.2.4: + /pnpm-shrinkwrap/6.3.2: dependencies: '@pnpm/resolver-base': 1.0.0 '@types/js-yaml': 3.11.1 - '@types/node': 9.6.2 + '@types/node': 9.6.5 '@types/ramda': 0.25.21 dependency-path: 1.2.1 get-npm-tarball-url: 2.0.1 @@ -2670,7 +2671,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-6jS1RYFe5vfaoo2+JRQ9xIQ91oDOsYp6xCrJyCkmweKJ5ezXd2PNiYhOpZkwvVNj1NoBRN9IWS4L0/Ld2rIQcg== + integrity: sha512-DPfj3g997WtP4glNx0brXXp45Q+w9tluy90HST2md+oOPDXa9WlF9+OZkwAgoi/qgseRecUpK2d8EgIqU6H5Qw== /preserve/0.2.0: dev: true engines: @@ -2806,7 +2807,7 @@ packages: integrity: sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== /rechoir/0.6.2: dependencies: - resolve: 1.7.0 + resolve: 1.7.1 dev: true engines: node: '>= 0.10' @@ -2940,12 +2941,12 @@ packages: dev: true resolution: integrity: sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw== - /resolve/1.7.0: + /resolve/1.7.1: dependencies: path-parse: 1.0.5 dev: true resolution: - integrity: sha512-QdgZ5bjR1WAlpLaO5yHepFvC+o3rCr6wpfE2tpJNMkXdulf2jKomQBdNRQITF3ZKHNlT71syG98yQP03gasgnA== + integrity: sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw== /restore-cursor/1.0.1: dependencies: exit-hook: 1.1.1 @@ -3101,6 +3102,7 @@ packages: concat-stream: 1.6.2 os-shim: 0.1.3 dev: true + requiresBuild: true resolution: integrity: sha1-sAeZVX63+wyDdsKdROih6mfldHY= /spdx-correct/3.0.0: @@ -3263,16 +3265,16 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.16.1: + /supi/0.16.5: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/headless': 0.2.2 + '@pnpm/headless': 0.2.4 '@pnpm/lifecycle': 2.1.0 '@pnpm/link-bins': 1.0.1 '@pnpm/modules-yaml': 1.0.0 '@pnpm/package-bins': 1.0.0 - '@pnpm/package-requester': 0.8.5 + '@pnpm/package-requester': 0.8.6 '@pnpm/pkgid-to-filename': 1.0.0 '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 @@ -3280,7 +3282,7 @@ packages: '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.2 + '@types/node': 9.6.5 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 @@ -3306,11 +3308,11 @@ packages: os-homedir: 1.0.2 p-filter: 1.0.0 p-limit: 1.2.0 - package-store: 0.18.0 + package-store: 0.18.1 path-absolute: 1.0.0 path-exists: 3.0.0 pnpm-install-checks: 1.1.0 - pnpm-shrinkwrap: 6.2.4 + pnpm-shrinkwrap: 6.3.2 ramda: 0.25.0 read-package-json: 2.0.13 remove-all-except-outer-links: 1.0.3 @@ -3329,7 +3331,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-6lfpFdNx4epbgxQt7Sp78sUzY2f2mq2J4qXB54JVFlQkiwOnd4LgMphaDesEbzyQnvMJu2G//RqoUR6I7A06sA== + integrity: sha512-wAYWRCgpoA3X40SFh4ZGkP1PkgL0dt1AO5f9qr4GMBSe87/K0pyrz12oUeUFAkVQFfSgrmT4mhsQyFvO4TdHLA== /supports-color/0.2.0: dev: true engines: @@ -3358,7 +3360,7 @@ packages: /symlink-dir/1.1.2: dependencies: '@types/mz': 0.0.32 - '@types/node': 9.6.2 + '@types/node': 9.6.5 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -3499,7 +3501,7 @@ packages: glob: 7.1.2 js-yaml: 3.11.0 minimatch: 3.0.4 - resolve: 1.7.0 + resolve: 1.7.1 semver: 5.5.0 tslib: 1.9.0 tsutils: 2.26.1 @@ -3568,7 +3570,7 @@ packages: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= /unpack-stream/3.0.2: dependencies: - '@types/node': 9.6.2 + '@types/node': 9.6.5 decompress-maybe: 1.0.0 ssri: 5.3.0 tar-fs: 1.16.0 @@ -3722,7 +3724,7 @@ packages: resolution: integrity: sha512-Qv4qvc8ZIue51B/0zmeIMxpIGDVhz4GhJALBvnKs/FRa2T7jy4Ori9wFwaHVt0zWV7MIFglKAHbgnVxVTw7U1w== registry: 'https://registry.npmjs.org/' -shrinkwrapMinorVersion: 4 +shrinkwrapMinorVersion: 5 shrinkwrapVersion: 3 specifiers: '@pnpm/logger': ^1.0.0 diff --git a/src/index.ts b/src/index.ts index 2020056e20..1fc488e3f8 100644 --- a/src/index.ts +++ b/src/index.ts @@ -76,6 +76,7 @@ export function toOutput$ ( const linkPushStream = new PushStream() const cliPushStream = new PushStream() const otherPushStream = new PushStream() + const hookPushStream = new PushStream() setTimeout(() => { // setTimeout is a workaround for a strange bug in most https://github.com/cujojs/most/issues/491 streamParser['on']('data', (log: supi.Log) => { switch (log.name) { @@ -115,6 +116,9 @@ export function toOutput$ ( case 'pnpm:cli' as any: // tslint:disable-line cliPushStream.next(log) break + case 'pnpm:hook' as any: // tslint:disable-line + hookPushStream.next(log) + break case 'pnpm' as any: // tslint:disable-line otherPushStream.next(log) break @@ -124,6 +128,7 @@ export function toOutput$ ( const log$ = { cli: most.from(cliPushStream.observable), deprecation: most.from(deprecationPushStream.observable), + hook: most.from(hookPushStream.observable), installCheck: most.from(installCheckPushStream.observable), lifecycle: most.from(lifecyclePushStream.observable), link: most.from(linkPushStream.observable), diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 5e85eee4a5..3654caf6df 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -53,6 +53,7 @@ export default function ( link: most.Stream, other: most.Stream, cli: most.Stream, + hook: most.Stream, }, isRecursive: boolean, cmd: string, @@ -364,6 +365,22 @@ export default function ( outputs.push(miscOutput$) } + if (!isRecursive) { + const hookOutput$ = log$.hook + .map((log) => ({msg: `${chalk.magentaBright(log['hook'])}: ${log['message']}`})) + .map(most.of) + + outputs.push(hookOutput$) + } else { + const hookOutput$ = log$.hook + .map((log) => ({ + msg: `${rightPad(formatPrefix(cwd, log['prefix']), PREFIX_MAX_LENGTH)} | ${chalk.magentaBright(log['hook'])}: ${log['message']}`, + })) + .map(most.of) + + outputs.push(hookOutput$) + } + return outputs } diff --git a/test/index.ts b/test/index.ts index 57f9028632..efdf356711 100644 --- a/test/index.ts +++ b/test/index.ts @@ -33,6 +33,7 @@ const summaryLogger = logger('summary') const lifecycleLogger = logger('lifecycle') const packageJsonLogger = logger('package-json') const statsLogger = logger('stats') +const hookLogger = logger('hook') const EOL = '\n' test('prints progress beginning', t => { @@ -921,3 +922,49 @@ test('recursive installation: prints at least one add sign when added !== 0', t error: t.end, }) }) + +test('install: print hook message', t => { + const output$ = toOutput$(createStreamParser(), {cmd: 'install', cwd: '/home/jane/repo'}) + + hookLogger.debug({ + from: '/home/jane/repo/pnpmfile.js', + prefix: '/home/jane/repo', + hook: 'readPackage', + message: 'foo', + }) + + t.plan(1) + + output$.take(1).map(normalizeNewline).subscribe({ + next: output => { + t.equal(output, stripIndents` + ${chalk.magentaBright('readPackage')}: foo` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) + +test('recursive: print hook message', t => { + const output$ = toOutput$(createStreamParser(), {cmd: 'recursive', cwd: '/home/jane/repo'}) + + hookLogger.debug({ + from: '/home/jane/repo/pnpmfile.js', + prefix: '/home/jane/repo/pkg-1', + hook: 'readPackage', + message: 'foo', + }) + + t.plan(1) + + output$.take(1).map(normalizeNewline).subscribe({ + next: output => { + t.equal(output, stripIndents` + pkg-1 | ${chalk.magentaBright('readPackage')}: foo` + ) + }, + complete: () => t.end(), + error: t.end, + }) +}) From 45be6a046d1be90e12fa1a666619cc9bd520a13e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 19 Apr 2018 14:56:40 +0000 Subject: [PATCH 186/196] fix(deps): update dependency normalize-path to v3 --- package.json | 2 +- shrinkwrap.yaml | 54 ++++++++++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 3a6927c3aa..e054cae755 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "most": "^1.7.2", "most-last": "^1.0.0", "ndjson": "^1.5.0", - "normalize-path": "^2.1.1", + "normalize-path": "^3.0.0", "pretty-bytes": "^4.0.2", "ramda": "^0.25.0", "right-pad": "^1.0.1", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index dbde827980..d61b6f3091 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,18 +1,17 @@ dependencies: '@types/common-tags': 1.4.0 '@types/node': 9.6.5 - '@types/ramda': 0.25.21 + '@types/ramda': 0.25.23 '@types/semver': 5.5.0 '@types/strip-ansi': 3.0.0 ansi-diff: 1.1.0 - chalk: 2.3.2 + chalk: 2.4.0 cli-cursor: 2.1.0 common-tags: 1.7.2 most: 1.7.3 most-last: 1.0.1 ndjson: 1.5.0 - normalize-path: 2.1.1 - pnpm-default-reporter: 'link:../__package_previews__/pnpm-default-reporter/pnpm-default-reporter' + normalize-path: 3.0.0 pretty-bytes: 4.0.2 ramda: 0.25.0 right-pad: 1.0.1 @@ -32,7 +31,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.5 rimraf: 2.6.2 - supi: 0.16.5 + supi: 0.16.6 tape: 4.9.0 ts-node: 5.0.1 tslint: 5.9.1 @@ -99,7 +98,7 @@ packages: '@pnpm/package-requester': 0.8.6 '@pnpm/pkgid-to-filename': 1.0.0 '@pnpm/types': 1.7.0 - '@types/ramda': 0.25.21 + '@types/ramda': 0.25.23 dependency-path: 1.2.1 graph-sequencer: 2.0.0 p-limit: 1.2.0 @@ -108,7 +107,7 @@ packages: pnpm-shrinkwrap: 6.3.2 ramda: 0.25.0 read-package-json: 2.0.13 - supi: 0.16.5 + supi: 0.16.6 symlink-dir: 1.1.2 util.promisify: 1.0.0 dev: true @@ -137,7 +136,7 @@ packages: '@pnpm/package-bins': 1.0.0 '@pnpm/types': 1.7.0 '@types/mz': 0.0.32 - '@types/ramda': 0.25.21 + '@types/ramda': 0.25.23 '@zkochan/cmd-shim': 2.2.4 arr-flatten: 1.1.0 is-windows: 1.0.2 @@ -300,9 +299,9 @@ packages: dev: true resolution: integrity: sha512-dwv960sf5inFWiufjhDfK7ZG3nYyHXt58I+14bJJBKV5MPlZm6Tu1sQS63NWEtLpIw6+RhbNbXjNStdMXxR8Nw== - /@types/ramda/0.25.21: + /@types/ramda/0.25.23: resolution: - integrity: sha512-y4Dx3t+EA5Y+s87cwUoIzo0Tsj9z7QCu4gaXrdFln4wQRgk9igBskEEe7gZ0PG8dSXtQb29oA3RS//3XquHdiw== + integrity: sha512-JYovPjyl7dLbYSXLjnqZlQCyw2NJ2+X5W9JrJLiQh6BMkB9KdfZ8eqBaK2kPlesj+wA6VLEra0UCx1R9ZkpmZQ== /@types/rc/0.0.1: dev: true resolution: @@ -691,15 +690,15 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - /chalk/2.3.2: + /chalk/2.4.0: dependencies: ansi-styles: 3.2.1 escape-string-regexp: 1.0.5 - supports-color: 5.3.0 + supports-color: 5.4.0 engines: node: '>=4' resolution: - integrity: sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ== + integrity: sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw== /chownr/1.0.1: dev: true resolution: @@ -2245,10 +2244,17 @@ packages: /normalize-path/2.1.1: dependencies: remove-trailing-separator: 1.1.0 + dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= + /normalize-path/3.0.0: + dev: false + engines: + node: '>=0.10.0' + resolution: + integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== /normalize-registry-url/1.0.0: dev: true resolution: @@ -2338,6 +2344,7 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= + tarball: 'http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz' /onetime/2.0.1: dependencies: mimic-fn: 1.2.0 @@ -2482,7 +2489,7 @@ packages: '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 '@types/node': 9.6.5 - '@types/ramda': 0.25.21 + '@types/ramda': 0.25.23 encode-registry: 1.1.0 load-json-file: 4.0.0 mkdirp-promise: 5.0.1 @@ -2655,7 +2662,7 @@ packages: '@pnpm/resolver-base': 1.0.0 '@types/js-yaml': 3.11.1 '@types/node': 9.6.5 - '@types/ramda': 0.25.21 + '@types/ramda': 0.25.23 dependency-path: 1.2.1 get-npm-tarball-url: 2.0.1 js-yaml: 3.11.0 @@ -2844,6 +2851,7 @@ packages: resolution: integrity: sha512-h9Pl2xE1ZxYOhlKh0nYeMfzfv0GYUfglE5Eb0ILFFUiDnvVcbKwxGGukETEeIteR0JTVfesOaKqiwrOoUz1ajw== /remove-trailing-separator/1.1.0: + dev: true resolution: integrity: sha1-wkvOKig62tW8P1jg1IJJuSN52O8= /rename-overwrite/1.0.2: @@ -3265,7 +3273,7 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.16.5: + /supi/0.16.6: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 @@ -3286,7 +3294,7 @@ packages: '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 - '@types/ramda': 0.25.21 + '@types/ramda': 0.25.23 '@types/rc': 0.0.1 '@types/semver': 5.5.0 '@zkochan/npm-package-arg': 1.0.0 @@ -3331,7 +3339,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-wAYWRCgpoA3X40SFh4ZGkP1PkgL0dt1AO5f9qr4GMBSe87/K0pyrz12oUeUFAkVQFfSgrmT4mhsQyFvO4TdHLA== + integrity: sha512-A90KRrVD7Gmr/afq/MVQ/8KSSfQpBdu9lApIkm1LJnQ9mvOxUa6oS4ihiVSQ6gBBxe65c6VNcdCAoL4+he1vOQ== /supports-color/0.2.0: dev: true engines: @@ -3344,13 +3352,13 @@ packages: node: '>=0.8.0' resolution: integrity: sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - /supports-color/5.3.0: + /supports-color/5.4.0: dependencies: has-flag: 3.0.0 engines: node: '>=4' resolution: - integrity: sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg== + integrity: sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w== /symbol-observable/1.2.0: dev: false engines: @@ -3475,7 +3483,7 @@ packages: /ts-node/5.0.1: dependencies: arrify: 1.0.1 - chalk: 2.3.2 + chalk: 2.4.0 diff: 3.5.0 make-error: 1.3.4 minimist: 1.2.0 @@ -3495,7 +3503,7 @@ packages: dependencies: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 - chalk: 2.3.2 + chalk: 2.4.0 commander: 2.15.1 diff: 3.5.0 glob: 7.1.2 @@ -3746,7 +3754,7 @@ specifiers: most-last: ^1.0.0 ndjson: ^1.5.0 normalize-newline: ^3.0.0 - normalize-path: ^2.1.1 + normalize-path: ^3.0.0 package-preview: ^1.0.0 pretty-bytes: ^4.0.2 ramda: ^0.25.0 From 8a3cc16ed51ef6fff29fd9912c8d2834a53789ad Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 19 Apr 2018 16:01:44 +0000 Subject: [PATCH 187/196] chore(deps): update dependency ts-node to v6 --- package.json | 2 +- shrinkwrap.yaml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index e054cae755..d8ce230b2b 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "rimraf": "^2.5.4", "supi": "^0.16.0", "tape": "^4.8.0", - "ts-node": "^5.0.0", + "ts-node": "^6.0.0", "tslint": "^5.7.0", "typescript": "^2.6.2", "validate-commit-msg": "^2.8.2" diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index d61b6f3091..90048a31e5 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -33,7 +33,7 @@ devDependencies: rimraf: 2.6.2 supi: 0.16.6 tape: 4.9.0 - ts-node: 5.0.1 + ts-node: 6.0.0 tslint: 5.9.1 typescript: 2.8.1 validate-commit-msg: 2.14.0 @@ -274,10 +274,10 @@ packages: dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/8.10.8: + /@types/node/8.10.9: dev: false resolution: - integrity: sha512-BvcUxNZe9JgiiUVivtiQt3NrPVu9OAQzkxR1Ko9ESftCYU7V6Np5kpDzQwxd+34lsop7SNRdL292Flv52OvCaw== + integrity: sha512-GUUTbeDaJSRaoLkqVQ5jwwKbDiLWFX3JrKLvC078q2P51Z9Dcb5F5UdnApSYqdMk4X0VrKod1gzeoX8bGl8DMg== /@types/node/9.6.5: resolution: integrity: sha512-NOLEgsT6UiDTjnWG5Hd2Mg25LRyz/oe8ql3wbjzgSFeRzRROhPmtlsvIrei4B46UjERF0td9SZ1ZXPLOdcrBHg== @@ -905,7 +905,7 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.10.8 + '@types/node': 8.10.9 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -3480,7 +3480,7 @@ packages: node: '>=4' resolution: integrity: sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= - /ts-node/5.0.1: + /ts-node/6.0.0: dependencies: arrify: 1.0.1 chalk: 2.4.0 @@ -3494,7 +3494,7 @@ packages: engines: node: '>=4.2.0' resolution: - integrity: sha512-XK7QmDcNHVmZkVtkiwNDWiERRHPyU8nBqZB1+iv2UhOG0q3RQ9HsZ2CMqISlFbxjrYFGfG2mX7bW4dAyxBVzUw== + integrity: sha512-+CQev+4J7BAUNUnW9piRzSfSZZWeFCjgUjMSgGs4+dJ2RZa86NVW9MOlP4e6/kEHTyOqdxHxcIMd7KgmY/ynVw== /tslib/1.9.0: dev: true resolution: @@ -3767,7 +3767,7 @@ specifiers: strip-ansi: ^4.0.0 supi: ^0.16.0 tape: ^4.8.0 - ts-node: ^5.0.0 + ts-node: ^6.0.0 tslint: ^5.7.0 typescript: ^2.6.2 validate-commit-msg: ^2.8.2 From 1392276efeca4c0bf8271580c91567d9f4198fd3 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 20 Apr 2018 00:31:56 +0300 Subject: [PATCH 188/196] test: fix typings --- package.json | 1 + shrinkwrap.yaml | 7 +++++++ test/index.ts | 22 +++++++++++----------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index d8ce230b2b..485473cd80 100644 --- a/package.json +++ b/package.json @@ -66,6 +66,7 @@ }, "devDependencies": { "@pnpm/logger": "^1.0.0", + "@types/delay": "^2.0.1", "@types/tape": "^4.2.30", "commitizen": "^2.9.5", "delay": "^2.0.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 90048a31e5..9afcd5aec1 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -12,6 +12,7 @@ dependencies: most-last: 1.0.1 ndjson: 1.5.0 normalize-path: 3.0.0 + pnpm-default-reporter: 'link:../__package_previews__/pnpm-default-reporter/pnpm-default-reporter' pretty-bytes: 4.0.2 ramda: 0.25.0 right-pad: 1.0.1 @@ -23,6 +24,7 @@ dependencies: zen-push: 0.2.1 devDependencies: '@pnpm/logger': 1.0.1 + '@types/delay': 2.0.1 '@types/tape': 4.2.32 commitizen: 2.9.6 delay: 2.0.0 @@ -248,6 +250,10 @@ packages: /@types/common-tags/1.4.0: resolution: integrity: sha512-HI1tSO87vmd1sPS3DOVSK4gvVKROvCBFvAnXlLiQtAus/+1xXMQcNyu9TX2ChwRXFeQZeB9+f+nMo99xLd5DdA== + /@types/delay/2.0.1: + dev: true + resolution: + integrity: sha512-D1/YuYOcdOIdaQnaiUJ77VcilVvESkynw79CtGqpjkXyv4OUezEVZtdXnSOwXL8Zcelu66QbyC8QQcVQ/ZPdig== /@types/fs-extra/5.0.2: dependencies: '@types/node': 9.6.5 @@ -3737,6 +3743,7 @@ shrinkwrapVersion: 3 specifiers: '@pnpm/logger': ^1.0.0 '@types/common-tags': ^1.2.5 + '@types/delay': ^2.0.1 '@types/node': ^9.3.0 '@types/ramda': ^0.25.6 '@types/semver': ^5.4.0 diff --git a/test/index.ts b/test/index.ts index efdf356711..084b0705c3 100644 --- a/test/index.ts +++ b/test/index.ts @@ -37,7 +37,7 @@ const hookLogger = logger('hook') const EOL = '\n' test('prints progress beginning', t => { - const output$ = toOutput$(createStreamParser()) + const output$ = toOutput$(createStreamParser(), {cmd: 'install'}) const pkgId = 'registry.npmjs.org/foo/1.0.0' @@ -58,7 +58,7 @@ test('prints progress beginning', t => { }) test('prints progress beginning when appendOnly is true', t => { - const output$ = toOutput$(createStreamParser(), {appendOnly: true}) + const output$ = toOutput$(createStreamParser(), {cmd: 'install', appendOnly: true}) const pkgId = 'registry.npmjs.org/foo/1.0.0' @@ -100,7 +100,7 @@ test('prints progress beginning during recursive install', t => { }) test('prints progress on first download', t => { - const output$ = toOutput$(createStreamParser(), {throttleProgress: 0}) + const output$ = toOutput$(createStreamParser(), {cmd: 'install', throttleProgress: 0}) const pkgId = 'registry.npmjs.org/foo/1.0.0' @@ -125,7 +125,7 @@ test('prints progress on first download', t => { }) test('moves fixed line to the end', async t => { - const output$ = toOutput$(createStreamParser(), {throttleProgress: 0}) + const output$ = toOutput$(createStreamParser(), {cmd: 'install', throttleProgress: 0}) output$.skip(3).take(1).map(normalizeNewline).subscribe({ next: output => { @@ -159,7 +159,7 @@ test('moves fixed line to the end', async t => { }) test('prints "Already up-to-date"', t => { - const output$ = toOutput$(createStreamParser()) + const output$ = toOutput$(createStreamParser(), {cmd: 'install'}) statsLogger.debug({ added: 0 }) statsLogger.debug({ removed: 0 }) @@ -178,7 +178,7 @@ test('prints "Already up-to-date"', t => { }) test('prints summary', t => { - const output$ = toOutput$(createStreamParser()) + const output$ = toOutput$(createStreamParser(), {cmd: 'install'}) packageJsonLogger.debug({ initial: { @@ -306,7 +306,7 @@ test('prints summary', t => { }) test('groups lifecycle output', t => { - const output$ = toOutput$(createStreamParser()) + const output$ = toOutput$(createStreamParser(), {cmd: 'install'}) const pkgId = 'registry.npmjs.org/foo/1.0.0' @@ -393,7 +393,7 @@ test('groups lifecycle output', t => { // Many libs use stderr for logging, so showing all stderr adds not much value test['skip']('prints lifecycle progress', t => { - const output$ = toOutput$(createStreamParser()) + const output$ = toOutput$(createStreamParser(), {cmd: 'install'}) const pkgId = 'registry.npmjs.org/foo/1.0.0' @@ -438,7 +438,7 @@ test['skip']('prints lifecycle progress', t => { }) test('prints generic error', t => { - const output$ = toOutput$(createStreamParser()) + const output$ = toOutput$(createStreamParser(), {cmd: 'install'}) const err = new Error('some error') logger.error(err) @@ -480,7 +480,7 @@ test('prints generic error when recursive install fails', t => { }) test('prints info', t => { - const output$ = toOutput$(createStreamParser()) + const output$ = toOutput$(createStreamParser(), {cmd: 'install'}) logger.info('info message') @@ -498,7 +498,7 @@ test('prints info', t => { test('prints progress of big files download', async t => { t.plan(6) - let output$ = toOutput$(createStreamParser(), {throttleProgress: 0}) + let output$ = toOutput$(createStreamParser(), {cmd: 'install', throttleProgress: 0}) .map(normalizeNewline) as most.Stream const stream$: most.Stream[] = [] From 5b9562be4868706f2b341baa284c7665c84e2343 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Fri, 20 Apr 2018 00:36:00 +0300 Subject: [PATCH 189/196] chore(release): 0.16.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 485473cd80..03415715c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.16.1", + "version": "0.16.2", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 39e3de4c012793e63b2af27068ecad1f2abce120 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 6 May 2018 15:58:48 +0300 Subject: [PATCH 190/196] ci(travis): test on Node.js 10 --- .travis.yml | 2 +- shrinkwrap.yaml | 301 +++++++++++++++++++++++++++--------------------- 2 files changed, 172 insertions(+), 131 deletions(-) diff --git a/.travis.yml b/.travis.yml index 52694032c7..4005ab8e81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ node_js: - 4 - 6 - 8 - - 9 + - 10 sudo: false before_install: - curl -L https://unpkg.com/@pnpm/self-installer | node diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 9afcd5aec1..4a58eba7bd 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,11 +1,11 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 9.6.5 - '@types/ramda': 0.25.23 + '@types/node': 9.6.12 + '@types/ramda': 0.25.24 '@types/semver': 5.5.0 '@types/strip-ansi': 3.0.0 ansi-diff: 1.1.0 - chalk: 2.4.0 + chalk: 2.4.1 cli-cursor: 2.1.0 common-tags: 1.7.2 most: 1.7.3 @@ -17,7 +17,7 @@ dependencies: ramda: 0.25.0 right-pad: 1.0.1 semver: 5.5.0 - stacktracey: 1.2.100 + stacktracey: 1.2.101 string-length: 2.0.0 string.prototype.padstart: 3.0.0 strip-ansi: 4.0.0 @@ -28,16 +28,16 @@ devDependencies: '@types/tape': 4.2.32 commitizen: 2.9.6 delay: 2.0.0 - ghooks: 2.0.3 + ghooks: 2.0.4 mos-tap-diff: 1.0.0 normalize-newline: 3.0.0 package-preview: 1.0.5 rimraf: 2.6.2 - supi: 0.16.6 + supi: 0.16.9 tape: 4.9.0 - ts-node: 6.0.0 - tslint: 5.9.1 - typescript: 2.8.1 + ts-node: 6.0.2 + tslint: 5.10.0 + typescript: 2.8.3 validate-commit-msg: 2.14.0 packages: /@most/multicast/1.3.0: @@ -64,9 +64,9 @@ packages: integrity: sha512-rN+hiOjGtxwwus7c/E0xkCs9prBeXzZCSCW/Q3k2WdHGSRNLAepr777iv+i2eqTfz9vXlTF0rLZOGi62ujzwYA== /@pnpm/exec/1.1.4: dependencies: - '@pnpm/self-installer': 2.0.2 + '@pnpm/self-installer': 2.0.3 '@types/got': 7.1.8 - '@types/node': 9.6.5 + '@types/node': 9.6.12 command-exists: 1.2.6 cross-spawn: 5.1.0 dev: true @@ -84,7 +84,7 @@ packages: integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== /@pnpm/fs-locker/1.0.1: dependencies: - '@types/node': 9.6.5 + '@types/node': 9.6.12 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: true @@ -92,15 +92,15 @@ packages: node: '>=4' resolution: integrity: sha512-gmM3SM6fBpssvbSD1U8wJbArNPiQchFzt90ICkfawo0OGQBYY6mgt+sqxF93E9yLfNY7WGtPJYhAQW3Uht6m7A== - /@pnpm/headless/0.2.4: + /@pnpm/headless/0.2.6: dependencies: '@pnpm/lifecycle': 2.1.0 - '@pnpm/link-bins': 1.0.1 + '@pnpm/link-bins': 1.0.2 '@pnpm/modules-yaml': 1.0.0 - '@pnpm/package-requester': 0.8.6 - '@pnpm/pkgid-to-filename': 1.0.0 + '@pnpm/package-requester': 0.8.8 + '@pnpm/pkgid-to-filename': 1.0.1 '@pnpm/types': 1.7.0 - '@types/ramda': 0.25.23 + '@types/ramda': 0.25.24 dependency-path: 1.2.1 graph-sequencer: 2.0.0 p-limit: 1.2.0 @@ -109,7 +109,7 @@ packages: pnpm-shrinkwrap: 6.3.2 ramda: 0.25.0 read-package-json: 2.0.13 - supi: 0.16.6 + supi: 0.16.9 symlink-dir: 1.1.2 util.promisify: 1.0.0 dev: true @@ -118,7 +118,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-G2uU3IUcoClz9yxVdNXTLQLppD3AyeDKEBEFT3uImwhRDZ7YCRiBh6IDVY1hNi/cxH17E19ahR7bWQ7QzHffcg== + integrity: sha512-0Vm78Hchh/N39N8x5mDuNgrxlxvdo1kDyT9/btZ+HkexmwWP5u/QW3uOQSPLC6wERIHAOwO5t0aSfCiOXtdRHw== /@pnpm/lifecycle/2.1.0: dependencies: '@pnpm/types': 1.7.0 @@ -133,18 +133,19 @@ packages: '@pnpm/logger': ^1.0.0 resolution: integrity: sha512-f/Dtu0kUDlzZI2+8QVOvFbBra82aa5VLXpTOLEndJzddCooY/Qhva7Rc0xULfciy83BohBF9sp8OFZCTugnMVQ== - /@pnpm/link-bins/1.0.1: + /@pnpm/link-bins/1.0.2: dependencies: '@pnpm/package-bins': 1.0.0 '@pnpm/types': 1.7.0 '@types/mz': 0.0.32 - '@types/ramda': 0.25.23 + '@types/node': 9.6.12 + '@types/ramda': 0.25.24 '@zkochan/cmd-shim': 2.2.4 arr-flatten: 1.1.0 is-windows: 1.0.2 mkdirp-promise: 5.0.1 mz: 2.7.0 - normalize-path: 2.1.1 + normalize-path: 3.0.0 p-filter: 1.0.0 ramda: 0.25.0 read-package-json: 2.0.13 @@ -154,10 +155,10 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-6hHV7qwIxYizwpSfcSR5A/ChBkTdJYVvAxB70WYbdbj6Wc0enS2sOSuFWO8yhOUDpzBph6T+qTWYeZrlpFTqzA== + integrity: sha512-xFLSomtWjEN6Oa4YPSBamhiYYDefh+zkUNkh0xpUmJVOSYASZ9BnJ38eGJuvb9Kcz+hkzoz75ZzwGIlyZrGL2A== /@pnpm/logger/1.0.1: dependencies: - '@types/node': 9.6.5 + '@types/node': 9.6.12 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -185,22 +186,23 @@ packages: node: '>=4' resolution: integrity: sha512-ZqVfIXK3r5AsP5VAhPHrhf3isF+T4yEuUpJTF9T03oFTJ9LBnkKvx8F7P7biKEManxSGOkSpNoIBdsura9pY5Q== - /@pnpm/package-requester/0.8.6: + /@pnpm/package-requester/0.8.8: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fetcher-base': 1.0.0 - '@pnpm/pkgid-to-filename': 1.0.0 + '@pnpm/pkgid-to-filename': 1.0.1 '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 + '@types/node': 9.6.12 '@types/p-queue': 2.3.1 '@types/write-json-file': 2.2.1 load-json-file: 4.0.0 mkdirp-promise: 5.0.1 mz: 2.7.0 p-limit: 1.2.0 - p-queue: 2.4.0 + p-queue: 2.4.2 path-exists: 3.0.0 read-package-json: 2.0.13 rename-overwrite: 1.0.2 @@ -214,15 +216,15 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-1K9V9w/fogs4ZJ2JJF0YvhZu1ehRvQ/h3lD07DhzHOX/GrfRLyT34M2PwPHtmXjxpGYJPPz+4zVx8TScjS9yfw== - /@pnpm/pkgid-to-filename/1.0.0: + integrity: sha512-EN1LBSKJg1wcBjt7O1OMbVrmtUdnVkSmXJj+VlCNqVaMckcwMuefMIDsafb1JpTA0ie+K9dfbtomUFMZVrb1jQ== + /@pnpm/pkgid-to-filename/1.0.1: dependencies: - normalize-path: 2.1.1 + normalize-path: 3.0.0 dev: true engines: node: '>=4' resolution: - integrity: sha512-HnWDy3ecIKBsbRR9bwf+GJpV1CWLQ9Injj7eLSEQIsXQ+CLXU0h1NaxBCW7zcJm+2kbwnm0E1aFdFIEJXhHiTg== + integrity: sha512-PxAHIeraDV9YE0mBriqWewN4iOGL3UMzS7XTaYhu1OvoTqEuJ3cFCHGUW2GR0sYiMf0krj2WIASgoXi4XpAGuA== /@pnpm/resolver-base/1.0.0: dependencies: '@pnpm/types': 1.7.0 @@ -231,19 +233,19 @@ packages: node: '>=4' resolution: integrity: sha512-+y47No75LZFnkN7VAnoEtkIzDgOuc8ZT4QjyhuNIBVLx4oqFa/R16DpSyRjmaTZMCSREXunObULKL/hoLipNDA== - /@pnpm/self-installer/2.0.2: + /@pnpm/self-installer/2.0.3: dev: true engines: node: '>=4' resolution: - integrity: sha1-hbuHZMfM0iOZn2FCGQBixibo8oc= + integrity: sha512-Awzcm+UsGmUZaZXkLH5efJEos9UICA4PIXpedyiY7Mg4LXVUtrGtX/jYNkuxj3x/bwh+7LnEvbBV4GpscxsFjw== /@pnpm/types/1.7.0: dev: true resolution: integrity: sha512-pn7g4uxcofWTNG/cxmKvkMK2lxr4OUIhrQDrEVYEdVhW0WkWztsHkFrYjFgfNzPbYu3ITlB3T6aSVjCoJQTOlw== /@types/byline/4.2.31: dependencies: - '@types/node': 9.6.5 + '@types/node': 9.6.12 dev: true resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= @@ -256,13 +258,13 @@ packages: integrity: sha512-D1/YuYOcdOIdaQnaiUJ77VcilVvESkynw79CtGqpjkXyv4OUezEVZtdXnSOwXL8Zcelu66QbyC8QQcVQ/ZPdig== /@types/fs-extra/5.0.2: dependencies: - '@types/node': 9.6.5 + '@types/node': 9.6.12 dev: true resolution: integrity: sha512-Q3FWsbdmkQd1ib11A4XNWQvRD//5KpPoGawA8aB2DR7pWKoW9XQv3+dGxD/Z1eVFze23Okdo27ZQytVFlweKvQ== /@types/got/7.1.8: dependencies: - '@types/node': 9.6.5 + '@types/node': 9.6.12 dev: true resolution: integrity: sha512-QxcSkx9PjHH7uqbzqKTKOAjGbayyo+dECnnqM3BBMC0WjYAqx0e6Qi9AFR4jluvx91e7qzgz4aGka7AhCTHYRw== @@ -276,24 +278,24 @@ packages: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== /@types/mz/0.0.32: dependencies: - '@types/node': 9.6.5 + '@types/node': 9.6.12 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/8.10.9: + /@types/node/8.10.12: dev: false resolution: - integrity: sha512-GUUTbeDaJSRaoLkqVQ5jwwKbDiLWFX3JrKLvC078q2P51Z9Dcb5F5UdnApSYqdMk4X0VrKod1gzeoX8bGl8DMg== - /@types/node/9.6.5: + integrity: sha512-aRFUGj/f9JVA0qSQiCK9ebaa778mmqMIcy1eKnPktgfm9O6VsnIzzB5wJnjp9/jVrfm7fX1rr3OR1nndppGZUg== + /@types/node/9.6.12: resolution: - integrity: sha512-NOLEgsT6UiDTjnWG5Hd2Mg25LRyz/oe8ql3wbjzgSFeRzRROhPmtlsvIrei4B46UjERF0td9SZ1ZXPLOdcrBHg== + integrity: sha512-2Z8ziWjJbvV8hHL5YcqCG9ng+/qwUlO1gB4frBD7QI5Wm1Y1iM+AEkGVEv0S5P+aDMwTtAhPJFR4rp1uqagSig== /@types/nopt/3.0.29: dev: true resolution: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 9.6.5 + '@types/node': 9.6.12 dev: true resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== @@ -305,9 +307,9 @@ packages: dev: true resolution: integrity: sha512-dwv960sf5inFWiufjhDfK7ZG3nYyHXt58I+14bJJBKV5MPlZm6Tu1sQS63NWEtLpIw6+RhbNbXjNStdMXxR8Nw== - /@types/ramda/0.25.23: + /@types/ramda/0.25.24: resolution: - integrity: sha512-JYovPjyl7dLbYSXLjnqZlQCyw2NJ2+X5W9JrJLiQh6BMkB9KdfZ8eqBaK2kPlesj+wA6VLEra0UCx1R9ZkpmZQ== + integrity: sha512-c0TmWA7d4y9KLJJwL/cLPEfSReSgFQK9BtemcCATT48lMeyD7HG8IfGY8bamSuz/Byx1l+13hZV0PCvHsgMB3w== /@types/rc/0.0.1: dev: true resolution: @@ -321,7 +323,7 @@ packages: integrity: sha1-m2PUU6a1SqhJGCIHcRoIvo7qSK4= /@types/tape/4.2.32: dependencies: - '@types/node': 9.6.5 + '@types/node': 9.6.12 dev: true resolution: integrity: sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ== @@ -482,12 +484,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= - /as-table/1.0.31: + /as-table/1.0.32: dependencies: - printable-characters: 1.0.38 + printable-characters: 1.0.39 dev: false resolution: - integrity: sha1-0AGAAk7LttGnRxUN91HTcWrqgWY= + integrity: sha1-zQmMcjtrgCOS+PeEmOZc0EHw5QQ= /asn1/0.2.3: dev: true resolution: @@ -550,7 +552,7 @@ packages: /bl/1.2.2: dependencies: readable-stream: 2.3.6 - safe-buffer: 5.1.1 + safe-buffer: 5.1.2 dev: true resolution: integrity: sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA== @@ -608,6 +610,21 @@ packages: dev: true resolution: integrity: sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0= + /buffer-alloc-unsafe/0.1.1: + dev: true + resolution: + integrity: sha1-/+H2dVHdBVc33iUzN7/oU9+rGmo= + /buffer-alloc/1.1.0: + dependencies: + buffer-alloc-unsafe: 0.1.1 + buffer-fill: 0.1.1 + dev: true + resolution: + integrity: sha1-BVFNM78WVtNUDGhPZbEgLpDsowM= + /buffer-fill/0.1.1: + dev: true + resolution: + integrity: sha512-YgBMBzdRLEfgxJIGu2wrvI2E03tMCFU1p7d1KhB4BOoMN0VxmTFjSyN5JtKt9z8Z9JajMHruI6SE25W96wNv7Q== /buffer-from/1.0.0: dev: true resolution: @@ -640,7 +657,7 @@ packages: dependencies: is-bzip2: 1.0.0 peek-stream: 1.1.3 - pumpify: 1.4.0 + pumpify: 1.5.0 through2: 2.0.3 unbzip2-stream: 1.2.5 dev: true @@ -696,7 +713,7 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= - /chalk/2.4.0: + /chalk/2.4.1: dependencies: ansi-styles: 3.2.1 escape-string-regexp: 1.0.5 @@ -704,7 +721,7 @@ packages: engines: node: '>=4' resolution: - integrity: sha512-Wr/w0f4o9LuE7K53cD0qmbAMM+2XNLzR29vFn5hqko4sxGlUsyy363NvmyGIyk5tpe9cjTr9SJYbysEyPkRnFw== + integrity: sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ== /chownr/1.0.1: dev: true resolution: @@ -911,7 +928,7 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.10.9 + '@types/node': 8.10.12 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -934,7 +951,7 @@ packages: dependencies: bzip2-maybe: 1.0.0 gunzip-maybe: 1.4.1 - pumpify: 1.4.0 + pumpify: 1.5.0 dev: true resolution: integrity: sha1-rf54xmzAaeZOgkvRQFuF515tHLs= @@ -1036,7 +1053,7 @@ packages: dev: true resolution: integrity: sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= - /duplexify/3.5.4: + /duplexify/3.6.0: dependencies: end-of-stream: 1.4.1 inherits: 2.0.3 @@ -1044,7 +1061,7 @@ packages: stream-shift: 1.0.0 dev: true resolution: - integrity: sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA== + integrity: sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ== /ecc-jsbn/0.1.1: dependencies: jsbn: 0.1.1 @@ -1317,6 +1334,10 @@ packages: node: '>= 0.12' resolution: integrity: sha1-SXBJi+YEwgwAXU9cI67NIda0kJk= + /fs-constants/1.0.0: + dev: true + resolution: + integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== /fs-exists-sync/0.1.0: dev: true engines: @@ -1339,6 +1360,14 @@ packages: dev: true resolution: integrity: sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ== + /fs-vacuum/1.2.10: + dependencies: + graceful-fs: 4.1.11 + path-is-inside: 1.0.2 + rimraf: 2.6.2 + dev: true + resolution: + integrity: sha1-t2Kb7AekAxolSP35n17PHMizHjY= /fs.realpath/1.0.0: dev: true resolution: @@ -1378,13 +1407,13 @@ packages: node: '>=4' resolution: integrity: sha512-POrVRGyS9X5w+855/H46JGVYBGuVgJXyIkbsTCzW+sv5x2qH+rfQjc7652DzkgOskF+cqLevA2En7V0hu0gZCg== - /get-source/1.0.24: + /get-source/1.0.25: dependencies: data-uri-to-buffer: 2.0.0 source-map: 0.6.1 dev: false resolution: - integrity: sha1-iY3Me1WSrboC6LuCuNLNpgza5cU= + integrity: sha1-+j4GErwMG456GuT8DQV3Uvbz3+A= /get-stream/3.0.0: dev: true engines: @@ -1397,7 +1426,7 @@ packages: dev: true resolution: integrity: sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - /ghooks/2.0.3: + /ghooks/2.0.4: dependencies: findup: 0.1.5 lodash.clone: 4.5.0 @@ -1408,7 +1437,7 @@ packages: dev: true requiresBuild: true resolution: - integrity: sha1-vXySV6yuPyYWw3ecRUfTdTfLBQU= + integrity: sha1-/VDgQP9UiQauQstReToBv+JFZ7k= /glob-base/0.3.0: dependencies: glob-parent: 2.0.0 @@ -1489,7 +1518,7 @@ packages: is-deflate: 1.0.0 is-gzip: 1.0.0 peek-stream: 1.1.3 - pumpify: 1.4.0 + pumpify: 1.5.0 through2: 2.0.3 dev: true resolution: @@ -1625,7 +1654,7 @@ packages: cli-width: 2.2.0 external-editor: 1.1.1 figures: 1.7.0 - lodash: 4.17.5 + lodash: 4.17.10 mute-stream: 0.0.6 pinkie-promise: 2.0.1 run-async: 2.3.0 @@ -1981,14 +2010,14 @@ packages: dev: true resolution: integrity: sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= + /lodash/4.17.10: + dev: true + resolution: + integrity: sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg== /lodash/4.17.2: dev: true resolution: integrity: sha1-NKMFW6vgTOQkZ7YH1wAHLH/2v0I= - /lodash/4.17.5: - dev: true - resolution: - integrity: sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw== /longest/1.0.1: dev: true engines: @@ -2048,7 +2077,7 @@ packages: node: '>=4' resolution: integrity: sha1-hOWK1N+99dEFsmtlSKOYsrOqiiE= - /meow/4.0.0: + /meow/4.0.1: dependencies: camelcase-keys: 4.2.0 decamelize-keys: 1.1.0 @@ -2063,7 +2092,7 @@ packages: engines: node: '>=4' resolution: - integrity: sha512-Me/kel335m6vMKmEmA6c87Z6DUFW3JqkINRnxkbC+A/PUm0D5Fl2dEBQrPKnqCL9Te/CIa1MUt/0InMJhuC/sw== + integrity: sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A== /merge/1.2.0: dev: true resolution: @@ -2256,7 +2285,6 @@ packages: resolution: integrity: sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= /normalize-path/3.0.0: - dev: false engines: node: '>=0.10.0' resolution: @@ -2449,12 +2477,12 @@ packages: node: '>=4' resolution: integrity: sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== - /p-queue/2.4.0: + /p-queue/2.4.2: dev: true engines: node: '>=4' resolution: - integrity: sha512-ZXisZuQjnDcRd4/Np7lNrE2f3qq2Cy8Ikg8T2gbLjQZbRnSVqOr9cQUMbyVJJuIDUJYWMOZ+Q/5fJbYJtMbZ2A== + integrity: sha512-n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng== /p-try/1.0.0: dev: true engines: @@ -2467,14 +2495,14 @@ packages: '@types/fs-extra': 5.0.2 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.5 + '@types/node': 9.6.12 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.5 find-down: 0.1.4 fs-extra: 5.0.0 graceful-fs: 4.1.11 load-json-file: 4.0.0 - meow: 4.0.0 + meow: 4.0.1 mz: 2.7.0 rimraf-then: 1.0.1 symlink-dir: 1.1.2 @@ -2489,13 +2517,13 @@ packages: dependencies: '@pnpm/fetcher-base': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/package-requester': 0.8.6 + '@pnpm/package-requester': 0.8.8 '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.5 - '@types/ramda': 0.25.23 + '@types/node': 9.6.12 + '@types/ramda': 0.25.24 encode-registry: 1.1.0 load-json-file: 4.0.0 mkdirp-promise: 5.0.1 @@ -2587,6 +2615,10 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + /path-is-inside/1.0.2: + dev: true + resolution: + integrity: sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= /path-key/2.0.1: dev: true engines: @@ -2616,7 +2648,7 @@ packages: /peek-stream/1.1.3: dependencies: buffer-from: 1.0.0 - duplexify: 3.5.4 + duplexify: 3.6.0 through2: 2.0.3 dev: true resolution: @@ -2667,8 +2699,8 @@ packages: dependencies: '@pnpm/resolver-base': 1.0.0 '@types/js-yaml': 3.11.1 - '@types/node': 9.6.5 - '@types/ramda': 0.25.23 + '@types/node': 9.6.12 + '@types/ramda': 0.25.24 dependency-path: 1.2.1 get-npm-tarball-url: 2.0.1 js-yaml: 3.11.0 @@ -2707,10 +2739,10 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-QlfCVt8/sLRR1q/6qwIYhBJpgdw= - /printable-characters/1.0.38: + /printable-characters/1.0.39: dev: false resolution: - integrity: sha1-du+ErM/X+DZvtxOPuSRmqRbVmbw= + integrity: sha1-wRcMt22FjxmGqmB8r+9FhXQDoNs= /process-nextick-args/2.0.0: resolution: integrity: sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw== @@ -2741,24 +2773,24 @@ packages: dev: true resolution: integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== - /pumpify/1.4.0: + /pumpify/1.5.0: dependencies: - duplexify: 3.5.4 + duplexify: 3.6.0 inherits: 2.0.3 pump: 2.0.1 dev: true resolution: - integrity: sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA== + integrity: sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg== /punycode/1.4.1: dev: true resolution: integrity: sha1-wNWmOycYgArY4esPpSachN1BhF4= - /qs/6.5.1: + /qs/6.5.2: dev: true engines: node: '>=0.6' resolution: - integrity: sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A== + integrity: sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== /quick-lru/1.1.0: dev: true engines: @@ -2813,7 +2845,7 @@ packages: inherits: 2.0.3 isarray: 1.0.0 process-nextick-args: 2.0.0 - safe-buffer: 5.1.1 + safe-buffer: 5.1.2 string_decoder: 1.1.1 util-deprecate: 1.0.2 resolution: @@ -2915,8 +2947,8 @@ packages: mime-types: 2.1.18 oauth-sign: 0.8.2 performance-now: 2.1.0 - qs: 6.5.1 - safe-buffer: 5.1.1 + qs: 6.5.2 + safe-buffer: 5.1.2 stringstream: 0.0.5 tough-cookie: 2.3.4 tunnel-agent: 0.6.0 @@ -3019,9 +3051,9 @@ packages: dev: true resolution: integrity: sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= - /safe-buffer/5.1.1: + /safe-buffer/5.1.2: resolution: - integrity: sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg== + integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== /semver-regex/1.0.0: dev: true engines: @@ -3092,12 +3124,13 @@ packages: node: '>=4' resolution: integrity: sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= - /source-map-support/0.5.4: + /source-map-support/0.5.5: dependencies: + buffer-from: 1.0.0 source-map: 0.6.1 dev: true resolution: - integrity: sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg== + integrity: sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA== /source-map/0.6.1: engines: node: '>=0.10.0' @@ -3168,17 +3201,17 @@ packages: integrity: sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s= /ssri/5.3.0: dependencies: - safe-buffer: 5.1.1 + safe-buffer: 5.1.2 dev: true resolution: integrity: sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ== - /stacktracey/1.2.100: + /stacktracey/1.2.101: dependencies: - as-table: 1.0.31 - get-source: 1.0.24 + as-table: 1.0.32 + get-source: 1.0.25 dev: false resolution: - integrity: sha1-njLHp/pkPq9pqPlXI2Ezmor7a1k= + integrity: sha1-b5uaRasQks0JUXzqnozNeamlmVI= /stream-shift/1.0.0: dev: true resolution: @@ -3224,7 +3257,7 @@ packages: integrity: sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo= /string_decoder/1.1.1: dependencies: - safe-buffer: 5.1.1 + safe-buffer: 5.1.2 resolution: integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== /stringstream/0.0.5: @@ -3279,28 +3312,28 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.16.6: + /supi/0.16.9: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/headless': 0.2.4 + '@pnpm/headless': 0.2.6 '@pnpm/lifecycle': 2.1.0 - '@pnpm/link-bins': 1.0.1 + '@pnpm/link-bins': 1.0.2 '@pnpm/modules-yaml': 1.0.0 '@pnpm/package-bins': 1.0.0 - '@pnpm/package-requester': 0.8.6 - '@pnpm/pkgid-to-filename': 1.0.0 + '@pnpm/package-requester': 0.8.8 + '@pnpm/pkgid-to-filename': 1.0.1 '@pnpm/resolver-base': 1.0.0 '@pnpm/types': 1.7.0 '@types/byline': 4.2.31 '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.5 + '@types/node': 9.6.12 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 - '@types/ramda': 0.25.23 + '@types/ramda': 0.25.24 '@types/rc': 0.0.1 '@types/semver': 5.5.0 '@zkochan/npm-package-arg': 1.0.0 @@ -3308,6 +3341,7 @@ packages: dependency-path: 1.2.1 encode-registry: 1.1.0 execa: 0.10.0 + fs-vacuum: 1.2.10 get-npm-tarball-url: 2.0.1 graceful-fs: 4.1.11 graph-sequencer: 2.0.0 @@ -3317,7 +3351,7 @@ packages: load-json-file: 4.0.0 mkdirp-promise: 5.0.1 mz: 2.7.0 - normalize-path: 2.1.1 + normalize-path: 3.0.0 normalize-registry-url: 1.0.0 os-homedir: 1.0.2 p-filter: 1.0.0 @@ -3345,7 +3379,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-A90KRrVD7Gmr/afq/MVQ/8KSSfQpBdu9lApIkm1LJnQ9mvOxUa6oS4ihiVSQ6gBBxe65c6VNcdCAoL4+he1vOQ== + integrity: sha512-WvktG5DWynV11BVUOKxe6H7mcZpAswd6QU7Q4FiKhCn/iojb/FXoqIQNvUnHHsNBfxxScsedixDE/G36QC1UyQ== /supports-color/0.2.0: dev: true engines: @@ -3374,7 +3408,7 @@ packages: /symlink-dir/1.1.2: dependencies: '@types/mz': 0.0.32 - '@types/node': 9.6.5 + '@types/node': 9.6.12 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -3412,26 +3446,29 @@ packages: dev: true resolution: integrity: sha512-j0jO9BiScfqtPBb9QmPLL0qvxXMz98xjkMb7x8lKipFlJZwNJkqkWPou+NU4V6T9RnVh1kuSthLE8gLrN8bBfw== - /tar-fs/1.16.0: + /tar-fs/1.16.2: dependencies: chownr: 1.0.1 mkdirp: 0.5.1 pump: 1.0.3 - tar-stream: 1.5.5 + tar-stream: 1.6.0 dev: true resolution: - integrity: sha512-I9rb6v7mjWLtOfCau9eH5L7sLJyU2BnxtEZRQ5Mt+eRKmf1F0ohXmT/Jc3fr52kDvjJ/HV5MH3soQfPL5bQ0Yg== - /tar-stream/1.5.5: + integrity: sha512-LdknWjPEiZC1nOBwhv0JBzfJBGPJar08dZg2rwZe0ZTLQoRGEzgrl7vF3qUEkCHpI/wN9e7RyCuDhMsJUCLPPQ== + /tar-stream/1.6.0: dependencies: bl: 1.2.2 + buffer-alloc: 1.1.0 end-of-stream: 1.4.1 + fs-constants: 1.0.0 readable-stream: 2.3.6 + to-buffer: 1.1.1 xtend: 4.0.1 dev: true engines: node: '>= 0.8.0' resolution: - integrity: sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg== + integrity: sha512-lh2iAPG/BHNmN6WB9Ybdynk9rEJ5GD/dy4zscHmVlwa1dq2tpE+BH78i5vjYwYVWEaOXGBjzxr89aVACF17Cpw== /tar/2.2.1: dependencies: block-stream: 0.0.9 @@ -3472,6 +3509,10 @@ packages: node: '>=0.4.0' resolution: integrity: sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA= + /to-buffer/1.1.1: + dev: true + resolution: + integrity: sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== /tough-cookie/2.3.4: dependencies: punycode: 1.4.1 @@ -3486,30 +3527,30 @@ packages: node: '>=4' resolution: integrity: sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= - /ts-node/6.0.0: + /ts-node/6.0.2: dependencies: arrify: 1.0.1 - chalk: 2.4.0 + chalk: 2.4.1 diff: 3.5.0 make-error: 1.3.4 minimist: 1.2.0 mkdirp: 0.5.1 - source-map-support: 0.5.4 + source-map-support: 0.5.5 yn: 2.0.0 dev: true engines: node: '>=4.2.0' resolution: - integrity: sha512-+CQev+4J7BAUNUnW9piRzSfSZZWeFCjgUjMSgGs4+dJ2RZa86NVW9MOlP4e6/kEHTyOqdxHxcIMd7KgmY/ynVw== + integrity: sha512-H/KWK27B3JJAc5WFOBBUxN638DukbV8PptdQgiHWPO2SGDVJzuVOl8Ye0XJ5+FiZIdFtgUuGOJRV4c/XBQ5dBg== /tslib/1.9.0: dev: true resolution: integrity: sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ== - /tslint/5.9.1: + /tslint/5.10.0: dependencies: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 - chalk: 2.4.0 + chalk: 2.4.1 commander: 2.15.1 diff: 3.5.0 glob: 7.1.2 @@ -3518,25 +3559,25 @@ packages: resolve: 1.7.1 semver: 5.5.0 tslib: 1.9.0 - tsutils: 2.26.1 + tsutils: 2.26.2 dev: true engines: node: '>=4.8.0' peerDependencies: - typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev' + typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev' resolution: - integrity: sha1-ElX4ej/1frCw4fDmEKi0dIBGya4= - /tsutils/2.26.1: + integrity: sha1-EeJrzLiK+gLdDZlWyuPUVAtfVMM= + /tsutils/2.26.2: dependencies: tslib: 1.9.0 dev: true peerDependencies: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 2.10.0-dev' resolution: - integrity: sha512-bnm9bcjOqOr1UljleL94wVCDlpa6KjfGaTkefeLch4GRafgDkROxPizbB/FxTEdI++5JqhxczRy/Qub0syNqZA== + integrity: sha512-uzwnhmrSbyinPCiwfzGsOY3IulBTwoky7r83HmZdz9QNCjhSCzavkh47KLWuU0zF2F2WbpmmzoJUIEiYyd+jEQ== /tunnel-agent/0.6.0: dependencies: - safe-buffer: 5.1.1 + safe-buffer: 5.1.2 dev: true resolution: integrity: sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= @@ -3549,12 +3590,12 @@ packages: dev: true resolution: integrity: sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - /typescript/2.8.1: + /typescript/2.8.3: dev: true engines: node: '>=4.2.0' resolution: - integrity: sha512-Ao/f6d/4EPLq0YwzsQz8iXflezpTkQzqAyenTiw4kCUGr1uPiFLC3+fZ+gMZz6eeI/qdRUqvC+HxIJzUAzEFdg== + integrity: sha512-K7g15Bb6Ra4lKf7Iq2l/I5/En+hLIHmxWZGq3D4DIRNFxMNV6j2SHSvDOqs2tGd4UvD/fJvrwopzQXjLrT7Itw== /uid-number/0.0.6: dev: true resolution: @@ -3584,10 +3625,10 @@ packages: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= /unpack-stream/3.0.2: dependencies: - '@types/node': 9.6.5 + '@types/node': 9.6.12 decompress-maybe: 1.0.0 ssri: 5.3.0 - tar-fs: 1.16.0 + tar-fs: 1.16.2 dev: true engines: node: '>=4' From 2fa103037feeb35d270f01d38ebb6d72869c17ab Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 6 May 2018 16:25:47 +0000 Subject: [PATCH 191/196] chore(deps): update dependency supi --- package.json | 4 ++-- shrinkwrap.yaml | 28 ++++++++++++++++------------ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 03415715c0..831e383d0d 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "supi": ">=0.16.0 <0.17.0" + "supi": ">=0.16.0 <0.18.0" }, "dependencies": { "@types/common-tags": "^1.2.5", @@ -75,7 +75,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.16.0", + "supi": "^0.17.4", "tape": "^4.8.0", "ts-node": "^6.0.0", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 4a58eba7bd..da7ed22e3d 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -33,9 +33,9 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.5 rimraf: 2.6.2 - supi: 0.16.9 + supi: 0.17.4 tape: 4.9.0 - ts-node: 6.0.2 + ts-node: 6.0.3 tslint: 5.10.0 typescript: 2.8.3 validate-commit-msg: 2.14.0 @@ -92,7 +92,7 @@ packages: node: '>=4' resolution: integrity: sha512-gmM3SM6fBpssvbSD1U8wJbArNPiQchFzt90ICkfawo0OGQBYY6mgt+sqxF93E9yLfNY7WGtPJYhAQW3Uht6m7A== - /@pnpm/headless/0.2.6: + /@pnpm/headless/0.2.9: dependencies: '@pnpm/lifecycle': 2.1.0 '@pnpm/link-bins': 1.0.2 @@ -109,7 +109,7 @@ packages: pnpm-shrinkwrap: 6.3.2 ramda: 0.25.0 read-package-json: 2.0.13 - supi: 0.16.9 + supi: 0.17.4 symlink-dir: 1.1.2 util.promisify: 1.0.0 dev: true @@ -118,7 +118,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-0Vm78Hchh/N39N8x5mDuNgrxlxvdo1kDyT9/btZ+HkexmwWP5u/QW3uOQSPLC6wERIHAOwO5t0aSfCiOXtdRHw== + integrity: sha512-seziRwFYiqDVO8WYSgoeYvTrwAB7AIRt6/x7+jbq3/BSn7AbsUsslE8uTwLeBoYva0wJ31moEee829rlhDYZCA== /@pnpm/lifecycle/2.1.0: dependencies: '@pnpm/types': 1.7.0 @@ -528,7 +528,7 @@ packages: integrity: sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= /babel-runtime/6.26.0: dependencies: - core-js: 2.5.5 + core-js: 2.5.6 regenerator-runtime: 0.11.1 resolution: integrity: sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -860,8 +860,12 @@ packages: resolution: integrity: sha1-XblXOdbCEqy+e29lahG5QLqmiUY= /core-js/2.5.5: + dev: true resolution: integrity: sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs= + /core-js/2.5.6: + resolution: + integrity: sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ== /core-util-is/1.0.2: resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= @@ -3312,11 +3316,11 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.16.9: + /supi/0.17.4: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/headless': 0.2.6 + '@pnpm/headless': 0.2.9 '@pnpm/lifecycle': 2.1.0 '@pnpm/link-bins': 1.0.2 '@pnpm/modules-yaml': 1.0.0 @@ -3379,7 +3383,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-WvktG5DWynV11BVUOKxe6H7mcZpAswd6QU7Q4FiKhCn/iojb/FXoqIQNvUnHHsNBfxxScsedixDE/G36QC1UyQ== + integrity: sha512-EpaxmnPXnj/aHw9AqLYvN/zcsmJ6ZIJWZULUSXFFVxCkBZfF1wSEom/TaF7OCHd3IAbjo8NPqoVITTnCIQJaMg== /supports-color/0.2.0: dev: true engines: @@ -3527,7 +3531,7 @@ packages: node: '>=4' resolution: integrity: sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= - /ts-node/6.0.2: + /ts-node/6.0.3: dependencies: arrify: 1.0.1 chalk: 2.4.1 @@ -3541,7 +3545,7 @@ packages: engines: node: '>=4.2.0' resolution: - integrity: sha512-H/KWK27B3JJAc5WFOBBUxN638DukbV8PptdQgiHWPO2SGDVJzuVOl8Ye0XJ5+FiZIdFtgUuGOJRV4c/XBQ5dBg== + integrity: sha512-ARaOMNFEPKg2ZuC1qJddFvHxHNFVckR0g9xLxMIoMqSSIkDc8iS4/LoV53EdDWWNq2FGwqcEf0bVVGJIWpsznw== /tslib/1.9.0: dev: true resolution: @@ -3813,7 +3817,7 @@ specifiers: string-length: ^2.0.0 string.prototype.padstart: ^3.0.0 strip-ansi: ^4.0.0 - supi: ^0.16.0 + supi: ^0.17.4 tape: ^4.8.0 ts-node: ^6.0.0 tslint: ^5.7.0 From 7de7ff1c39d4c61eebed1a35b9d5d1b75b9b3b75 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 7 May 2018 23:02:12 +0300 Subject: [PATCH 192/196] feat: print info about skipped root optional dependency ref pnpm/pnpm#1140 --- src/index.ts | 5 +++++ src/reporterForClient.ts | 11 +++++++++++ test/index.ts | 27 +++++++++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/src/index.ts b/src/index.ts index 1fc488e3f8..3fab0e4094 100644 --- a/src/index.ts +++ b/src/index.ts @@ -77,6 +77,7 @@ export function toOutput$ ( const cliPushStream = new PushStream() const otherPushStream = new PushStream() const hookPushStream = new PushStream() + const skippedOptionalDependencyPushStream = new PushStream() setTimeout(() => { // setTimeout is a workaround for a strange bug in most https://github.com/cujojs/most/issues/491 streamParser['on']('data', (log: supi.Log) => { switch (log.name) { @@ -119,6 +120,9 @@ export function toOutput$ ( case 'pnpm:hook' as any: // tslint:disable-line hookPushStream.next(log) break + case 'pnpm:skipped-optional-dependency': + skippedOptionalDependencyPushStream.next(log as supi.SkippedOptionalDependencyLog) + break case 'pnpm' as any: // tslint:disable-line otherPushStream.next(log) break @@ -137,6 +141,7 @@ export function toOutput$ ( progress: most.from(progressPushStream.observable), registry: most.from(registryPushStream.observable), root: most.from(rootPushStream.observable), + skippedOptionalDependency: most.from(skippedOptionalDependencyPushStream.observable), stage: most.from(stagePushStream.observable), stats: most.from(statsPushStream.observable), summary: most.from(summaryPushStream.observable), diff --git a/src/reporterForClient.ts b/src/reporterForClient.ts index 3654caf6df..03af0a1aa8 100644 --- a/src/reporterForClient.ts +++ b/src/reporterForClient.ts @@ -54,6 +54,7 @@ export default function ( other: most.Stream, cli: most.Stream, hook: most.Stream, + skippedOptionalDependency: most.Stream, }, isRecursive: boolean, cmd: string, @@ -320,6 +321,16 @@ export default function ( .map(most.of) outputs.push(miscOutput$) + + outputs.push( + log$.skippedOptionalDependency + .filter((log) => Boolean(log.parents && log.parents.length === 0)) + .map((log) => most.of({ + msg: `info: ${ + log.package['id'] || log.package.name && (`${log.package.name}@${log.package.version}`) || log.package['pref'] + } is an optional dependency and failed compatibility check. Excluding it from installation.`, + })), + ) } else { outputs.push( log$.stats diff --git a/test/index.ts b/test/index.ts index 084b0705c3..6d1188ef05 100644 --- a/test/index.ts +++ b/test/index.ts @@ -34,6 +34,7 @@ const lifecycleLogger = logger('lifecycle') const packageJsonLogger = logger('package-json') const statsLogger = logger('stats') const hookLogger = logger('hook') +const skippedOptionalDependencyLogger = logger('skipped-optional-dependency') const EOL = '\n' test('prints progress beginning', t => { @@ -968,3 +969,29 @@ test('recursive: print hook message', t => { error: t.end, }) }) + +test('prints skipped optional dependency info message', t => { + const output$ = toOutput$(createStreamParser(), {cmd: 'install'}) + + const pkgId = 'registry.npmjs.org/foo/1.0.0' + + skippedOptionalDependencyLogger.debug({ + package: { + id: pkgId, + name: 'foo', + version: '1.0.0', + }, + parents: [], + reason: 'unsupported_platform', + }) + + t.plan(1) + + output$.take(1).subscribe({ + next: output => { + t.equal(output, `info: ${pkgId} is an optional dependency and failed compatibility check. Excluding it from installation.`) + }, + error: t.end, + complete: () => t.end(), + }) +}) From 78cc1c539dba9771108befbf32ff813cfed4abd6 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 7 May 2018 23:03:03 +0300 Subject: [PATCH 193/196] chore(release): 0.16.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 831e383d0d..5bd51d20d1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.16.2", + "version": "0.16.3", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From db340a4405688f5878b655b42da7c5a973860927 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 9 May 2018 20:24:21 +0000 Subject: [PATCH 194/196] chore(deps): update dependency supi --- package.json | 4 +- shrinkwrap.yaml | 200 ++++++++++++++++++++++++++++-------------------- 2 files changed, 118 insertions(+), 86 deletions(-) diff --git a/package.json b/package.json index 5bd51d20d1..9196b2e704 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ }, "homepage": "https://github.com/pnpm/pnpm-reporter-default#readme", "peerDependencies": { - "supi": ">=0.16.0 <0.18.0" + "supi": ">=0.16.0 <0.19.0" }, "dependencies": { "@types/common-tags": "^1.2.5", @@ -75,7 +75,7 @@ "normalize-newline": "^3.0.0", "package-preview": "^1.0.0", "rimraf": "^2.5.4", - "supi": "^0.17.4", + "supi": "^0.18.0", "tape": "^4.8.0", "ts-node": "^6.0.0", "tslint": "^5.7.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index da7ed22e3d..8f4492b798 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,7 +1,7 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 9.6.12 - '@types/ramda': 0.25.24 + '@types/node': 9.6.14 + '@types/ramda': 0.25.26 '@types/semver': 5.5.0 '@types/strip-ansi': 3.0.0 ansi-diff: 1.1.0 @@ -33,7 +33,7 @@ devDependencies: normalize-newline: 3.0.0 package-preview: 1.0.5 rimraf: 2.6.2 - supi: 0.17.4 + supi: 0.18.1 tape: 4.9.0 ts-node: 6.0.3 tslint: 5.10.0 @@ -66,7 +66,7 @@ packages: dependencies: '@pnpm/self-installer': 2.0.3 '@types/got': 7.1.8 - '@types/node': 9.6.12 + '@types/node': 9.6.14 command-exists: 1.2.6 cross-spawn: 5.1.0 dev: true @@ -76,7 +76,7 @@ packages: integrity: sha512-sYJOXPxpQxFcTSACFRFCuIQdnZLNaOgTHGF+CQNYlKnlc2ZnmEW+lAZVTc0hJSU+8mnTY7ei39MbYpI5q+li+w== /@pnpm/fetcher-base/1.0.0: dependencies: - '@pnpm/resolver-base': 1.0.0 + '@pnpm/resolver-base': 1.1.0 dev: true engines: node: '>=4' @@ -84,7 +84,7 @@ packages: integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== /@pnpm/fs-locker/1.0.1: dependencies: - '@types/node': 9.6.12 + '@types/node': 9.6.14 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: true @@ -92,24 +92,24 @@ packages: node: '>=4' resolution: integrity: sha512-gmM3SM6fBpssvbSD1U8wJbArNPiQchFzt90ICkfawo0OGQBYY6mgt+sqxF93E9yLfNY7WGtPJYhAQW3Uht6m7A== - /@pnpm/headless/0.2.9: + /@pnpm/headless/0.3.0: dependencies: - '@pnpm/lifecycle': 2.1.0 + '@pnpm/lifecycle': 2.2.1 '@pnpm/link-bins': 1.0.2 '@pnpm/modules-yaml': 1.0.0 - '@pnpm/package-requester': 0.8.8 + '@pnpm/package-requester': 0.9.0 '@pnpm/pkgid-to-filename': 1.0.1 '@pnpm/types': 1.7.0 - '@types/ramda': 0.25.24 + '@types/ramda': 0.25.26 dependency-path: 1.2.1 graph-sequencer: 2.0.0 p-limit: 1.2.0 - package-store: 0.18.1 + package-store: 0.19.0 path-exists: 3.0.0 - pnpm-shrinkwrap: 6.3.2 + pnpm-shrinkwrap: 6.4.0 ramda: 0.25.0 read-package-json: 2.0.13 - supi: 0.17.4 + supi: 0.18.1 symlink-dir: 1.1.2 util.promisify: 1.0.0 dev: true @@ -118,8 +118,8 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-seziRwFYiqDVO8WYSgoeYvTrwAB7AIRt6/x7+jbq3/BSn7AbsUsslE8uTwLeBoYva0wJ31moEee829rlhDYZCA== - /@pnpm/lifecycle/2.1.0: + integrity: sha512-44w+do+CW12jTGMOPXyyFiTT9HsCVcbV1m8JkloJJTHkpFA3mqnLu+pClKL+8a33kw+oSJXptuaTJxwDbrflOg== + /@pnpm/lifecycle/2.2.1: dependencies: '@pnpm/types': 1.7.0 npm-lifecycle: 2.0.1 @@ -132,14 +132,14 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-f/Dtu0kUDlzZI2+8QVOvFbBra82aa5VLXpTOLEndJzddCooY/Qhva7Rc0xULfciy83BohBF9sp8OFZCTugnMVQ== + integrity: sha512-jB8OzeApGS5zHi79p4O3m6WVH4X8zDYv5CTT3GAScxr5yA1RqFam5MAOhrMhYZa5CY+kXcL6T0D25IclQzmTUQ== /@pnpm/link-bins/1.0.2: dependencies: '@pnpm/package-bins': 1.0.0 '@pnpm/types': 1.7.0 '@types/mz': 0.0.32 - '@types/node': 9.6.12 - '@types/ramda': 0.25.24 + '@types/node': 9.6.14 + '@types/ramda': 0.25.26 '@zkochan/cmd-shim': 2.2.4 arr-flatten: 1.1.0 is-windows: 1.0.2 @@ -158,7 +158,7 @@ packages: integrity: sha512-xFLSomtWjEN6Oa4YPSBamhiYYDefh+zkUNkh0xpUmJVOSYASZ9BnJ38eGJuvb9Kcz+hkzoz75ZzwGIlyZrGL2A== /@pnpm/logger/1.0.1: dependencies: - '@types/node': 9.6.12 + '@types/node': 9.6.14 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -191,11 +191,11 @@ packages: '@pnpm/check-package': 1.0.0 '@pnpm/fetcher-base': 1.0.0 '@pnpm/pkgid-to-filename': 1.0.1 - '@pnpm/resolver-base': 1.0.0 + '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.12 + '@types/node': 9.6.14 '@types/p-queue': 2.3.1 '@types/write-json-file': 2.2.1 load-json-file: 4.0.0 @@ -217,6 +217,37 @@ packages: '@pnpm/logger': ^1.0.0 resolution: integrity: sha512-EN1LBSKJg1wcBjt7O1OMbVrmtUdnVkSmXJj+VlCNqVaMckcwMuefMIDsafb1JpTA0ie+K9dfbtomUFMZVrb1jQ== + /@pnpm/package-requester/0.9.0: + dependencies: + '@pnpm/check-package': 1.0.0 + '@pnpm/fetcher-base': 1.0.0 + '@pnpm/pkgid-to-filename': 1.0.1 + '@pnpm/resolver-base': 1.1.0 + '@pnpm/types': 1.7.0 + '@types/load-json-file': 2.0.7 + '@types/mz': 0.0.32 + '@types/node': 10.0.6 + '@types/p-queue': 2.3.1 + '@types/write-json-file': 2.2.1 + load-json-file: 4.0.0 + mkdirp-promise: 5.0.1 + mz: 2.7.0 + p-limit: 1.2.0 + p-queue: 2.4.2 + path-exists: 3.0.0 + read-package-json: 2.0.13 + rename-overwrite: 1.0.2 + rimraf-then: 1.0.1 + symlink-dir: 1.1.2 + util.promisify: 1.0.0 + write-json-file: 2.3.0 + dev: true + engines: + node: '>=4' + peerDependencies: + '@pnpm/logger': ^1.0.0 + resolution: + integrity: sha512-u1ftVFdBiDKkorwsST0ZYRWcxo8/6KtAZ/hGhb+6VElSDQiEqC4NPSqlBnf8E3UmRYQgX9HzZYn5q4xcUVNTeQ== /@pnpm/pkgid-to-filename/1.0.1: dependencies: normalize-path: 3.0.0 @@ -225,14 +256,14 @@ packages: node: '>=4' resolution: integrity: sha512-PxAHIeraDV9YE0mBriqWewN4iOGL3UMzS7XTaYhu1OvoTqEuJ3cFCHGUW2GR0sYiMf0krj2WIASgoXi4XpAGuA== - /@pnpm/resolver-base/1.0.0: + /@pnpm/resolver-base/1.1.0: dependencies: '@pnpm/types': 1.7.0 dev: true engines: node: '>=4' resolution: - integrity: sha512-+y47No75LZFnkN7VAnoEtkIzDgOuc8ZT4QjyhuNIBVLx4oqFa/R16DpSyRjmaTZMCSREXunObULKL/hoLipNDA== + integrity: sha512-YRUmjy2mR7Qk0r3xCUs0UkWLwRM2Mu2Fjyl2513PNlzsjDFG1xw4lbHRuz/bCMeN+ZKynJbIbfSW0ddMitfbgA== /@pnpm/self-installer/2.0.3: dev: true engines: @@ -245,7 +276,7 @@ packages: integrity: sha512-pn7g4uxcofWTNG/cxmKvkMK2lxr4OUIhrQDrEVYEdVhW0WkWztsHkFrYjFgfNzPbYu3ITlB3T6aSVjCoJQTOlw== /@types/byline/4.2.31: dependencies: - '@types/node': 9.6.12 + '@types/node': 9.6.14 dev: true resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= @@ -258,13 +289,13 @@ packages: integrity: sha512-D1/YuYOcdOIdaQnaiUJ77VcilVvESkynw79CtGqpjkXyv4OUezEVZtdXnSOwXL8Zcelu66QbyC8QQcVQ/ZPdig== /@types/fs-extra/5.0.2: dependencies: - '@types/node': 9.6.12 + '@types/node': 9.6.14 dev: true resolution: integrity: sha512-Q3FWsbdmkQd1ib11A4XNWQvRD//5KpPoGawA8aB2DR7pWKoW9XQv3+dGxD/Z1eVFze23Okdo27ZQytVFlweKvQ== /@types/got/7.1.8: dependencies: - '@types/node': 9.6.12 + '@types/node': 9.6.14 dev: true resolution: integrity: sha512-QxcSkx9PjHH7uqbzqKTKOAjGbayyo+dECnnqM3BBMC0WjYAqx0e6Qi9AFR4jluvx91e7qzgz4aGka7AhCTHYRw== @@ -278,24 +309,28 @@ packages: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== /@types/mz/0.0.32: dependencies: - '@types/node': 9.6.12 + '@types/node': 9.6.14 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/8.10.12: + /@types/node/10.0.6: + dev: true + resolution: + integrity: sha512-2whhQUfDHRBiZ3L54Ulyl1X+fZWbWabxPYRDAsibgOAtE6adwusD15Xv0Bw/D7cPah35Z/wKTdW3iAKsevw1uw== + /@types/node/8.10.13: dev: false resolution: - integrity: sha512-aRFUGj/f9JVA0qSQiCK9ebaa778mmqMIcy1eKnPktgfm9O6VsnIzzB5wJnjp9/jVrfm7fX1rr3OR1nndppGZUg== - /@types/node/9.6.12: + integrity: sha512-AorNXRHoPVxIUIVmr6uJXRnvlPOSNKAJF5jZ1JOj1/IxYMocZzvQooNeLU02Db6kpy1IVIySTOvuIxmUF1HrOg== + /@types/node/9.6.14: resolution: - integrity: sha512-2Z8ziWjJbvV8hHL5YcqCG9ng+/qwUlO1gB4frBD7QI5Wm1Y1iM+AEkGVEv0S5P+aDMwTtAhPJFR4rp1uqagSig== + integrity: sha512-a0mGovBom+nXeDQkgS13AgHGpN+DLR+qTuRWZA7y9FTEiuTbDlXUwhz4+yShOobZGebmjBcl+tTEirTwBlA2LA== /@types/nopt/3.0.29: dev: true resolution: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 9.6.12 + '@types/node': 9.6.14 dev: true resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== @@ -307,9 +342,9 @@ packages: dev: true resolution: integrity: sha512-dwv960sf5inFWiufjhDfK7ZG3nYyHXt58I+14bJJBKV5MPlZm6Tu1sQS63NWEtLpIw6+RhbNbXjNStdMXxR8Nw== - /@types/ramda/0.25.24: + /@types/ramda/0.25.26: resolution: - integrity: sha512-c0TmWA7d4y9KLJJwL/cLPEfSReSgFQK9BtemcCATT48lMeyD7HG8IfGY8bamSuz/Byx1l+13hZV0PCvHsgMB3w== + integrity: sha512-/hhvF9xyBNhS+pTHupqpqT885r7ZhOUgeyIi/tiNVuTHSW3vOuV5wVcdB90lNsuwbZuziAXmoYhtYok+RKbJ0Q== /@types/rc/0.0.1: dev: true resolution: @@ -323,7 +358,7 @@ packages: integrity: sha1-m2PUU6a1SqhJGCIHcRoIvo7qSK4= /@types/tape/4.2.32: dependencies: - '@types/node': 9.6.12 + '@types/node': 9.6.14 dev: true resolution: integrity: sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ== @@ -859,10 +894,6 @@ packages: dev: true resolution: integrity: sha1-XblXOdbCEqy+e29lahG5QLqmiUY= - /core-js/2.5.5: - dev: true - resolution: - integrity: sha1-sU3ek2xkDAV5prUMq8wTLdYSfjs= /core-js/2.5.6: resolution: integrity: sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ== @@ -871,7 +902,7 @@ packages: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= /cross-spawn/5.1.0: dependencies: - lru-cache: 4.1.2 + lru-cache: 4.1.3 shebang-command: 1.2.0 which: 1.3.0 dev: true @@ -932,7 +963,7 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.10.12 + '@types/node': 8.10.13 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -1164,7 +1195,7 @@ packages: integrity: sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= /expand-range/1.8.2: dependencies: - fill-range: 2.2.3 + fill-range: 2.2.4 dev: true engines: node: '>=0.10.0' @@ -1237,18 +1268,18 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= - /fill-range/2.2.3: + /fill-range/2.2.4: dependencies: is-number: 2.1.0 isobject: 2.1.0 - randomatic: 1.1.7 + randomatic: 3.0.0 repeat-element: 1.1.2 repeat-string: 1.6.1 dev: true engines: node: '>=0.10.0' resolution: - integrity: sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM= + integrity: sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q== /find-down/0.1.4: dependencies: locate-path: 2.0.0 @@ -1791,14 +1822,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= - /is-number/3.0.0: - dependencies: - kind-of: 3.2.2 + /is-number/4.0.0: dev: true engines: node: '>=0.10.0' resolution: - integrity: sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + integrity: sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== /is-plain-obj/1.1.0: dev: true engines: @@ -1951,14 +1980,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= - /kind-of/4.0.0: - dependencies: - is-buffer: 1.1.6 + /kind-of/6.0.2: dev: true engines: node: '>=0.10.0' resolution: - integrity: sha1-IIE989cSkosgc3hpGkUGb65y3Vc= + integrity: sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== /klaw/1.3.1: dev: true optionalDependencies: @@ -2037,13 +2064,13 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= - /lru-cache/4.1.2: + /lru-cache/4.1.3: dependencies: pseudomap: 1.0.2 yallist: 2.1.2 dev: true resolution: - integrity: sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ== + integrity: sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA== /make-dir/1.2.0: dependencies: pify: 3.0.0 @@ -2072,6 +2099,10 @@ packages: node: '>=4' resolution: integrity: sha1-plzSkIepJZi4eRJXpSPgISIqwfk= + /math-random/1.0.1: + dev: true + resolution: + integrity: sha1-izqsWIuKZuSXXjzepn97sylgH6w= /mem/3.0.0: dependencies: mimic-fn: 1.2.0 @@ -2180,7 +2211,7 @@ packages: dependencies: babel-runtime: 6.26.0 chalk: 1.1.3 - core-js: 2.5.5 + core-js: 2.5.6 diff: 2.2.3 duplexer: 0.1.1 figures: 1.7.0 @@ -2499,7 +2530,7 @@ packages: '@types/fs-extra': 5.0.2 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.12 + '@types/node': 9.6.14 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.5 find-down: 0.1.4 @@ -2517,17 +2548,17 @@ packages: node: '>=4' resolution: integrity: sha512-Qmhr23K9e2jI4LK4MU2be4xWX0CyniBDwmyCi6K+3lTZtryd2r29Wh6wPXo6wdP++jNsJ5ayZT4yJlZWVHnluQ== - /package-store/0.18.1: + /package-store/0.19.0: dependencies: '@pnpm/fetcher-base': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/package-requester': 0.8.8 - '@pnpm/resolver-base': 1.0.0 + '@pnpm/package-requester': 0.9.0 + '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.12 - '@types/ramda': 0.25.24 + '@types/node': 10.0.6 + '@types/ramda': 0.25.26 encode-registry: 1.1.0 load-json-file: 4.0.0 mkdirp-promise: 5.0.1 @@ -2548,7 +2579,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-Ia2uG5IMfNhTZtN+xynG3nyP2Hn12/Zg76OJZMhQZpGRQXXL+MPMXw/A2UCeFbBXVdb2SC75L2xfKb9TCI3rmg== + integrity: sha512-d1cvhAX4C9fw5VHI18mH2oNWiuPH1lcTrvqUloCIZezvuFc31zEauLWIvjisg6HwvvxAdiQ4EDmEd9dnyhaL+g== /pad-right/0.2.2: dependencies: repeat-string: 1.6.1 @@ -2699,12 +2730,12 @@ packages: dev: true resolution: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= - /pnpm-shrinkwrap/6.3.2: + /pnpm-shrinkwrap/6.4.0: dependencies: - '@pnpm/resolver-base': 1.0.0 + '@pnpm/resolver-base': 1.1.0 '@types/js-yaml': 3.11.1 - '@types/node': 9.6.12 - '@types/ramda': 0.25.24 + '@types/node': 10.0.6 + '@types/ramda': 0.25.26 dependency-path: 1.2.1 get-npm-tarball-url: 2.0.1 js-yaml: 3.11.0 @@ -2720,7 +2751,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-DPfj3g997WtP4glNx0brXXp45Q+w9tluy90HST2md+oOPDXa9WlF9+OZkwAgoi/qgseRecUpK2d8EgIqU6H5Qw== + integrity: sha512-/b79ZgIjg52yLZ8CIf9ol+PoZ+GWNvjPIh9fLVyVpz2p5iU+RMFQPq764UNZnTxzbyo2vcELR6DtTS9yt8cnPQ== /preserve/0.2.0: dev: true engines: @@ -2804,15 +2835,16 @@ packages: /ramda/0.25.0: resolution: integrity: sha512-GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ== - /randomatic/1.1.7: + /randomatic/3.0.0: dependencies: - is-number: 3.0.0 - kind-of: 4.0.0 + is-number: 4.0.0 + kind-of: 6.0.2 + math-random: 1.0.1 dev: true engines: node: '>= 0.10.0' resolution: - integrity: sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how== + integrity: sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA== /read-package-json/2.0.13: dependencies: glob: 7.1.2 @@ -3316,28 +3348,28 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.17.4: + /supi/0.18.1: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 - '@pnpm/headless': 0.2.9 - '@pnpm/lifecycle': 2.1.0 + '@pnpm/headless': 0.3.0 + '@pnpm/lifecycle': 2.2.1 '@pnpm/link-bins': 1.0.2 '@pnpm/modules-yaml': 1.0.0 '@pnpm/package-bins': 1.0.0 '@pnpm/package-requester': 0.8.8 '@pnpm/pkgid-to-filename': 1.0.1 - '@pnpm/resolver-base': 1.0.0 + '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/byline': 4.2.31 '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.12 + '@types/node': 10.0.6 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 - '@types/ramda': 0.25.24 + '@types/ramda': 0.25.26 '@types/rc': 0.0.1 '@types/semver': 5.5.0 '@zkochan/npm-package-arg': 1.0.0 @@ -3360,11 +3392,11 @@ packages: os-homedir: 1.0.2 p-filter: 1.0.0 p-limit: 1.2.0 - package-store: 0.18.1 + package-store: 0.19.0 path-absolute: 1.0.0 path-exists: 3.0.0 pnpm-install-checks: 1.1.0 - pnpm-shrinkwrap: 6.3.2 + pnpm-shrinkwrap: 6.4.0 ramda: 0.25.0 read-package-json: 2.0.13 remove-all-except-outer-links: 1.0.3 @@ -3383,7 +3415,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-EpaxmnPXnj/aHw9AqLYvN/zcsmJ6ZIJWZULUSXFFVxCkBZfF1wSEom/TaF7OCHd3IAbjo8NPqoVITTnCIQJaMg== + integrity: sha512-FobeWbloYei/DsX7CmMhu3+hyLLqb+Ny6EhScyrk0jQjt6uNM9rcQ4P6v7EXfuwGKbeRVNwStJkatrWFCvzICA== /supports-color/0.2.0: dev: true engines: @@ -3412,7 +3444,7 @@ packages: /symlink-dir/1.1.2: dependencies: '@types/mz': 0.0.32 - '@types/node': 9.6.12 + '@types/node': 9.6.14 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -3629,7 +3661,7 @@ packages: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= /unpack-stream/3.0.2: dependencies: - '@types/node': 9.6.12 + '@types/node': 9.6.14 decompress-maybe: 1.0.0 ssri: 5.3.0 tar-fs: 1.16.2 @@ -3817,7 +3849,7 @@ specifiers: string-length: ^2.0.0 string.prototype.padstart: ^3.0.0 strip-ansi: ^4.0.0 - supi: ^0.17.4 + supi: ^0.18.0 tape: ^4.8.0 ts-node: ^6.0.0 tslint: ^5.7.0 From 0b764a3239309d77db34377188b40a51a6078cf4 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 9 May 2018 23:31:34 +0300 Subject: [PATCH 195/196] chore(release): 0.16.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9196b2e704..da475b7467 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pnpm-default-reporter", - "version": "0.16.3", + "version": "0.16.4", "description": "The default reporter of pnpm", "main": "lib/index.js", "typings": "lib/index.d.ts", From 307d2ef5ad2335a0a958187a074032e050d0ddcf Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 13 May 2018 14:15:51 +0300 Subject: [PATCH 196/196] fix(deps): update @types/node to v10 --- package.json | 2 +- shrinkwrap.yaml | 218 ++++++++++++++++++------------------------------ 2 files changed, 81 insertions(+), 139 deletions(-) diff --git a/package.json b/package.json index da475b7467..027a4e4678 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@types/common-tags": "^1.2.5", - "@types/node": "^9.3.0", + "@types/node": "^9.3.0 || 10", "@types/ramda": "^0.25.6", "@types/semver": "^5.4.0", "@types/strip-ansi": "^3.0.0", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index 8f4492b798..a16e2b6ad3 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,7 +1,7 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 9.6.14 - '@types/ramda': 0.25.26 + '@types/node': 10.0.8 + '@types/ramda': 0.25.28 '@types/semver': 5.5.0 '@types/strip-ansi': 3.0.0 ansi-diff: 1.1.0 @@ -17,13 +17,13 @@ dependencies: ramda: 0.25.0 right-pad: 1.0.1 semver: 5.5.0 - stacktracey: 1.2.101 + stacktracey: 1.2.102 string-length: 2.0.0 string.prototype.padstart: 3.0.0 strip-ansi: 4.0.0 zen-push: 0.2.1 devDependencies: - '@pnpm/logger': 1.0.1 + '@pnpm/logger': 1.0.2 '@types/delay': 2.0.1 '@types/tape': 4.2.32 commitizen: 2.9.6 @@ -31,9 +31,9 @@ devDependencies: ghooks: 2.0.4 mos-tap-diff: 1.0.0 normalize-newline: 3.0.0 - package-preview: 1.0.5 + package-preview: 1.0.6 rimraf: 2.6.2 - supi: 0.18.1 + supi: 0.18.2 tape: 4.9.0 ts-node: 6.0.3 tslint: 5.10.0 @@ -62,18 +62,18 @@ packages: node: '>=4' resolution: integrity: sha512-rN+hiOjGtxwwus7c/E0xkCs9prBeXzZCSCW/Q3k2WdHGSRNLAepr777iv+i2eqTfz9vXlTF0rLZOGi62ujzwYA== - /@pnpm/exec/1.1.4: + /@pnpm/exec/1.1.5: dependencies: '@pnpm/self-installer': 2.0.3 - '@types/got': 7.1.8 - '@types/node': 9.6.14 + '@types/got': 8.3.1 + '@types/node': 10.0.8 command-exists: 1.2.6 - cross-spawn: 5.1.0 + cross-spawn: 6.0.5 dev: true engines: node: '>=4' resolution: - integrity: sha512-sYJOXPxpQxFcTSACFRFCuIQdnZLNaOgTHGF+CQNYlKnlc2ZnmEW+lAZVTc0hJSU+8mnTY7ei39MbYpI5q+li+w== + integrity: sha512-1zLmh6tRftQXfZ1IFHq1IexP0KaJhN6pSCA/IzK+Vixn4hPvxwcIbGjKW0KH9hsHSmrPpmSit2EWj7jGNgfa6Q== /@pnpm/fetcher-base/1.0.0: dependencies: '@pnpm/resolver-base': 1.1.0 @@ -82,25 +82,25 @@ packages: node: '>=4' resolution: integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== - /@pnpm/fs-locker/1.0.1: + /@pnpm/fs-locker/1.0.2: dependencies: - '@types/node': 9.6.14 + '@types/node': 10.0.8 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: true engines: node: '>=4' resolution: - integrity: sha512-gmM3SM6fBpssvbSD1U8wJbArNPiQchFzt90ICkfawo0OGQBYY6mgt+sqxF93E9yLfNY7WGtPJYhAQW3Uht6m7A== + integrity: sha512-ASULw2KzrapsjQVSMYdDc3f6+wYOs9cPt0M5Ip9VUkTfYfPrfxd0UYXcOPoUHkk7L12HUj0vwUYK0DE1da2gww== /@pnpm/headless/0.3.0: dependencies: '@pnpm/lifecycle': 2.2.1 - '@pnpm/link-bins': 1.0.2 + '@pnpm/link-bins': 1.0.3 '@pnpm/modules-yaml': 1.0.0 '@pnpm/package-requester': 0.9.0 '@pnpm/pkgid-to-filename': 1.0.1 '@pnpm/types': 1.7.0 - '@types/ramda': 0.25.26 + '@types/ramda': 0.25.28 dependency-path: 1.2.1 graph-sequencer: 2.0.0 p-limit: 1.2.0 @@ -109,8 +109,8 @@ packages: pnpm-shrinkwrap: 6.4.0 ramda: 0.25.0 read-package-json: 2.0.13 - supi: 0.18.1 - symlink-dir: 1.1.2 + supi: 0.18.2 + symlink-dir: 1.1.3 util.promisify: 1.0.0 dev: true engines: @@ -133,13 +133,13 @@ packages: '@pnpm/logger': ^1.0.0 resolution: integrity: sha512-jB8OzeApGS5zHi79p4O3m6WVH4X8zDYv5CTT3GAScxr5yA1RqFam5MAOhrMhYZa5CY+kXcL6T0D25IclQzmTUQ== - /@pnpm/link-bins/1.0.2: + /@pnpm/link-bins/1.0.3: dependencies: '@pnpm/package-bins': 1.0.0 '@pnpm/types': 1.7.0 '@types/mz': 0.0.32 - '@types/node': 9.6.14 - '@types/ramda': 0.25.26 + '@types/node': 10.0.8 + '@types/ramda': 0.25.28 '@zkochan/cmd-shim': 2.2.4 arr-flatten: 1.1.0 is-windows: 1.0.2 @@ -155,17 +155,17 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-xFLSomtWjEN6Oa4YPSBamhiYYDefh+zkUNkh0xpUmJVOSYASZ9BnJ38eGJuvb9Kcz+hkzoz75ZzwGIlyZrGL2A== - /@pnpm/logger/1.0.1: + integrity: sha512-thVgwrQ5rMcPYI6a0IPOt2pnlF1n5zX7BN4CrFeBp0/JCGsZAht/VOPv9bD3cZ+j0vDemEwE23BfhOWxmxq2yQ== + /@pnpm/logger/1.0.2: dependencies: - '@types/node': 9.6.14 + '@types/node': 10.0.8 bole: 3.0.2 ndjson: 1.5.0 dev: true engines: node: '>=4' resolution: - integrity: sha512-23FWOXgCkJ9q73mIqS5H/x98uaZcvO7ov/nt0HZGgLci3MHsqBgEfh3UzZiLZIxlxmA3XoUp4fgbjM7S96pBRg== + integrity: sha512-A8XbJKvdueazvJGPn1qQ9LL6uopV88ebIT+dJKNQ68gT7yfCbtfT8j5ZzdVczmGbkiuBeZ1VckZerkO0tjOXZA== /@pnpm/modules-yaml/1.0.0: dependencies: load-yaml-file: 0.1.0 @@ -186,37 +186,6 @@ packages: node: '>=4' resolution: integrity: sha512-ZqVfIXK3r5AsP5VAhPHrhf3isF+T4yEuUpJTF9T03oFTJ9LBnkKvx8F7P7biKEManxSGOkSpNoIBdsura9pY5Q== - /@pnpm/package-requester/0.8.8: - dependencies: - '@pnpm/check-package': 1.0.0 - '@pnpm/fetcher-base': 1.0.0 - '@pnpm/pkgid-to-filename': 1.0.1 - '@pnpm/resolver-base': 1.1.0 - '@pnpm/types': 1.7.0 - '@types/load-json-file': 2.0.7 - '@types/mz': 0.0.32 - '@types/node': 9.6.14 - '@types/p-queue': 2.3.1 - '@types/write-json-file': 2.2.1 - load-json-file: 4.0.0 - mkdirp-promise: 5.0.1 - mz: 2.7.0 - p-limit: 1.2.0 - p-queue: 2.4.2 - path-exists: 3.0.0 - read-package-json: 2.0.13 - rename-overwrite: 1.0.2 - rimraf-then: 1.0.1 - symlink-dir: 1.1.2 - util.promisify: 1.0.0 - write-json-file: 2.3.0 - dev: true - engines: - node: '>=4' - peerDependencies: - '@pnpm/logger': ^1.0.0 - resolution: - integrity: sha512-EN1LBSKJg1wcBjt7O1OMbVrmtUdnVkSmXJj+VlCNqVaMckcwMuefMIDsafb1JpTA0ie+K9dfbtomUFMZVrb1jQ== /@pnpm/package-requester/0.9.0: dependencies: '@pnpm/check-package': 1.0.0 @@ -226,7 +195,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.0.6 + '@types/node': 10.0.8 '@types/p-queue': 2.3.1 '@types/write-json-file': 2.2.1 load-json-file: 4.0.0 @@ -238,7 +207,7 @@ packages: read-package-json: 2.0.13 rename-overwrite: 1.0.2 rimraf-then: 1.0.1 - symlink-dir: 1.1.2 + symlink-dir: 1.1.3 util.promisify: 1.0.0 write-json-file: 2.3.0 dev: true @@ -276,7 +245,7 @@ packages: integrity: sha512-pn7g4uxcofWTNG/cxmKvkMK2lxr4OUIhrQDrEVYEdVhW0WkWztsHkFrYjFgfNzPbYu3ITlB3T6aSVjCoJQTOlw== /@types/byline/4.2.31: dependencies: - '@types/node': 9.6.14 + '@types/node': 10.0.8 dev: true resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= @@ -289,16 +258,16 @@ packages: integrity: sha512-D1/YuYOcdOIdaQnaiUJ77VcilVvESkynw79CtGqpjkXyv4OUezEVZtdXnSOwXL8Zcelu66QbyC8QQcVQ/ZPdig== /@types/fs-extra/5.0.2: dependencies: - '@types/node': 9.6.14 + '@types/node': 10.0.8 dev: true resolution: integrity: sha512-Q3FWsbdmkQd1ib11A4XNWQvRD//5KpPoGawA8aB2DR7pWKoW9XQv3+dGxD/Z1eVFze23Okdo27ZQytVFlweKvQ== - /@types/got/7.1.8: + /@types/got/8.3.1: dependencies: - '@types/node': 9.6.14 + '@types/node': 10.0.8 dev: true resolution: - integrity: sha512-QxcSkx9PjHH7uqbzqKTKOAjGbayyo+dECnnqM3BBMC0WjYAqx0e6Qi9AFR4jluvx91e7qzgz4aGka7AhCTHYRw== + integrity: sha512-CGEPw67/Ub6gNMusk062tueurxN+HyjDCvYl4QVBKiSO+fqluXmRX/wSqST/4RtKth4mz8lDZiaZIpXr/uPROg== /@types/js-yaml/3.11.1: dev: true resolution: @@ -309,28 +278,24 @@ packages: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== /@types/mz/0.0.32: dependencies: - '@types/node': 9.6.14 + '@types/node': 10.0.8 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/10.0.6: - dev: true + /@types/node/10.0.8: resolution: - integrity: sha512-2whhQUfDHRBiZ3L54Ulyl1X+fZWbWabxPYRDAsibgOAtE6adwusD15Xv0Bw/D7cPah35Z/wKTdW3iAKsevw1uw== - /@types/node/8.10.13: + integrity: sha512-MFFKFv2X4iZy/NFl1m1E8uwE1CR96SGwJjgHma09PLtqOWoj3nqeJHMG+P/EuJGVLvC2I6MdQRQsr4TcRduIow== + /@types/node/8.10.14: dev: false resolution: - integrity: sha512-AorNXRHoPVxIUIVmr6uJXRnvlPOSNKAJF5jZ1JOj1/IxYMocZzvQooNeLU02Db6kpy1IVIySTOvuIxmUF1HrOg== - /@types/node/9.6.14: - resolution: - integrity: sha512-a0mGovBom+nXeDQkgS13AgHGpN+DLR+qTuRWZA7y9FTEiuTbDlXUwhz4+yShOobZGebmjBcl+tTEirTwBlA2LA== + integrity: sha512-TKQqQIaYNO+8MrOsFgobkt3fbMzkfXhBFKcg20Nip5Omptw1HOY/IEvYiFtMwIbr7Me/Y2H/JO+TgNUMJ9NGjA== /@types/nopt/3.0.29: dev: true resolution: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 9.6.14 + '@types/node': 10.0.8 dev: true resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== @@ -342,9 +307,9 @@ packages: dev: true resolution: integrity: sha512-dwv960sf5inFWiufjhDfK7ZG3nYyHXt58I+14bJJBKV5MPlZm6Tu1sQS63NWEtLpIw6+RhbNbXjNStdMXxR8Nw== - /@types/ramda/0.25.26: + /@types/ramda/0.25.28: resolution: - integrity: sha512-/hhvF9xyBNhS+pTHupqpqT885r7ZhOUgeyIi/tiNVuTHSW3vOuV5wVcdB90lNsuwbZuziAXmoYhtYok+RKbJ0Q== + integrity: sha512-H2NDAXtu2NXXBM/GMkASnKX2sVMu3aMlUBP6OHeI22cb+5+Zb74ACQs5ymJo/vaE/iGjLP4UIZdqi67j1nws1A== /@types/rc/0.0.1: dev: true resolution: @@ -358,7 +323,7 @@ packages: integrity: sha1-m2PUU6a1SqhJGCIHcRoIvo7qSK4= /@types/tape/4.2.32: dependencies: - '@types/node': 9.6.14 + '@types/node': 10.0.8 dev: true resolution: integrity: sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ== @@ -900,14 +865,6 @@ packages: /core-util-is/1.0.2: resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - /cross-spawn/5.1.0: - dependencies: - lru-cache: 4.1.3 - shebang-command: 1.2.0 - which: 1.3.0 - dev: true - resolution: - integrity: sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= /cross-spawn/6.0.5: dependencies: nice-try: 1.0.4 @@ -963,7 +920,7 @@ packages: integrity: sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.10.13 + '@types/node': 8.10.14 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -2064,21 +2021,14 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= - /lru-cache/4.1.3: - dependencies: - pseudomap: 1.0.2 - yallist: 2.1.2 - dev: true - resolution: - integrity: sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA== - /make-dir/1.2.0: + /make-dir/1.3.0: dependencies: pify: 3.0.0 dev: true engines: node: '>=4' resolution: - integrity: sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw== + integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ== /make-error/1.3.4: dev: true resolution: @@ -2524,13 +2474,13 @@ packages: node: '>=4' resolution: integrity: sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= - /package-preview/1.0.5: + /package-preview/1.0.6: dependencies: - '@pnpm/exec': 1.1.4 + '@pnpm/exec': 1.1.5 '@types/fs-extra': 5.0.2 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.14 + '@types/node': 10.0.8 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.5 find-down: 0.1.4 @@ -2540,25 +2490,25 @@ packages: meow: 4.0.1 mz: 2.7.0 rimraf-then: 1.0.1 - symlink-dir: 1.1.2 - unpack-stream: 3.0.2 + symlink-dir: 1.1.3 + unpack-stream: 3.0.3 write-json-file: 2.3.0 dev: true engines: node: '>=4' resolution: - integrity: sha512-Qmhr23K9e2jI4LK4MU2be4xWX0CyniBDwmyCi6K+3lTZtryd2r29Wh6wPXo6wdP++jNsJ5ayZT4yJlZWVHnluQ== + integrity: sha512-GQ4w5vrDXoy8UVJM+0W7oWd5MYF21/IXkdzcupGNXdfqQuMzgQT+LXde109uHaH7xyqvCzPPBSxYM/HqQOi3+w== /package-store/0.19.0: dependencies: '@pnpm/fetcher-base': 1.0.0 - '@pnpm/fs-locker': 1.0.1 + '@pnpm/fs-locker': 1.0.2 '@pnpm/package-requester': 0.9.0 '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.0.6 - '@types/ramda': 0.25.26 + '@types/node': 10.0.8 + '@types/ramda': 0.25.28 encode-registry: 1.1.0 load-json-file: 4.0.0 mkdirp-promise: 5.0.1 @@ -2734,8 +2684,8 @@ packages: dependencies: '@pnpm/resolver-base': 1.1.0 '@types/js-yaml': 3.11.1 - '@types/node': 10.0.6 - '@types/ramda': 0.25.26 + '@types/node': 10.0.8 + '@types/ramda': 0.25.28 dependency-path: 1.2.1 get-npm-tarball-url: 2.0.1 js-yaml: 3.11.0 @@ -2790,10 +2740,6 @@ packages: node: '>=4.0.0' resolution: integrity: sha1-FZ+wYZPTIAP0s2kd0uwaY0qoDR0= - /pseudomap/1.0.2: - dev: true - resolution: - integrity: sha1-8FKijacOYYkX7wqKw0wa5aaChrM= /pump/1.0.3: dependencies: end-of-stream: 1.4.1 @@ -3160,13 +3106,13 @@ packages: node: '>=4' resolution: integrity: sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= - /source-map-support/0.5.5: + /source-map-support/0.5.6: dependencies: buffer-from: 1.0.0 source-map: 0.6.1 dev: true resolution: - integrity: sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA== + integrity: sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g== /source-map/0.6.1: engines: node: '>=0.10.0' @@ -3241,13 +3187,13 @@ packages: dev: true resolution: integrity: sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ== - /stacktracey/1.2.101: + /stacktracey/1.2.102: dependencies: as-table: 1.0.32 get-source: 1.0.25 dev: false resolution: - integrity: sha1-b5uaRasQks0JUXzqnozNeamlmVI= + integrity: sha1-NYD/Zxi18oZsNEmHEhehF47BB6Q= /stream-shift/1.0.0: dev: true resolution: @@ -3348,16 +3294,16 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= - /supi/0.18.1: + /supi/0.18.2: dependencies: '@pnpm/check-package': 1.0.0 - '@pnpm/fs-locker': 1.0.1 + '@pnpm/fs-locker': 1.0.2 '@pnpm/headless': 0.3.0 '@pnpm/lifecycle': 2.2.1 - '@pnpm/link-bins': 1.0.2 + '@pnpm/link-bins': 1.0.3 '@pnpm/modules-yaml': 1.0.0 '@pnpm/package-bins': 1.0.0 - '@pnpm/package-requester': 0.8.8 + '@pnpm/package-requester': 0.9.0 '@pnpm/pkgid-to-filename': 1.0.1 '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 @@ -3365,11 +3311,11 @@ packages: '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.0.6 + '@types/node': 10.0.8 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 - '@types/ramda': 0.25.26 + '@types/ramda': 0.25.28 '@types/rc': 0.0.1 '@types/semver': 5.5.0 '@zkochan/npm-package-arg': 1.0.0 @@ -3404,7 +3350,7 @@ packages: resolve-link-target: 1.0.1 rimraf-then: 1.0.1 semver: 5.5.0 - symlink-dir: 1.1.2 + symlink-dir: 1.1.3 util.promisify: 1.0.0 validate-npm-package-name: 3.0.0 version-selector-type: 2.0.0 @@ -3415,7 +3361,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-FobeWbloYei/DsX7CmMhu3+hyLLqb+Ny6EhScyrk0jQjt6uNM9rcQ4P6v7EXfuwGKbeRVNwStJkatrWFCvzICA== + integrity: sha512-KRG7wp+sftboRaGpRhN0HBrGIwVQPzWEIwNTferwmdoeRwM+mNcd6+uZi6SmB1zL1IB6o/jwRn+3O/bWo00MMA== /supports-color/0.2.0: dev: true engines: @@ -3441,10 +3387,10 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== - /symlink-dir/1.1.2: + /symlink-dir/1.1.3: dependencies: '@types/mz': 0.0.32 - '@types/node': 9.6.14 + '@types/node': 10.0.8 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -3453,7 +3399,7 @@ packages: engines: node: '>=4' resolution: - integrity: sha512-GXEvwF1zpalvovqO+x18H7k+4adCXn9NU6vjfEQ+cVS7Ltq7YXFQyitdl7WoQqNUMce3RGMPo037GJrtM7f7lw== + integrity: sha512-klQgTYk7en8A69nAzZjJdaMXbGCmfh0DU+YLaZG/stHNp00VZSS3Pos238Ua7oCKVw57UszViod4D7RVRH6XHg== /tap-parser/1.3.2: dependencies: events-to-array: 1.1.2 @@ -3571,7 +3517,7 @@ packages: make-error: 1.3.4 minimist: 1.2.0 mkdirp: 0.5.1 - source-map-support: 0.5.5 + source-map-support: 0.5.6 yn: 2.0.0 dev: true engines: @@ -3595,7 +3541,7 @@ packages: resolve: 1.7.1 semver: 5.5.0 tslib: 1.9.0 - tsutils: 2.26.2 + tsutils: 2.27.0 dev: true engines: node: '>=4.8.0' @@ -3603,14 +3549,14 @@ packages: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev' resolution: integrity: sha1-EeJrzLiK+gLdDZlWyuPUVAtfVMM= - /tsutils/2.26.2: + /tsutils/2.27.0: dependencies: tslib: 1.9.0 dev: true peerDependencies: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 2.10.0-dev' resolution: - integrity: sha512-uzwnhmrSbyinPCiwfzGsOY3IulBTwoky7r83HmZdz9QNCjhSCzavkh47KLWuU0zF2F2WbpmmzoJUIEiYyd+jEQ== + integrity: sha512-JcyX25oM9pFcb3zh60OqG1St8p/uSqC5Bgipdo3ieacB/Ao4dPhm7hAtKT9NrEu23CyYrrgJPV3CqYfo+/+T4w== /tunnel-agent/0.6.0: dependencies: safe-buffer: 5.1.2 @@ -3659,9 +3605,9 @@ packages: dev: true resolution: integrity: sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc= - /unpack-stream/3.0.2: + /unpack-stream/3.0.3: dependencies: - '@types/node': 9.6.14 + '@types/node': 10.0.8 decompress-maybe: 1.0.0 ssri: 5.3.0 tar-fs: 1.16.2 @@ -3669,7 +3615,7 @@ packages: engines: node: '>=4' resolution: - integrity: sha512-mdQv3N9fkxG04/4G8HLg3Q/whJscMTUikRQU2pTr4ISU9t59xoRGUEeqpUwpj78jZUPB7LN6oabkyZJ574MleA== + integrity: sha512-h3Ii7ThTL7P5LlX1RuMPsuW4V5EZnLyjPwStIMQ4V0F6rblgmXIS+IkpAOu9THHDZYUO/D8TTJddVc6HIY4S5g== /util-deprecate/1.0.2: resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= @@ -3759,7 +3705,7 @@ packages: dependencies: detect-indent: 5.0.0 graceful-fs: 4.1.11 - make-dir: 1.2.0 + make-dir: 1.3.0 pify: 3.0.0 sort-keys: 2.0.0 write-file-atomic: 2.3.0 @@ -3794,10 +3740,6 @@ packages: node: '>=0.4' resolution: integrity: sha1-pcbVMr5lbiPbgg77lDofBJmNY68= - /yallist/2.1.2: - dev: true - resolution: - integrity: sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= /yn/2.0.0: dev: true engines: @@ -3815,13 +3757,13 @@ packages: resolution: integrity: sha512-Qv4qvc8ZIue51B/0zmeIMxpIGDVhz4GhJALBvnKs/FRa2T7jy4Ori9wFwaHVt0zWV7MIFglKAHbgnVxVTw7U1w== registry: 'https://registry.npmjs.org/' -shrinkwrapMinorVersion: 5 +shrinkwrapMinorVersion: 6 shrinkwrapVersion: 3 specifiers: '@pnpm/logger': ^1.0.0 '@types/common-tags': ^1.2.5 '@types/delay': ^2.0.1 - '@types/node': ^9.3.0 + '@types/node': ^9.3.0 || 10 '@types/ramda': ^0.25.6 '@types/semver': ^5.4.0 '@types/strip-ansi': ^3.0.0