wrangler 0.0.13 → 0.0.17
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 +2 -2
- package/package.json +20 -11
- package/pages/functions/buildWorker.ts +1 -1
- package/pages/functions/filepath-routing.test.ts +112 -28
- package/pages/functions/filepath-routing.ts +44 -51
- package/pages/functions/routes.ts +11 -18
- package/pages/functions/template-worker.ts +3 -9
- package/src/__tests__/dev.test.tsx +42 -5
- package/src/__tests__/guess-worker-format.test.ts +66 -0
- package/src/__tests__/{clipboardy-mock.js → helpers/clipboardy-mock.js} +0 -0
- package/src/__tests__/helpers/cmd-shim.d.ts +11 -0
- package/src/__tests__/helpers/faye-websocket.d.ts +6 -0
- package/src/__tests__/helpers/mock-account-id.ts +30 -0
- package/src/__tests__/helpers/mock-bin.ts +36 -0
- package/src/__tests__/{mock-cfetch.ts → helpers/mock-cfetch.ts} +43 -9
- package/src/__tests__/helpers/mock-console.ts +62 -0
- package/src/__tests__/{mock-dialogs.ts → helpers/mock-dialogs.ts} +1 -1
- package/src/__tests__/helpers/mock-kv.ts +40 -0
- package/src/__tests__/helpers/mock-user.ts +27 -0
- package/src/__tests__/helpers/mock-web-socket.ts +37 -0
- package/src/__tests__/{run-in-tmp.ts → helpers/run-in-tmp.ts} +1 -1
- package/src/__tests__/helpers/run-wrangler.ts +16 -0
- package/src/__tests__/helpers/write-wrangler-toml.ts +20 -0
- package/src/__tests__/index.test.ts +418 -71
- package/src/__tests__/jest.setup.ts +30 -2
- package/src/__tests__/kv.test.ts +147 -252
- package/src/__tests__/logout.test.ts +50 -0
- package/src/__tests__/package-manager.test.ts +206 -0
- package/src/__tests__/publish.test.ts +1136 -291
- package/src/__tests__/r2.test.ts +206 -0
- package/src/__tests__/secret.test.ts +210 -0
- package/src/__tests__/sentry.test.ts +146 -0
- package/src/__tests__/tail.test.ts +246 -0
- package/src/__tests__/whoami.test.tsx +6 -47
- package/src/api/form_data.ts +75 -25
- package/src/api/preview.ts +2 -2
- package/src/api/worker.ts +34 -15
- package/src/bundle.ts +127 -0
- package/src/cfetch/index.ts +7 -15
- package/src/cfetch/internal.ts +41 -6
- package/src/cli.ts +10 -0
- package/src/config.ts +125 -95
- package/src/dev.tsx +300 -193
- package/src/dialogs.tsx +2 -2
- package/src/guess-worker-format.ts +68 -0
- package/src/index.tsx +578 -192
- package/src/inspect.ts +29 -10
- package/src/kv.tsx +23 -17
- package/src/module-collection.ts +32 -12
- package/src/open-in-browser.ts +13 -0
- package/src/package-manager.ts +120 -0
- package/src/pages.tsx +28 -23
- package/src/paths.ts +26 -0
- package/src/proxy.ts +88 -14
- package/src/publish.ts +260 -297
- package/src/r2.ts +50 -0
- package/src/reporting.ts +115 -0
- package/src/sites.tsx +28 -27
- package/src/tail.tsx +178 -9
- package/src/user.tsx +58 -44
- package/templates/new-worker.js +15 -0
- package/templates/new-worker.ts +15 -0
- package/{static-asset-facade.js → templates/static-asset-facade.js} +0 -0
- package/wrangler-dist/cli.js +124315 -104677
- package/wrangler-dist/cli.js.map +3 -3
- package/src/__tests__/mock-console.ts +0 -34
- package/src/__tests__/run-wrangler.ts +0 -8
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
import { existsSync } from "node:fs";
|
|
2
|
+
import os from "node:os";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import fetchMock from "jest-fetch-mock";
|
|
5
|
+
import { initialise } from "../user";
|
|
6
|
+
import { mockConsoleMethods } from "./helpers/mock-console";
|
|
7
|
+
import { writeUserConfig } from "./helpers/mock-user";
|
|
8
|
+
import { runInTempDir } from "./helpers/run-in-tmp";
|
|
9
|
+
import { runWrangler } from "./helpers/run-wrangler";
|
|
10
|
+
|
|
11
|
+
describe("wrangler", () => {
|
|
12
|
+
runInTempDir({ homedir: "./home" });
|
|
13
|
+
const std = mockConsoleMethods();
|
|
14
|
+
|
|
15
|
+
describe("logout", () => {
|
|
16
|
+
it("should exit with a message stating the user is not logged in", async () => {
|
|
17
|
+
await initialise();
|
|
18
|
+
await runWrangler("logout");
|
|
19
|
+
expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
it("should logout user that has been properly logged in", async () => {
|
|
23
|
+
writeUserConfig("some-oauth-tok", "some-refresh-tok");
|
|
24
|
+
|
|
25
|
+
// Mock out the response for a request to revoke the auth tokens,
|
|
26
|
+
// checking the form of the request is as expected.
|
|
27
|
+
fetchMock.mockResponseOnce(async (req) => {
|
|
28
|
+
expect(req.url).toEqual("https://dash.cloudflare.com/oauth2/revoke");
|
|
29
|
+
expect(req.method).toEqual("POST");
|
|
30
|
+
return "";
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
await initialise();
|
|
34
|
+
await runWrangler("logout");
|
|
35
|
+
|
|
36
|
+
expect(std.out).toMatchInlineSnapshot(`
|
|
37
|
+
"💁 Wrangler is configured with an OAuth token. The token has been successfully revoked
|
|
38
|
+
Removing ./home/.wrangler/config/default.toml.. success!"
|
|
39
|
+
`);
|
|
40
|
+
|
|
41
|
+
// Make sure that we made the request to logout.
|
|
42
|
+
expect(fetchMock).toHaveBeenCalledTimes(1);
|
|
43
|
+
|
|
44
|
+
// Make sure that logout removed the config file containing the auth tokens.
|
|
45
|
+
expect(
|
|
46
|
+
existsSync(path.join(os.homedir(), ".wrangler/config/default.toml"))
|
|
47
|
+
).toBe(false);
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
});
|
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
import { writeFileSync } from "node:fs";
|
|
2
|
+
import { mockBinary } from "./helpers/mock-bin";
|
|
3
|
+
import { mockConsoleMethods } from "./helpers/mock-console";
|
|
4
|
+
import { runInTempDir } from "./helpers/run-in-tmp";
|
|
5
|
+
|
|
6
|
+
const { getPackageManager, getPackageManagerName } =
|
|
7
|
+
jest.requireActual("../package-manager");
|
|
8
|
+
interface TestCase {
|
|
9
|
+
npm: boolean;
|
|
10
|
+
yarn: boolean;
|
|
11
|
+
npmLockFile: boolean;
|
|
12
|
+
yarnLockFile: boolean;
|
|
13
|
+
expectedPackageManager: string;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
const testCases: TestCase[] = [
|
|
17
|
+
// npm binary - no yarn binary
|
|
18
|
+
{
|
|
19
|
+
npm: true,
|
|
20
|
+
yarn: false,
|
|
21
|
+
npmLockFile: false,
|
|
22
|
+
yarnLockFile: false,
|
|
23
|
+
expectedPackageManager: "npm",
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
npm: true,
|
|
27
|
+
yarn: false,
|
|
28
|
+
npmLockFile: true,
|
|
29
|
+
yarnLockFile: false,
|
|
30
|
+
expectedPackageManager: "npm",
|
|
31
|
+
},
|
|
32
|
+
{
|
|
33
|
+
npm: true,
|
|
34
|
+
yarn: false,
|
|
35
|
+
npmLockFile: false,
|
|
36
|
+
yarnLockFile: true,
|
|
37
|
+
expectedPackageManager: "npm",
|
|
38
|
+
},
|
|
39
|
+
{
|
|
40
|
+
npm: true,
|
|
41
|
+
yarn: false,
|
|
42
|
+
npmLockFile: true,
|
|
43
|
+
yarnLockFile: true,
|
|
44
|
+
expectedPackageManager: "npm",
|
|
45
|
+
},
|
|
46
|
+
|
|
47
|
+
// yarn binary - no npm binary
|
|
48
|
+
{
|
|
49
|
+
npm: false,
|
|
50
|
+
yarn: true,
|
|
51
|
+
npmLockFile: false,
|
|
52
|
+
yarnLockFile: false,
|
|
53
|
+
expectedPackageManager: "yarn",
|
|
54
|
+
},
|
|
55
|
+
{
|
|
56
|
+
npm: false,
|
|
57
|
+
yarn: true,
|
|
58
|
+
npmLockFile: true,
|
|
59
|
+
yarnLockFile: false,
|
|
60
|
+
expectedPackageManager: "yarn",
|
|
61
|
+
},
|
|
62
|
+
{
|
|
63
|
+
npm: false,
|
|
64
|
+
yarn: true,
|
|
65
|
+
npmLockFile: false,
|
|
66
|
+
yarnLockFile: true,
|
|
67
|
+
expectedPackageManager: "yarn",
|
|
68
|
+
},
|
|
69
|
+
{
|
|
70
|
+
npm: false,
|
|
71
|
+
yarn: true,
|
|
72
|
+
npmLockFile: true,
|
|
73
|
+
yarnLockFile: true,
|
|
74
|
+
expectedPackageManager: "yarn",
|
|
75
|
+
},
|
|
76
|
+
|
|
77
|
+
// npm and yarn binaries
|
|
78
|
+
{
|
|
79
|
+
npm: true,
|
|
80
|
+
yarn: true,
|
|
81
|
+
npmLockFile: false,
|
|
82
|
+
yarnLockFile: false,
|
|
83
|
+
expectedPackageManager: "npm",
|
|
84
|
+
},
|
|
85
|
+
{
|
|
86
|
+
npm: true,
|
|
87
|
+
yarn: true,
|
|
88
|
+
npmLockFile: true,
|
|
89
|
+
yarnLockFile: false,
|
|
90
|
+
expectedPackageManager: "npm",
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
npm: true,
|
|
94
|
+
yarn: true,
|
|
95
|
+
npmLockFile: false,
|
|
96
|
+
yarnLockFile: true,
|
|
97
|
+
expectedPackageManager: "yarn",
|
|
98
|
+
},
|
|
99
|
+
{
|
|
100
|
+
npm: true,
|
|
101
|
+
yarn: true,
|
|
102
|
+
npmLockFile: true,
|
|
103
|
+
yarnLockFile: true,
|
|
104
|
+
expectedPackageManager: "npm",
|
|
105
|
+
},
|
|
106
|
+
];
|
|
107
|
+
|
|
108
|
+
describe("getPackageManager()", () => {
|
|
109
|
+
runInTempDir();
|
|
110
|
+
mockConsoleMethods();
|
|
111
|
+
|
|
112
|
+
describe("no supported package manager", () => {
|
|
113
|
+
mockYarn(false);
|
|
114
|
+
mockNpm(false);
|
|
115
|
+
|
|
116
|
+
it("should throw an error", async () => {
|
|
117
|
+
await expect(() =>
|
|
118
|
+
getPackageManager(process.cwd())
|
|
119
|
+
).rejects.toThrowErrorMatchingInlineSnapshot(
|
|
120
|
+
`"Unable to find a package manager. Supported managers are: npm and yarn."`
|
|
121
|
+
);
|
|
122
|
+
});
|
|
123
|
+
});
|
|
124
|
+
|
|
125
|
+
for (const {
|
|
126
|
+
npm,
|
|
127
|
+
yarn,
|
|
128
|
+
npmLockFile,
|
|
129
|
+
yarnLockFile,
|
|
130
|
+
expectedPackageManager,
|
|
131
|
+
} of testCases) {
|
|
132
|
+
describe(
|
|
133
|
+
getTestCaseDescription(npm, yarn, npmLockFile, yarnLockFile),
|
|
134
|
+
() => {
|
|
135
|
+
mockYarn(yarn);
|
|
136
|
+
mockNpm(npm);
|
|
137
|
+
mockLockFiles(npmLockFile, yarnLockFile);
|
|
138
|
+
|
|
139
|
+
it(`should return the ${expectedPackageManager} package manager`, async () => {
|
|
140
|
+
const actualPackageManager = await getPackageManager(process.cwd());
|
|
141
|
+
expect(getPackageManagerName(actualPackageManager)).toEqual(
|
|
142
|
+
expectedPackageManager
|
|
143
|
+
);
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
);
|
|
147
|
+
}
|
|
148
|
+
});
|
|
149
|
+
|
|
150
|
+
/**
|
|
151
|
+
* Create a fake yarn binary
|
|
152
|
+
*/
|
|
153
|
+
function mockYarn(succeed: boolean): void {
|
|
154
|
+
let unMock: () => void;
|
|
155
|
+
beforeEach(async () => {
|
|
156
|
+
unMock = await mockBinary("yarn", `process.exit(${succeed ? 0 : 1})`);
|
|
157
|
+
});
|
|
158
|
+
afterEach(() => unMock());
|
|
159
|
+
}
|
|
160
|
+
|
|
161
|
+
/**
|
|
162
|
+
* Create a fake npm binary
|
|
163
|
+
*/
|
|
164
|
+
function mockNpm(succeed: boolean): void {
|
|
165
|
+
let unMock: () => void;
|
|
166
|
+
beforeEach(async () => {
|
|
167
|
+
unMock = await mockBinary("npm", `process.exit(${succeed ? 0 : 1})`);
|
|
168
|
+
});
|
|
169
|
+
afterEach(() => unMock());
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
/**
|
|
173
|
+
* Create a fake lock files.
|
|
174
|
+
*/
|
|
175
|
+
function mockLockFiles(npmLockFile: boolean, yarnLockFile: boolean) {
|
|
176
|
+
beforeEach(() => {
|
|
177
|
+
if (npmLockFile) {
|
|
178
|
+
writeFileSync("package-lock.json", "");
|
|
179
|
+
}
|
|
180
|
+
if (yarnLockFile) {
|
|
181
|
+
writeFileSync("yarn.lock", "");
|
|
182
|
+
}
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
function getTestCaseDescription(
|
|
187
|
+
npm: boolean,
|
|
188
|
+
yarn: boolean,
|
|
189
|
+
npmLockFile: boolean,
|
|
190
|
+
yarnLockFile: boolean
|
|
191
|
+
): string {
|
|
192
|
+
const criteria: string[] = [];
|
|
193
|
+
if (npm) {
|
|
194
|
+
criteria.push("npm");
|
|
195
|
+
}
|
|
196
|
+
if (npmLockFile) {
|
|
197
|
+
criteria.push("package-lock.json");
|
|
198
|
+
}
|
|
199
|
+
if (yarn) {
|
|
200
|
+
criteria.push("yarn");
|
|
201
|
+
}
|
|
202
|
+
if (yarnLockFile) {
|
|
203
|
+
criteria.push("yarn.lock");
|
|
204
|
+
}
|
|
205
|
+
return "using " + criteria.join("; ");
|
|
206
|
+
}
|