Skip to content

Update Dependencies #6133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Feb 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions DEPENDENCIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,6 @@ graph LR;
libnpmexec-->just-extend;
libnpmexec-->just-safe-set;
libnpmexec-->minify-registry-metadata;
libnpmexec-->mkdirp;
libnpmexec-->npm-package-arg;
libnpmexec-->npmcli-arborist["@npmcli/arborist"];
libnpmexec-->npmcli-eslint-config["@npmcli/eslint-config"];
Expand Down Expand Up @@ -510,7 +509,6 @@ graph LR;
npm-->minimatch;
npm-->minipass-pipeline;
npm-->minipass;
npm-->mkdirp;
npm-->ms;
npm-->nock;
npm-->node-gyp;
Expand Down Expand Up @@ -637,7 +635,6 @@ graph LR;
npmcli-docs-->ignore-walk;
npmcli-docs-->isaacs-string-locale-compare["@isaacs/string-locale-compare"];
npmcli-docs-->jsdom;
npmcli-docs-->mkdirp;
npmcli-docs-->npmcli-eslint-config["@npmcli/eslint-config"];
npmcli-docs-->npmcli-template-oss["@npmcli/template-oss"];
npmcli-docs-->rehype-stringify;
Expand Down
9 changes: 4 additions & 5 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,16 @@
"@npmcli/eslint-config": "^4.0.0",
"@npmcli/template-oss": "4.11.3",
"front-matter": "^4.0.2",
"ignore-walk": "^6.0.0",
"jsdom": "^20.0.3",
"mkdirp": "^1.0.4",
"ignore-walk": "^6.0.1",
"jsdom": "^21.1.0",
"rehype-stringify": "^9.0.3",
"remark-gfm": "^3.0.1",
"remark-man": "^8.0.1",
"remark-parse": "^10.0.1",
"remark-rehype": "^10.1.0",
"tap": "^16.3.2",
"tap": "^16.3.4",
"unified": "^10.1.2",
"yaml": "^2.1.3"
"yaml": "^2.2.1"
},
"author": "GitHub Inc.",
"license": "ISC",
Expand Down
32 changes: 14 additions & 18 deletions lib/commands/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,24 +165,20 @@ class Init extends BaseCommand {
].join('\n'))
}

// XXX promisify init-package-json
await new Promise((res, rej) => {
initJson(path, initFile, this.npm.config, (er, data) => {
log.resume()
log.enableProgress()
log.silly('package data', data)
if (er && er.message === 'canceled') {
log.warn('init', 'canceled')
return res()
}
if (er) {
rej(er)
} else {
log.info('init', 'written successfully')
res(data)
}
})
})
try {
const data = await initJson(path, initFile, this.npm.config)
log.silly('package data', data)
return data
} catch (er) {
if (er.message === 'canceled') {
log.warn('init', 'canceled')
} else {
throw er
}
} finally {
log.resume()
log.enableProgress()
}
}

async setWorkspace (pkg, workspacePath) {
Expand Down
15 changes: 7 additions & 8 deletions lib/utils/read-user-info.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const { promisify } = require('util')
const readAsync = promisify(require('read'))
const read = require('read')
const userValidate = require('npm-user-validate')
const log = require('./log-shim.js')

Expand All @@ -17,17 +16,17 @@ const passwordPrompt = 'npm password: '
const usernamePrompt = 'npm username: '
const emailPrompt = 'email (this IS public): '

function read (opts) {
function readWithProgress (opts) {
log.clearProgress()
return readAsync(opts).finally(() => log.showProgress())
return read(opts).finally(() => log.showProgress())
}

function readOTP (msg = otpPrompt, otp, isRetry) {
if (isRetry && otp && /^[\d ]+$|^[A-Fa-f0-9]{64,64}$/.test(otp)) {
return otp.replace(/\s+/g, '')
}

return read({ prompt: msg, default: otp || '' })
return readWithProgress({ prompt: msg, default: otp || '' })
.then((rOtp) => readOTP(msg, rOtp, true))
}

Expand All @@ -36,7 +35,7 @@ function readPassword (msg = passwordPrompt, password, isRetry) {
return password
}

return read({ prompt: msg, silent: true, default: password || '' })
return readWithProgress({ prompt: msg, silent: true, default: password || '' })
.then((rPassword) => readPassword(msg, rPassword, true))
}

Expand All @@ -50,7 +49,7 @@ function readUsername (msg = usernamePrompt, username, isRetry) {
}
}

return read({ prompt: msg, default: username || '' })
return readWithProgress({ prompt: msg, default: username || '' })
.then((rUsername) => readUsername(msg, rUsername, true))
}

Expand All @@ -64,6 +63,6 @@ function readEmail (msg = emailPrompt, email, isRetry) {
}
}

