From fd0f35d6d08a9c45ce65ce8aa8d9a93b1d4bdfb7 Mon Sep 17 00:00:00 2001 From: Gar Date: Fri, 6 Oct 2023 13:48:50 -0700 Subject: [PATCH 1/9] deps: npm-install-checks@6.3.0 --- node_modules/npm-install-checks/lib/index.js | 4 +++- node_modules/npm-install-checks/package.json | 6 +++--- package-lock.json | 8 ++++---- package.json | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/node_modules/npm-install-checks/lib/index.js b/node_modules/npm-install-checks/lib/index.js index f0ba2c07ad081..545472b61dc60 100644 --- a/node_modules/npm-install-checks/lib/index.js +++ b/node_modules/npm-install-checks/lib/index.js @@ -36,7 +36,9 @@ const checkPlatform = (target, force = false, environment = {}) => { let libcFamily = null if (target.libc) { // libc checks only work in linux, any value is a failure if we aren't - if (platform !== 'linux') { + if (environment.libc) { + libcOk = checkList(environment.libc, target.libc) + } else if (platform !== 'linux') { libcOk = false } else { const report = process.report.getReport() diff --git a/node_modules/npm-install-checks/package.json b/node_modules/npm-install-checks/package.json index 50378808d75d0..11a3b87750e25 100644 --- a/node_modules/npm-install-checks/package.json +++ b/node_modules/npm-install-checks/package.json @@ -1,6 +1,6 @@ { "name": "npm-install-checks", - "version": "6.2.0", + "version": "6.3.0", "description": "Check the engines and platform fields in package.json", "main": "lib/index.js", "dependencies": { @@ -8,7 +8,7 @@ }, "devDependencies": { "@npmcli/eslint-config": "^4.0.0", - "@npmcli/template-oss": "4.18.0", + "@npmcli/template-oss": "4.19.0", "tap": "^16.0.1" }, "scripts": { @@ -39,7 +39,7 @@ "author": "GitHub Inc.", "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.18.0", + "version": "4.19.0", "publish": "true" }, "tap": { diff --git a/package-lock.json b/package-lock.json index 5cab4036cb892..710a60cb38f96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -135,7 +135,7 @@ "nopt": "^7.2.0", "normalize-package-data": "^6.0.0", "npm-audit-report": "^5.0.0", - "npm-install-checks": "^6.2.0", + "npm-install-checks": "^6.3.0", "npm-package-arg": "^11.0.1", "npm-pick-manifest": "^9.0.0", "npm-profile": "^9.0.0", @@ -10845,9 +10845,9 @@ } }, "node_modules/npm-install-checks": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.2.0.tgz", - "integrity": "sha512-744wat5wAAHsxa4590mWO0tJ8PKxR8ORZsH9wGpQc3nWTzozMAgBN/XyqYw7mg3yqLM8dLwEnwSfKMmXAjF69g==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", + "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", "inBundle": true, "dependencies": { "semver": "^7.1.1" diff --git a/package.json b/package.json index 3246377f0cb72..135489d0b6ba0 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "nopt": "^7.2.0", "normalize-package-data": "^6.0.0", "npm-audit-report": "^5.0.0", - "npm-install-checks": "^6.2.0", + "npm-install-checks": "^6.3.0", "npm-package-arg": "^11.0.1", "npm-pick-manifest": "^9.0.0", "npm-profile": "^9.0.0", From 2949da5e619d4f77edf621c4e169e8554aa3e61b Mon Sep 17 00:00:00 2001 From: Gar Date: Fri, 6 Oct 2023 13:50:15 -0700 Subject: [PATCH 2/9] deps: ci-info@3.9.0 --- node_modules/ci-info/LICENSE | 2 +- node_modules/ci-info/package.json | 8 ++++---- node_modules/ci-info/vendors.json | 9 ++++++--- package-lock.json | 8 ++++---- package.json | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/node_modules/ci-info/LICENSE b/node_modules/ci-info/LICENSE index 44ca33aa611e7..95f61daaaf485 100644 --- a/node_modules/ci-info/LICENSE +++ b/node_modules/ci-info/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016-2023 Thomas Watson Steen +Copyright (c) 2016 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 diff --git a/node_modules/ci-info/package.json b/node_modules/ci-info/package.json index 3edae7417a33e..8d3ff0030cc91 100644 --- a/node_modules/ci-info/package.json +++ b/node_modules/ci-info/package.json @@ -1,6 +1,6 @@ { "name": "ci-info", - "version": "3.8.0", + "version": "3.9.0", "description": "Get details about the current Continuous Integration environment", "main": "index.js", "typings": "index.d.ts", @@ -35,9 +35,9 @@ }, "devDependencies": { "clear-module": "^4.1.2", - "husky": "^8.0.2", - "standard": "^17.0.0", - "tape": "^5.6.1" + "husky": "^8.0.3", + "standard": "^17.1.0", + "tape": "^5.7.0" }, "engines": { "node": ">=8" diff --git a/node_modules/ci-info/vendors.json b/node_modules/ci-info/vendors.json index 213711755273a..7bedd96a7972f 100644 --- a/node_modules/ci-info/vendors.json +++ b/node_modules/ci-info/vendors.json @@ -18,8 +18,10 @@ { "name": "Azure Pipelines", "constant": "AZURE_PIPELINES", - "env": "SYSTEM_TEAMFOUNDATIONCOLLECTIONURI", - "pr": "SYSTEM_PULLREQUEST_PULLREQUESTID" + "env": "TF_BUILD", + "pr": { + "BUILD_REASON": "PullRequest" + } }, { "name": "Bamboo", @@ -287,7 +289,8 @@ "NOW_BUILDER", "VERCEL" ] - } + }, + "pr": "VERCEL_GIT_PULL_REQUEST_ID" }, { "name": "Visual Studio App Center", diff --git a/package-lock.json b/package-lock.json index 710a60cb38f96..ecc56c5304c8c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,7 +102,7 @@ "archy": "~1.0.0", "cacache": "^18.0.0", "chalk": "^5.3.0", - "ci-info": "^3.8.0", + "ci-info": "^3.9.0", "cli-columns": "^4.0.0", "cli-table3": "^0.6.3", "columnify": "^1.6.0", @@ -4456,9 +4456,9 @@ } }, "node_modules/ci-info": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", - "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", "funding": [ { "type": "github", diff --git a/package.json b/package.json index 135489d0b6ba0..65b7e776d822f 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "archy": "~1.0.0", "cacache": "^18.0.0", "chalk": "^5.3.0", - "ci-info": "^3.8.0", + "ci-info": "^3.9.0", "cli-columns": "^4.0.0", "cli-table3": "^0.6.3", "columnify": "^1.6.0", From 1b21c2bb643f60ce2360887f6bfb6df5dae5db3e Mon Sep 17 00:00:00 2001 From: Gar Date: Fri, 6 Oct 2023 13:51:43 -0700 Subject: [PATCH 3/9] deps: are-we-there-yet@4.0.1 --- .../are-we-there-yet/lib/tracker-base.js | 18 +- .../are-we-there-yet/lib/tracker-group.js | 184 +++++++++--------- .../are-we-there-yet/lib/tracker-stream.js | 46 ++--- node_modules/are-we-there-yet/lib/tracker.js | 50 ++--- node_modules/are-we-there-yet/package.json | 9 +- package-lock.json | 6 +- 6 files changed, 158 insertions(+), 155 deletions(-) diff --git a/node_modules/are-we-there-yet/lib/tracker-base.js b/node_modules/are-we-there-yet/lib/tracker-base.js index 6f436875578a7..1b5e0dc30c49b 100644 --- a/node_modules/are-we-there-yet/lib/tracker-base.js +++ b/node_modules/are-we-there-yet/lib/tracker-base.js @@ -1,11 +1,13 @@ 'use strict' -var EventEmitter = require('events').EventEmitter -var util = require('util') +const EventEmitter = require('events') -var trackerId = 0 -var TrackerBase = module.exports = function (name) { - EventEmitter.call(this) - this.id = ++trackerId - this.name = name +let trackerId = 0 +class TrackerBase extends EventEmitter { + constructor (name) { + super() + this.id = ++trackerId + this.name = name + } } -util.inherits(TrackerBase, EventEmitter) + +module.exports = TrackerBase diff --git a/node_modules/are-we-there-yet/lib/tracker-group.js b/node_modules/are-we-there-yet/lib/tracker-group.js index a3c7af804c4d3..162c22584cdc5 100644 --- a/node_modules/are-we-there-yet/lib/tracker-group.js +++ b/node_modules/are-we-there-yet/lib/tracker-group.js @@ -1,116 +1,112 @@ 'use strict' -var util = require('util') -var TrackerBase = require('./tracker-base.js') -var Tracker = require('./tracker.js') -var TrackerStream = require('./tracker-stream.js') +const TrackerBase = require('./tracker-base.js') +const Tracker = require('./tracker.js') +const TrackerStream = require('./tracker-stream.js') -var TrackerGroup = module.exports = function (name) { - TrackerBase.call(this, name) - this.parentGroup = null - this.trackers = [] - this.completion = {} - this.weight = {} - this.totalWeight = 0 - this.finished = false - this.bubbleChange = bubbleChange(this) -} -util.inherits(TrackerGroup, TrackerBase) +class TrackerGroup extends TrackerBase { + parentGroup = null + trackers = [] + completion = {} + weight = {} + totalWeight = 0 + finished = false + bubbleChange = bubbleChange(this) -function bubbleChange (trackerGroup) { - return function (name, completed, tracker) { - trackerGroup.completion[tracker.id] = completed - if (trackerGroup.finished) { - return + nameInTree () { + var names = [] + var from = this + while (from) { + names.unshift(from.name) + from = from.parentGroup } - trackerGroup.emit('change', name || trackerGroup.name, trackerGroup.completed(), trackerGroup) + return names.join('/') } -} -TrackerGroup.prototype.nameInTree = function () { - var names = [] - var from = this - while (from) { - names.unshift(from.name) - from = from.parentGroup - } - return names.join('/') -} - -TrackerGroup.prototype.addUnit = function (unit, weight) { - if (unit.addUnit) { - var toTest = this - while (toTest) { - if (unit === toTest) { - throw new Error( - 'Attempted to add tracker group ' + - unit.name + ' to tree that already includes it ' + - this.nameInTree(this)) + addUnit (unit, weight) { + if (unit.addUnit) { + var toTest = this + while (toTest) { + if (unit === toTest) { + throw new Error( + 'Attempted to add tracker group ' + + unit.name + ' to tree that already includes it ' + + this.nameInTree(this)) + } + toTest = toTest.parentGroup } - toTest = toTest.parentGroup + unit.parentGroup = this } - unit.parentGroup = this + this.weight[unit.id] = weight || 1 + this.totalWeight += this.weight[unit.id] + this.trackers.push(unit) + this.completion[unit.id] = unit.completed() + unit.on('change', this.bubbleChange) + if (!this.finished) { + this.emit('change', unit.name, this.completion[unit.id], unit) + } + return unit } - this.weight[unit.id] = weight || 1 - this.totalWeight += this.weight[unit.id] - this.trackers.push(unit) - this.completion[unit.id] = unit.completed() - unit.on('change', this.bubbleChange) - if (!this.finished) { - this.emit('change', unit.name, this.completion[unit.id], unit) + + completed () { + if (this.trackers.length === 0) { + return 0 + } + var valPerWeight = 1 / this.totalWeight + var completed = 0 + for (var ii = 0; ii < this.trackers.length; ii++) { + var trackerId = this.trackers[ii].id + completed += + valPerWeight * this.weight[trackerId] * this.completion[trackerId] + } + return completed } - return unit -} -TrackerGroup.prototype.completed = function () { - if (this.trackers.length === 0) { - return 0 + newGroup (name, weight) { + return this.addUnit(new TrackerGroup(name), weight) } - var valPerWeight = 1 / this.totalWeight - var completed = 0 - for (var ii = 0; ii < this.trackers.length; ii++) { - var trackerId = this.trackers[ii].id - completed += - valPerWeight * this.weight[trackerId] * this.completion[trackerId] + + newItem (name, todo, weight) { + return this.addUnit(new Tracker(name, todo), weight) } - return completed -} -TrackerGroup.prototype.newGroup = function (name, weight) { - return this.addUnit(new TrackerGroup(name), weight) -} + newStream (name, todo, weight) { + return this.addUnit(new TrackerStream(name, todo), weight) + } -TrackerGroup.prototype.newItem = function (name, todo, weight) { - return this.addUnit(new Tracker(name, todo), weight) -} + finish () { + this.finished = true + if (!this.trackers.length) { + this.addUnit(new Tracker(), 1, true) + } + for (var ii = 0; ii < this.trackers.length; ii++) { + var tracker = this.trackers[ii] + tracker.finish() + tracker.removeListener('change', this.bubbleChange) + } + this.emit('change', this.name, 1, this) + } -TrackerGroup.prototype.newStream = function (name, todo, weight) { - return this.addUnit(new TrackerStream(name, todo), weight) -} + debug (depth = 0) { + const indent = ' '.repeat(depth) + let output = `${indent}${this.name || 'top'}: ${this.completed()}\n` -TrackerGroup.prototype.finish = function () { - this.finished = true - if (!this.trackers.length) { - this.addUnit(new Tracker(), 1, true) - } - for (var ii = 0; ii < this.trackers.length; ii++) { - var tracker = this.trackers[ii] - tracker.finish() - tracker.removeListener('change', this.bubbleChange) + this.trackers.forEach(function (tracker) { + output += tracker instanceof TrackerGroup + ? tracker.debug(depth + 1) + : `${indent} ${tracker.name}: ${tracker.completed()}\n` + }) + return output } - this.emit('change', this.name, 1, this) } -var buffer = ' ' -TrackerGroup.prototype.debug = function (depth) { - depth = depth || 0 - var indent = depth ? buffer.slice(0, depth) : '' - var output = indent + (this.name || 'top') + ': ' + this.completed() + '\n' - this.trackers.forEach(function (tracker) { - if (tracker instanceof TrackerGroup) { - output += tracker.debug(depth + 1) - } else { - output += indent + ' ' + tracker.name + ': ' + tracker.completed() + '\n' +function bubbleChange (trackerGroup) { + return function (name, completed, tracker) { + trackerGroup.completion[tracker.id] = completed + if (trackerGroup.finished) { + return } - }) - return output + trackerGroup.emit('change', name || trackerGroup.name, trackerGroup.completed(), trackerGroup) + } } + +module.exports = TrackerGroup diff --git a/node_modules/are-we-there-yet/lib/tracker-stream.js b/node_modules/are-we-there-yet/lib/tracker-stream.js index e1cf85055702a..4b111b6bae8a8 100644 --- a/node_modules/are-we-there-yet/lib/tracker-stream.js +++ b/node_modules/are-we-there-yet/lib/tracker-stream.js @@ -1,17 +1,28 @@ 'use strict' -var util = require('util') -var stream = require('readable-stream') -var delegate = require('delegates') -var Tracker = require('./tracker.js') +const stream = require('readable-stream') +const delegate = require('delegates') +const Tracker = require('./tracker.js') -var TrackerStream = module.exports = function (name, size, options) { - stream.Transform.call(this, options) - this.tracker = new Tracker(name, size) - this.name = name - this.id = this.tracker.id - this.tracker.on('change', delegateChange(this)) +class TrackerStream extends stream.Transform { + constructor (name, size, options) { + super(options) + this.tracker = new Tracker(name, size) + this.name = name + this.id = this.tracker.id + this.tracker.on('change', delegateChange(this)) + } + + _transform (data, encoding, cb) { + this.tracker.completeWork(data.length ? data.length : 1) + this.push(data) + cb() + } + + _flush (cb) { + this.tracker.finish() + cb() + } } -util.inherits(TrackerStream, stream.Transform) function delegateChange (trackerStream) { return function (name, completion, tracker) { @@ -19,18 +30,9 @@ function delegateChange (trackerStream) { } } -TrackerStream.prototype._transform = function (data, encoding, cb) { - this.tracker.completeWork(data.length ? data.length : 1) - this.push(data) - cb() -} - -TrackerStream.prototype._flush = function (cb) { - this.tracker.finish() - cb() -} - delegate(TrackerStream.prototype, 'tracker') .method('completed') .method('addWork') .method('finish') + +module.exports = TrackerStream diff --git a/node_modules/are-we-there-yet/lib/tracker.js b/node_modules/are-we-there-yet/lib/tracker.js index a8f8b3ba01391..02e879ce6e3e2 100644 --- a/node_modules/are-we-there-yet/lib/tracker.js +++ b/node_modules/are-we-there-yet/lib/tracker.js @@ -1,32 +1,34 @@ 'use strict' -var util = require('util') -var TrackerBase = require('./tracker-base.js') +const TrackerBase = require('./tracker-base.js') -var Tracker = module.exports = function (name, todo) { - TrackerBase.call(this, name) - this.workDone = 0 - this.workTodo = todo || 0 -} -util.inherits(Tracker, TrackerBase) +class Tracker extends TrackerBase { + constructor (name, todo) { + super(name) + this.workDone = 0 + this.workTodo = todo || 0 + } -Tracker.prototype.completed = function () { - return this.workTodo === 0 ? 0 : this.workDone / this.workTodo -} + completed () { + return this.workTodo === 0 ? 0 : this.workDone / this.workTodo + } -Tracker.prototype.addWork = function (work) { - this.workTodo += work - this.emit('change', this.name, this.completed(), this) -} + addWork (work) { + this.workTodo += work + this.emit('change', this.name, this.completed(), this) + } -Tracker.prototype.completeWork = function (work) { - this.workDone += work - if (this.workDone > this.workTodo) { - this.workDone = this.workTodo + completeWork (work) { + this.workDone += work + if (this.workDone > this.workTodo) { + this.workDone = this.workTodo + } + this.emit('change', this.name, this.completed(), this) } - this.emit('change', this.name, this.completed(), this) -} -Tracker.prototype.finish = function () { - this.workTodo = this.workDone = 1 - this.emit('change', this.name, 1, this) + finish () { + this.workTodo = this.workDone = 1 + this.emit('change', this.name, 1, this) + } } + +module.exports = Tracker diff --git a/node_modules/are-we-there-yet/package.json b/node_modules/are-we-there-yet/package.json index 919cb9a1dc5a7..e238c6581df66 100644 --- a/node_modules/are-we-there-yet/package.json +++ b/node_modules/are-we-there-yet/package.json @@ -1,6 +1,6 @@ { "name": "are-we-there-yet", - "version": "4.0.0", + "version": "4.0.1", "description": "Keep track of the overall completion of many disparate processes", "main": "lib/index.js", "scripts": { @@ -24,8 +24,8 @@ }, "homepage": "https://github.com/npm/are-we-there-yet", "devDependencies": { - "@npmcli/eslint-config": "^3.0.1", - "@npmcli/template-oss": "4.5.1", + "@npmcli/eslint-config": "^4.0.0", + "@npmcli/template-oss": "4.17.0", "tap": "^16.0.1" }, "dependencies": { @@ -51,6 +51,7 @@ }, "templateOSS": { "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.", - "version": "4.5.1" + "version": "4.17.0", + "publish": true } } diff --git a/package-lock.json b/package-lock.json index ecc56c5304c8c..bf787663eadb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3765,9 +3765,9 @@ "inBundle": true }, "node_modules/are-we-there-yet": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.0.tgz", - "integrity": "sha512-nSXlV+u3vtVjRgihdTzbfWYzxPWGo424zPgQbHD0ZqIla3jqYAewDcvee0Ua2hjS5IfTAmjGlx1Jf0PKwjZDEw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-4.0.1.tgz", + "integrity": "sha512-2zuA+jpOYBRgoBCfa+fB87Rk0oGJjDX6pxGzqH6f33NzUhG25Xur6R0u0Z9VVAq8Z5JvQpQI6j6rtonuivC8QA==", "inBundle": true, "dependencies": { "delegates": "^1.0.0", From 3fcc163a5aa74d514b31c25a7b6ce705b7fdcb46 Mon Sep 17 00:00:00 2001 From: Gar Date: Fri, 6 Oct 2023 13:52:41 -0700 Subject: [PATCH 4/9] deps: https-proxy-agent@7.0.2 --- .../agent/node_modules/https-proxy-agent/dist/index.js | 6 +++++- .../https-proxy-agent/dist/parse-proxy-response.js | 5 ++++- .../agent/node_modules/https-proxy-agent/package.json | 2 +- package-lock.json | 6 +++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/node_modules/@npmcli/agent/node_modules/https-proxy-agent/dist/index.js b/node_modules/@npmcli/agent/node_modules/https-proxy-agent/dist/index.js index e3bbfe632c454..978af031baf3a 100644 --- a/node_modules/@npmcli/agent/node_modules/https-proxy-agent/dist/index.js +++ b/node_modules/@npmcli/agent/node_modules/https-proxy-agent/dist/index.js @@ -81,7 +81,11 @@ class HttpsProxyAgent extends agent_base_1.Agent { let socket; if (proxy.protocol === 'https:') { debug('Creating `tls.Socket`: %o', this.connectOpts); - socket = tls.connect(this.connectOpts); + const servername = this.connectOpts.servername || this.connectOpts.host; + socket = tls.connect({ + ...this.connectOpts, + servername: servername && net.isIP(servername) ? undefined : servername + }); } else { debug('Creating `net.Socket`: %o', this.connectOpts); diff --git a/node_modules/@npmcli/agent/node_modules/https-proxy-agent/dist/parse-proxy-response.js b/node_modules/@npmcli/agent/node_modules/https-proxy-agent/dist/parse-proxy-response.js index a28f1d811805f..d3f506f941306 100644 --- a/node_modules/@npmcli/agent/node_modules/https-proxy-agent/dist/parse-proxy-response.js +++ b/node_modules/@npmcli/agent/node_modules/https-proxy-agent/dist/parse-proxy-response.js @@ -47,7 +47,10 @@ function parseProxyResponse(socket) { read(); return; } - const headerParts = buffered.slice(0, endOfHeaders).toString('ascii').split('\r\n'); + const headerParts = buffered + .slice(0, endOfHeaders) + .toString('ascii') + .split('\r\n'); const firstLine = headerParts.shift(); if (!firstLine) { socket.destroy(); diff --git a/node_modules/@npmcli/agent/node_modules/https-proxy-agent/package.json b/node_modules/@npmcli/agent/node_modules/https-proxy-agent/package.json index fc5f988d3b02b..07c04f82a9c3a 100644 --- a/node_modules/@npmcli/agent/node_modules/https-proxy-agent/package.json +++ b/node_modules/@npmcli/agent/node_modules/https-proxy-agent/package.json @@ -1,6 +1,6 @@ { "name": "https-proxy-agent", - "version": "7.0.1", + "version": "7.0.2", "description": "An HTTP(s) proxy `http.Agent` implementation for HTTPS", "main": "./dist/index.js", "types": "./dist/index.d.ts", diff --git a/package-lock.json b/package-lock.json index bf787663eadb7..3578fb5d3ef23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2420,9 +2420,9 @@ } }, "node_modules/@npmcli/agent/node_modules/https-proxy-agent": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz", - "integrity": "sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", + "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==", "inBundle": true, "dependencies": { "agent-base": "^7.0.2", From 3b8842501d1ebc5e96bd20fb7a7457d1a786f048 Mon Sep 17 00:00:00 2001 From: Gar Date: Fri, 6 Oct 2023 13:53:31 -0700 Subject: [PATCH 5/9] deps: is-core-module@2.13.0 --- node_modules/is-core-module/core.json | 6 +++--- node_modules/is-core-module/package.json | 10 +++++----- package-lock.json | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/node_modules/is-core-module/core.json b/node_modules/is-core-module/core.json index af29f0b734b22..3cda693d7d0fd 100644 --- a/node_modules/is-core-module/core.json +++ b/node_modules/is-core-module/core.json @@ -115,7 +115,7 @@ "sys": [">= 0.4 && < 0.7", ">= 0.8"], "node:sys": [">= 14.18 && < 15", ">= 16"], "test/reporters": ">= 19.9 && < 20.2", - "node:test/reporters": [">= 19.9", ">= 20"], + "node:test/reporters": [">= 18.17 && < 19", ">= 19.9", ">= 20"], "node:test": [">= 16.17 && < 17", ">= 18"], "timers": true, "node:timers": [">= 14.18 && < 15", ">= 16"], @@ -149,8 +149,8 @@ "node:v8": [">= 14.18 && < 15", ">= 16"], "vm": true, "node:vm": [">= 14.18 && < 15", ">= 16"], - "wasi": [">= 13.4 && < 13.5", ">= 20"], - "node:wasi": ">= 20", + "wasi": [">= 13.4 && < 13.5", ">= 18.17 && < 19", ">= 20"], + "node:wasi": [">= 18.17 && < 19", ">= 20"], "worker_threads": ">= 11.7", "node:worker_threads": [">= 14.18 && < 15", ">= 16"], "zlib": ">= 0.5", diff --git a/node_modules/is-core-module/package.json b/node_modules/is-core-module/package.json index 62bb065e8364a..1269c80c5520d 100644 --- a/node_modules/is-core-module/package.json +++ b/node_modules/is-core-module/package.json @@ -1,6 +1,6 @@ { "name": "is-core-module", - "version": "2.12.1", + "version": "2.13.0", "description": "Is this specifier a node.js core module?", "main": "index.js", "sideEffects": false, @@ -45,8 +45,8 @@ "has": "^1.0.3" }, "devDependencies": { - "@ljharb/eslint-config": "^21.0.1", - "aud": "^2.0.2", + "@ljharb/eslint-config": "^21.1.0", + "aud": "^2.0.3", "auto-changelog": "^2.4.0", "eslint": "=8.8.0", "in-publish": "^2.0.1", @@ -54,8 +54,8 @@ "npmignore": "^0.3.0", "nyc": "^10.3.2", "safe-publish-latest": "^2.0.0", - "semver": "^6.3.0", - "tape": "^5.6.3" + "semver": "^6.3.1", + "tape": "^5.6.6" }, "auto-changelog": { "output": "CHANGELOG.md", diff --git a/package-lock.json b/package-lock.json index 3578fb5d3ef23..d0579286a6699 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7493,9 +7493,9 @@ } }, "node_modules/is-core-module": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz", - "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", "inBundle": true, "dependencies": { "has": "^1.0.3" From 450eb82f40aaa0d1a62930a2f44b7a134d3ea3d1 Mon Sep 17 00:00:00 2001 From: Gar Date: Fri, 6 Oct 2023 13:55:29 -0700 Subject: [PATCH 6/9] deps: minipass@7.0.4 --- .../minipass/dist/cjs/package.json | 3 - .../minipass/dist/{cjs => commonjs}/index.js | 0 .../minipass/dist/commonjs/package.json | 1 + .../minipass/dist/{mjs => esm}/index.js | 0 .../minipass/dist/esm/package.json | 1 + .../minipass/dist/mjs/package.json | 3 - .../node_modules/minipass/package.json | 66 +++++++++---------- package-lock.json | 6 +- 8 files changed, 38 insertions(+), 42 deletions(-) delete mode 100644 node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/cjs/package.json rename node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/{cjs => commonjs}/index.js (100%) create mode 100644 node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/commonjs/package.json rename node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/{mjs => esm}/index.js (100%) create mode 100644 node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/esm/package.json delete mode 100644 node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/mjs/package.json diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/cjs/package.json b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/cjs/package.json deleted file mode 100644 index 5bbefffbabee3..0000000000000 --- a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/cjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "commonjs" -} diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/cjs/index.js b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/commonjs/index.js similarity index 100% rename from node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/cjs/index.js rename to node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/commonjs/index.js diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/commonjs/package.json b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/commonjs/package.json new file mode 100644 index 0000000000000..0292b9956f2e4 --- /dev/null +++ b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/commonjs/package.json @@ -0,0 +1 @@ +{"type":"commonjs"} \ No newline at end of file diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/mjs/index.js b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/esm/index.js similarity index 100% rename from node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/mjs/index.js rename to node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/esm/index.js diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/esm/package.json b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/esm/package.json new file mode 100644 index 0000000000000..7c34deb5837d8 --- /dev/null +++ b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/esm/package.json @@ -0,0 +1 @@ +{"type":"module"} \ No newline at end of file diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/mjs/package.json b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/mjs/package.json deleted file mode 100644 index 3dbc1ca591c05..0000000000000 --- a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/dist/mjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "module" -} diff --git a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/package.json b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/package.json index 6faaa247a5bc6..4398347289164 100644 --- a/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/package.json +++ b/node_modules/node-gyp/node_modules/cacache/node_modules/minipass/package.json @@ -1,22 +1,29 @@ { "name": "minipass", - "version": "7.0.3", + "version": "7.0.4", "description": "minimal implementation of a PassThrough stream", - "main": "./dist/cjs/index.js", - "module": "./dist/mjs/index.js", - "types": "./dist/cjs/index.js", + "main": "./dist/commonjs/index.js", + "types": "./dist/commonjs/index.d.ts", + "type": "module", + "tshy": { + "main": true, + "exports": { + "./package.json": "./package.json", + ".": "./src/index.ts" + } + }, "exports": { + "./package.json": "./package.json", ".": { "import": { - "types": "./dist/mjs/index.d.ts", - "default": "./dist/mjs/index.js" + "types": "./dist/esm/index.d.ts", + "default": "./dist/esm/index.js" }, "require": { - "types": "./dist/cjs/index.d.ts", - "default": "./dist/cjs/index.js" + "types": "./dist/commonjs/index.d.ts", + "default": "./dist/commonjs/index.js" } - }, - "./package.json": "./package.json" + } }, "files": [ "dist" @@ -25,24 +32,13 @@ "preversion": "npm test", "postversion": "npm publish", "prepublishOnly": "git push origin --follow-tags", - "preprepare": "rm -rf dist", - "prepare": "tsc -p tsconfig.json && tsc -p tsconfig-esm.json && bash ./scripts/fixup.sh", + "prepare": "tshy", "pretest": "npm run prepare", "presnap": "npm run prepare", - "test": "c8 tap", - "snap": "c8 tap", + "test": "tap", + "snap": "tap", "format": "prettier --write . --loglevel warn", - "typedoc": "typedoc --tsconfig tsconfig-esm.json ./src/*.ts" - }, - "tap": { - "coverage": false, - "node-arg": [ - "--enable-source-maps", - "--no-warnings", - "--loader", - "ts-node/esm" - ], - "ts": false + "typedoc": "typedoc --tsconfig .tshy/esm.json ./src/*.ts" }, "prettier": { "semi": false, @@ -56,18 +52,17 @@ "endOfLine": "lf" }, "devDependencies": { + "@types/end-of-stream": "^1.4.2", "@types/node": "^20.1.2", - "@types/tap": "^15.0.8", - "c8": "^7.13.0", - "prettier": "^2.6.2", - "tap": "^16.3.0", - "ts-node": "^10.9.1", - "typedoc": "^0.24.8", - "typescript": "^5.1.3", "end-of-stream": "^1.4.0", "node-abort-controller": "^3.1.1", + "prettier": "^2.6.2", "sync-content": "^1.0.2", - "through2": "^2.0.3" + "tap": "^18.3.0", + "through2": "^2.0.3", + "tshy": "^1.2.2", + "typedoc": "^0.25.1", + "typescript": "^5.2.2" }, "repository": "https://github.com/isaacs/minipass", "keywords": [ @@ -78,5 +73,10 @@ "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" + }, + "tap": { + "include": [ + "test/*.ts" + ] } } diff --git a/package-lock.json b/package-lock.json index d0579286a6699..7ad536ff4d1e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10588,9 +10588,9 @@ } }, "node_modules/node-gyp/node_modules/cacache/node_modules/minipass": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz", - "integrity": "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "inBundle": true, "engines": { "node": ">=16 || 14 >=14.17" From 96aadc0ced5c4e3ce258dd7279ebe2093eb18863 Mon Sep 17 00:00:00 2001 From: Gar Date: Fri, 6 Oct 2023 13:57:13 -0700 Subject: [PATCH 7/9] deps: readable-stream@4.4.2 --- node_modules/readable-stream/lib/stream/promises.js | 2 +- node_modules/readable-stream/package.json | 6 ++++-- package-lock.json | 9 +++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/node_modules/readable-stream/lib/stream/promises.js b/node_modules/readable-stream/lib/stream/promises.js index b85c51f47f1ce..5d4ce15f4904b 100644 --- a/node_modules/readable-stream/lib/stream/promises.js +++ b/node_modules/readable-stream/lib/stream/promises.js @@ -4,7 +4,7 @@ const { ArrayPrototypePop, Promise } = require('../ours/primordials') const { isIterable, isNodeStream, isWebStream } = require('../internal/streams/utils') const { pipelineImpl: pl } = require('../internal/streams/pipeline') const { finished } = require('../internal/streams/end-of-stream') -require('stream') +require('../../lib/stream.js') function pipeline(...streams) { return new Promise((resolve, reject) => { let signal diff --git a/node_modules/readable-stream/package.json b/node_modules/readable-stream/package.json index c4f6504cc7cc6..289f3a45a634f 100644 --- a/node_modules/readable-stream/package.json +++ b/node_modules/readable-stream/package.json @@ -1,6 +1,6 @@ { "name": "readable-stream", - "version": "4.4.0", + "version": "4.4.2", "description": "Node.js Streams, a user-land copy of the stream library from Node.js", "homepage": "https://github.com/nodejs/readable-stream", "license": "MIT", @@ -39,6 +39,7 @@ "test:prepare": "node test/browser/runner-prepare.mjs", "test:browsers": "node test/browser/runner-browser.mjs", "test:bundlers": "node test/browser/runner-node.mjs", + "test:readable-stream-only": "node readable-stream-test/runner-prepare.mjs", "coverage": "c8 -c ./c8.json tap --rcfile=./tap.yml test/parallel/test-*.js test/ours/test-*.js", "format": "prettier -w src lib test", "lint": "eslint src" @@ -47,7 +48,8 @@ "abort-controller": "^3.0.0", "buffer": "^6.0.3", "events": "^3.3.0", - "process": "^0.11.10" + "process": "^0.11.10", + "string_decoder": "^1.3.0" }, "devDependencies": { "@babel/core": "^7.17.10", diff --git a/package-lock.json b/package-lock.json index 7ad536ff4d1e7..bf6ab69466c5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12161,15 +12161,16 @@ } }, "node_modules/readable-stream": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.0.tgz", - "integrity": "sha512-kDMOq0qLtxV9f/SQv522h8cxZBqNZXuXNyjyezmfAAuribMyVXziljpQ/uQhfE1XLg2/TLTW2DsnoE4VAi/krg==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.2.tgz", + "integrity": "sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==", "inBundle": true, "dependencies": { "abort-controller": "^3.0.0", "buffer": "^6.0.3", "events": "^3.3.0", - "process": "^0.11.10" + "process": "^0.11.10", + "string_decoder": "^1.3.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" From c8d7d0e7c9dc373a4f59ba483e856a3b867b6fd8 Mon Sep 17 00:00:00 2001 From: Gar Date: Fri, 6 Oct 2023 13:59:11 -0700 Subject: [PATCH 8/9] deps: socks-proxy-agent@8.0.2 --- .../agent/node_modules/socks-proxy-agent/dist/index.js | 3 ++- .../agent/node_modules/socks-proxy-agent/package.json | 10 +++++----- package-lock.json | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/node_modules/@npmcli/agent/node_modules/socks-proxy-agent/dist/index.js b/node_modules/@npmcli/agent/node_modules/socks-proxy-agent/dist/index.js index 8189e014c13a0..102ecd64c0b9d 100644 --- a/node_modules/@npmcli/agent/node_modules/socks-proxy-agent/dist/index.js +++ b/node_modules/@npmcli/agent/node_modules/socks-proxy-agent/dist/index.js @@ -33,6 +33,7 @@ const debug_1 = __importDefault(require("debug")); const dns = __importStar(require("dns")); const net = __importStar(require("net")); const tls = __importStar(require("tls")); +const url_1 = require("url"); const debug = (0, debug_1.default)('socks-proxy-agent'); function parseSocksURL(url) { let lookup = false; @@ -88,7 +89,7 @@ function parseSocksURL(url) { class SocksProxyAgent extends agent_base_1.Agent { constructor(uri, opts) { super(opts); - const url = typeof uri === 'string' ? new URL(uri) : uri; + const url = typeof uri === 'string' ? new url_1.URL(uri) : uri; const { proxy, lookup } = parseSocksURL(url); this.shouldLookup = lookup; this.proxy = proxy; diff --git a/node_modules/@npmcli/agent/node_modules/socks-proxy-agent/package.json b/node_modules/@npmcli/agent/node_modules/socks-proxy-agent/package.json index a6c7c0741641a..6e1c2c12de367 100644 --- a/node_modules/@npmcli/agent/node_modules/socks-proxy-agent/package.json +++ b/node_modules/@npmcli/agent/node_modules/socks-proxy-agent/package.json @@ -1,6 +1,6 @@ { "name": "socks-proxy-agent", - "version": "8.0.1", + "version": "8.0.2", "description": "A SOCKS proxy `http.Agent` implementation for HTTP and HTTPS", "main": "./dist/index.js", "types": "./dist/index.d.ts", @@ -107,7 +107,7 @@ "socks5h" ], "dependencies": { - "agent-base": "^7.0.1", + "agent-base": "^7.0.2", "debug": "^4.3.4", "socks": "^2.7.1" }, @@ -117,7 +117,7 @@ "@types/dns2": "^2.0.3", "@types/jest": "^29.5.1", "@types/node": "^14.18.45", - "async-listen": "^2.1.0", + "async-listen": "^3.0.0", "async-retry": "^1.3.3", "cacheable-lookup": "^6.1.0", "dns2": "^2.1.0", @@ -125,8 +125,8 @@ "socksv5": "github:TooTallNate/socksv5#fix/dstSock-close-event", "ts-jest": "^29.1.0", "typescript": "^5.0.4", - "tsconfig": "0.0.0", - "proxy": "2.0.1" + "proxy": "2.1.1", + "tsconfig": "0.0.0" }, "engines": { "node": ">= 14" diff --git a/package-lock.json b/package-lock.json index bf6ab69466c5a..68632df20d271 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2433,12 +2433,12 @@ } }, "node_modules/@npmcli/agent/node_modules/socks-proxy-agent": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.1.tgz", - "integrity": "sha512-59EjPbbgg8U3x62hhKOFVAmySQUcfRQ4C7Q/D5sEHnZTQRrQlNKINks44DMR1gwXp0p4LaVIeccX2KHTTcHVqQ==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz", + "integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==", "inBundle": true, "dependencies": { - "agent-base": "^7.0.1", + "agent-base": "^7.0.2", "debug": "^4.3.4", "socks": "^2.7.1" }, From 7bfa8d3cceab34dbc5f5bd2fd6df2e8a3078d866 Mon Sep 17 00:00:00 2001 From: Gar Date: Fri, 6 Oct 2023 14:00:07 -0700 Subject: [PATCH 9/9] deps: spdx-license-ids@3.0.16 --- node_modules/spdx-license-ids/deprecated.json | 6 ++ node_modules/spdx-license-ids/index.json | 62 +++++++++++++++++++ node_modules/spdx-license-ids/package.json | 6 +- package-lock.json | 6 +- 4 files changed, 74 insertions(+), 6 deletions(-) diff --git a/node_modules/spdx-license-ids/deprecated.json b/node_modules/spdx-license-ids/deprecated.json index 278531e40c613..a877dc3efd8bd 100644 --- a/node_modules/spdx-license-ids/deprecated.json +++ b/node_modules/spdx-license-ids/deprecated.json @@ -7,18 +7,24 @@ "GFDL-1.2", "GFDL-1.3", "GPL-1.0", + "GPL-1.0+", "GPL-2.0", + "GPL-2.0+", "GPL-2.0-with-GCC-exception", "GPL-2.0-with-autoconf-exception", "GPL-2.0-with-bison-exception", "GPL-2.0-with-classpath-exception", "GPL-2.0-with-font-exception", "GPL-3.0", + "GPL-3.0+", "GPL-3.0-with-GCC-exception", "GPL-3.0-with-autoconf-exception", "LGPL-2.0", + "LGPL-2.0+", "LGPL-2.1", + "LGPL-2.1+", "LGPL-3.0", + "LGPL-3.0+", "Nunit", "StandardML-NJ", "bzip2-1.0.5", diff --git a/node_modules/spdx-license-ids/index.json b/node_modules/spdx-license-ids/index.json index 04c03126d98eb..a7b98b24b6273 100644 --- a/node_modules/spdx-license-ids/index.json +++ b/node_modules/spdx-license-ids/index.json @@ -22,10 +22,13 @@ "APSL-1.1", "APSL-1.2", "APSL-2.0", + "ASWF-Digital-Assets-1.0", + "ASWF-Digital-Assets-1.1", "Abstyles", "AdaCore-doc", "Adobe-2006", "Adobe-Glyph", + "Adobe-Utopia", "Afmparse", "Aladdin", "Apache-1.0", @@ -44,6 +47,7 @@ "BSD-3-Clause", "BSD-3-Clause-Attribution", "BSD-3-Clause-Clear", + "BSD-3-Clause-HP", "BSD-3-Clause-LBNL", "BSD-3-Clause-Modification", "BSD-3-Clause-No-Military-License", @@ -51,6 +55,8 @@ "BSD-3-Clause-No-Nuclear-License-2014", "BSD-3-Clause-No-Nuclear-Warranty", "BSD-3-Clause-Open-MPI", + "BSD-3-Clause-Sun", + "BSD-3-Clause-flex", "BSD-4-Clause", "BSD-4-Clause-Shortened", "BSD-4-Clause-UC", @@ -58,8 +64,10 @@ "BSD-4.3TAHOE", "BSD-Advertising-Acknowledgement", "BSD-Attribution-HPND-disclaimer", + "BSD-Inferno-Nettverk", "BSD-Protection", "BSD-Source-Code", + "BSD-Systemics", "BSL-1.0", "BUSL-1.1", "Baekmuk", @@ -71,6 +79,7 @@ "Bitstream-Charter", "Bitstream-Vera", "BlueOak-1.0.0", + "Boehm-GC", "Borceux", "Brian-Gladman-3-Clause", "C-UDA-1.0", @@ -125,6 +134,7 @@ "CC-BY-SA-3.0", "CC-BY-SA-3.0-AT", "CC-BY-SA-3.0-DE", + "CC-BY-SA-3.0-IGO", "CC-BY-SA-4.0", "CC-PDDC", "CC0-1.0", @@ -161,11 +171,13 @@ "Community-Spec-1.0", "Condor-1.1", "Cornell-Lossless-JPEG", + "Cronyx", "Crossword", "CrystalStacker", "Cube", "D-FSL-1.0", "DL-DE-BY-2.0", + "DL-DE-ZERO-2.0", "DOC", "DRL-1.0", "DSDP", @@ -185,6 +197,7 @@ "Entessa", "ErlPL-1.1", "Eurosym", + "FBM", "FDK-AAC", "FSFAP", "FSFUL", @@ -192,9 +205,11 @@ "FSFULLRWD", "FTL", "Fair", + "Ferguson-Twofish", "Frameworx-1.0", "FreeBSD-DOC", "FreeImage", + "Furuseth", "GD", "GFDL-1.1-invariants-only", "GFDL-1.1-invariants-or-later", @@ -227,9 +242,17 @@ "Glulxe", "Graphics-Gems", "HP-1986", + "HP-1989", "HPND", + "HPND-DEC", "HPND-Markus-Kuhn", + "HPND-Pbmplus", + "HPND-UC", + "HPND-doc", + "HPND-doc-sell", "HPND-export-US", + "HPND-export-US-modify", + "HPND-sell-regexpr", "HPND-sell-variant", "HPND-sell-variant-MIT-disclaimer", "HTMLTIDY", @@ -246,6 +269,7 @@ "ImageMagick", "Imlib2", "Info-ZIP", + "Inner-Net-2.0", "Intel", "Intel-ACPI", "Interbase-1.0", @@ -254,6 +278,7 @@ "JSON", "Jam", "JasPer-2.0", + "Kastrup", "Kazlib", "Knuth-CTAN", "LAL-1.2", @@ -276,23 +301,32 @@ "LZMA-SDK-9.11-to-9.20", "LZMA-SDK-9.22", "Latex2e", + "Latex2e-translated-notice", "Leptonica", "LiLiQ-P-1.1", "LiLiQ-R-1.1", "LiLiQ-Rplus-1.1", "Libpng", "Linux-OpenIB", + "Linux-man-pages-1-para", "Linux-man-pages-copyleft", + "Linux-man-pages-copyleft-2-para", + "Linux-man-pages-copyleft-var", + "Lucida-Bitmap-Fonts", "MIT", "MIT-0", "MIT-CMU", + "MIT-Festival", "MIT-Modern-Variant", "MIT-Wu", "MIT-advertising", "MIT-enna", "MIT-feh", "MIT-open-group", + "MIT-testregex", "MITNFA", + "MMIXware", + "MPEG-SSG", "MPL-1.0", "MPL-1.1", "MPL-2.0", @@ -303,6 +337,7 @@ "MTLL", "MakeIndex", "Martin-Birgmeier", + "McPhee-slideshow", "Minpack", "MirOS", "Motosoto", @@ -319,6 +354,7 @@ "NICTA-1.0", "NIST-PD", "NIST-PD-fallback", + "NIST-Software", "NLOD-1.0", "NLOD-2.0", "NLPL", @@ -370,8 +406,10 @@ "OLDAP-2.6", "OLDAP-2.7", "OLDAP-2.8", + "OLFL-1.3", "OML", "OPL-1.0", + "OPL-UK-3.0", "OPUBL-1.0", "OSET-PL-2.1", "OSL-1.0", @@ -381,6 +419,7 @@ "OSL-3.0", "OpenPBS-2.3", "OpenSSL", + "PADL", "PDDL-1.0", "PHP-3.0", "PHP-3.01", @@ -409,10 +448,13 @@ "SGI-B-1.0", "SGI-B-1.1", "SGI-B-2.0", + "SGI-OpenGL", + "SGP4", "SHL-0.5", "SHL-0.51", "SISSL", "SISSL-1.2", + "SL", "SMLNJ", "SMPPL", "SNIA", @@ -427,6 +469,7 @@ "Sendmail-8.23", "SimPL-2.0", "Sleepycat", + "Soundex", "Spencer-86", "Spencer-94", "Spencer-99", @@ -442,14 +485,18 @@ "TPDL", "TPL-1.0", "TTWL", + "TTYP0", "TU-Berlin-1.0", "TU-Berlin-2.0", + "TermReadKey", "UCAR", "UCL-1.0", "UPL-1.0", + "URT-RLE", "Unicode-DFS-2015", "Unicode-DFS-2016", "Unicode-TOU", + "UnixCrypt", "Unlicense", "VOSTROM", "VSL-1.0", @@ -459,12 +506,15 @@ "W3C-20150513", "WTFPL", "Watcom-1.0", + "Widget-Workshop", "Wsuipa", "X11", "X11-distribute-modifications-variant", "XFree86-1.1", "XSkat", + "Xdebug-1.03", "Xerox", + "Xfig", "Xnet", "YPL-1.0", "YPL-1.1", @@ -472,20 +522,24 @@ "ZPL-2.0", "ZPL-2.1", "Zed", + "Zeeff", "Zend-2.0", "Zimbra-1.3", "Zimbra-1.4", "Zlib", "blessing", "bzip2-1.0.6", + "check-cvs", "checkmk", "copyleft-next-0.3.0", "copyleft-next-0.3.1", "curl", "diffmark", + "dtoa", "dvipdfm", "eGenix", "etalab-2.0", + "fwlw", "gSOAP-1.3b", "gnuplot", "iMatix", @@ -493,12 +547,20 @@ "libselinux-1.0", "libtiff", "libutil-David-Nugent", + "lsof", + "magaz", + "metamail", "mpi-permissive", "mpich2", "mplus", + "pnmstitch", "psfrag", "psutils", + "python-ldap", "snprintf", + "ssh-keyscan", + "swrule", + "ulem", "w3m", "xinetd", "xlock", diff --git a/node_modules/spdx-license-ids/package.json b/node_modules/spdx-license-ids/package.json index ea060776d9cf7..196b02705769a 100644 --- a/node_modules/spdx-license-ids/package.json +++ b/node_modules/spdx-license-ids/package.json @@ -1,6 +1,6 @@ { "name": "spdx-license-ids", - "version": "3.0.13", + "version": "3.0.16", "description": "A list of SPDX license identifiers", "repository": "jslicense/spdx-license-ids", "author": "Shinnosuke Watanabe (https://github.com/shinnn)", @@ -28,10 +28,10 @@ ], "devDependencies": { "@shinnn/eslint-config": "^7.0.0", - "eslint": "^8.2.0", + "eslint": "^8.49.0", "eslint-formatter-codeframe": "^7.32.1", "rmfr": "^2.0.0", - "tape": "^5.3.1" + "tape": "^5.6.6" }, "eslintConfig": { "extends": "@shinnn" diff --git a/package-lock.json b/package-lock.json index 68632df20d271..258e33a845159 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13105,9 +13105,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz", - "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==", + "version": "3.0.16", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", + "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", "inBundle": true }, "node_modules/spdx-osi": {