Skip to content

Commit 2846c6d

Browse files
kchindam-infykchindam-infy
committed
Merge remote-tracking branch 'origin' into fix/8008
2 parents 0afa846 + 7fb624f commit 2846c6d

File tree

166 files changed

+6798
-2986
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+6798
-2986
lines changed

‎DEPENDENCIES.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ graph LR;
282282
cross-spawn-->which;
283283
debug-->ms;
284284
encoding-->iconv-lite;
285+
fdir-->picomatch;
285286
foreground-child-->cross-spawn;
286287
foreground-child-->signal-exit;
287288
fs-minipass-->minipass;
@@ -428,16 +429,15 @@ graph LR;
428429
minipass-pipeline-->minipass;
429430
minipass-sized-->minipass;
430431
minizlib-->minipass;
431-
minizlib-->rimraf;
432432
node-gyp-->env-paths;
433433
node-gyp-->exponential-backoff;
434-
node-gyp-->glob;
435434
node-gyp-->graceful-fs;
436435
node-gyp-->make-fetch-happen;
437436
node-gyp-->nopt;
438437
node-gyp-->proc-log;
439438
node-gyp-->semver;
440439
node-gyp-->tar;
440+
node-gyp-->tinyglobby;
441441
node-gyp-->which;
442442
nopt-->abbrev;
443443
normalize-package-data-->hosted-git-info;
@@ -677,6 +677,7 @@ graph LR;
677677
npmcli-smoke-tests-->npmcli-promise-spawn["@npmcli/promise-spawn"];
678678
npmcli-smoke-tests-->npmcli-template-oss["@npmcli/template-oss"];
679679
npmcli-smoke-tests-->proxy;
680+
npmcli-smoke-tests-->rimraf;
680681
npmcli-smoke-tests-->tap;
681682
npmcli-smoke-tests-->which;
682683
pacote-->cacache;
@@ -709,7 +710,6 @@ graph LR;
709710
read-->mute-stream;
710711
read-package-json-fast-->json-parse-even-better-errors;
711712
read-package-json-fast-->npm-normalize-package-bin;
712-
rimraf-->glob;
713713
shebang-command-->shebang-regex;
714714
sigstore-->sigstore-bundle["@sigstore/bundle"];
715715
sigstore-->sigstore-core["@sigstore/core"];
@@ -751,6 +751,8 @@ graph LR;
751751
tar-->minizlib;
752752
tar-->mkdirp;
753753
tar-->yallist;
754+
tinyglobby-->fdir;
755+
tinyglobby-->picomatch;
754756
tuf-js-->debug;
755757
tuf-js-->make-fetch-happen;
756758
tuf-js-->tufjs-models["@tufjs/models"];