return read({ prompt: msg, default: email || '' })
return readWithProgress({ prompt: msg, default: email || '' })
.then((username) => readEmail(msg, username, true))
}
4 changes: 2 additions & 2 deletions mock-registry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
"@npmcli/arborist": "^6.1.1",
"@npmcli/eslint-config": "^4.0.1",
"@npmcli/template-oss": "4.11.3",
"nock": "^13.2.9",
"nock": "^13.3.0",
"npm-package-arg": "^10.1.0",
"pacote": "^15.0.8",
"tap": "^16.3.2"
"tap": "^16.3.4"
}
}
19 changes: 10 additions & 9 deletions node_modules/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@
!/buffer
!/builtins
!/cacache
!/cacache/node_modules/
/cacache/node_modules/*
!/cacache/node_modules/fs-minipass
!/chalk
!/chownr
!/ci-info
Expand Down Expand Up @@ -88,13 +85,13 @@
!/events
!/fastest-levenshtein
!/fs-minipass
!/fs-minipass/node_modules/
/fs-minipass/node_modules/*
!/fs-minipass/node_modules/minipass
!/fs.realpath
!/function-bind
!/gauge
!/glob
!/glob/node_modules/
/glob/node_modules/*
!/glob/node_modules/minimatch
!/graceful-fs
!/has-flag
!/has-unicode
Expand Down Expand Up @@ -186,6 +183,7 @@
!/node-gyp/node_modules/cacache/node_modules/brace-expansion
!/node-gyp/node_modules/cacache/node_modules/glob
!/node-gyp/node_modules/cacache/node_modules/minimatch
!/node-gyp/node_modules/fs-minipass
!/node-gyp/node_modules/gauge
!/node-gyp/node_modules/glob
!/node-gyp/node_modules/make-fetch-happen
Expand Down Expand Up @@ -214,9 +212,6 @@
!/once
!/p-map
!/pacote
!/pacote/node_modules/
/pacote/node_modules/*
!/pacote/node_modules/fs-minipass
!/parse-conflict-json
!/path-is-absolute
!/postcss-selector-parser
Expand Down Expand Up @@ -261,6 +256,12 @@
!/strip-ansi
!/supports-color
!/tar
!/tar/node_modules/
/tar/node_modules/*
!/tar/node_modules/fs-minipass
!/tar/node_modules/fs-minipass/node_modules/
/tar/node_modules/fs-minipass/node_modules/*
!/tar/node_modules/fs-minipass/node_modules/minipass
!/text-table
!/tiny-relative-date
!/treeverse
Expand Down
8 changes: 4 additions & 4 deletions node_modules/@npmcli/map-workspaces/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@npmcli/map-workspaces",
"version": "3.0.1",
"version": "3.0.2",
"main": "lib/index.js",
"files": [
"bin/",
Expand Down Expand Up @@ -43,17 +43,17 @@
},
"devDependencies": {
"@npmcli/eslint-config": "^4.0.0",
"@npmcli/template-oss": "4.11.0",
"@npmcli/template-oss": "4.11.3",
"tap": "^16.0.1"
},
"dependencies": {
"@npmcli/name-from-folder": "^2.0.0",
"glob": "^8.0.1",
"minimatch": "^5.0.1",
"minimatch": "^6.1.6",
"read-package-json-fast": "^3.0.0"
},
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "4.11.0"
"version": "4.11.3"
}
}
53 changes: 0 additions & 53 deletions node_modules/cacache/node_modules/fs-minipass/package.json

This file was deleted.

2 changes: 1 addition & 1 deletion node_modules/ci-info/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016-2022 Thomas Watson Steen
Copyright (c) 2016-2023 Thomas Watson Steen

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
5 changes: 3 additions & 2 deletions node_modules/ci-info/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ vendors.forEach(function (vendor) {
})

exports.isCI = !!(
env.BUILD_ID || // Jenkins, Cloudbees
env.CI !== 'false' && // Bypass all checks if CI env is explicitly set to 'false'
(env.BUILD_ID || // Jenkins, Cloudbees
env.BUILD_NUMBER || // Jenkins, TeamCity
env.CI || // Travis CI, CircleCI, Cirrus CI, Gitlab CI, Appveyor, CodeShip, dsari
env.CI_APP_ID || // Appflow
Expand All @@ -64,7 +65,7 @@ exports.isCI = !!(
env.CONTINUOUS_INTEGRATION || // Travis CI, Cirrus CI
env.RUN_ID || // TaskCluster, dsari
exports.name ||
false
false)
)

function checkEnv (obj) {
Expand Down
8 changes: 7 additions & 1 deletion node_modules/ci-info/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ci-info",
"version": "3.7.0",
"version": "3.7.1",
"description": "Get details about the current Continuous Integration environment",
"main": "index.js",
"typings": "index.d.ts",
Expand All @@ -22,6 +22,12 @@
"index.d.ts",
"CHANGELOG.md"
],
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/sibiraj-s"
}
],
"scripts": {
"lint:fix": "standard --fix",
"test": "standard && node test.js",
Expand Down
Loading