wrangler 0.0.0-bd89b54 → 0.0.0-c9dc473
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/bin/wrangler.js +1 -1
- package/package.json +18 -10
- package/src/__tests__/clipboardy-mock.js +4 -0
- package/src/__tests__/index.test.ts +79 -48
- package/src/__tests__/mock-cfetch.js +46 -0
- package/src/{index_node.ts → cli.ts} +1 -1
- package/src/dev.tsx +8 -8
- package/src/dialogs.tsx +85 -0
- package/src/index.tsx +147 -99
- package/src/publish.ts +100 -101
- package/src/user.tsx +10 -0
- package/wrangler-dist/cli.js +841 -0
- package/wrangler-dist/{index_node.js.map → cli.js.map} +3 -3
- package/src/secret.tsx +0 -40
- package/wrangler-dist/index_node.js +0 -135259
package/bin/wrangler.js
CHANGED
|
@@ -24,7 +24,7 @@ Consider using a Node.js version manager such as https://volta.sh/ or https://gi
|
|
|
24
24
|
"--no-warnings",
|
|
25
25
|
"--experimental-vm-modules",
|
|
26
26
|
...process.execArgv,
|
|
27
|
-
join(__dirname, "../wrangler-dist/
|
|
27
|
+
join(__dirname, "../wrangler-dist/cli.js"),
|
|
28
28
|
...process.argv.slice(2),
|
|
29
29
|
],
|
|
30
30
|
{ stdio: "inherit" }
|
package/package.json
CHANGED
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "wrangler",
|
|
3
|
-
"version": "0.0.0-
|
|
3
|
+
"version": "0.0.0-c9dc473",
|
|
4
4
|
"author": "wrangler@cloudflare.com",
|
|
5
5
|
"description": "Command-line interface for all things Cloudflare Workers",
|
|
6
|
-
"bin":
|
|
6
|
+
"bin": {
|
|
7
|
+
"wrangler": "./bin/wrangler.js",
|
|
8
|
+
"wrangler2": "./bin/wrangler.js"
|
|
9
|
+
},
|
|
7
10
|
"license": "MIT OR Apache-2.0",
|
|
8
11
|
"bugs": {
|
|
9
12
|
"url": "https://github.com/cloudflare/wrangler/issues"
|
|
@@ -35,7 +38,7 @@
|
|
|
35
38
|
"dependencies": {
|
|
36
39
|
"@cloudflare/pages-functions-compiler": "0.3.4",
|
|
37
40
|
"esbuild": "0.13.12",
|
|
38
|
-
"miniflare": "2.0.0-rc.
|
|
41
|
+
"miniflare": "2.0.0-rc.2",
|
|
39
42
|
"semiver": "^1.1.0",
|
|
40
43
|
"serve": "^13.0.2"
|
|
41
44
|
},
|
|
@@ -63,8 +66,9 @@
|
|
|
63
66
|
"ink-select-input": "^4.2.0",
|
|
64
67
|
"ink-table": "^3.0.0",
|
|
65
68
|
"ink-text-input": "^4.0.1",
|
|
66
|
-
"node-fetch": "
|
|
69
|
+
"node-fetch": "^3.1.0",
|
|
67
70
|
"open": "^8.4.0",
|
|
71
|
+
"path-to-regexp": "^6.2.0",
|
|
68
72
|
"react": "^17.0.2",
|
|
69
73
|
"serve-static": "^1.14.1",
|
|
70
74
|
"signal-exit": "^3.0.5",
|
|
@@ -86,20 +90,24 @@
|
|
|
86
90
|
"bundle": "node -r esbuild-register scripts/bundle.ts",
|
|
87
91
|
"build": "npm run clean && npm run bundle",
|
|
88
92
|
"start": "npm run bundle && NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
|
|
89
|
-
"test": "
|
|
93
|
+
"test": "CF_API_TOKEN=some-api-token CF_ACCOUNT_ID=some-account-id jest --silent=false --verbose=true"
|
|
90
94
|
},
|
|
91
95
|
"engines": {
|
|
92
96
|
"node": ">=16.0.0"
|
|
93
97
|
},
|
|
94
98
|
"jest": {
|
|
99
|
+
"testRegex": ".*.(test|spec)\\.[jt]sx?$",
|
|
100
|
+
"transformIgnorePatterns": [
|
|
101
|
+
"node_modules/(?!node-fetch|fetch-blob|find-up|locate-path|p-locate|p-limit|yocto-queue|path-exists|data-uri-to-buffer|formdata-polyfill)"
|
|
102
|
+
],
|
|
103
|
+
"moduleNameMapper": {
|
|
104
|
+
"clipboardy": "<rootDir>/src/__tests__/clipboardy-mock.js"
|
|
105
|
+
},
|
|
95
106
|
"transform": {
|
|
96
|
-
"^.+\\.
|
|
107
|
+
"^.+\\.c?(t|j)sx?$": [
|
|
97
108
|
"esbuild-jest",
|
|
98
109
|
{
|
|
99
|
-
"sourcemap": true
|
|
100
|
-
"loaders": {
|
|
101
|
-
".spec.ts": "tsx"
|
|
102
|
-
}
|
|
110
|
+
"sourcemap": true
|
|
103
111
|
}
|
|
104
112
|
]
|
|
105
113
|
}
|
|
@@ -1,19 +1,53 @@
|
|
|
1
|
-
import execa from "execa";
|
|
2
1
|
import * as fs from "node:fs";
|
|
3
2
|
import * as fsp from "node:fs/promises";
|
|
4
3
|
import * as path from "node:path";
|
|
5
4
|
import * as TOML from "@iarna/toml";
|
|
5
|
+
import { main } from "../index";
|
|
6
|
+
// @ts-expect-error we're mocking cfetch, so of course setMock isn't a thing
|
|
7
|
+
import { setMock, unsetAllMocks } from "../cfetch";
|
|
6
8
|
|
|
7
|
-
|
|
8
|
-
return
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
jest.mock("../cfetch", () => {
|
|
10
|
+
return jest.requireActual("./mock-cfetch");
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
async function w(cmd: void | string, options?: { tap: boolean }) {
|
|
14
|
+
const tapped = options?.tap ? tap() : undefined;
|
|
15
|
+
await main([...(cmd ? cmd.split(" ") : [])]);
|
|
16
|
+
tapped?.off();
|
|
17
|
+
return { stdout: tapped?.out, stderr: tapped?.err };
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
function tap() {
|
|
21
|
+
const oldLog = console.log;
|
|
22
|
+
const oldError = console.error;
|
|
23
|
+
|
|
24
|
+
const toReturn = {
|
|
25
|
+
off: () => {
|
|
26
|
+
console.log = oldLog;
|
|
27
|
+
console.error = oldError;
|
|
28
|
+
},
|
|
29
|
+
out: "",
|
|
30
|
+
err: "",
|
|
31
|
+
};
|
|
32
|
+
|
|
33
|
+
console.log = (...args) => {
|
|
34
|
+
toReturn.out += args.join("");
|
|
35
|
+
oldLog.apply(console, args);
|
|
36
|
+
// console.trace(...args); // use this if you want to find the true source of your console.log
|
|
37
|
+
};
|
|
38
|
+
console.error = (...args) => {
|
|
39
|
+
toReturn.err += args.join("");
|
|
40
|
+
oldError.apply(console, args);
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
return toReturn;
|
|
12
44
|
}
|
|
13
45
|
|
|
14
46
|
describe("wrangler", () => {
|
|
15
47
|
it("should run", async () => {
|
|
16
|
-
|
|
48
|
+
const { stdout } = await w(undefined, { tap: true });
|
|
49
|
+
|
|
50
|
+
expect(stdout).toMatchInlineSnapshot(`
|
|
17
51
|
"wrangler
|
|
18
52
|
|
|
19
53
|
Commands:
|
|
@@ -52,32 +86,46 @@ describe("wrangler", () => {
|
|
|
52
86
|
it("should create a wrangler.toml", async () => {
|
|
53
87
|
await w("init");
|
|
54
88
|
const parsed = TOML.parse(await fsp.readFile("./wrangler.toml", "utf-8"));
|
|
55
|
-
expect(parsed.name).toBe("init");
|
|
56
89
|
expect(typeof parsed.compatibility_date).toBe("string");
|
|
57
90
|
});
|
|
58
91
|
|
|
59
92
|
it("should error when wrangler.toml already exists", async () => {
|
|
60
93
|
fs.closeSync(fs.openSync("./wrangler.toml", "w"));
|
|
61
|
-
const { stderr } = await w("init");
|
|
94
|
+
const { stderr } = await w("init", { tap: true });
|
|
62
95
|
expect(stderr.endsWith("wrangler.toml already exists.")).toBe(true);
|
|
63
96
|
});
|
|
64
|
-
|
|
65
|
-
it("should create a named config", async () => {
|
|
66
|
-
await w("init xyz");
|
|
67
|
-
const parsed = TOML.parse(await fsp.readFile("./wrangler.toml", "utf-8"));
|
|
68
|
-
expect(parsed.name).toBe("xyz");
|
|
69
|
-
});
|
|
70
97
|
});
|
|
71
98
|
|
|
72
99
|
describe("kv:namespace", () => {
|
|
100
|
+
afterAll(() => {
|
|
101
|
+
unsetAllMocks();
|
|
102
|
+
});
|
|
103
|
+
let KVNamespaces: { title: string; id: string }[] = [];
|
|
73
104
|
it("can create a namespace", async () => {
|
|
74
|
-
|
|
75
|
-
|
|
105
|
+
setMock("/accounts/:accountId/storage/kv/namespaces", (uri, init) => {
|
|
106
|
+
expect(init.method === "POST");
|
|
107
|
+
const body = JSON.parse(init.body);
|
|
108
|
+
expect(body.title).toBe("worker-UnitTestNamespace");
|
|
109
|
+
KVNamespaces.push({ title: body.title, id: "some-namespace-id" });
|
|
110
|
+
return { id: "some-namespace-id" };
|
|
111
|
+
});
|
|
112
|
+
|
|
113
|
+
await w('kv:namespace create "UnitTestNamespace"');
|
|
114
|
+
expect(
|
|
115
|
+
KVNamespaces.find((ns) => ns.title === `worker-UnitTestNamespace`)
|
|
116
|
+
).toBeTruthy();
|
|
76
117
|
});
|
|
77
118
|
|
|
78
119
|
let createdNamespace: { id: string; title: string };
|
|
79
120
|
it("can list namespaces", async () => {
|
|
80
|
-
|
|
121
|
+
setMock(
|
|
122
|
+
"/accounts/:accountId/storage/kv/namespaces\\?:qs",
|
|
123
|
+
(uri, init) => {
|
|
124
|
+
expect(init).toBe(undefined);
|
|
125
|
+
return KVNamespaces;
|
|
126
|
+
}
|
|
127
|
+
);
|
|
128
|
+
const { stdout } = await w("kv:namespace list", { tap: true });
|
|
81
129
|
const namespaces = JSON.parse(stdout);
|
|
82
130
|
createdNamespace = namespaces.find(
|
|
83
131
|
(ns) => ns.title === "worker-UnitTestNamespace"
|
|
@@ -86,37 +134,20 @@ describe("wrangler", () => {
|
|
|
86
134
|
});
|
|
87
135
|
|
|
88
136
|
it("can delete a namespace", async () => {
|
|
89
|
-
const
|
|
90
|
-
|
|
137
|
+
const namespaceIdToDelete = createdNamespace.id;
|
|
138
|
+
setMock(
|
|
139
|
+
"/accounts/:accountId/storage/kv/namespaces/:namespaceId",
|
|
140
|
+
(uri, init) => {
|
|
141
|
+
expect(init.method).toBe("DELETE");
|
|
142
|
+
KVNamespaces = KVNamespaces.filter(
|
|
143
|
+
(ns) => ns.id !== namespaceIdToDelete
|
|
144
|
+
);
|
|
145
|
+
}
|
|
146
|
+
);
|
|
147
|
+
await w(`kv:namespace delete --namespace-id ${namespaceIdToDelete}`);
|
|
148
|
+
expect(KVNamespaces.find((ns) => ns.id === namespaceIdToDelete)).toBe(
|
|
149
|
+
undefined
|
|
91
150
|
);
|
|
92
|
-
console.log(stdout);
|
|
93
|
-
});
|
|
94
|
-
});
|
|
95
|
-
describe("kv:key", () => {
|
|
96
|
-
let namespaceId: string;
|
|
97
|
-
beforeAll(async () => {
|
|
98
|
-
await w('kv:namespace create "UnitTestNamespace"');
|
|
99
|
-
namespaceId = JSON.parse((await w("kv:namespace list")).stdout).find(
|
|
100
|
-
(ns) => ns.title === "worker-UnitTestNamespace"
|
|
101
|
-
).id;
|
|
102
|
-
});
|
|
103
|
-
afterAll(async () => {
|
|
104
|
-
await w(`kv:namespace delete --namespace-id ${namespaceId}`);
|
|
105
151
|
});
|
|
106
|
-
it("stub", () => {});
|
|
107
|
-
// it("can add a key", () => {});
|
|
108
|
-
// it("can read a key", () => {});
|
|
109
|
-
// it("can list keys", () => {});
|
|
110
|
-
// it("can delete a key", () => {});
|
|
111
152
|
});
|
|
112
|
-
|
|
113
|
-
// describe("login", () => {
|
|
114
|
-
// it("should show possible scopes", async () => {
|
|
115
|
-
// const { stdout } = await w("login --scopes-list");
|
|
116
|
-
// // UGH jest doesn't like wide text huh
|
|
117
|
-
// expect(stdout).toMatchInlineSnapshot();
|
|
118
|
-
// });
|
|
119
|
-
// });
|
|
120
|
-
|
|
121
|
-
// TODO: setup a "api server" to mock requests
|
|
122
153
|
});
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
// This file mocks ../cfetch.ts
|
|
2
|
+
// so we can insert whatever responses we want from it
|
|
3
|
+
|
|
4
|
+
const pathToRegexp = require("path-to-regexp");
|
|
5
|
+
// TODO: add jsdoc style types here
|
|
6
|
+
|
|
7
|
+
// type MockHandler = (resource: string, init?: RequestInit) => any; // TODO: use a generic here
|
|
8
|
+
|
|
9
|
+
let mocks = [];
|
|
10
|
+
|
|
11
|
+
function mockCfetch(resource, init) {
|
|
12
|
+
for (const { regexp, handler } of mocks) {
|
|
13
|
+
if (regexp.test(resource)) {
|
|
14
|
+
return handler(resource, init); // should we have some kind of fallthrough system? we'll see.
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
throw new Error(`no mocks found for ${resource}`);
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
function setMock(resource, handler) {
|
|
21
|
+
const mock = {
|
|
22
|
+
resource,
|
|
23
|
+
handler,
|
|
24
|
+
regexp: pathToRegexp(resource),
|
|
25
|
+
};
|
|
26
|
+
mocks.push(mock);
|
|
27
|
+
return () => {
|
|
28
|
+
mocks = mocks.filter((x) => x !== mock);
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
function unsetAllMocks() {
|
|
33
|
+
mocks = [];
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
const CF_API_BASE_URL =
|
|
37
|
+
process.env.CF_API_BASE_URL || "https://api.cloudflare.com/client/v4";
|
|
38
|
+
|
|
39
|
+
Object.assign(module.exports, {
|
|
40
|
+
__esModule: true,
|
|
41
|
+
default: mockCfetch,
|
|
42
|
+
mockCfetch,
|
|
43
|
+
setMock,
|
|
44
|
+
unsetAllMocks,
|
|
45
|
+
CF_API_BASE_URL,
|
|
46
|
+
});
|
package/src/dev.tsx
CHANGED
|
@@ -565,15 +565,15 @@ function useTunnel(toggle: boolean) {
|
|
|
565
565
|
// point them to a url where they can get docs to install it
|
|
566
566
|
useEffect(() => {
|
|
567
567
|
async function startTunnel() {
|
|
568
|
-
try {
|
|
569
|
-
await commandExists("cloudflared");
|
|
570
|
-
} catch (e) {
|
|
571
|
-
console.error(
|
|
572
|
-
"Please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation"
|
|
573
|
-
);
|
|
574
|
-
return;
|
|
575
|
-
}
|
|
576
568
|
if (toggle) {
|
|
569
|
+
try {
|
|
570
|
+
await commandExists("cloudflared");
|
|
571
|
+
} catch (e) {
|
|
572
|
+
console.error(
|
|
573
|
+
"To share your worker on the internet, please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation"
|
|
574
|
+
);
|
|
575
|
+
return;
|
|
576
|
+
}
|
|
577
577
|
console.log("⎔ Starting a tunnel...");
|
|
578
578
|
tunnel.current = spawn("cloudflared", [
|
|
579
579
|
"tunnel",
|
package/src/dialogs.tsx
ADDED
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
import * as React from "react";
|
|
2
|
+
import { useState } from "react";
|
|
3
|
+
import { Box, Text, useInput, render } from "ink";
|
|
4
|
+
import TextInput from "ink-text-input";
|
|
5
|
+
type ConfirmProps = {
|
|
6
|
+
text: string;
|
|
7
|
+
onConfirm: (answer: boolean) => void | Promise<void>;
|
|
8
|
+
};
|
|
9
|
+
function Confirm(props: ConfirmProps) {
|
|
10
|
+
useInput((input: string) => {
|
|
11
|
+
if (input === "y") {
|
|
12
|
+
props.onConfirm(true);
|
|
13
|
+
} else if (input === "n") {
|
|
14
|
+
props.onConfirm(false);
|
|
15
|
+
} else {
|
|
16
|
+
console.log("Unrecognised input");
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
return (
|
|
20
|
+
<Box>
|
|
21
|
+
<Text>{props.text} (y/n) </Text>
|
|
22
|
+
</Box>
|
|
23
|
+
);
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export function confirm(text: string): Promise<boolean> {
|
|
27
|
+
return new Promise((resolve) => {
|
|
28
|
+
const { unmount } = render(
|
|
29
|
+
<Confirm
|
|
30
|
+
text={text}
|
|
31
|
+
onConfirm={(answer: boolean) => {
|
|
32
|
+
unmount();
|
|
33
|
+
resolve(answer);
|
|
34
|
+
}}
|
|
35
|
+
/>
|
|
36
|
+
);
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
type PromptProps = {
|
|
41
|
+
text: string;
|
|
42
|
+
type?: "text" | "password";
|
|
43
|
+
onSubmit: (text: string) => void;
|
|
44
|
+
};
|
|
45
|
+
|
|
46
|
+
export function Prompt(props: PromptProps) {
|
|
47
|
+
const [value, setValue] = useState("");
|
|
48
|
+
|
|
49
|
+
return (
|
|
50
|
+
<Box>
|
|
51
|
+
<Text>{props.text} </Text>
|
|
52
|
+
<Box>
|
|
53
|
+
<TextInput
|
|
54
|
+
mask={props.type === "password" ? "*" : undefined}
|
|
55
|
+
value={value}
|
|
56
|
+
onChange={setValue}
|
|
57
|
+
onSubmit={props.onSubmit}
|
|
58
|
+
/>
|
|
59
|
+
</Box>
|
|
60
|
+
</Box>
|
|
61
|
+
);
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
export async function prompt(text: string, type: "text" | "password" = "text") {
|
|
65
|
+
return new Promise((resolve) => {
|
|
66
|
+
const { unmount } = render(
|
|
67
|
+
<Prompt
|
|
68
|
+
text={text}
|
|
69
|
+
type={type}
|
|
70
|
+
onSubmit={(text) => {
|
|
71
|
+
unmount();
|
|
72
|
+
resolve(text);
|
|
73
|
+
}}
|
|
74
|
+
/>
|
|
75
|
+
);
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
// this one feels a little non "standard"
|
|
80
|
+
// export async function select(
|
|
81
|
+
// title: string,
|
|
82
|
+
// choices: { label: string; value: string }[]
|
|
83
|
+
// ): Promise<{ label: string; value: string }>{
|
|
84
|
+
|
|
85
|
+
// }
|