diff --git a/lib/dir.js b/lib/dir.js index 923fdd65..420afc58 100644 --- a/lib/dir.js +++ b/lib/dir.js @@ -1,6 +1,6 @@ const Fetcher = require('./fetcher.js') const FileFetcher = require('./file.js') -const Minipass = require('minipass') +const { Minipass } = require('minipass') const tarCreateOptions = require('./util/tar-create-options.js') const packlist = require('npm-packlist') const tar = require('tar') diff --git a/lib/fetcher.js b/lib/fetcher.js index 4852564d..6694a57f 100644 --- a/lib/fetcher.js +++ b/lib/fetcher.js @@ -18,7 +18,7 @@ const removeTrailingSlashes = require('./util/trailing-slashes.js') const getContents = require('@npmcli/installed-package-contents') const readPackageJsonFast = require('read-package-json-fast') const readPackageJson = promisify(require('read-package-json')) -const Minipass = require('minipass') +const { Minipass } = require('minipass') const cacheDir = require('./util/cache-dir.js') diff --git a/lib/git.js b/lib/git.js index 1fa8b1f9..5d24f724 100644 --- a/lib/git.js +++ b/lib/git.js @@ -6,7 +6,7 @@ const hashre = /^[a-f0-9]{40}$/ const git = require('@npmcli/git') const pickManifest = require('npm-pick-manifest') const npa = require('npm-package-arg') -const Minipass = require('minipass') +const { Minipass } = require('minipass') const cacache = require('cacache') const log = require('proc-log') const npm = require('./util/npm.js') diff --git a/lib/remote.js b/lib/remote.js index a361a9e8..fd617459 100644 --- a/lib/remote.js +++ b/lib/remote.js @@ -3,7 +3,7 @@ const FileFetcher = require('./file.js') const _tarballFromResolved = Symbol.for('pacote.Fetcher._tarballFromResolved') const pacoteVersion = require('../package.json').version const fetch = require('npm-registry-fetch') -const Minipass = require('minipass') +const { Minipass } = require('minipass') const _cacheFetches = Symbol.for('pacote.Fetcher._cacheFetches') const _headers = Symbol('_headers') diff --git a/package.json b/package.json index 3ea34e5b..7023f6c7 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@npmcli/run-script": "^6.0.0", "cacache": "^17.0.0", "fs-minipass": "^3.0.0", - "minipass": "^4.0.0", + "minipass": "^5.0.0", "npm-package-arg": "^10.0.0", "npm-packlist": "^7.0.0", "npm-pick-manifest": "^8.0.0", diff --git a/test/bin.js b/test/bin.js index d2d5894e..264ee3b9 100644 --- a/test/bin.js +++ b/test/bin.js @@ -22,7 +22,7 @@ pacote.manifest = (spec, conf) => Promise.resolve({ }) pacote.packument = (spec, conf) => Promise.resolve({ method: 'packument', spec, conf }) pacote.tarball.file = (spec, file, conf) => Promise.resolve({ method: 'tarball', spec, file, conf }) -const Minipass = require('minipass') +const { Minipass } = require('minipass') pacote.tarball.stream = (spec, handler, conf) => handler(new Minipass().end('tarball data')) pacote.extract = (spec, dest, conf) => Promise.resolve({ method: 'extract', spec, dest, conf }) diff --git a/test/fetcher.js b/test/fetcher.js index 7da995db..bd0e88a4 100644 --- a/test/fetcher.js +++ b/test/fetcher.js @@ -29,7 +29,7 @@ const weirdspec = `file:${relative(process.cwd(), weird)}` const cacache = require('cacache') const byDigest = cacache.get.stream.byDigest -const Minipass = require('minipass') +const { Minipass } = require('minipass') // we actually use a file fetcher for this, because we need implementations const FileFetcher = require('../lib/file.js') diff --git a/test/util/npm.js b/test/util/npm.js index 511d4245..e6ec89ff 100644 --- a/test/util/npm.js +++ b/test/util/npm.js @@ -2,7 +2,7 @@ const t = require('tap') const cp = require('child_process') const { spawn } = cp -const Minipass = require('minipass') +const { Minipass } = require('minipass') const EventEmitter = require('events') cp.spawn = (...args) => { const proc = new EventEmitter()