Skip to content

Commit

Permalink
chore: update/removed usages of libnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Perrotte authored and isaacs committed May 8, 2020
1 parent d7604fa commit b9e8be4
Show file tree
Hide file tree
Showing 25 changed files with 39 additions and 38 deletions.
2 changes: 1 addition & 1 deletion lib/access.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
const BB = require('bluebird')

const figgyPudding = require('figgy-pudding')
const libaccess = require('libnpm/access')
const libaccess = require('libnpmaccess')
const npmConfig = require('./config/figgy-config.js')
const output = require('./utils/output.js')
const otplease = require('./utils/otplease.js')
Expand Down
2 changes: 1 addition & 1 deletion lib/audit.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const fs = require('graceful-fs')
const Installer = require('./install.js').Installer
const lockVerify = require('lock-verify')
const log = require('npmlog')
const npa = require('libnpm/parse-arg')
const npa = require('npm-package-arg')
const npm = require('./npm.js')
const npmConfig = require('./config/figgy-config.js')
const output = require('./utils/output.js')
Expand Down
2 changes: 1 addition & 1 deletion lib/auth/legacy.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const read = require('../utils/read-user-info.js')
const profile = require('libnpm/profile')
const profile = require('npm-profile')
const log = require('npmlog')
const figgyPudding = require('figgy-pudding')
const npmConfig = require('../config/figgy-config.js')
Expand Down
2 changes: 1 addition & 1 deletion lib/auth/sso.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const npmFetch = require('npm-registry-fetch')
const output = require('../utils/output.js')
const openUrl = BB.promisify(require('../utils/open-url.js'))
const otplease = require('../utils/otplease.js')
const profile = require('libnpm/profile')
const profile = require('npm-profile')

