wrangler 3.103.2 → 3.105.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -557,14 +557,14 @@ var require_util = __commonJS({
557
557
  }
558
558
  const port = url4.port != null ? url4.port : url4.protocol === "https:" ? 443 : 80;
559
559
  let origin = url4.origin != null ? url4.origin : `${url4.protocol}//${url4.hostname}:${port}`;
560
- let path69 = url4.path != null ? url4.path : `${url4.pathname || ""}${url4.search || ""}`;
560
+ let path70 = url4.path != null ? url4.path : `${url4.pathname || ""}${url4.search || ""}`;
561
561
  if (origin.endsWith("/")) {
562
562
  origin = origin.substring(0, origin.length - 1);
563
563
  }
564
- if (path69 && !path69.startsWith("/")) {
565
- path69 = `/${path69}`;
564
+ if (path70 && !path70.startsWith("/")) {
565
+ path70 = `/${path70}`;
566
566
  }
567
- url4 = new URL(origin + path69);
567
+ url4 = new URL(origin + path70);
568
568
  }
569
569
  return url4;
570
570
  }
@@ -2228,19 +2228,19 @@ var require_basename = __commonJS({
2228
2228
  "../../node_modules/.pnpm/@fastify+busboy@2.1.1/node_modules/@fastify/busboy/lib/utils/basename.js"(exports2, module3) {
2229
2229
  "use strict";
2230
2230
  init_import_meta_url();
2231
- module3.exports = /* @__PURE__ */ __name(function basename7(path69) {
2232
- if (typeof path69 !== "string") {
2231
+ module3.exports = /* @__PURE__ */ __name(function basename7(path70) {
2232
+ if (typeof path70 !== "string") {
2233
2233
  return "";
2234
2234
  }
2235
- for (var i5 = path69.length - 1; i5 >= 0; --i5) {
2236
- switch (path69.charCodeAt(i5)) {
2235
+ for (var i5 = path70.length - 1; i5 >= 0; --i5) {
2236
+ switch (path70.charCodeAt(i5)) {
2237
2237
  case 47:
2238
2238
  case 92:
2239
- path69 = path69.slice(i5 + 1);
2240
- return path69 === ".." || path69 === "." ? "" : path69;
2239
+ path70 = path70.slice(i5 + 1);
2240
+ return path70 === ".." || path70 === "." ? "" : path70;
2241
2241
  }
2242
2242
  }
2243
- return path69 === ".." || path69 === "." ? "" : path69;
2243
+ return path70 === ".." || path70 === "." ? "" : path70;
2244
2244
  }, "basename");
2245
2245
  }
2246
2246
  });
@@ -5362,7 +5362,7 @@ var require_request = __commonJS({
5362
5362
  }
5363
5363
  var Request4 = class {
5364
5364
  constructor(origin, {
5365
- path: path69,
5365
+ path: path70,
5366
5366
  method,
5367
5367
  body,
5368
5368
  headers,
@@ -5376,11 +5376,11 @@ var require_request = __commonJS({
5376
5376
  throwOnError,
5377
5377
  expectContinue
5378
5378
  }, handler30) {
5379
- if (typeof path69 !== "string") {
5379
+ if (typeof path70 !== "string") {
5380
5380
  throw new InvalidArgumentError("path must be a string");
5381
- } else if (path69[0] !== "/" && !(path69.startsWith("http://") || path69.startsWith("https://")) && method !== "CONNECT") {
5381
+ } else if (path70[0] !== "/" && !(path70.startsWith("http://") || path70.startsWith("https://")) && method !== "CONNECT") {
5382
5382
  throw new InvalidArgumentError("path must be an absolute URL or start with a slash");
5383
- } else if (invalidPathRegex.exec(path69) !== null) {
5383
+ } else if (invalidPathRegex.exec(path70) !== null) {
5384
5384
  throw new InvalidArgumentError("invalid request path");
5385
5385
  }
5386
5386
  if (typeof method !== "string") {
@@ -5443,7 +5443,7 @@ var require_request = __commonJS({
5443
5443
  this.completed = false;
5444
5444
  this.aborted = false;
5445
5445
  this.upgrade = upgrade || null;
5446
- this.path = query ? util5.buildURL(path69, query) : path69;
5446
+ this.path = query ? util5.buildURL(path70, query) : path70;
5447
5447
  this.origin = origin;
5448
5448
  this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent;
5449
5449
  this.blocking = blocking == null ? false : blocking;
@@ -6476,9 +6476,9 @@ var require_RedirectHandler = __commonJS({
6476
6476
  return this.handler.onHeaders(statusCode, headers, resume, statusText);
6477
6477
  }
6478
6478
  const { origin, pathname, search } = util5.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin)));
6479
- const path69 = search ? `${pathname}${search}` : pathname;
6479
+ const path70 = search ? `${pathname}${search}` : pathname;
6480
6480
  this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin);
6481
- this.opts.path = path69;
6481
+ this.opts.path = path70;
6482
6482
  this.opts.origin = origin;
6483
6483
  this.opts.maxRedirections = 0;
6484
6484
  this.opts.query = null;
@@ -7745,7 +7745,7 @@ var require_client = __commonJS({
7745
7745
  writeH2(client, client[kHTTP2Session], request4);
7746
7746
  return;
7747
7747
  }
7748
- const { body, method, path: path69, host, upgrade, headers, blocking, reset } = request4;
7748
+ const { body, method, path: path70, host, upgrade, headers, blocking, reset } = request4;
7749
7749
  const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH";
7750
7750
  if (body && typeof body.read === "function") {
7751
7751
  body.read(0);
@@ -7795,7 +7795,7 @@ var require_client = __commonJS({
7795
7795
  if (blocking) {
7796
7796
  socket[kBlocking] = true;
7797
7797
  }
7798
- let header = `${method} ${path69} HTTP/1.1\r
7798
+ let header = `${method} ${path70} HTTP/1.1\r
7799
7799
  `;
7800
7800
  if (typeof host === "string") {
7801
7801
  header += `host: ${host}\r
@@ -7859,7 +7859,7 @@ upgrade: ${upgrade}\r
7859
7859
  }
7860
7860
  __name(write, "write");
7861
7861
  function writeH2(client, session, request4) {
7862
- const { body, method, path: path69, host, upgrade, expectContinue, signal, headers: reqHeaders } = request4;
7862
+ const { body, method, path: path70, host, upgrade, expectContinue, signal, headers: reqHeaders } = request4;
7863
7863
  let headers;
7864
7864
  if (typeof reqHeaders === "string")
7865
7865
  headers = Request4[kHTTP2CopyHeaders](reqHeaders.trim());
@@ -7905,7 +7905,7 @@ upgrade: ${upgrade}\r
7905
7905
  });
7906
7906
  return true;
7907
7907
  }
7908
- headers[HTTP2_HEADER_PATH] = path69;
7908
+ headers[HTTP2_HEADER_PATH] = path70;
7909
7909
  headers[HTTP2_HEADER_SCHEME] = "https";
7910
7910
  const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH";
7911
7911
  if (body && typeof body.read === "function") {
@@ -10207,21 +10207,21 @@ var require_mock_utils = __commonJS({
10207
10207
  return true;
10208
10208
  }
10209
10209
  __name(matchHeaders, "matchHeaders");
10210
- function safeUrl(path69) {
10211
- if (typeof path69 !== "string") {
10212
- return path69;
10210
+ function safeUrl(path70) {
10211
+ if (typeof path70 !== "string") {
10212
+ return path70;
10213
10213
  }
10214
- const pathSegments = path69.split("?");
10214
+ const pathSegments = path70.split("?");
10215
10215
  if (pathSegments.length !== 2) {
10216
- return path69;
10216
+ return path70;
10217
10217
  }
10218
10218
  const qp = new URLSearchParams(pathSegments.pop());
10219
10219
  qp.sort();
10220
10220
  return [...pathSegments, qp.toString()].join("?");
10221
10221
  }
10222
10222
  __name(safeUrl, "safeUrl");
10223
- function matchKey(mockDispatch2, { path: path69, method, body, headers }) {
10224
- const pathMatch = matchValue(mockDispatch2.path, path69);
10223
+ function matchKey(mockDispatch2, { path: path70, method, body, headers }) {
10224
+ const pathMatch = matchValue(mockDispatch2.path, path70);
10225
10225
  const methodMatch = matchValue(mockDispatch2.method, method);
10226
10226
  const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true;
10227
10227
  const headersMatch = matchHeaders(mockDispatch2, headers);
@@ -10241,7 +10241,7 @@ var require_mock_utils = __commonJS({
10241
10241
  function getMockDispatch(mockDispatches, key) {
10242
10242
  const basePath = key.query ? buildURL(key.path, key.query) : key.path;
10243
10243
  const resolvedPath2 = typeof basePath === "string" ? safeUrl(basePath) : basePath;
10244
- let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path69 }) => matchValue(safeUrl(path69), resolvedPath2));
10244
+ let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path70 }) => matchValue(safeUrl(path70), resolvedPath2));
10245
10245
  if (matchedMockDispatches.length === 0) {
10246
10246
  throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath2}'`);
10247
10247
  }
@@ -10281,9 +10281,9 @@ var require_mock_utils = __commonJS({
10281
10281
  }
10282
10282
  __name(deleteMockDispatch, "deleteMockDispatch");
10283
10283
  function buildKey(opts) {
10284
- const { path: path69, method, body, headers, query } = opts;
10284
+ const { path: path70, method, body, headers, query } = opts;
10285
10285
  return {
10286
- path: path69,
10286
+ path: path70,
10287
10287
  method,
10288
10288
  body,
10289
10289
  headers,
@@ -10751,10 +10751,10 @@ var require_pending_interceptors_formatter = __commonJS({
10751
10751
  }
10752
10752
  format(pendingInterceptors) {
10753
10753
  const withPrettyHeaders = pendingInterceptors.map(
10754
- ({ method, path: path69, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
10754
+ ({ method, path: path70, data: { statusCode }, persist, times, timesInvoked, origin }) => ({
10755
10755
  Method: method,
10756
10756
  Origin: origin,
10757
- Path: path69,
10757
+ Path: path70,
10758
10758
  "Status code": statusCode,
10759
10759
  Persistent: persist ? "\u2705" : "\u274C",
10760
10760
  Invocations: timesInvoked,
@@ -15459,8 +15459,8 @@ var require_util6 = __commonJS({
15459
15459
  }
15460
15460
  }
15461
15461
  __name(validateCookieValue, "validateCookieValue");
15462
- function validateCookiePath(path69) {
15463
- for (const char of path69) {
15462
+ function validateCookiePath(path70) {
15463
+ for (const char of path70) {
15464
15464
  const code = char.charCodeAt(0);
15465
15465
  if (code < 33 || char === ";") {
15466
15466
  throw new Error("Invalid cookie path");
@@ -17193,11 +17193,11 @@ var require_undici = __commonJS({
17193
17193
  if (typeof opts.path !== "string") {
17194
17194
  throw new InvalidArgumentError("invalid opts.path");
17195
17195
  }
17196
- let path69 = opts.path;
17196
+ let path70 = opts.path;
17197
17197
  if (!opts.path.startsWith("/")) {
17198
- path69 = `/${path69}`;
17198
+ path70 = `/${path70}`;
17199
17199
  }
17200
- url4 = new URL(util5.parseOrigin(url4).origin + path69);
17200
+ url4 = new URL(util5.parseOrigin(url4).origin + path70);
17201
17201
  } else {
17202
17202
  if (!opts) {
17203
17203
  opts = typeof url4 === "object" ? url4 : {};
@@ -17441,7 +17441,7 @@ var require_XDGAppPaths = __commonJS({
17441
17441
  }
17442
17442
  __name(typeOf, "typeOf");
17443
17443
  function Adapt(adapter_) {
17444
- var meta = adapter_.meta, path69 = adapter_.path, xdg = adapter_.xdg;
17444
+ var meta = adapter_.meta, path70 = adapter_.path, xdg = adapter_.xdg;
17445
17445
  var XDGAppPaths_ = function() {
17446
17446
  function XDGAppPaths_2(options_) {
17447
17447
  if (options_ === void 0) {
@@ -17464,7 +17464,7 @@ var require_XDGAppPaths = __commonJS({
17464
17464
  meta.mainFilename()
17465
17465
  ];
17466
17466
  var nameFallback = "$eval";
17467
- var name2 = path69.parse(((_c2 = namePriorityList.find(function(e7) {
17467
+ var name2 = path70.parse(((_c2 = namePriorityList.find(function(e7) {
17468
17468
  return isString4(e7);
17469
17469
  })) !== null && _c2 !== void 0 ? _c2 : nameFallback) + suffix).name;
17470
17470
  XDGAppPaths.$name = /* @__PURE__ */ __name(function $name() {
@@ -17485,28 +17485,28 @@ var require_XDGAppPaths = __commonJS({
17485
17485
  }
17486
17486
  __name(finalPathSegment, "finalPathSegment");
17487
17487
  XDGAppPaths.cache = /* @__PURE__ */ __name(function cache6(dirOptions) {
17488
- return path69.join(xdg.cache(), finalPathSegment(dirOptions));
17488
+ return path70.join(xdg.cache(), finalPathSegment(dirOptions));
17489
17489
  }, "cache");
17490
17490
  XDGAppPaths.config = /* @__PURE__ */ __name(function config(dirOptions) {
17491
- return path69.join(xdg.config(), finalPathSegment(dirOptions));
17491
+ return path70.join(xdg.config(), finalPathSegment(dirOptions));
17492
17492
  }, "config");
17493
17493
  XDGAppPaths.data = /* @__PURE__ */ __name(function data(dirOptions) {
17494
- return path69.join(xdg.data(), finalPathSegment(dirOptions));
17494
+ return path70.join(xdg.data(), finalPathSegment(dirOptions));
17495
17495
  }, "data");
17496
17496
  XDGAppPaths.runtime = /* @__PURE__ */ __name(function runtime(dirOptions) {
17497
- return xdg.runtime() ? path69.join(xdg.runtime(), finalPathSegment(dirOptions)) : void 0;
17497
+ return xdg.runtime() ? path70.join(xdg.runtime(), finalPathSegment(dirOptions)) : void 0;
17498
17498
  }, "runtime");
17499
17499
  XDGAppPaths.state = /* @__PURE__ */ __name(function state2(dirOptions) {
17500
- return path69.join(xdg.state(), finalPathSegment(dirOptions));
17500
+ return path70.join(xdg.state(), finalPathSegment(dirOptions));
17501
17501
  }, "state");
17502
17502
  XDGAppPaths.configDirs = /* @__PURE__ */ __name(function configDirs(dirOptions) {
17503
17503
  return xdg.configDirs().map(function(s5) {
17504
- return path69.join(s5, finalPathSegment(dirOptions));
17504
+ return path70.join(s5, finalPathSegment(dirOptions));
17505
17505
  });
17506
17506
  }, "configDirs");
17507
17507
  XDGAppPaths.dataDirs = /* @__PURE__ */ __name(function dataDirs(dirOptions) {
17508
17508
  return xdg.dataDirs().map(function(s5) {
17509
- return path69.join(s5, finalPathSegment(dirOptions));
17509
+ return path70.join(s5, finalPathSegment(dirOptions));
17510
17510
  });
17511
17511
  }, "dataDirs");
17512
17512
  return XDGAppPaths;
@@ -17534,7 +17534,7 @@ var require_XDG = __commonJS({
17534
17534
  exports2.__esModule = true;
17535
17535
  exports2.Adapt = void 0;
17536
17536
  function Adapt(adapter_) {
17537
- var env7 = adapter_.env, osPaths = adapter_.osPaths, path69 = adapter_.path;
17537
+ var env7 = adapter_.env, osPaths = adapter_.osPaths, path70 = adapter_.path;
17538
17538
  var isMacOS = /^darwin$/i.test(adapter_.process.platform);
17539
17539
  var isWinOS = /^win/i.test(adapter_.process.platform);
17540
17540
  function baseDir() {
@@ -17542,7 +17542,7 @@ var require_XDG = __commonJS({
17542
17542
  }
17543
17543
  __name(baseDir, "baseDir");
17544
17544
  function valOrPath(val2, pathSegments) {
17545
- return val2 || path69.join.apply(path69, pathSegments);
17545
+ return val2 || path70.join.apply(path70, pathSegments);
17546
17546
  }
17547
17547
  __name(valOrPath, "valOrPath");
17548
17548
  var linux = /* @__PURE__ */ __name(function() {
@@ -17621,11 +17621,11 @@ var require_XDG = __commonJS({
17621
17621
  XDG.state = extension.state;
17622
17622
  XDG.configDirs = /* @__PURE__ */ __name(function configDirs() {
17623
17623
  var pathList = env7.get("XDG_CONFIG_DIRS");
17624
- return __spreadArray([extension.config()], pathList ? pathList.split(path69.delimiter) : []);
17624
+ return __spreadArray([extension.config()], pathList ? pathList.split(path70.delimiter) : []);
17625
17625
  }, "configDirs");
17626
17626
  XDG.dataDirs = /* @__PURE__ */ __name(function dataDirs() {
17627
17627
  var pathList = env7.get("XDG_DATA_DIRS");
17628
- return __spreadArray([extension.data()], pathList ? pathList.split(path69.delimiter) : []);
17628
+ return __spreadArray([extension.data()], pathList ? pathList.split(path70.delimiter) : []);
17629
17629
  }, "dataDirs");
17630
17630
  return XDG;
17631
17631
  }
@@ -17656,7 +17656,7 @@ var require_OSPaths = __commonJS({
17656
17656
  }
17657
17657
  __name(isEmpty, "isEmpty");
17658
17658
  function Adapt(adapter_) {
17659
- var env7 = adapter_.env, os13 = adapter_.os, path69 = adapter_.path;
17659
+ var env7 = adapter_.env, os13 = adapter_.os, path70 = adapter_.path;
17660
17660
  var isWinOS = /^win/i.test(adapter_.process.platform);
17661
17661
  function normalizePath2(path_) {
17662
17662
  return path_ ? adapter_.path.normalize(adapter_.path.join(path_, ".")) : void 0;
@@ -17671,7 +17671,7 @@ var require_OSPaths = __commonJS({
17671
17671
  typeof os13.homedir === "function" ? os13.homedir() : void 0,
17672
17672
  env7.get("USERPROFILE"),
17673
17673
  env7.get("HOME"),
17674
- env7.get("HOMEDRIVE") || env7.get("HOMEPATH") ? path69.join(env7.get("HOMEDRIVE") || "", env7.get("HOMEPATH") || "") : void 0
17674
+ env7.get("HOMEDRIVE") || env7.get("HOMEPATH") ? path70.join(env7.get("HOMEDRIVE") || "", env7.get("HOMEPATH") || "") : void 0
17675
17675
  ];
17676
17676
  return normalizePath2(priorityList.find(function(v7) {
17677
17677
  return !isEmpty(v7);
@@ -17682,7 +17682,7 @@ var require_OSPaths = __commonJS({
17682
17682
  __name(home, "home");
17683
17683
  function temp() {
17684
17684
  function joinPathToBase(base, segments) {
17685
- return base ? path69.join.apply(path69, __spreadArray([base], segments)) : void 0;
17685
+ return base ? path70.join.apply(path70, __spreadArray([base], segments)) : void 0;
17686
17686
  }
17687
17687
  __name(joinPathToBase, "joinPathToBase");
17688
17688
  function posix2() {
@@ -17794,7 +17794,7 @@ var require_node = __commonJS({
17794
17794
  exports2.__esModule = true;
17795
17795
  exports2.adapter = void 0;
17796
17796
  var os13 = __importStar(require("os"));
17797
- var path69 = __importStar(require("path"));
17797
+ var path70 = __importStar(require("path"));
17798
17798
  exports2.adapter = {
17799
17799
  atImportPermissions: { env: true },
17800
17800
  env: {
@@ -17803,7 +17803,7 @@ var require_node = __commonJS({
17803
17803
  }
17804
17804
  },
17805
17805
  os: os13,
17806
- path: path69,
17806
+ path: path70,
17807
17807
  process
17808
17808
  };
17809
17809
  }
@@ -17858,7 +17858,7 @@ var require_node2 = __commonJS({
17858
17858
  };
17859
17859
  exports2.__esModule = true;
17860
17860
  exports2.adapter = void 0;
17861
- var path69 = __importStar(require("path"));
17861
+ var path70 = __importStar(require("path"));
17862
17862
  var os_paths_1 = __importDefault(require_mod_cjs());
17863
17863
  exports2.adapter = {
17864
17864
  atImportPermissions: { env: true },
@@ -17868,7 +17868,7 @@ var require_node2 = __commonJS({
17868
17868
  }
17869
17869
  },
17870
17870
  osPaths: os_paths_1["default"],
17871
- path: path69,
17871
+ path: path70,
17872
17872
  process
17873
17873
  };
17874
17874
  }
@@ -17923,7 +17923,7 @@ var require_node3 = __commonJS({
17923
17923
  };
17924
17924
  exports2.__esModule = true;
17925
17925
  exports2.adapter = void 0;
17926
- var path69 = __importStar(require("path"));
17926
+ var path70 = __importStar(require("path"));
17927
17927
  var xdg_portable_1 = __importDefault(require_mod_cjs2());
17928
17928
  exports2.adapter = {
17929
17929
  atImportPermissions: { env: true, read: true },
@@ -17938,7 +17938,7 @@ var require_node3 = __commonJS({
17938
17938
  return process.pkg ? process.execPath : void 0;
17939
17939
  }
17940
17940
  },
17941
- path: path69,
17941
+ path: path70,
17942
17942
  process,
17943
17943
  xdg: xdg_portable_1["default"]
17944
17944
  };
@@ -20262,17 +20262,17 @@ var require_ignore = __commonJS({
20262
20262
  var throwError = /* @__PURE__ */ __name((message, Ctor) => {
20263
20263
  throw new Ctor(message);
20264
20264
  }, "throwError");
20265
- var checkPath = /* @__PURE__ */ __name((path69, originalPath, doThrow) => {
20266
- if (!isString4(path69)) {
20265
+ var checkPath = /* @__PURE__ */ __name((path70, originalPath, doThrow) => {
20266
+ if (!isString4(path70)) {
20267
20267
  return doThrow(
20268
20268
  `path must be a string, but got \`${originalPath}\``,
20269
20269
  TypeError
20270
20270
  );
20271
20271
  }
20272
- if (!path69) {
20272
+ if (!path70) {
20273
20273
  return doThrow(`path must not be empty`, TypeError);
20274
20274
  }
20275
- if (checkPath.isNotRelative(path69)) {
20275
+ if (checkPath.isNotRelative(path70)) {
20276
20276
  const r7 = "`path.relative()`d";
20277
20277
  return doThrow(
20278
20278
  `path should be a ${r7} string, but got "${originalPath}"`,
@@ -20281,7 +20281,7 @@ var require_ignore = __commonJS({
20281
20281
  }
20282
20282
  return true;
20283
20283
  }, "checkPath");
20284
- var isNotRelative = /* @__PURE__ */ __name((path69) => REGEX_TEST_INVALID_PATH.test(path69), "isNotRelative");
20284
+ var isNotRelative = /* @__PURE__ */ __name((path70) => REGEX_TEST_INVALID_PATH.test(path70), "isNotRelative");
20285
20285
  checkPath.isNotRelative = isNotRelative;
20286
20286
  checkPath.convert = (p6) => p6;
20287
20287
  var Ignore = class {
@@ -20340,7 +20340,7 @@ var require_ignore = __commonJS({
20340
20340
  // setting `checkUnignored` to `false` could reduce additional
20341
20341
  // path matching.
20342
20342
  // @returns {TestResult} true if a file is ignored
20343
- _testOne(path69, checkUnignored) {
20343
+ _testOne(path70, checkUnignored) {
20344
20344
  let ignored = false;
20345
20345
  let unignored = false;
20346
20346
  this._rules.forEach((rule) => {
@@ -20348,7 +20348,7 @@ var require_ignore = __commonJS({
20348
20348
  if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) {
20349
20349
  return;
20350
20350
  }
20351
- const matched = rule.regex.test(path69);
20351
+ const matched = rule.regex.test(path70);
20352
20352
  if (matched) {
20353
20353
  ignored = !negative;
20354
20354
  unignored = negative;
@@ -20361,24 +20361,24 @@ var require_ignore = __commonJS({
20361
20361
  }
20362
20362
  // @returns {TestResult}
20363
20363
  _test(originalPath, cache6, checkUnignored, slices) {
20364
- const path69 = originalPath && checkPath.convert(originalPath);
20364
+ const path70 = originalPath && checkPath.convert(originalPath);
20365
20365
  checkPath(
20366
- path69,
20366
+ path70,
20367
20367
  originalPath,
20368
20368
  this._allowRelativePaths ? RETURN_FALSE : throwError
20369
20369
  );
20370
- return this._t(path69, cache6, checkUnignored, slices);
20370
+ return this._t(path70, cache6, checkUnignored, slices);
20371
20371
  }
20372
- _t(path69, cache6, checkUnignored, slices) {
20373
- if (path69 in cache6) {
20374
- return cache6[path69];
20372
+ _t(path70, cache6, checkUnignored, slices) {
20373
+ if (path70 in cache6) {
20374
+ return cache6[path70];
20375
20375
  }
20376
20376
  if (!slices) {
20377
- slices = path69.split(SLASH2);
20377
+ slices = path70.split(SLASH2);
20378
20378
  }
20379
20379
  slices.pop();
20380
20380
  if (!slices.length) {
20381
- return cache6[path69] = this._testOne(path69, checkUnignored);
20381
+ return cache6[path70] = this._testOne(path70, checkUnignored);
20382
20382
  }
20383
20383
  const parent = this._t(
20384
20384
  slices.join(SLASH2) + SLASH2,
@@ -20386,25 +20386,25 @@ var require_ignore = __commonJS({
20386
20386
  checkUnignored,
20387
20387
  slices
20388
20388
  );
20389
- return cache6[path69] = parent.ignored ? parent : this._testOne(path69, checkUnignored);
20389
+ return cache6[path70] = parent.ignored ? parent : this._testOne(path70, checkUnignored);
20390
20390
  }
20391
- ignores(path69) {
20392
- return this._test(path69, this._ignoreCache, false).ignored;
20391
+ ignores(path70) {
20392
+ return this._test(path70, this._ignoreCache, false).ignored;
20393
20393
  }
20394
20394
  createFilter() {
20395
- return (path69) => !this.ignores(path69);
20395
+ return (path70) => !this.ignores(path70);
20396
20396
  }
20397
20397
  filter(paths) {
20398
20398
  return makeArray(paths).filter(this.createFilter());
20399
20399
  }
20400
20400
  // @returns {TestResult}
20401
- test(path69) {
20402
- return this._test(path69, this._testCache, true);
20401
+ test(path70) {
20402
+ return this._test(path70, this._testCache, true);
20403
20403
  }
20404
20404
  };
20405
20405
  __name(Ignore, "Ignore");
20406
20406
  var factory = /* @__PURE__ */ __name((options30) => new Ignore(options30), "factory");
20407
- var isPathValid = /* @__PURE__ */ __name((path69) => checkPath(path69 && checkPath.convert(path69), path69, RETURN_FALSE), "isPathValid");
20407
+ var isPathValid = /* @__PURE__ */ __name((path70) => checkPath(path70 && checkPath.convert(path70), path70, RETURN_FALSE), "isPathValid");
20408
20408
  factory.isPathValid = isPathValid;
20409
20409
  factory.default = factory;
20410
20410
  module3.exports = factory;
@@ -20415,7 +20415,7 @@ var require_ignore = __commonJS({
20415
20415
  const makePosix = /* @__PURE__ */ __name((str) => /^\\\\\?\\/.test(str) || /["<>|\u0000-\u001F]+/u.test(str) ? str : str.replace(/\\/g, "/"), "makePosix");
20416
20416
  checkPath.convert = makePosix;
20417
20417
  const REGIX_IS_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i;
20418
- checkPath.isNotRelative = (path69) => REGIX_IS_WINDOWS_PATH_ABSOLUTE.test(path69) || isNotRelative(path69);
20418
+ checkPath.isNotRelative = (path70) => REGIX_IS_WINDOWS_PATH_ABSOLUTE.test(path70) || isNotRelative(path70);
20419
20419
  }
20420
20420
  }
20421
20421
  });
@@ -22630,7 +22630,7 @@ var require_main2 = __commonJS({
22630
22630
  "../../node_modules/.pnpm/dotenv@16.3.1/node_modules/dotenv/lib/main.js"(exports2, module3) {
22631
22631
  init_import_meta_url();
22632
22632
  var fs29 = require("fs");
22633
- var path69 = require("path");
22633
+ var path70 = require("path");
22634
22634
  var os13 = require("os");
22635
22635
  var crypto7 = require("crypto");
22636
22636
  var packageJson = require_package();
@@ -22729,7 +22729,7 @@ var require_main2 = __commonJS({
22729
22729
  }
22730
22730
  __name(_instructions, "_instructions");
22731
22731
  function _vaultPath(options30) {
22732
- let dotenvPath = path69.resolve(process.cwd(), ".env");
22732
+ let dotenvPath = path70.resolve(process.cwd(), ".env");
22733
22733
  if (options30 && options30.path && options30.path.length > 0) {
22734
22734
  dotenvPath = options30.path;
22735
22735
  }
@@ -22737,7 +22737,7 @@ var require_main2 = __commonJS({
22737
22737
  }
22738
22738
  __name(_vaultPath, "_vaultPath");
22739
22739
  function _resolveHome(envPath) {
22740
- return envPath[0] === "~" ? path69.join(os13.homedir(), envPath.slice(1)) : envPath;
22740
+ return envPath[0] === "~" ? path70.join(os13.homedir(), envPath.slice(1)) : envPath;
22741
22741
  }
22742
22742
  __name(_resolveHome, "_resolveHome");
22743
22743
  function _configVault(options30) {
@@ -22752,7 +22752,7 @@ var require_main2 = __commonJS({
22752
22752
  }
22753
22753
  __name(_configVault, "_configVault");
22754
22754
  function configDotenv(options30) {
22755
- let dotenvPath = path69.resolve(process.cwd(), ".env");
22755
+ let dotenvPath = path70.resolve(process.cwd(), ".env");
22756
22756
  let encoding = "utf8";
22757
22757
  const debug = Boolean(options30 && options30.debug);
22758
22758
  if (options30) {
@@ -28804,13 +28804,13 @@ var require_define_lazy_prop = __commonJS({
28804
28804
  var require_open = __commonJS({
28805
28805
  "../../node_modules/.pnpm/open@8.4.0/node_modules/open/index.js"(exports2, module3) {
28806
28806
  init_import_meta_url();
28807
- var path69 = require("path");
28807
+ var path70 = require("path");
28808
28808
  var childProcess2 = require("child_process");
28809
28809
  var { promises: fs29, constants: fsConstants } = require("fs");
28810
28810
  var isWsl = require_is_wsl();
28811
28811
  var isDocker = require_is_docker();
28812
28812
  var defineLazyProperty = require_define_lazy_prop();
28813
- var localXdgOpenPath = path69.join(__dirname, "xdg-open");
28813
+ var localXdgOpenPath = path70.join(__dirname, "xdg-open");
28814
28814
  var { platform: platform3, arch: arch2 } = process;
28815
28815
  var getWslDrivesMountPoint = (() => {
28816
28816
  const defaultMountPoint = "/mnt/";
@@ -29241,8 +29241,8 @@ var require_path_parse = __commonJS({
29241
29241
  var require_node_modules_paths = __commonJS({
29242
29242
  "../../node_modules/.pnpm/resolve@1.22.8/node_modules/resolve/lib/node-modules-paths.js"(exports2, module3) {
29243
29243
  init_import_meta_url();
29244
- var path69 = require("path");
29245
- var parse8 = path69.parse || require_path_parse();
29244
+ var path70 = require("path");
29245
+ var parse8 = path70.parse || require_path_parse();
29246
29246
  var getNodeModulesDirs = /* @__PURE__ */ __name(function getNodeModulesDirs2(absoluteStart, modules) {
29247
29247
  var prefix = "/";
29248
29248
  if (/^([A-Za-z]:)/.test(absoluteStart)) {
@@ -29258,7 +29258,7 @@ var require_node_modules_paths = __commonJS({
29258
29258
  }
29259
29259
  return paths.reduce(function(dirs, aPath) {
29260
29260
  return dirs.concat(modules.map(function(moduleDir) {
29261
- return path69.resolve(prefix, aPath, moduleDir);
29261
+ return path70.resolve(prefix, aPath, moduleDir);
29262
29262
  }));
29263
29263
  }, []);
29264
29264
  }, "getNodeModulesDirs");
@@ -29624,7 +29624,7 @@ var require_async = __commonJS({
29624
29624
  init_import_meta_url();
29625
29625
  var fs29 = require("fs");
29626
29626
  var getHomedir = require_homedir();
29627
- var path69 = require("path");
29627
+ var path70 = require("path");
29628
29628
  var caller = require_caller();
29629
29629
  var nodeModulesPaths = require_node_modules_paths();
29630
29630
  var normalizeOptions = require_normalize_options();
@@ -29633,8 +29633,8 @@ var require_async = __commonJS({
29633
29633
  var homedir3 = getHomedir();
29634
29634
  var defaultPaths = /* @__PURE__ */ __name(function() {
29635
29635
  return [
29636
- path69.join(homedir3, ".node_modules"),
29637
- path69.join(homedir3, ".node_libraries")
29636
+ path70.join(homedir3, ".node_modules"),
29637
+ path70.join(homedir3, ".node_libraries")
29638
29638
  ];
29639
29639
  }, "defaultPaths");
29640
29640
  var defaultIsFile = /* @__PURE__ */ __name(function isFile(file, cb2) {
@@ -29689,7 +29689,7 @@ var require_async = __commonJS({
29689
29689
  var getPackageCandidates = /* @__PURE__ */ __name(function getPackageCandidates2(x6, start, opts) {
29690
29690
  var dirs = nodeModulesPaths(start, opts, x6);
29691
29691
  for (var i5 = 0; i5 < dirs.length; i5++) {
29692
- dirs[i5] = path69.join(dirs[i5], x6);
29692
+ dirs[i5] = path70.join(dirs[i5], x6);
29693
29693
  }
29694
29694
  return dirs;
29695
29695
  }, "getPackageCandidates");
@@ -29721,10 +29721,10 @@ var require_async = __commonJS({
29721
29721
  var packageIterator = opts.packageIterator;
29722
29722
  var extensions = opts.extensions || [".js"];
29723
29723
  var includeCoreModules = opts.includeCoreModules !== false;
29724
- var basedir = opts.basedir || path69.dirname(caller());
29724
+ var basedir = opts.basedir || path70.dirname(caller());
29725
29725
  var parent = opts.filename || basedir;
29726
29726
  opts.paths = opts.paths || defaultPaths();
29727
- var absoluteStart = path69.resolve(basedir);
29727
+ var absoluteStart = path70.resolve(basedir);
29728
29728
  maybeRealpath(
29729
29729
  realpath2,
29730
29730
  absoluteStart,
@@ -29739,7 +29739,7 @@ var require_async = __commonJS({
29739
29739
  var res;
29740
29740
  function init2(basedir2) {
29741
29741
  if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/.test(x6)) {
29742
- res = path69.resolve(basedir2, x6);
29742
+ res = path70.resolve(basedir2, x6);
29743
29743
  if (x6 === "." || x6 === ".." || x6.slice(-1) === "/")
29744
29744
  res += "/";
29745
29745
  if (/\/$/.test(x6) && res === basedir2) {
@@ -29810,19 +29810,19 @@ var require_async = __commonJS({
29810
29810
  if (pkg)
29811
29811
  onpkg(null, pkg);
29812
29812
  else
29813
- loadpkg(path69.dirname(file), onpkg);
29813
+ loadpkg(path70.dirname(file), onpkg);
29814
29814
  function onpkg(err2, pkg_, dir) {
29815
29815
  pkg = pkg_;
29816
29816
  if (err2)
29817
29817
  return cb3(err2);
29818
29818
  if (dir && pkg && opts.pathFilter) {
29819
- var rfile = path69.relative(dir, file);
29819
+ var rfile = path70.relative(dir, file);
29820
29820
  var rel = rfile.slice(0, rfile.length - exts2[0].length);
29821
29821
  var r7 = opts.pathFilter(pkg, x8, rel);
29822
29822
  if (r7)
29823
29823
  return load(
29824
29824
  [""].concat(extensions.slice()),
29825
- path69.resolve(dir, r7),
29825
+ path70.resolve(dir, r7),
29826
29826
  pkg
29827
29827
  );
29828
29828
  }
@@ -29851,11 +29851,11 @@ var require_async = __commonJS({
29851
29851
  return cb3(null);
29852
29852
  maybeRealpath(realpath2, dir, opts, function(unwrapErr, pkgdir) {
29853
29853
  if (unwrapErr)
29854
- return loadpkg(path69.dirname(dir), cb3);
29855
- var pkgfile = path69.join(pkgdir, "package.json");
29854
+ return loadpkg(path70.dirname(dir), cb3);
29855
+ var pkgfile = path70.join(pkgdir, "package.json");
29856
29856
  isFile(pkgfile, function(err2, ex) {
29857
29857
  if (!ex)
29858
- return loadpkg(path69.dirname(dir), cb3);
29858
+ return loadpkg(path70.dirname(dir), cb3);
29859
29859
  readPackage(readFile17, pkgfile, function(err3, pkgParam) {
29860
29860
  if (err3)
29861
29861
  cb3(err3);
@@ -29879,12 +29879,12 @@ var require_async = __commonJS({
29879
29879
  maybeRealpath(realpath2, x7, opts, function(unwrapErr, pkgdir) {
29880
29880
  if (unwrapErr)
29881
29881
  return cb3(unwrapErr);
29882
- var pkgfile = path69.join(pkgdir, "package.json");
29882
+ var pkgfile = path70.join(pkgdir, "package.json");
29883
29883
  isFile(pkgfile, function(err2, ex) {
29884
29884
  if (err2)
29885
29885
  return cb3(err2);
29886
29886
  if (!ex)
29887
- return loadAsFile(path69.join(x7, "index"), fpkg, cb3);
29887
+ return loadAsFile(path70.join(x7, "index"), fpkg, cb3);
29888
29888
  readPackage(readFile17, pkgfile, function(err3, pkgParam) {
29889
29889
  if (err3)
29890
29890
  return cb3(err3);
@@ -29901,25 +29901,25 @@ var require_async = __commonJS({
29901
29901
  if (pkg.main === "." || pkg.main === "./") {
29902
29902
  pkg.main = "index";
29903
29903
  }
29904
- loadAsFile(path69.resolve(x7, pkg.main), pkg, function(err4, m6, pkg2) {
29904
+ loadAsFile(path70.resolve(x7, pkg.main), pkg, function(err4, m6, pkg2) {
29905
29905
  if (err4)
29906
29906
  return cb3(err4);
29907
29907
  if (m6)
29908
29908
  return cb3(null, m6, pkg2);
29909
29909
  if (!pkg2)
29910
- return loadAsFile(path69.join(x7, "index"), pkg2, cb3);
29911
- var dir = path69.resolve(x7, pkg2.main);
29910
+ return loadAsFile(path70.join(x7, "index"), pkg2, cb3);
29911
+ var dir = path70.resolve(x7, pkg2.main);
29912
29912
  loadAsDirectory(dir, pkg2, function(err5, n6, pkg3) {
29913
29913
  if (err5)
29914
29914
  return cb3(err5);
29915
29915
  if (n6)
29916
29916
  return cb3(null, n6, pkg3);
29917
- loadAsFile(path69.join(x7, "index"), pkg3, cb3);
29917
+ loadAsFile(path70.join(x7, "index"), pkg3, cb3);
29918
29918
  });
29919
29919
  });
29920
29920
  return;
29921
29921
  }
29922
- loadAsFile(path69.join(x7, "/index"), pkg, cb3);
29922
+ loadAsFile(path70.join(x7, "/index"), pkg, cb3);
29923
29923
  });
29924
29924
  });
29925
29925
  });
@@ -29929,7 +29929,7 @@ var require_async = __commonJS({
29929
29929
  if (dirs.length === 0)
29930
29930
  return cb3(null, void 0);
29931
29931
  var dir = dirs[0];
29932
- isDirectory2(path69.dirname(dir), isdir);
29932
+ isDirectory2(path70.dirname(dir), isdir);
29933
29933
  function isdir(err2, isdir2) {
29934
29934
  if (err2)
29935
29935
  return cb3(err2);
@@ -30169,7 +30169,7 @@ var require_sync = __commonJS({
30169
30169
  init_import_meta_url();
30170
30170
  var isCore = require_is_core_module();
30171
30171
  var fs29 = require("fs");
30172
- var path69 = require("path");
30172
+ var path70 = require("path");
30173
30173
  var getHomedir = require_homedir();
30174
30174
  var caller = require_caller();
30175
30175
  var nodeModulesPaths = require_node_modules_paths();
@@ -30178,8 +30178,8 @@ var require_sync = __commonJS({
30178
30178
  var homedir3 = getHomedir();
30179
30179
  var defaultPaths = /* @__PURE__ */ __name(function() {
30180
30180
  return [
30181
- path69.join(homedir3, ".node_modules"),
30182
- path69.join(homedir3, ".node_libraries")
30181
+ path70.join(homedir3, ".node_modules"),
30182
+ path70.join(homedir3, ".node_libraries")
30183
30183
  ];
30184
30184
  }, "defaultPaths");
30185
30185
  var defaultIsFile = /* @__PURE__ */ __name(function isFile(file) {
@@ -30229,7 +30229,7 @@ var require_sync = __commonJS({
30229
30229
  var getPackageCandidates = /* @__PURE__ */ __name(function getPackageCandidates2(x6, start, opts) {
30230
30230
  var dirs = nodeModulesPaths(start, opts, x6);
30231
30231
  for (var i5 = 0; i5 < dirs.length; i5++) {
30232
- dirs[i5] = path69.join(dirs[i5], x6);
30232
+ dirs[i5] = path70.join(dirs[i5], x6);
30233
30233
  }
30234
30234
  return dirs;
30235
30235
  }, "getPackageCandidates");
@@ -30249,12 +30249,12 @@ var require_sync = __commonJS({
30249
30249
  var packageIterator = opts.packageIterator;
30250
30250
  var extensions = opts.extensions || [".js"];
30251
30251
  var includeCoreModules = opts.includeCoreModules !== false;
30252
- var basedir = opts.basedir || path69.dirname(caller());
30252
+ var basedir = opts.basedir || path70.dirname(caller());
30253
30253
  var parent = opts.filename || basedir;
30254
30254
  opts.paths = opts.paths || defaultPaths();
30255
- var absoluteStart = maybeRealpathSync(realpathSync4, path69.resolve(basedir), opts);
30255
+ var absoluteStart = maybeRealpathSync(realpathSync4, path70.resolve(basedir), opts);
30256
30256
  if (/^(?:\.\.?(?:\/|$)|\/|([A-Za-z]:)?[/\\])/.test(x6)) {
30257
- var res = path69.resolve(absoluteStart, x6);
30257
+ var res = path70.resolve(absoluteStart, x6);
30258
30258
  if (x6 === "." || x6 === ".." || x6.slice(-1) === "/")
30259
30259
  res += "/";
30260
30260
  var m6 = loadAsFileSync(res) || loadAsDirectorySync(res);
@@ -30271,12 +30271,12 @@ var require_sync = __commonJS({
30271
30271
  err.code = "MODULE_NOT_FOUND";
30272
30272
  throw err;
30273
30273
  function loadAsFileSync(x7) {
30274
- var pkg = loadpkg(path69.dirname(x7));
30274
+ var pkg = loadpkg(path70.dirname(x7));
30275
30275
  if (pkg && pkg.dir && pkg.pkg && opts.pathFilter) {
30276
- var rfile = path69.relative(pkg.dir, x7);
30276
+ var rfile = path70.relative(pkg.dir, x7);
30277
30277
  var r7 = opts.pathFilter(pkg.pkg, x7, rfile);
30278
30278
  if (r7) {
30279
- x7 = path69.resolve(pkg.dir, r7);
30279
+ x7 = path70.resolve(pkg.dir, r7);
30280
30280
  }
30281
30281
  }
30282
30282
  if (isFile(x7)) {
@@ -30298,9 +30298,9 @@ var require_sync = __commonJS({
30298
30298
  }
30299
30299
  if (/[/\\]node_modules[/\\]*$/.test(dir))
30300
30300
  return;
30301
- var pkgfile = path69.join(maybeRealpathSync(realpathSync4, dir, opts), "package.json");
30301
+ var pkgfile = path70.join(maybeRealpathSync(realpathSync4, dir, opts), "package.json");
30302
30302
  if (!isFile(pkgfile)) {
30303
- return loadpkg(path69.dirname(dir));
30303
+ return loadpkg(path70.dirname(dir));
30304
30304
  }
30305
30305
  var pkg = readPackageSync(readFileSync27, pkgfile);
30306
30306
  if (pkg && opts.packageFilter) {
@@ -30314,7 +30314,7 @@ var require_sync = __commonJS({
30314
30314
  }
30315
30315
  __name(loadpkg, "loadpkg");
30316
30316
  function loadAsDirectorySync(x7) {
30317
- var pkgfile = path69.join(maybeRealpathSync(realpathSync4, x7, opts), "/package.json");
30317
+ var pkgfile = path70.join(maybeRealpathSync(realpathSync4, x7, opts), "/package.json");
30318
30318
  if (isFile(pkgfile)) {
30319
30319
  try {
30320
30320
  var pkg = readPackageSync(readFileSync27, pkgfile);
@@ -30337,17 +30337,17 @@ var require_sync = __commonJS({
30337
30337
  pkg.main = "index";
30338
30338
  }
30339
30339
  try {
30340
- var m7 = loadAsFileSync(path69.resolve(x7, pkg.main));
30340
+ var m7 = loadAsFileSync(path70.resolve(x7, pkg.main));
30341
30341
  if (m7)
30342
30342
  return m7;
30343
- var n7 = loadAsDirectorySync(path69.resolve(x7, pkg.main));
30343
+ var n7 = loadAsDirectorySync(path70.resolve(x7, pkg.main));
30344
30344
  if (n7)
30345
30345
  return n7;
30346
30346
  } catch (e7) {
30347
30347
  }
30348
30348
  }
30349
30349
  }
30350
- return loadAsFileSync(path69.join(x7, "/index"));
30350
+ return loadAsFileSync(path70.join(x7, "/index"));
30351
30351
  }
30352
30352
  __name(loadAsDirectorySync, "loadAsDirectorySync");
30353
30353
  function loadNodeModulesSync(x7, start) {
@@ -30357,7 +30357,7 @@ var require_sync = __commonJS({
30357
30357
  var dirs = packageIterator ? packageIterator(x7, start, thunk, opts) : thunk();
30358
30358
  for (var i5 = 0; i5 < dirs.length; i5++) {
30359
30359
  var dir = dirs[i5];
30360
- if (isDirectory2(path69.dirname(dir))) {
30360
+ if (isDirectory2(path70.dirname(dir))) {
30361
30361
  var m7 = loadAsFileSync(dir);
30362
30362
  if (m7)
30363
30363
  return m7;
@@ -30630,7 +30630,7 @@ var require_utils3 = __commonJS({
30630
30630
  init_import_meta_url();
30631
30631
  var fs29 = require("fs");
30632
30632
  var ini = require_ini();
30633
- var path69 = require("path");
30633
+ var path70 = require("path");
30634
30634
  var stripJsonComments = require_strip_json_comments();
30635
30635
  var parse8 = exports2.parse = function(content) {
30636
30636
  if (/^\s*{/.test(content))
@@ -30644,7 +30644,7 @@ var require_utils3 = __commonJS({
30644
30644
  for (var i5 in args)
30645
30645
  if ("string" !== typeof args[i5])
30646
30646
  return;
30647
- var file2 = path69.join.apply(null, args);
30647
+ var file2 = path70.join.apply(null, args);
30648
30648
  var content;
30649
30649
  try {
30650
30650
  return fs29.readFileSync(file2, "utf-8");
@@ -30682,15 +30682,15 @@ var require_utils3 = __commonJS({
30682
30682
  return obj;
30683
30683
  };
30684
30684
  var find = exports2.find = function() {
30685
- var rel = path69.join.apply(null, [].slice.call(arguments));
30685
+ var rel = path70.join.apply(null, [].slice.call(arguments));
30686
30686
  function find2(start, rel2) {
30687
- var file2 = path69.join(start, rel2);
30687
+ var file2 = path70.join(start, rel2);
30688
30688
  try {
30689
30689
  fs29.statSync(file2);
30690
30690
  return file2;
30691
30691
  } catch (err) {
30692
- if (path69.dirname(start) !== start)
30693
- return find2(path69.dirname(start), rel2);
30692
+ if (path70.dirname(start) !== start)
30693
+ return find2(path70.dirname(start), rel2);
30694
30694
  }
30695
30695
  }
30696
30696
  __name(find2, "find");
@@ -31203,8 +31203,8 @@ var require_registry_auth_token = __commonJS({
31203
31203
  return void 0;
31204
31204
  }
31205
31205
  __name(getLegacyAuthInfo, "getLegacyAuthInfo");
31206
- function normalizePath2(path69) {
31207
- return path69[path69.length - 1] === "/" ? path69 : path69 + "/";
31206
+ function normalizePath2(path70) {
31207
+ return path70[path70.length - 1] === "/" ? path70 : path70 + "/";
31208
31208
  }
31209
31209
  __name(normalizePath2, "normalizePath");
31210
31210
  function getAuthInfoForUrl(regUrl, npmrc) {
@@ -35169,9 +35169,9 @@ var require_websocket_server = __commonJS({
35169
35169
  }
35170
35170
  });
35171
35171
 
35172
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/forge.js
35172
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/forge.js
35173
35173
  var require_forge = __commonJS({
35174
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/forge.js"(exports2, module3) {
35174
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/forge.js"(exports2, module3) {
35175
35175
  init_import_meta_url();
35176
35176
  module3.exports = {
35177
35177
  // default options
@@ -35182,9 +35182,9 @@ var require_forge = __commonJS({
35182
35182
  }
35183
35183
  });
35184
35184
 
35185
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/baseN.js
35185
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/baseN.js
35186
35186
  var require_baseN = __commonJS({
35187
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/baseN.js"(exports2, module3) {
35187
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/baseN.js"(exports2, module3) {
35188
35188
  init_import_meta_url();
35189
35189
  var api = {};
35190
35190
  module3.exports = api;
@@ -35298,9 +35298,9 @@ var require_baseN = __commonJS({
35298
35298
  }
35299
35299
  });
35300
35300
 
35301
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/util.js
35301
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/util.js
35302
35302
  var require_util10 = __commonJS({
35303
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/util.js"(exports2, module3) {
35303
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/util.js"(exports2, module3) {
35304
35304
  init_import_meta_url();
35305
35305
  var forge = require_forge();
35306
35306
  var baseN = require_baseN();
@@ -36686,9 +36686,9 @@ var require_util10 = __commonJS({
36686
36686
  }
36687
36687
  });
36688
36688
 
36689
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/cipher.js
36689
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/cipher.js
36690
36690
  var require_cipher = __commonJS({
36691
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/cipher.js"(exports2, module3) {
36691
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/cipher.js"(exports2, module3) {
36692
36692
  init_import_meta_url();
36693
36693
  var forge = require_forge();
36694
36694
  require_util10();
@@ -36804,9 +36804,9 @@ var require_cipher = __commonJS({
36804
36804
  }
36805
36805
  });
36806
36806
 
36807
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/cipherModes.js
36807
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/cipherModes.js
36808
36808
  var require_cipherModes = __commonJS({
36809
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/cipherModes.js"(exports2, module3) {
36809
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/cipherModes.js"(exports2, module3) {
36810
36810
  init_import_meta_url();
36811
36811
  var forge = require_forge();
36812
36812
  require_util10();
@@ -37458,9 +37458,9 @@ var require_cipherModes = __commonJS({
37458
37458
  }
37459
37459
  });
37460
37460
 
37461
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/aes.js
37461
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/aes.js
37462
37462
  var require_aes = __commonJS({
37463
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/aes.js"(exports2, module3) {
37463
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/aes.js"(exports2, module3) {
37464
37464
  init_import_meta_url();
37465
37465
  var forge = require_forge();
37466
37466
  require_cipher();
@@ -37739,9 +37739,9 @@ var require_aes = __commonJS({
37739
37739
  }
37740
37740
  });
37741
37741
 
37742
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/oids.js
37742
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/oids.js
37743
37743
  var require_oids = __commonJS({
37744
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/oids.js"(exports2, module3) {
37744
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/oids.js"(exports2, module3) {
37745
37745
  init_import_meta_url();
37746
37746
  var forge = require_forge();
37747
37747
  forge.pki = forge.pki || {};
@@ -37886,9 +37886,9 @@ var require_oids = __commonJS({
37886
37886
  }
37887
37887
  });
37888
37888
 
37889
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/asn1.js
37889
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/asn1.js
37890
37890
  var require_asn1 = __commonJS({
37891
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/asn1.js"(exports2, module3) {
37891
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/asn1.js"(exports2, module3) {
37892
37892
  init_import_meta_url();
37893
37893
  var forge = require_forge();
37894
37894
  require_util10();
@@ -38674,9 +38674,9 @@ var require_asn1 = __commonJS({
38674
38674
  }
38675
38675
  });
38676
38676
 
38677
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/md.js
38677
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/md.js
38678
38678
  var require_md = __commonJS({
38679
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/md.js"(exports2, module3) {
38679
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/md.js"(exports2, module3) {
38680
38680
  init_import_meta_url();
38681
38681
  var forge = require_forge();
38682
38682
  module3.exports = forge.md = forge.md || {};
@@ -38684,9 +38684,9 @@ var require_md = __commonJS({
38684
38684
  }
38685
38685
  });
38686
38686
 
38687
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/hmac.js
38687
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/hmac.js
38688
38688
  var require_hmac = __commonJS({
38689
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/hmac.js"(exports2, module3) {
38689
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/hmac.js"(exports2, module3) {
38690
38690
  init_import_meta_url();
38691
38691
  var forge = require_forge();
38692
38692
  require_md();
@@ -38767,9 +38767,9 @@ var require_hmac = __commonJS({
38767
38767
  }
38768
38768
  });
38769
38769
 
38770
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/md5.js
38770
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/md5.js
38771
38771
  var require_md5 = __commonJS({
38772
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/md5.js"(exports2, module3) {
38772
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/md5.js"(exports2, module3) {
38773
38773
  init_import_meta_url();
38774
38774
  var forge = require_forge();
38775
38775
  require_md();
@@ -39062,9 +39062,9 @@ var require_md5 = __commonJS({
39062
39062
  }
39063
39063
  });
39064
39064
 
39065
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pem.js
39065
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pem.js
39066
39066
  var require_pem = __commonJS({
39067
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pem.js"(exports2, module3) {
39067
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pem.js"(exports2, module3) {
39068
39068
  init_import_meta_url();
39069
39069
  var forge = require_forge();
39070
39070
  require_util10();
@@ -39216,9 +39216,9 @@ var require_pem = __commonJS({
39216
39216
  }
39217
39217
  });
39218
39218
 
39219
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/des.js
39219
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/des.js
39220
39220
  var require_des = __commonJS({
39221
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/des.js"(exports2, module3) {
39221
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/des.js"(exports2, module3) {
39222
39222
  init_import_meta_url();
39223
39223
  var forge = require_forge();
39224
39224
  require_cipher();
@@ -39459,9 +39459,9 @@ var require_des = __commonJS({
39459
39459
  }
39460
39460
  });
39461
39461
 
39462
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pbkdf2.js
39462
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pbkdf2.js
39463
39463
  var require_pbkdf2 = __commonJS({
39464
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pbkdf2.js"(exports2, module3) {
39464
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pbkdf2.js"(exports2, module3) {
39465
39465
  init_import_meta_url();
39466
39466
  var forge = require_forge();
39467
39467
  require_hmac();
@@ -39577,9 +39577,9 @@ var require_pbkdf2 = __commonJS({
39577
39577
  }
39578
39578
  });
39579
39579
 
39580
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/sha256.js
39580
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/sha256.js
39581
39581
  var require_sha256 = __commonJS({
39582
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/sha256.js"(exports2, module3) {
39582
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/sha256.js"(exports2, module3) {
39583
39583
  init_import_meta_url();
39584
39584
  var forge = require_forge();
39585
39585
  require_md();
@@ -39813,9 +39813,9 @@ var require_sha256 = __commonJS({
39813
39813
  }
39814
39814
  });
39815
39815
 
39816
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/prng.js
39816
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/prng.js
39817
39817
  var require_prng = __commonJS({
39818
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/prng.js"(exports2, module3) {
39818
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/prng.js"(exports2, module3) {
39819
39819
  init_import_meta_url();
39820
39820
  var forge = require_forge();
39821
39821
  require_util10();
@@ -40060,9 +40060,9 @@ var require_prng = __commonJS({
40060
40060
  }
40061
40061
  });
40062
40062
 
40063
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/random.js
40063
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/random.js
40064
40064
  var require_random2 = __commonJS({
40065
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/random.js"(exports2, module3) {
40065
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/random.js"(exports2, module3) {
40066
40066
  init_import_meta_url();
40067
40067
  var forge = require_forge();
40068
40068
  require_aes();
@@ -40170,9 +40170,9 @@ var require_random2 = __commonJS({
40170
40170
  }
40171
40171
  });
40172
40172
 
40173
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/rc2.js
40173
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/rc2.js
40174
40174
  var require_rc2 = __commonJS({
40175
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/rc2.js"(exports2, module3) {
40175
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/rc2.js"(exports2, module3) {
40176
40176
  init_import_meta_url();
40177
40177
  var forge = require_forge();
40178
40178
  require_util10();
@@ -40632,9 +40632,9 @@ var require_rc2 = __commonJS({
40632
40632
  }
40633
40633
  });
40634
40634
 
40635
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/jsbn.js
40635
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/jsbn.js
40636
40636
  var require_jsbn = __commonJS({
40637
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/jsbn.js"(exports2, module3) {
40637
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/jsbn.js"(exports2, module3) {
40638
40638
  init_import_meta_url();
40639
40639
  var forge = require_forge();
40640
40640
  module3.exports = forge.jsbn = forge.jsbn || {};
@@ -42070,9 +42070,9 @@ var require_jsbn = __commonJS({
42070
42070
  }
42071
42071
  });
42072
42072
 
42073
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/sha1.js
42073
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/sha1.js
42074
42074
  var require_sha1 = __commonJS({
42075
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/sha1.js"(exports2, module3) {
42075
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/sha1.js"(exports2, module3) {
42076
42076
  init_import_meta_url();
42077
42077
  var forge = require_forge();
42078
42078
  require_md();
@@ -42269,9 +42269,9 @@ var require_sha1 = __commonJS({
42269
42269
  }
42270
42270
  });
42271
42271
 
42272
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pkcs1.js
42272
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pkcs1.js
42273
42273
  var require_pkcs1 = __commonJS({
42274
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pkcs1.js"(exports2, module3) {
42274
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pkcs1.js"(exports2, module3) {
42275
42275
  init_import_meta_url();
42276
42276
  var forge = require_forge();
42277
42277
  require_util10();
@@ -42423,9 +42423,9 @@ var require_pkcs1 = __commonJS({
42423
42423
  }
42424
42424
  });
42425
42425
 
42426
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/prime.js
42426
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/prime.js
42427
42427
  var require_prime = __commonJS({
42428
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/prime.js"(exports2, module3) {
42428
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/prime.js"(exports2, module3) {
42429
42429
  init_import_meta_url();
42430
42430
  var forge = require_forge();
42431
42431
  require_util10();
@@ -42605,9 +42605,9 @@ var require_prime = __commonJS({
42605
42605
  }
42606
42606
  });
42607
42607
 
42608
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/rsa.js
42608
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/rsa.js
42609
42609
  var require_rsa = __commonJS({
42610
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/rsa.js"(exports2, module3) {
42610
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/rsa.js"(exports2, module3) {
42611
42611
  init_import_meta_url();
42612
42612
  var forge = require_forge();
42613
42613
  require_asn1();
@@ -42812,6 +42812,9 @@ var require_rsa = __commonJS({
42812
42812
  name: "DigestInfo.DigestAlgorithm.parameters",
42813
42813
  tagClass: asn1.Class.UNIVERSAL,
42814
42814
  type: asn1.Type.NULL,
42815
+ // captured only to check existence for md2 and md5
42816
+ capture: "parameters",
42817
+ optional: true,
42815
42818
  constructed: false
42816
42819
  }]
42817
42820
  }, {
@@ -43315,6 +43318,13 @@ var require_rsa = __commonJS({
43315
43318
  error2.oid = oid;
43316
43319
  throw error2;
43317
43320
  }
43321
+ if (oid === forge.oids.md2 || oid === forge.oids.md5) {
43322
+ if (!("parameters" in capture)) {
43323
+ throw new Error(
43324
+ "ASN.1 object does not contain a valid RSASSA-PKCS1-v1_5 DigestInfo value. Missing algorithm identifer NULL parameters."
43325
+ );
43326
+ }
43327
+ }
43318
43328
  return digest2 === capture.digest;
43319
43329
  }
43320
43330
  };
@@ -43810,9 +43820,9 @@ var require_rsa = __commonJS({
43810
43820
  }
43811
43821
  });
43812
43822
 
43813
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pbe.js
43823
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pbe.js
43814
43824
  var require_pbe = __commonJS({
43815
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pbe.js"(exports2, module3) {
43825
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pbe.js"(exports2, module3) {
43816
43826
  init_import_meta_url();
43817
43827
  var forge = require_forge();
43818
43828
  require_aes();
@@ -44592,9 +44602,9 @@ var require_pbe = __commonJS({
44592
44602
  }
44593
44603
  });
44594
44604
 
44595
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pkcs7asn1.js
44605
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pkcs7asn1.js
44596
44606
  var require_pkcs7asn1 = __commonJS({
44597
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pkcs7asn1.js"(exports2, module3) {
44607
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pkcs7asn1.js"(exports2, module3) {
44598
44608
  init_import_meta_url();
44599
44609
  var forge = require_forge();
44600
44610
  require_asn1();
@@ -44894,9 +44904,9 @@ var require_pkcs7asn1 = __commonJS({
44894
44904
  }
44895
44905
  });
44896
44906
 
44897
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/mgf1.js
44907
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/mgf1.js
44898
44908
  var require_mgf1 = __commonJS({
44899
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/mgf1.js"(exports2, module3) {
44909
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/mgf1.js"(exports2, module3) {
44900
44910
  init_import_meta_url();
44901
44911
  var forge = require_forge();
44902
44912
  require_util10();
@@ -44930,9 +44940,9 @@ var require_mgf1 = __commonJS({
44930
44940
  }
44931
44941
  });
44932
44942
 
44933
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/mgf.js
44943
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/mgf.js
44934
44944
  var require_mgf = __commonJS({
44935
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/mgf.js"(exports2, module3) {
44945
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/mgf.js"(exports2, module3) {
44936
44946
  init_import_meta_url();
44937
44947
  var forge = require_forge();
44938
44948
  require_mgf1();
@@ -44941,9 +44951,9 @@ var require_mgf = __commonJS({
44941
44951
  }
44942
44952
  });
44943
44953
 
44944
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pss.js
44954
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pss.js
44945
44955
  var require_pss = __commonJS({
44946
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pss.js"(exports2, module3) {
44956
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pss.js"(exports2, module3) {
44947
44957
  init_import_meta_url();
44948
44958
  var forge = require_forge();
44949
44959
  require_random2();
@@ -45061,9 +45071,9 @@ var require_pss = __commonJS({
45061
45071
  }
45062
45072
  });
45063
45073
 
45064
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/x509.js
45074
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/x509.js
45065
45075
  var require_x509 = __commonJS({
45066
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/x509.js"(exports2, module3) {
45076
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/x509.js"(exports2, module3) {
45067
45077
  init_import_meta_url();
45068
45078
  var forge = require_forge();
45069
45079
  require_aes();
@@ -47188,9 +47198,9 @@ var require_x509 = __commonJS({
47188
47198
  }
47189
47199
  });
47190
47200
 
47191
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pkcs12.js
47201
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pkcs12.js
47192
47202
  var require_pkcs12 = __commonJS({
47193
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pkcs12.js"(exports2, module3) {
47203
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pkcs12.js"(exports2, module3) {
47194
47204
  init_import_meta_url();
47195
47205
  var forge = require_forge();
47196
47206
  require_asn1();
@@ -48053,9 +48063,9 @@ var require_pkcs12 = __commonJS({
48053
48063
  }
48054
48064
  });
48055
48065
 
48056
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pki.js
48066
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pki.js
48057
48067
  var require_pki = __commonJS({
48058
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pki.js"(exports2, module3) {
48068
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pki.js"(exports2, module3) {
48059
48069
  init_import_meta_url();
48060
48070
  var forge = require_forge();
48061
48071
  require_asn1();
@@ -48107,9 +48117,9 @@ var require_pki = __commonJS({
48107
48117
  }
48108
48118
  });
48109
48119
 
48110
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/tls.js
48120
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/tls.js
48111
48121
  var require_tls = __commonJS({
48112
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/tls.js"(exports2, module3) {
48122
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/tls.js"(exports2, module3) {
48113
48123
  init_import_meta_url();
48114
48124
  var forge = require_forge();
48115
48125
  require_asn1();
@@ -50141,9 +50151,9 @@ var require_tls = __commonJS({
50141
50151
  }
50142
50152
  });
50143
50153
 
50144
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/aesCipherSuites.js
50154
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/aesCipherSuites.js
50145
50155
  var require_aesCipherSuites = __commonJS({
50146
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/aesCipherSuites.js"(exports2, module3) {
50156
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/aesCipherSuites.js"(exports2, module3) {
50147
50157
  init_import_meta_url();
50148
50158
  var forge = require_forge();
50149
50159
  require_aes();
@@ -50292,9 +50302,9 @@ var require_aesCipherSuites = __commonJS({
50292
50302
  }
50293
50303
  });
50294
50304
 
50295
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/sha512.js
50305
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/sha512.js
50296
50306
  var require_sha512 = __commonJS({
50297
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/sha512.js"(exports2, module3) {
50307
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/sha512.js"(exports2, module3) {
50298
50308
  init_import_meta_url();
50299
50309
  var forge = require_forge();
50300
50310
  require_md();
@@ -50703,9 +50713,9 @@ var require_sha512 = __commonJS({
50703
50713
  }
50704
50714
  });
50705
50715
 
50706
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/asn1-validator.js
50716
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/asn1-validator.js
50707
50717
  var require_asn1_validator = __commonJS({
50708
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/asn1-validator.js"(exports2) {
50718
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/asn1-validator.js"(exports2) {
50709
50719
  init_import_meta_url();
50710
50720
  var forge = require_forge();
50711
50721
  require_asn1();
@@ -50796,9 +50806,9 @@ var require_asn1_validator = __commonJS({
50796
50806
  }
50797
50807
  });
50798
50808
 
50799
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/ed25519.js
50809
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/ed25519.js
50800
50810
  var require_ed25519 = __commonJS({
50801
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/ed25519.js"(exports2, module3) {
50811
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/ed25519.js"(exports2, module3) {
50802
50812
  init_import_meta_url();
50803
50813
  var forge = require_forge();
50804
50814
  require_jsbn();
@@ -51924,9 +51934,9 @@ var require_ed25519 = __commonJS({
51924
51934
  }
51925
51935
  });
51926
51936
 
51927
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/kem.js
51937
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/kem.js
51928
51938
  var require_kem = __commonJS({
51929
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/kem.js"(exports2, module3) {
51939
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/kem.js"(exports2, module3) {
51930
51940
  init_import_meta_url();
51931
51941
  var forge = require_forge();
51932
51942
  require_util10();
@@ -51989,9 +51999,9 @@ var require_kem = __commonJS({
51989
51999
  }
51990
52000
  });
51991
52001
 
51992
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/log.js
52002
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/log.js
51993
52003
  var require_log = __commonJS({
51994
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/log.js"(exports2, module3) {
52004
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/log.js"(exports2, module3) {
51995
52005
  init_import_meta_url();
51996
52006
  var forge = require_forge();
51997
52007
  require_util10();
@@ -52165,9 +52175,9 @@ var require_log = __commonJS({
52165
52175
  }
52166
52176
  });
52167
52177
 
52168
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/md.all.js
52178
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/md.all.js
52169
52179
  var require_md_all = __commonJS({
52170
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/md.all.js"(exports2, module3) {
52180
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/md.all.js"(exports2, module3) {
52171
52181
  init_import_meta_url();
52172
52182
  module3.exports = require_md();
52173
52183
  require_md5();
@@ -52177,9 +52187,9 @@ var require_md_all = __commonJS({
52177
52187
  }
52178
52188
  });
52179
52189
 
52180
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pkcs7.js
52190
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pkcs7.js
52181
52191
  var require_pkcs7 = __commonJS({
52182
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/pkcs7.js"(exports2, module3) {
52192
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/pkcs7.js"(exports2, module3) {
52183
52193
  init_import_meta_url();
52184
52194
  var forge = require_forge();
52185
52195
  require_aes();
@@ -53179,9 +53189,9 @@ var require_pkcs7 = __commonJS({
53179
53189
  }
53180
53190
  });
53181
53191
 
53182
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/ssh.js
53192
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/ssh.js
53183
53193
  var require_ssh = __commonJS({
53184
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/ssh.js"(exports2, module3) {
53194
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/ssh.js"(exports2, module3) {
53185
53195
  init_import_meta_url();
53186
53196
  var forge = require_forge();
53187
53197
  require_aes();
@@ -53319,9 +53329,9 @@ var require_ssh = __commonJS({
53319
53329
  }
53320
53330
  });
53321
53331
 
53322
- // ../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/index.js
53332
+ // ../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/index.js
53323
53333
  var require_lib2 = __commonJS({
53324
- "../../node_modules/.pnpm/node-forge@1.3.0/node_modules/node-forge/lib/index.js"(exports2, module3) {
53334
+ "../../node_modules/.pnpm/node-forge@1.3.1/node_modules/node-forge/lib/index.js"(exports2, module3) {
53325
53335
  init_import_meta_url();
53326
53336
  module3.exports = require_forge();
53327
53337
  require_aes();
@@ -53552,11 +53562,11 @@ var require_Mime = __commonJS({
53552
53562
  }
53553
53563
  }
53554
53564
  };
53555
- Mime.prototype.getType = function(path69) {
53556
- path69 = String(path69);
53557
- let last = path69.replace(/^.*[/\\]/, "").toLowerCase();
53565
+ Mime.prototype.getType = function(path70) {
53566
+ path70 = String(path70);
53567
+ let last = path70.replace(/^.*[/\\]/, "").toLowerCase();
53558
53568
  let ext = last.replace(/^.*\./, "").toLowerCase();
53559
- let hasPath = last.length < path69.length;
53569
+ let hasPath = last.length < path70.length;
53560
53570
  let hasDot = ext.length < last.length - 1;
53561
53571
  return (hasDot || !hasPath) && this._types[ext] || null;
53562
53572
  };
@@ -53642,15 +53652,15 @@ var require_eventemitter3 = __commonJS({
53642
53652
  }
53643
53653
  __name(EventEmitter5, "EventEmitter");
53644
53654
  EventEmitter5.prototype.eventNames = /* @__PURE__ */ __name(function eventNames() {
53645
- var names = [], events4, name2;
53655
+ var names = [], events5, name2;
53646
53656
  if (this._eventsCount === 0)
53647
53657
  return names;
53648
- for (name2 in events4 = this._events) {
53649
- if (has.call(events4, name2))
53658
+ for (name2 in events5 = this._events) {
53659
+ if (has.call(events5, name2))
53650
53660
  names.push(prefix ? name2.slice(1) : name2);
53651
53661
  }
53652
53662
  if (Object.getOwnPropertySymbols) {
53653
- return names.concat(Object.getOwnPropertySymbols(events4));
53663
+ return names.concat(Object.getOwnPropertySymbols(events5));
53654
53664
  }
53655
53665
  return names;
53656
53666
  }, "eventNames");
@@ -53748,13 +53758,13 @@ var require_eventemitter3 = __commonJS({
53748
53758
  clearEvent(this, evt);
53749
53759
  }
53750
53760
  } else {
53751
- for (var i5 = 0, events4 = [], length = listeners.length; i5 < length; i5++) {
53761
+ for (var i5 = 0, events5 = [], length = listeners.length; i5 < length; i5++) {
53752
53762
  if (listeners[i5].fn !== fn2 || once && !listeners[i5].once || context2 && listeners[i5].context !== context2) {
53753
- events4.push(listeners[i5]);
53763
+ events5.push(listeners[i5]);
53754
53764
  }
53755
53765
  }
53756
- if (events4.length)
53757
- this._events[evt] = events4.length === 1 ? events4[0] : events4;
53766
+ if (events5.length)
53767
+ this._events[evt] = events5.length === 1 ? events5[0] : events5;
53758
53768
  else
53759
53769
  clearEvent(this, evt);
53760
53770
  }
@@ -53923,7 +53933,7 @@ var require_command_exists = __commonJS({
53923
53933
  var exec3 = require("child_process").exec;
53924
53934
  var execSync4 = require("child_process").execSync;
53925
53935
  var fs29 = require("fs");
53926
- var path69 = require("path");
53936
+ var path70 = require("path");
53927
53937
  var access3 = fs29.access;
53928
53938
  var accessSync = fs29.accessSync;
53929
53939
  var constants3 = fs29.constants || fs29;
@@ -54027,8 +54037,8 @@ var require_command_exists = __commonJS({
54027
54037
  cleanInput = /* @__PURE__ */ __name(function(s5) {
54028
54038
  var isPathName = /[\\]/.test(s5);
54029
54039
  if (isPathName) {
54030
- var dirname17 = '"' + path69.dirname(s5) + '"';
54031
- var basename7 = '"' + path69.basename(s5) + '"';
54040
+ var dirname17 = '"' + path70.dirname(s5) + '"';
54041
+ var basename7 = '"' + path70.basename(s5) + '"';
54032
54042
  return dirname17 + ":" + basename7;
54033
54043
  }
54034
54044
  return '"' + s5 + '"';
@@ -54079,7 +54089,7 @@ var require_windows = __commonJS({
54079
54089
  module3.exports = isexe;
54080
54090
  isexe.sync = sync;
54081
54091
  var fs29 = require("fs");
54082
- function checkPathExt(path69, options30) {
54092
+ function checkPathExt(path70, options30) {
54083
54093
  var pathext = options30.pathExt !== void 0 ? options30.pathExt : process.env.PATHEXT;
54084
54094
  if (!pathext) {
54085
54095
  return true;
@@ -54090,28 +54100,28 @@ var require_windows = __commonJS({
54090
54100
  }
54091
54101
  for (var i5 = 0; i5 < pathext.length; i5++) {
54092
54102
  var p6 = pathext[i5].toLowerCase();
54093
- if (p6 && path69.substr(-p6.length).toLowerCase() === p6) {
54103
+ if (p6 && path70.substr(-p6.length).toLowerCase() === p6) {
54094
54104
  return true;
54095
54105
  }
54096
54106
  }
54097
54107
  return false;
54098
54108
  }
54099
54109
  __name(checkPathExt, "checkPathExt");
54100
- function checkStat(stat8, path69, options30) {
54110
+ function checkStat(stat8, path70, options30) {
54101
54111
  if (!stat8.isSymbolicLink() && !stat8.isFile()) {
54102
54112
  return false;
54103
54113
  }
54104
- return checkPathExt(path69, options30);
54114
+ return checkPathExt(path70, options30);
54105
54115
  }
54106
54116
  __name(checkStat, "checkStat");
54107
- function isexe(path69, options30, cb2) {
54108
- fs29.stat(path69, function(er, stat8) {
54109
- cb2(er, er ? false : checkStat(stat8, path69, options30));
54117
+ function isexe(path70, options30, cb2) {
54118
+ fs29.stat(path70, function(er, stat8) {
54119
+ cb2(er, er ? false : checkStat(stat8, path70, options30));
54110
54120
  });
54111
54121
  }
54112
54122
  __name(isexe, "isexe");
54113
- function sync(path69, options30) {
54114
- return checkStat(fs29.statSync(path69), path69, options30);
54123
+ function sync(path70, options30) {
54124
+ return checkStat(fs29.statSync(path70), path70, options30);
54115
54125
  }
54116
54126
  __name(sync, "sync");
54117
54127
  }
@@ -54124,14 +54134,14 @@ var require_mode = __commonJS({
54124
54134
  module3.exports = isexe;
54125
54135
  isexe.sync = sync;
54126
54136
  var fs29 = require("fs");
54127
- function isexe(path69, options30, cb2) {
54128
- fs29.stat(path69, function(er, stat8) {
54137
+ function isexe(path70, options30, cb2) {
54138
+ fs29.stat(path70, function(er, stat8) {
54129
54139
  cb2(er, er ? false : checkStat(stat8, options30));
54130
54140
  });
54131
54141
  }
54132
54142
  __name(isexe, "isexe");
54133
- function sync(path69, options30) {
54134
- return checkStat(fs29.statSync(path69), options30);
54143
+ function sync(path70, options30) {
54144
+ return checkStat(fs29.statSync(path70), options30);
54135
54145
  }
54136
54146
  __name(sync, "sync");
54137
54147
  function checkStat(stat8, options30) {
@@ -54168,7 +54178,7 @@ var require_isexe = __commonJS({
54168
54178
  }
54169
54179
  module3.exports = isexe;
54170
54180
  isexe.sync = sync;
54171
- function isexe(path69, options30, cb2) {
54181
+ function isexe(path70, options30, cb2) {
54172
54182
  if (typeof options30 === "function") {
54173
54183
  cb2 = options30;
54174
54184
  options30 = {};
@@ -54178,7 +54188,7 @@ var require_isexe = __commonJS({
54178
54188
  throw new TypeError("callback not provided");
54179
54189
  }
54180
54190
  return new Promise(function(resolve24, reject) {
54181
- isexe(path69, options30 || {}, function(er, is2) {
54191
+ isexe(path70, options30 || {}, function(er, is2) {
54182
54192
  if (er) {
54183
54193
  reject(er);
54184
54194
  } else {
@@ -54187,7 +54197,7 @@ var require_isexe = __commonJS({
54187
54197
  });
54188
54198
  });
54189
54199
  }
54190
- core(path69, options30 || {}, function(er, is2) {
54200
+ core(path70, options30 || {}, function(er, is2) {
54191
54201
  if (er) {
54192
54202
  if (er.code === "EACCES" || options30 && options30.ignoreErrors) {
54193
54203
  er = null;
@@ -54198,9 +54208,9 @@ var require_isexe = __commonJS({
54198
54208
  });
54199
54209
  }
54200
54210
  __name(isexe, "isexe");
54201
- function sync(path69, options30) {
54211
+ function sync(path70, options30) {
54202
54212
  try {
54203
- return core.sync(path69, options30 || {});
54213
+ return core.sync(path70, options30 || {});
54204
54214
  } catch (er) {
54205
54215
  if (options30 && options30.ignoreErrors || er.code === "EACCES") {
54206
54216
  return false;
@@ -54218,7 +54228,7 @@ var require_which = __commonJS({
54218
54228
  "../../node_modules/.pnpm/which@2.0.2/node_modules/which/which.js"(exports2, module3) {
54219
54229
  init_import_meta_url();
54220
54230
  var isWindows4 = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
54221
- var path69 = require("path");
54231
+ var path70 = require("path");
54222
54232
  var COLON = isWindows4 ? ";" : ":";
54223
54233
  var isexe = require_isexe();
54224
54234
  var getNotFoundError = /* @__PURE__ */ __name((cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" }), "getNotFoundError");
@@ -54256,7 +54266,7 @@ var require_which = __commonJS({
54256
54266
  return opt.all && found.length ? resolve24(found) : reject(getNotFoundError(cmd));
54257
54267
  const ppRaw = pathEnv[i5];
54258
54268
  const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
54259
- const pCmd = path69.join(pathPart, cmd);
54269
+ const pCmd = path70.join(pathPart, cmd);
54260
54270
  const p6 = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
54261
54271
  resolve24(subStep(p6, i5, 0));
54262
54272
  }), "step");
@@ -54283,7 +54293,7 @@ var require_which = __commonJS({
54283
54293
  for (let i5 = 0; i5 < pathEnv.length; i5++) {
54284
54294
  const ppRaw = pathEnv[i5];
54285
54295
  const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
54286
- const pCmd = path69.join(pathPart, cmd);
54296
+ const pCmd = path70.join(pathPart, cmd);
54287
54297
  const p6 = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
54288
54298
  for (let j6 = 0; j6 < pathExt.length; j6++) {
54289
54299
  const cur = p6 + pathExt[j6];
@@ -54333,7 +54343,7 @@ var require_resolveCommand = __commonJS({
54333
54343
  "../../node_modules/.pnpm/cross-spawn@7.0.3/node_modules/cross-spawn/lib/util/resolveCommand.js"(exports2, module3) {
54334
54344
  "use strict";
54335
54345
  init_import_meta_url();
54336
- var path69 = require("path");
54346
+ var path70 = require("path");
54337
54347
  var which = require_which();
54338
54348
  var getPathKey = require_path_key();
54339
54349
  function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -54351,7 +54361,7 @@ var require_resolveCommand = __commonJS({
54351
54361
  try {
54352
54362
  resolved = which.sync(parsed.command, {
54353
54363
  path: env7[getPathKey({ env: env7 })],
54354
- pathExt: withoutPathExt ? path69.delimiter : void 0
54364
+ pathExt: withoutPathExt ? path70.delimiter : void 0
54355
54365
  });
54356
54366
  } catch (e7) {
54357
54367
  } finally {
@@ -54360,7 +54370,7 @@ var require_resolveCommand = __commonJS({
54360
54370
  }
54361
54371
  }
54362
54372
  if (resolved) {
54363
- resolved = path69.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
54373
+ resolved = path70.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
54364
54374
  }
54365
54375
  return resolved;
54366
54376
  }
@@ -54421,8 +54431,8 @@ var require_shebang_command = __commonJS({
54421
54431
  if (!match2) {
54422
54432
  return null;
54423
54433
  }
54424
- const [path69, argument] = match2[0].replace(/#! ?/, "").split(" ");
54425
- const binary = path69.split("/").pop();
54434
+ const [path70, argument] = match2[0].replace(/#! ?/, "").split(" ");
54435
+ const binary = path70.split("/").pop();
54426
54436
  if (binary === "env") {
54427
54437
  return argument;
54428
54438
  }
@@ -54460,7 +54470,7 @@ var require_parse3 = __commonJS({
54460
54470
  "../../node_modules/.pnpm/cross-spawn@7.0.3/node_modules/cross-spawn/lib/parse.js"(exports2, module3) {
54461
54471
  "use strict";
54462
54472
  init_import_meta_url();
54463
- var path69 = require("path");
54473
+ var path70 = require("path");
54464
54474
  var resolveCommand = require_resolveCommand();
54465
54475
  var escape2 = require_escape();
54466
54476
  var readShebang = require_readShebang();
@@ -54486,7 +54496,7 @@ var require_parse3 = __commonJS({
54486
54496
  const needsShell = !isExecutableRegExp.test(commandFile);
54487
54497
  if (parsed.options.forceShell || needsShell) {
54488
54498
  const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
54489
- parsed.command = path69.normalize(parsed.command);
54499
+ parsed.command = path70.normalize(parsed.command);
54490
54500
  parsed.command = escape2.command(parsed.command);
54491
54501
  parsed.args = parsed.args.map((arg) => escape2.argument(arg, needsDoubleEscapeMetaChars));
54492
54502
  const shellCommand = [parsed.command].concat(parsed.args).join(" ");
@@ -54664,9 +54674,9 @@ function npmRunPath(options30 = {}) {
54664
54674
  }
54665
54675
  function npmRunPathEnv({ env: env7 = import_node_process8.default.env, ...options30 } = {}) {
54666
54676
  env7 = { ...env7 };
54667
- const path69 = pathKey({ env: env7 });
54668
- options30.path = env7[path69];
54669
- env7[path69] = npmRunPath(options30);
54677
+ const path70 = pathKey({ env: env7 });
54678
+ options30.path = env7[path70];
54679
+ env7[path70] = npmRunPath(options30);
54670
54680
  return env7;
54671
54681
  }
54672
54682
  var import_node_process8, import_node_path25, import_node_url10;
@@ -56120,8 +56130,8 @@ var require_minimatch = __commonJS({
56120
56130
  return new Minimatch2(pattern, options30).match(p6);
56121
56131
  };
56122
56132
  module3.exports = minimatch;
56123
- var path69 = require_path();
56124
- minimatch.sep = path69.sep;
56133
+ var path70 = require_path();
56134
+ minimatch.sep = path70.sep;
56125
56135
  var GLOBSTAR = Symbol("globstar **");
56126
56136
  minimatch.GLOBSTAR = GLOBSTAR;
56127
56137
  var expand = require_brace_expansion();
@@ -56642,8 +56652,8 @@ var require_minimatch = __commonJS({
56642
56652
  if (f5 === "/" && partial)
56643
56653
  return true;
56644
56654
  const options30 = this.options;
56645
- if (path69.sep !== "/") {
56646
- f5 = f5.split(path69.sep).join("/");
56655
+ if (path70.sep !== "/") {
56656
+ f5 = f5.split(path70.sep).join("/");
56647
56657
  }
56648
56658
  f5 = f5.split(slashSplit);
56649
56659
  this.debug(this.pattern, "split", f5);
@@ -56743,7 +56753,7 @@ var init_esm = __esm({
56743
56753
  this._directoryFilter = normalizeFilter(opts.directoryFilter);
56744
56754
  const statMethod = opts.lstat ? import_fs8.lstatSync : import_fs8.statSync;
56745
56755
  if (wantBigintFsStats) {
56746
- this._stat = (path69) => statMethod(path69, { bigint: true });
56756
+ this._stat = (path70) => statMethod(path70, { bigint: true });
56747
56757
  } else {
56748
56758
  this._stat = statMethod;
56749
56759
  }
@@ -56768,8 +56778,8 @@ var init_esm = __esm({
56768
56778
  const par = this.parent;
56769
56779
  const fil = par && par.files;
56770
56780
  if (fil && fil.length > 0) {
56771
- const { path: path69, depth } = par;
56772
- const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path69));
56781
+ const { path: path70, depth } = par;
56782
+ const slice = fil.splice(0, batch).map((dirent) => this._formatEntry(dirent, path70));
56773
56783
  for (const entry of slice) {
56774
56784
  if (!entry) {
56775
56785
  batch--;
@@ -56810,20 +56820,20 @@ var init_esm = __esm({
56810
56820
  this.reading = false;
56811
56821
  }
56812
56822
  }
56813
- async _exploreDir(path69, depth) {
56823
+ async _exploreDir(path70, depth) {
56814
56824
  let files;
56815
56825
  try {
56816
- files = await (0, import_promises12.readdir)(path69, this._rdOptions);
56826
+ files = await (0, import_promises12.readdir)(path70, this._rdOptions);
56817
56827
  } catch (error2) {
56818
56828
  this._onError(error2);
56819
56829
  }
56820
- return { files, depth, path: path69 };
56830
+ return { files, depth, path: path70 };
56821
56831
  }
56822
- _formatEntry(dirent, path69) {
56832
+ _formatEntry(dirent, path70) {
56823
56833
  let entry;
56824
56834
  const basename7 = this._isDirent ? dirent.name : dirent;
56825
56835
  try {
56826
- const fullPath = (0, import_path8.resolve)((0, import_path8.join)(path69, basename7));
56836
+ const fullPath = (0, import_path8.resolve)((0, import_path8.join)(path70, basename7));
56827
56837
  entry = { path: (0, import_path8.relative)(this._root, fullPath), fullPath, basename: basename7 };
56828
56838
  entry[this._statsProp] = this._isDirent ? dirent : this._stat(fullPath);
56829
56839
  } catch (err) {
@@ -56897,16 +56907,16 @@ var init_esm = __esm({
56897
56907
  });
56898
56908
 
56899
56909
  // ../../node_modules/.pnpm/chokidar@4.0.1/node_modules/chokidar/esm/handler.js
56900
- function createFsWatchInstance(path69, options30, listener, errHandler, emitRaw) {
56910
+ function createFsWatchInstance(path70, options30, listener, errHandler, emitRaw) {
56901
56911
  const handleEvent = /* @__PURE__ */ __name((rawEvent, evPath) => {
56902
- listener(path69);
56903
- emitRaw(rawEvent, evPath, { watchedPath: path69 });
56904
- if (evPath && path69 !== evPath) {
56905
- fsWatchBroadcast(sysPath.resolve(path69, evPath), KEY_LISTENERS, sysPath.join(path69, evPath));
56912
+ listener(path70);
56913
+ emitRaw(rawEvent, evPath, { watchedPath: path70 });
56914
+ if (evPath && path70 !== evPath) {
56915
+ fsWatchBroadcast(sysPath.resolve(path70, evPath), KEY_LISTENERS, sysPath.join(path70, evPath));
56906
56916
  }
56907
56917
  }, "handleEvent");
56908
56918
  try {
56909
- return (0, import_fs9.watch)(path69, {
56919
+ return (0, import_fs9.watch)(path70, {
56910
56920
  persistent: options30.persistent
56911
56921
  }, handleEvent);
56912
56922
  } catch (error2) {
@@ -57255,12 +57265,12 @@ var init_handler = __esm({
57255
57265
  listener(val1, val2, val3);
57256
57266
  });
57257
57267
  }, "fsWatchBroadcast");
57258
- setFsWatchListener = /* @__PURE__ */ __name((path69, fullPath, options30, handlers2) => {
57268
+ setFsWatchListener = /* @__PURE__ */ __name((path70, fullPath, options30, handlers2) => {
57259
57269
  const { listener, errHandler, rawEmitter } = handlers2;
57260
57270
  let cont = FsWatchInstances.get(fullPath);
57261
57271
  let watcher;
57262
57272
  if (!options30.persistent) {
57263
- watcher = createFsWatchInstance(path69, options30, listener, errHandler, rawEmitter);
57273
+ watcher = createFsWatchInstance(path70, options30, listener, errHandler, rawEmitter);
57264
57274
  if (!watcher)
57265
57275
  return;
57266
57276
  return watcher.close.bind(watcher);
@@ -57271,7 +57281,7 @@ var init_handler = __esm({
57271
57281
  addAndConvert(cont, KEY_RAW, rawEmitter);
57272
57282
  } else {
57273
57283
  watcher = createFsWatchInstance(
57274
- path69,
57284
+ path70,
57275
57285
  options30,
57276
57286
  fsWatchBroadcast.bind(null, fullPath, KEY_LISTENERS),
57277
57287
  errHandler,
@@ -57286,7 +57296,7 @@ var init_handler = __esm({
57286
57296
  cont.watcherUnusable = true;
57287
57297
  if (isWindows2 && error2.code === "EPERM") {
57288
57298
  try {
57289
- const fd = await (0, import_promises13.open)(path69, "r");
57299
+ const fd = await (0, import_promises13.open)(path70, "r");
57290
57300
  await fd.close();
57291
57301
  broadcastErr(error2);
57292
57302
  } catch (err) {
@@ -57317,7 +57327,7 @@ var init_handler = __esm({
57317
57327
  };
57318
57328
  }, "setFsWatchListener");
57319
57329
  FsWatchFileInstances = /* @__PURE__ */ new Map();
57320
- setFsWatchFileListener = /* @__PURE__ */ __name((path69, fullPath, options30, handlers2) => {
57330
+ setFsWatchFileListener = /* @__PURE__ */ __name((path70, fullPath, options30, handlers2) => {
57321
57331
  const { listener, rawEmitter } = handlers2;
57322
57332
  let cont = FsWatchFileInstances.get(fullPath);
57323
57333
  const copts = cont && cont.options;
@@ -57339,7 +57349,7 @@ var init_handler = __esm({
57339
57349
  });
57340
57350
  const currmtime = curr.mtimeMs;
57341
57351
  if (curr.size !== prev.size || currmtime > prev.mtimeMs || currmtime === 0) {
57342
- foreach(cont.listeners, (listener2) => listener2(path69, curr));
57352
+ foreach(cont.listeners, (listener2) => listener2(path70, curr));
57343
57353
  }
57344
57354
  })
57345
57355
  };
@@ -57367,13 +57377,13 @@ var init_handler = __esm({
57367
57377
  * @param listener on fs change
57368
57378
  * @returns closer for the watcher instance
57369
57379
  */
57370
- _watchWithNodeFs(path69, listener) {
57380
+ _watchWithNodeFs(path70, listener) {
57371
57381
  const opts = this.fsw.options;
57372
- const directory = sysPath.dirname(path69);
57373
- const basename7 = sysPath.basename(path69);
57382
+ const directory = sysPath.dirname(path70);
57383
+ const basename7 = sysPath.basename(path70);
57374
57384
  const parent = this.fsw._getWatchedDir(directory);
57375
57385
  parent.add(basename7);
57376
- const absolutePath = sysPath.resolve(path69);
57386
+ const absolutePath = sysPath.resolve(path70);
57377
57387
  const options30 = {
57378
57388
  persistent: opts.persistent
57379
57389
  };
@@ -57383,12 +57393,12 @@ var init_handler = __esm({
57383
57393
  if (opts.usePolling) {
57384
57394
  const enableBin = opts.interval !== opts.binaryInterval;
57385
57395
  options30.interval = enableBin && isBinaryPath(basename7) ? opts.binaryInterval : opts.interval;
57386
- closer = setFsWatchFileListener(path69, absolutePath, options30, {
57396
+ closer = setFsWatchFileListener(path70, absolutePath, options30, {
57387
57397
  listener,
57388
57398
  rawEmitter: this.fsw._emitRaw
57389
57399
  });
57390
57400
  } else {
57391
- closer = setFsWatchListener(path69, absolutePath, options30, {
57401
+ closer = setFsWatchListener(path70, absolutePath, options30, {
57392
57402
  listener,
57393
57403
  errHandler: this._boundHandleError,
57394
57404
  rawEmitter: this.fsw._emitRaw
@@ -57410,7 +57420,7 @@ var init_handler = __esm({
57410
57420
  let prevStats = stats;
57411
57421
  if (parent.has(basename7))
57412
57422
  return;
57413
- const listener = /* @__PURE__ */ __name(async (path69, newStats) => {
57423
+ const listener = /* @__PURE__ */ __name(async (path70, newStats) => {
57414
57424
  if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file, 5))
57415
57425
  return;
57416
57426
  if (!newStats || newStats.mtimeMs === 0) {
@@ -57424,11 +57434,11 @@ var init_handler = __esm({
57424
57434
  this.fsw._emit(EV.CHANGE, file, newStats2);
57425
57435
  }
57426
57436
  if ((isMacos || isLinux) && prevStats.ino !== newStats2.ino) {
57427
- this.fsw._closeFile(path69);
57437
+ this.fsw._closeFile(path70);
57428
57438
  prevStats = newStats2;
57429
57439
  const closer2 = this._watchWithNodeFs(file, listener);
57430
57440
  if (closer2)
57431
- this.fsw._addPathCloser(path69, closer2);
57441
+ this.fsw._addPathCloser(path70, closer2);
57432
57442
  } else {
57433
57443
  prevStats = newStats2;
57434
57444
  }
@@ -57460,7 +57470,7 @@ var init_handler = __esm({
57460
57470
  * @param item basename of this item
57461
57471
  * @returns true if no more processing is needed for this entry.
57462
57472
  */
57463
- async _handleSymlink(entry, directory, path69, item) {
57473
+ async _handleSymlink(entry, directory, path70, item) {
57464
57474
  if (this.fsw.closed) {
57465
57475
  return;
57466
57476
  }
@@ -57470,7 +57480,7 @@ var init_handler = __esm({
57470
57480
  this.fsw._incrReadyCount();
57471
57481
  let linkPath;
57472
57482
  try {
57473
- linkPath = await (0, import_promises13.realpath)(path69);
57483
+ linkPath = await (0, import_promises13.realpath)(path70);
57474
57484
  } catch (e7) {
57475
57485
  this.fsw._emitReady();
57476
57486
  return true;
@@ -57480,12 +57490,12 @@ var init_handler = __esm({
57480
57490
  if (dir.has(item)) {
57481
57491
  if (this.fsw._symlinkPaths.get(full) !== linkPath) {
57482
57492
  this.fsw._symlinkPaths.set(full, linkPath);
57483
- this.fsw._emit(EV.CHANGE, path69, entry.stats);
57493
+ this.fsw._emit(EV.CHANGE, path70, entry.stats);
57484
57494
  }
57485
57495
  } else {
57486
57496
  dir.add(item);
57487
57497
  this.fsw._symlinkPaths.set(full, linkPath);
57488
- this.fsw._emit(EV.ADD, path69, entry.stats);
57498
+ this.fsw._emit(EV.ADD, path70, entry.stats);
57489
57499
  }
57490
57500
  this.fsw._emitReady();
57491
57501
  return true;
@@ -57514,9 +57524,9 @@ var init_handler = __esm({
57514
57524
  return;
57515
57525
  }
57516
57526
  const item = entry.path;
57517
- let path69 = sysPath.join(directory, item);
57527
+ let path70 = sysPath.join(directory, item);
57518
57528
  current.add(item);
57519
- if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path69, item)) {
57529
+ if (entry.stats.isSymbolicLink() && await this._handleSymlink(entry, directory, path70, item)) {
57520
57530
  return;
57521
57531
  }
57522
57532
  if (this.fsw.closed) {
@@ -57525,8 +57535,8 @@ var init_handler = __esm({
57525
57535
  }
57526
57536
  if (item === target || !target && !previous.has(item)) {
57527
57537
  this.fsw._incrReadyCount();
57528
- path69 = sysPath.join(dir, sysPath.relative(dir, path69));
57529
- this._addToNodeFs(path69, initialAdd, wh, depth + 1);
57538
+ path70 = sysPath.join(dir, sysPath.relative(dir, path70));
57539
+ this._addToNodeFs(path70, initialAdd, wh, depth + 1);
57530
57540
  }
57531
57541
  }).on(EV.ERROR, this._boundHandleError);
57532
57542
  return new Promise((resolve24, reject) => {
@@ -57595,13 +57605,13 @@ var init_handler = __esm({
57595
57605
  * @param depth Child path actually targeted for watch
57596
57606
  * @param target Child path actually targeted for watch
57597
57607
  */
57598
- async _addToNodeFs(path69, initialAdd, priorWh, depth, target) {
57608
+ async _addToNodeFs(path70, initialAdd, priorWh, depth, target) {
57599
57609
  const ready = this.fsw._emitReady;
57600
- if (this.fsw._isIgnored(path69) || this.fsw.closed) {
57610
+ if (this.fsw._isIgnored(path70) || this.fsw.closed) {
57601
57611
  ready();
57602
57612
  return false;
57603
57613
  }
57604
- const wh = this.fsw._getWatchHelpers(path69);
57614
+ const wh = this.fsw._getWatchHelpers(path70);
57605
57615
  if (priorWh) {
57606
57616
  wh.filterPath = (entry) => priorWh.filterPath(entry);
57607
57617
  wh.filterDir = (entry) => priorWh.filterDir(entry);
@@ -57617,8 +57627,8 @@ var init_handler = __esm({
57617
57627
  const follow = this.fsw.options.followSymlinks;
57618
57628
  let closer;
57619
57629
  if (stats.isDirectory()) {
57620
- const absPath = sysPath.resolve(path69);
57621
- const targetPath = follow ? await (0, import_promises13.realpath)(path69) : path69;
57630
+ const absPath = sysPath.resolve(path70);
57631
+ const targetPath = follow ? await (0, import_promises13.realpath)(path70) : path70;
57622
57632
  if (this.fsw.closed)
57623
57633
  return;
57624
57634
  closer = await this._handleDir(wh.watchPath, stats, initialAdd, depth, target, wh, targetPath);
@@ -57628,29 +57638,29 @@ var init_handler = __esm({
57628
57638
  this.fsw._symlinkPaths.set(absPath, targetPath);
57629
57639
  }
57630
57640
  } else if (stats.isSymbolicLink()) {
57631
- const targetPath = follow ? await (0, import_promises13.realpath)(path69) : path69;
57641
+ const targetPath = follow ? await (0, import_promises13.realpath)(path70) : path70;
57632
57642
  if (this.fsw.closed)
57633
57643
  return;
57634
57644
  const parent = sysPath.dirname(wh.watchPath);
57635
57645
  this.fsw._getWatchedDir(parent).add(wh.watchPath);
57636
57646
  this.fsw._emit(EV.ADD, wh.watchPath, stats);
57637
- closer = await this._handleDir(parent, stats, initialAdd, depth, path69, wh, targetPath);
57647
+ closer = await this._handleDir(parent, stats, initialAdd, depth, path70, wh, targetPath);
57638
57648
  if (this.fsw.closed)
57639
57649
  return;
57640
57650
  if (targetPath !== void 0) {
57641
- this.fsw._symlinkPaths.set(sysPath.resolve(path69), targetPath);
57651
+ this.fsw._symlinkPaths.set(sysPath.resolve(path70), targetPath);
57642
57652
  }
57643
57653
  } else {
57644
57654
  closer = this._handleFile(wh.watchPath, stats, initialAdd);
57645
57655
  }
57646
57656
  ready();
57647
57657
  if (closer)
57648
- this.fsw._addPathCloser(path69, closer);
57658
+ this.fsw._addPathCloser(path70, closer);
57649
57659
  return false;
57650
57660
  } catch (error2) {
57651
57661
  if (this.fsw._handleError(error2)) {
57652
57662
  ready();
57653
- return path69;
57663
+ return path70;
57654
57664
  }
57655
57665
  }
57656
57666
  }
@@ -57686,26 +57696,26 @@ function createPattern(matcher) {
57686
57696
  }
57687
57697
  return () => false;
57688
57698
  }
57689
- function normalizePath(path69) {
57690
- if (typeof path69 !== "string")
57699
+ function normalizePath(path70) {
57700
+ if (typeof path70 !== "string")
57691
57701
  throw new Error("string expected");
57692
- path69 = sysPath2.normalize(path69);
57693
- path69 = path69.replace(/\\/g, "/");
57702
+ path70 = sysPath2.normalize(path70);
57703
+ path70 = path70.replace(/\\/g, "/");
57694
57704
  let prepend = false;
57695
- if (path69.startsWith("//"))
57705
+ if (path70.startsWith("//"))
57696
57706
  prepend = true;
57697
57707
  const DOUBLE_SLASH_RE2 = /\/\//;
57698
- while (path69.match(DOUBLE_SLASH_RE2))
57699
- path69 = path69.replace(DOUBLE_SLASH_RE2, "/");
57708
+ while (path70.match(DOUBLE_SLASH_RE2))
57709
+ path70 = path70.replace(DOUBLE_SLASH_RE2, "/");
57700
57710
  if (prepend)
57701
- path69 = "/" + path69;
57702
- return path69;
57711
+ path70 = "/" + path70;
57712
+ return path70;
57703
57713
  }
57704
57714
  function matchPatterns(patterns, testString, stats) {
57705
- const path69 = normalizePath(testString);
57715
+ const path70 = normalizePath(testString);
57706
57716
  for (let index = 0; index < patterns.length; index++) {
57707
57717
  const pattern = patterns[index];
57708
- if (pattern(path69, stats)) {
57718
+ if (pattern(path70, stats)) {
57709
57719
  return true;
57710
57720
  }
57711
57721
  }
@@ -57775,19 +57785,19 @@ var init_esm2 = __esm({
57775
57785
  }
57776
57786
  return str;
57777
57787
  }, "toUnix");
57778
- normalizePathToUnix = /* @__PURE__ */ __name((path69) => toUnix(sysPath2.normalize(toUnix(path69))), "normalizePathToUnix");
57779
- normalizeIgnored = /* @__PURE__ */ __name((cwd2 = "") => (path69) => {
57780
- if (typeof path69 === "string") {
57781
- return normalizePathToUnix(sysPath2.isAbsolute(path69) ? path69 : sysPath2.join(cwd2, path69));
57788
+ normalizePathToUnix = /* @__PURE__ */ __name((path70) => toUnix(sysPath2.normalize(toUnix(path70))), "normalizePathToUnix");
57789
+ normalizeIgnored = /* @__PURE__ */ __name((cwd2 = "") => (path70) => {
57790
+ if (typeof path70 === "string") {
57791
+ return normalizePathToUnix(sysPath2.isAbsolute(path70) ? path70 : sysPath2.join(cwd2, path70));
57782
57792
  } else {
57783
- return path69;
57793
+ return path70;
57784
57794
  }
57785
57795
  }, "normalizeIgnored");
57786
- getAbsolutePath = /* @__PURE__ */ __name((path69, cwd2) => {
57787
- if (sysPath2.isAbsolute(path69)) {
57788
- return path69;
57796
+ getAbsolutePath = /* @__PURE__ */ __name((path70, cwd2) => {
57797
+ if (sysPath2.isAbsolute(path70)) {
57798
+ return path70;
57789
57799
  }
57790
- return sysPath2.join(cwd2, path69);
57800
+ return sysPath2.join(cwd2, path70);
57791
57801
  }, "getAbsolutePath");
57792
57802
  EMPTY_SET = Object.freeze(/* @__PURE__ */ new Set());
57793
57803
  DirEntry = class {
@@ -57843,10 +57853,10 @@ var init_esm2 = __esm({
57843
57853
  STAT_METHOD_F = "stat";
57844
57854
  STAT_METHOD_L = "lstat";
57845
57855
  WatchHelper = class {
57846
- constructor(path69, follow, fsw) {
57856
+ constructor(path70, follow, fsw) {
57847
57857
  this.fsw = fsw;
57848
- const watchPath = path69;
57849
- this.path = path69 = path69.replace(REPLACER_RE, "");
57858
+ const watchPath = path70;
57859
+ this.path = path70 = path70.replace(REPLACER_RE, "");
57850
57860
  this.watchPath = watchPath;
57851
57861
  this.fullWatchPath = sysPath2.resolve(watchPath);
57852
57862
  this.dirParts = [];
@@ -57969,20 +57979,20 @@ var init_esm2 = __esm({
57969
57979
  this._closePromise = void 0;
57970
57980
  let paths = unifyPaths(paths_);
57971
57981
  if (cwd2) {
57972
- paths = paths.map((path69) => {
57973
- const absPath = getAbsolutePath(path69, cwd2);
57982
+ paths = paths.map((path70) => {
57983
+ const absPath = getAbsolutePath(path70, cwd2);
57974
57984
  return absPath;
57975
57985
  });
57976
57986
  }
57977
- paths.forEach((path69) => {
57978
- this._removeIgnoredPath(path69);
57987
+ paths.forEach((path70) => {
57988
+ this._removeIgnoredPath(path70);
57979
57989
  });
57980
57990
  this._userIgnored = void 0;
57981
57991
  if (!this._readyCount)
57982
57992
  this._readyCount = 0;
57983
57993
  this._readyCount += paths.length;
57984
- Promise.all(paths.map(async (path69) => {
57985
- const res = await this._nodeFsHandler._addToNodeFs(path69, !_internal, void 0, 0, _origAdd);
57994
+ Promise.all(paths.map(async (path70) => {
57995
+ const res = await this._nodeFsHandler._addToNodeFs(path70, !_internal, void 0, 0, _origAdd);
57986
57996
  if (res)
57987
57997
  this._emitReady();
57988
57998
  return res;
@@ -58004,17 +58014,17 @@ var init_esm2 = __esm({
58004
58014
  return this;
58005
58015
  const paths = unifyPaths(paths_);
58006
58016
  const { cwd: cwd2 } = this.options;
58007
- paths.forEach((path69) => {
58008
- if (!sysPath2.isAbsolute(path69) && !this._closers.has(path69)) {
58017
+ paths.forEach((path70) => {
58018
+ if (!sysPath2.isAbsolute(path70) && !this._closers.has(path70)) {
58009
58019
  if (cwd2)
58010
- path69 = sysPath2.join(cwd2, path69);
58011
- path69 = sysPath2.resolve(path69);
58020
+ path70 = sysPath2.join(cwd2, path70);
58021
+ path70 = sysPath2.resolve(path70);
58012
58022
  }
58013
- this._closePath(path69);
58014
- this._addIgnoredPath(path69);
58015
- if (this._watched.has(path69)) {
58023
+ this._closePath(path70);
58024
+ this._addIgnoredPath(path70);
58025
+ if (this._watched.has(path70)) {
58016
58026
  this._addIgnoredPath({
58017
- path: path69,
58027
+ path: path70,
58018
58028
  recursive: true
58019
58029
  });
58020
58030
  }
@@ -58078,38 +58088,38 @@ var init_esm2 = __esm({
58078
58088
  * @param stats arguments to be passed with event
58079
58089
  * @returns the error if defined, otherwise the value of the FSWatcher instance's `closed` flag
58080
58090
  */
58081
- async _emit(event, path69, stats) {
58091
+ async _emit(event, path70, stats) {
58082
58092
  if (this.closed)
58083
58093
  return;
58084
58094
  const opts = this.options;
58085
58095
  if (isWindows2)
58086
- path69 = sysPath2.normalize(path69);
58096
+ path70 = sysPath2.normalize(path70);
58087
58097
  if (opts.cwd)
58088
- path69 = sysPath2.relative(opts.cwd, path69);
58089
- const args = [event, path69];
58098
+ path70 = sysPath2.relative(opts.cwd, path70);
58099
+ const args = [event, path70];
58090
58100
  if (stats != null)
58091
58101
  args.push(stats);
58092
58102
  const awf = opts.awaitWriteFinish;
58093
58103
  let pw;
58094
- if (awf && (pw = this._pendingWrites.get(path69))) {
58104
+ if (awf && (pw = this._pendingWrites.get(path70))) {
58095
58105
  pw.lastChange = /* @__PURE__ */ new Date();
58096
58106
  return this;
58097
58107
  }
58098
58108
  if (opts.atomic) {
58099
58109
  if (event === EVENTS.UNLINK) {
58100
- this._pendingUnlinks.set(path69, args);
58110
+ this._pendingUnlinks.set(path70, args);
58101
58111
  setTimeout(() => {
58102
- this._pendingUnlinks.forEach((entry, path70) => {
58112
+ this._pendingUnlinks.forEach((entry, path71) => {
58103
58113
  this.emit(...entry);
58104
58114
  this.emit(EVENTS.ALL, ...entry);
58105
- this._pendingUnlinks.delete(path70);
58115
+ this._pendingUnlinks.delete(path71);
58106
58116
  });
58107
58117
  }, typeof opts.atomic === "number" ? opts.atomic : 100);
58108
58118
  return this;
58109
58119
  }
58110
- if (event === EVENTS.ADD && this._pendingUnlinks.has(path69)) {
58120
+ if (event === EVENTS.ADD && this._pendingUnlinks.has(path70)) {
58111
58121
  event = args[0] = EVENTS.CHANGE;
58112
- this._pendingUnlinks.delete(path69);
58122
+ this._pendingUnlinks.delete(path70);
58113
58123
  }
58114
58124
  }
58115
58125
  if (awf && (event === EVENTS.ADD || event === EVENTS.CHANGE) && this._readyEmitted) {
@@ -58127,16 +58137,16 @@ var init_esm2 = __esm({
58127
58137
  this.emitWithAll(event, args);
58128
58138
  }
58129
58139
  }, "awfEmit");
58130
- this._awaitWriteFinish(path69, awf.stabilityThreshold, event, awfEmit);
58140
+ this._awaitWriteFinish(path70, awf.stabilityThreshold, event, awfEmit);
58131
58141
  return this;
58132
58142
  }
58133
58143
  if (event === EVENTS.CHANGE) {
58134
- const isThrottled = !this._throttle(EVENTS.CHANGE, path69, 50);
58144
+ const isThrottled = !this._throttle(EVENTS.CHANGE, path70, 50);
58135
58145
  if (isThrottled)
58136
58146
  return this;
58137
58147
  }
58138
58148
  if (opts.alwaysStat && stats === void 0 && (event === EVENTS.ADD || event === EVENTS.ADD_DIR || event === EVENTS.CHANGE)) {
58139
- const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path69) : path69;
58149
+ const fullPath = opts.cwd ? sysPath2.join(opts.cwd, path70) : path70;
58140
58150
  let stats2;
58141
58151
  try {
58142
58152
  stats2 = await (0, import_promises14.stat)(fullPath);
@@ -58167,23 +58177,23 @@ var init_esm2 = __esm({
58167
58177
  * @param timeout duration of time to suppress duplicate actions
58168
58178
  * @returns tracking object or false if action should be suppressed
58169
58179
  */
58170
- _throttle(actionType, path69, timeout2) {
58180
+ _throttle(actionType, path70, timeout2) {
58171
58181
  if (!this._throttled.has(actionType)) {
58172
58182
  this._throttled.set(actionType, /* @__PURE__ */ new Map());
58173
58183
  }
58174
58184
  const action = this._throttled.get(actionType);
58175
58185
  if (!action)
58176
58186
  throw new Error("invalid throttle");
58177
- const actionPath = action.get(path69);
58187
+ const actionPath = action.get(path70);
58178
58188
  if (actionPath) {
58179
58189
  actionPath.count++;
58180
58190
  return false;
58181
58191
  }
58182
58192
  let timeoutObject;
58183
58193
  const clear = /* @__PURE__ */ __name(() => {
58184
- const item = action.get(path69);
58194
+ const item = action.get(path70);
58185
58195
  const count = item ? item.count : 0;
58186
- action.delete(path69);
58196
+ action.delete(path70);
58187
58197
  clearTimeout(timeoutObject);
58188
58198
  if (item)
58189
58199
  clearTimeout(item.timeoutObject);
@@ -58191,7 +58201,7 @@ var init_esm2 = __esm({
58191
58201
  }, "clear");
58192
58202
  timeoutObject = setTimeout(clear, timeout2);
58193
58203
  const thr = { timeoutObject, clear, count: 0 };
58194
- action.set(path69, thr);
58204
+ action.set(path70, thr);
58195
58205
  return thr;
58196
58206
  }
58197
58207
  _incrReadyCount() {
@@ -58205,33 +58215,33 @@ var init_esm2 = __esm({
58205
58215
  * @param event
58206
58216
  * @param awfEmit Callback to be called when ready for event to be emitted.
58207
58217
  */
58208
- _awaitWriteFinish(path69, threshold, event, awfEmit) {
58218
+ _awaitWriteFinish(path70, threshold, event, awfEmit) {
58209
58219
  const awf = this.options.awaitWriteFinish;
58210
58220
  if (typeof awf !== "object")
58211
58221
  return;
58212
58222
  const pollInterval = awf.pollInterval;
58213
58223
  let timeoutHandler;
58214
- let fullPath = path69;
58215
- if (this.options.cwd && !sysPath2.isAbsolute(path69)) {
58216
- fullPath = sysPath2.join(this.options.cwd, path69);
58224
+ let fullPath = path70;
58225
+ if (this.options.cwd && !sysPath2.isAbsolute(path70)) {
58226
+ fullPath = sysPath2.join(this.options.cwd, path70);
58217
58227
  }
58218
58228
  const now = /* @__PURE__ */ new Date();
58219
58229
  const writes = this._pendingWrites;
58220
58230
  function awaitWriteFinishFn(prevStat) {
58221
58231
  (0, import_fs10.stat)(fullPath, (err, curStat) => {
58222
- if (err || !writes.has(path69)) {
58232
+ if (err || !writes.has(path70)) {
58223
58233
  if (err && err.code !== "ENOENT")
58224
58234
  awfEmit(err);
58225
58235
  return;
58226
58236
  }
58227
58237
  const now2 = Number(/* @__PURE__ */ new Date());
58228
58238
  if (prevStat && curStat.size !== prevStat.size) {
58229
- writes.get(path69).lastChange = now2;
58239
+ writes.get(path70).lastChange = now2;
58230
58240
  }
58231
- const pw = writes.get(path69);
58241
+ const pw = writes.get(path70);
58232
58242
  const df = now2 - pw.lastChange;
58233
58243
  if (df >= threshold) {
58234
- writes.delete(path69);
58244
+ writes.delete(path70);
58235
58245
  awfEmit(void 0, curStat);
58236
58246
  } else {
58237
58247
  timeoutHandler = setTimeout(awaitWriteFinishFn, pollInterval, curStat);
@@ -58239,11 +58249,11 @@ var init_esm2 = __esm({
58239
58249
  });
58240
58250
  }
58241
58251
  __name(awaitWriteFinishFn, "awaitWriteFinishFn");
58242
- if (!writes.has(path69)) {
58243
- writes.set(path69, {
58252
+ if (!writes.has(path70)) {
58253
+ writes.set(path70, {
58244
58254
  lastChange: now,
58245
58255
  cancelWait: () => {
58246
- writes.delete(path69);
58256
+ writes.delete(path70);
58247
58257
  clearTimeout(timeoutHandler);
58248
58258
  return event;
58249
58259
  }
@@ -58254,8 +58264,8 @@ var init_esm2 = __esm({
58254
58264
  /**
58255
58265
  * Determines whether user has asked to ignore this path.
58256
58266
  */
58257
- _isIgnored(path69, stats) {
58258
- if (this.options.atomic && DOT_RE.test(path69))
58267
+ _isIgnored(path70, stats) {
58268
+ if (this.options.atomic && DOT_RE.test(path70))
58259
58269
  return true;
58260
58270
  if (!this._userIgnored) {
58261
58271
  const { cwd: cwd2 } = this.options;
@@ -58265,17 +58275,17 @@ var init_esm2 = __esm({
58265
58275
  const list = [...ignoredPaths.map(normalizeIgnored(cwd2)), ...ignored];
58266
58276
  this._userIgnored = anymatch(list, void 0);
58267
58277
  }
58268
- return this._userIgnored(path69, stats);
58278
+ return this._userIgnored(path70, stats);
58269
58279
  }
58270
- _isntIgnored(path69, stat8) {
58271
- return !this._isIgnored(path69, stat8);
58280
+ _isntIgnored(path70, stat8) {
58281
+ return !this._isIgnored(path70, stat8);
58272
58282
  }
58273
58283
  /**
58274
58284
  * Provides a set of common helpers and properties relating to symlink handling.
58275
58285
  * @param path file or directory pattern being watched
58276
58286
  */
58277
- _getWatchHelpers(path69) {
58278
- return new WatchHelper(path69, this.options.followSymlinks, this);
58287
+ _getWatchHelpers(path70) {
58288
+ return new WatchHelper(path70, this.options.followSymlinks, this);
58279
58289
  }
58280
58290
  // Directory helpers
58281
58291
  // -----------------
@@ -58307,63 +58317,63 @@ var init_esm2 = __esm({
58307
58317
  * @param item base path of item/directory
58308
58318
  */
58309
58319
  _remove(directory, item, isDirectory2) {
58310
- const path69 = sysPath2.join(directory, item);
58311
- const fullPath = sysPath2.resolve(path69);
58312
- isDirectory2 = isDirectory2 != null ? isDirectory2 : this._watched.has(path69) || this._watched.has(fullPath);
58313
- if (!this._throttle("remove", path69, 100))
58320
+ const path70 = sysPath2.join(directory, item);
58321
+ const fullPath = sysPath2.resolve(path70);
58322
+ isDirectory2 = isDirectory2 != null ? isDirectory2 : this._watched.has(path70) || this._watched.has(fullPath);
58323
+ if (!this._throttle("remove", path70, 100))
58314
58324
  return;
58315
58325
  if (!isDirectory2 && this._watched.size === 1) {
58316
58326
  this.add(directory, item, true);
58317
58327
  }
58318
- const wp = this._getWatchedDir(path69);
58328
+ const wp = this._getWatchedDir(path70);
58319
58329
  const nestedDirectoryChildren = wp.getChildren();
58320
- nestedDirectoryChildren.forEach((nested) => this._remove(path69, nested));
58330
+ nestedDirectoryChildren.forEach((nested) => this._remove(path70, nested));
58321
58331
  const parent = this._getWatchedDir(directory);
58322
58332
  const wasTracked = parent.has(item);
58323
58333
  parent.remove(item);
58324
58334
  if (this._symlinkPaths.has(fullPath)) {
58325
58335
  this._symlinkPaths.delete(fullPath);
58326
58336
  }
58327
- let relPath = path69;
58337
+ let relPath = path70;
58328
58338
  if (this.options.cwd)
58329
- relPath = sysPath2.relative(this.options.cwd, path69);
58339
+ relPath = sysPath2.relative(this.options.cwd, path70);
58330
58340
  if (this.options.awaitWriteFinish && this._pendingWrites.has(relPath)) {
58331
58341
  const event = this._pendingWrites.get(relPath).cancelWait();
58332
58342
  if (event === EVENTS.ADD)
58333
58343
  return;
58334
58344
  }
58335
- this._watched.delete(path69);
58345
+ this._watched.delete(path70);
58336
58346
  this._watched.delete(fullPath);
58337
58347
  const eventName = isDirectory2 ? EVENTS.UNLINK_DIR : EVENTS.UNLINK;
58338
- if (wasTracked && !this._isIgnored(path69))
58339
- this._emit(eventName, path69);
58340
- this._closePath(path69);
58348
+ if (wasTracked && !this._isIgnored(path70))
58349
+ this._emit(eventName, path70);
58350
+ this._closePath(path70);
58341
58351
  }
58342
58352
  /**
58343
58353
  * Closes all watchers for a path
58344
58354
  */
58345
- _closePath(path69) {
58346
- this._closeFile(path69);
58347
- const dir = sysPath2.dirname(path69);
58348
- this._getWatchedDir(dir).remove(sysPath2.basename(path69));
58355
+ _closePath(path70) {
58356
+ this._closeFile(path70);
58357
+ const dir = sysPath2.dirname(path70);
58358
+ this._getWatchedDir(dir).remove(sysPath2.basename(path70));
58349
58359
  }
58350
58360
  /**
58351
58361
  * Closes only file-specific watchers
58352
58362
  */
58353
- _closeFile(path69) {
58354
- const closers = this._closers.get(path69);
58363
+ _closeFile(path70) {
58364
+ const closers = this._closers.get(path70);
58355
58365
  if (!closers)
58356
58366
  return;
58357
58367
  closers.forEach((closer) => closer());
58358
- this._closers.delete(path69);
58368
+ this._closers.delete(path70);
58359
58369
  }
58360
- _addPathCloser(path69, closer) {
58370
+ _addPathCloser(path70, closer) {
58361
58371
  if (!closer)
58362
58372
  return;
58363
- let list = this._closers.get(path69);
58373
+ let list = this._closers.get(path70);
58364
58374
  if (!list) {
58365
58375
  list = [];
58366
- this._closers.set(path69, list);
58376
+ this._closers.set(path70, list);
58367
58377
  }
58368
58378
  list.push(closer);
58369
58379
  }
@@ -58588,11 +58598,11 @@ var extractPathname, URL_REGEX, HOST_WITH_PORT_REGEX, PATH_REGEX, validateUrl;
58588
58598
  var init_validateURL = __esm({
58589
58599
  "../pages-shared/metadata-generator/validateURL.ts"() {
58590
58600
  init_import_meta_url();
58591
- extractPathname = /* @__PURE__ */ __name((path69 = "/", includeSearch, includeHash) => {
58592
- if (!path69.startsWith("/")) {
58593
- path69 = `/${path69}`;
58601
+ extractPathname = /* @__PURE__ */ __name((path70 = "/", includeSearch, includeHash) => {
58602
+ if (!path70.startsWith("/")) {
58603
+ path70 = `/${path70}`;
58594
58604
  }
58595
- const url4 = new URL(`//${path69}`, "relative://");
58605
+ const url4 = new URL(`//${path70}`, "relative://");
58596
58606
  return `${url4.pathname}${includeSearch ? url4.search : ""}${includeHash ? url4.hash : ""}`;
58597
58607
  }, "extractPathname");
58598
58608
  URL_REGEX = /^https:\/\/+(?<host>[^/]+)\/?(?<path>.*)/;
@@ -58625,8 +58635,8 @@ var init_validateURL = __esm({
58625
58635
  if (!token.startsWith("/") && onlyRelative) {
58626
58636
  token = `/${token}`;
58627
58637
  }
58628
- const path69 = PATH_REGEX.exec(token);
58629
- if (path69) {
58638
+ const path70 = PATH_REGEX.exec(token);
58639
+ if (path70) {
58630
58640
  try {
58631
58641
  return [extractPathname(token, includeSearch, includeHash), void 0];
58632
58642
  } catch {
@@ -58682,7 +58692,7 @@ function parseHeaders(input) {
58682
58692
  });
58683
58693
  }
58684
58694
  }
58685
- const [path69, pathError] = validateUrl(line, false, true);
58695
+ const [path70, pathError] = validateUrl(line, false, true);
58686
58696
  if (pathError) {
58687
58697
  invalid.push({
58688
58698
  line,
@@ -58693,7 +58703,7 @@ function parseHeaders(input) {
58693
58703
  continue;
58694
58704
  }
58695
58705
  rule = {
58696
- path: path69,
58706
+ path: path70,
58697
58707
  line,
58698
58708
  headers: {},
58699
58709
  unsetHeaders: []
@@ -58932,7 +58942,7 @@ var require_constants7 = __commonJS({
58932
58942
  "../../node_modules/.pnpm/picomatch@2.3.1/node_modules/picomatch/lib/constants.js"(exports2, module3) {
58933
58943
  "use strict";
58934
58944
  init_import_meta_url();
58935
- var path69 = require("path");
58945
+ var path70 = require("path");
58936
58946
  var WIN_SLASH = "\\\\/";
58937
58947
  var WIN_NO_SLASH = `[^${WIN_SLASH}]`;
58938
58948
  var DOT_LITERAL = "\\.";
@@ -59102,7 +59112,7 @@ var require_constants7 = __commonJS({
59102
59112
  /* | */
59103
59113
  CHAR_ZERO_WIDTH_NOBREAK_SPACE: 65279,
59104
59114
  /* \uFEFF */
59105
- SEP: path69.sep,
59115
+ SEP: path70.sep,
59106
59116
  /**
59107
59117
  * Create EXTGLOB_CHARS
59108
59118
  */
@@ -59130,7 +59140,7 @@ var require_utils4 = __commonJS({
59130
59140
  "../../node_modules/.pnpm/picomatch@2.3.1/node_modules/picomatch/lib/utils.js"(exports2) {
59131
59141
  "use strict";
59132
59142
  init_import_meta_url();
59133
- var path69 = require("path");
59143
+ var path70 = require("path");
59134
59144
  var win32 = process.platform === "win32";
59135
59145
  var {
59136
59146
  REGEX_BACKSLASH,
@@ -59159,7 +59169,7 @@ var require_utils4 = __commonJS({
59159
59169
  if (options30 && typeof options30.windows === "boolean") {
59160
59170
  return options30.windows;
59161
59171
  }
59162
- return win32 === true || path69.sep === "\\";
59172
+ return win32 === true || path70.sep === "\\";
59163
59173
  };
59164
59174
  exports2.escapeLast = (input, char, lastIdx) => {
59165
59175
  const idx = input.lastIndexOf(char, lastIdx);
@@ -60310,7 +60320,7 @@ var require_picomatch = __commonJS({
60310
60320
  "../../node_modules/.pnpm/picomatch@2.3.1/node_modules/picomatch/lib/picomatch.js"(exports2, module3) {
60311
60321
  "use strict";
60312
60322
  init_import_meta_url();
60313
- var path69 = require("path");
60323
+ var path70 = require("path");
60314
60324
  var scan = require_scan();
60315
60325
  var parse8 = require_parse4();
60316
60326
  var utils = require_utils4();
@@ -60396,7 +60406,7 @@ var require_picomatch = __commonJS({
60396
60406
  };
60397
60407
  picomatch.matchBase = (input, glob, options30, posix2 = utils.isWindows(options30)) => {
60398
60408
  const regex2 = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options30);
60399
- return regex2.test(path69.basename(input));
60409
+ return regex2.test(path70.basename(input));
60400
60410
  };
60401
60411
  picomatch.isMatch = (str, patterns, options30) => picomatch(patterns, options30)(str);
60402
60412
  picomatch.parse = (pattern, options30) => {
@@ -62659,8 +62669,8 @@ You should install ${missingPackages.map((p6) => p6.name).join(", ")} locally:
62659
62669
  return Array.isArray(pkg) ? results : results[0];
62660
62670
  }
62661
62671
  function npxResolve(pkg) {
62662
- const { name: name2, path: path69 } = parse4(pkg);
62663
- const packageWithPath = [name2, path69].join("");
62672
+ const { name: name2, path: path70 } = parse4(pkg);
62673
+ const packageWithPath = [name2, path70].join("");
62664
62674
  const cachedDir = INSTALL_CACHE[name2];
62665
62675
  if (!cachedDir) {
62666
62676
  throw new Error(`You must call npxImport for a package before calling npxResolve. Got: ${pkg}`);
@@ -62673,17 +62683,17 @@ function npxResolve(pkg) {
62673
62683
  async function checkPackagesAvailableLocally(pkg) {
62674
62684
  const packages = {};
62675
62685
  for (const p6 of Array.isArray(pkg) ? pkg : [pkg]) {
62676
- const { name: name2, version: version4, path: path69, exact } = parseAndValidate(p6);
62686
+ const { name: name2, version: version4, path: path70, exact } = parseAndValidate(p6);
62677
62687
  if (packages[name2])
62678
62688
  throw new Error(`npx-import cannot import the same package twice! Got: '${p6}' but already saw '${name2}' earlier!`);
62679
- const packageWithPath = [name2, path69].join("");
62689
+ const packageWithPath = [name2, path70].join("");
62680
62690
  const imported = await tryImport(packageWithPath);
62681
62691
  packages[name2] = {
62682
62692
  name: name2,
62683
62693
  packageWithPath,
62684
62694
  version: version4,
62685
62695
  exact,
62686
- path: path69,
62696
+ path: path70,
62687
62697
  imported,
62688
62698
  local: imported !== NOT_IMPORTABLE
62689
62699
  };
@@ -62694,7 +62704,7 @@ function parseAndValidate(p6) {
62694
62704
  if (p6.match(/^[.\/]/)) {
62695
62705
  throw new Error(`npx-import can only import packages, not relative paths: got ${p6}`);
62696
62706
  }
62697
- const { name: name2, version: version4, path: path69 } = parse4(p6);
62707
+ const { name: name2, version: version4, path: path70 } = parse4(p6);
62698
62708
  const validation2 = (0, import_validate_npm_package_name.default)(name2);
62699
62709
  if (!validation2.validForNewPackages) {
62700
62710
  if (validation2.warnings?.some((w6) => w6.match(/is a core module name/)))
@@ -62702,7 +62712,7 @@ function parseAndValidate(p6) {
62702
62712
  else
62703
62713
  throw new Error(`npx-import can't import invalid package name: parsed name '${name2}' from '${p6}'`);
62704
62714
  }
62705
- return { name: name2, version: version4, path: path69, exact: import_semver.default.parse(version4) !== null };
62715
+ return { name: name2, version: version4, path: path70, exact: import_semver.default.parse(version4) !== null };
62706
62716
  }
62707
62717
  async function tryImport(packageWithPath) {
62708
62718
  try {
@@ -63659,7 +63669,7 @@ var require_main3 = __commonJS({
63659
63669
  "../../node_modules/.pnpm/dotenv@10.0.0/node_modules/dotenv/lib/main.js"(exports2, module3) {
63660
63670
  init_import_meta_url();
63661
63671
  var fs29 = require("fs");
63662
- var path69 = require("path");
63672
+ var path70 = require("path");
63663
63673
  var os13 = require("os");
63664
63674
  function log2(message) {
63665
63675
  console.log(`[dotenv][DEBUG] ${message}`);
@@ -63697,11 +63707,11 @@ var require_main3 = __commonJS({
63697
63707
  }
63698
63708
  __name(parse8, "parse");
63699
63709
  function resolveHome(envPath) {
63700
- return envPath[0] === "~" ? path69.join(os13.homedir(), envPath.slice(1)) : envPath;
63710
+ return envPath[0] === "~" ? path70.join(os13.homedir(), envPath.slice(1)) : envPath;
63701
63711
  }
63702
63712
  __name(resolveHome, "resolveHome");
63703
63713
  function config(options30) {
63704
- let dotenvPath = path69.resolve(process.cwd(), ".env");
63714
+ let dotenvPath = path70.resolve(process.cwd(), ".env");
63705
63715
  let encoding = "utf8";
63706
63716
  let debug = false;
63707
63717
  if (options30) {
@@ -64290,18 +64300,18 @@ var require_utils5 = __commonJS({
64290
64300
  return decode(data, hint);
64291
64301
  }
64292
64302
  __name(convertToUTF8, "convertToUTF8");
64293
- function basename7(path69) {
64294
- if (typeof path69 !== "string")
64303
+ function basename7(path70) {
64304
+ if (typeof path70 !== "string")
64295
64305
  return "";
64296
- for (let i5 = path69.length - 1; i5 >= 0; --i5) {
64297
- switch (path69.charCodeAt(i5)) {
64306
+ for (let i5 = path70.length - 1; i5 >= 0; --i5) {
64307
+ switch (path70.charCodeAt(i5)) {
64298
64308
  case 47:
64299
64309
  case 92:
64300
- path69 = path69.slice(i5 + 1);
64301
- return path69 === ".." || path69 === "." ? "" : path69;
64310
+ path70 = path70.slice(i5 + 1);
64311
+ return path70 === ".." || path70 === "." ? "" : path70;
64302
64312
  }
64303
64313
  }
64304
- return path69 === ".." || path69 === "." ? "" : path69;
64314
+ return path70 === ".." || path70 === "." ? "" : path70;
64305
64315
  }
64306
64316
  __name(basename7, "basename");
64307
64317
  var TOKEN = [
@@ -67808,7 +67818,7 @@ var require_dist3 = __commonJS({
67808
67818
  const result = [];
67809
67819
  let key = 0;
67810
67820
  let i5 = 0;
67811
- let path69 = "";
67821
+ let path70 = "";
67812
67822
  let nameSet = /* @__PURE__ */ new Set();
67813
67823
  const tryConsume = /* @__PURE__ */ __name((type) => {
67814
67824
  if (i5 < tokens.length && tokens[i5].type === type)
@@ -67850,12 +67860,12 @@ var require_dist3 = __commonJS({
67850
67860
  if (name2 || pattern) {
67851
67861
  let prefix = char || "";
67852
67862
  if (prefixes.indexOf(prefix) === -1) {
67853
- path69 += prefix;
67863
+ path70 += prefix;
67854
67864
  prefix = "";
67855
67865
  }
67856
- if (path69) {
67857
- result.push(encodePart(path69));
67858
- path69 = "";
67866
+ if (path70) {
67867
+ result.push(encodePart(path70));
67868
+ path70 = "";
67859
67869
  }
67860
67870
  const finalName = name2 || key++;
67861
67871
  if (nameSet.has(finalName)) {
@@ -67873,7 +67883,7 @@ var require_dist3 = __commonJS({
67873
67883
  }
67874
67884
  const value = char || tryConsume("ESCAPED_CHAR");
67875
67885
  if (value) {
67876
- path69 += value;
67886
+ path70 += value;
67877
67887
  continue;
67878
67888
  }
67879
67889
  const open4 = tryConsume("OPEN");
@@ -67888,15 +67898,15 @@ var require_dist3 = __commonJS({
67888
67898
  mustConsume("CLOSE");
67889
67899
  const modifier = tryConsumeModifier() || "";
67890
67900
  if (!name22 && !pattern2 && !modifier) {
67891
- path69 += prefix;
67901
+ path70 += prefix;
67892
67902
  continue;
67893
67903
  }
67894
67904
  if (!name22 && !pattern2 && !prefix) {
67895
67905
  continue;
67896
67906
  }
67897
- if (path69) {
67898
- result.push(encodePart(path69));
67899
- path69 = "";
67907
+ if (path70) {
67908
+ result.push(encodePart(path70));
67909
+ path70 = "";
67900
67910
  }
67901
67911
  result.push({
67902
67912
  name: name22 || (pattern2 ? key++ : ""),
@@ -67907,9 +67917,9 @@ var require_dist3 = __commonJS({
67907
67917
  });
67908
67918
  continue;
67909
67919
  }
67910
- if (path69) {
67911
- result.push(encodePart(path69));
67912
- path69 = "";
67920
+ if (path70) {
67921
+ result.push(encodePart(path70));
67922
+ path70 = "";
67913
67923
  }
67914
67924
  mustConsume("END");
67915
67925
  }
@@ -67924,12 +67934,12 @@ var require_dist3 = __commonJS({
67924
67934
  return options30 && options30.sensitive ? "u" : "ui";
67925
67935
  }
67926
67936
  __name(flags2, "flags");
67927
- function regexpToRegexp(path69, keys) {
67937
+ function regexpToRegexp(path70, keys) {
67928
67938
  if (!keys)
67929
- return path69;
67939
+ return path70;
67930
67940
  const groupsRegex = /\((?:\?<(.*?)>)?(?!\?)/g;
67931
67941
  let index = 0;
67932
- let execResult = groupsRegex.exec(path69.source);
67942
+ let execResult = groupsRegex.exec(path70.source);
67933
67943
  while (execResult) {
67934
67944
  keys.push({
67935
67945
  name: execResult[1] || index++,
@@ -67938,18 +67948,18 @@ var require_dist3 = __commonJS({
67938
67948
  modifier: "",
67939
67949
  pattern: ""
67940
67950
  });
67941
- execResult = groupsRegex.exec(path69.source);
67951
+ execResult = groupsRegex.exec(path70.source);
67942
67952
  }
67943
- return path69;
67953
+ return path70;
67944
67954
  }
67945
67955
  __name(regexpToRegexp, "regexpToRegexp");
67946
67956
  function arrayToRegexp(paths, keys, options30) {
67947
- const parts = paths.map((path69) => pathToRegexp(path69, keys, options30).source);
67957
+ const parts = paths.map((path70) => pathToRegexp(path70, keys, options30).source);
67948
67958
  return new RegExp(`(?:${parts.join("|")})`, flags2(options30));
67949
67959
  }
67950
67960
  __name(arrayToRegexp, "arrayToRegexp");
67951
- function stringToRegexp(path69, keys, options30) {
67952
- return tokensToRegexp(parse8(path69, options30), keys, options30);
67961
+ function stringToRegexp(path70, keys, options30) {
67962
+ return tokensToRegexp(parse8(path70, options30), keys, options30);
67953
67963
  }
67954
67964
  __name(stringToRegexp, "stringToRegexp");
67955
67965
  function tokensToRegexp(tokens, keys, options30 = {}) {
@@ -68007,12 +68017,12 @@ var require_dist3 = __commonJS({
68007
68017
  return new RegExp(route2, flags2(options30));
68008
68018
  }
68009
68019
  __name(tokensToRegexp, "tokensToRegexp");
68010
- function pathToRegexp(path69, keys, options30) {
68011
- if (path69 instanceof RegExp)
68012
- return regexpToRegexp(path69, keys);
68013
- if (Array.isArray(path69))
68014
- return arrayToRegexp(path69, keys, options30);
68015
- return stringToRegexp(path69, keys, options30);
68020
+ function pathToRegexp(path70, keys, options30) {
68021
+ if (path70 instanceof RegExp)
68022
+ return regexpToRegexp(path70, keys);
68023
+ if (Array.isArray(path70))
68024
+ return arrayToRegexp(path70, keys, options30);
68025
+ return stringToRegexp(path70, keys, options30);
68016
68026
  }
68017
68027
  __name(pathToRegexp, "pathToRegexp");
68018
68028
  var regexIdentifierStart;
@@ -73645,18 +73655,18 @@ Make sure "${service}" is mounted so Miniflare knows where to find it.`);
73645
73655
  once: () => once,
73646
73656
  setMaxListeners: () => setMaxListeners
73647
73657
  });
73648
- var import_node_events6 = __toModule(require("node:events"));
73649
- var events_default = import_node_events6.default;
73650
- var EventEmitter5 = import_node_events6.default.EventEmitter;
73651
- var EventEmitterAsyncResource = import_node_events6.default.EventEmitterAsyncResource;
73652
- var captureRejectionSymbol = import_node_events6.default.captureRejectionSymbol;
73653
- var defaultMaxListeners = import_node_events6.default.defaultMaxListeners;
73654
- var errorMonitor = import_node_events6.default.errorMonitor;
73655
- var getEventListeners = import_node_events6.default.getEventListeners;
73656
- var listenerCount = import_node_events6.default.listenerCount;
73657
- var on = import_node_events6.default.on;
73658
- var once = import_node_events6.default.once;
73659
- var setMaxListeners = import_node_events6.default.setMaxListeners;
73658
+ var import_node_events7 = __toModule(require("node:events"));
73659
+ var events_default = import_node_events7.default;
73660
+ var EventEmitter5 = import_node_events7.default.EventEmitter;
73661
+ var EventEmitterAsyncResource = import_node_events7.default.EventEmitterAsyncResource;
73662
+ var captureRejectionSymbol = import_node_events7.default.captureRejectionSymbol;
73663
+ var defaultMaxListeners = import_node_events7.default.defaultMaxListeners;
73664
+ var errorMonitor = import_node_events7.default.errorMonitor;
73665
+ var getEventListeners = import_node_events7.default.getEventListeners;
73666
+ var listenerCount = import_node_events7.default.listenerCount;
73667
+ var on = import_node_events7.default.on;
73668
+ var once = import_node_events7.default.once;
73669
+ var setMaxListeners = import_node_events7.default.setMaxListeners;
73660
73670
  var util_exports = {};
73661
73671
  __export2(util_exports, {
73662
73672
  _extend: () => import_node_util4._extend,
@@ -75890,8 +75900,8 @@ ${val2.stack}`;
75890
75900
  var ret = wasm.memory;
75891
75901
  return addHeapObject(ret);
75892
75902
  };
75893
- var path69 = require("path").join(__dirname, "html_rewriter_bg.wasm");
75894
- var bytes = require("fs").readFileSync(path69);
75903
+ var path70 = require("path").join(__dirname, "html_rewriter_bg.wasm");
75904
+ var bytes = require("fs").readFileSync(path70);
75895
75905
  var wasmModule = new WebAssembly.Module(bytes);
75896
75906
  var wasmInstance = new WebAssembly.Instance(wasmModule, imports);
75897
75907
  wasm = wasmInstance.exports;
@@ -76891,8 +76901,8 @@ async function generateAssetsFetch(directory, log2) {
76891
76901
  });
76892
76902
  watch([headersFile, redirectsFile], { persistent: true }).on(
76893
76903
  "change",
76894
- (path69) => {
76895
- switch (path69) {
76904
+ (path70) => {
76905
+ switch (path70) {
76896
76906
  case headersFile: {
76897
76907
  log2.log("_headers modified. Re-evaluating...");
76898
76908
  const contents = (0, import_node_fs20.readFileSync)(headersFile).toString();
@@ -76922,8 +76932,8 @@ async function generateAssetsFetch(directory, log2) {
76922
76932
  metadata,
76923
76933
  xServerEnvHeader: "dev",
76924
76934
  logError: console.error,
76925
- findAssetEntryForPath: async (path69) => {
76926
- const filepath = (0, import_node_path37.resolve)((0, import_node_path37.join)(directory, path69));
76935
+ findAssetEntryForPath: async (path70) => {
76936
+ const filepath = (0, import_node_path37.resolve)((0, import_node_path37.join)(directory, path70));
76927
76937
  if (!filepath.startsWith(directory)) {
76928
76938
  return null;
76929
76939
  }
@@ -77039,8 +77049,8 @@ var require_md5_file = __commonJS({
77039
77049
  var crypto7 = require("crypto");
77040
77050
  var fs29 = require("fs");
77041
77051
  var BUFFER_SIZE = 8192;
77042
- function md5FileSync(path69) {
77043
- const fd = fs29.openSync(path69, "r");
77052
+ function md5FileSync(path70) {
77053
+ const fd = fs29.openSync(path70, "r");
77044
77054
  const hash = crypto7.createHash("md5");
77045
77055
  const buffer = Buffer.alloc(BUFFER_SIZE);
77046
77056
  try {
@@ -77055,10 +77065,10 @@ var require_md5_file = __commonJS({
77055
77065
  return hash.digest("hex");
77056
77066
  }
77057
77067
  __name(md5FileSync, "md5FileSync");
77058
- function md5File2(path69) {
77068
+ function md5File2(path70) {
77059
77069
  return new Promise((resolve24, reject) => {
77060
77070
  const output = crypto7.createHash("md5");
77061
- const input = fs29.createReadStream(path69);
77071
+ const input = fs29.createReadStream(path70);
77062
77072
  input.on("error", (err) => {
77063
77073
  reject(err);
77064
77074
  });
@@ -79731,9 +79741,9 @@ var init_createPaginator = __esm({
79731
79741
  return await client.send(new CommandCtor(input), ...args);
79732
79742
  }, "makePagedClientRequest");
79733
79743
  __name(createPaginator, "createPaginator");
79734
- get = /* @__PURE__ */ __name((fromObject, path69) => {
79744
+ get = /* @__PURE__ */ __name((fromObject, path70) => {
79735
79745
  let cursor = fromObject;
79736
- const pathComponents = path69.split(".");
79746
+ const pathComponents = path70.split(".");
79737
79747
  for (const step of pathComponents) {
79738
79748
  if (!cursor || typeof cursor !== "object") {
79739
79749
  return void 0;
@@ -80351,12 +80361,12 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
80351
80361
  const password = request4.password ?? "";
80352
80362
  auth = `${username}:${password}`;
80353
80363
  }
80354
- let path69 = request4.path;
80364
+ let path70 = request4.path;
80355
80365
  if (queryString) {
80356
- path69 += `?${queryString}`;
80366
+ path70 += `?${queryString}`;
80357
80367
  }
80358
80368
  if (request4.fragment) {
80359
- path69 += `#${request4.fragment}`;
80369
+ path70 += `#${request4.fragment}`;
80360
80370
  }
80361
80371
  let hostname2 = request4.hostname ?? "";
80362
80372
  if (hostname2[0] === "[" && hostname2.endsWith("]")) {
@@ -80368,7 +80378,7 @@ or increase socketAcquisitionWarningTimeout=(millis) in the NodeHttpHandler conf
80368
80378
  headers: request4.headers,
80369
80379
  host: hostname2,
80370
80380
  method: request4.method,
80371
- path: path69,
80381
+ path: path70,
80372
80382
  port: request4.port,
80373
80383
  agent,
80374
80384
  auth
@@ -81130,8 +81140,8 @@ var init_requestBuilder = __esm({
81130
81140
  return this;
81131
81141
  }
81132
81142
  p(memberName, labelValueProvider, uriLabel, isGreedyLabel) {
81133
- this.resolvePathStack.push((path69) => {
81134
- this.path = resolvedPath(path69, this.input, memberName, labelValueProvider, uriLabel, isGreedyLabel);
81143
+ this.resolvePathStack.push((path70) => {
81144
+ this.path = resolvedPath(path70, this.input, memberName, labelValueProvider, uriLabel, isGreedyLabel);
81135
81145
  });
81136
81146
  return this;
81137
81147
  }
@@ -82061,10 +82071,10 @@ ${longDate}
82061
82071
  ${credentialScope}
82062
82072
  ${toHex(hashedRequest)}`;
82063
82073
  }
82064
- getCanonicalPath({ path: path69 }) {
82074
+ getCanonicalPath({ path: path70 }) {
82065
82075
  if (this.uriEscapePath) {
82066
82076
  const normalizedPathSegments = [];
82067
- for (const pathSegment of path69.split("/")) {
82077
+ for (const pathSegment of path70.split("/")) {
82068
82078
  if (pathSegment?.length === 0)
82069
82079
  continue;
82070
82080
  if (pathSegment === ".")
@@ -82075,11 +82085,11 @@ ${toHex(hashedRequest)}`;
82075
82085
  normalizedPathSegments.push(pathSegment);
82076
82086
  }
82077
82087
  }
82078
- const normalizedPath = `${path69?.startsWith("/") ? "/" : ""}${normalizedPathSegments.join("/")}${normalizedPathSegments.length > 0 && path69?.endsWith("/") ? "/" : ""}`;
82088
+ const normalizedPath = `${path70?.startsWith("/") ? "/" : ""}${normalizedPathSegments.join("/")}${normalizedPathSegments.length > 0 && path70?.endsWith("/") ? "/" : ""}`;
82079
82089
  const doubleEncoded = escapeUri(normalizedPath);
82080
82090
  return doubleEncoded.replace(/%2F/g, "/");
82081
82091
  }
82082
- return path69;
82092
+ return path70;
82083
82093
  }
82084
82094
  async getSignature(longDate, credentialScope, keyPromise, canonicalRequest) {
82085
82095
  const stringToSign = await this.createStringToSign(longDate, credentialScope, canonicalRequest);
@@ -85857,18 +85867,18 @@ var init_getAttrPathList = __esm({
85857
85867
  "../../node_modules/.pnpm/@smithy+util-endpoints@2.1.7/node_modules/@smithy/util-endpoints/dist-es/lib/getAttrPathList.js"() {
85858
85868
  init_import_meta_url();
85859
85869
  init_types3();
85860
- getAttrPathList = /* @__PURE__ */ __name((path69) => {
85861
- const parts = path69.split(".");
85870
+ getAttrPathList = /* @__PURE__ */ __name((path70) => {
85871
+ const parts = path70.split(".");
85862
85872
  const pathList = [];
85863
85873
  for (const part of parts) {
85864
85874
  const squareBracketIndex = part.indexOf("[");
85865
85875
  if (squareBracketIndex !== -1) {
85866
85876
  if (part.indexOf("]") !== part.length - 1) {
85867
- throw new EndpointError(`Path: '${path69}' does not end with ']'`);
85877
+ throw new EndpointError(`Path: '${path70}' does not end with ']'`);
85868
85878
  }
85869
85879
  const arrayIndex = part.slice(squareBracketIndex + 1, -1);
85870
85880
  if (Number.isNaN(parseInt(arrayIndex))) {
85871
- throw new EndpointError(`Invalid array index: '${arrayIndex}' in path: '${path69}'`);
85881
+ throw new EndpointError(`Invalid array index: '${arrayIndex}' in path: '${path70}'`);
85872
85882
  }
85873
85883
  if (squareBracketIndex !== 0) {
85874
85884
  pathList.push(part.slice(0, squareBracketIndex));
@@ -85890,9 +85900,9 @@ var init_getAttr = __esm({
85890
85900
  init_import_meta_url();
85891
85901
  init_types3();
85892
85902
  init_getAttrPathList();
85893
- getAttr = /* @__PURE__ */ __name((value, path69) => getAttrPathList(path69).reduce((acc, index) => {
85903
+ getAttr = /* @__PURE__ */ __name((value, path70) => getAttrPathList(path70).reduce((acc, index) => {
85894
85904
  if (typeof acc !== "object") {
85895
- throw new EndpointError(`Index '${index}' in '${path69}' not found in '${JSON.stringify(value)}'`);
85905
+ throw new EndpointError(`Index '${index}' in '${path70}' not found in '${JSON.stringify(value)}'`);
85896
85906
  } else if (Array.isArray(acc)) {
85897
85907
  return acc[parseInt(index)];
85898
85908
  }
@@ -85937,8 +85947,8 @@ var init_parseURL = __esm({
85937
85947
  return value;
85938
85948
  }
85939
85949
  if (typeof value === "object" && "hostname" in value) {
85940
- const { hostname: hostname3, port, protocol: protocol2 = "", path: path69 = "", query = {} } = value;
85941
- const url4 = new URL(`${protocol2}//${hostname3}${port ? `:${port}` : ""}${path69}`);
85950
+ const { hostname: hostname3, port, protocol: protocol2 = "", path: path70 = "", query = {} } = value;
85951
+ const url4 = new URL(`${protocol2}//${hostname3}${port ? `:${port}` : ""}${path70}`);
85942
85952
  url4.search = Object.entries(query).map(([k6, v7]) => `${k6}=${v7}`).join("&");
85943
85953
  return url4;
85944
85954
  }
@@ -87408,8 +87418,8 @@ var init_createConfigValueProvider = __esm({
87408
87418
  return endpoint.url.href;
87409
87419
  }
87410
87420
  if ("hostname" in endpoint) {
87411
- const { protocol, hostname: hostname2, port, path: path69 } = endpoint;
87412
- return `${protocol}//${hostname2}${port ? ":" + port : ""}${path69}`;
87421
+ const { protocol, hostname: hostname2, port, path: path70 } = endpoint;
87422
+ return `${protocol}//${hostname2}${port ? ":" + port : ""}${path70}`;
87413
87423
  }
87414
87424
  }
87415
87425
  return endpoint;
@@ -87646,11 +87656,11 @@ var init_slurpFile = __esm({
87646
87656
  import_fs16 = require("fs");
87647
87657
  ({ readFile: readFile13 } = import_fs16.promises);
87648
87658
  filePromisesHash = {};
87649
- slurpFile = /* @__PURE__ */ __name((path69, options30) => {
87650
- if (!filePromisesHash[path69] || options30?.ignoreCache) {
87651
- filePromisesHash[path69] = readFile13(path69, "utf8");
87659
+ slurpFile = /* @__PURE__ */ __name((path70, options30) => {
87660
+ if (!filePromisesHash[path70] || options30?.ignoreCache) {
87661
+ filePromisesHash[path70] = readFile13(path70, "utf8");
87652
87662
  }
87653
- return filePromisesHash[path69];
87663
+ return filePromisesHash[path70];
87654
87664
  }, "slurpFile");
87655
87665
  }
87656
87666
  });
@@ -94322,14 +94332,14 @@ var init_Aws_query = __esm({
94322
94332
  cfId: output.headers["x-amz-cf-id"]
94323
94333
  }), "deserializeMetadata");
94324
94334
  throwDefaultError5 = withBaseException(STSServiceException);
94325
- buildHttpRpcRequest = /* @__PURE__ */ __name(async (context2, headers, path69, resolvedHostname, body) => {
94335
+ buildHttpRpcRequest = /* @__PURE__ */ __name(async (context2, headers, path70, resolvedHostname, body) => {
94326
94336
  const { hostname: hostname2, protocol = "https", port, path: basePath } = await context2.endpoint();
94327
94337
  const contents = {
94328
94338
  protocol,
94329
94339
  hostname: hostname2,
94330
94340
  port,
94331
94341
  method: "POST",
94332
- path: basePath.endsWith("/") ? basePath.slice(0, -1) + path69 : basePath + path69,
94342
+ path: basePath.endsWith("/") ? basePath.slice(0, -1) + path70 : basePath + path70,
94333
94343
  headers
94334
94344
  };
94335
94345
  if (resolvedHostname !== void 0) {
@@ -96943,11 +96953,11 @@ var parser = new YargsParser({
96943
96953
  resolve: import_path.resolve,
96944
96954
  // TODO: figure out a way to combine ESM and CJS coverage, such that
96945
96955
  // we can exercise all the lines below:
96946
- require: (path69) => {
96956
+ require: (path70) => {
96947
96957
  if (typeof require !== "undefined") {
96948
- return require(path69);
96949
- } else if (path69.match(/\.json$/)) {
96950
- return JSON.parse((0, import_fs.readFileSync)(path69, "utf8"));
96958
+ return require(path70);
96959
+ } else if (path70.match(/\.json$/)) {
96960
+ return JSON.parse((0, import_fs.readFileSync)(path70, "utf8"));
96951
96961
  } else {
96952
96962
  throw Error("only .json config files are supported in ESM");
96953
96963
  }
@@ -98098,7 +98108,7 @@ var import_undici3 = __toESM(require_undici());
98098
98108
 
98099
98109
  // package.json
98100
98110
  var name = "wrangler";
98101
- var version = "3.103.2";
98111
+ var version = "3.105.0";
98102
98112
 
98103
98113
  // src/environment-variables/misc-variables.ts
98104
98114
  init_import_meta_url();
@@ -99311,12 +99321,12 @@ function parseTree(text, errors = [], options30 = ParseOptions.DEFAULT) {
99311
99321
  return result;
99312
99322
  }
99313
99323
  __name(parseTree, "parseTree");
99314
- function findNodeAtLocation(root, path69) {
99324
+ function findNodeAtLocation(root, path70) {
99315
99325
  if (!root) {
99316
99326
  return void 0;
99317
99327
  }
99318
99328
  let node2 = root;
99319
- for (let segment of path69) {
99329
+ for (let segment of path70) {
99320
99330
  if (typeof segment === "string") {
99321
99331
  if (node2.type !== "object" || !Array.isArray(node2.children)) {
99322
99332
  return void 0;
@@ -99665,14 +99675,14 @@ __name(getNodeType, "getNodeType");
99665
99675
 
99666
99676
  // ../../node_modules/.pnpm/jsonc-parser@3.2.0/node_modules/jsonc-parser/lib/esm/impl/edit.js
99667
99677
  function setProperty(text, originalPath, value, options30) {
99668
- const path69 = originalPath.slice();
99678
+ const path70 = originalPath.slice();
99669
99679
  const errors = [];
99670
99680
  const root = parseTree(text, errors);
99671
99681
  let parent = void 0;
99672
99682
  let lastSegment = void 0;
99673
- while (path69.length > 0) {
99674
- lastSegment = path69.pop();
99675
- parent = findNodeAtLocation(root, path69);
99683
+ while (path70.length > 0) {
99684
+ lastSegment = path70.pop();
99685
+ parent = findNodeAtLocation(root, path70);
99676
99686
  if (parent === void 0 && value !== void 0) {
99677
99687
  if (typeof lastSegment === "string") {
99678
99688
  value = { [lastSegment]: value };
@@ -99903,8 +99913,8 @@ function format5(documentText, range, options30) {
99903
99913
  return format4(documentText, range, options30);
99904
99914
  }
99905
99915
  __name(format5, "format");
99906
- function modify(text, path69, value, options30) {
99907
- return setProperty(text, path69, value, options30);
99916
+ function modify(text, path70, value, options30) {
99917
+ return setProperty(text, path70, value, options30);
99908
99918
  }
99909
99919
  __name(modify, "modify");
99910
99920
  function applyEdits(text, edits) {
@@ -99974,6 +99984,9 @@ var APIError = class extends ParseError {
99974
99984
  }
99975
99985
  return false;
99976
99986
  }
99987
+ isRetryable() {
99988
+ return String(this.#status).startsWith("5");
99989
+ }
99977
99990
  // Allow `APIError`s to be marked as handled.
99978
99991
  #reportable = true;
99979
99992
  get reportable() {
@@ -100799,11 +100812,11 @@ function findRedirectedWranglerConfig(cwd2, userConfigPath) {
100799
100812
  `);
100800
100813
  }
100801
100814
  }
100802
- logger.warn(esm_default2`
100815
+ logger.info(esm_default2`
100803
100816
  Using redirected Wrangler configuration.
100804
- Configuration being used: "${import_node_path7.default.relative(".", redirectedConfigPath)}"
100805
- Original user's configuration: "${userConfigPath ? import_node_path7.default.relative(".", userConfigPath) : "<no user config found>"}"
100806
- Deploy configuration file: "${import_node_path7.default.relative(".", deployConfigPath)}"
100817
+ - Configuration being used: "${import_node_path7.default.relative(".", redirectedConfigPath)}"
100818
+ - Original user's configuration: "${userConfigPath ? import_node_path7.default.relative(".", userConfigPath) : "<no user config found>"}"
100819
+ - Deploy configuration file: "${import_node_path7.default.relative(".", deployConfigPath)}"
100807
100820
  `);
100808
100821
  return redirectedConfigPath;
100809
100822
  }
@@ -101382,9 +101395,9 @@ Please add "${field}" to "env.${envName}".`
101382
101395
  return rawEnv[field] ?? defaultValue;
101383
101396
  }
101384
101397
  __name(notInheritable, "notInheritable");
101385
- function unwindPropertyPath(root, path69) {
101398
+ function unwindPropertyPath(root, path70) {
101386
101399
  let container = root;
101387
- const parts = path69.split(".");
101400
+ const parts = path70.split(".");
101388
101401
  for (let i5 = 0; i5 < parts.length - 1; i5++) {
101389
101402
  if (!hasProperty(container, parts[i5])) {
101390
101403
  return;
@@ -104279,6 +104292,7 @@ var validateMigrations = /* @__PURE__ */ __name((diagnostics, field, value) => {
104279
104292
  new_sqlite_classes,
104280
104293
  renamed_classes,
104281
104294
  deleted_classes,
104295
+ transferred_classes,
104282
104296
  ...rest
104283
104297
  } = rawMigrations[i5];
104284
104298
  valid = validateAdditionalProperties(
@@ -104325,6 +104339,25 @@ var validateMigrations = /* @__PURE__ */ __name((diagnostics, field, value) => {
104325
104339
  valid = false;
104326
104340
  }
104327
104341
  }
104342
+ if (transferred_classes !== void 0) {
104343
+ if (!Array.isArray(transferred_classes)) {
104344
+ diagnostics.errors.push(
104345
+ `Expected "migrations[${i5}].transferred_classes" to be an array of "{from: string, from_script: string, to: string}" objects but got ${JSON.stringify(
104346
+ transferred_classes
104347
+ )}.`
104348
+ );
104349
+ valid = false;
104350
+ } else if (transferred_classes.some(
104351
+ (c6) => typeof c6 !== "object" || !isRequiredProperty(c6, "from", "string") || !isRequiredProperty(c6, "from_script", "string") || !isRequiredProperty(c6, "to", "string")
104352
+ )) {
104353
+ diagnostics.errors.push(
104354
+ `Expected "migrations[${i5}].transferred_classes" to be an array of "{from: string, from_script: string, to: string}" objects but got ${JSON.stringify(
104355
+ transferred_classes
104356
+ )}.`
104357
+ );
104358
+ valid = false;
104359
+ }
104360
+ }
104328
104361
  valid = validateOptionalTypedArray(
104329
104362
  diagnostics,
104330
104363
  `migrations[${i5}].deleted_classes`,
@@ -107938,7 +107971,7 @@ async function getAccountId() {
107938
107971
  if (e7 instanceof NoDefaultValueProvided) {
107939
107972
  throw new UserError(
107940
107973
  `More than one account available but unable to select one in non-interactive mode.
107941
- Please set the appropriate \`account_id\` in your ${configFileName(void 0)} file.
107974
+ Please set the appropriate \`account_id\` in your ${configFileName(void 0)} file or assign it to the \`CLOUDFLARE_ACCOUNT_ID\` environment variable.
107942
107975
  Available accounts are (\`<name>\`: \`<account_id>\`):
107943
107976
  ${accounts.map((account) => ` \`${account.name}\`: \`${account.id}\``).join("\n")}`
107944
107977
  );
@@ -108945,8 +108978,8 @@ function getSourceMappingPrepareStackTrace(retrieveSourceMap) {
108945
108978
  // Make sure we're using fresh copies of files each time we source map
108946
108979
  emptyCacheBetweenOperations: true,
108947
108980
  // Allow retriever to be overridden at prepare stack trace time
108948
- retrieveSourceMap(path69) {
108949
- return retrieveSourceMapOverride?.(path69) ?? null;
108981
+ retrieveSourceMap(path70) {
108982
+ return retrieveSourceMapOverride?.(path70) ?? null;
108950
108983
  }
108951
108984
  });
108952
108985
  sourceMappingPrepareStackTrace = Error.prepareStackTrace;
@@ -111244,11 +111277,18 @@ var ProxyController = class extends Controller {
111244
111277
  if (willInstantiateMiniflareInstance) {
111245
111278
  void Promise.all([
111246
111279
  proxyWorker.ready,
111247
- proxyWorker.unsafeGetDirectURL("InspectorProxyWorker"),
111248
- this.reconnectInspectorProxyWorker()
111280
+ proxyWorker.unsafeGetDirectURL("InspectorProxyWorker")
111249
111281
  ]).then(([url4, inspectorUrl]) => {
111282
+ return this.reconnectInspectorProxyWorker().then(() => [
111283
+ url4,
111284
+ inspectorUrl
111285
+ ]);
111286
+ }).then(([url4, inspectorUrl]) => {
111250
111287
  this.emitReadyEvent(proxyWorker, url4, inspectorUrl);
111251
111288
  }).catch((error2) => {
111289
+ if (this._torndown) {
111290
+ return;
111291
+ }
111252
111292
  this.emitErrorEvent(
111253
111293
  "Failed to start ProxyWorker or InspectorProxyWorker",
111254
111294
  error2
@@ -111931,8 +111971,8 @@ function getErrorMap() {
111931
111971
  }
111932
111972
  __name(getErrorMap, "getErrorMap");
111933
111973
  var makeIssue = /* @__PURE__ */ __name((params) => {
111934
- const { data, path: path69, errorMaps, issueData } = params;
111935
- const fullPath = [...path69, ...issueData.path || []];
111974
+ const { data, path: path70, errorMaps, issueData } = params;
111975
+ const fullPath = [...path70, ...issueData.path || []];
111936
111976
  const fullIssue = {
111937
111977
  ...issueData,
111938
111978
  path: fullPath
@@ -112033,11 +112073,11 @@ var errorUtil;
112033
112073
  errorUtil2.toString = (message) => typeof message === "string" ? message : message === null || message === void 0 ? void 0 : message.message;
112034
112074
  })(errorUtil || (errorUtil = {}));
112035
112075
  var ParseInputLazyPath = class {
112036
- constructor(parent, value, path69, key) {
112076
+ constructor(parent, value, path70, key) {
112037
112077
  this._cachedPath = [];
112038
112078
  this.parent = parent;
112039
112079
  this.data = value;
112040
- this._path = path69;
112080
+ this._path = path70;
112041
112081
  this._key = key;
112042
112082
  }
112043
112083
  get path() {
@@ -115354,7 +115394,10 @@ var z2 = /* @__PURE__ */ Object.freeze({
115354
115394
  // ../workers-shared/utils/types.ts
115355
115395
  var RoutingConfigSchema = z2.object({
115356
115396
  has_user_worker: z2.boolean().optional(),
115357
- invoke_user_worker_ahead_of_assets: z2.boolean().optional()
115397
+ invoke_user_worker_ahead_of_assets: z2.boolean().optional(),
115398
+ // Used for analytics and reporting
115399
+ account_id: z2.number().optional(),
115400
+ script_id: z2.number().optional()
115358
115401
  });
115359
115402
  var AssetConfigSchema = z2.object({
115360
115403
  html_handling: z2.enum([
@@ -115366,6 +115409,15 @@ var AssetConfigSchema = z2.object({
115366
115409
  not_found_handling: z2.enum(["single-page-application", "404-page", "none"]).optional(),
115367
115410
  serve_directly: z2.boolean().optional()
115368
115411
  });
115412
+ var InternalConfigSchema = z2.object({
115413
+ // Used for analytics and reporting
115414
+ account_id: z2.number().optional(),
115415
+ script_id: z2.number().optional()
115416
+ });
115417
+ var AssetWorkerConfigShema = z2.object({
115418
+ ...AssetConfigSchema.shape,
115419
+ ...InternalConfigSchema.shape
115420
+ });
115369
115421
 
115370
115422
  // ../workers-shared/utils/helpers.ts
115371
115423
  init_import_meta_url();
@@ -118144,10 +118196,10 @@ function handleRequireCallsToNodeJSBuiltins(build5) {
118144
118196
  });
118145
118197
  build5.onLoad(
118146
118198
  { filter: /.*/, namespace: REQUIRED_NODE_BUILT_IN_NAMESPACE },
118147
- ({ path: path69 }) => {
118199
+ ({ path: path70 }) => {
118148
118200
  return {
118149
118201
  contents: esm_default2`
118150
- import libDefault from '${path69}';
118202
+ import libDefault from '${path70}';
118151
118203
  module.exports = libDefault;`,
118152
118204
  loader: "js"
118153
118205
  };
@@ -118196,10 +118248,10 @@ function handleUnenvAliasedPackages(build5, alias, external) {
118196
118248
  `;
118197
118249
  build5.onLoad(
118198
118250
  { filter: /.*/, namespace: REQUIRED_UNENV_ALIAS_NAMESPACE },
118199
- ({ path: path69 }) => {
118251
+ ({ path: path70 }) => {
118200
118252
  return {
118201
118253
  contents: esm_default2`
118202
- import * as esm from '${path69}';
118254
+ import * as esm from '${path70}';
118203
118255
  module.exports = __cf_cjs(esm);
118204
118256
  `,
118205
118257
  loader: "js"
@@ -118221,9 +118273,9 @@ function handleNodeJSGlobals(build5, inject) {
118221
118273
  (globalName) => `${prefix}${encodeToLowerCase(globalName)}.js`
118222
118274
  )
118223
118275
  ];
118224
- build5.onResolve({ filter: UNENV_GLOBALS_RE }, ({ path: path69 }) => ({ path: path69 }));
118225
- build5.onLoad({ filter: UNENV_GLOBALS_RE }, ({ path: path69 }) => {
118226
- const globalName = decodeFromLowerCase(path69.match(UNENV_GLOBALS_RE)[1]);
118276
+ build5.onResolve({ filter: UNENV_GLOBALS_RE }, ({ path: path70 }) => ({ path: path70 }));
118277
+ build5.onLoad({ filter: UNENV_GLOBALS_RE }, ({ path: path70 }) => {
118278
+ const globalName = decodeFromLowerCase(path70.match(UNENV_GLOBALS_RE)[1]);
118227
118279
  const { importStatement, exportName } = getGlobalInject(inject[globalName]);
118228
118280
  return {
118229
118281
  contents: esm_default2`
@@ -118271,21 +118323,21 @@ var nodejsCompatPlugin = /* @__PURE__ */ __name((mode) => ({
118271
118323
  });
118272
118324
  pluginBuild.onResolve(
118273
118325
  { filter: /node:.*/ },
118274
- async ({ path: path69, kind, resolveDir, importer }) => {
118275
- const specifier = `${path69}:${kind}:${resolveDir}:${importer}`;
118326
+ async ({ path: path70, kind, resolveDir, importer }) => {
118327
+ const specifier = `${path70}:${kind}:${resolveDir}:${importer}`;
118276
118328
  if (seen.has(specifier)) {
118277
118329
  return;
118278
118330
  }
118279
118331
  seen.add(specifier);
118280
- const result = await pluginBuild.resolve(path69, {
118332
+ const result = await pluginBuild.resolve(path70, {
118281
118333
  kind,
118282
118334
  resolveDir,
118283
118335
  importer
118284
118336
  });
118285
118337
  if (result.errors.length > 0) {
118286
- const pathWarnedPackages = warnedPackages.get(path69) ?? [];
118338
+ const pathWarnedPackages = warnedPackages.get(path70) ?? [];
118287
118339
  pathWarnedPackages.push(importer);
118288
- warnedPackages.set(path69, pathWarnedPackages);
118340
+ warnedPackages.set(path70, pathWarnedPackages);
118289
118341
  return { external: true };
118290
118342
  }
118291
118343
  return result;
@@ -118313,10 +118365,10 @@ var nodejsCompatPlugin = /* @__PURE__ */ __name((mode) => ({
118313
118365
  });
118314
118366
  pluginBuild.onEnd(() => {
118315
118367
  if (mode !== "v1") {
118316
- warnedPackages.forEach((importers, path69) => {
118368
+ warnedPackages.forEach((importers, path70) => {
118317
118369
  logger.warn(
118318
118370
  dedent2`
118319
- The package "${path69}" wasn't found on the file system but is built into node.
118371
+ The package "${path70}" wasn't found on the file system but is built into node.
118320
118372
  Your Worker may throw errors at runtime unless you enable the "nodejs_compat" compatibility flag. Refer to https://developers.cloudflare.com/workers/runtime-apis/nodejs/ for more details. Imported from:
118321
118373
  ${toList(importers, pluginBuild.initialOptions.absWorkingDir)}`
118322
118374
  );
@@ -120810,18 +120862,28 @@ __name(triggersDeploy, "triggersDeploy");
120810
120862
  // src/utils/retry.ts
120811
120863
  init_import_meta_url();
120812
120864
  var import_promises8 = require("node:timers/promises");
120813
- async function retryOnError(action, backoff = 2e3, attempts = 3) {
120865
+ var MAX_ATTEMPTS = 3;
120866
+ async function retryOnAPIFailure(action, backoff = 0, attempts = MAX_ATTEMPTS) {
120814
120867
  try {
120815
120868
  return await action();
120816
120869
  } catch (err) {
120870
+ if (err instanceof APIError && !err.isRetryable() || !(err instanceof TypeError)) {
120871
+ throw err;
120872
+ }
120873
+ logger.info(source_default.dim(`Retrying API call after error...`));
120874
+ logger.debug(err);
120817
120875
  if (attempts <= 1) {
120818
120876
  throw err;
120819
120877
  }
120820
120878
  await (0, import_promises8.setTimeout)(backoff);
120821
- return retryOnError(action, backoff, attempts - 1);
120879
+ return retryOnAPIFailure(
120880
+ action,
120881
+ backoff + (MAX_ATTEMPTS - attempts) * 1e3,
120882
+ attempts - 1
120883
+ );
120822
120884
  }
120823
120885
  }
120824
- __name(retryOnError, "retryOnError");
120886
+ __name(retryOnAPIFailure, "retryOnAPIFailure");
120825
120887
 
120826
120888
  // src/versions/api.ts
120827
120889
  init_import_meta_url();
@@ -122014,7 +122076,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
122014
122076
  try {
122015
122077
  let result;
122016
122078
  if (canUseNewVersionsDeploymentsApi) {
122017
- const versionResult = await retryOnError(
122079
+ const versionResult = await retryOnAPIFailure(
122018
122080
  async () => fetchResult(
122019
122081
  `/accounts/${accountId}/workers/scripts/${scriptName}/versions`,
122020
122082
  {
@@ -122048,7 +122110,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
122048
122110
  startup_time_ms: versionResult.startup_time_ms
122049
122111
  };
122050
122112
  } else {
122051
- result = await retryOnError(
122113
+ result = await retryOnAPIFailure(
122052
122114
  async () => fetchResult(
122053
122115
  workerUrl,
122054
122116
  {
@@ -125020,8 +125082,8 @@ function buildPluginFromFunctions({
125020
125082
  ]
125021
125083
  };
125022
125084
  }
125023
- const path69 = `assets:./${(0, import_node_path41.relative)(outdir, directory)}`;
125024
- return { path: path69, external: true, namespace: "assets" };
125085
+ const path70 = `assets:./${(0, import_node_path41.relative)(outdir, directory)}`;
125086
+ return { path: path70, external: true, namespace: "assets" };
125025
125087
  });
125026
125088
  }
125027
125089
  },
@@ -125955,6 +126017,17 @@ async function uploadMTlsCertificateFromFs(accountId, details) {
125955
126017
  });
125956
126018
  }
125957
126019
  __name(uploadMTlsCertificateFromFs, "uploadMTlsCertificateFromFs");
126020
+ async function uploadCaCertificateFromFs(accountId, details) {
126021
+ return await fetchResult(`/accounts/${accountId}/mtls_certificates`, {
126022
+ method: "POST",
126023
+ body: JSON.stringify({
126024
+ name: details.name,
126025
+ certificates: readFileSync5(details.certificates),
126026
+ ca: details.ca
126027
+ })
126028
+ });
126029
+ }
126030
+ __name(uploadCaCertificateFromFs, "uploadCaCertificateFromFs");
125958
126031
  async function uploadMTlsCertificate(accountId, body) {
125959
126032
  return await fetchResult(`/accounts/${accountId}/mtls_certificates`, {
125960
126033
  method: "POST",
@@ -125974,9 +126047,11 @@ async function getMTlsCertificate(accountId, id) {
125974
126047
  );
125975
126048
  }
125976
126049
  __name(getMTlsCertificate, "getMTlsCertificate");
125977
- async function listMTlsCertificates(accountId, filter) {
126050
+ async function listMTlsCertificates(accountId, filter, ca2 = false) {
125978
126051
  const params = new URLSearchParams();
125979
- params.append("ca", "false");
126052
+ if (!ca2) {
126053
+ params.append("ca", String(false));
126054
+ }
125980
126055
  if (filter.name) {
125981
126056
  params.append("name", filter.name);
125982
126057
  }
@@ -125987,8 +126062,8 @@ async function listMTlsCertificates(accountId, filter) {
125987
126062
  );
125988
126063
  }
125989
126064
  __name(listMTlsCertificates, "listMTlsCertificates");
125990
- async function getMTlsCertificateByName(accountId, name2) {
125991
- const certificates = await listMTlsCertificates(accountId, { name: name2 });
126065
+ async function getMTlsCertificateByName(accountId, name2, ca2 = false) {
126066
+ const certificates = await listMTlsCertificates(accountId, { name: name2 }, ca2);
125992
126067
  if (certificates.length === 0) {
125993
126068
  throw new ErrorMTlsCertificateNameNotFound(
125994
126069
  `certificate not found with name "${name2}"`
@@ -127101,6 +127176,12 @@ async function resolveTriggers(config, input) {
127101
127176
  }
127102
127177
  __name(resolveTriggers, "resolveTriggers");
127103
127178
  async function resolveConfig(config, input) {
127179
+ if (config.pages_build_output_dir && input.dev?.multiworkerPrimary === false) {
127180
+ throw new UserError(
127181
+ `You cannot use a Pages project as a service binding target.
127182
+ If you are trying to develop Pages and Workers together, please use \`wrangler pages dev\`. Note the first config file specified must be for the Pages project`
127183
+ );
127184
+ }
127104
127185
  const legacySite = unwrapHook(input.legacy?.site, config);
127105
127186
  const legacyAssets = unwrapHook(input.legacy?.legacyAssets, config);
127106
127187
  const entry = await getEntry(
@@ -131925,6 +132006,174 @@ function ai(yargs) {
131925
132006
  }
131926
132007
  __name(ai, "ai");
131927
132008
 
132009
+ // src/cert/cert.ts
132010
+ init_import_meta_url();
132011
+ var certNamespace = createNamespace({
132012
+ metadata: {
132013
+ description: "\u{1FAAA} Manage client mTLS certificates and CA certificate chains used for secured connections",
132014
+ status: "open-beta",
132015
+ owner: "Product: SSL"
132016
+ }
132017
+ });
132018
+ var certUploadNamespace = createNamespace({
132019
+ metadata: {
132020
+ description: "Upload a new cert",
132021
+ status: "open-beta",
132022
+ owner: "Product: SSL"
132023
+ }
132024
+ });
132025
+ var certUploadMtlsCommand = createCommand({
132026
+ metadata: {
132027
+ description: "Upload an mTLS certificate",
132028
+ status: "stable",
132029
+ owner: "Product: SSL"
132030
+ },
132031
+ args: {
132032
+ cert: {
132033
+ description: "The path to a certificate file (.pem) containing a chain of certificates to upload",
132034
+ type: "string",
132035
+ demandOption: true
132036
+ },
132037
+ key: {
132038
+ description: "The path to a file containing the private key for your leaf certificate",
132039
+ type: "string",
132040
+ demandOption: true
132041
+ },
132042
+ name: {
132043
+ description: "The name for the certificate",
132044
+ type: "string"
132045
+ }
132046
+ },
132047
+ async handler({ cert, key, name: name2 }, { config }) {
132048
+ const accountId = await requireAuth(config);
132049
+ logger.log(
132050
+ name2 ? `Uploading mTLS Certificate ${name2}...` : `Uploading mTLS Certificate...`
132051
+ );
132052
+ const certResponse = await uploadMTlsCertificateFromFs(accountId, {
132053
+ certificateChainFilename: cert,
132054
+ privateKeyFilename: key,
132055
+ name: name2
132056
+ });
132057
+ const expiresOn = new Date(certResponse.expires_on).toLocaleDateString();
132058
+ logger.log(
132059
+ name2 ? `Success! Uploaded mTLS Certificate ${name2}` : `Success! Uploaded mTLS Certificate`
132060
+ );
132061
+ logger.log(`ID: ${certResponse.id}`);
132062
+ logger.log(`Issuer: ${certResponse.issuer}`);
132063
+ logger.log(`Expires on ${expiresOn}`);
132064
+ }
132065
+ });
132066
+ var certUploadCaCertCommand = createCommand({
132067
+ metadata: {
132068
+ description: "Upload a CA certificate chain",
132069
+ status: "stable",
132070
+ owner: "Product: SSL"
132071
+ },
132072
+ args: {
132073
+ name: {
132074
+ describe: "The name for the certificate",
132075
+ type: "string"
132076
+ },
132077
+ "ca-cert": {
132078
+ description: "The path to a certificate file (.pem) containing a chain of CA certificates to upload",
132079
+ type: "string",
132080
+ demandOption: true
132081
+ }
132082
+ },
132083
+ async handler({ caCert, name: name2 }, { config }) {
132084
+ const accountId = await requireAuth(config);
132085
+ logger.log(
132086
+ name2 ? `Uploading CA Certificate ${name2}...` : `Uploading CA Certificate...`
132087
+ );
132088
+ const certResponse = await uploadCaCertificateFromFs(accountId, {
132089
+ certificates: caCert,
132090
+ ca: true,
132091
+ name: name2
132092
+ });
132093
+ const expiresOn = new Date(certResponse.expires_on).toLocaleDateString();
132094
+ logger.log(
132095
+ name2 ? `Success! Uploaded CA Certificate ${name2}` : `Success! Uploaded CA Certificate`
132096
+ );
132097
+ logger.log(`ID: ${certResponse.id}`);
132098
+ logger.log(`Issuer: ${certResponse.issuer}`);
132099
+ logger.log(`Expires on ${expiresOn}`);
132100
+ }
132101
+ });
132102
+ var certListCommand = createCommand({
132103
+ metadata: {
132104
+ description: "List uploaded mTLS certificates",
132105
+ status: "stable",
132106
+ owner: "Product: SSL"
132107
+ },
132108
+ async handler(_4, { config }) {
132109
+ const accountId = await requireAuth(config);
132110
+ const certificates = await listMTlsCertificates(accountId, {}, true);
132111
+ for (const certificate of certificates) {
132112
+ logger.log(`ID: ${certificate.id}`);
132113
+ if (certificate.name) {
132114
+ logger.log(`Name: ${certificate.name}`);
132115
+ }
132116
+ logger.log(`Issuer: ${certificate.issuer}`);
132117
+ logger.log(
132118
+ `Created on: ${new Date(certificate.uploaded_on).toLocaleDateString()}`
132119
+ );
132120
+ logger.log(
132121
+ `Expires on: ${new Date(certificate.expires_on).toLocaleDateString()}`
132122
+ );
132123
+ if (certificate.ca) {
132124
+ logger.log(`CA: ${certificate.ca}`);
132125
+ }
132126
+ logger.log("\n");
132127
+ }
132128
+ }
132129
+ });
132130
+ var certDeleteCommand = createCommand({
132131
+ metadata: {
132132
+ description: "Delete an mTLS certificate",
132133
+ status: "stable",
132134
+ owner: "Product: SSL"
132135
+ },
132136
+ args: {
132137
+ id: {
132138
+ description: "The id of the mTLS certificate to delete",
132139
+ type: "string"
132140
+ },
132141
+ name: {
132142
+ description: "The name of the mTLS certificate record to delete",
132143
+ type: "string"
132144
+ }
132145
+ },
132146
+ async handler({ id, name: name2 }, { config }) {
132147
+ const accountId = await requireAuth(config);
132148
+ if (id && name2) {
132149
+ return logger.error(`Can't provide both --id and --name.`);
132150
+ } else if (!id && !name2) {
132151
+ return logger.error(`Must provide --id or --name.`);
132152
+ }
132153
+ let certificate;
132154
+ if (id) {
132155
+ certificate = await getMTlsCertificate(accountId, id);
132156
+ } else {
132157
+ certificate = await getMTlsCertificateByName(
132158
+ accountId,
132159
+ name2,
132160
+ true
132161
+ );
132162
+ }
132163
+ const response = await confirm(
132164
+ `Are you sure you want to delete certificate ${certificate.id}${certificate.name ? ` (${certificate.name})` : ""}?`
132165
+ );
132166
+ if (!response) {
132167
+ logger.log("Not deleting");
132168
+ return;
132169
+ }
132170
+ await deleteMTlsCertificate(accountId, certificate.id);
132171
+ logger.log(
132172
+ `Deleted certificate ${certificate.id} ${certificate.name ? `(${certificate.name})` : ""} successfully`
132173
+ );
132174
+ }
132175
+ });
132176
+
131928
132177
  // src/cloudchamber/index.ts
131929
132178
  init_import_meta_url();
131930
132179
 
@@ -132331,13 +132580,13 @@ var getQueryString = /* @__PURE__ */ __name((params) => {
132331
132580
  }, "getQueryString");
132332
132581
  var getUrl = /* @__PURE__ */ __name((config, options30) => {
132333
132582
  const encoder = config.ENCODE_PATH || encodeURI;
132334
- const path69 = options30.url.replace("{api-version}", config.VERSION).replace(/{(.*?)}/g, (substring2, group) => {
132583
+ const path70 = options30.url.replace("{api-version}", config.VERSION).replace(/{(.*?)}/g, (substring2, group) => {
132335
132584
  if (options30.path?.hasOwnProperty(group)) {
132336
132585
  return encoder(String(options30.path[group]));
132337
132586
  }
132338
132587
  return substring2;
132339
132588
  });
132340
- const url4 = `${config.BASE}${path69}`;
132589
+ const url4 = `${config.BASE}${path70}`;
132341
132590
  if (options30.query) {
132342
132591
  return `${url4}${getQueryString(options30.query)}`;
132343
132592
  }
@@ -133816,11 +134065,11 @@ var Diff = class {
133816
134065
  while (!execEditLength()) {
133817
134066
  }
133818
134067
  }
133819
- addToPath(path69, added, removed, oldPosInc) {
133820
- const last = path69.lastComponent;
134068
+ addToPath(path70, added, removed, oldPosInc) {
134069
+ const last = path70.lastComponent;
133821
134070
  if (last && last.added === added && last.removed === removed) {
133822
134071
  return {
133823
- oldPos: path69.oldPos + oldPosInc,
134072
+ oldPos: path70.oldPos + oldPosInc,
133824
134073
  lastComponent: {
133825
134074
  count: last.count + 1,
133826
134075
  added,
@@ -133830,7 +134079,7 @@ var Diff = class {
133830
134079
  };
133831
134080
  }
133832
134081
  return {
133833
- oldPos: path69.oldPos + oldPosInc,
134082
+ oldPos: path70.oldPos + oldPosInc,
133834
134083
  lastComponent: {
133835
134084
  count: 1,
133836
134085
  added,
@@ -134935,15 +135184,15 @@ var sshCommand = /* @__PURE__ */ __name((yargs) => {
134935
135184
  }, "sshCommand");
134936
135185
  async function tryToRetrieveAllDefaultSSHKeyPaths() {
134937
135186
  const HOME = (0, import_os4.homedir)();
134938
- const path69 = `${HOME}/.ssh`;
135187
+ const path70 = `${HOME}/.ssh`;
134939
135188
  const paths = [];
134940
135189
  try {
134941
- const dirList = await (0, import_promises22.readdir)(path69);
135190
+ const dirList = await (0, import_promises22.readdir)(path70);
134942
135191
  for (const file of dirList) {
134943
135192
  if (file.endsWith(".pub")) {
134944
- const s5 = await (0, import_promises22.stat)(`${path69}/${file}`);
135193
+ const s5 = await (0, import_promises22.stat)(`${path70}/${file}`);
134945
135194
  if (s5.isFile()) {
134946
- paths.push(`${path69}/${file}`);
135195
+ paths.push(`${path70}/${file}`);
134947
135196
  }
134948
135197
  }
134949
135198
  }
@@ -134955,8 +135204,8 @@ async function tryToRetrieveAllDefaultSSHKeyPaths() {
134955
135204
  __name(tryToRetrieveAllDefaultSSHKeyPaths, "tryToRetrieveAllDefaultSSHKeyPaths");
134956
135205
  async function tryToRetrieveADefaultPath() {
134957
135206
  const paths = await tryToRetrieveAllDefaultSSHKeyPaths();
134958
- const path69 = paths.pop();
134959
- return path69 ?? "";
135207
+ const path70 = paths.pop();
135208
+ return path70 ?? "";
134960
135209
  }
134961
135210
  __name(tryToRetrieveADefaultPath, "tryToRetrieveADefaultPath");
134962
135211
  function clipPublicSSHKey(value) {
@@ -146802,8 +147051,9 @@ __name(ListHandler4, "ListHandler");
146802
147051
  // src/pages/dev.ts
146803
147052
  init_import_meta_url();
146804
147053
  var import_node_child_process5 = require("node:child_process");
147054
+ var import_node_events6 = __toESM(require("node:events"));
146805
147055
  var import_node_fs33 = require("node:fs");
146806
- var import_node_path62 = require("node:path");
147056
+ var import_node_path62 = __toESM(require("node:path"));
146807
147057
  init_esm2();
146808
147058
  var esbuild3 = __toESM(require("esbuild"));
146809
147059
 
@@ -146983,11 +147233,6 @@ function Options14(yargs) {
146983
147233
  deprecated: true,
146984
147234
  hidden: true
146985
147235
  },
146986
- config: {
146987
- describe: "Pages does not support custom paths for the Wrangler configuration file",
146988
- type: "string",
146989
- hidden: true
146990
- },
146991
147236
  "log-level": {
146992
147237
  choices: ["debug", "info", "log", "warn", "error", "none"],
146993
147238
  describe: "Specify logging level"
@@ -147014,7 +147259,7 @@ var Handler14 = /* @__PURE__ */ __name(async (args) => {
147014
147259
  "--experimental-local is no longer required and will be removed in a future version.\n`wrangler pages dev` now uses the local Cloudflare Workers runtime by default."
147015
147260
  );
147016
147261
  }
147017
- if (args.config) {
147262
+ if (args.config && !Array.isArray(args.config)) {
147018
147263
  throw new FatalError(
147019
147264
  "Pages does not support custom paths for the Wrangler configuration file",
147020
147265
  1
@@ -147033,9 +147278,14 @@ The Worker script should be named \`_worker.js\` and located in the build output
147033
147278
  );
147034
147279
  }
147035
147280
  const config = readConfig(
147036
- { ...args, env: void 0 },
147281
+ { ...args, env: void 0, config: void 0 },
147037
147282
  { useRedirectIfAvailable: true }
147038
147283
  );
147284
+ if (args.config && Array.isArray(args.config) && config.configPath && import_node_path62.default.resolve(process.cwd(), args.config[0]) !== config.configPath) {
147285
+ throw new FatalError(
147286
+ "The first `--config` argument must point to your Pages configuration file: " + import_node_path62.default.relative(process.cwd(), config.configPath)
147287
+ );
147288
+ }
147039
147289
  const resolvedDirectory = args.directory ?? config.pages_build_output_dir;
147040
147290
  const [_pages, _dev, ...remaining] = args._;
147041
147291
  const command2 = remaining;
@@ -147188,8 +147438,8 @@ The Worker script should be named \`_worker.js\` and located in the build output
147188
147438
  }, 50);
147189
147439
  try {
147190
147440
  await runBuild2();
147191
- watcher.on("all", async (eventName, path69) => {
147192
- logger.debug(`\u{1F300} "${eventName}" event detected at ${path69}.`);
147441
+ watcher.on("all", async (eventName, p6) => {
147442
+ logger.debug(`\u{1F300} "${eventName}" event detected at ${p6}.`);
147193
147443
  if (eventName === "unlink") {
147194
147444
  return;
147195
147445
  }
@@ -147260,8 +147510,8 @@ The Worker script should be named \`_worker.js\` and located in the build output
147260
147510
  }, 50);
147261
147511
  try {
147262
147512
  await buildFn();
147263
- watcher.on("all", async (eventName, path69) => {
147264
- logger.debug(`\u{1F300} "${eventName}" event detected at ${path69}.`);
147513
+ watcher.on("all", async (eventName, p6) => {
147514
+ logger.debug(`\u{1F300} "${eventName}" event detected at ${p6}.`);
147265
147515
  debouncedBuildFn();
147266
147516
  });
147267
147517
  } catch (e7) {
@@ -147364,56 +147614,94 @@ ${JSON.stringify(defaultRoutesJSONSpec, null, 2)}`
147364
147614
  });
147365
147615
  }
147366
147616
  }
147367
- const { stop, waitUntilExit } = await unstable_dev(scriptEntrypoint, {
147368
- env: void 0,
147369
- ip,
147370
- port,
147371
- inspectorPort,
147372
- localProtocol,
147373
- httpsKeyPath: args.httpsKeyPath,
147374
- httpsCertPath: args.httpsCertPath,
147375
- compatibilityDate,
147376
- compatibilityFlags,
147377
- nodeCompat: nodejsCompatMode === "legacy",
147378
- vars,
147379
- kv: kv_namespaces,
147380
- durableObjects: do_bindings,
147381
- r2: r2_buckets,
147382
- services,
147383
- ai: ai3,
147384
- rules: usingWorkerDirectory ? [
147385
- {
147386
- type: "ESModule",
147387
- globs: ["**/*.js", "**/*.mjs"]
147388
- }
147389
- ] : void 0,
147390
- bundle: enableBundling,
147391
- persistTo: args.persistTo,
147392
- inspect: void 0,
147393
- logLevel: args.logLevel,
147394
- experimental: {
147395
- processEntrypoint: true,
147396
- additionalModules: modules,
147617
+ const devServer = await run(
147618
+ {
147619
+ MULTIWORKER: Array.isArray(args.config),
147620
+ RESOURCES_PROVISION: false
147621
+ },
147622
+ () => startDev({
147623
+ script: scriptEntrypoint,
147624
+ _: [],
147625
+ $0: "",
147626
+ remote: false,
147627
+ local: true,
147628
+ experimentalLocal: void 0,
147397
147629
  d1Databases: d1_databases,
147398
- disableExperimentalWarning: true,
147630
+ testScheduled: false,
147399
147631
  enablePagesAssetsServiceBinding: {
147400
147632
  proxyPort,
147401
147633
  directory
147402
147634
  },
147403
- liveReload: args.liveReload,
147404
147635
  forceLocal: true,
147636
+ liveReload: args.liveReload,
147405
147637
  showInteractiveDevSession: args.showInteractiveDevSession,
147406
- testMode: false,
147407
- watch: true,
147408
- enableIpc: true
147409
- }
147410
- });
147638
+ processEntrypoint: true,
147639
+ additionalModules: modules,
147640
+ v: void 0,
147641
+ assets: void 0,
147642
+ name: void 0,
147643
+ noBundle: false,
147644
+ format: void 0,
147645
+ latest: false,
147646
+ routes: void 0,
147647
+ host: void 0,
147648
+ localUpstream: void 0,
147649
+ experimentalPublic: void 0,
147650
+ upstreamProtocol: void 0,
147651
+ var: void 0,
147652
+ define: void 0,
147653
+ alias: void 0,
147654
+ jsxFactory: void 0,
147655
+ jsxFragment: void 0,
147656
+ tsconfig: void 0,
147657
+ minify: void 0,
147658
+ experimentalEnableLocalPersistence: void 0,
147659
+ legacyEnv: void 0,
147660
+ public: void 0,
147661
+ env: void 0,
147662
+ ip,
147663
+ port,
147664
+ inspectorPort,
147665
+ localProtocol,
147666
+ httpsKeyPath: args.httpsKeyPath,
147667
+ httpsCertPath: args.httpsCertPath,
147668
+ compatibilityDate,
147669
+ compatibilityFlags,
147670
+ nodeCompat: nodejsCompatMode === "legacy",
147671
+ vars,
147672
+ kv: kv_namespaces,
147673
+ durableObjects: do_bindings,
147674
+ r2: r2_buckets,
147675
+ services,
147676
+ ai: ai3,
147677
+ rules: usingWorkerDirectory ? [
147678
+ {
147679
+ type: "ESModule",
147680
+ globs: ["**/*.js", "**/*.mjs"]
147681
+ }
147682
+ ] : void 0,
147683
+ bundle: enableBundling,
147684
+ persistTo: args.persistTo,
147685
+ logLevel: args.logLevel ?? "log",
147686
+ experimentalProvision: void 0,
147687
+ experimentalVectorizeBindToProd: false,
147688
+ enableIpc: true,
147689
+ config: Array.isArray(args.config) ? args.config : void 0,
147690
+ legacyAssets: void 0,
147691
+ site: void 0,
147692
+ siteInclude: void 0,
147693
+ siteExclude: void 0,
147694
+ inspect: void 0
147695
+ })
147696
+ );
147411
147697
  sendMetricsEvent("run pages dev");
147412
- CLEANUP_CALLBACKS.push(stop);
147413
147698
  process.on("exit", CLEANUP);
147414
147699
  process.on("SIGINT", CLEANUP);
147415
147700
  process.on("SIGTERM", CLEANUP);
147416
- await waitUntilExit();
147701
+ await import_node_events6.default.once(devServer.devEnv, "teardown");
147702
+ const teardownRegistry = await devServer.teardownRegistryPromise;
147703
+ await teardownRegistry?.(devServer.devEnv.config.latestConfig?.name);
147704
+ devServer.unregisterHotKeys?.();
147417
147705
  CLEANUP();
147418
147706
  process.exit(0);
147419
147707
  }, "Handler");
@@ -152589,7 +152877,7 @@ async function authorizeR2Bucket(pipelineName, accountId, bucketName) {
152589
152877
  },
152590
152878
  endpoint: getAccountR2Endpoint(accountId)
152591
152879
  });
152592
- !__testSkipDelaysFlag && await retryOnError(
152880
+ !__testSkipDelaysFlag && await retryOnAPIFailure(
152593
152881
  async () => {
152594
152882
  await r22.send(
152595
152883
  new HeadBucketCommand({
@@ -155287,7 +155575,7 @@ var r2BucketNotificationDeleteCommand = createCommand({
155287
155575
  init_import_meta_url();
155288
155576
  var import_node_buffer5 = require("node:buffer");
155289
155577
  var fs27 = __toESM(require("node:fs"));
155290
- var path67 = __toESM(require("node:path"));
155578
+ var path68 = __toESM(require("node:path"));
155291
155579
  var stream = __toESM(require("node:stream"));
155292
155580
  var r2ObjectNamespace = createNamespace({
155293
155581
  metadata: {
@@ -155353,7 +155641,7 @@ var r2ObjectGetCommand = createCommand({
155353
155641
  }
155354
155642
  let output;
155355
155643
  if (file) {
155356
- fs27.mkdirSync(path67.dirname(file), { recursive: true });
155644
+ fs27.mkdirSync(path68.dirname(file), { recursive: true });
155357
155645
  output = fs27.createWriteStream(file);
155358
155646
  } else {
155359
155647
  output = process.stdout;
@@ -156477,8 +156765,8 @@ function isValidProtocol(protocol) {
156477
156765
  }
156478
156766
  __name(isValidProtocol, "isValidProtocol");
156479
156767
  function dsnToString(dsn, withPassword = false) {
156480
- const { host, path: path69, pass: pass2, port, projectId, protocol, publicKey } = dsn;
156481
- return `${protocol}://${publicKey}${withPassword && pass2 ? `:${pass2}` : ""}@${host}${port ? `:${port}` : ""}/${path69 ? `${path69}/` : path69}${projectId}`;
156768
+ const { host, path: path70, pass: pass2, port, projectId, protocol, publicKey } = dsn;
156769
+ return `${protocol}://${publicKey}${withPassword && pass2 ? `:${pass2}` : ""}@${host}${port ? `:${port}` : ""}/${path70 ? `${path70}/` : path70}${projectId}`;
156482
156770
  }
156483
156771
  __name(dsnToString, "dsnToString");
156484
156772
  function dsnFromString(str) {
@@ -156490,11 +156778,11 @@ function dsnFromString(str) {
156490
156778
  return void 0;
156491
156779
  }
156492
156780
  const [protocol, publicKey, pass2 = "", host, port = "", lastPath] = match2.slice(1);
156493
- let path69 = "";
156781
+ let path70 = "";
156494
156782
  let projectId = lastPath;
156495
156783
  const split = projectId.split("/");
156496
156784
  if (split.length > 1) {
156497
- path69 = split.slice(0, -1).join("/");
156785
+ path70 = split.slice(0, -1).join("/");
156498
156786
  projectId = split.pop();
156499
156787
  }
156500
156788
  if (projectId) {
@@ -156503,7 +156791,7 @@ function dsnFromString(str) {
156503
156791
  projectId = projectMatch[0];
156504
156792
  }
156505
156793
  }
156506
- return dsnFromComponents({ host, pass: pass2, path: path69, projectId, port, protocol, publicKey });
156794
+ return dsnFromComponents({ host, pass: pass2, path: path70, projectId, port, protocol, publicKey });
156507
156795
  }
156508
156796
  __name(dsnFromString, "dsnFromString");
156509
156797
  function dsnFromComponents(components) {
@@ -157591,9 +157879,9 @@ function getNumberOfUrlSegments(url4) {
157591
157879
  }
157592
157880
  __name(getNumberOfUrlSegments, "getNumberOfUrlSegments");
157593
157881
  function getSanitizedUrlString(url4) {
157594
- const { protocol, host, path: path69 } = url4;
157882
+ const { protocol, host, path: path70 } = url4;
157595
157883
  const filteredHost = host && host.replace(/^.*@/, "[filtered]:[filtered]@").replace(/(:80)$/, "").replace(/(:443)$/, "") || "";
157596
- return `${protocol ? `${protocol}://` : ""}${filteredHost}${path69}`;
157884
+ return `${protocol ? `${protocol}://` : ""}${filteredHost}${path70}`;
157597
157885
  }
157598
157886
  __name(getSanitizedUrlString, "getSanitizedUrlString");
157599
157887
 
@@ -157608,13 +157896,13 @@ var DEFAULT_REQUEST_INCLUDES = ["cookies", "data", "headers", "method", "query_s
157608
157896
  var DEFAULT_USER_INCLUDES = ["id", "username", "email"];
157609
157897
  function extractPathForTransaction(req, options30 = {}) {
157610
157898
  const method = req.method && req.method.toUpperCase();
157611
- let path69 = "";
157899
+ let path70 = "";
157612
157900
  let source = "url";
157613
157901
  if (options30.customRoute || req.route) {
157614
- path69 = options30.customRoute || `${req.baseUrl || ""}${req.route && req.route.path}`;
157902
+ path70 = options30.customRoute || `${req.baseUrl || ""}${req.route && req.route.path}`;
157615
157903
  source = "route";
157616
157904
  } else if (req.originalUrl || req.url) {
157617
- path69 = stripUrlQueryAndFragment(req.originalUrl || req.url || "");
157905
+ path70 = stripUrlQueryAndFragment(req.originalUrl || req.url || "");
157618
157906
  }
157619
157907
  let name2 = "";
157620
157908
  if (options30.method && method) {
@@ -157623,8 +157911,8 @@ function extractPathForTransaction(req, options30 = {}) {
157623
157911
  if (options30.method && options30.path) {
157624
157912
  name2 += " ";
157625
157913
  }
157626
- if (options30.path && path69) {
157627
- name2 += path69;
157914
+ if (options30.path && path70) {
157915
+ name2 += path70;
157628
157916
  }
157629
157917
  return [name2, source];
157630
157918
  }
@@ -162114,13 +162402,13 @@ function instrumentRouter(appOrRouter) {
162114
162402
  }, "process_params");
162115
162403
  }
162116
162404
  __name(instrumentRouter, "instrumentRouter");
162117
- var extractOriginalRoute = /* @__PURE__ */ __name((path69, regexp, keys) => {
162118
- if (!path69 || !regexp || !keys || Object.keys(keys).length === 0 || !_optionalChain([keys, "access", (_10) => _10[0], "optionalAccess", (_11) => _11.offset])) {
162405
+ var extractOriginalRoute = /* @__PURE__ */ __name((path70, regexp, keys) => {
162406
+ if (!path70 || !regexp || !keys || Object.keys(keys).length === 0 || !_optionalChain([keys, "access", (_10) => _10[0], "optionalAccess", (_11) => _11.offset])) {
162119
162407
  return void 0;
162120
162408
  }
162121
162409
  const orderedKeys = keys.sort((a5, b6) => a5.offset - b6.offset);
162122
162410
  const pathRegex = new RegExp(regexp, `${regexp.flags}d`);
162123
- const execResult = pathRegex.exec(path69);
162411
+ const execResult = pathRegex.exec(path70);
162124
162412
  if (!execResult || !execResult.indices) {
162125
162413
  return void 0;
162126
162414
  }
@@ -162128,7 +162416,7 @@ var extractOriginalRoute = /* @__PURE__ */ __name((path69, regexp, keys) => {
162128
162416
  if (paramIndices.length !== orderedKeys.length) {
162129
162417
  return void 0;
162130
162418
  }
162131
- let resultPath = path69;
162419
+ let resultPath = path70;
162132
162420
  let indexShift = 0;
162133
162421
  paramIndices.forEach((item, index) => {
162134
162422
  if (item) {
@@ -163030,8 +163318,8 @@ init_import_meta_url();
163030
163318
  init_import_meta_url();
163031
163319
  var import_path21 = require("path");
163032
163320
  var isWindowsPlatform = import_path21.sep === "\\";
163033
- function normalizeWindowsPath(path69) {
163034
- return path69.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
163321
+ function normalizeWindowsPath(path70) {
163322
+ return path70.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
163035
163323
  }
163036
163324
  __name(normalizeWindowsPath, "normalizeWindowsPath");
163037
163325
  function getModuleFromFilename(filename, normalizeWindowsPathSeparator = isWindowsPlatform) {
@@ -163220,15 +163508,15 @@ init_import_meta_url();
163220
163508
  var import_url7 = require("url");
163221
163509
  function extractRawUrl(requestOptions) {
163222
163510
  const { protocol, hostname: hostname2, port } = parseRequestOptions(requestOptions);
163223
- const path69 = requestOptions.path ? requestOptions.path : "/";
163224
- return `${protocol}//${hostname2}${port}${path69}`;
163511
+ const path70 = requestOptions.path ? requestOptions.path : "/";
163512
+ return `${protocol}//${hostname2}${port}${path70}`;
163225
163513
  }
163226
163514
  __name(extractRawUrl, "extractRawUrl");
163227
163515
  function extractUrl(requestOptions) {
163228
163516
  const { protocol, hostname: hostname2, port } = parseRequestOptions(requestOptions);
163229
- const path69 = requestOptions.pathname || "/";
163517
+ const path70 = requestOptions.pathname || "/";
163230
163518
  const authority = requestOptions.auth ? redactAuthority(requestOptions.auth) : "";
163231
- return `${protocol}//${authority}${hostname2}${port}${path69}`;
163519
+ return `${protocol}//${authority}${hostname2}${port}${path70}`;
163232
163520
  }
163233
163521
  __name(extractUrl, "extractUrl");
163234
163522
  function redactAuthority(auth) {
@@ -163769,8 +164057,8 @@ function collectModules() {
163769
164057
  const paths = getPaths();
163770
164058
  const infos = {};
163771
164059
  const seen = {};
163772
- paths.forEach((path69) => {
163773
- let dir = path69;
164060
+ paths.forEach((path70) => {
164061
+ let dir = path70;
163774
164062
  const updir = /* @__PURE__ */ __name(() => {
163775
164063
  const orig = dir;
163776
164064
  dir = (0, import_path22.dirname)(orig);
@@ -163845,9 +164133,9 @@ init_import_meta_url();
163845
164133
  var import_fs21 = require("fs");
163846
164134
  var FILE_CONTENT_CACHE = new LRUMap(100);
163847
164135
  var DEFAULT_LINES_OF_CONTEXT = 7;
163848
- function readTextFileAsync(path69) {
164136
+ function readTextFileAsync(path70) {
163849
164137
  return new Promise((resolve24, reject) => {
163850
- (0, import_fs21.readFile)(path69, "utf8", (err, data) => {
164138
+ (0, import_fs21.readFile)(path70, "utf8", (err, data) => {
163851
164139
  if (err)
163852
164140
  reject(err);
163853
164141
  else
@@ -165193,172 +165481,192 @@ __name(closeSentry, "closeSentry");
165193
165481
  init_import_meta_url();
165194
165482
  var import_promises31 = require("node:timers/promises");
165195
165483
  var import_signal_exit6 = __toESM(require_signal_exit());
165196
- function tailOptions(yargs) {
165197
- return yargs.positional("worker", {
165198
- describe: "Name or route of the worker to tail",
165199
- type: "string"
165200
- }).option("format", {
165201
- default: process.stdout.isTTY ? "pretty" : "json",
165202
- choices: ["json", "pretty"],
165203
- describe: "The format of log entries"
165204
- }).option("status", {
165205
- choices: ["ok", "error", "canceled"],
165206
- describe: "Filter by invocation status",
165207
- array: true
165208
- }).option("header", {
165209
- type: "string",
165210
- requiresArg: true,
165211
- describe: "Filter by HTTP header"
165212
- }).option("method", {
165213
- type: "string",
165214
- requiresArg: true,
165215
- describe: "Filter by HTTP method",
165216
- array: true
165217
- }).option("sampling-rate", {
165218
- type: "number",
165219
- describe: "Adds a percentage of requests to log sampling rate"
165220
- }).option("search", {
165221
- type: "string",
165222
- requiresArg: true,
165223
- describe: "Filter by a text match in console.log messages"
165224
- }).option("ip", {
165225
- type: "string",
165226
- requiresArg: true,
165227
- describe: 'Filter by the IP address the request originates from. Use "self" to filter for your own IP',
165228
- array: true
165229
- }).option("version-id", {
165230
- type: "string",
165231
- requiresArg: true,
165232
- describe: "Filter by Worker version"
165233
- }).option("debug", {
165234
- type: "boolean",
165235
- hidden: true,
165236
- default: false,
165237
- describe: "If a log would have been filtered out, send it through anyway alongside the filter which would have blocked it."
165238
- }).option("legacy-env", {
165239
- type: "boolean",
165240
- describe: "Use legacy environments",
165241
- hidden: true
165242
- });
165243
- }
165244
- __name(tailOptions, "tailOptions");
165245
- async function tailHandler(args) {
165246
- if (args.format === "pretty") {
165247
- await printWranglerBanner();
165248
- }
165249
- const config = readConfig(args);
165250
- if (config.pages_build_output_dir) {
165251
- throw new UserError(
165252
- "It looks like you've run a Workers-specific command in a Pages project.\nFor Pages, please run `wrangler pages deployment tail` instead."
165253
- );
165254
- }
165255
- sendMetricsEvent("begin log stream", {
165256
- sendMetrics: config.send_metrics
165257
- });
165258
- let scriptName;
165259
- const accountId = await requireAuth(config);
165260
- if (args.worker?.includes(".")) {
165261
- scriptName = await getWorkerForZone(
165262
- {
165263
- worker: args.worker,
165264
- accountId
165265
- },
165266
- config.configPath
165267
- );
165484
+ var tailCommand = createCommand({
165485
+ metadata: {
165486
+ description: "\u{1F99A} Start a log tailing session for a Worker",
165487
+ status: "stable",
165488
+ owner: "Workers: Workers Observability"
165489
+ },
165490
+ positionalArgs: ["worker"],
165491
+ args: {
165492
+ worker: {
165493
+ describe: "Name or route of the worker to tail",
165494
+ type: "string"
165495
+ },
165496
+ format: {
165497
+ choices: ["json", "pretty"],
165498
+ describe: "The format of log entries"
165499
+ },
165500
+ status: {
165501
+ choices: ["ok", "error", "canceled"],
165502
+ describe: "Filter by invocation status",
165503
+ array: true
165504
+ },
165505
+ header: {
165506
+ type: "string",
165507
+ requiresArg: true,
165508
+ describe: "Filter by HTTP header"
165509
+ },
165510
+ method: {
165511
+ type: "string",
165512
+ requiresArg: true,
165513
+ describe: "Filter by HTTP method",
165514
+ array: true
165515
+ },
165516
+ "sampling-rate": {
165517
+ type: "number",
165518
+ describe: "Adds a percentage of requests to log sampling rate"
165519
+ },
165520
+ search: {
165521
+ type: "string",
165522
+ requiresArg: true,
165523
+ describe: "Filter by a text match in console.log messages"
165524
+ },
165525
+ ip: {
165526
+ type: "string",
165527
+ requiresArg: true,
165528
+ describe: 'Filter by the IP address the request originates from. Use "self" to filter for your own IP',
165529
+ array: true
165530
+ },
165531
+ "version-id": {
165532
+ type: "string",
165533
+ requiresArg: true,
165534
+ describe: "Filter by Worker version"
165535
+ },
165536
+ debug: {
165537
+ type: "boolean",
165538
+ hidden: true,
165539
+ default: false,
165540
+ describe: "If a log would have been filtered out, send it through anyway alongside the filter which would have blocked it."
165541
+ },
165542
+ "legacy-env": {
165543
+ type: "boolean",
165544
+ describe: "Use legacy environments",
165545
+ hidden: true
165546
+ }
165547
+ },
165548
+ behaviour: {
165549
+ printBanner: false
165550
+ },
165551
+ async handler(args, { config }) {
165552
+ args.format ??= process.stdout.isTTY ? "pretty" : "json";
165268
165553
  if (args.format === "pretty") {
165269
- logger.log(`Connecting to worker ${scriptName} at route ${args.worker}`);
165554
+ await printWranglerBanner();
165270
165555
  }
165271
- } else {
165272
- scriptName = getLegacyScriptName({ name: args.worker, ...args }, config);
165273
- }
165274
- if (!scriptName) {
165275
- throw new UserError(
165276
- `Required Worker name missing. Please specify the Worker name in your ${configFileName(config.configPath)} file, or pass it as an argument with \`wrangler tail <worker-name>\``
165277
- );
165278
- }
165279
- const cliFilters = {
165280
- status: args.status,
165281
- header: args.header,
165282
- method: args.method,
165283
- samplingRate: args.samplingRate,
165284
- search: args.search,
165285
- clientIp: args.ip,
165286
- versionId: args.versionId
165287
- };
165288
- const filters = translateCLICommandToFilterMessage(cliFilters);
165289
- const { tail, expiration, deleteTail } = await createTail(
165290
- accountId,
165291
- scriptName,
165292
- filters,
165293
- args.debug,
165294
- !isLegacyEnv(config) ? args.env : void 0
165295
- );
165296
- const scriptDisplayName = `${scriptName}${args.env && !isLegacyEnv(config) ? ` (${args.env})` : ""}`;
165297
- if (args.format === "pretty") {
165298
- logger.log(
165299
- `Successfully created tail, expires at ${expiration.toLocaleString()}`
165300
- );
165301
- }
165302
- const printLog = args.format === "pretty" ? prettyPrintLogs : jsonPrintLogs;
165303
- tail.on("message", printLog);
165304
- while (tail.readyState !== tail.OPEN) {
165305
- switch (tail.readyState) {
165306
- case tail.CONNECTING:
165307
- await (0, import_promises31.setTimeout)(100);
165308
- break;
165309
- case tail.CLOSING:
165310
- await (0, import_promises31.setTimeout)(100);
165311
- break;
165312
- case tail.CLOSED:
165313
- sendMetricsEvent("end log stream", {
165314
- sendMetrics: config.send_metrics
165315
- });
165316
- throw new Error(
165317
- `Connection to ${scriptDisplayName} closed unexpectedly.`
165318
- );
165556
+ if (config.pages_build_output_dir) {
165557
+ throw new UserError(
165558
+ "It looks like you've run a Workers-specific command in a Pages project.\nFor Pages, please run `wrangler pages deployment tail` instead."
165559
+ );
165319
165560
  }
165320
- }
165321
- if (args.format === "pretty") {
165322
- logger.log(`Connected to ${scriptDisplayName}, waiting for logs...`);
165323
- }
165324
- const cancelPing = startWebSocketPing();
165325
- tail.on("close", exit6);
165326
- (0, import_signal_exit6.default)(exit6);
165327
- async function exit6() {
165328
- cancelPing();
165329
- tail.terminate();
165330
- await deleteTail();
165331
- sendMetricsEvent("end log stream", {
165561
+ sendMetricsEvent("begin log stream", {
165332
165562
  sendMetrics: config.send_metrics
165333
165563
  });
165334
- }
165335
- __name(exit6, "exit");
165336
- function startWebSocketPing() {
165337
- const PING_MESSAGE = Buffer.from("wrangler tail ping");
165338
- const PING_INTERVAL = 1e4;
165339
- let waitingForPong = false;
165340
- const pingInterval = setInterval(() => {
165341
- if (waitingForPong) {
165342
- console.log(args.format);
165343
- throw createFatalError(
165344
- "Tail disconnected, exiting.",
165345
- args.format === "json",
165346
- 1
165564
+ let scriptName;
165565
+ const accountId = await requireAuth(config);
165566
+ if (args.worker?.includes(".")) {
165567
+ scriptName = await getWorkerForZone(
165568
+ {
165569
+ worker: args.worker,
165570
+ accountId
165571
+ },
165572
+ config.configPath
165573
+ );
165574
+ if (args.format === "pretty") {
165575
+ logger.log(
165576
+ `Connecting to worker ${scriptName} at route ${args.worker}`
165347
165577
  );
165348
165578
  }
165349
- waitingForPong = true;
165350
- tail.ping(PING_MESSAGE);
165351
- }, PING_INTERVAL);
165352
- tail.on("pong", (data) => {
165353
- if (data.equals(PING_MESSAGE)) {
165354
- waitingForPong = false;
165579
+ } else {
165580
+ scriptName = getLegacyScriptName({ name: args.worker, ...args }, config);
165581
+ }
165582
+ if (!scriptName) {
165583
+ throw new UserError(
165584
+ `Required Worker name missing. Please specify the Worker name in your ${configFileName(config.configPath)} file, or pass it as an argument with \`wrangler tail <worker-name>\``
165585
+ );
165586
+ }
165587
+ const cliFilters = {
165588
+ status: args.status,
165589
+ header: args.header,
165590
+ method: args.method,
165591
+ samplingRate: args.samplingRate,
165592
+ search: args.search,
165593
+ clientIp: args.ip,
165594
+ versionId: args.versionId
165595
+ };
165596
+ const filters = translateCLICommandToFilterMessage(cliFilters);
165597
+ const { tail, expiration, deleteTail } = await createTail(
165598
+ accountId,
165599
+ scriptName,
165600
+ filters,
165601
+ args.debug,
165602
+ !isLegacyEnv(config) ? args.env : void 0
165603
+ );
165604
+ const scriptDisplayName = `${scriptName}${args.env && !isLegacyEnv(config) ? ` (${args.env})` : ""}`;
165605
+ if (args.format === "pretty") {
165606
+ logger.log(
165607
+ `Successfully created tail, expires at ${expiration.toLocaleString()}`
165608
+ );
165609
+ }
165610
+ const printLog = args.format === "pretty" ? prettyPrintLogs : jsonPrintLogs;
165611
+ tail.on("message", printLog);
165612
+ while (tail.readyState !== tail.OPEN) {
165613
+ switch (tail.readyState) {
165614
+ case tail.CONNECTING:
165615
+ await (0, import_promises31.setTimeout)(100);
165616
+ break;
165617
+ case tail.CLOSING:
165618
+ await (0, import_promises31.setTimeout)(100);
165619
+ break;
165620
+ case tail.CLOSED:
165621
+ sendMetricsEvent("end log stream", {
165622
+ sendMetrics: config.send_metrics
165623
+ });
165624
+ throw new Error(
165625
+ `Connection to ${scriptDisplayName} closed unexpectedly.`
165626
+ );
165355
165627
  }
165356
- });
165357
- return () => clearInterval(pingInterval);
165628
+ }
165629
+ if (args.format === "pretty") {
165630
+ logger.log(`Connected to ${scriptDisplayName}, waiting for logs...`);
165631
+ }
165632
+ const cancelPing = startWebSocketPing();
165633
+ tail.on("close", exit6);
165634
+ (0, import_signal_exit6.default)(exit6);
165635
+ async function exit6() {
165636
+ cancelPing();
165637
+ tail.terminate();
165638
+ await deleteTail();
165639
+ sendMetricsEvent("end log stream", {
165640
+ sendMetrics: config.send_metrics
165641
+ });
165642
+ }
165643
+ __name(exit6, "exit");
165644
+ function startWebSocketPing() {
165645
+ const PING_MESSAGE = Buffer.from("wrangler tail ping");
165646
+ const PING_INTERVAL = 1e4;
165647
+ let waitingForPong = false;
165648
+ const pingInterval = setInterval(() => {
165649
+ if (waitingForPong) {
165650
+ console.log(args.format);
165651
+ throw createFatalError(
165652
+ "Tail disconnected, exiting.",
165653
+ args.format === "json",
165654
+ 1
165655
+ );
165656
+ }
165657
+ waitingForPong = true;
165658
+ tail.ping(PING_MESSAGE);
165659
+ }, PING_INTERVAL);
165660
+ tail.on("pong", (data) => {
165661
+ if (data.equals(PING_MESSAGE)) {
165662
+ waitingForPong = false;
165663
+ }
165664
+ });
165665
+ return () => clearInterval(pingInterval);
165666
+ }
165667
+ __name(startWebSocketPing, "startWebSocketPing");
165358
165668
  }
165359
- __name(startWebSocketPing, "startWebSocketPing");
165360
- }
165361
- __name(tailHandler, "tailHandler");
165669
+ });
165362
165670
 
165363
165671
  // src/triggers/index.ts
165364
165672
  init_import_meta_url();
@@ -165483,9 +165791,9 @@ async function generate({
165483
165791
  script: worker
165484
165792
  });
165485
165793
  const flagsString = compatibilityFlags.length ? `+${compatibilityFlags.join("+")}` : "";
165486
- const path69 = `http://dummy.com/${compatibilityDate}${flagsString}`;
165794
+ const path70 = `http://dummy.com/${compatibilityDate}${flagsString}`;
165487
165795
  try {
165488
- const res = await mf.dispatchFetch(path69);
165796
+ const res = await mf.dispatchFetch(path70);
165489
165797
  const text = await res.text();
165490
165798
  if (!res.ok) {
165491
165799
  throw new Error(text);
@@ -165556,117 +165864,127 @@ function buildUpdatedTypesString(types, newTypesPath) {
165556
165864
  __name(buildUpdatedTypesString, "buildUpdatedTypesString");
165557
165865
 
165558
165866
  // src/type-generation/index.ts
165559
- function typesOptions(yargs) {
165560
- return yargs.positional("path", {
165561
- describe: "The path to the declaration file to generate",
165562
- type: "string",
165563
- default: "worker-configuration.d.ts",
165564
- demandOption: false
165565
- }).option("env-interface", {
165566
- type: "string",
165567
- default: "Env",
165568
- describe: "The name of the generated environment interface",
165569
- requiresArg: true
165570
- }).option("experimental-include-runtime", {
165571
- alias: "x-include-runtime",
165572
- type: "string",
165573
- describe: "The path of the generated runtime types file",
165574
- demandOption: false
165575
- }).option("strict-vars", {
165576
- type: "boolean",
165577
- default: true,
165578
- describe: "Generate literal and union types for variables"
165579
- });
165580
- }
165581
- __name(typesOptions, "typesOptions");
165582
- async function typesHandler(args) {
165583
- const { envInterface, path: outputPath } = args;
165584
- const validInterfaceRegex = /^[a-zA-Z][a-zA-Z0-9_]*$/;
165585
- if (!validInterfaceRegex.test(envInterface)) {
165586
- throw new CommandLineArgsError(
165587
- `The provided env-interface value ("${envInterface}") does not satisfy the validation regex: ${validInterfaceRegex}`
165588
- );
165589
- }
165590
- if (!outputPath.endsWith(".d.ts")) {
165591
- throw new CommandLineArgsError(
165592
- `The provided path value ("${outputPath}") does not point to a declaration file (please use the 'd.ts' extension)`
165593
- );
165594
- }
165595
- await printWranglerBanner();
165596
- const config = readConfig(args);
165597
- if (!config.configPath || !fs28.existsSync(config.configPath) || fs28.statSync(config.configPath).isDirectory()) {
165598
- logger.warn(
165599
- `No config file detected${args.config ? ` (at ${args.config})` : ""}, aborting`
165867
+ var typesCommand = createCommand({
165868
+ metadata: {
165869
+ description: "\u{1F4DD} Generate types from bindings and module rules in configuration\n",
165870
+ status: "stable",
165871
+ owner: "Workers: Authoring and Testing"
165872
+ },
165873
+ positionalArgs: ["path"],
165874
+ args: {
165875
+ path: {
165876
+ describe: "The path to the declaration file to generate",
165877
+ type: "string",
165878
+ default: "worker-configuration.d.ts",
165879
+ demandOption: false
165880
+ },
165881
+ "env-interface": {
165882
+ type: "string",
165883
+ default: "Env",
165884
+ describe: "The name of the generated environment interface",
165885
+ requiresArg: true
165886
+ },
165887
+ "experimental-include-runtime": {
165888
+ alias: "x-include-runtime",
165889
+ type: "string",
165890
+ describe: "The path of the generated runtime types file",
165891
+ demandOption: false
165892
+ },
165893
+ "strict-vars": {
165894
+ type: "boolean",
165895
+ default: true,
165896
+ describe: "Generate literal and union types for variables"
165897
+ }
165898
+ },
165899
+ validateArgs(args) {
165900
+ const { envInterface, path: outputPath } = args;
165901
+ const validInterfaceRegex = /^[a-zA-Z][a-zA-Z0-9_]*$/;
165902
+ if (!validInterfaceRegex.test(envInterface)) {
165903
+ throw new CommandLineArgsError(
165904
+ `The provided env-interface value ("${envInterface}") does not satisfy the validation regex: ${validInterfaceRegex}`
165905
+ );
165906
+ }
165907
+ if (!outputPath.endsWith(".d.ts")) {
165908
+ throw new CommandLineArgsError(
165909
+ `The provided path value ("${outputPath}") does not point to a declaration file (please use the 'd.ts' extension)`
165910
+ );
165911
+ }
165912
+ },
165913
+ async handler(args, { config }) {
165914
+ const { envInterface, path: outputPath } = args;
165915
+ if (!config.configPath || !fs28.existsSync(config.configPath) || fs28.statSync(config.configPath).isDirectory()) {
165916
+ logger.warn(
165917
+ `No config file detected${args.config ? ` (at ${args.config})` : ""}, aborting`
165918
+ );
165919
+ return;
165920
+ }
165921
+ if (typeof args.experimentalIncludeRuntime === "string") {
165922
+ logger.log(`Generating runtime types...`);
165923
+ const { outFile } = await generateRuntimeTypes({
165924
+ config,
165925
+ outFile: args.experimentalIncludeRuntime || void 0
165926
+ });
165927
+ const tsconfigPath = config.tsconfig ?? (0, import_node_path66.join)((0, import_node_path66.dirname)(config.configPath), "tsconfig.json");
165928
+ const tsconfigTypes = readTsconfigTypes(tsconfigPath);
165929
+ const { mode } = (0, import_miniflare26.getNodeCompat)(
165930
+ config.compatibility_date,
165931
+ config.compatibility_flags,
165932
+ {
165933
+ nodeCompat: config.node_compat
165934
+ }
165935
+ );
165936
+ logRuntimeTypesMessage(
165937
+ outFile,
165938
+ tsconfigTypes,
165939
+ mode !== null,
165940
+ config.configPath
165941
+ );
165942
+ }
165943
+ const secrets = getVarsForDev(
165944
+ // We do not want `getVarsForDev()` to merge in the standard vars into the dev vars
165945
+ // because we want to be able to work with secrets differently to vars.
165946
+ // So we pass in a fake vars object here.
165947
+ { ...config, vars: {} },
165948
+ args.env,
165949
+ true
165600
165950
  );
165601
- return;
165602
- }
165603
- if (typeof args.experimentalIncludeRuntime === "string") {
165604
- logger.log(`Generating runtime types...`);
165605
- const { outFile } = await generateRuntimeTypes({
165951
+ const configBindingsWithSecrets = {
165952
+ kv_namespaces: config.kv_namespaces ?? [],
165953
+ vars: collectAllVars(args),
165954
+ wasm_modules: config.wasm_modules,
165955
+ text_blobs: {
165956
+ ...config.text_blobs
165957
+ },
165958
+ data_blobs: config.data_blobs,
165959
+ durable_objects: config.durable_objects,
165960
+ r2_buckets: config.r2_buckets,
165961
+ d1_databases: config.d1_databases,
165962
+ services: config.services,
165963
+ analytics_engine_datasets: config.analytics_engine_datasets,
165964
+ dispatch_namespaces: config.dispatch_namespaces,
165965
+ logfwdr: config.logfwdr,
165966
+ unsafe: config.unsafe,
165967
+ rules: config.rules,
165968
+ queues: config.queues,
165969
+ send_email: config.send_email,
165970
+ vectorize: config.vectorize,
165971
+ hyperdrive: config.hyperdrive,
165972
+ mtls_certificates: config.mtls_certificates,
165973
+ browser: config.browser,
165974
+ ai: config.ai,
165975
+ version_metadata: config.version_metadata,
165976
+ secrets,
165977
+ assets: config.assets,
165978
+ workflows: config.workflows
165979
+ };
165980
+ await generateTypes(
165981
+ configBindingsWithSecrets,
165606
165982
  config,
165607
- outFile: args.experimentalIncludeRuntime || void 0
165608
- });
165609
- const tsconfigPath = config.tsconfig ?? (0, import_node_path66.join)((0, import_node_path66.dirname)(config.configPath), "tsconfig.json");
165610
- const tsconfigTypes = readTsconfigTypes(tsconfigPath);
165611
- const { mode } = (0, import_miniflare26.getNodeCompat)(
165612
- config.compatibility_date,
165613
- config.compatibility_flags,
165614
- {
165615
- nodeCompat: config.node_compat
165616
- }
165617
- );
165618
- logRuntimeTypesMessage(
165619
- outFile,
165620
- tsconfigTypes,
165621
- mode !== null,
165622
- config.configPath
165983
+ envInterface,
165984
+ outputPath
165623
165985
  );
165624
165986
  }
165625
- const secrets = getVarsForDev(
165626
- // We do not want `getVarsForDev()` to merge in the standard vars into the dev vars
165627
- // because we want to be able to work with secrets differently to vars.
165628
- // So we pass in a fake vars object here.
165629
- { ...config, vars: {} },
165630
- args.env,
165631
- true
165632
- );
165633
- const configBindingsWithSecrets = {
165634
- kv_namespaces: config.kv_namespaces ?? [],
165635
- vars: collectAllVars(args),
165636
- wasm_modules: config.wasm_modules,
165637
- text_blobs: {
165638
- ...config.text_blobs
165639
- },
165640
- data_blobs: config.data_blobs,
165641
- durable_objects: config.durable_objects,
165642
- r2_buckets: config.r2_buckets,
165643
- d1_databases: config.d1_databases,
165644
- services: config.services,
165645
- analytics_engine_datasets: config.analytics_engine_datasets,
165646
- dispatch_namespaces: config.dispatch_namespaces,
165647
- logfwdr: config.logfwdr,
165648
- unsafe: config.unsafe,
165649
- rules: config.rules,
165650
- queues: config.queues,
165651
- send_email: config.send_email,
165652
- vectorize: config.vectorize,
165653
- hyperdrive: config.hyperdrive,
165654
- mtls_certificates: config.mtls_certificates,
165655
- browser: config.browser,
165656
- ai: config.ai,
165657
- version_metadata: config.version_metadata,
165658
- secrets,
165659
- assets: config.assets,
165660
- workflows: config.workflows
165661
- };
165662
- await generateTypes(
165663
- configBindingsWithSecrets,
165664
- config,
165665
- envInterface,
165666
- outputPath
165667
- );
165668
- }
165669
- __name(typesHandler, "typesHandler");
165987
+ });
165670
165988
  function isValidIdentifier2(key) {
165671
165989
  return /^[a-zA-Z_$][\w$]*$/.test(key);
165672
165990
  }
@@ -165906,13 +166224,13 @@ function writeDTSFile({
165906
166224
  modulesTypeStructure,
165907
166225
  formatType,
165908
166226
  envInterface,
165909
- path: path69
166227
+ path: path70
165910
166228
  }) {
165911
- const wranglerOverrideDTSPath = findUpSync(path69);
166229
+ const wranglerOverrideDTSPath = findUpSync(path70);
165912
166230
  try {
165913
166231
  if (wranglerOverrideDTSPath !== void 0 && !fs28.readFileSync(wranglerOverrideDTSPath, "utf8").includes("Generated by Wrangler")) {
165914
166232
  throw new UserError(
165915
- `A non-wrangler ${(0, import_node_path66.basename)(path69)} already exists, please rename and try again.`
166233
+ `A non-wrangler ${(0, import_node_path66.basename)(path70)} already exists, please rename and try again.`
165916
166234
  );
165917
166235
  }
165918
166236
  } catch (error2) {
@@ -165930,7 +166248,7 @@ function writeDTSFile({
165930
166248
  modulesTypeStructure
165931
166249
  );
165932
166250
  fs28.writeFileSync(
165933
- path69,
166251
+ path70,
165934
166252
  [
165935
166253
  `// Generated by Wrangler by running \`${wranglerCommandUsed}\``,
165936
166254
  "",
@@ -168842,7 +169160,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
168842
169160
  let bindingsPrinted = false;
168843
169161
  try {
168844
169162
  const body = createWorkerUploadForm(worker);
168845
- const result = await retryOnError(
169163
+ const result = await retryOnAPIFailure(
168846
169164
  async () => fetchResult(`${workerUrl}/versions`, {
168847
169165
  method: "POST",
168848
169166
  body,
@@ -170583,7 +170901,10 @@ function createCLIParser(argv) {
170583
170901
  type: "string",
170584
170902
  requiresArg: true
170585
170903
  }).check(
170586
- demandSingleValue("config", (configArgv) => configArgv["_"][0] === "dev")
170904
+ demandSingleValue(
170905
+ "config",
170906
+ (configArgv) => configArgv["_"][0] === "dev" || configArgv["_"][0] === "pages" && configArgv["_"][1] === "dev"
170907
+ )
170587
170908
  ).option("env", {
170588
170909
  alias: "e",
170589
170910
  describe: "Environment to use for operations and .env files",
@@ -170772,12 +171093,8 @@ function createCLIParser(argv) {
170772
171093
  deleteOptions,
170773
171094
  deleteHandler
170774
171095
  );
170775
- wrangler.command(
170776
- "tail [worker]",
170777
- "\u{1F99A} Start a log tailing session for a Worker",
170778
- tailOptions,
170779
- tailHandler
170780
- );
171096
+ registry.define([{ command: "wrangler tail", definition: tailCommand }]);
171097
+ registry.registerNamespace("tail");
170781
171098
  wrangler.command(
170782
171099
  "secret",
170783
171100
  "\u{1F92B} Generate a secret that can be referenced in a Worker",
@@ -170785,12 +171102,8 @@ function createCLIParser(argv) {
170785
171102
  return secret(secretYargs.command(subHelp));
170786
171103
  }
170787
171104
  );
170788
- wrangler.command(
170789
- "types [path]",
170790
- "\u{1F4DD} Generate types from bindings and module rules in configuration\n",
170791
- typesOptions,
170792
- typesHandler
170793
- );
171105
+ registry.define([{ command: "wrangler types", definition: typesCommand }]);
171106
+ registry.registerNamespace("types");
170794
171107
  registry.define([
170795
171108
  { command: "wrangler kv:key", definition: kvKeyAlias },
170796
171109
  { command: "wrangler kv:namespace", definition: kvNamespaceAlias },
@@ -170999,6 +171312,21 @@ function createCLIParser(argv) {
170999
171312
  return hyperdrive(hyperdriveYargs.command(subHelp));
171000
171313
  }
171001
171314
  );
171315
+ registry.define([
171316
+ { command: "wrangler cert", definition: certNamespace },
171317
+ { command: "wrangler cert upload", definition: certUploadNamespace },
171318
+ {
171319
+ command: "wrangler cert upload mtls-certificate",
171320
+ definition: certUploadMtlsCommand
171321
+ },
171322
+ {
171323
+ command: "wrangler cert upload certificate-authority",
171324
+ definition: certUploadCaCertCommand
171325
+ },
171326
+ { command: "wrangler cert list", definition: certListCommand },
171327
+ { command: "wrangler cert delete", definition: certDeleteCommand }
171328
+ ]);
171329
+ registry.registerNamespace("cert");
171002
171330
  wrangler.command("pages", "\u26A1\uFE0F Configure Cloudflare Pages", (pagesYargs) => {
171003
171331
  pagesYargs.hide("config").hide("env");
171004
171332
  return pages(pagesYargs, subHelp);