‎node_modules/.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@
182182
!/read-package-json-fast
183183
!/read
184184
!/retry
185-
!/rimraf
186185
!/safer-buffer
187186
!/semver
188187
!/shebang-command
@@ -216,6 +215,11 @@
216215
!/tar/node_modules/minipass
217216
!/text-table
218217
!/tiny-relative-date
218+
!/tinyglobby
219+
!/tinyglobby/node_modules/
220+
/tinyglobby/node_modules/*
221+
!/tinyglobby/node_modules/fdir
222+
!/tinyglobby/node_modules/picomatch
219223
!/treeverse
220224
!/tuf-js
221225
!/unique-filename

‎node_modules/cacache/node_modules/minizlib/dist/commonjs/index.js‎

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,37 @@
11
"use strict";
2+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3+
if (k2 === undefined) k2 = k;
4+
var desc = Object.getOwnPropertyDescriptor(m, k);
5+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6+
desc = { enumerable: true, get: function() { return m[k]; } };
7+
}
8+
Object.defineProperty(o, k2, desc);
9+
}) : (function(o, m, k, k2) {
10+
if (k2 === undefined) k2 = k;
11+
o[k2] = m[k];
12+
}));
13+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14+
Object.defineProperty(o, "default", { enumerable: true, value: v });
15+
}) : function(o, v) {
16+
o["default"] = v;
17+
});
18+
var __importStar = (this && this.__importStar) || (function () {
19+
var ownKeys = function(o) {
20+
ownKeys = Object.getOwnPropertyNames || function (o) {
21+
var ar = [];
22+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23+
return ar;
24+
};
25+
return ownKeys(o);
26+
};
27+
return function (mod) {
28+
if (mod && mod.__esModule) return mod;
29+
var result = {};
30+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31+
__setModuleDefault(result, mod);
32+
return result;
33+
};
34+
})();
235
var __importDefault = (this && this.__importDefault) || function (mod) {
336
return (mod && mod.__esModule) ? mod : { "default": mod };
437
};
@@ -7,11 +40,18 @@ exports.BrotliDecompress = exports.BrotliCompress = exports.Brotli = exports.Unz
740
const assert_1 = __importDefault(require("assert"));
841
const buffer_1 = require("buffer");
942
const minipass_1 = require("minipass");
10-
const zlib_1 = __importDefault(require("zlib"));
43+
const realZlib = __importStar(require("zlib"));
1144
const constants_js_1 = require("./constants.js");
1245
var constants_js_2 = require("./constants.js");
1346
Object.defineProperty(exports, "constants", { enumerable: true, get: function () { return constants_js_2.constants; } });
1447
const OriginalBufferConcat = buffer_1.Buffer.concat;
48+
const desc = Object.getOwnPropertyDescriptor(buffer_1.Buffer, 'concat');
49+
const noop = (args) => args;
50+
const passthroughBufferConcat = desc?.writable === true || desc?.set !== undefined
51+
? (makeNoOp) => {
52+
buffer_1.Buffer.concat = makeNoOp ? noop : OriginalBufferConcat;
53+
}
54+
: (_) => { };
1555
const _superWrite = Symbol('_superWrite');
1656
class ZlibError extends Error {
1757
code;
@@ -69,7 +109,7 @@ class ZlibBase extends minipass_1.Minipass {
69109
try {
70110
// @types/node doesn't know that it exports the classes, but they're there
71111
//@ts-ignore
72-
this.#handle = new zlib_1.default[mode](opts);
112+
this.#handle = new realZlib[mode](opts);
73113
}
74114
catch (er) {
75115
// make sure that all errors get decorated properly
@@ -159,20 +199,20 @@ class ZlibBase extends minipass_1.Minipass {
159199
this.#handle.close = () => { };
160200
// It also calls `Buffer.concat()` at the end, which may be convenient
161201
// for some, but which we are not interested in as it slows us down.
162-
buffer_1.Buffer.concat = args => args;
202+
passthroughBufferConcat(true);
163203
let result = undefined;
164204
try {
165205
const flushFlag = typeof chunk[_flushFlag] === 'number'
166206
? chunk[_flushFlag]
167207
: this.#flushFlag;
168208
result = this.#handle._processChunk(chunk, flushFlag);
169209
// if we don't throw, reset it back how it was
170-
buffer_1.Buffer.concat = OriginalBufferConcat;
210+
passthroughBufferConcat(false);
171211
}
172212
catch (err) {
173213
// or if we do, put Buffer.concat() back before we emit error
174214
// Error events call into user code, which may call Buffer.concat()
175-
buffer_1.Buffer.concat = OriginalBufferConcat;
215+
passthroughBufferConcat(false);
176216
this.#onError(new ZlibError(err));
177217
}
178218
finally {

‎node_modules/cacache/node_modules/minizlib/dist/esm/index.js‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
import assert from 'assert';
22
import { Buffer } from 'buffer';
33
import { Minipass } from 'minipass';
4-
import realZlib from 'zlib';
4+
import * as realZlib from 'zlib';
55
import { constants } from './constants.js';
66
export { constants } from './constants.js';
77
const OriginalBufferConcat = Buffer.concat;
8+
const desc = Object.getOwnPropertyDescriptor(Buffer, 'concat');
9+
const noop = (args) => args;
10+
const passthroughBufferConcat = desc?.writable === true || desc?.set !== undefined
11+
? (makeNoOp) => {
12+
Buffer.concat = makeNoOp ? noop : OriginalBufferConcat;
13+
}
14+
: (_) => { };
815
const _superWrite = Symbol('_superWrite');
916
export class ZlibError extends Error {
1017
code;
@@ -151,20 +158,20 @@ class ZlibBase extends Minipass {
151158
this.#handle.close = () => { };
152159
// It also calls `Buffer.concat()` at the end, which may be convenient
153160
// for some, but which we are not interested in as it slows us down.
154-
Buffer.concat = args => args;
161+
passthroughBufferConcat(true);
155162
let result = undefined;
156163
try {
157164
const flushFlag = typeof chunk[_flushFlag] === 'number'
158165
? chunk[_flushFlag]
159166
: this.#flushFlag;
160167
result = this.#handle._processChunk(chunk, flushFlag);
161168
// if we don't throw, reset it back how it was
162-
Buffer.concat = OriginalBufferConcat;
169+
passthroughBufferConcat(false);
163170
}
164171
catch (err) {
165172
// or if we do, put Buffer.concat() back before we emit error
166173
// Error events call into user code, which may call Buffer.concat()
167-
Buffer.concat = OriginalBufferConcat;
174+
passthroughBufferConcat(false);
168175
this.#onError(new ZlibError(err));
169176
}
170177
finally {

‎node_modules/cacache/node_modules/minizlib/package.json‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
22
"name": "minizlib",
3-
"version": "3.0.1",
3+
"version": "3.0.2",
44
"description": "A small fast zlib stream built on [minipass](http://npm.im/minipass) and Node.js's zlib binding.",
55
"main": "./dist/commonjs/index.js",
66
"dependencies": {
7-
"minipass": "^7.0.4",
8-
"rimraf": "^5.0.5"
7+
"minipass": "^7.1.2"
98
},
109
"scripts": {
1110
"prepare": "tshy",
@@ -34,11 +33,10 @@
3433
"author": "Isaac Z. Schlueter <[email protected]> (http://blog.izs.me/)",
3534
"license": "MIT",
3635
"devDependencies": {
37-
"@types/node": "^20.11.29",
38-
"mkdirp": "^3.0.1",
39-
"tap": "^18.7.1",
40-
"tshy": "^1.12.0",
41-
"typedoc": "^0.25.12"
36+
"@types/node": "^22.13.14",
37+
"tap": "^21.1.0",
38+
"tshy": "^3.0.2",
39+
"typedoc": "^0.28.1"
4240
},
4341
"files": [
4442
"dist"
@@ -77,5 +75,6 @@
7775
"bracketSameLine": true,
7876
"arrowParens": "avoid",
7977
"endOfLine": "lf"
80-
}
78+
},
79+
"module": "./dist/esm/index.js"
8180
}

‎node_modules/ci-info/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ exports.isCI = !!(
3636
env.CI !== 'false' && // Bypass all checks if CI env is explicitly set to 'false'
3737
(env.BUILD_ID || // Jenkins, Cloudbees
3838
env.BUILD_NUMBER || // Jenkins, TeamCity
39-
env.CI || // Travis CI, CircleCI, Cirrus CI, Gitlab CI, Appveyor, CodeShip, dsari
39+
env.CI || // Travis CI, CircleCI, Cirrus CI, Gitlab CI, Appveyor, CodeShip, dsari, Cloudflare Pages
4040
env.CI_APP_ID || // Appflow
4141
env.CI_BUILD_ID || // Appflow
4242
env.CI_BUILD_NUMBER || // Appflow

‎node_modules/ci-info/package.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
22
"name": "ci-info",
3-
"version": "4.1.0",
3+
"version": "4.2.0",
44
"description": "Get details about the current Continuous Integration environment",
55
"main": "index.js",
66
"typings": "index.d.ts",
7+
"type": "commonjs",
78
"author": "Thomas Watson Steen <[email protected]> (https://twitter.com/wa7son)",
89
"license": "MIT",
9-
"repository": "https://github.com/watson/ci-info.git",
10+
"repository": "github:watson/ci-info",
1011
"bugs": "https://github.com/watson/ci-info/issues",
1112
"homepage": "https://github.com/watson/ci-info",
1213
"contributors": [
@@ -41,7 +42,8 @@
4142
},
4243
"devDependencies": {
4344
"clear-module": "^4.1.2",
44-
"husky": "^9.1.6",
45+
"husky": "^9.1.7",
46+
"publint": "^0.3.8",
4547
"standard": "^17.1.2",
4648
"tape": "^5.9.0"
4749
},

‎node_modules/ci-info/vendors.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@
8585
"env": "CIRRUS_CI",
8686
"pr": "CIRRUS_PR"
8787
},
88+
{
89+
"name": "Cloudflare Pages",
90+
"constant": "CLOUDFLARE_PAGES",
91+
"env": "CF_PAGES"
92+
},
8893
{
8994
"name": "Codefresh",
9095
"constant": "CODEFRESH",

‎node_modules/minipass-fetch/lib/index.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,7 @@ const fetch = async (url, opts) => {
318318
if (codings === 'deflate' || codings === 'x-deflate') {
319319
// handle the infamous raw deflate response from old servers
320320
// a hack for old IIS and Apache servers
321-
const raw = res.pipe(new Minipass())
322-
raw.once('data', chunk => {
321+
res.once('data', chunk => {
323322
// see http://stackoverflow.com/questions/37519828
324323
const decoder = (chunk[0] & 0x0F) === 0x08
325324
? new zlib.Inflate()

‎node_modules/minipass-fetch/node_modules/minizlib/dist/commonjs/index.js‎

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,37 @@
11
"use strict";
2+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3+
if (k2 === undefined) k2 = k;
4+
var desc = Object.getOwnPropertyDescriptor(m, k);
5+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6+
desc = { enumerable: true, get: function() { return m[k]; } };
7+
}
8+
Object.defineProperty(o, k2, desc);
9+
}) : (function(o, m, k, k2) {
10+
if (k2 === undefined) k2 = k;
11+
o[k2] = m[k];
12+
}));
13+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14+
Object.defineProperty(o, "default", { enumerable: true, value: v });
15+
}) : function(o, v) {
16+
o["default"] = v;
17+
});
18+
var __importStar = (this && this.__importStar) || (function () {
19+
var ownKeys = function(o) {
20+
ownKeys = Object.getOwnPropertyNames || function (o) {
21+
var ar = [];
22+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23+
return ar;
24+
};
25+
return ownKeys(o);
26+
};
27+
return function (mod) {
28+
if (mod && mod.__esModule) return mod;
29+
var result = {};
30+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31+
__setModuleDefault(result, mod);
32+
return result;
33+
};
34+
})();
235
var __importDefault = (this && this.__importDefault) || function (mod) {
336
return (mod && mod.__esModule) ? mod : { "default": mod };
437
};
@@ -7,11 +40,18 @@ exports.BrotliDecompress = exports.BrotliCompress = exports.Brotli = exports.Unz
740
const assert_1 = __importDefault(require("assert"));
841
const buffer_1 = require("buffer");
942
const minipass_1 = require("minipass");
10-
const zlib_1 = __importDefault(require("zlib"));
43+
const realZlib = __importStar(require("zlib"));
1144
const constants_js_1 = require("./constants.js");
1245
var constants_js_2 = require("./constants.js");
1346
Object.defineProperty(exports, "constants", { enumerable: true, get: function () { return constants_js_2.constants; } });
1447
const OriginalBufferConcat = buffer_1.Buffer.concat;
48+
const desc = Object.getOwnPropertyDescriptor(buffer_1.Buffer, 'concat');
49+
const noop = (args) => args;
50+
const passthroughBufferConcat = desc?.writable === true || desc?.set !== undefined
51+
? (makeNoOp) => {
52+
buffer_1.Buffer.concat = makeNoOp ? noop : OriginalBufferConcat;
53+
}
54+
: (_) => { };
1555
const _superWrite = Symbol('_superWrite');
1656
class ZlibError extends Error {
1757
code;
@@ -69,7 +109,7 @@ class ZlibBase extends minipass_1.Minipass {
69109
try {
70110
// @types/node doesn't know that it exports the classes, but they're there
71111
//@ts-ignore
72-
this.#handle = new zlib_1.default[mode](opts);
112+
this.#handle = new realZlib[mode](opts);
73113
}
74114
catch (er) {
75115
// make sure that all errors get decorated properly
@@ -159,20 +199,20 @@ class ZlibBase extends minipass_1.Minipass {
159199
this.#handle.close = () => { };
160200
// It also calls `Buffer.concat()` at the end, which may be convenient
161201
// for some, but which we are not interested in as it slows us down.
162-
buffer_1.Buffer.concat = args => args;
202+
passthroughBufferConcat(true);
163203
let result = undefined;
164204
try {
165205
const flushFlag = typeof chunk[_flushFlag] === 'number'
166206
? chunk[_flushFlag]
167207
: this.#flushFlag;
168208
result = this.#handle._processChunk(chunk, flushFlag);
169209
// if we don't throw, reset it back how it was
170-
buffer_1.Buffer.concat = OriginalBufferConcat;
210+
passthroughBufferConcat(false);
171211
}
172212
catch (err) {
173213
// or if we do, put Buffer.concat() back before we emit error
174214
// Error events call into user code, which may call Buffer.concat()
175-
buffer_1.Buffer.concat = OriginalBufferConcat;
215+
passthroughBufferConcat(false);
176216
this.#onError(new ZlibError(err));
177217
}
178218
finally {

0 commit comments

Comments
 (0)