From 739634d76168f438934f1f8287618dabe2f3b968 Mon Sep 17 00:00:00 2001 From: Gar Date: Thu, 18 Jan 2024 12:56:59 -0800 Subject: [PATCH] deps: remove strip-ansi Only removes from direct dependencies, is still a non-dev subdependency --- DEPENDENCIES.md | 1 - package-lock.json | 2 -- package.json | 2 -- test/lib/commands/hook.js | 7 +++---- test/lib/commands/org.js | 10 ++++------ 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index 4414b66e9c66d..78fc8a9c457ca 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -557,7 +557,6 @@ graph LR; npm-->spawk; npm-->spdx-expression-parse; npm-->ssri; - npm-->strip-ansi; npm-->supports-color; npm-->tap; npm-->tar; diff --git a/package-lock.json b/package-lock.json index 7da2f9e460fa5..a0cae4be64d6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -70,7 +70,6 @@ "semver", "spdx-expression-parse", "ssri", - "strip-ansi", "supports-color", "tar", "text-table", @@ -151,7 +150,6 @@ "semver": "^7.5.4", "spdx-expression-parse": "^3.0.1", "ssri": "^10.0.5", - "strip-ansi": "^7.1.0", "supports-color": "^9.4.0", "tar": "^6.2.0", "text-table": "~0.2.0", diff --git a/package.json b/package.json index ba379e92abe70..15cab8c704a1d 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,6 @@ "semver": "^7.5.4", "spdx-expression-parse": "^3.0.1", "ssri": "^10.0.5", - "strip-ansi": "^7.1.0", "supports-color": "^9.4.0", "tar": "^6.2.0", "text-table": "~0.2.0", @@ -186,7 +185,6 @@ "semver", "spdx-expression-parse", "ssri", - "strip-ansi", "supports-color", "tar", "text-table", diff --git a/test/lib/commands/hook.js b/test/lib/commands/hook.js index 448045cdd6916..382bc177e7001 100644 --- a/test/lib/commands/hook.js +++ b/test/lib/commands/hook.js @@ -1,5 +1,6 @@ const t = require('tap') const mockNpm = require('../../fixtures/mock-npm') +const { stripVTControlCharacters } = require('node:util') const mockHook = async (t, { hookResponse, ...npmOpts } = {}) => { const now = Date.now() @@ -243,8 +244,7 @@ t.test('npm hook ls', async t => { 'received the correct arguments' ) t.equal(outputs[0][0], 'You have 3 hooks configured.', 'prints the correct header') - const { default: stripAnsi } = await import('strip-ansi') - const out = stripAnsi(outputs[1][0]) + const out = stripVTControlCharacters(outputs[1][0]) t.match(out, /semver.*https:\/\/google.com.*\n.*\n.*never triggered/, 'prints package hook') t.match(out, /@npmcli.*https:\/\/google.com.*\n.*\n.*triggered just now/, 'prints scope hook') t.match(out, /~npm.*https:\/\/google.com.*\n.*\n.*never triggered/, 'prints owner hook') @@ -293,8 +293,7 @@ t.test('npm hook ls, single result', async t => { 'received the correct arguments' ) t.equal(outputs[0][0], 'You have one hook configured.', 'prints the correct header') - const { default: stripAnsi } = await import('strip-ansi') - const out = stripAnsi(outputs[1][0]) + const out = stripVTControlCharacters(outputs[1][0]) t.match(out, /semver.*https:\/\/google.com.*\n.*\n.*never triggered/, 'prints package hook') }) diff --git a/test/lib/commands/org.js b/test/lib/commands/org.js index ed8fb238c4b0d..0c343f028d6dc 100644 --- a/test/lib/commands/org.js +++ b/test/lib/commands/org.js @@ -1,5 +1,6 @@ const t = require('tap') const mockNpm = require('../../fixtures/mock-npm') +const { stripVTControlCharacters } = require('node:util') const mockOrg = async (t, { orgSize = 1, orgList = {}, ...npmOpts } = {}) => { let setArgs = null @@ -426,8 +427,7 @@ t.test('npm org ls', async t => { }, 'receieved the correct args' ) - const { default: stripAnsi } = await import('strip-ansi') - const out = stripAnsi(outputs[0][0]) + const out = stripVTControlCharacters(outputs[0][0]) t.match(out, /one.*developer/, 'contains the developer member') t.match(out, /two.*admin/, 'contains the admin member') t.match(out, /three.*owner/, 'contains the owner member') @@ -452,8 +452,7 @@ t.test('npm org ls - user filter', async t => { }, 'receieved the correct args' ) - const { default: stripAnsi } = await import('strip-ansi') - const out = stripAnsi(outputs[0][0]) + const out = stripVTControlCharacters(outputs[0][0]) t.match(out, /username.*admin/, 'contains the filtered member') t.notMatch(out, /missing.*admin/, 'does not contain other members') }) @@ -476,8 +475,7 @@ t.test('npm org ls - user filter, missing user', async t => { }, 'receieved the correct args' ) - const { default: stripAnsi } = await import('strip-ansi') - const out = stripAnsi(outputs[0][0]) + const out = stripVTControlCharacters(outputs[0][0]) t.notMatch(out, /username/, 'does not contain the requested member') t.notMatch(out, /missing.*admin/, 'does not contain other members') })