Skip to content
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

deps updates #7937

Merged
merged 16 commits into from
Nov 26, 2024
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
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"devDependencies": {
"@isaacs/string-locale-compare": "^1.1.0",
"@npmcli/eslint-config": "^5.0.1",
"@npmcli/template-oss": "4.23.3",
"@npmcli/template-oss": "4.23.5",
"front-matter": "^4.0.2",
"ignore-walk": "^7.0.0",
"jsdom": "^24.0.0",
Expand Down Expand Up @@ -56,7 +56,7 @@
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"ciVersions": "latest",
"version": "4.23.3",
"version": "4.23.5",
"content": "../scripts/template-oss/index.js",
"workspaceRepo": {
"add": {
Expand Down
4 changes: 2 additions & 2 deletions mock-globals/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "4.23.3",
"version": "4.23.5",
"content": "../scripts/template-oss/index.js"
},
"tap": {
Expand All @@ -50,7 +50,7 @@
},
"devDependencies": {
"@npmcli/eslint-config": "^5.0.1",
"@npmcli/template-oss": "4.23.3",
"@npmcli/template-oss": "4.23.5",
"tap": "^16.3.8"
}
}
4 changes: 2 additions & 2 deletions mock-registry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
},
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "4.23.3",
"version": "4.23.5",
"content": "../scripts/template-oss/index.js"
},
"tap": {
Expand All @@ -48,7 +48,7 @@
"devDependencies": {
"@npmcli/arborist": "^8.0.0",
"@npmcli/eslint-config": "^5.0.1",
"@npmcli/template-oss": "4.23.3",
"@npmcli/template-oss": "4.23.5",
"json-stringify-safe": "^5.0.1",
"nock": "^13.3.3",
"npm-package-arg": "^12.0.0",
Expand Down
6 changes: 3 additions & 3 deletions node_modules/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@
!/cross-spawn/node_modules/which
!/cssesc
!/debug
!/debug/node_modules/
/debug/node_modules/*
!/debug/node_modules/ms
!/diff
!/eastasianwidth
!/emoji-regex
Expand Down Expand Up @@ -120,6 +117,9 @@
!/just-diff
!/lru-cache
!/make-fetch-happen
!/make-fetch-happen/node_modules/
/make-fetch-happen/node_modules/*
!/make-fetch-happen/node_modules/negotiator
!/minimatch
!/minipass-collect
!/minipass-fetch
Expand Down
6 changes: 4 additions & 2 deletions node_modules/@isaacs/cliui/node_modules/ansi-regex/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
export default function ansiRegex({onlyFirst = false} = {}) {
// Valid string terminator sequences are BEL, ESC\, and 0x9c
const ST = '(?:\\u0007|\\u001B\\u005C|\\u009C)';
const pattern = [
'[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
'(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))'
`[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?${ST})`,
'(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))',
].join('|');

return new RegExp(pattern, onlyFirst ? undefined : 'g');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ansi-regex",
"version": "6.0.1",
"version": "6.1.0",
"description": "Regular expression for matching ANSI escape codes",
"license": "MIT",
"repository": "chalk/ansi-regex",
Expand All @@ -12,6 +12,8 @@
},
"type": "module",
"exports": "./index.js",
"types": "./index.d.ts",
"sideEffects": false,
"engines": {
"node": ">=12"
},
Expand Down Expand Up @@ -51,8 +53,9 @@
"pattern"
],
"devDependencies": {
"ansi-escapes": "^5.0.0",
"ava": "^3.15.0",
"tsd": "^0.14.0",
"xo": "^0.38.2"
"tsd": "^0.21.0",
"xo": "^0.54.2"
}
}
2 changes: 1 addition & 1 deletion node_modules/@npmcli/map-workspaces/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ async function mapWorkspaces (opts = {}) {
try {
pkg = await pkgJson.normalize(path.join(opts.cwd, match))
} catch (err) {
if (err.code === 'ENOENT') {
if (err.code === 'ENOENT' || err.code === 'ENOTDIR') {
continue
} else {
throw err
Expand Down
6 changes: 3 additions & 3 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": "4.0.1",
"version": "4.0.2",
"main": "lib/index.js",
"files": [
"bin/",
Expand Down Expand Up @@ -44,7 +44,7 @@
},
"devDependencies": {
"@npmcli/eslint-config": "^5.0.0",
"@npmcli/template-oss": "4.23.3",
"@npmcli/template-oss": "4.23.4",
"tap": "^16.0.1"
},
"dependencies": {
Expand All @@ -55,7 +55,7 @@
},
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "4.23.3",
"version": "4.23.4",
"publish": "true"
}
}
16 changes: 14 additions & 2 deletions node_modules/@npmcli/promise-spawn/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,19 @@ const open = (_args, opts = {}, extra = {}) => {

let platform = process.platform
// process.platform === 'linux' may actually indicate WSL, if that's the case
// we want to treat things as win32 anyway so the host can open the argument
// open the argument with sensible-browser which is pre-installed
// In WSL, set the default browser using, for example,
// export BROWSER="/mnt/c/Program Files (x86)/Google/Chrome/Application/chrome.exe"
// or
// export BROWSER="/mnt/c/Program Files (x86)/Microsoft/Edge/Application/msedge.exe"
// To permanently set the default browser, add the appropriate entry to your shell's
// RC file, e.g. .bashrc or .zshrc.
if (platform === 'linux' && os.release().toLowerCase().includes('microsoft')) {
platform = 'win32'
platform = 'wsl'
if (!process.env.BROWSER) {
return Promise.reject(
new Error('Set the BROWSER environment variable to your desired browser.'))
}
}

let command = options.command
Expand All @@ -146,6 +156,8 @@ const open = (_args, opts = {}, extra = {}) => {
// accidentally interpret the first arg as the title, we stick an empty
// string immediately after the start command
command = 'start ""'
} else if (platform === 'wsl') {
command = 'sensible-browser'
} else if (platform === 'darwin') {
command = 'open'
} else {
Expand Down
6 changes: 3 additions & 3 deletions node_modules/@npmcli/promise-spawn/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@npmcli/promise-spawn",
"version": "8.0.1",
"version": "8.0.2",
"files": [
"bin/",
"lib/"
Expand Down Expand Up @@ -33,7 +33,7 @@
},
"devDependencies": {
"@npmcli/eslint-config": "^5.0.0",
"@npmcli/template-oss": "4.23.3",
"@npmcli/template-oss": "4.23.4",
"spawk": "^1.7.1",
"tap": "^16.0.1"
},
Expand All @@ -42,7 +42,7 @@
},
"templateOSS": {
"//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
"version": "4.23.3",
"version": "4.23.4",
"publish": true
},
"dependencies": {
Expand Down
80 changes: 46 additions & 34 deletions node_modules/ci-info/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Object.defineProperty(exports, '_vendors', {

exports.name = null
exports.isPR = null
exports.id = null

vendors.forEach(function (vendor) {
const envs = Array.isArray(vendor.env) ? vendor.env : [vendor.env]
Expand All @@ -27,45 +28,23 @@ vendors.forEach(function (vendor) {
}

exports.name = vendor.name

switch (typeof vendor.pr) {
case 'string':
// "pr": "CIRRUS_PR"
exports.isPR = !!env[vendor.pr]
break
case 'object':
if ('env' in vendor.pr) {
// "pr": { "env": "BUILDKITE_PULL_REQUEST", "ne": "false" }
exports.isPR = vendor.pr.env in env && env[vendor.pr.env] !== vendor.pr.ne
} else if ('any' in vendor.pr) {
// "pr": { "any": ["ghprbPullId", "CHANGE_ID"] }
exports.isPR = vendor.pr.any.some(function (key) {
return !!env[key]
})
} else {
// "pr": { "DRONE_BUILD_EVENT": "pull_request" }
exports.isPR = checkEnv(vendor.pr)
}
break
default:
// PR detection not supported for this vendor
exports.isPR = null
}
exports.isPR = checkPR(vendor)
exports.id = vendor.constant
})

exports.isCI = !!(
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
env.CI_BUILD_ID || // Appflow
env.CI_BUILD_NUMBER || // Appflow
env.CI_NAME || // Codeship and others
env.CONTINUOUS_INTEGRATION || // Travis CI, Cirrus CI
env.RUN_ID || // TaskCluster, dsari
exports.name ||
false)
env.BUILD_NUMBER || // Jenkins, TeamCity
env.CI || // Travis CI, CircleCI, Cirrus CI, Gitlab CI, Appveyor, CodeShip, dsari
env.CI_APP_ID || // Appflow
env.CI_BUILD_ID || // Appflow
env.CI_BUILD_NUMBER || // Appflow
env.CI_NAME || // Codeship and others
env.CONTINUOUS_INTEGRATION || // Travis CI, Cirrus CI
env.RUN_ID || // TaskCluster, dsari
exports.name ||
false)
)

function checkEnv (obj) {
Expand All @@ -79,12 +58,45 @@ function checkEnv (obj) {
return env[obj.env] && env[obj.env].includes(obj.includes)
// }
}

if ('any' in obj) {
return obj.any.some(function (k) {
return !!env[k]
})
}

return Object.keys(obj).every(function (k) {
return env[k] === obj[k]
})
}

function checkPR (vendor) {
switch (typeof vendor.pr) {
case 'string':
// "pr": "CIRRUS_PR"
return !!env[vendor.pr]
case 'object':
if ('env' in vendor.pr) {
if ('any' in vendor.pr) {
// "pr": { "env": "CODEBUILD_WEBHOOK_EVENT", "any": ["PULL_REQUEST_CREATED", "PULL_REQUEST_UPDATED"] }
return vendor.pr.any.some(function (key) {
return env[vendor.pr.env] === key
})
} else {
// "pr": { "env": "BUILDKITE_PULL_REQUEST", "ne": "false" }
return vendor.pr.env in env && env[vendor.pr.env] !== vendor.pr.ne
}
} else if ('any' in vendor.pr) {
// "pr": { "any": ["ghprbPullId", "CHANGE_ID"] }
return vendor.pr.any.some(function (key) {
return !!env[key]
})
} else {
// "pr": { "DRONE_BUILD_EVENT": "pull_request" }
return checkEnv(vendor.pr)
}
default:
// PR detection not supported for this vendor
return null
}
}
28 changes: 17 additions & 11 deletions node_modules/ci-info/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ci-info",
"version": "4.0.0",
"version": "4.1.0",
"description": "Get details about the current Continuous Integration environment",
"main": "index.js",
"typings": "index.d.ts",
Expand All @@ -9,6 +9,18 @@
"repository": "https://github.com/watson/ci-info.git",
"bugs": "https://github.com/watson/ci-info/issues",
"homepage": "https://github.com/watson/ci-info",
"contributors": [
{
"name": "Sibiraj",
"url": "https://github.com/sibiraj-s"
}
],
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/sibiraj-s"
}
],
"keywords": [
"ci",
"continuous",
Expand All @@ -22,22 +34,16 @@
"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",
"prepare": "husky install"
"prepare": "husky install || true"
},
"devDependencies": {
"clear-module": "^4.1.2",
"husky": "^8.0.3",
"standard": "^17.1.0",
"tape": "^5.7.0"
"husky": "^9.1.6",
"standard": "^17.1.2",
"tape": "^5.9.0"
},
"engines": {
"node": ">=8"
Expand Down
Loading