create-cloudflare 2.69.0 → 2.70.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.
- package/dist/cli.js +637 -251
- package/package.json +15 -15
- package/templates/react-router/c3.ts +42 -8
- package/templates/react-router/ts/README.md +79 -0
- package/templates/react-router/ts/__dot__gitignore +14 -0
- package/templates/react-router/ts/app/app.css +15 -0
- package/templates/react-router/ts/app/entry.server.tsx +42 -0
- package/templates/react-router/ts/app/routes/home.tsx +19 -0
- package/templates/react-router/ts/app/welcome/welcome.tsx +90 -0
- package/templates/react-router/ts/tsconfig.cloudflare.json +27 -0
- package/templates/react-router/ts/tsconfig.json +14 -0
- package/templates/react-router/ts/tsconfig.node.json +13 -0
- package/templates/react-router/ts/vite.config.ts +15 -0
- package/templates/react-router/ts/workers/app.ts +12 -0
- package/templates/react-router/ts/wrangler.jsonc +9 -0
- package/templates/react-router/ts/react-router.config.ts +0 -8
package/dist/cli.js
CHANGED
|
@@ -2696,9 +2696,9 @@ var require_dispatcher_base = __commonJS({
|
|
|
2696
2696
|
}
|
|
2697
2697
|
close(callback) {
|
|
2698
2698
|
if (callback === void 0) {
|
|
2699
|
-
return new Promise((
|
|
2699
|
+
return new Promise((resolve13, reject) => {
|
|
2700
2700
|
this.close((err, data) => {
|
|
2701
|
-
return err ? reject(err) :
|
|
2701
|
+
return err ? reject(err) : resolve13(data);
|
|
2702
2702
|
});
|
|
2703
2703
|
});
|
|
2704
2704
|
}
|
|
@@ -2736,9 +2736,9 @@ var require_dispatcher_base = __commonJS({
|
|
|
2736
2736
|
err = null;
|
|
2737
2737
|
}
|
|
2738
2738
|
if (callback === void 0) {
|
|
2739
|
-
return new Promise((
|
|
2739
|
+
return new Promise((resolve13, reject) => {
|
|
2740
2740
|
this.destroy(err, (err2, data) => {
|
|
2741
|
-
return err2 ? reject(err2) :
|
|
2741
|
+
return err2 ? reject(err2) : resolve13(data);
|
|
2742
2742
|
});
|
|
2743
2743
|
});
|
|
2744
2744
|
}
|
|
@@ -5730,7 +5730,7 @@ var require_formdata = __commonJS({
|
|
|
5730
5730
|
var { kEnumerableProperty } = require_util();
|
|
5731
5731
|
var { webidl } = require_webidl();
|
|
5732
5732
|
var nodeUtil = require("node:util");
|
|
5733
|
-
var
|
|
5733
|
+
var FormData2 = class _FormData {
|
|
5734
5734
|
#state = [];
|
|
5735
5735
|
constructor(form = void 0) {
|
|
5736
5736
|
webidl.util.markAsUncloneable(this);
|
|
@@ -5847,11 +5847,11 @@ var require_formdata = __commonJS({
|
|
|
5847
5847
|
formData.#state = newState;
|
|
5848
5848
|
}
|
|
5849
5849
|
};
|
|
5850
|
-
var { getFormDataState, setFormDataState } =
|
|
5851
|
-
Reflect.deleteProperty(
|
|
5852
|
-
Reflect.deleteProperty(
|
|
5853
|
-
iteratorMixin("FormData",
|
|
5854
|
-
Object.defineProperties(
|
|
5850
|
+
var { getFormDataState, setFormDataState } = FormData2;
|
|
5851
|
+
Reflect.deleteProperty(FormData2, "getFormDataState");
|
|
5852
|
+
Reflect.deleteProperty(FormData2, "setFormDataState");
|
|
5853
|
+
iteratorMixin("FormData", FormData2, getFormDataState, "name", "value");
|
|
5854
|
+
Object.defineProperties(FormData2.prototype, {
|
|
5855
5855
|
append: kEnumerableProperty,
|
|
5856
5856
|
delete: kEnumerableProperty,
|
|
5857
5857
|
get: kEnumerableProperty,
|
|
@@ -5879,8 +5879,8 @@ var require_formdata = __commonJS({
|
|
|
5879
5879
|
}
|
|
5880
5880
|
return { name: name3, value };
|
|
5881
5881
|
}
|
|
5882
|
-
webidl.is.FormData = webidl.util.MakeTypeAssertion(
|
|
5883
|
-
module2.exports = { FormData, makeEntry, setFormDataState };
|
|
5882
|
+
webidl.is.FormData = webidl.util.MakeTypeAssertion(FormData2);
|
|
5883
|
+
module2.exports = { FormData: FormData2, makeEntry, setFormDataState };
|
|
5884
5884
|
}
|
|
5885
5885
|
});
|
|
5886
5886
|
|
|
@@ -6215,8 +6215,8 @@ var require_promise = __commonJS({
|
|
|
6215
6215
|
function createDeferredPromise() {
|
|
6216
6216
|
let res;
|
|
6217
6217
|
let rej;
|
|
6218
|
-
const promise = new Promise((
|
|
6219
|
-
res =
|
|
6218
|
+
const promise = new Promise((resolve13, reject) => {
|
|
6219
|
+
res = resolve13;
|
|
6220
6220
|
rej = reject;
|
|
6221
6221
|
});
|
|
6222
6222
|
return { promise, resolve: res, reject: rej };
|
|
@@ -6238,7 +6238,7 @@ var require_body = __commonJS({
|
|
|
6238
6238
|
fullyReadBody,
|
|
6239
6239
|
extractMimeType
|
|
6240
6240
|
} = require_util2();
|
|
6241
|
-
var { FormData, setFormDataState } = require_formdata();
|
|
6241
|
+
var { FormData: FormData2, setFormDataState } = require_formdata();
|
|
6242
6242
|
var { webidl } = require_webidl();
|
|
6243
6243
|
var assert7 = require("node:assert");
|
|
6244
6244
|
var { isErrored, isDisturbed } = require("node:stream");
|
|
@@ -6431,13 +6431,13 @@ Content-Type: ${value.type || "application/octet-stream"}\r
|
|
|
6431
6431
|
switch (mimeType.essence) {
|
|
6432
6432
|
case "multipart/form-data": {
|
|
6433
6433
|
const parsed = multipartFormDataParser(value, mimeType);
|
|
6434
|
-
const fd = new
|
|
6434
|
+
const fd = new FormData2();
|
|
6435
6435
|
setFormDataState(fd, parsed);
|
|
6436
6436
|
return fd;
|
|
6437
6437
|
}
|
|
6438
6438
|
case "application/x-www-form-urlencoded": {
|
|
6439
6439
|
const entries = new URLSearchParams(value.toString());
|
|
6440
|
-
const fd = new
|
|
6440
|
+
const fd = new FormData2();
|
|
6441
6441
|
for (const [name3, value2] of entries) {
|
|
6442
6442
|
fd.append(name3, value2);
|
|
6443
6443
|
}
|
|
@@ -7517,12 +7517,12 @@ upgrade: ${upgrade}\r
|
|
|
7517
7517
|
cb();
|
|
7518
7518
|
}
|
|
7519
7519
|
}
|
|
7520
|
-
const waitForDrain = () => new Promise((
|
|
7520
|
+
const waitForDrain = () => new Promise((resolve13, reject) => {
|
|
7521
7521
|
assert7(callback === null);
|
|
7522
7522
|
if (socket[kError]) {
|
|
7523
7523
|
reject(socket[kError]);
|
|
7524
7524
|
} else {
|
|
7525
|
-
callback =
|
|
7525
|
+
callback = resolve13;
|
|
7526
7526
|
}
|
|
7527
7527
|
});
|
|
7528
7528
|
socket.on("close", onDrain).on("drain", onDrain);
|
|
@@ -8367,12 +8367,12 @@ var require_client_h2 = __commonJS({
|
|
|
8367
8367
|
cb();
|
|
8368
8368
|
}
|
|
8369
8369
|
}
|
|
8370
|
-
const waitForDrain = () => new Promise((
|
|
8370
|
+
const waitForDrain = () => new Promise((resolve13, reject) => {
|
|
8371
8371
|
assert7(callback === null);
|
|
8372
8372
|
if (socket[kError]) {
|
|
8373
8373
|
reject(socket[kError]);
|
|
8374
8374
|
} else {
|
|
8375
|
-
callback =
|
|
8375
|
+
callback = resolve13;
|
|
8376
8376
|
}
|
|
8377
8377
|
});
|
|
8378
8378
|
h2stream.on("close", onDrain).on("drain", onDrain);
|
|
@@ -8683,16 +8683,16 @@ var require_client = __commonJS({
|
|
|
8683
8683
|
return this[kNeedDrain] < 2;
|
|
8684
8684
|
}
|
|
8685
8685
|
[kClose]() {
|
|
8686
|
-
return new Promise((
|
|
8686
|
+
return new Promise((resolve13) => {
|
|
8687
8687
|
if (this[kSize]) {
|
|
8688
|
-
this[kClosedResolve] =
|
|
8688
|
+
this[kClosedResolve] = resolve13;
|
|
8689
8689
|
} else {
|
|
8690
|
-
|
|
8690
|
+
resolve13(null);
|
|
8691
8691
|
}
|
|
8692
8692
|
});
|
|
8693
8693
|
}
|
|
8694
8694
|
[kDestroy](err) {
|
|
8695
|
-
return new Promise((
|
|
8695
|
+
return new Promise((resolve13) => {
|
|
8696
8696
|
const requests = this[kQueue].splice(this[kPendingIdx]);
|
|
8697
8697
|
for (let i = 0; i < requests.length; i++) {
|
|
8698
8698
|
const request2 = requests[i];
|
|
@@ -8703,7 +8703,7 @@ var require_client = __commonJS({
|
|
|
8703
8703
|
this[kClosedResolve]();
|
|
8704
8704
|
this[kClosedResolve] = null;
|
|
8705
8705
|
}
|
|
8706
|
-
|
|
8706
|
+
resolve13(null);
|
|
8707
8707
|
};
|
|
8708
8708
|
if (this[kHTTPContext]) {
|
|
8709
8709
|
this[kHTTPContext].destroy(err, callback);
|
|
@@ -9108,8 +9108,8 @@ var require_pool_base = __commonJS({
|
|
|
9108
9108
|
}
|
|
9109
9109
|
return Promise.all(closeAll);
|
|
9110
9110
|
} else {
|
|
9111
|
-
return new Promise((
|
|
9112
|
-
this[kClosedResolve] =
|
|
9111
|
+
return new Promise((resolve13) => {
|
|
9112
|
+
this[kClosedResolve] = resolve13;
|
|
9113
9113
|
});
|
|
9114
9114
|
}
|
|
9115
9115
|
}
|
|
@@ -10201,10 +10201,10 @@ var require_socks5_proxy_agent = __commonJS({
|
|
|
10201
10201
|
const proxyHost = this[kProxyUrl].hostname;
|
|
10202
10202
|
const proxyPort = parseInt(this[kProxyUrl].port) || 1080;
|
|
10203
10203
|
debug("creating SOCKS5 connection to", proxyHost, proxyPort);
|
|
10204
|
-
const socket = await new Promise((
|
|
10204
|
+
const socket = await new Promise((resolve13, reject) => {
|
|
10205
10205
|
const onConnect = () => {
|
|
10206
10206
|
socket2.removeListener("error", onError);
|
|
10207
|
-
|
|
10207
|
+
resolve13(socket2);
|
|
10208
10208
|
};
|
|
10209
10209
|
const onError = (err) => {
|
|
10210
10210
|
socket2.removeListener("connect", onConnect);
|
|
@@ -10223,14 +10223,14 @@ var require_socks5_proxy_agent = __commonJS({
|
|
|
10223
10223
|
socket.destroy();
|
|
10224
10224
|
});
|
|
10225
10225
|
await socks5Client.handshake();
|
|
10226
|
-
await new Promise((
|
|
10226
|
+
await new Promise((resolve13, reject) => {
|
|
10227
10227
|
const timeout = setTimeout(() => {
|
|
10228
10228
|
reject(new Error("SOCKS5 authentication timeout"));
|
|
10229
10229
|
}, 5e3);
|
|
10230
10230
|
const onAuthenticated = () => {
|
|
10231
10231
|
clearTimeout(timeout);
|
|
10232
10232
|
socks5Client.removeListener("error", onError);
|
|
10233
|
-
|
|
10233
|
+
resolve13();
|
|
10234
10234
|
};
|
|
10235
10235
|
const onError = (err) => {
|
|
10236
10236
|
clearTimeout(timeout);
|
|
@@ -10239,14 +10239,14 @@ var require_socks5_proxy_agent = __commonJS({
|
|
|
10239
10239
|
};
|
|
10240
10240
|
if (socks5Client.state === "authenticated") {
|
|
10241
10241
|
clearTimeout(timeout);
|
|
10242
|
-
|
|
10242
|
+
resolve13();
|
|
10243
10243
|
} else {
|
|
10244
10244
|
socks5Client.once("authenticated", onAuthenticated);
|
|
10245
10245
|
socks5Client.once("error", onError);
|
|
10246
10246
|
}
|
|
10247
10247
|
});
|
|
10248
10248
|
await socks5Client.connect(targetHost, targetPort);
|
|
10249
|
-
await new Promise((
|
|
10249
|
+
await new Promise((resolve13, reject) => {
|
|
10250
10250
|
const timeout = setTimeout(() => {
|
|
10251
10251
|
reject(new Error("SOCKS5 connection timeout"));
|
|
10252
10252
|
}, 5e3);
|
|
@@ -10254,7 +10254,7 @@ var require_socks5_proxy_agent = __commonJS({
|
|
|
10254
10254
|
debug("SOCKS5 tunnel established to", targetHost, targetPort, "via", info);
|
|
10255
10255
|
clearTimeout(timeout);
|
|
10256
10256
|
socks5Client.removeListener("error", onError);
|
|
10257
|
-
|
|
10257
|
+
resolve13();
|
|
10258
10258
|
};
|
|
10259
10259
|
const onError = (err) => {
|
|
10260
10260
|
clearTimeout(timeout);
|
|
@@ -10295,8 +10295,8 @@ var require_socks5_proxy_agent = __commonJS({
|
|
|
10295
10295
|
servername: targetHost,
|
|
10296
10296
|
...connectOpts.tls || {}
|
|
10297
10297
|
});
|
|
10298
|
-
await new Promise((
|
|
10299
|
-
finalSocket.once("secureConnect",
|
|
10298
|
+
await new Promise((resolve13, reject) => {
|
|
10299
|
+
finalSocket.once("secureConnect", resolve13);
|
|
10300
10300
|
finalSocket.once("error", reject);
|
|
10301
10301
|
});
|
|
10302
10302
|
}
|
|
@@ -11321,7 +11321,7 @@ var require_readable = __commonJS({
|
|
|
11321
11321
|
if (this._readableState.closeEmitted) {
|
|
11322
11322
|
return Promise.resolve(null);
|
|
11323
11323
|
}
|
|
11324
|
-
return new Promise((
|
|
11324
|
+
return new Promise((resolve13, reject) => {
|
|
11325
11325
|
if (this[kContentLength] && this[kContentLength] > limit || this[kBytesRead] > limit) {
|
|
11326
11326
|
this.destroy(new AbortError());
|
|
11327
11327
|
}
|
|
@@ -11335,11 +11335,11 @@ var require_readable = __commonJS({
|
|
|
11335
11335
|
if (signal.aborted) {
|
|
11336
11336
|
reject(signal.reason ?? new AbortError());
|
|
11337
11337
|
} else {
|
|
11338
|
-
|
|
11338
|
+
resolve13(null);
|
|
11339
11339
|
}
|
|
11340
11340
|
});
|
|
11341
11341
|
} else {
|
|
11342
|
-
this.on("close",
|
|
11342
|
+
this.on("close", resolve13);
|
|
11343
11343
|
}
|
|
11344
11344
|
this.on("error", noop).on("data", () => {
|
|
11345
11345
|
if (this[kBytesRead] > limit) {
|
|
@@ -11367,7 +11367,7 @@ var require_readable = __commonJS({
|
|
|
11367
11367
|
}
|
|
11368
11368
|
function consume(stream, type) {
|
|
11369
11369
|
assert7(!stream[kConsume]);
|
|
11370
|
-
return new Promise((
|
|
11370
|
+
return new Promise((resolve13, reject) => {
|
|
11371
11371
|
if (isUnusable(stream)) {
|
|
11372
11372
|
const rState = stream._readableState;
|
|
11373
11373
|
if (rState.destroyed && rState.closeEmitted === false) {
|
|
@@ -11382,7 +11382,7 @@ var require_readable = __commonJS({
|
|
|
11382
11382
|
stream[kConsume] = {
|
|
11383
11383
|
type,
|
|
11384
11384
|
stream,
|
|
11385
|
-
resolve:
|
|
11385
|
+
resolve: resolve13,
|
|
11386
11386
|
reject,
|
|
11387
11387
|
length: 0,
|
|
11388
11388
|
body: []
|
|
@@ -11456,18 +11456,18 @@ var require_readable = __commonJS({
|
|
|
11456
11456
|
return buffer;
|
|
11457
11457
|
}
|
|
11458
11458
|
function consumeEnd(consume2, encoding) {
|
|
11459
|
-
const { type, body, resolve:
|
|
11459
|
+
const { type, body, resolve: resolve13, stream, length } = consume2;
|
|
11460
11460
|
try {
|
|
11461
11461
|
if (type === "text") {
|
|
11462
|
-
|
|
11462
|
+
resolve13(chunksDecode(body, length, encoding));
|
|
11463
11463
|
} else if (type === "json") {
|
|
11464
|
-
|
|
11464
|
+
resolve13(JSON.parse(chunksDecode(body, length, encoding)));
|
|
11465
11465
|
} else if (type === "arrayBuffer") {
|
|
11466
|
-
|
|
11466
|
+
resolve13(chunksConcat(body, length).buffer);
|
|
11467
11467
|
} else if (type === "blob") {
|
|
11468
|
-
|
|
11468
|
+
resolve13(new Blob(body, { type: stream[kContentType] }));
|
|
11469
11469
|
} else if (type === "bytes") {
|
|
11470
|
-
|
|
11470
|
+
resolve13(chunksConcat(body, length));
|
|
11471
11471
|
}
|
|
11472
11472
|
consumeFinish(consume2);
|
|
11473
11473
|
} catch (err) {
|
|
@@ -11657,9 +11657,9 @@ var require_api_request = __commonJS({
|
|
|
11657
11657
|
};
|
|
11658
11658
|
function request2(opts, callback) {
|
|
11659
11659
|
if (callback === void 0) {
|
|
11660
|
-
return new Promise((
|
|
11660
|
+
return new Promise((resolve13, reject) => {
|
|
11661
11661
|
request2.call(this, opts, (err, data) => {
|
|
11662
|
-
return err ? reject(err) :
|
|
11662
|
+
return err ? reject(err) : resolve13(data);
|
|
11663
11663
|
});
|
|
11664
11664
|
});
|
|
11665
11665
|
}
|
|
@@ -11871,9 +11871,9 @@ var require_api_stream = __commonJS({
|
|
|
11871
11871
|
};
|
|
11872
11872
|
function stream(opts, factory, callback) {
|
|
11873
11873
|
if (callback === void 0) {
|
|
11874
|
-
return new Promise((
|
|
11874
|
+
return new Promise((resolve13, reject) => {
|
|
11875
11875
|
stream.call(this, opts, factory, (err, data) => {
|
|
11876
|
-
return err ? reject(err) :
|
|
11876
|
+
return err ? reject(err) : resolve13(data);
|
|
11877
11877
|
});
|
|
11878
11878
|
});
|
|
11879
11879
|
}
|
|
@@ -12161,9 +12161,9 @@ var require_api_upgrade = __commonJS({
|
|
|
12161
12161
|
};
|
|
12162
12162
|
function upgrade(opts, callback) {
|
|
12163
12163
|
if (callback === void 0) {
|
|
12164
|
-
return new Promise((
|
|
12164
|
+
return new Promise((resolve13, reject) => {
|
|
12165
12165
|
upgrade.call(this, opts, (err, data) => {
|
|
12166
|
-
return err ? reject(err) :
|
|
12166
|
+
return err ? reject(err) : resolve13(data);
|
|
12167
12167
|
});
|
|
12168
12168
|
});
|
|
12169
12169
|
}
|
|
@@ -12256,9 +12256,9 @@ var require_api_connect = __commonJS({
|
|
|
12256
12256
|
};
|
|
12257
12257
|
function connect(opts, callback) {
|
|
12258
12258
|
if (callback === void 0) {
|
|
12259
|
-
return new Promise((
|
|
12259
|
+
return new Promise((resolve13, reject) => {
|
|
12260
12260
|
connect.call(this, opts, (err, data) => {
|
|
12261
|
-
return err ? reject(err) :
|
|
12261
|
+
return err ? reject(err) : resolve13(data);
|
|
12262
12262
|
});
|
|
12263
12263
|
});
|
|
12264
12264
|
}
|
|
@@ -13532,7 +13532,7 @@ var require_snapshot_recorder = __commonJS({
|
|
|
13532
13532
|
"../../node_modules/.pnpm/undici@7.24.8/node_modules/undici/lib/mock/snapshot-recorder.js"(exports2, module2) {
|
|
13533
13533
|
"use strict";
|
|
13534
13534
|
var { writeFile: writeFile4, readFile: readFile2, mkdir } = require("node:fs/promises");
|
|
13535
|
-
var { dirname: dirname7, resolve:
|
|
13535
|
+
var { dirname: dirname7, resolve: resolve13 } = require("node:path");
|
|
13536
13536
|
var { setTimeout: setTimeout6, clearTimeout: clearTimeout2 } = require("node:timers");
|
|
13537
13537
|
var { InvalidArgumentError, UndiciError } = require_errors();
|
|
13538
13538
|
var { hashId, isUrlExcludedFactory, normalizeHeaders, createHeaderFilters } = require_snapshot_utils();
|
|
@@ -13733,7 +13733,7 @@ var require_snapshot_recorder = __commonJS({
|
|
|
13733
13733
|
throw new InvalidArgumentError("Snapshot path is required");
|
|
13734
13734
|
}
|
|
13735
13735
|
try {
|
|
13736
|
-
const data = await readFile2(
|
|
13736
|
+
const data = await readFile2(resolve13(path6), "utf8");
|
|
13737
13737
|
const parsed = JSON.parse(data);
|
|
13738
13738
|
if (Array.isArray(parsed)) {
|
|
13739
13739
|
this.#snapshots.clear();
|
|
@@ -13762,7 +13762,7 @@ var require_snapshot_recorder = __commonJS({
|
|
|
13762
13762
|
if (!path6) {
|
|
13763
13763
|
throw new InvalidArgumentError("Snapshot path is required");
|
|
13764
13764
|
}
|
|
13765
|
-
const resolvedPath =
|
|
13765
|
+
const resolvedPath = resolve13(path6);
|
|
13766
13766
|
await mkdir(dirname7(resolvedPath), { recursive: true });
|
|
13767
13767
|
const data = Array.from(this.#snapshots.entries()).map(([hash, snapshot]) => ({
|
|
13768
13768
|
hash,
|
|
@@ -18133,7 +18133,7 @@ var require_headers = __commonJS({
|
|
|
18133
18133
|
}
|
|
18134
18134
|
}
|
|
18135
18135
|
};
|
|
18136
|
-
var
|
|
18136
|
+
var Headers2 = class _Headers {
|
|
18137
18137
|
#guard;
|
|
18138
18138
|
/**
|
|
18139
18139
|
* @type {HeadersList}
|
|
@@ -18274,13 +18274,13 @@ var require_headers = __commonJS({
|
|
|
18274
18274
|
target.#headersList = list;
|
|
18275
18275
|
}
|
|
18276
18276
|
};
|
|
18277
|
-
var { getHeadersGuard, setHeadersGuard, getHeadersList, setHeadersList } =
|
|
18278
|
-
Reflect.deleteProperty(
|
|
18279
|
-
Reflect.deleteProperty(
|
|
18280
|
-
Reflect.deleteProperty(
|
|
18281
|
-
Reflect.deleteProperty(
|
|
18282
|
-
iteratorMixin("Headers",
|
|
18283
|
-
Object.defineProperties(
|
|
18277
|
+
var { getHeadersGuard, setHeadersGuard, getHeadersList, setHeadersList } = Headers2;
|
|
18278
|
+
Reflect.deleteProperty(Headers2, "getHeadersGuard");
|
|
18279
|
+
Reflect.deleteProperty(Headers2, "setHeadersGuard");
|
|
18280
|
+
Reflect.deleteProperty(Headers2, "getHeadersList");
|
|
18281
|
+
Reflect.deleteProperty(Headers2, "setHeadersList");
|
|
18282
|
+
iteratorMixin("Headers", Headers2, headersListSortAndCombine, 0, 1);
|
|
18283
|
+
Object.defineProperties(Headers2.prototype, {
|
|
18284
18284
|
append: kEnumerableProperty,
|
|
18285
18285
|
delete: kEnumerableProperty,
|
|
18286
18286
|
get: kEnumerableProperty,
|
|
@@ -18298,7 +18298,7 @@ var require_headers = __commonJS({
|
|
|
18298
18298
|
webidl.converters.HeadersInit = function(V2, prefix, argument) {
|
|
18299
18299
|
if (webidl.util.Type(V2) === webidl.util.Types.OBJECT) {
|
|
18300
18300
|
const iterator = Reflect.get(V2, Symbol.iterator);
|
|
18301
|
-
if (!util2.types.isProxy(V2) && iterator ===
|
|
18301
|
+
if (!util2.types.isProxy(V2) && iterator === Headers2.prototype.entries) {
|
|
18302
18302
|
try {
|
|
18303
18303
|
return getHeadersList(V2).entriesList;
|
|
18304
18304
|
} catch {
|
|
@@ -18319,7 +18319,7 @@ var require_headers = __commonJS({
|
|
|
18319
18319
|
fill,
|
|
18320
18320
|
// for test.
|
|
18321
18321
|
compareHeaderName,
|
|
18322
|
-
Headers,
|
|
18322
|
+
Headers: Headers2,
|
|
18323
18323
|
HeadersList,
|
|
18324
18324
|
getHeadersGuard,
|
|
18325
18325
|
setHeadersGuard,
|
|
@@ -18333,7 +18333,7 @@ var require_headers = __commonJS({
|
|
|
18333
18333
|
var require_response = __commonJS({
|
|
18334
18334
|
"../../node_modules/.pnpm/undici@7.24.8/node_modules/undici/lib/web/fetch/response.js"(exports2, module2) {
|
|
18335
18335
|
"use strict";
|
|
18336
|
-
var { Headers, HeadersList, fill, getHeadersGuard, setHeadersGuard, setHeadersList } = require_headers();
|
|
18336
|
+
var { Headers: Headers2, HeadersList, fill, getHeadersGuard, setHeadersGuard, setHeadersList } = require_headers();
|
|
18337
18337
|
var { extractBody, cloneBody, mixinBody, streamRegistry, bodyUnusable } = require_body();
|
|
18338
18338
|
var util2 = require_util();
|
|
18339
18339
|
var nodeUtil = require("node:util");
|
|
@@ -18355,7 +18355,7 @@ var require_response = __commonJS({
|
|
|
18355
18355
|
var assert7 = require("node:assert");
|
|
18356
18356
|
var { isomorphicEncode, serializeJavascriptValueToJSONString } = require_infra();
|
|
18357
18357
|
var textEncoder = new TextEncoder("utf-8");
|
|
18358
|
-
var
|
|
18358
|
+
var Response2 = class _Response {
|
|
18359
18359
|
/** @type {Headers} */
|
|
18360
18360
|
#headers;
|
|
18361
18361
|
#state;
|
|
@@ -18409,7 +18409,7 @@ var require_response = __commonJS({
|
|
|
18409
18409
|
}
|
|
18410
18410
|
init = webidl.converters.ResponseInit(init);
|
|
18411
18411
|
this.#state = makeResponse({});
|
|
18412
|
-
this.#headers = new
|
|
18412
|
+
this.#headers = new Headers2(kConstruct);
|
|
18413
18413
|
setHeadersGuard(this.#headers, "response");
|
|
18414
18414
|
setHeadersList(this.#headers, this.#state.headersList);
|
|
18415
18415
|
let bodyWithType = null;
|
|
@@ -18527,13 +18527,13 @@ var require_response = __commonJS({
|
|
|
18527
18527
|
response.#state = newState;
|
|
18528
18528
|
}
|
|
18529
18529
|
};
|
|
18530
|
-
var { getResponseHeaders, setResponseHeaders, getResponseState, setResponseState } =
|
|
18531
|
-
Reflect.deleteProperty(
|
|
18532
|
-
Reflect.deleteProperty(
|
|
18533
|
-
Reflect.deleteProperty(
|
|
18534
|
-
Reflect.deleteProperty(
|
|
18535
|
-
mixinBody(
|
|
18536
|
-
Object.defineProperties(
|
|
18530
|
+
var { getResponseHeaders, setResponseHeaders, getResponseState, setResponseState } = Response2;
|
|
18531
|
+
Reflect.deleteProperty(Response2, "getResponseHeaders");
|
|
18532
|
+
Reflect.deleteProperty(Response2, "setResponseHeaders");
|
|
18533
|
+
Reflect.deleteProperty(Response2, "getResponseState");
|
|
18534
|
+
Reflect.deleteProperty(Response2, "setResponseState");
|
|
18535
|
+
mixinBody(Response2, getResponseState);
|
|
18536
|
+
Object.defineProperties(Response2.prototype, {
|
|
18537
18537
|
type: kEnumerableProperty,
|
|
18538
18538
|
url: kEnumerableProperty,
|
|
18539
18539
|
status: kEnumerableProperty,
|
|
@@ -18549,7 +18549,7 @@ var require_response = __commonJS({
|
|
|
18549
18549
|
configurable: true
|
|
18550
18550
|
}
|
|
18551
18551
|
});
|
|
18552
|
-
Object.defineProperties(
|
|
18552
|
+
Object.defineProperties(Response2, {
|
|
18553
18553
|
json: kEnumerableProperty,
|
|
18554
18554
|
redirect: kEnumerableProperty,
|
|
18555
18555
|
error: kEnumerableProperty
|
|
@@ -18682,9 +18682,9 @@ var require_response = __commonJS({
|
|
|
18682
18682
|
}
|
|
18683
18683
|
}
|
|
18684
18684
|
function fromInnerResponse(innerResponse, guard) {
|
|
18685
|
-
const response = new
|
|
18685
|
+
const response = new Response2(kConstruct);
|
|
18686
18686
|
setResponseState(response, innerResponse);
|
|
18687
|
-
const headers = new
|
|
18687
|
+
const headers = new Headers2(kConstruct);
|
|
18688
18688
|
setResponseHeaders(response, headers);
|
|
18689
18689
|
setHeadersList(headers, innerResponse.headersList);
|
|
18690
18690
|
setHeadersGuard(headers, guard);
|
|
@@ -18736,14 +18736,14 @@ var require_response = __commonJS({
|
|
|
18736
18736
|
converter: webidl.converters.HeadersInit
|
|
18737
18737
|
}
|
|
18738
18738
|
]);
|
|
18739
|
-
webidl.is.Response = webidl.util.MakeTypeAssertion(
|
|
18739
|
+
webidl.is.Response = webidl.util.MakeTypeAssertion(Response2);
|
|
18740
18740
|
module2.exports = {
|
|
18741
18741
|
isNetworkError,
|
|
18742
18742
|
makeNetworkError,
|
|
18743
18743
|
makeResponse,
|
|
18744
18744
|
makeAppropriateNetworkError,
|
|
18745
18745
|
filterResponse,
|
|
18746
|
-
Response,
|
|
18746
|
+
Response: Response2,
|
|
18747
18747
|
cloneResponse,
|
|
18748
18748
|
fromInnerResponse,
|
|
18749
18749
|
getResponseState
|
|
@@ -18756,7 +18756,7 @@ var require_request2 = __commonJS({
|
|
|
18756
18756
|
"../../node_modules/.pnpm/undici@7.24.8/node_modules/undici/lib/web/fetch/request.js"(exports2, module2) {
|
|
18757
18757
|
"use strict";
|
|
18758
18758
|
var { extractBody, mixinBody, cloneBody, bodyUnusable } = require_body();
|
|
18759
|
-
var { Headers, fill: fillHeaders, HeadersList, setHeadersGuard, getHeadersGuard, setHeadersList, getHeadersList } = require_headers();
|
|
18759
|
+
var { Headers: Headers2, fill: fillHeaders, HeadersList, setHeadersGuard, getHeadersGuard, setHeadersList, getHeadersList } = require_headers();
|
|
18760
18760
|
var util2 = require_util();
|
|
18761
18761
|
var nodeUtil = require("node:util");
|
|
18762
18762
|
var {
|
|
@@ -19025,7 +19025,7 @@ var require_request2 = __commonJS({
|
|
|
19025
19025
|
requestFinalizer.register(ac, { signal, abort }, abort);
|
|
19026
19026
|
}
|
|
19027
19027
|
}
|
|
19028
|
-
this.#headers = new
|
|
19028
|
+
this.#headers = new Headers2(kConstruct);
|
|
19029
19029
|
setHeadersList(this.#headers, request2.headersList);
|
|
19030
19030
|
setHeadersGuard(this.#headers, "request");
|
|
19031
19031
|
if (mode === "no-cors") {
|
|
@@ -19366,7 +19366,7 @@ var require_request2 = __commonJS({
|
|
|
19366
19366
|
setRequestState(request2, innerRequest);
|
|
19367
19367
|
setRequestDispatcher(request2, dispatcher);
|
|
19368
19368
|
setRequestSignal(request2, signal);
|
|
19369
|
-
const headers = new
|
|
19369
|
+
const headers = new Headers2(kConstruct);
|
|
19370
19370
|
setRequestHeaders(request2, headers);
|
|
19371
19371
|
setHeadersList(headers, innerRequest.headersList);
|
|
19372
19372
|
setHeadersGuard(headers, guard);
|
|
@@ -20604,7 +20604,7 @@ var require_fetch = __commonJS({
|
|
|
20604
20604
|
const agent = fetchParams.controller.dispatcher;
|
|
20605
20605
|
const path6 = url.pathname + url.search;
|
|
20606
20606
|
const hasTrailingQuestionMark = url.search.length === 0 && url.href[url.href.length - url.hash.length - 1] === "?";
|
|
20607
|
-
return new Promise((
|
|
20607
|
+
return new Promise((resolve13, reject) => agent.dispatch(
|
|
20608
20608
|
{
|
|
20609
20609
|
path: hasTrailingQuestionMark ? `${path6}?` : path6,
|
|
20610
20610
|
origin: url.origin,
|
|
@@ -20692,7 +20692,7 @@ var require_fetch = __commonJS({
|
|
|
20692
20692
|
}
|
|
20693
20693
|
}
|
|
20694
20694
|
const onError = this.onError.bind(this);
|
|
20695
|
-
|
|
20695
|
+
resolve13({
|
|
20696
20696
|
status: status2,
|
|
20697
20697
|
statusText,
|
|
20698
20698
|
headersList,
|
|
@@ -20745,7 +20745,7 @@ var require_fetch = __commonJS({
|
|
|
20745
20745
|
headersList.append(headerName, String(value), true);
|
|
20746
20746
|
}
|
|
20747
20747
|
}
|
|
20748
|
-
|
|
20748
|
+
resolve13({
|
|
20749
20749
|
status: status2,
|
|
20750
20750
|
statusText: STATUS_CODES[status2],
|
|
20751
20751
|
headersList,
|
|
@@ -20769,7 +20769,7 @@ var require_fetch = __commonJS({
|
|
|
20769
20769
|
headersList.append(nameStr, value.toString("latin1"), true);
|
|
20770
20770
|
}
|
|
20771
20771
|
}
|
|
20772
|
-
|
|
20772
|
+
resolve13({
|
|
20773
20773
|
status: status2,
|
|
20774
20774
|
statusText: STATUS_CODES[status2],
|
|
20775
20775
|
headersList,
|
|
@@ -21810,8 +21810,8 @@ var require_cookies = __commonJS({
|
|
|
21810
21810
|
var { parseSetCookie } = require_parse();
|
|
21811
21811
|
var { stringify: stringify5 } = require_util4();
|
|
21812
21812
|
var { webidl } = require_webidl();
|
|
21813
|
-
var { Headers } = require_headers();
|
|
21814
|
-
var brandChecks = webidl.brandCheckMultiple([
|
|
21813
|
+
var { Headers: Headers2 } = require_headers();
|
|
21814
|
+
var brandChecks = webidl.brandCheckMultiple([Headers2, globalThis.Headers].filter(Boolean));
|
|
21815
21815
|
function getCookies(headers) {
|
|
21816
21816
|
webidl.argumentLengthCheck(arguments, 1, "getCookies");
|
|
21817
21817
|
brandChecks(headers);
|
|
@@ -22552,7 +22552,7 @@ var require_connection = __commonJS({
|
|
|
22552
22552
|
var { parseExtensions, isClosed, isClosing, isEstablished, isConnecting, validateCloseCodeAndReason } = require_util5();
|
|
22553
22553
|
var { makeRequest } = require_request2();
|
|
22554
22554
|
var { fetching } = require_fetch();
|
|
22555
|
-
var { Headers, getHeadersList } = require_headers();
|
|
22555
|
+
var { Headers: Headers2, getHeadersList } = require_headers();
|
|
22556
22556
|
var { getDecodeSplit } = require_util2();
|
|
22557
22557
|
var { WebsocketFrameSend } = require_frame();
|
|
22558
22558
|
var assert7 = require("node:assert");
|
|
@@ -22574,7 +22574,7 @@ var require_connection = __commonJS({
|
|
|
22574
22574
|
useURLCredentials: true
|
|
22575
22575
|
});
|
|
22576
22576
|
if (options.headers) {
|
|
22577
|
-
const headersList = getHeadersList(new
|
|
22577
|
+
const headersList = getHeadersList(new Headers2(options.headers));
|
|
22578
22578
|
request2.headersList = headersList;
|
|
22579
22579
|
}
|
|
22580
22580
|
const keyValue = crypto.randomBytes(16).toString("base64");
|
|
@@ -25782,12 +25782,12 @@ var require_isexe = __commonJS({
|
|
|
25782
25782
|
if (typeof Promise !== "function") {
|
|
25783
25783
|
throw new TypeError("callback not provided");
|
|
25784
25784
|
}
|
|
25785
|
-
return new Promise(function(
|
|
25785
|
+
return new Promise(function(resolve13, reject) {
|
|
25786
25786
|
isexe(path6, options || {}, function(er, is) {
|
|
25787
25787
|
if (er) {
|
|
25788
25788
|
reject(er);
|
|
25789
25789
|
} else {
|
|
25790
|
-
|
|
25790
|
+
resolve13(is);
|
|
25791
25791
|
}
|
|
25792
25792
|
});
|
|
25793
25793
|
});
|
|
@@ -25853,27 +25853,27 @@ var require_which = __commonJS({
|
|
|
25853
25853
|
opt = {};
|
|
25854
25854
|
const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
|
|
25855
25855
|
const found = [];
|
|
25856
|
-
const step = (i) => new Promise((
|
|
25856
|
+
const step = (i) => new Promise((resolve13, reject) => {
|
|
25857
25857
|
if (i === pathEnv.length)
|
|
25858
|
-
return opt.all && found.length ?
|
|
25858
|
+
return opt.all && found.length ? resolve13(found) : reject(getNotFoundError(cmd));
|
|
25859
25859
|
const ppRaw = pathEnv[i];
|
|
25860
25860
|
const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
|
|
25861
25861
|
const pCmd = path6.join(pathPart, cmd);
|
|
25862
25862
|
const p2 = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
|
|
25863
|
-
|
|
25863
|
+
resolve13(subStep(p2, i, 0));
|
|
25864
25864
|
});
|
|
25865
|
-
const subStep = (p2, i, ii) => new Promise((
|
|
25865
|
+
const subStep = (p2, i, ii) => new Promise((resolve13, reject) => {
|
|
25866
25866
|
if (ii === pathExt.length)
|
|
25867
|
-
return
|
|
25867
|
+
return resolve13(step(i + 1));
|
|
25868
25868
|
const ext = pathExt[ii];
|
|
25869
25869
|
isexe(p2 + ext, { pathExt: pathExtExe }, (er, is) => {
|
|
25870
25870
|
if (!er && is) {
|
|
25871
25871
|
if (opt.all)
|
|
25872
25872
|
found.push(p2 + ext);
|
|
25873
25873
|
else
|
|
25874
|
-
return
|
|
25874
|
+
return resolve13(p2 + ext);
|
|
25875
25875
|
}
|
|
25876
|
-
return
|
|
25876
|
+
return resolve13(subStep(p2, i, ii + 1));
|
|
25877
25877
|
});
|
|
25878
25878
|
});
|
|
25879
25879
|
return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
|
|
@@ -29446,9 +29446,9 @@ var require_index_688c5d50 = __commonJS({
|
|
|
29446
29446
|
}
|
|
29447
29447
|
// stream.promise().then(() => done, er => emitted error)
|
|
29448
29448
|
promise() {
|
|
29449
|
-
return new Promise((
|
|
29449
|
+
return new Promise((resolve14, reject) => {
|
|
29450
29450
|
this.on(DESTROYED, () => reject(new Error("stream destroyed")));
|
|
29451
|
-
this.on("end", () =>
|
|
29451
|
+
this.on("end", () => resolve14());
|
|
29452
29452
|
this.on("error", (er) => reject(er));
|
|
29453
29453
|
});
|
|
29454
29454
|
}
|
|
@@ -29460,7 +29460,7 @@ var require_index_688c5d50 = __commonJS({
|
|
|
29460
29460
|
return Promise.resolve({ done: false, value: res });
|
|
29461
29461
|
if (this[EOF$1])
|
|
29462
29462
|
return Promise.resolve({ done: true });
|
|
29463
|
-
let
|
|
29463
|
+
let resolve14 = null;
|
|
29464
29464
|
let reject = null;
|
|
29465
29465
|
const onerr = (er) => {
|
|
29466
29466
|
this.removeListener("data", ondata);
|
|
@@ -29471,17 +29471,17 @@ var require_index_688c5d50 = __commonJS({
|
|
|
29471
29471
|
this.removeListener("error", onerr);
|
|
29472
29472
|
this.removeListener("end", onend);
|
|
29473
29473
|
this.pause();
|
|
29474
|
-
|
|
29474
|
+
resolve14({ value, done: !!this[EOF$1] });
|
|
29475
29475
|
};
|
|
29476
29476
|
const onend = () => {
|
|
29477
29477
|
this.removeListener("error", onerr);
|
|
29478
29478
|
this.removeListener("data", ondata);
|
|
29479
|
-
|
|
29479
|
+
resolve14({ done: true });
|
|
29480
29480
|
};
|
|
29481
29481
|
const ondestroy = () => onerr(new Error("stream destroyed"));
|
|
29482
29482
|
return new Promise((res2, rej) => {
|
|
29483
29483
|
reject = rej;
|
|
29484
|
-
|
|
29484
|
+
resolve14 = res2;
|
|
29485
29485
|
this.once(DESTROYED, ondestroy);
|
|
29486
29486
|
this.once("error", onerr);
|
|
29487
29487
|
this.once("end", onend);
|
|
@@ -31908,9 +31908,9 @@ var require_index_688c5d50 = __commonJS({
|
|
|
31908
31908
|
const parse11 = new parse$4(opt);
|
|
31909
31909
|
const readSize = opt.maxReadSize || 16 * 1024 * 1024;
|
|
31910
31910
|
const file2 = opt.file;
|
|
31911
|
-
const p2 = new Promise((
|
|
31911
|
+
const p2 = new Promise((resolve14, reject) => {
|
|
31912
31912
|
parse11.on("error", reject);
|
|
31913
|
-
parse11.on("end",
|
|
31913
|
+
parse11.on("end", resolve14);
|
|
31914
31914
|
fs__default["default"].stat(file2, (er, stat) => {
|
|
31915
31915
|
if (er)
|
|
31916
31916
|
reject(er);
|
|
@@ -32121,7 +32121,7 @@ var require_index_688c5d50 = __commonJS({
|
|
|
32121
32121
|
};
|
|
32122
32122
|
fs__default["default"].read(fd, headBuf, 0, 512, position, onread);
|
|
32123
32123
|
};
|
|
32124
|
-
const promise = new Promise((
|
|
32124
|
+
const promise = new Promise((resolve14, reject) => {
|
|
32125
32125
|
p2.on("error", reject);
|
|
32126
32126
|
let flag = "r+";
|
|
32127
32127
|
const onopen = (er, fd) => {
|
|
@@ -32143,7 +32143,7 @@ var require_index_688c5d50 = __commonJS({
|
|
|
32143
32143
|
});
|
|
32144
32144
|
p2.pipe(stream);
|
|
32145
32145
|
stream.on("error", reject);
|
|
32146
|
-
stream.on("close",
|
|
32146
|
+
stream.on("close", resolve14);
|
|
32147
32147
|
addFilesAsync(p2, files);
|
|
32148
32148
|
});
|
|
32149
32149
|
});
|
|
@@ -32220,7 +32220,7 @@ var require_index_688c5d50 = __commonJS({
|
|
|
32220
32220
|
};
|
|
32221
32221
|
var optsArg_1 = optsArg;
|
|
32222
32222
|
var platform$2 = process.env.__TESTING_MKDIRP_PLATFORM__ || process.platform;
|
|
32223
|
-
var { resolve:
|
|
32223
|
+
var { resolve: resolve13, parse: parse$3 } = path__default["default"];
|
|
32224
32224
|
var pathArg = (path7) => {
|
|
32225
32225
|
if (/\0/.test(path7)) {
|
|
32226
32226
|
throw Object.assign(
|
|
@@ -32231,7 +32231,7 @@ var require_index_688c5d50 = __commonJS({
|
|
|
32231
32231
|
}
|
|
32232
32232
|
);
|
|
32233
32233
|
}
|
|
32234
|
-
path7 =
|
|
32234
|
+
path7 = resolve13(path7);
|
|
32235
32235
|
if (platform$2 === "win32") {
|
|
32236
32236
|
const badWinChars = /[*|"<>?:]/;
|
|
32237
32237
|
const { root } = parse$3(path7);
|
|
@@ -33310,9 +33310,9 @@ var require_index_688c5d50 = __commonJS({
|
|
|
33310
33310
|
const u2 = new unpack(opt);
|
|
33311
33311
|
const readSize = opt.maxReadSize || 16 * 1024 * 1024;
|
|
33312
33312
|
const file2 = opt.file;
|
|
33313
|
-
const p2 = new Promise((
|
|
33313
|
+
const p2 = new Promise((resolve14, reject) => {
|
|
33314
33314
|
u2.on("error", reject);
|
|
33315
|
-
u2.on("close",
|
|
33315
|
+
u2.on("close", resolve14);
|
|
33316
33316
|
fs__default["default"].stat(file2, (er, stat) => {
|
|
33317
33317
|
if (er)
|
|
33318
33318
|
reject(er);
|
|
@@ -34623,9 +34623,9 @@ var require_index_688c5d50 = __commonJS({
|
|
|
34623
34623
|
const styles5 = [];
|
|
34624
34624
|
const chunks = [];
|
|
34625
34625
|
let chunk = [];
|
|
34626
|
-
temporary.replace(TEMPLATE_REGEX2, (m2,
|
|
34627
|
-
if (
|
|
34628
|
-
chunk.push(unescape(
|
|
34626
|
+
temporary.replace(TEMPLATE_REGEX2, (m2, escapeCharacter2, inverse, style, close, character) => {
|
|
34627
|
+
if (escapeCharacter2) {
|
|
34628
|
+
chunk.push(unescape(escapeCharacter2));
|
|
34629
34629
|
} else if (style) {
|
|
34630
34630
|
const string = chunk.join("");
|
|
34631
34631
|
chunk = [];
|
|
@@ -38627,12 +38627,12 @@ var require_index_688c5d50 = __commonJS({
|
|
|
38627
38627
|
});
|
|
38628
38628
|
function promisify7(fn) {
|
|
38629
38629
|
return function(req, opts) {
|
|
38630
|
-
return new Promise((
|
|
38630
|
+
return new Promise((resolve14, reject) => {
|
|
38631
38631
|
fn.call(this, req, opts, (err, rtn) => {
|
|
38632
38632
|
if (err) {
|
|
38633
38633
|
reject(err);
|
|
38634
38634
|
} else {
|
|
38635
|
-
|
|
38635
|
+
resolve14(rtn);
|
|
38636
38636
|
}
|
|
38637
38637
|
});
|
|
38638
38638
|
});
|
|
@@ -38823,7 +38823,7 @@ var require_index_688c5d50 = __commonJS({
|
|
|
38823
38823
|
var debug_1$1 = __importDefault$2(src$1);
|
|
38824
38824
|
var debug$1 = debug_1$1.default("https-proxy-agent:parse-proxy-response");
|
|
38825
38825
|
function parseProxyResponse(socket) {
|
|
38826
|
-
return new Promise((
|
|
38826
|
+
return new Promise((resolve14, reject) => {
|
|
38827
38827
|
let buffersLength = 0;
|
|
38828
38828
|
const buffers = [];
|
|
38829
38829
|
function read() {
|
|
@@ -38863,7 +38863,7 @@ var require_index_688c5d50 = __commonJS({
|
|
|
38863
38863
|
const firstLine = buffered.toString("ascii", 0, buffered.indexOf("\r\n"));
|
|
38864
38864
|
const statusCode = +firstLine.split(" ")[1];
|
|
38865
38865
|
debug$1("got proxy server response: %o", firstLine);
|
|
38866
|
-
|
|
38866
|
+
resolve14({
|
|
38867
38867
|
statusCode,
|
|
38868
38868
|
buffered
|
|
38869
38869
|
});
|
|
@@ -38880,11 +38880,11 @@ var require_index_688c5d50 = __commonJS({
|
|
|
38880
38880
|
}, "__esModule", { value: true });
|
|
38881
38881
|
var __awaiter2 = commonjsGlobal && commonjsGlobal.__awaiter || function(thisArg, _arguments, P2, generator) {
|
|
38882
38882
|
function adopt(value) {
|
|
38883
|
-
return value instanceof P2 ? value : new P2(function(
|
|
38884
|
-
|
|
38883
|
+
return value instanceof P2 ? value : new P2(function(resolve14) {
|
|
38884
|
+
resolve14(value);
|
|
38885
38885
|
});
|
|
38886
38886
|
}
|
|
38887
|
-
return new (P2 || (P2 = Promise))(function(
|
|
38887
|
+
return new (P2 || (P2 = Promise))(function(resolve14, reject) {
|
|
38888
38888
|
function fulfilled(value) {
|
|
38889
38889
|
try {
|
|
38890
38890
|
step(generator.next(value));
|
|
@@ -38900,7 +38900,7 @@ var require_index_688c5d50 = __commonJS({
|
|
|
38900
38900
|
}
|
|
38901
38901
|
}
|
|
38902
38902
|
function step(result) {
|
|
38903
|
-
result.done ?
|
|
38903
|
+
result.done ? resolve14(result.value) : adopt(result.value).then(fulfilled, rejected);
|
|
38904
38904
|
}
|
|
38905
38905
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
38906
38906
|
});
|
|
@@ -48151,11 +48151,11 @@ function __metadata(metadataKey, metadataValue) {
|
|
|
48151
48151
|
}
|
|
48152
48152
|
function __awaiter(thisArg, _arguments, P2, generator) {
|
|
48153
48153
|
function adopt(value) {
|
|
48154
|
-
return value instanceof P2 ? value : new P2(function(
|
|
48155
|
-
|
|
48154
|
+
return value instanceof P2 ? value : new P2(function(resolve13) {
|
|
48155
|
+
resolve13(value);
|
|
48156
48156
|
});
|
|
48157
48157
|
}
|
|
48158
|
-
return new (P2 || (P2 = Promise))(function(
|
|
48158
|
+
return new (P2 || (P2 = Promise))(function(resolve13, reject) {
|
|
48159
48159
|
function fulfilled(value) {
|
|
48160
48160
|
try {
|
|
48161
48161
|
step(generator.next(value));
|
|
@@ -48171,7 +48171,7 @@ function __awaiter(thisArg, _arguments, P2, generator) {
|
|
|
48171
48171
|
}
|
|
48172
48172
|
}
|
|
48173
48173
|
function step(result) {
|
|
48174
|
-
result.done ?
|
|
48174
|
+
result.done ? resolve13(result.value) : adopt(result.value).then(fulfilled, rejected);
|
|
48175
48175
|
}
|
|
48176
48176
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
48177
48177
|
});
|
|
@@ -48362,14 +48362,14 @@ function __asyncValues(o) {
|
|
|
48362
48362
|
}, i);
|
|
48363
48363
|
function verb(n) {
|
|
48364
48364
|
i[n] = o[n] && function(v) {
|
|
48365
|
-
return new Promise(function(
|
|
48366
|
-
v = o[n](v), settle(
|
|
48365
|
+
return new Promise(function(resolve13, reject) {
|
|
48366
|
+
v = o[n](v), settle(resolve13, reject, v.done, v.value);
|
|
48367
48367
|
});
|
|
48368
48368
|
};
|
|
48369
48369
|
}
|
|
48370
|
-
function settle(
|
|
48370
|
+
function settle(resolve13, reject, d2, v) {
|
|
48371
48371
|
Promise.resolve(v).then(function(v2) {
|
|
48372
|
-
|
|
48372
|
+
resolve13({ value: v2, done: d2 });
|
|
48373
48373
|
}, reject);
|
|
48374
48374
|
}
|
|
48375
48375
|
}
|
|
@@ -73294,12 +73294,12 @@ var require_packet = __commonJS({
|
|
|
73294
73294
|
let chunklen = 0;
|
|
73295
73295
|
let received = false;
|
|
73296
73296
|
let expected = false;
|
|
73297
|
-
return new Promise((
|
|
73297
|
+
return new Promise((resolve13, reject) => {
|
|
73298
73298
|
const processMessage = () => {
|
|
73299
73299
|
if (received) return;
|
|
73300
73300
|
received = true;
|
|
73301
73301
|
const buffer = Buffer.concat(chunks, chunklen);
|
|
73302
|
-
|
|
73302
|
+
resolve13(buffer.slice(2));
|
|
73303
73303
|
};
|
|
73304
73304
|
socket.on("end", processMessage);
|
|
73305
73305
|
socket.on("error", reject);
|
|
@@ -73361,15 +73361,15 @@ var require_udp = __commonJS({
|
|
|
73361
73361
|
if (message instanceof Packet) {
|
|
73362
73362
|
message = message.toBuffer();
|
|
73363
73363
|
}
|
|
73364
|
-
return new Promise((
|
|
73364
|
+
return new Promise((resolve13, reject) => {
|
|
73365
73365
|
this.send(message, rinfo.port, rinfo.address, (err) => {
|
|
73366
73366
|
if (err) return reject(err);
|
|
73367
|
-
|
|
73367
|
+
resolve13(message);
|
|
73368
73368
|
});
|
|
73369
73369
|
});
|
|
73370
73370
|
}
|
|
73371
73371
|
listen(port, address) {
|
|
73372
|
-
return new Promise((
|
|
73372
|
+
return new Promise((resolve13) => this.bind(port, address, resolve13));
|
|
73373
73373
|
}
|
|
73374
73374
|
};
|
|
73375
73375
|
module2.exports = Server;
|
|
@@ -73431,11 +73431,11 @@ var require_doh = __commonJS({
|
|
|
73431
73431
|
}
|
|
73432
73432
|
return queryData;
|
|
73433
73433
|
};
|
|
73434
|
-
var readStream = (stream) => new Promise((
|
|
73434
|
+
var readStream = (stream) => new Promise((resolve13, reject) => {
|
|
73435
73435
|
let buffer = "";
|
|
73436
73436
|
stream.on("error", reject).on("data", (chunk) => {
|
|
73437
73437
|
buffer += chunk;
|
|
73438
|
-
}).on("end", () =>
|
|
73438
|
+
}).on("end", () => resolve13(buffer));
|
|
73439
73439
|
});
|
|
73440
73440
|
var Server = class extends EventEmitter {
|
|
73441
73441
|
constructor(options) {
|
|
@@ -73561,12 +73561,12 @@ var require_dns2 = __commonJS({
|
|
|
73561
73561
|
}
|
|
73562
73562
|
const servers = Object.values(this.servers);
|
|
73563
73563
|
this.closed = Promise.all(
|
|
73564
|
-
servers.map((server) => new Promise((
|
|
73564
|
+
servers.map((server) => new Promise((resolve13) => server.once("close", resolve13)))
|
|
73565
73565
|
).then(() => {
|
|
73566
73566
|
this.emit("close");
|
|
73567
73567
|
});
|
|
73568
73568
|
this.listening = Promise.all(
|
|
73569
|
-
servers.map((server) => new Promise((
|
|
73569
|
+
servers.map((server) => new Promise((resolve13) => server.once("listening", resolve13)))
|
|
73570
73570
|
).then(() => {
|
|
73571
73571
|
const addresses = this.addresses();
|
|
73572
73572
|
this.emit("listening", addresses);
|
|
@@ -73698,18 +73698,18 @@ var require_tcp2 = __commonJS({
|
|
|
73698
73698
|
var require_doh2 = __commonJS({
|
|
73699
73699
|
"../../node_modules/.pnpm/dns2@2.1.0/node_modules/dns2/client/doh.js"(exports2, module2) {
|
|
73700
73700
|
var Packet = require_packet();
|
|
73701
|
-
var defaultGet = (url) => new Promise((
|
|
73701
|
+
var defaultGet = (url) => new Promise((resolve13, reject) => {
|
|
73702
73702
|
const headers = {
|
|
73703
73703
|
accept: "application/dns-message"
|
|
73704
73704
|
};
|
|
73705
73705
|
const base = url.startsWith("https") ? require("https") : require("http");
|
|
73706
|
-
const req = base.get(url, { headers },
|
|
73706
|
+
const req = base.get(url, { headers }, resolve13);
|
|
73707
73707
|
req.on("error", reject);
|
|
73708
73708
|
});
|
|
73709
73709
|
var readStream = (stream) => {
|
|
73710
73710
|
const buffer = [];
|
|
73711
|
-
return new Promise((
|
|
73712
|
-
stream.on("error", reject).on("data", (chunk) => buffer.push(chunk)).on("end", () =>
|
|
73711
|
+
return new Promise((resolve13, reject) => {
|
|
73712
|
+
stream.on("error", reject).on("data", (chunk) => buffer.push(chunk)).on("end", () => resolve13(Buffer.concat(buffer)));
|
|
73713
73713
|
});
|
|
73714
73714
|
};
|
|
73715
73715
|
var DOHClient = ({ dns, http, get = defaultGet } = {}) => {
|
|
@@ -73762,12 +73762,12 @@ var require_udp2 = __commonJS({
|
|
|
73762
73762
|
type: Packet.TYPE[type]
|
|
73763
73763
|
});
|
|
73764
73764
|
const client = new udp.Socket(socketType);
|
|
73765
|
-
return new Promise((
|
|
73765
|
+
return new Promise((resolve13, reject) => {
|
|
73766
73766
|
client.once("message", function onMessage(message) {
|
|
73767
73767
|
client.close();
|
|
73768
73768
|
const response = Packet.parse(message);
|
|
73769
73769
|
equal(response.header.id, query.header.id);
|
|
73770
|
-
|
|
73770
|
+
resolve13(response);
|
|
73771
73771
|
});
|
|
73772
73772
|
debug("send", dns, query.toBuffer());
|
|
73773
73773
|
client.send(query.toBuffer(), port, dns, (err) => err && reject(err));
|
|
@@ -73781,13 +73781,13 @@ var require_udp2 = __commonJS({
|
|
|
73781
73781
|
var require_google = __commonJS({
|
|
73782
73782
|
"../../node_modules/.pnpm/dns2@2.1.0/node_modules/dns2/client/google.js"(exports2, module2) {
|
|
73783
73783
|
var https = require("https");
|
|
73784
|
-
var get = (url) => new Promise((
|
|
73784
|
+
var get = (url) => new Promise((resolve13) => https.get(url, resolve13));
|
|
73785
73785
|
var readStream = (stream) => {
|
|
73786
73786
|
const buffer = [];
|
|
73787
|
-
return new Promise((
|
|
73787
|
+
return new Promise((resolve13, reject) => {
|
|
73788
73788
|
stream.on("error", reject).on("data", (chunk) => {
|
|
73789
73789
|
buffer.push(chunk);
|
|
73790
|
-
}).on("end", () =>
|
|
73790
|
+
}).on("end", () => resolve13(Buffer.concat(buffer)));
|
|
73791
73791
|
});
|
|
73792
73792
|
};
|
|
73793
73793
|
var GoogleClient = () => (name3, type = "ANY") => {
|
|
@@ -73848,8 +73848,8 @@ var require_dns22 = __commonJS({
|
|
|
73848
73848
|
const { port, nameServers, recursive, resolverProtocol = "UDP" } = this;
|
|
73849
73849
|
const createResolver = _DNS[resolverProtocol + "Client"];
|
|
73850
73850
|
return Promise.race(nameServers.map((address) => {
|
|
73851
|
-
const
|
|
73852
|
-
return
|
|
73851
|
+
const resolve13 = createResolver({ dns: address, port, recursive });
|
|
73852
|
+
return resolve13(name3, type, cls, clientIp);
|
|
73853
73853
|
}));
|
|
73854
73854
|
}
|
|
73855
73855
|
/**
|
|
@@ -73903,7 +73903,7 @@ __export(cli_exports, {
|
|
|
73903
73903
|
});
|
|
73904
73904
|
module.exports = __toCommonJS(cli_exports);
|
|
73905
73905
|
var import_node_fs21 = require("node:fs");
|
|
73906
|
-
var
|
|
73906
|
+
var import_node_path24 = require("node:path");
|
|
73907
73907
|
var import_node_process14 = require("node:process");
|
|
73908
73908
|
|
|
73909
73909
|
// ../../node_modules/.pnpm/chalk@5.3.0/node_modules/chalk/source/vendor/ansi-styles/index.js
|
|
@@ -74459,7 +74459,7 @@ var __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__
|
|
|
74459
74459
|
mod
|
|
74460
74460
|
));
|
|
74461
74461
|
|
|
74462
|
-
// ../workers-utils/dist/chunk-
|
|
74462
|
+
// ../workers-utils/dist/chunk-UFU4JGIG.mjs
|
|
74463
74463
|
var import_node_assert = __toESM(require("node:assert"), 1);
|
|
74464
74464
|
function isCompatDate(str) {
|
|
74465
74465
|
return /^\d{4}-\d{2}-\d{2}$/.test(str);
|
|
@@ -74493,8 +74493,7 @@ function mapWorkerMetadataBindings(bindings) {
|
|
|
74493
74493
|
{
|
|
74494
74494
|
configObj.vars = {
|
|
74495
74495
|
...configObj.vars ?? {},
|
|
74496
|
-
name: binding.
|
|
74497
|
-
json: binding.json
|
|
74496
|
+
[binding.name]: binding.json
|
|
74498
74497
|
};
|
|
74499
74498
|
}
|
|
74500
74499
|
break;
|
|
@@ -77839,6 +77838,7 @@ var import_node_os2 = __toESM(require("node:os"), 1);
|
|
|
77839
77838
|
var import_node_child_process = require("node:child_process");
|
|
77840
77839
|
var import_node_crypto = require("node:crypto");
|
|
77841
77840
|
var import_undici = __toESM(require_undici(), 1);
|
|
77841
|
+
var import_node_url = require("node:url");
|
|
77842
77842
|
var timersPromises = __toESM(require("node:timers/promises"), 1);
|
|
77843
77843
|
var require_XDGAppPaths = __commonJS2({
|
|
77844
77844
|
"../../node_modules/.pnpm/xdg-app-paths@8.3.0/node_modules/xdg-app-paths/dist/cjs/lib/XDGAppPaths.js"(exports2) {
|
|
@@ -78375,7 +78375,7 @@ var require_signal_exit = __commonJS2({
|
|
|
78375
78375
|
};
|
|
78376
78376
|
};
|
|
78377
78377
|
} else {
|
|
78378
|
-
|
|
78378
|
+
assert32 = __require("assert");
|
|
78379
78379
|
signals = require_signals();
|
|
78380
78380
|
isWin = /^win/i.test(process22.platform);
|
|
78381
78381
|
EE = __require("events");
|
|
@@ -78398,7 +78398,7 @@ var require_signal_exit = __commonJS2({
|
|
|
78398
78398
|
return function() {
|
|
78399
78399
|
};
|
|
78400
78400
|
}
|
|
78401
|
-
|
|
78401
|
+
assert32.equal(typeof cb, "function", "a callback must be provided for exit handler");
|
|
78402
78402
|
if (loaded === false) {
|
|
78403
78403
|
load();
|
|
78404
78404
|
}
|
|
@@ -78504,7 +78504,7 @@ var require_signal_exit = __commonJS2({
|
|
|
78504
78504
|
}
|
|
78505
78505
|
}, "processEmit");
|
|
78506
78506
|
}
|
|
78507
|
-
var
|
|
78507
|
+
var assert32;
|
|
78508
78508
|
var signals;
|
|
78509
78509
|
var isWin;
|
|
78510
78510
|
var EE;
|
|
@@ -78639,10 +78639,10 @@ var require_command_exists = __commonJS2({
|
|
|
78639
78639
|
module2.exports = /* @__PURE__ */ __name(function commandExists(commandName, callback) {
|
|
78640
78640
|
var cleanedCommandName = cleanInput(commandName);
|
|
78641
78641
|
if (!callback && typeof Promise !== "undefined") {
|
|
78642
|
-
return new Promise(function(
|
|
78642
|
+
return new Promise(function(resolve13, reject) {
|
|
78643
78643
|
commandExists(commandName, function(error2, output) {
|
|
78644
78644
|
if (output) {
|
|
78645
|
-
|
|
78645
|
+
resolve13(commandName);
|
|
78646
78646
|
} else {
|
|
78647
78647
|
reject(error2);
|
|
78648
78648
|
}
|
|
@@ -79536,7 +79536,7 @@ var require_update_check = __commonJS2({
|
|
|
79536
79536
|
});
|
|
79537
79537
|
await writeFile4(file2, content, "utf8");
|
|
79538
79538
|
}, "updateCache");
|
|
79539
|
-
var loadPackage = /* @__PURE__ */ __name((url, authInfo) => new Promise((
|
|
79539
|
+
var loadPackage = /* @__PURE__ */ __name((url, authInfo) => new Promise((resolve13, reject) => {
|
|
79540
79540
|
const options = {
|
|
79541
79541
|
host: url.hostname,
|
|
79542
79542
|
path: url.pathname,
|
|
@@ -79567,7 +79567,7 @@ var require_update_check = __commonJS2({
|
|
|
79567
79567
|
response.on("end", () => {
|
|
79568
79568
|
try {
|
|
79569
79569
|
const parsedData = JSON.parse(rawData);
|
|
79570
|
-
|
|
79570
|
+
resolve13(parsedData);
|
|
79571
79571
|
} catch (e2) {
|
|
79572
79572
|
reject(e2);
|
|
79573
79573
|
}
|
|
@@ -83760,6 +83760,7 @@ var getCloudflareApiBaseUrlFromEnv = getEnvironmentVariableFactory({
|
|
|
83760
83760
|
variableName: "CLOUDFLARE_API_BASE_URL",
|
|
83761
83761
|
deprecatedName: "CF_API_BASE_URL"
|
|
83762
83762
|
});
|
|
83763
|
+
var getCloudflareApiBaseUrl = /* @__PURE__ */ __name((complianceConfig) => getCloudflareApiBaseUrlFromEnv() ?? `https://api${getComplianceRegionSubdomain(complianceConfig)}${getStagingSubdomain()}.cloudflare.com/client/v4`, "getCloudflareApiBaseUrl");
|
|
83763
83764
|
function getComplianceRegionSubdomain(complianceConfig) {
|
|
83764
83765
|
return getCloudflareComplianceRegion(complianceConfig) === "fedramp_high" ? ".fed" : "";
|
|
83765
83766
|
}
|
|
@@ -89843,7 +89844,7 @@ function startTunnel(options) {
|
|
|
89843
89844
|
return;
|
|
89844
89845
|
}
|
|
89845
89846
|
logger?.log(
|
|
89846
|
-
`${publicURL ? `
|
|
89847
|
+
`${publicURL ? `Tunnel still open, expires in ${formatTunnelDuration(remainingMs)}: ${publicURL}` : `The tunnel is still open. It expires in ${formatTunnelDuration(remainingMs)}.`}${options.extendHint ? ` ${options.extendHint}` : ""}`
|
|
89847
89848
|
);
|
|
89848
89849
|
}, reminderIntervalMs);
|
|
89849
89850
|
reminderInterval.unref?.();
|
|
@@ -89930,7 +89931,7 @@ function terminateCloudflared(cloudflared) {
|
|
|
89930
89931
|
}
|
|
89931
89932
|
__name(terminateCloudflared, "terminateCloudflared");
|
|
89932
89933
|
function waitForQuickTunnelReady(cloudflared, timeoutMs, options) {
|
|
89933
|
-
return new Promise((
|
|
89934
|
+
return new Promise((resolve13, reject) => {
|
|
89934
89935
|
let resolved = false;
|
|
89935
89936
|
let stderrOutput = "";
|
|
89936
89937
|
const logger = options?.logger;
|
|
@@ -89958,7 +89959,7 @@ function waitForQuickTunnelReady(cloudflared, timeoutMs, options) {
|
|
|
89958
89959
|
if (match && !resolved) {
|
|
89959
89960
|
resolved = true;
|
|
89960
89961
|
clearTimeout(timeoutId);
|
|
89961
|
-
|
|
89962
|
+
resolve13({ mode: "quick", publicUrl: new URL(match[0]) });
|
|
89962
89963
|
}
|
|
89963
89964
|
});
|
|
89964
89965
|
}
|
|
@@ -89994,7 +89995,7 @@ function createTunnelStartupError(message, stderrOutput, origin) {
|
|
|
89994
89995
|
cloudflared output:
|
|
89995
89996
|
${stderrOutput || "(no output)"}
|
|
89996
89997
|
|
|
89997
|
-
The local dev server started at ${origin.href}
|
|
89998
|
+
The local dev server started at ${origin.href}
|
|
89998
89999
|
` + (isQuickTunnelRateLimited ? "Cloudflare Quick Tunnel creation was rate limited. Try again in a few minutes, or use a named tunnel if you need more reliable access." : `Check the cloudflared output above for more details, and verify that ${origin.href} is reachable from this machine if this keeps happening.`);
|
|
89999
90000
|
if (isQuickTunnelRateLimited) {
|
|
90000
90001
|
return new UserError(errorMessage, { telemetryMessage: false });
|
|
@@ -90002,6 +90003,344 @@ The local dev server started at ${origin.href}.
|
|
|
90002
90003
|
return new Error(errorMessage);
|
|
90003
90004
|
}
|
|
90004
90005
|
__name(createTunnelStartupError, "createTunnelStartupError");
|
|
90006
|
+
function buildDetailedError(message, ...extra) {
|
|
90007
|
+
return new ParseError({
|
|
90008
|
+
text: message,
|
|
90009
|
+
notes: extra.map((text) => ({ text })),
|
|
90010
|
+
telemetryMessage: false
|
|
90011
|
+
});
|
|
90012
|
+
}
|
|
90013
|
+
__name(buildDetailedError, "buildDetailedError");
|
|
90014
|
+
function maybeThrowFriendlyError(error2) {
|
|
90015
|
+
if (error2.message === "workers.api.error.email_verification_required") {
|
|
90016
|
+
throw buildDetailedError(
|
|
90017
|
+
"Please verify your account's email address and try again.",
|
|
90018
|
+
"Check your email for a verification link, or login to https://dash.cloudflare.com and request a new one."
|
|
90019
|
+
);
|
|
90020
|
+
}
|
|
90021
|
+
}
|
|
90022
|
+
__name(maybeThrowFriendlyError, "maybeThrowFriendlyError");
|
|
90023
|
+
function logHeaders(headers, logger) {
|
|
90024
|
+
const clone = cloneHeaders(headers);
|
|
90025
|
+
clone.delete("Authorization");
|
|
90026
|
+
logger.debugWithSanitization(
|
|
90027
|
+
"HEADERS:",
|
|
90028
|
+
JSON.stringify(Object.fromEntries(clone), null, 2)
|
|
90029
|
+
);
|
|
90030
|
+
}
|
|
90031
|
+
__name(logHeaders, "logHeaders");
|
|
90032
|
+
async function performApiFetchBase(complianceConfig, resource, init = {}, userAgent, logger, queryParams, abortSignal, credentials) {
|
|
90033
|
+
(0, import_node_assert2.default)(credentials, "credentials are required for performApiFetch");
|
|
90034
|
+
const method = init.method ?? "GET";
|
|
90035
|
+
(0, import_node_assert2.default)(
|
|
90036
|
+
resource.startsWith("/"),
|
|
90037
|
+
`CF API fetch - resource path must start with a "/" but got "${resource}"`
|
|
90038
|
+
);
|
|
90039
|
+
const headers = cloneHeaders(new import_undici.Headers(init.headers));
|
|
90040
|
+
addAuthorizationHeader(headers, credentials);
|
|
90041
|
+
headers.set("User-Agent", userAgent);
|
|
90042
|
+
maybeAddTraceHeader(headers);
|
|
90043
|
+
const queryString = queryParams ? `?${queryParams.toString()}` : "";
|
|
90044
|
+
logger.debug(
|
|
90045
|
+
`-- START CF API REQUEST: ${method} ${getCloudflareApiBaseUrl(complianceConfig)}${resource}`
|
|
90046
|
+
);
|
|
90047
|
+
logger.debugWithSanitization("QUERY STRING:", queryString);
|
|
90048
|
+
logHeaders(headers, logger);
|
|
90049
|
+
logger.debugWithSanitization("INIT:", JSON.stringify({ ...init }, null, 2));
|
|
90050
|
+
if (init.body instanceof import_undici.FormData) {
|
|
90051
|
+
logger.debugWithSanitization(
|
|
90052
|
+
"BODY:",
|
|
90053
|
+
await new import_undici.Response(init.body).text(),
|
|
90054
|
+
null,
|
|
90055
|
+
2
|
|
90056
|
+
);
|
|
90057
|
+
}
|
|
90058
|
+
logger.debug("-- END CF API REQUEST");
|
|
90059
|
+
return await (0, import_undici.fetch)(
|
|
90060
|
+
`${getCloudflareApiBaseUrl(complianceConfig)}${resource}${queryString}`,
|
|
90061
|
+
{
|
|
90062
|
+
method,
|
|
90063
|
+
...init,
|
|
90064
|
+
headers,
|
|
90065
|
+
signal: abortSignal
|
|
90066
|
+
}
|
|
90067
|
+
);
|
|
90068
|
+
}
|
|
90069
|
+
__name(performApiFetchBase, "performApiFetchBase");
|
|
90070
|
+
async function fetchInternalBase(complianceConfig, resource, init = {}, userAgent, logger, queryParams, abortSignal, credentials) {
|
|
90071
|
+
const method = init.method ?? "GET";
|
|
90072
|
+
const response = await performApiFetchBase(
|
|
90073
|
+
complianceConfig,
|
|
90074
|
+
resource,
|
|
90075
|
+
init,
|
|
90076
|
+
userAgent,
|
|
90077
|
+
logger,
|
|
90078
|
+
queryParams,
|
|
90079
|
+
abortSignal,
|
|
90080
|
+
credentials
|
|
90081
|
+
);
|
|
90082
|
+
const jsonText = await response.text();
|
|
90083
|
+
logger.debug(
|
|
90084
|
+
"-- START CF API RESPONSE:",
|
|
90085
|
+
response.statusText,
|
|
90086
|
+
response.status
|
|
90087
|
+
);
|
|
90088
|
+
logHeaders(response.headers, logger);
|
|
90089
|
+
logger.debugWithSanitization("RESPONSE:", jsonText);
|
|
90090
|
+
logger.debug("-- END CF API RESPONSE");
|
|
90091
|
+
if (!jsonText && (response.status === 204 || response.status === 205)) {
|
|
90092
|
+
return {
|
|
90093
|
+
response: {
|
|
90094
|
+
result: {},
|
|
90095
|
+
success: true,
|
|
90096
|
+
errors: [],
|
|
90097
|
+
messages: []
|
|
90098
|
+
},
|
|
90099
|
+
status: response.status
|
|
90100
|
+
};
|
|
90101
|
+
}
|
|
90102
|
+
if (isWAFBlockResponse(response.headers)) {
|
|
90103
|
+
throwWAFBlockError(
|
|
90104
|
+
response.headers,
|
|
90105
|
+
method,
|
|
90106
|
+
resource,
|
|
90107
|
+
response.status,
|
|
90108
|
+
response.statusText
|
|
90109
|
+
);
|
|
90110
|
+
}
|
|
90111
|
+
try {
|
|
90112
|
+
const json = parseJSON(jsonText);
|
|
90113
|
+
return { response: json, status: response.status };
|
|
90114
|
+
} catch {
|
|
90115
|
+
const rayId = extractWAFBlockRayId(response.headers);
|
|
90116
|
+
throw new APIError({
|
|
90117
|
+
text: "Received a malformed response from the API",
|
|
90118
|
+
notes: [
|
|
90119
|
+
{
|
|
90120
|
+
text: truncate(jsonText, 100)
|
|
90121
|
+
},
|
|
90122
|
+
{
|
|
90123
|
+
text: `${method} ${resource} -> ${response.status} ${response.statusText}`
|
|
90124
|
+
},
|
|
90125
|
+
...rayId ? [{ text: `Cloudflare Ray ID: ${rayId}` }] : []
|
|
90126
|
+
],
|
|
90127
|
+
status: response.status,
|
|
90128
|
+
telemetryMessage: false
|
|
90129
|
+
});
|
|
90130
|
+
}
|
|
90131
|
+
}
|
|
90132
|
+
__name(fetchInternalBase, "fetchInternalBase");
|
|
90133
|
+
async function fetchResultBase(complianceConfig, resource, init = {}, userAgent, logger, queryParams, abortSignal, credentials) {
|
|
90134
|
+
const { response: json, status: status2 } = await fetchInternalBase(
|
|
90135
|
+
complianceConfig,
|
|
90136
|
+
resource,
|
|
90137
|
+
init,
|
|
90138
|
+
userAgent,
|
|
90139
|
+
logger,
|
|
90140
|
+
queryParams,
|
|
90141
|
+
abortSignal,
|
|
90142
|
+
credentials
|
|
90143
|
+
);
|
|
90144
|
+
if (json.success) {
|
|
90145
|
+
return json.result;
|
|
90146
|
+
} else {
|
|
90147
|
+
throwFetchError(resource, json, status2);
|
|
90148
|
+
}
|
|
90149
|
+
}
|
|
90150
|
+
__name(fetchResultBase, "fetchResultBase");
|
|
90151
|
+
async function fetchListResultBase(complianceConfig, resource, init = {}, userAgent, logger, queryParams, credentials) {
|
|
90152
|
+
const results = [];
|
|
90153
|
+
let getMoreResults = true;
|
|
90154
|
+
let cursor;
|
|
90155
|
+
while (getMoreResults) {
|
|
90156
|
+
if (cursor) {
|
|
90157
|
+
queryParams = new import_node_url.URLSearchParams(queryParams);
|
|
90158
|
+
queryParams.set("cursor", cursor);
|
|
90159
|
+
}
|
|
90160
|
+
const { response: json, status: status2 } = await fetchInternalBase(
|
|
90161
|
+
complianceConfig,
|
|
90162
|
+
resource,
|
|
90163
|
+
init,
|
|
90164
|
+
userAgent,
|
|
90165
|
+
logger,
|
|
90166
|
+
queryParams,
|
|
90167
|
+
void 0,
|
|
90168
|
+
credentials
|
|
90169
|
+
);
|
|
90170
|
+
if (json.success) {
|
|
90171
|
+
results.push(...json.result);
|
|
90172
|
+
if (hasCursor(json.result_info)) {
|
|
90173
|
+
cursor = json.result_info?.cursor;
|
|
90174
|
+
} else {
|
|
90175
|
+
getMoreResults = false;
|
|
90176
|
+
}
|
|
90177
|
+
} else {
|
|
90178
|
+
throwFetchError(resource, json, status2);
|
|
90179
|
+
}
|
|
90180
|
+
}
|
|
90181
|
+
return results;
|
|
90182
|
+
}
|
|
90183
|
+
__name(fetchListResultBase, "fetchListResultBase");
|
|
90184
|
+
function truncate(text, maxLength) {
|
|
90185
|
+
const { length } = text;
|
|
90186
|
+
if (length <= maxLength) {
|
|
90187
|
+
return text;
|
|
90188
|
+
}
|
|
90189
|
+
return `${text.substring(0, maxLength)}... (length = ${length})`;
|
|
90190
|
+
}
|
|
90191
|
+
__name(truncate, "truncate");
|
|
90192
|
+
function isWAFBlockResponse(headers) {
|
|
90193
|
+
return headers.get("cf-mitigated") === "challenge";
|
|
90194
|
+
}
|
|
90195
|
+
__name(isWAFBlockResponse, "isWAFBlockResponse");
|
|
90196
|
+
function extractWAFBlockRayId(headers) {
|
|
90197
|
+
return headers.get("cf-ray") ?? void 0;
|
|
90198
|
+
}
|
|
90199
|
+
__name(extractWAFBlockRayId, "extractWAFBlockRayId");
|
|
90200
|
+
function extractAccountTag(resource) {
|
|
90201
|
+
const re = new RegExp("/accounts/([a-zA-Z0-9]+)/?");
|
|
90202
|
+
const matches = re.exec(resource);
|
|
90203
|
+
return matches?.[1];
|
|
90204
|
+
}
|
|
90205
|
+
__name(extractAccountTag, "extractAccountTag");
|
|
90206
|
+
function hasMorePages(result_info) {
|
|
90207
|
+
const page = result_info?.page;
|
|
90208
|
+
const per_page = result_info?.per_page;
|
|
90209
|
+
const total = result_info?.total_count;
|
|
90210
|
+
return page !== void 0 && per_page !== void 0 && total !== void 0 && page * per_page < total;
|
|
90211
|
+
}
|
|
90212
|
+
__name(hasMorePages, "hasMorePages");
|
|
90213
|
+
function renderError(err, level = 0) {
|
|
90214
|
+
const indent2 = " ".repeat(level);
|
|
90215
|
+
const message = err.message ?? "";
|
|
90216
|
+
const chainedMessages = "error_chain" in err ? err.error_chain?.map(
|
|
90217
|
+
(chainedError) => `
|
|
90218
|
+
|
|
90219
|
+
${indent2}- ${renderError(chainedError, level + 1)}`
|
|
90220
|
+
).join("\n") ?? "" : "";
|
|
90221
|
+
return (err.code ? `${message} [code: ${err.code}]` : message) + (err.documentation_url ? `
|
|
90222
|
+
${indent2}To learn more about this error, visit: ${err.documentation_url}` : "") + chainedMessages;
|
|
90223
|
+
}
|
|
90224
|
+
__name(renderError, "renderError");
|
|
90225
|
+
function addAuthorizationHeader(headers, auth, overrideExisting = false) {
|
|
90226
|
+
if (!headers.has("Authorization") || overrideExisting) {
|
|
90227
|
+
if ("apiToken" in auth) {
|
|
90228
|
+
const authorizationHeader = `Bearer ${auth.apiToken}`;
|
|
90229
|
+
validateAuthorizationHeaderValue(authorizationHeader);
|
|
90230
|
+
headers.set("Authorization", authorizationHeader);
|
|
90231
|
+
} else {
|
|
90232
|
+
headers.set("X-Auth-Key", auth.authKey);
|
|
90233
|
+
headers.set("X-Auth-Email", auth.authEmail);
|
|
90234
|
+
}
|
|
90235
|
+
}
|
|
90236
|
+
}
|
|
90237
|
+
__name(addAuthorizationHeader, "addAuthorizationHeader");
|
|
90238
|
+
function validateAuthorizationHeaderValue(value) {
|
|
90239
|
+
for (const character of value) {
|
|
90240
|
+
const codePoint = character.codePointAt(0);
|
|
90241
|
+
if (codePoint === void 0 || codePoint > 255) {
|
|
90242
|
+
throw new UserError(
|
|
90243
|
+
`The configured Cloudflare API token contains a character that cannot be used in an HTTP Authorization header: ${formatAuthorizationHeaderCharacter(character, codePoint)}. Recreate or copy the token again, making sure it does not include characters such as ellipses.`,
|
|
90244
|
+
{
|
|
90245
|
+
telemetryMessage: "cfetch auth invalid authorization header"
|
|
90246
|
+
}
|
|
90247
|
+
);
|
|
90248
|
+
}
|
|
90249
|
+
}
|
|
90250
|
+
}
|
|
90251
|
+
__name(validateAuthorizationHeaderValue, "validateAuthorizationHeaderValue");
|
|
90252
|
+
function formatAuthorizationHeaderCharacter(character, codePoint) {
|
|
90253
|
+
if (codePoint === void 0) {
|
|
90254
|
+
return '"\\u{unknown}"';
|
|
90255
|
+
}
|
|
90256
|
+
const codePointLabel = `U+${codePoint.toString(16).toUpperCase().padStart(4, "0")}`;
|
|
90257
|
+
const characterLabel = isPrintableCharacter(character) ? `"${character}"` : `"${escapeCharacter(character)}"`;
|
|
90258
|
+
return `${characterLabel} (${codePointLabel})`;
|
|
90259
|
+
}
|
|
90260
|
+
__name(formatAuthorizationHeaderCharacter, "formatAuthorizationHeaderCharacter");
|
|
90261
|
+
function isPrintableCharacter(character) {
|
|
90262
|
+
return !/[\p{Cc}\p{Cf}\p{Zl}\p{Zp}]/u.test(character);
|
|
90263
|
+
}
|
|
90264
|
+
__name(isPrintableCharacter, "isPrintableCharacter");
|
|
90265
|
+
function escapeCharacter(character) {
|
|
90266
|
+
return Array.from(character).map((c2) => {
|
|
90267
|
+
const codePoint = c2.codePointAt(0);
|
|
90268
|
+
if (codePoint === void 0) {
|
|
90269
|
+
return "";
|
|
90270
|
+
}
|
|
90271
|
+
return codePoint <= 65535 ? `\\u${codePoint.toString(16).toUpperCase().padStart(4, "0")}` : `\\u{${codePoint.toString(16).toUpperCase()}}`;
|
|
90272
|
+
}).join("");
|
|
90273
|
+
}
|
|
90274
|
+
__name(escapeCharacter, "escapeCharacter");
|
|
90275
|
+
function throwFetchError(resource, response, status2) {
|
|
90276
|
+
const errors = response.errors ?? [];
|
|
90277
|
+
for (const error22 of errors) {
|
|
90278
|
+
maybeThrowFriendlyError(error22);
|
|
90279
|
+
}
|
|
90280
|
+
const notes = [
|
|
90281
|
+
...errors.map((err) => ({ text: renderError(err) })),
|
|
90282
|
+
...response.messages?.map((msg) => ({
|
|
90283
|
+
text: typeof msg === "string" ? msg : msg.message ?? String(msg)
|
|
90284
|
+
})) ?? []
|
|
90285
|
+
];
|
|
90286
|
+
if (notes.length === 0) {
|
|
90287
|
+
const raw = response;
|
|
90288
|
+
const fallbackMessage = typeof raw.error === "string" ? `${raw.error}${raw.code ? ` [code: ${raw.code}]` : ""}` : void 0;
|
|
90289
|
+
if (fallbackMessage) {
|
|
90290
|
+
notes.push({ text: fallbackMessage });
|
|
90291
|
+
}
|
|
90292
|
+
}
|
|
90293
|
+
const error2 = new APIError({
|
|
90294
|
+
text: `A request to the Cloudflare API (${resource}) failed.`,
|
|
90295
|
+
notes,
|
|
90296
|
+
status: status2,
|
|
90297
|
+
telemetryMessage: false
|
|
90298
|
+
});
|
|
90299
|
+
const code = errors[0]?.code;
|
|
90300
|
+
if (code) {
|
|
90301
|
+
error2.code = code;
|
|
90302
|
+
}
|
|
90303
|
+
error2.accountTag = extractAccountTag(resource);
|
|
90304
|
+
throw error2;
|
|
90305
|
+
}
|
|
90306
|
+
__name(throwFetchError, "throwFetchError");
|
|
90307
|
+
function throwWAFBlockError(headers, method, resource, status2, statusText) {
|
|
90308
|
+
const rayId = extractWAFBlockRayId(headers);
|
|
90309
|
+
throw new APIError({
|
|
90310
|
+
text: "The Cloudflare API responded with a WAF block page instead of the expected JSON response",
|
|
90311
|
+
notes: [
|
|
90312
|
+
{
|
|
90313
|
+
text: "Cloudflare's firewall (WAF) blocked this API request. This is usually a false positive."
|
|
90314
|
+
},
|
|
90315
|
+
...rayId ? [{ text: `Cloudflare Ray ID: ${rayId}` }] : [],
|
|
90316
|
+
{
|
|
90317
|
+
text: rayId ? "If the issue persists, please open a Cloudflare Support ticket and include the Ray ID above." : "If the issue persists, please open a Cloudflare Support ticket. You can find the Cloudflare Ray ID on the block page in your browser."
|
|
90318
|
+
},
|
|
90319
|
+
{
|
|
90320
|
+
text: `${method} ${resource} -> ${status2} ${statusText}`
|
|
90321
|
+
}
|
|
90322
|
+
],
|
|
90323
|
+
status: status2,
|
|
90324
|
+
telemetryMessage: false
|
|
90325
|
+
});
|
|
90326
|
+
}
|
|
90327
|
+
__name(throwWAFBlockError, "throwWAFBlockError");
|
|
90328
|
+
function hasCursor(result_info) {
|
|
90329
|
+
const cursor = result_info?.cursor;
|
|
90330
|
+
return cursor !== void 0 && cursor !== null && cursor !== "";
|
|
90331
|
+
}
|
|
90332
|
+
__name(hasCursor, "hasCursor");
|
|
90333
|
+
function maybeAddTraceHeader(headers) {
|
|
90334
|
+
const traceHeader = getTraceHeader();
|
|
90335
|
+
if (traceHeader) {
|
|
90336
|
+
headers.set("Cf-Trace-Id", traceHeader);
|
|
90337
|
+
}
|
|
90338
|
+
}
|
|
90339
|
+
__name(maybeAddTraceHeader, "maybeAddTraceHeader");
|
|
90340
|
+
function cloneHeaders(headers) {
|
|
90341
|
+
return new import_undici.Headers(headers);
|
|
90342
|
+
}
|
|
90343
|
+
__name(cloneHeaders, "cloneHeaders");
|
|
90005
90344
|
var import_update_check = __toESM2(require_update_check());
|
|
90006
90345
|
var UPDATE_CHECK_TIMEOUT_MS = 3e3;
|
|
90007
90346
|
var TIMED_OUT = /* @__PURE__ */ Symbol("timed_out");
|
|
@@ -95953,12 +96292,12 @@ var YargsInstance = class {
|
|
|
95953
96292
|
async getCompletion(args, done) {
|
|
95954
96293
|
argsert("<array> [function]", [args, done], arguments.length);
|
|
95955
96294
|
if (!done) {
|
|
95956
|
-
return new Promise((
|
|
96295
|
+
return new Promise((resolve13, reject) => {
|
|
95957
96296
|
__classPrivateFieldGet(this, _YargsInstance_completion, "f").getCompletion(args, (err, completions) => {
|
|
95958
96297
|
if (err)
|
|
95959
96298
|
reject(err);
|
|
95960
96299
|
else
|
|
95961
|
-
|
|
96300
|
+
resolve13(completions);
|
|
95962
96301
|
});
|
|
95963
96302
|
});
|
|
95964
96303
|
} else {
|
|
@@ -96998,7 +97337,7 @@ var Yargs = YargsFactory(esm_default2);
|
|
|
96998
97337
|
var yargs_default = Yargs;
|
|
96999
97338
|
|
|
97000
97339
|
// package.json
|
|
97001
|
-
var version = "2.
|
|
97340
|
+
var version = "2.70.0";
|
|
97002
97341
|
|
|
97003
97342
|
// src/metrics.ts
|
|
97004
97343
|
var import_node_async_hooks = require("node:async_hooks");
|
|
@@ -97237,16 +97576,16 @@ async function sendEvent(payload, enableLog) {
|
|
|
97237
97576
|
|
|
97238
97577
|
// src/metrics.ts
|
|
97239
97578
|
function promiseWithResolvers() {
|
|
97240
|
-
let
|
|
97579
|
+
let resolve13;
|
|
97241
97580
|
let reject;
|
|
97242
97581
|
const promise = new Promise((res, rej) => {
|
|
97243
|
-
|
|
97582
|
+
resolve13 = res;
|
|
97244
97583
|
reject = rej;
|
|
97245
97584
|
});
|
|
97246
|
-
if (!
|
|
97585
|
+
if (!resolve13 || !reject) {
|
|
97247
97586
|
throw new Error("Promise resolvers not set");
|
|
97248
97587
|
}
|
|
97249
|
-
return { resolve:
|
|
97588
|
+
return { resolve: resolve13, reject, promise };
|
|
97250
97589
|
}
|
|
97251
97590
|
function getPlatform() {
|
|
97252
97591
|
const platform2 = process.platform;
|
|
@@ -97450,7 +97789,7 @@ var runTelemetryCommand = (action) => {
|
|
|
97450
97789
|
var import_node_fs18 = require("node:fs");
|
|
97451
97790
|
var import_promises6 = require("node:fs/promises");
|
|
97452
97791
|
var import_node_os7 = require("node:os");
|
|
97453
|
-
var
|
|
97792
|
+
var import_node_path19 = require("node:path");
|
|
97454
97793
|
var import_deepmerge = __toESM(require_cjs());
|
|
97455
97794
|
var import_degit = __toESM(require_dist());
|
|
97456
97795
|
|
|
@@ -97592,7 +97931,7 @@ async function getLatestPackageVersion(packageSpecifier) {
|
|
|
97592
97931
|
// ../../node_modules/.pnpm/open@11.0.0/node_modules/open/index.js
|
|
97593
97932
|
var import_node_process13 = __toESM(require("node:process"), 1);
|
|
97594
97933
|
var import_node_path9 = __toESM(require("node:path"), 1);
|
|
97595
|
-
var
|
|
97934
|
+
var import_node_url2 = require("node:url");
|
|
97596
97935
|
var import_node_child_process8 = __toESM(require("node:child_process"), 1);
|
|
97597
97936
|
var import_promises4 = __toESM(require("node:fs/promises"), 1);
|
|
97598
97937
|
|
|
@@ -97923,7 +98262,7 @@ var is_in_ssh_default = isInSsh;
|
|
|
97923
98262
|
// ../../node_modules/.pnpm/open@11.0.0/node_modules/open/index.js
|
|
97924
98263
|
var import_meta2 = {};
|
|
97925
98264
|
var fallbackAttemptSymbol = /* @__PURE__ */ Symbol("fallbackAttempt");
|
|
97926
|
-
var __dirname3 = import_meta2.url ? import_node_path9.default.dirname((0,
|
|
98265
|
+
var __dirname3 = import_meta2.url ? import_node_path9.default.dirname((0, import_node_url2.fileURLToPath)(import_meta2.url)) : "";
|
|
97927
98266
|
var localXdgOpenPath = import_node_path9.default.join(__dirname3, "xdg-open");
|
|
97928
98267
|
var { platform, arch: arch2 } = import_node_process13.default;
|
|
97929
98268
|
var tryEachApp = async (apps2, opener) => {
|
|
@@ -98095,19 +98434,19 @@ var baseOpen = async (options) => {
|
|
|
98095
98434
|
}
|
|
98096
98435
|
const subprocess = import_node_child_process8.default.spawn(command2, cliArguments, childProcessOptions);
|
|
98097
98436
|
if (options.wait) {
|
|
98098
|
-
return new Promise((
|
|
98437
|
+
return new Promise((resolve13, reject) => {
|
|
98099
98438
|
subprocess.once("error", reject);
|
|
98100
98439
|
subprocess.once("close", (exitCode) => {
|
|
98101
98440
|
if (!options.allowNonzeroExitCode && exitCode !== 0) {
|
|
98102
98441
|
reject(new Error(`Exited with code ${exitCode}`));
|
|
98103
98442
|
return;
|
|
98104
98443
|
}
|
|
98105
|
-
|
|
98444
|
+
resolve13(subprocess);
|
|
98106
98445
|
});
|
|
98107
98446
|
});
|
|
98108
98447
|
}
|
|
98109
98448
|
if (isFallbackAttempt) {
|
|
98110
|
-
return new Promise((
|
|
98449
|
+
return new Promise((resolve13, reject) => {
|
|
98111
98450
|
subprocess.once("error", reject);
|
|
98112
98451
|
subprocess.once("spawn", () => {
|
|
98113
98452
|
subprocess.once("close", (exitCode) => {
|
|
@@ -98117,17 +98456,17 @@ var baseOpen = async (options) => {
|
|
|
98117
98456
|
return;
|
|
98118
98457
|
}
|
|
98119
98458
|
subprocess.unref();
|
|
98120
|
-
|
|
98459
|
+
resolve13(subprocess);
|
|
98121
98460
|
});
|
|
98122
98461
|
});
|
|
98123
98462
|
});
|
|
98124
98463
|
}
|
|
98125
98464
|
subprocess.unref();
|
|
98126
|
-
return new Promise((
|
|
98465
|
+
return new Promise((resolve13, reject) => {
|
|
98127
98466
|
subprocess.once("error", reject);
|
|
98128
98467
|
subprocess.once("spawn", () => {
|
|
98129
98468
|
subprocess.off("error", reject);
|
|
98130
|
-
|
|
98469
|
+
resolve13(subprocess);
|
|
98131
98470
|
});
|
|
98132
98471
|
});
|
|
98133
98472
|
};
|
|
@@ -99113,6 +99452,13 @@ var readFile = (path6) => {
|
|
|
99113
99452
|
throw new Error(error2);
|
|
99114
99453
|
}
|
|
99115
99454
|
};
|
|
99455
|
+
var removeFile = (path6) => {
|
|
99456
|
+
try {
|
|
99457
|
+
import_node_fs11.default.rmSync(path6, { force: true });
|
|
99458
|
+
} catch (error2) {
|
|
99459
|
+
throw new Error(`Remove file failed: ${path6}`, { cause: error2 });
|
|
99460
|
+
}
|
|
99461
|
+
};
|
|
99116
99462
|
var readJSON = (path6) => {
|
|
99117
99463
|
const contents = readFile(path6);
|
|
99118
99464
|
return contents ? (0, import_comment_json.parse)(contents) : contents;
|
|
@@ -99209,7 +99555,7 @@ __name2(getPropertyName, "getPropertyName");
|
|
|
99209
99555
|
var package_default = {
|
|
99210
99556
|
name: "frameworks_clis_info",
|
|
99211
99557
|
dependencies: {
|
|
99212
|
-
"@angular/create": "21.2.
|
|
99558
|
+
"@angular/create": "21.2.13",
|
|
99213
99559
|
"@tanstack/cli": "0.68.0",
|
|
99214
99560
|
"create-analog": "2.5.2",
|
|
99215
99561
|
"create-astro": "5.0.6",
|
|
@@ -99217,7 +99563,7 @@ var package_default = {
|
|
|
99217
99563
|
"create-hono": "0.19.4",
|
|
99218
99564
|
"create-next-app": "16.2.6",
|
|
99219
99565
|
"create-qwik": "1.20.0",
|
|
99220
|
-
"create-react-router": "7.
|
|
99566
|
+
"create-react-router": "7.16.0",
|
|
99221
99567
|
"create-rwsdk": "3.1.3",
|
|
99222
99568
|
"create-solid": "0.7.0",
|
|
99223
99569
|
"create-vike": "0.0.627",
|
|
@@ -100530,7 +100876,7 @@ var config26 = {
|
|
|
100530
100876
|
};
|
|
100531
100877
|
var c3_default29 = config26;
|
|
100532
100878
|
function buildConfigure(params) {
|
|
100533
|
-
return async function
|
|
100879
|
+
return async function configure17(ctx) {
|
|
100534
100880
|
const loginSuccess = await params.login(ctx);
|
|
100535
100881
|
if (!loginSuccess) {
|
|
100536
100882
|
throw new Error("Failed to login to Cloudflare");
|
|
@@ -100776,21 +101122,35 @@ var config30 = {
|
|
|
100776
101122
|
var c3_default33 = config30;
|
|
100777
101123
|
|
|
100778
101124
|
// templates/react-router/c3.ts
|
|
101125
|
+
var import_node_path17 = require("node:path");
|
|
100779
101126
|
var { npm: npm12 } = detectPackageManager();
|
|
100780
101127
|
var generate18 = async (ctx) => {
|
|
100781
101128
|
await runFrameworkGenerator(ctx, [
|
|
100782
101129
|
ctx.project.name,
|
|
100783
|
-
...ctx.args.experimental ? [] : [
|
|
100784
|
-
"--template",
|
|
100785
|
-
// React-router deleted the template here
|
|
100786
|
-
"https://github.com/remix-run/react-router-templates/tree/29ac272b9532fe26463a2d2693fc73ff3c1e884b/cloudflare"
|
|
100787
|
-
],
|
|
100788
101130
|
// to prevent asking about git twice, just let c3 do it
|
|
100789
101131
|
"--no-git-init",
|
|
100790
101132
|
"--no-install"
|
|
100791
101133
|
]);
|
|
100792
101134
|
logRaw("");
|
|
100793
101135
|
};
|
|
101136
|
+
var configure10 = async (ctx) => {
|
|
101137
|
+
await installPackages2(["@cloudflare/vite-plugin"], {
|
|
101138
|
+
dev: true,
|
|
101139
|
+
startText: "Installing the Cloudflare Vite plugin",
|
|
101140
|
+
doneText: `${brandColor("installed")} ${dim("@cloudflare/vite-plugin")}`
|
|
101141
|
+
});
|
|
101142
|
+
const s = spinner();
|
|
101143
|
+
s.start("Removing non-Cloudflare artifacts from template");
|
|
101144
|
+
removeFile((0, import_node_path17.resolve)(ctx.project.path, "Dockerfile"));
|
|
101145
|
+
removeFile((0, import_node_path17.resolve)(ctx.project.path, ".dockerignore"));
|
|
101146
|
+
const pkgJsonPath = (0, import_node_path17.resolve)(ctx.project.path, "package.json");
|
|
101147
|
+
const pkgJson = readJSON(pkgJsonPath);
|
|
101148
|
+
delete pkgJson.dependencies?.["@react-router/node"];
|
|
101149
|
+
delete pkgJson.dependencies?.["@react-router/serve"];
|
|
101150
|
+
delete pkgJson.scripts?.start;
|
|
101151
|
+
writeJSON(pkgJsonPath, pkgJson);
|
|
101152
|
+
s.stop(`${brandColor("removed")} ${dim("Node-server template artifacts")}`);
|
|
101153
|
+
};
|
|
100794
101154
|
var config31 = {
|
|
100795
101155
|
configVersion: 1,
|
|
100796
101156
|
id: "react-router",
|
|
@@ -100801,6 +101161,7 @@ var config31 = {
|
|
|
100801
101161
|
path: "./ts"
|
|
100802
101162
|
},
|
|
100803
101163
|
generate: generate18,
|
|
101164
|
+
configure: configure10,
|
|
100804
101165
|
transformPackageJson: async () => ({
|
|
100805
101166
|
dependencies: {
|
|
100806
101167
|
"react-router": "^7.10.0"
|
|
@@ -100811,7 +101172,9 @@ var config31 = {
|
|
|
100811
101172
|
scripts: {
|
|
100812
101173
|
deploy: `${npm12} run build && wrangler deploy`,
|
|
100813
101174
|
preview: `${npm12} run build && vite preview`,
|
|
100814
|
-
"cf-typegen": `wrangler types
|
|
101175
|
+
"cf-typegen": `wrangler types`,
|
|
101176
|
+
typecheck: `wrangler types && react-router typegen && tsc -b`,
|
|
101177
|
+
postinstall: `wrangler types`
|
|
100815
101178
|
}
|
|
100816
101179
|
}),
|
|
100817
101180
|
devScript: "dev",
|
|
@@ -100909,7 +101272,7 @@ var generate20 = async (ctx) => {
|
|
|
100909
101272
|
]);
|
|
100910
101273
|
logRaw("");
|
|
100911
101274
|
};
|
|
100912
|
-
var
|
|
101275
|
+
var configure11 = async (ctx) => {
|
|
100913
101276
|
await installPackages2(["@cloudflare/vite-plugin"], {
|
|
100914
101277
|
dev: true,
|
|
100915
101278
|
startText: "Installing the Cloudflare Vite plugin",
|
|
@@ -101028,7 +101391,7 @@ var config33 = {
|
|
|
101028
101391
|
}
|
|
101029
101392
|
},
|
|
101030
101393
|
generate: generate20,
|
|
101031
|
-
configure:
|
|
101394
|
+
configure: configure11,
|
|
101032
101395
|
transformPackageJson: async (_2, ctx) => ({
|
|
101033
101396
|
scripts: {
|
|
101034
101397
|
deploy: `${npm14} run build && wrangler deploy`,
|
|
@@ -101102,7 +101465,7 @@ var generate22 = async (ctx) => {
|
|
|
101102
101465
|
await runFrameworkGenerator(ctx, ["-p", ctx.project.name, "-s"]);
|
|
101103
101466
|
logRaw("");
|
|
101104
101467
|
};
|
|
101105
|
-
var
|
|
101468
|
+
var configure12 = async (ctx) => {
|
|
101106
101469
|
usesTypescript(ctx);
|
|
101107
101470
|
const filePath = `vite.config.${usesTypescript(ctx) ? "ts" : "js"}`;
|
|
101108
101471
|
updateStatus(`Updating configuration in ${blue(filePath)}`);
|
|
@@ -101140,7 +101503,7 @@ var config37 = {
|
|
|
101140
101503
|
},
|
|
101141
101504
|
path: "templates/solid",
|
|
101142
101505
|
generate: generate22,
|
|
101143
|
-
configure:
|
|
101506
|
+
configure: configure12,
|
|
101144
101507
|
transformPackageJson: async () => ({
|
|
101145
101508
|
scripts: {
|
|
101146
101509
|
preview: `${npm16} run build && npx wrangler dev`,
|
|
@@ -101162,7 +101525,7 @@ var generate23 = async (ctx) => {
|
|
|
101162
101525
|
await runFrameworkGenerator(ctx, ["create", ctx.project.name]);
|
|
101163
101526
|
logRaw("");
|
|
101164
101527
|
};
|
|
101165
|
-
var
|
|
101528
|
+
var configure13 = async (ctx) => {
|
|
101166
101529
|
const pkg = `@sveltejs/adapter-cloudflare`;
|
|
101167
101530
|
await installPackages2([pkg], {
|
|
101168
101531
|
dev: true,
|
|
@@ -101257,7 +101620,7 @@ var config38 = {
|
|
|
101257
101620
|
},
|
|
101258
101621
|
path: "templates/svelte/pages",
|
|
101259
101622
|
generate: generate23,
|
|
101260
|
-
configure:
|
|
101623
|
+
configure: configure13,
|
|
101261
101624
|
transformPackageJson: async (original, ctx) => {
|
|
101262
101625
|
let scripts = {
|
|
101263
101626
|
preview: `${npm17} run build && wrangler pages dev`,
|
|
@@ -101285,7 +101648,7 @@ var generate24 = async (ctx) => {
|
|
|
101285
101648
|
await runFrameworkGenerator(ctx, ["create", ctx.project.name]);
|
|
101286
101649
|
logRaw("");
|
|
101287
101650
|
};
|
|
101288
|
-
var
|
|
101651
|
+
var configure14 = async (ctx) => {
|
|
101289
101652
|
const pkg = `@sveltejs/adapter-cloudflare`;
|
|
101290
101653
|
await installPackages2([pkg], {
|
|
101291
101654
|
dev: true,
|
|
@@ -101356,7 +101719,7 @@ var config39 = {
|
|
|
101356
101719
|
},
|
|
101357
101720
|
path: "templates/svelte/workers",
|
|
101358
101721
|
generate: generate24,
|
|
101359
|
-
configure:
|
|
101722
|
+
configure: configure14,
|
|
101360
101723
|
transformPackageJson: async (original, ctx) => {
|
|
101361
101724
|
let scripts = {
|
|
101362
101725
|
preview: `${npm18} run build && wrangler dev`,
|
|
@@ -101520,7 +101883,7 @@ var generate29 = async (ctx) => {
|
|
|
101520
101883
|
]);
|
|
101521
101884
|
logRaw("");
|
|
101522
101885
|
};
|
|
101523
|
-
var
|
|
101886
|
+
var configure15 = async (ctx) => {
|
|
101524
101887
|
await installPackages2(["@cloudflare/vite-plugin"], {
|
|
101525
101888
|
dev: true,
|
|
101526
101889
|
startText: "Installing the Cloudflare Vite plugin",
|
|
@@ -101561,7 +101924,7 @@ var config45 = {
|
|
|
101561
101924
|
}
|
|
101562
101925
|
}
|
|
101563
101926
|
},
|
|
101564
|
-
configure:
|
|
101927
|
+
configure: configure15,
|
|
101565
101928
|
generate: generate29,
|
|
101566
101929
|
transformPackageJson: async (_2, ctx) => ({
|
|
101567
101930
|
scripts: {
|
|
@@ -101686,7 +102049,7 @@ If the application uses Durable Objects or Workflows, refer to the relevant best
|
|
|
101686
102049
|
var import_node_assert6 = __toESM(require("node:assert"));
|
|
101687
102050
|
|
|
101688
102051
|
// ../wrangler/package.json
|
|
101689
|
-
var version2 = "4.
|
|
102052
|
+
var version2 = "4.97.0";
|
|
101690
102053
|
|
|
101691
102054
|
// src/git.ts
|
|
101692
102055
|
var offerGit = async (ctx) => {
|
|
@@ -101875,7 +102238,7 @@ async function getProductionBranch(cwd) {
|
|
|
101875
102238
|
|
|
101876
102239
|
// src/validators.ts
|
|
101877
102240
|
var import_node_fs17 = require("node:fs");
|
|
101878
|
-
var
|
|
102241
|
+
var import_node_path18 = require("node:path");
|
|
101879
102242
|
var TEMPLATE_REGEX = /^(?:(?:https:\/\/)?(?<httpsUrl>[^:/]+\.[^:/]+)\/|git@(?<gitUrl>[^:/]+)[:/]|(?<shorthandUrl>[^/]+):)?(?<user>[^/\s]+)\/(?<repository>[^/\s#]+)(?:(?<subdirectoryPath>(?:\/[^/\s#]+)+))?(?:\/)?(?:#(?<tag>.+))?/;
|
|
101880
102243
|
var validateTemplateUrl = (value) => {
|
|
101881
102244
|
if (!String(value).match(TEMPLATE_REGEX)) {
|
|
@@ -101883,7 +102246,7 @@ var validateTemplateUrl = (value) => {
|
|
|
101883
102246
|
}
|
|
101884
102247
|
};
|
|
101885
102248
|
var validateProjectDirectory = (relativePath, args) => {
|
|
101886
|
-
const path6 = (0,
|
|
102249
|
+
const path6 = (0, import_node_path18.resolve)(relativePath);
|
|
101887
102250
|
const existsAlready = (0, import_node_fs17.existsSync)(path6);
|
|
101888
102251
|
if (existsAlready) {
|
|
101889
102252
|
for (const file2 of (0, import_node_fs17.readdirSync)(path6)) {
|
|
@@ -101893,7 +102256,7 @@ var validateProjectDirectory = (relativePath, args) => {
|
|
|
101893
102256
|
}
|
|
101894
102257
|
}
|
|
101895
102258
|
if (!args.existingScript) {
|
|
101896
|
-
const projectName = (0,
|
|
102259
|
+
const projectName = (0, import_node_path18.basename)(path6);
|
|
101897
102260
|
const invalidChars = /[^a-z0-9-]/;
|
|
101898
102261
|
const invalidStartEnd = /^-|-$/;
|
|
101899
102262
|
if (projectName.match(invalidStartEnd)) {
|
|
@@ -102176,7 +102539,7 @@ var createContext = async (args, prevArgs) => {
|
|
|
102176
102539
|
format: (val) => `./${val}`
|
|
102177
102540
|
});
|
|
102178
102541
|
const categoryOptions = [];
|
|
102179
|
-
if (Object.keys(helloWorldTemplateMap).length) {
|
|
102542
|
+
if (args.platform !== "pages" && Object.keys(helloWorldTemplateMap).length) {
|
|
102180
102543
|
categoryOptions.push({
|
|
102181
102544
|
label: "Hello World example",
|
|
102182
102545
|
value: "hello-world",
|
|
@@ -102190,7 +102553,7 @@ var createContext = async (args, prevArgs) => {
|
|
|
102190
102553
|
description: "Select from the most popular full-stack web frameworks"
|
|
102191
102554
|
});
|
|
102192
102555
|
}
|
|
102193
|
-
if (Object.keys(otherTemplateMap).length) {
|
|
102556
|
+
if (args.platform !== "pages" && Object.keys(otherTemplateMap).length) {
|
|
102194
102557
|
categoryOptions.push({
|
|
102195
102558
|
label: "Application Starter",
|
|
102196
102559
|
value: "demo",
|
|
@@ -102198,6 +102561,9 @@ var createContext = async (args, prevArgs) => {
|
|
|
102198
102561
|
});
|
|
102199
102562
|
}
|
|
102200
102563
|
categoryOptions.push(
|
|
102564
|
+
// TODO: hide "Template from a GitHub repo" when a --platform arg is
|
|
102565
|
+
// provided (whether workers or pages), since remote templates have no
|
|
102566
|
+
// platform validation and would ignore the user's platform choice
|
|
102201
102567
|
{
|
|
102202
102568
|
label: "Template from a GitHub repo",
|
|
102203
102569
|
value: "remote-template",
|
|
@@ -102218,11 +102584,22 @@ var createContext = async (args, prevArgs) => {
|
|
|
102218
102584
|
if (category === BACK_VALUE) {
|
|
102219
102585
|
return goBack("category");
|
|
102220
102586
|
}
|
|
102587
|
+
if (args.platform === "pages" && category !== "web-framework" && category !== "remote-template") {
|
|
102588
|
+
throw new Error(
|
|
102589
|
+
`The "${category}" category is not available for the "pages" platform`
|
|
102590
|
+
);
|
|
102591
|
+
}
|
|
102221
102592
|
let template;
|
|
102222
102593
|
if (category === "web-framework") {
|
|
102223
102594
|
const frameworkOptions = Object.entries(frameworkMap).reduce(
|
|
102224
102595
|
(acc, [key, config49]) => {
|
|
102225
102596
|
if (!config49.hidden || args.framework) {
|
|
102597
|
+
if (args.platform && !args.framework) {
|
|
102598
|
+
const supportsTargetPlatform = "platformVariants" in config49 ? args.platform in config49.platformVariants : config49.platform === args.platform;
|
|
102599
|
+
if (!supportsTargetPlatform) {
|
|
102600
|
+
return acc;
|
|
102601
|
+
}
|
|
102602
|
+
}
|
|
102226
102603
|
acc.push({
|
|
102227
102604
|
label: config49.displayName,
|
|
102228
102605
|
value: key
|
|
@@ -102333,7 +102710,7 @@ var createContext = async (args, prevArgs) => {
|
|
|
102333
102710
|
envInterfaceName: "Env",
|
|
102334
102711
|
...template
|
|
102335
102712
|
};
|
|
102336
|
-
const path6 = (0,
|
|
102713
|
+
const path6 = (0, import_node_path19.resolve)(projectName);
|
|
102337
102714
|
const languageVariants = template.copyFiles && !isVariantInfo(template.copyFiles) && !template.copyFiles.selectVariant ? Object.keys(template.copyFiles.variants) : [];
|
|
102338
102715
|
if (languageVariants.length > 0) {
|
|
102339
102716
|
if (hasTsConfig(path6)) {
|
|
@@ -102359,8 +102736,8 @@ var createContext = async (args, prevArgs) => {
|
|
|
102359
102736
|
}
|
|
102360
102737
|
}
|
|
102361
102738
|
}
|
|
102362
|
-
const name3 = (0,
|
|
102363
|
-
const directory = (0,
|
|
102739
|
+
const name3 = (0, import_node_path19.basename)(path6);
|
|
102740
|
+
const directory = (0, import_node_path19.dirname)(path6);
|
|
102364
102741
|
const originalCWD = process.cwd();
|
|
102365
102742
|
return {
|
|
102366
102743
|
project: { name: name3, path: path6 },
|
|
@@ -102380,7 +102757,7 @@ async function copyTemplateFiles(ctx) {
|
|
|
102380
102757
|
const { copyFiles } = ctx.template;
|
|
102381
102758
|
let srcdir;
|
|
102382
102759
|
if (isVariantInfo(copyFiles)) {
|
|
102383
|
-
srcdir = (0,
|
|
102760
|
+
srcdir = (0, import_node_path19.join)(getTemplatePath(ctx), copyFiles.path);
|
|
102384
102761
|
} else {
|
|
102385
102762
|
const selectVariant = copyFiles.selectVariant ?? defaultSelectVariant;
|
|
102386
102763
|
const variant = await selectVariant(ctx);
|
|
@@ -102390,21 +102767,21 @@ async function copyTemplateFiles(ctx) {
|
|
|
102390
102767
|
`Unknown variant provided: ${JSON.stringify(variant ?? "")}`
|
|
102391
102768
|
);
|
|
102392
102769
|
}
|
|
102393
|
-
srcdir = (0,
|
|
102770
|
+
srcdir = (0, import_node_path19.join)(getTemplatePath(ctx), variantInfo.path);
|
|
102394
102771
|
}
|
|
102395
102772
|
const copyDestDir = getCopyFilesDestinationDir(ctx);
|
|
102396
|
-
const destdir = (0,
|
|
102773
|
+
const destdir = (0, import_node_path19.join)(ctx.project.path, ...copyDestDir ? [copyDestDir] : []);
|
|
102397
102774
|
const s = spinner();
|
|
102398
102775
|
s.start(`Copying template files`);
|
|
102399
102776
|
await (0, import_promises6.cp)(srcdir, destdir, { recursive: true, force: true });
|
|
102400
|
-
const dummyGitIgnorePath = (0,
|
|
102777
|
+
const dummyGitIgnorePath = (0, import_node_path19.join)(destdir, "__dot__gitignore");
|
|
102401
102778
|
if ((0, import_node_fs18.existsSync)(dummyGitIgnorePath)) {
|
|
102402
|
-
await (0, import_promises6.rename)(dummyGitIgnorePath, (0,
|
|
102779
|
+
await (0, import_promises6.rename)(dummyGitIgnorePath, (0, import_node_path19.join)(destdir, ".gitignore"));
|
|
102403
102780
|
}
|
|
102404
102781
|
s.stop(`${brandColor("files")} ${dim("copied to project directory")}`);
|
|
102405
102782
|
}
|
|
102406
102783
|
function writeAgentsMd(projectPath) {
|
|
102407
|
-
const agentsMdPath = (0,
|
|
102784
|
+
const agentsMdPath = (0, import_node_path19.join)(projectPath, "AGENTS.md");
|
|
102408
102785
|
if ((0, import_node_fs18.existsSync)(agentsMdPath)) {
|
|
102409
102786
|
return;
|
|
102410
102787
|
}
|
|
@@ -102434,25 +102811,25 @@ var validateTemplate = (path6, config49) => {
|
|
|
102434
102811
|
return;
|
|
102435
102812
|
}
|
|
102436
102813
|
if (isVariantInfo(config49.copyFiles)) {
|
|
102437
|
-
validateTemplateSrcDirectory((0,
|
|
102814
|
+
validateTemplateSrcDirectory((0, import_node_path19.resolve)(path6, config49.copyFiles.path), config49);
|
|
102438
102815
|
} else {
|
|
102439
102816
|
for (const variant of Object.values(config49.copyFiles.variants)) {
|
|
102440
|
-
validateTemplateSrcDirectory((0,
|
|
102817
|
+
validateTemplateSrcDirectory((0, import_node_path19.resolve)(path6, variant.path), config49);
|
|
102441
102818
|
}
|
|
102442
102819
|
}
|
|
102443
102820
|
};
|
|
102444
102821
|
var validateTemplateSrcDirectory = (path6, config49) => {
|
|
102445
102822
|
if (config49.platform === "workers") {
|
|
102446
|
-
const wranglerTomlPath = (0,
|
|
102447
|
-
const wranglerJsonPath = (0,
|
|
102448
|
-
const wranglerJsoncPath = (0,
|
|
102823
|
+
const wranglerTomlPath = (0, import_node_path19.resolve)(path6, "wrangler.toml");
|
|
102824
|
+
const wranglerJsonPath = (0, import_node_path19.resolve)(path6, "wrangler.json");
|
|
102825
|
+
const wranglerJsoncPath = (0, import_node_path19.resolve)(path6, "wrangler.jsonc");
|
|
102449
102826
|
if (!(0, import_node_fs18.existsSync)(wranglerTomlPath) && !(0, import_node_fs18.existsSync)(wranglerJsonPath) && !(0, import_node_fs18.existsSync)(wranglerJsoncPath)) {
|
|
102450
102827
|
throw new Error(
|
|
102451
102828
|
`create-cloudflare templates must contain a "wrangler.toml" or "wrangler.json(c)" file.`
|
|
102452
102829
|
);
|
|
102453
102830
|
}
|
|
102454
102831
|
}
|
|
102455
|
-
const pkgJsonPath = (0,
|
|
102832
|
+
const pkgJsonPath = (0, import_node_path19.resolve)(path6, "package.json");
|
|
102456
102833
|
if (!(0, import_node_fs18.existsSync)(pkgJsonPath)) {
|
|
102457
102834
|
throw new Error(
|
|
102458
102835
|
`create-cloudflare templates must contain a "package.json" file.`
|
|
@@ -102470,10 +102847,10 @@ var inferTemplateConfig = (path6) => {
|
|
|
102470
102847
|
};
|
|
102471
102848
|
var inferCopyFilesDefinition = (path6) => {
|
|
102472
102849
|
const variants = {};
|
|
102473
|
-
if ((0, import_node_fs18.existsSync)((0,
|
|
102850
|
+
if ((0, import_node_fs18.existsSync)((0, import_node_path19.join)(path6, "js"))) {
|
|
102474
102851
|
variants["js"] = { path: "./js" };
|
|
102475
102852
|
}
|
|
102476
|
-
if ((0, import_node_fs18.existsSync)((0,
|
|
102853
|
+
if ((0, import_node_fs18.existsSync)((0, import_node_path19.join)(path6, "ts"))) {
|
|
102477
102854
|
variants["ts"] = { path: "./ts" };
|
|
102478
102855
|
}
|
|
102479
102856
|
const copyFiles = Object.keys(variants).length !== 0 ? { variants } : { path: "." };
|
|
@@ -102508,7 +102885,7 @@ Use the format "github:<owner>/<repo>/sub/directory[#<branch>]" to clone a speci
|
|
|
102508
102885
|
force: true,
|
|
102509
102886
|
mode: options.mode
|
|
102510
102887
|
});
|
|
102511
|
-
const tmpDir = options.intoFolder ?? await (0, import_promises6.mkdtemp)((0,
|
|
102888
|
+
const tmpDir = options.intoFolder ?? await (0, import_promises6.mkdtemp)((0, import_node_path19.join)((0, import_node_os7.tmpdir)(), "c3-template"));
|
|
102512
102889
|
await emitter.clone(tmpDir);
|
|
102513
102890
|
return tmpDir;
|
|
102514
102891
|
} catch {
|
|
@@ -102517,7 +102894,7 @@ Use the format "github:<owner>/<repo>/sub/directory[#<branch>]" to clone a speci
|
|
|
102517
102894
|
}
|
|
102518
102895
|
}
|
|
102519
102896
|
function updatePythonPackageName(path6, projectName) {
|
|
102520
|
-
const pyProjectFile = (0,
|
|
102897
|
+
const pyProjectFile = (0, import_node_path19.resolve)(path6, "pyproject.toml");
|
|
102521
102898
|
if (!(0, import_node_fs18.existsSync)(pyProjectFile)) {
|
|
102522
102899
|
return;
|
|
102523
102900
|
}
|
|
@@ -102530,7 +102907,7 @@ function updatePythonPackageName(path6, projectName) {
|
|
|
102530
102907
|
}
|
|
102531
102908
|
var updatePackageName = (ctx) => {
|
|
102532
102909
|
const placeholderNames = ["<PACKAGE_NAME>", "<TBD>", "TBD", ""];
|
|
102533
|
-
const pkgJsonPath = (0,
|
|
102910
|
+
const pkgJsonPath = (0, import_node_path19.resolve)(ctx.project.path, "package.json");
|
|
102534
102911
|
const pkgJson = readJSON(pkgJsonPath);
|
|
102535
102912
|
if (!placeholderNames.includes(pkgJson.name)) {
|
|
102536
102913
|
return;
|
|
@@ -102548,7 +102925,7 @@ var updatePackageScripts = async (ctx) => {
|
|
|
102548
102925
|
}
|
|
102549
102926
|
const s = spinner();
|
|
102550
102927
|
s.start("Updating `package.json` scripts");
|
|
102551
|
-
const pkgJsonPath = (0,
|
|
102928
|
+
const pkgJsonPath = (0, import_node_path19.resolve)(ctx.project.path, "package.json");
|
|
102552
102929
|
let pkgJson = readJSON(pkgJsonPath);
|
|
102553
102930
|
const transformed = await ctx.template.transformPackageJson(pkgJson, ctx);
|
|
102554
102931
|
pkgJson = (0, import_deepmerge.default)(pkgJson, transformed);
|
|
@@ -102557,9 +102934,9 @@ var updatePackageScripts = async (ctx) => {
|
|
|
102557
102934
|
};
|
|
102558
102935
|
var getTemplatePath = (ctx) => {
|
|
102559
102936
|
if (ctx.template.path) {
|
|
102560
|
-
return (0,
|
|
102937
|
+
return (0, import_node_path19.resolve)(__dirname, "..", ctx.template.path);
|
|
102561
102938
|
}
|
|
102562
|
-
return (0,
|
|
102939
|
+
return (0, import_node_path19.resolve)(__dirname, "..", "templates", ctx.template.id);
|
|
102563
102940
|
};
|
|
102564
102941
|
var isVariantInfo = (copyFiles) => {
|
|
102565
102942
|
return "path" in copyFiles;
|
|
@@ -102603,8 +102980,17 @@ var cliDefinition = {
|
|
|
102603
102980
|
description: `Specifies the kind of templates that should be created`,
|
|
102604
102981
|
values(args) {
|
|
102605
102982
|
const experimental2 = Boolean(args?.["experimental"]);
|
|
102983
|
+
const platform2 = args?.["platform"];
|
|
102606
102984
|
if (experimental2) {
|
|
102607
102985
|
return [{ name: "web-framework", description: "Framework Starter" }];
|
|
102986
|
+
} else if (platform2 === "pages") {
|
|
102987
|
+
return [
|
|
102988
|
+
{ name: "web-framework", description: "Framework Starter" },
|
|
102989
|
+
{
|
|
102990
|
+
name: "remote-template",
|
|
102991
|
+
description: "Template from a GitHub repo"
|
|
102992
|
+
}
|
|
102993
|
+
];
|
|
102608
102994
|
} else {
|
|
102609
102995
|
return [
|
|
102610
102996
|
{ name: "hello-world", description: "Hello World Starter" },
|
|
@@ -102927,7 +103313,7 @@ var processArgument = async (args, key, promptConfig) => {
|
|
|
102927
103313
|
// src/deploy.ts
|
|
102928
103314
|
var import_promises8 = require("node:fs/promises");
|
|
102929
103315
|
var import_node_os8 = require("node:os");
|
|
102930
|
-
var
|
|
103316
|
+
var import_node_path21 = require("node:path");
|
|
102931
103317
|
|
|
102932
103318
|
// src/helpers/poll.ts
|
|
102933
103319
|
var import_promises7 = require("node:timers/promises");
|
|
@@ -103020,7 +103406,7 @@ function secondsSince(start) {
|
|
|
103020
103406
|
|
|
103021
103407
|
// src/wrangler/config.ts
|
|
103022
103408
|
var import_node_fs19 = require("node:fs");
|
|
103023
|
-
var
|
|
103409
|
+
var import_node_path20 = require("node:path");
|
|
103024
103410
|
|
|
103025
103411
|
// src/helpers/json.ts
|
|
103026
103412
|
var import_comment_json2 = __toESM(require_src3());
|
|
@@ -103132,13 +103518,13 @@ ${generateHintsAsTomlComments(wranglerToml)}
|
|
|
103132
103518
|
}
|
|
103133
103519
|
};
|
|
103134
103520
|
var getWranglerTomlPath = (ctx) => {
|
|
103135
|
-
return (0,
|
|
103521
|
+
return (0, import_node_path20.resolve)(ctx.project.path, "wrangler.toml");
|
|
103136
103522
|
};
|
|
103137
103523
|
var getWranglerJsonPath = (ctx) => {
|
|
103138
|
-
return (0,
|
|
103524
|
+
return (0, import_node_path20.resolve)(ctx.project.path, "wrangler.json");
|
|
103139
103525
|
};
|
|
103140
103526
|
var getWranglerJsoncPath = (ctx) => {
|
|
103141
|
-
return (0,
|
|
103527
|
+
return (0, import_node_path20.resolve)(ctx.project.path, "wrangler.jsonc");
|
|
103142
103528
|
};
|
|
103143
103529
|
var wranglerTomlExists = (ctx) => {
|
|
103144
103530
|
const wranglerTomlPath = getWranglerTomlPath(ctx);
|
|
@@ -103344,8 +103730,8 @@ var runDeploy = async (ctx) => {
|
|
|
103344
103730
|
JSON.stringify(ctx.commitMessage)
|
|
103345
103731
|
] : []
|
|
103346
103732
|
];
|
|
103347
|
-
const outputFile = (0,
|
|
103348
|
-
await (0, import_promises8.mkdtemp)((0,
|
|
103733
|
+
const outputFile = (0, import_node_path21.join)(
|
|
103734
|
+
await (0, import_promises8.mkdtemp)((0, import_node_path21.join)((0, import_node_os8.tmpdir)(), "c3-wrangler-deploy-")),
|
|
103349
103735
|
"output.json"
|
|
103350
103736
|
);
|
|
103351
103737
|
await runCommand(deployCmd, {
|
|
@@ -103407,7 +103793,7 @@ var hasBinding = (node) => {
|
|
|
103407
103793
|
};
|
|
103408
103794
|
|
|
103409
103795
|
// src/dialog.ts
|
|
103410
|
-
var
|
|
103796
|
+
var import_node_path22 = require("node:path");
|
|
103411
103797
|
function createDialog(lines) {
|
|
103412
103798
|
const screenWidth = process.stdout.columns;
|
|
103413
103799
|
const maxLineWidth = Math.max(
|
|
@@ -103447,7 +103833,7 @@ function printWelcomeMessage(version3, telemetryEnabled, args) {
|
|
|
103447
103833
|
}
|
|
103448
103834
|
var printSummary = (ctx) => {
|
|
103449
103835
|
const dashboardUrl = ctx.account ? `https://dash.cloudflare.com/?to=/:account/workers/services/view/${ctx.project.name}/production` : null;
|
|
103450
|
-
const relativePath = (0,
|
|
103836
|
+
const relativePath = (0, import_node_path22.relative)(ctx.originalCWD, ctx.project.path);
|
|
103451
103837
|
const cdCommand = relativePath ? `cd ${relativePath}` : null;
|
|
103452
103838
|
const { npm: npm25 } = detectPackageManager();
|
|
103453
103839
|
const deployCommand = quoteShellArgs([
|
|
@@ -103919,7 +104305,7 @@ var createProject = async (ctx) => {
|
|
|
103919
104305
|
|
|
103920
104306
|
// src/workers.ts
|
|
103921
104307
|
var import_node_fs20 = require("node:fs");
|
|
103922
|
-
var
|
|
104308
|
+
var import_node_path23 = require("node:path");
|
|
103923
104309
|
|
|
103924
104310
|
// ../../node_modules/.pnpm/jsonc-parser@3.2.0/node_modules/jsonc-parser/lib/esm/impl/scanner.js
|
|
103925
104311
|
function createScanner2(text, ignoreTrivia = false) {
|
|
@@ -105249,7 +105635,7 @@ async function addTypes(ctx) {
|
|
|
105249
105635
|
await updateTsConfig(ctx, { usesNodeCompat });
|
|
105250
105636
|
}
|
|
105251
105637
|
async function generateWorkersTypes(ctx, npm25) {
|
|
105252
|
-
const packageJsonPath = (0,
|
|
105638
|
+
const packageJsonPath = (0, import_node_path23.join)(ctx.project.path, "package.json");
|
|
105253
105639
|
if (!(0, import_node_fs20.existsSync)(packageJsonPath)) {
|
|
105254
105640
|
return;
|
|
105255
105641
|
}
|
|
@@ -105289,7 +105675,7 @@ var maybeInstallNodeTypes = async (ctx, npm25) => {
|
|
|
105289
105675
|
return false;
|
|
105290
105676
|
};
|
|
105291
105677
|
async function updateTsConfig(ctx, { usesNodeCompat }) {
|
|
105292
|
-
const tsconfigPath = (0,
|
|
105678
|
+
const tsconfigPath = (0, import_node_path23.join)(ctx.project.path, "tsconfig.json");
|
|
105293
105679
|
if (!(0, import_node_fs20.existsSync)(tsconfigPath)) {
|
|
105294
105680
|
return;
|
|
105295
105681
|
}
|
|
@@ -105409,7 +105795,7 @@ var runCli = async (args) => {
|
|
|
105409
105795
|
checkMacOSVersion({ shouldThrow: true });
|
|
105410
105796
|
const ctx = await createContext(args);
|
|
105411
105797
|
await create(ctx);
|
|
105412
|
-
await
|
|
105798
|
+
await configure16(ctx);
|
|
105413
105799
|
await deploy(ctx);
|
|
105414
105800
|
printSummary(ctx);
|
|
105415
105801
|
logRaw("");
|
|
@@ -105420,7 +105806,7 @@ var setupProjectDirectory = (ctx) => {
|
|
|
105420
105806
|
if (err) {
|
|
105421
105807
|
throw new Error(err);
|
|
105422
105808
|
}
|
|
105423
|
-
const directory = (0,
|
|
105809
|
+
const directory = (0, import_node_path24.dirname)(path6);
|
|
105424
105810
|
(0, import_node_fs21.mkdirSync)(directory, { recursive: true });
|
|
105425
105811
|
(0, import_node_process14.chdir)(directory);
|
|
105426
105812
|
};
|
|
@@ -105442,7 +105828,7 @@ var create = async (ctx) => {
|
|
|
105442
105828
|
}
|
|
105443
105829
|
endSection(`Application created`);
|
|
105444
105830
|
};
|
|
105445
|
-
var
|
|
105831
|
+
var configure16 = async (ctx) => {
|
|
105446
105832
|
startSection(
|
|
105447
105833
|
`Configuring your application for Cloudflare${ctx.args.experimental ? ` via \`wrangler setup\`` : ""}`,
|
|
105448
105834
|
"Step 2 of 3"
|