const SsoOpts = figgyPudding({
ssoType: 'sso-type',
Expand Down
4 changes: 2 additions & 2 deletions lib/deprecate.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
const BB = require('bluebird')

const npmConfig = require('./config/figgy-config.js')
const fetch = require('libnpm/fetch')
const fetch = require('npm-registry-fetch')
const figgyPudding = require('figgy-pudding')
const otplease = require('./utils/otplease.js')
const npa = require('libnpm/parse-arg')
const npa = require('npm-package-arg')
const semver = require('semver')
const whoami = require('./whoami.js')

Expand Down
4 changes: 2 additions & 2 deletions lib/dist-tag.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ const BB = require('bluebird')

const figgyPudding = require('figgy-pudding')
const log = require('npmlog')
const npa = require('libnpm/parse-arg')
const npa = require('npm-package-arg')
const npmConfig = require('./config/figgy-config.js')
const output = require('./utils/output.js')
const otplease = require('./utils/otplease.js')
const readLocalPkg = BB.promisify(require('./utils/read-local-package.js'))
const regFetch = require('libnpm/fetch')
const regFetch = require('npm-registry-fetch')
const semver = require('semver')
const usage = require('./utils/usage')

Expand Down
2 changes: 1 addition & 1 deletion lib/hook.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const BB = require('bluebird')

const hookApi = require('libnpm/hook')
const hookApi = require('libnpmhook')
const npmConfig = require('./config/figgy-config.js')
const output = require('./utils/output.js')
const otplease = require('./utils/otplease.js')
Expand Down
2 changes: 1 addition & 1 deletion lib/install/action/extract-worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const BB = require('bluebird')

const extract = require('pacote/extract')
const pacote = require('pacote')
// const npmlog = require('npmlog')

module.exports = (args, cb) => {
Expand Down
2 changes: 1 addition & 1 deletion lib/logout.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const getAuth = require('npm-registry-fetch/auth.js')
const log = require('npmlog')
const npm = require('./npm.js')
const npmConfig = require('./config/figgy-config.js')
const npmFetch = require('libnpm/fetch')
const npmFetch = require('npm-registry-fetch')

logout.usage = 'npm logout [--registry=<url>] [--scope=<@scope>]'

Expand Down
2 changes: 1 addition & 1 deletion lib/org.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const figgyPudding = require('figgy-pudding')
const liborg = require('libnpm/org')
const liborg = require('libnpmorg')
const npmConfig = require('./config/figgy-config.js')
const output = require('./utils/output.js')
const otplease = require('./utils/otplease.js')
Expand Down
4 changes: 2 additions & 2 deletions lib/outdated.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ const color = require('ansicolors')
const styles = require('ansistyles')
const table = require('text-table')
const semver = require('semver')
const npa = require('libnpm/parse-arg')
const npa = require('npm-package-arg')
const pickManifest = require('npm-pick-manifest')
const fetchPackageMetadata = require('./fetch-package-metadata.js')
const mutateIntoLogicalTree = require('./install/mutate-into-logical-tree.js')
const npm = require('./npm.js')
const npmConfig = require('./config/figgy-config.js')
const figgyPudding = require('figgy-pudding')
const packument = require('libnpm/packument')
const { packument } = require('pacote')
const long = npm.config.get('long')
const isExtraneous = require('./install/is-extraneous.js')
const computeMetadata = require('./install/deps.js').computeMetadata
Expand Down
6 changes: 3 additions & 3 deletions lib/owner.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ module.exports = owner
const BB = require('bluebird')

const log = require('npmlog')
const npa = require('libnpm/parse-arg')
const npa = require('npm-package-arg')
const npmConfig = require('./config/figgy-config.js')
const npmFetch = require('libnpm/fetch')
const npmFetch = require('npm-registry-fetch')
const output = require('./utils/output.js')
const otplease = require('./utils/otplease.js')
const packument = require('libnpm/packument')
const { packument } = require('pacote')
const readLocalPkg = BB.promisify(require('./utils/read-local-package.js'))
const usage = require('./utils/usage')
const whoami = BB.promisify(require('./whoami.js'))
Expand Down
2 changes: 1 addition & 1 deletion lib/ping.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const npmConfig = require('./config/figgy-config.js')
const fetch = require('libnpm/fetch')
const fetch = require('npm-registry-fetch')
const figgyPudding = require('figgy-pudding')
const log = require('npmlog')
const npm = require('./npm.js')
Expand Down
2 changes: 1 addition & 1 deletion lib/profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const npm = require('./npm.js')
const npmConfig = require('./config/figgy-config.js')
const otplease = require('./utils/otplease.js')
const output = require('./utils/output.js')
const profile = require('libnpm/profile')
const profile = require('npm-profile')
const pulseTillDone = require('./utils/pulse-till-done.js')
const qrcodeTerminal = require('qrcode-terminal')
const queryString = require('query-string')
Expand Down
8 changes: 4 additions & 4 deletions lib/publish.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ const BB = require('bluebird')

const cacache = require('cacache')
const figgyPudding = require('figgy-pudding')
const libpub = require('libnpm/publish')
const libunpub = require('libnpm/unpublish')
const libpub = require('libnpmpublish').publish
const libunpub = require('libnpmpublish').unpublish
const lifecycle = BB.promisify(require('./utils/lifecycle.js'))
const log = require('npmlog')
const npa = require('libnpm/parse-arg')
const npa = require('npm-package-arg')
const npmConfig = require('./config/figgy-config.js')
const output = require('./utils/output.js')
const otplease = require('./utils/otplease.js')
const pack = require('./pack')
const { tarball, extract } = require('libnpm')
const { tarball, extract } = require('pacote')
const path = require('path')
const readFileAsync = BB.promisify(require('graceful-fs').readFile)
const readJson = BB.promisify(require('read-package-json'))
Expand Down
2 changes: 1 addition & 1 deletion lib/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const npm = require('./npm.js')
const allPackageSearch = require('./search/all-package-search')
const figgyPudding = require('figgy-pudding')
const formatPackageStream = require('./search/format-package-stream.js')
const libSearch = require('libnpm/search')
const libSearch = require('libnpmsearch')
const log = require('npmlog')
const ms = require('mississippi')
const npmConfig = require('./config/figgy-config.js')
Expand Down
2 changes: 1 addition & 1 deletion lib/search/all-package-metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const JSONStream = require('JSONStream')
const log = require('npmlog')
const mkdir = BB.promisify(require('gentle-fs').mkdir)
const ms = require('mississippi')
const npmFetch = require('libnpm/fetch')
const npmFetch = require('npm-registry-fetch')
const path = require('path')
const sortedUnionStream = require('sorted-union-stream')
const url = require('url')
Expand Down
4 changes: 2 additions & 2 deletions lib/star.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

const BB = require('bluebird')

const fetch = require('libnpm/fetch')
const fetch = require('npm-registry-fetch')
const figgyPudding = require('figgy-pudding')
const log = require('npmlog')
const npa = require('libnpm/parse-arg')
const npa = require('npm-package-arg')
const npm = require('./npm.js')
const npmConfig = require('./config/figgy-config.js')
const output = require('./utils/output.js')
Expand Down
2 changes: 1 addition & 1 deletion lib/stars.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const BB = require('bluebird')

const npmConfig = require('./config/figgy-config.js')
const fetch = require('libnpm/fetch')
const fetch = require('npm-registry-fetch')
const log = require('npmlog')
const output = require('./utils/output.js')
const whoami = require('./whoami.js')
Expand Down
2 changes: 1 addition & 1 deletion lib/team.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const columns = require('cli-columns')
const figgyPudding = require('figgy-pudding')
const libteam = require('libnpm/team')
const libteam = require('libnpmteam')
const npmConfig = require('./config/figgy-config.js')
const output = require('./utils/output.js')
const otplease = require('./utils/otplease.js')
Expand Down
2 changes: 1 addition & 1 deletion lib/token.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

const profile = require('libnpm/profile')
const profile = require('npm-profile')
const npm = require('./npm.js')
const figgyPudding = require('figgy-pudding')
const npmConfig = require('./config/figgy-config.js')
Expand Down
4 changes: 2 additions & 2 deletions lib/unpublish.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ module.exports = unpublish
const BB = require('bluebird')

const figgyPudding = require('figgy-pudding')
const libaccess = require('libnpm/access')
const libunpub = require('libnpm/unpublish')
const libaccess = require('libnpmaccess')
const libunpub = require('libnpmpublish').unpublish
const log = require('npmlog')
const npa = require('npm-package-arg')
const npm = require('./npm.js')
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/metrics.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exports.send = sendMetrics
const fs = require('fs')
const path = require('path')
const npm = require('../npm.js')
const regFetch = require('libnpm/fetch')
const regFetch = require('npm-registry-fetch')
const uuid = require('uuid')
const cacheFile = require('./cache-file.js')

Expand Down
9 changes: 5 additions & 4 deletions lib/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@ const columns = require('cli-columns')
const npmConfig = require('./config/figgy-config.js')
const log = require('npmlog')
const figgyPudding = require('figgy-pudding')
const npa = require('libnpm/parse-arg')
const npa = require('npm-package-arg')
const npm = require('./npm.js')
const packument = require('libnpm/packument')
const { packument } = require('pacote')
const path = require('path')
const readJson = require('libnpm/read-json')
const util = require('util')
const readJson = util.promisify(require('read-package-json'))
const relativeDate = require('tiny-relative-date')
const semver = require('semver')
const style = require('ansistyles')
const usage = require('./utils/usage')
const util = require('util')

const validateName = require('validate-npm-package-name')

const ViewConfig = figgyPudding({
Expand Down
2 changes: 1 addition & 1 deletion lib/whoami.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
const BB = require('bluebird')

const npmConfig = require('./config/figgy-config.js')
const fetch = require('libnpm/fetch')
const fetch = require('npm-registry-fetch')
const figgyPudding = require('figgy-pudding')
const npm = require('./npm.js')
const output = require('./utils/output.js')
Expand Down

0 comments on commit b9e8be4

Please sign in to comment.