mirror of
https://github.com/pnpm/pnpm.git
synced 2026-05-19 14:20:36 -04:00
refactor: replace strip-ansi with built-in util.stripVTControlCharacters (#9009)
This commit is contained in:
12
.changeset/pink-ties-roll.md
Normal file
12
.changeset/pink-ties-roll.md
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
---
|
||||||
|
"@pnpm/plugin-commands-licenses": patch
|
||||||
|
"@pnpm/plugin-commands-outdated": patch
|
||||||
|
"@pnpm/plugin-commands-listing": patch
|
||||||
|
"@pnpm/plugin-commands-audit": patch
|
||||||
|
"@pnpm/render-peer-issues": patch
|
||||||
|
"@pnpm/dedupe.issues-renderer": patch
|
||||||
|
"@pnpm/default-reporter": patch
|
||||||
|
"pnpm": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Replace `strip-ansi` with the built-in `util.stripVTControlCharacters` [#9009](https://github.com/pnpm/pnpm/pull/9009).
|
||||||
@@ -62,8 +62,7 @@
|
|||||||
"@types/semver": "catalog:",
|
"@types/semver": "catalog:",
|
||||||
"ghooks": "catalog:",
|
"ghooks": "catalog:",
|
||||||
"load-json-file": "catalog:",
|
"load-json-file": "catalog:",
|
||||||
"normalize-newline": "catalog:",
|
"normalize-newline": "catalog:"
|
||||||
"strip-ansi": "catalog:"
|
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/pnpm/pnpm/blob/main/cli/default-reporter#readme",
|
"homepage": "https://github.com/pnpm/pnpm/blob/main/cli/default-reporter#readme",
|
||||||
"funding": "https://opencollective.com/pnpm",
|
"funding": "https://opencollective.com/pnpm",
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { updateCheckLogger } from '@pnpm/core-loggers'
|
|||||||
import { toOutput$ } from '@pnpm/default-reporter'
|
import { toOutput$ } from '@pnpm/default-reporter'
|
||||||
import { createStreamParser } from '@pnpm/logger'
|
import { createStreamParser } from '@pnpm/logger'
|
||||||
import { take } from 'rxjs/operators'
|
import { take } from 'rxjs/operators'
|
||||||
import stripAnsi from 'strip-ansi'
|
import { stripVTControlCharacters as stripAnsi } from 'util'
|
||||||
|
|
||||||
test('does not print update if latest is less than current', (done) => {
|
test('does not print update if latest is less than current', (done) => {
|
||||||
const output$ = toOutput$({
|
const output$ = toOutput$({
|
||||||
|
|||||||
@@ -35,8 +35,7 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@pnpm/dedupe.issues-renderer": "workspace:*",
|
"@pnpm/dedupe.issues-renderer": "workspace:*",
|
||||||
"@types/archy": "catalog:",
|
"@types/archy": "catalog:"
|
||||||
"strip-ansi": "catalog:"
|
|
||||||
},
|
},
|
||||||
"exports": {
|
"exports": {
|
||||||
".": "./lib/index.js"
|
".": "./lib/index.js"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { renderDedupeCheckIssues } from '@pnpm/dedupe.issues-renderer'
|
import { renderDedupeCheckIssues } from '@pnpm/dedupe.issues-renderer'
|
||||||
import stripAnsi from 'strip-ansi'
|
import { stripVTControlCharacters as stripAnsi } from 'util'
|
||||||
|
|
||||||
describe('renderDedupeCheckIssues', () => {
|
describe('renderDedupeCheckIssues', () => {
|
||||||
test('prints removed packages and updated resolutions', () => {
|
test('prints removed packages and updated resolutions', () => {
|
||||||
|
|||||||
@@ -38,7 +38,6 @@
|
|||||||
"@types/zkochan__table": "catalog:",
|
"@types/zkochan__table": "catalog:",
|
||||||
"load-json-file": "catalog:",
|
"load-json-file": "catalog:",
|
||||||
"nock": "catalog:",
|
"nock": "catalog:",
|
||||||
"strip-ansi": "catalog:",
|
|
||||||
"tempy": "catalog:"
|
"tempy": "catalog:"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { audit } from '@pnpm/plugin-commands-audit'
|
|||||||
import { install } from '@pnpm/plugin-commands-installation'
|
import { install } from '@pnpm/plugin-commands-installation'
|
||||||
import { AuditEndpointNotExistsError } from '@pnpm/audit'
|
import { AuditEndpointNotExistsError } from '@pnpm/audit'
|
||||||
import nock from 'nock'
|
import nock from 'nock'
|
||||||
import stripAnsi from 'strip-ansi'
|
import { stripVTControlCharacters as stripAnsi } from 'util'
|
||||||
import * as responses from './utils/responses'
|
import * as responses from './utils/responses'
|
||||||
|
|
||||||
const f = fixtures(path.join(__dirname, 'fixtures'))
|
const f = fixtures(path.join(__dirname, 'fixtures'))
|
||||||
|
|||||||
@@ -151,7 +151,6 @@
|
|||||||
"ps-list",
|
"ps-list",
|
||||||
"sort-keys",
|
"sort-keys",
|
||||||
"string-length",
|
"string-length",
|
||||||
"strip-ansi",
|
|
||||||
"strip-bom",
|
"strip-bom",
|
||||||
"tempy",
|
"tempy",
|
||||||
"unique-string",
|
"unique-string",
|
||||||
|
|||||||
@@ -41,8 +41,7 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@pnpm/render-peer-issues": "workspace:*",
|
"@pnpm/render-peer-issues": "workspace:*",
|
||||||
"@types/archy": "catalog:",
|
"@types/archy": "catalog:",
|
||||||
"@types/semver": "catalog:",
|
"@types/semver": "catalog:"
|
||||||
"strip-ansi": "catalog:"
|
|
||||||
},
|
},
|
||||||
"exports": {
|
"exports": {
|
||||||
".": "./lib/index.js"
|
".": "./lib/index.js"
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { renderPeerIssues } from '@pnpm/render-peer-issues'
|
import { renderPeerIssues } from '@pnpm/render-peer-issues'
|
||||||
import stripAnsi from 'strip-ansi'
|
import { stripVTControlCharacters as stripAnsi } from 'util'
|
||||||
|
|
||||||
test('renderPeerIssues()', () => {
|
test('renderPeerIssues()', () => {
|
||||||
expect(stripAnsi(renderPeerIssues({
|
expect(stripAnsi(renderPeerIssues({
|
||||||
|
|||||||
27
pnpm-lock.yaml
generated
27
pnpm-lock.yaml
generated
@@ -588,9 +588,6 @@ catalogs:
|
|||||||
string-length:
|
string-length:
|
||||||
specifier: ^4.0.2
|
specifier: ^4.0.2
|
||||||
version: 4.0.2
|
version: 4.0.2
|
||||||
strip-ansi:
|
|
||||||
specifier: ^6.0.1
|
|
||||||
version: 6.0.1
|
|
||||||
strip-bom:
|
strip-bom:
|
||||||
specifier: ^4.0.0
|
specifier: ^4.0.0
|
||||||
version: 4.0.0
|
version: 4.0.0
|
||||||
@@ -1364,9 +1361,6 @@ importers:
|
|||||||
normalize-newline:
|
normalize-newline:
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 3.0.0
|
version: 3.0.0
|
||||||
strip-ansi:
|
|
||||||
specifier: 'catalog:'
|
|
||||||
version: 6.0.1
|
|
||||||
|
|
||||||
cli/parse-cli-args:
|
cli/parse-cli-args:
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -1752,9 +1746,6 @@ importers:
|
|||||||
'@types/archy':
|
'@types/archy':
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 0.0.33
|
version: 0.0.33
|
||||||
strip-ansi:
|
|
||||||
specifier: 'catalog:'
|
|
||||||
version: 6.0.1
|
|
||||||
|
|
||||||
dedupe/types:
|
dedupe/types:
|
||||||
devDependencies:
|
devDependencies:
|
||||||
@@ -3413,9 +3404,6 @@ importers:
|
|||||||
nock:
|
nock:
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 13.3.4
|
version: 13.3.4
|
||||||
strip-ansi:
|
|
||||||
specifier: 'catalog:'
|
|
||||||
version: 6.0.1
|
|
||||||
tempy:
|
tempy:
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 1.0.1
|
version: 1.0.1
|
||||||
@@ -4034,9 +4022,6 @@ importers:
|
|||||||
'@types/semver':
|
'@types/semver':
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 7.5.3
|
version: 7.5.3
|
||||||
strip-ansi:
|
|
||||||
specifier: 'catalog:'
|
|
||||||
version: 6.0.1
|
|
||||||
|
|
||||||
packages/types:
|
packages/types:
|
||||||
devDependencies:
|
devDependencies:
|
||||||
@@ -6070,9 +6055,6 @@ importers:
|
|||||||
split-cmd:
|
split-cmd:
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 1.1.0
|
version: 1.1.0
|
||||||
strip-ansi:
|
|
||||||
specifier: 'catalog:'
|
|
||||||
version: 6.0.1
|
|
||||||
symlink-dir:
|
symlink-dir:
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 6.0.4
|
version: 6.0.4
|
||||||
@@ -6989,9 +6971,6 @@ importers:
|
|||||||
'@types/zkochan__table':
|
'@types/zkochan__table':
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: '@types/table@6.0.0'
|
version: '@types/table@6.0.0'
|
||||||
strip-ansi:
|
|
||||||
specifier: 'catalog:'
|
|
||||||
version: 6.0.1
|
|
||||||
|
|
||||||
reviewing/plugin-commands-listing:
|
reviewing/plugin-commands-listing:
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -7050,9 +7029,6 @@ importers:
|
|||||||
execa:
|
execa:
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: safe-execa@0.1.2
|
version: safe-execa@0.1.2
|
||||||
strip-ansi:
|
|
||||||
specifier: 'catalog:'
|
|
||||||
version: 6.0.1
|
|
||||||
write-yaml-file:
|
write-yaml-file:
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 5.0.0
|
version: 5.0.0
|
||||||
@@ -7113,9 +7089,6 @@ importers:
|
|||||||
render-help:
|
render-help:
|
||||||
specifier: 'catalog:'
|
specifier: 'catalog:'
|
||||||
version: 1.0.3
|
version: 1.0.3
|
||||||
strip-ansi:
|
|
||||||
specifier: 'catalog:'
|
|
||||||
version: 6.0.1
|
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@pnpm/constants':
|
'@pnpm/constants':
|
||||||
specifier: workspace:*
|
specifier: workspace:*
|
||||||
|
|||||||
@@ -235,7 +235,6 @@ catalog:
|
|||||||
ssri: 10.0.5
|
ssri: 10.0.5
|
||||||
stacktracey: ^2.1.8
|
stacktracey: ^2.1.8
|
||||||
string-length: ^4.0.2
|
string-length: ^4.0.2
|
||||||
strip-ansi: ^6.0.1
|
|
||||||
strip-bom: ^4.0.0
|
strip-bom: ^4.0.0
|
||||||
strip-comments-strings: 1.2.0
|
strip-comments-strings: 1.2.0
|
||||||
symlink-dir: ^6.0.4
|
symlink-dir: ^6.0.4
|
||||||
|
|||||||
@@ -113,7 +113,6 @@
|
|||||||
"render-help": "catalog:",
|
"render-help": "catalog:",
|
||||||
"semver": "catalog:",
|
"semver": "catalog:",
|
||||||
"split-cmd": "catalog:",
|
"split-cmd": "catalog:",
|
||||||
"strip-ansi": "catalog:",
|
|
||||||
"symlink-dir": "catalog:",
|
"symlink-dir": "catalog:",
|
||||||
"tempy": "catalog:",
|
"tempy": "catalog:",
|
||||||
"tree-kill": "catalog:",
|
"tree-kill": "catalog:",
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ import chalk from 'chalk'
|
|||||||
import { isCI } from 'ci-info'
|
import { isCI } from 'ci-info'
|
||||||
import path from 'path'
|
import path from 'path'
|
||||||
import isEmpty from 'ramda/src/isEmpty'
|
import isEmpty from 'ramda/src/isEmpty'
|
||||||
import stripAnsi from 'strip-ansi'
|
import { stripVTControlCharacters as stripAnsi } from 'util'
|
||||||
import { checkForUpdates } from './checkForUpdates'
|
import { checkForUpdates } from './checkForUpdates'
|
||||||
import { pnpmCmds, rcOptionsTypes, skipPackageManagerCheckForCommand } from './cmd'
|
import { pnpmCmds, rcOptionsTypes, skipPackageManagerCheckForCommand } from './cmd'
|
||||||
import { formatUnknownOptionsError } from './formatError'
|
import { formatUnknownOptionsError } from './formatError'
|
||||||
|
|||||||
@@ -111,10 +111,6 @@
|
|||||||
"packageNames": ["p-defer"],
|
"packageNames": ["p-defer"],
|
||||||
"allowedVersions": "^3.0.0"
|
"allowedVersions": "^3.0.0"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"packageNames": ["strip-ansi"],
|
|
||||||
"allowedVersions": "^6.0.0"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"packageNames": ["escape-string-regexp"],
|
"packageNames": ["escape-string-regexp"],
|
||||||
"allowedVersions": "^4.0.0"
|
"allowedVersions": "^4.0.0"
|
||||||
|
|||||||
@@ -40,8 +40,7 @@
|
|||||||
"@pnpm/workspace.filter-packages-from-dir": "workspace:*",
|
"@pnpm/workspace.filter-packages-from-dir": "workspace:*",
|
||||||
"@types/ramda": "catalog:",
|
"@types/ramda": "catalog:",
|
||||||
"@types/semver": "catalog:",
|
"@types/semver": "catalog:",
|
||||||
"@types/zkochan__table": "catalog:",
|
"@types/zkochan__table": "catalog:"
|
||||||
"strip-ansi": "catalog:"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@pnpm/cli-utils": "workspace:*",
|
"@pnpm/cli-utils": "workspace:*",
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { licenses } from '@pnpm/plugin-commands-licenses'
|
|||||||
import { install } from '@pnpm/plugin-commands-installation'
|
import { install } from '@pnpm/plugin-commands-installation'
|
||||||
import { tempDir } from '@pnpm/prepare'
|
import { tempDir } from '@pnpm/prepare'
|
||||||
import { fixtures } from '@pnpm/test-fixtures'
|
import { fixtures } from '@pnpm/test-fixtures'
|
||||||
import stripAnsi from 'strip-ansi'
|
import { stripVTControlCharacters as stripAnsi } from 'util'
|
||||||
import { DEFAULT_OPTS } from './utils'
|
import { DEFAULT_OPTS } from './utils'
|
||||||
import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir'
|
import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir'
|
||||||
|
|
||||||
|
|||||||
@@ -39,7 +39,6 @@
|
|||||||
"@pnpm/workspace.filter-packages-from-dir": "workspace:*",
|
"@pnpm/workspace.filter-packages-from-dir": "workspace:*",
|
||||||
"@types/ramda": "catalog:",
|
"@types/ramda": "catalog:",
|
||||||
"execa": "catalog:",
|
"execa": "catalog:",
|
||||||
"strip-ansi": "catalog:",
|
|
||||||
"write-yaml-file": "catalog:"
|
"write-yaml-file": "catalog:"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { list, why } from '@pnpm/plugin-commands-listing'
|
|||||||
import { prepare, preparePackages } from '@pnpm/prepare'
|
import { prepare, preparePackages } from '@pnpm/prepare'
|
||||||
|
|
||||||
import execa from 'execa'
|
import execa from 'execa'
|
||||||
import stripAnsi from 'strip-ansi'
|
import { stripVTControlCharacters as stripAnsi } from 'util'
|
||||||
import { sync as writeYamlFile } from 'write-yaml-file'
|
import { sync as writeYamlFile } from 'write-yaml-file'
|
||||||
|
|
||||||
const pnpmBin = path.join(__dirname, '../../../pnpm/bin/pnpm.cjs')
|
const pnpmBin = path.join(__dirname, '../../../pnpm/bin/pnpm.cjs')
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { install } from '@pnpm/plugin-commands-installation'
|
|||||||
import { list, why } from '@pnpm/plugin-commands-listing'
|
import { list, why } from '@pnpm/plugin-commands-listing'
|
||||||
import { prepare, preparePackages } from '@pnpm/prepare'
|
import { prepare, preparePackages } from '@pnpm/prepare'
|
||||||
import { addDistTag } from '@pnpm/registry-mock'
|
import { addDistTag } from '@pnpm/registry-mock'
|
||||||
import stripAnsi from 'strip-ansi'
|
import { stripVTControlCharacters as stripAnsi } from 'util'
|
||||||
import { sync as writeYamlFile } from 'write-yaml-file'
|
import { sync as writeYamlFile } from 'write-yaml-file'
|
||||||
import { DEFAULT_OPTS } from './utils'
|
import { DEFAULT_OPTS } from './utils'
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { why } from '@pnpm/plugin-commands-listing'
|
|||||||
import { prepare } from '@pnpm/prepare'
|
import { prepare } from '@pnpm/prepare'
|
||||||
import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
|
import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
|
||||||
import execa from 'execa'
|
import execa from 'execa'
|
||||||
import stripAnsi from 'strip-ansi'
|
import { stripVTControlCharacters as stripAnsi } from 'util'
|
||||||
|
|
||||||
const pnpmBin = path.join(__dirname, '../../../pnpm/bin/pnpm.cjs')
|
const pnpmBin = path.join(__dirname, '../../../pnpm/bin/pnpm.cjs')
|
||||||
|
|
||||||
|
|||||||
@@ -58,8 +58,7 @@
|
|||||||
"@zkochan/table": "catalog:",
|
"@zkochan/table": "catalog:",
|
||||||
"chalk": "catalog:",
|
"chalk": "catalog:",
|
||||||
"ramda": "catalog:",
|
"ramda": "catalog:",
|
||||||
"render-help": "catalog:",
|
"render-help": "catalog:"
|
||||||
"strip-ansi": "catalog:"
|
|
||||||
},
|
},
|
||||||
"funding": "https://opencollective.com/pnpm",
|
"funding": "https://opencollective.com/pnpm",
|
||||||
"exports": {
|
"exports": {
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import chalk from 'chalk'
|
|||||||
import pick from 'ramda/src/pick'
|
import pick from 'ramda/src/pick'
|
||||||
import sortWith from 'ramda/src/sortWith'
|
import sortWith from 'ramda/src/sortWith'
|
||||||
import renderHelp from 'render-help'
|
import renderHelp from 'render-help'
|
||||||
import stripAnsi from 'strip-ansi'
|
import { stripVTControlCharacters as stripAnsi } from 'util'
|
||||||
import {
|
import {
|
||||||
DEFAULT_COMPARATORS,
|
DEFAULT_COMPARATORS,
|
||||||
NAME_COMPARATOR,
|
NAME_COMPARATOR,
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { outdated } from '@pnpm/plugin-commands-outdated'
|
|||||||
import { prepare, tempDir } from '@pnpm/prepare'
|
import { prepare, tempDir } from '@pnpm/prepare'
|
||||||
import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
|
import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
|
||||||
import { fixtures } from '@pnpm/test-fixtures'
|
import { fixtures } from '@pnpm/test-fixtures'
|
||||||
import stripAnsi from 'strip-ansi'
|
import { stripVTControlCharacters as stripAnsi } from 'util'
|
||||||
|
|
||||||
const f = fixtures(__dirname)
|
const f = fixtures(__dirname)
|
||||||
const hasOutdatedDepsFixture = f.find('has-outdated-deps')
|
const hasOutdatedDepsFixture = f.find('has-outdated-deps')
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir'
|
|||||||
import { install } from '@pnpm/plugin-commands-installation'
|
import { install } from '@pnpm/plugin-commands-installation'
|
||||||
import { outdated } from '@pnpm/plugin-commands-outdated'
|
import { outdated } from '@pnpm/plugin-commands-outdated'
|
||||||
import { preparePackages } from '@pnpm/prepare'
|
import { preparePackages } from '@pnpm/prepare'
|
||||||
import stripAnsi from 'strip-ansi'
|
import { stripVTControlCharacters as stripAnsi } from 'util'
|
||||||
import { DEFAULT_OPTS, DEFAULT_OUTDATED_OPTS } from './utils'
|
import { DEFAULT_OPTS, DEFAULT_OUTDATED_OPTS } from './utils'
|
||||||
|
|
||||||
test('pnpm recursive outdated', async () => {
|
test('pnpm recursive outdated', async () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user