wrangler 0.0.0-e978986 → 0.0.0-ea7ee45

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.
Files changed (181) hide show
  1. package/README.md +7 -1
  2. package/bin/wrangler.js +111 -57
  3. package/kv-asset-handler.js +1 -0
  4. package/miniflare-dist/index.mjs +9 -2
  5. package/package.json +156 -152
  6. package/src/__tests__/config-cache.test.ts +24 -24
  7. package/src/__tests__/configuration.test.ts +3818 -3363
  8. package/src/__tests__/dev.test.tsx +1128 -949
  9. package/src/__tests__/guess-worker-format.test.ts +68 -68
  10. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  11. package/src/__tests__/helpers/faye-websocket.d.ts +4 -4
  12. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  13. package/src/__tests__/helpers/mock-bin.ts +20 -20
  14. package/src/__tests__/helpers/mock-cfetch.ts +92 -92
  15. package/src/__tests__/helpers/mock-console.ts +49 -39
  16. package/src/__tests__/helpers/mock-dialogs.ts +94 -71
  17. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  18. package/src/__tests__/helpers/mock-istty.ts +65 -18
  19. package/src/__tests__/helpers/mock-kv.ts +26 -26
  20. package/src/__tests__/helpers/mock-oauth-flow.ts +223 -228
  21. package/src/__tests__/helpers/mock-process.ts +39 -0
  22. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  23. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  24. package/src/__tests__/helpers/run-in-tmp.ts +27 -27
  25. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  26. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  27. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  28. package/src/__tests__/https-options.test.ts +104 -104
  29. package/src/__tests__/index.test.ts +239 -233
  30. package/src/__tests__/init.test.ts +1605 -1180
  31. package/src/__tests__/jest.setup.ts +63 -33
  32. package/src/__tests__/kv.test.ts +1128 -990
  33. package/src/__tests__/logger.test.ts +100 -74
  34. package/src/__tests__/package-manager.test.ts +303 -303
  35. package/src/__tests__/pages.test.ts +1160 -563
  36. package/src/__tests__/parse.test.ts +252 -252
  37. package/src/__tests__/publish.test.ts +6344 -5299
  38. package/src/__tests__/pubsub.test.ts +276 -0
  39. package/src/__tests__/r2.test.ts +133 -133
  40. package/src/__tests__/route.test.ts +18 -18
  41. package/src/__tests__/secret.test.ts +382 -377
  42. package/src/__tests__/tail.test.ts +530 -530
  43. package/src/__tests__/user.test.ts +123 -111
  44. package/src/__tests__/whoami.test.tsx +198 -83
  45. package/src/__tests__/worker-namespace.test.ts +327 -0
  46. package/src/abort.d.ts +1 -1
  47. package/src/api/dev.ts +39 -0
  48. package/src/api/index.ts +1 -0
  49. package/src/bundle-reporter.tsx +29 -0
  50. package/src/bundle.ts +158 -146
  51. package/src/cfetch/index.ts +80 -80
  52. package/src/cfetch/internal.ts +92 -88
  53. package/src/cli.ts +21 -7
  54. package/src/config/config.ts +204 -195
  55. package/src/config/diagnostics.ts +61 -61
  56. package/src/config/environment.ts +367 -357
  57. package/src/config/index.ts +193 -193
  58. package/src/config/validation-helpers.ts +366 -357
  59. package/src/config/validation.ts +1521 -1367
  60. package/src/config-cache.ts +24 -25
  61. package/src/create-worker-preview.ts +206 -136
  62. package/src/create-worker-upload-form.ts +238 -238
  63. package/src/dev/dev-vars.ts +13 -13
  64. package/src/dev/dev.tsx +334 -336
  65. package/src/dev/local.tsx +304 -272
  66. package/src/dev/remote.tsx +351 -211
  67. package/src/dev/use-esbuild.ts +126 -94
  68. package/src/dev.tsx +526 -0
  69. package/src/dialogs.tsx +97 -97
  70. package/src/durable.ts +87 -87
  71. package/src/entry.ts +234 -228
  72. package/src/environment-variables.ts +23 -23
  73. package/src/errors.ts +6 -6
  74. package/src/generate.ts +33 -0
  75. package/src/git-client.ts +42 -0
  76. package/src/https-options.ts +79 -79
  77. package/src/index.tsx +1775 -2752
  78. package/src/init.ts +549 -0
  79. package/src/inspect.ts +593 -593
  80. package/src/intl-polyfill.d.ts +123 -123
  81. package/src/kv.ts +277 -277
  82. package/src/logger.ts +46 -39
  83. package/src/miniflare-cli/enum-keys.ts +8 -8
  84. package/src/miniflare-cli/index.ts +42 -31
  85. package/src/miniflare-cli/request-context.ts +18 -18
  86. package/src/module-collection.ts +212 -212
  87. package/src/open-in-browser.ts +4 -6
  88. package/src/package-manager.ts +123 -123
  89. package/src/pages/build.tsx +202 -0
  90. package/src/pages/constants.ts +7 -0
  91. package/src/pages/deployments.tsx +101 -0
  92. package/src/pages/dev.tsx +964 -0
  93. package/src/pages/functions/buildPlugin.ts +105 -0
  94. package/src/pages/functions/buildWorker.ts +151 -0
  95. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  96. package/src/pages/functions/filepath-routing.ts +189 -0
  97. package/src/pages/functions/identifiers.ts +78 -0
  98. package/src/pages/functions/routes.ts +151 -0
  99. package/src/pages/index.tsx +84 -0
  100. package/src/pages/projects.tsx +157 -0
  101. package/src/pages/publish.tsx +335 -0
  102. package/src/pages/types.ts +40 -0
  103. package/src/pages/upload.tsx +384 -0
  104. package/src/pages/utils.ts +12 -0
  105. package/src/parse.ts +209 -125
  106. package/src/paths.ts +6 -6
  107. package/src/preview.ts +31 -0
  108. package/src/proxy.ts +400 -389
  109. package/src/publish.ts +688 -505
  110. package/src/pubsub/index.ts +286 -0
  111. package/src/pubsub/pubsub-commands.tsx +594 -0
  112. package/src/r2.ts +19 -19
  113. package/src/selfsigned.d.ts +23 -23
  114. package/src/sites.tsx +278 -201
  115. package/src/tail/filters.ts +108 -108
  116. package/src/tail/index.ts +217 -217
  117. package/src/tail/printing.ts +45 -45
  118. package/src/update-check.ts +11 -11
  119. package/src/user/choose-account.tsx +60 -0
  120. package/src/user/env-vars.ts +46 -0
  121. package/src/user/generate-auth-url.ts +33 -0
  122. package/src/user/generate-random-state.ts +16 -0
  123. package/src/user/index.ts +3 -0
  124. package/src/user/user.tsx +1130 -0
  125. package/src/whoami.tsx +61 -41
  126. package/src/worker-namespace.ts +190 -0
  127. package/src/worker.ts +104 -99
  128. package/src/zones.ts +76 -0
  129. package/templates/checked-fetch.js +17 -0
  130. package/templates/new-worker-scheduled.js +4 -4
  131. package/templates/new-worker-scheduled.ts +16 -16
  132. package/templates/new-worker.js +3 -3
  133. package/templates/new-worker.ts +15 -15
  134. package/templates/no-op-worker.js +10 -0
  135. package/templates/pages-template-plugin.ts +155 -0
  136. package/templates/pages-template-worker.ts +161 -0
  137. package/templates/static-asset-facade.js +32 -36
  138. package/templates/tsconfig.json +95 -95
  139. package/wrangler-dist/cli.js +40620 -39223
  140. package/pages/functions/buildPlugin.ts +0 -105
  141. package/pages/functions/buildWorker.ts +0 -151
  142. package/pages/functions/filepath-routing.ts +0 -189
  143. package/pages/functions/identifiers.ts +0 -78
  144. package/pages/functions/routes.ts +0 -156
  145. package/pages/functions/template-plugin.ts +0 -147
  146. package/pages/functions/template-worker.ts +0 -143
  147. package/src/pages.tsx +0 -2027
  148. package/src/user.tsx +0 -1203
  149. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  150. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  151. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  152. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  153. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  154. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  155. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  156. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  157. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  158. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  159. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  160. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  161. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  162. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  163. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  164. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  165. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  166. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  167. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  168. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  169. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  170. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  171. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  172. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  173. package/vendor/wrangler-mime/LICENSE +0 -21
  174. package/vendor/wrangler-mime/Mime.js +0 -97
  175. package/vendor/wrangler-mime/README.md +0 -187
  176. package/vendor/wrangler-mime/cli.js +0 -46
  177. package/vendor/wrangler-mime/index.js +0 -4
  178. package/vendor/wrangler-mime/lite.js +0 -4
  179. package/vendor/wrangler-mime/package.json +0 -52
  180. package/vendor/wrangler-mime/types/other.js +0 -1
  181. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -1,8 +1,10 @@
1
+ import assert from "node:assert";
1
2
  import { fetch, Headers } from "undici";
2
3
  import { version as wranglerVersion } from "../../package.json";
3
4
  import { getEnvironmentVariableFactory } from "../environment-variables";
4
5
  import { ParseError, parseJSON } from "../parse";
5
- import { getAPIToken, loginOrRefreshIfRequired } from "../user";
6
+ import { loginOrRefreshIfRequired, requireApiToken } from "../user";
7
+ import type { ApiCredentials } from "../user";
6
8
  import type { URLSearchParams } from "node:url";
7
9
  import type { RequestInit, HeadersInit } from "undici";
8
10
 
@@ -10,9 +12,9 @@ import type { RequestInit, HeadersInit } from "undici";
10
12
  * Get the URL to use to access the Cloudflare API.
11
13
  */
12
14
  export const getCloudflareAPIBaseURL = getEnvironmentVariableFactory({
13
- variableName: "CLOUDFLARE_API_BASE_URL",
14
- deprecatedName: "CF_API_BASE_URL",
15
- defaultValue: "https://api.cloudflare.com/client/v4",
15
+ variableName: "CLOUDFLARE_API_BASE_URL",
16
+ deprecatedName: "CF_API_BASE_URL",
17
+ defaultValue: "https://api.cloudflare.com/client/v4",
16
18
  });
17
19
 
18
20
  /**
@@ -25,90 +27,91 @@ export const getCloudflareAPIBaseURL = getEnvironmentVariableFactory({
25
27
  * This function should not be used directly, instead use the functions in `cfetch/index.ts`.
26
28
  */
27
29
  export async function fetchInternal<ResponseType>(
28
- resource: string,
29
- init: RequestInit = {},
30
- queryParams?: URLSearchParams,
31
- abortSignal?: AbortSignal
30
+ resource: string,
31
+ init: RequestInit = {},
32
+ queryParams?: URLSearchParams,
33
+ abortSignal?: AbortSignal
32
34
  ): Promise<ResponseType> {
33
- await requireLoggedIn();
34
- const apiToken = requireApiToken();
35
- const headers = cloneHeaders(init.headers);
36
- addAuthorizationHeaderIfUnspecified(headers, apiToken);
37
- addUserAgent(headers);
35
+ assert(
36
+ resource.startsWith("/"),
37
+ `CF API fetch - resource path must start with a "/" but got "${resource}"`
38
+ );
39
+ await requireLoggedIn();
40
+ const apiToken = requireApiToken();
41
+ const headers = cloneHeaders(init.headers);
42
+ addAuthorizationHeaderIfUnspecified(headers, apiToken);
43
+ addUserAgent(headers);
38
44
 
39
- const queryString = queryParams ? `?${queryParams.toString()}` : "";
40
- const method = init.method ?? "GET";
41
- const response = await fetch(
42
- `${getCloudflareAPIBaseURL()}${resource}${queryString}`,
43
- {
44
- method,
45
- ...init,
46
- headers,
47
- signal: abortSignal,
48
- }
49
- );
50
- const jsonText = await response.text();
51
- try {
52
- return parseJSON<ResponseType>(jsonText);
53
- } catch (err) {
54
- throw new ParseError({
55
- text: "Received a malformed response from the API",
56
- notes: [
57
- {
58
- text: truncate(jsonText, 100),
59
- },
60
- {
61
- text: `${method} ${resource} -> ${response.status} ${response.statusText}`,
62
- },
63
- ],
64
- });
65
- }
45
+ const queryString = queryParams ? `?${queryParams.toString()}` : "";
46
+ const method = init.method ?? "GET";
47
+ const response = await fetch(
48
+ `${getCloudflareAPIBaseURL()}${resource}${queryString}`,
49
+ {
50
+ method,
51
+ ...init,
52
+ headers,
53
+ signal: abortSignal,
54
+ }
55
+ );
56
+ const jsonText = await response.text();
57
+ try {
58
+ return parseJSON<ResponseType>(jsonText);
59
+ } catch (err) {
60
+ throw new ParseError({
61
+ text: "Received a malformed response from the API",
62
+ notes: [
63
+ {
64
+ text: truncate(jsonText, 100),
65
+ },
66
+ {
67
+ text: `${method} ${resource} -> ${response.status} ${response.statusText}`,
68
+ },
69
+ ],
70
+ });
71
+ }
66
72
  }
67
73
 
68
74
  function truncate(text: string, maxLength: number): string {
69
- const { length } = text;
70
- if (length <= maxLength) {
71
- return text;
72
- }
73
- return `${text.substring(0, maxLength)}... (length = ${length})`;
75
+ const { length } = text;
76
+ if (length <= maxLength) {
77
+ return text;
78
+ }
79
+ return `${text.substring(0, maxLength)}... (length = ${length})`;
74
80
  }
75
81
 
76
82
  function cloneHeaders(
77
- headers: HeadersInit | undefined
83
+ headers: HeadersInit | undefined
78
84
  ): Record<string, string> {
79
- return headers instanceof Headers
80
- ? Object.fromEntries(headers.entries())
81
- : Array.isArray(headers)
82
- ? Object.fromEntries(headers)
83
- : { ...headers };
85
+ return headers instanceof Headers
86
+ ? Object.fromEntries(headers.entries())
87
+ : Array.isArray(headers)
88
+ ? Object.fromEntries(headers)
89
+ : { ...headers };
84
90
  }
85
91
 
86
92
  async function requireLoggedIn(): Promise<void> {
87
- const loggedIn = await loginOrRefreshIfRequired();
88
- if (!loggedIn) {
89
- throw new Error("Not logged in.");
90
- }
91
- }
92
-
93
- function requireApiToken(): string {
94
- const authToken = getAPIToken();
95
- if (!authToken) {
96
- throw new Error("No API token found.");
97
- }
98
- return authToken;
93
+ const loggedIn = await loginOrRefreshIfRequired();
94
+ if (!loggedIn) {
95
+ throw new Error("Not logged in.");
96
+ }
99
97
  }
100
98
 
101
99
  function addAuthorizationHeaderIfUnspecified(
102
- headers: Record<string, string>,
103
- apiToken: string
100
+ headers: Record<string, string>,
101
+ auth: ApiCredentials
104
102
  ): void {
105
- if (!("Authorization" in headers)) {
106
- headers["Authorization"] = `Bearer ${apiToken}`;
107
- }
103
+ if (!("Authorization" in headers)) {
104
+ if ("apiToken" in auth) {
105
+ headers["Authorization"] = `Bearer ${auth.apiToken}`;
106
+ } else {
107
+ headers["X-Auth-Key"] = auth.authKey;
108
+ headers["X-Auth-Email"] = auth.authEmail;
109
+ }
110
+ }
108
111
  }
109
112
 
110
113
  function addUserAgent(headers: Record<string, string>): void {
111
- headers["User-Agent"] = `wrangler/${wranglerVersion}`;
114
+ headers["User-Agent"] = `wrangler/${wranglerVersion}`;
112
115
  }
113
116
 
114
117
  /**
@@ -123,23 +126,24 @@ function addUserAgent(headers: Record<string, string>): void {
123
126
  */
124
127
 
125
128
  export async function fetchKVGetValue(
126
- accountId: string,
127
- namespaceId: string,
128
- key: string
129
- ): Promise<string> {
130
- await requireLoggedIn();
131
- const apiToken = requireApiToken();
132
- const headers = { Authorization: `Bearer ${apiToken}` };
133
- const resource = `${getCloudflareAPIBaseURL()}/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${key}`;
134
- const response = await fetch(resource, {
135
- method: "GET",
136
- headers,
137
- });
138
- if (response.ok) {
139
- return await response.text();
140
- } else {
141
- throw new Error(
142
- `Failed to fetch ${resource} - ${response.status}: ${response.statusText});`
143
- );
144
- }
129
+ accountId: string,
130
+ namespaceId: string,
131
+ key: string
132
+ ): Promise<ArrayBuffer> {
133
+ await requireLoggedIn();
134
+ const auth = requireApiToken();
135
+ const headers: Record<string, string> = {};
136
+ addAuthorizationHeaderIfUnspecified(headers, auth);
137
+ const resource = `${getCloudflareAPIBaseURL()}/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${key}`;
138
+ const response = await fetch(resource, {
139
+ method: "GET",
140
+ headers,
141
+ });
142
+ if (response.ok) {
143
+ return await response.arrayBuffer();
144
+ } else {
145
+ throw new Error(
146
+ `Failed to fetch ${resource} - ${response.status}: ${response.statusText});`
147
+ );
148
+ }
145
149
  }
package/src/cli.ts CHANGED
@@ -1,13 +1,27 @@
1
1
  import "dotenv/config"; // Grab locally specified env params from a `.env` file.
2
2
  import process from "process";
3
3
  import { hideBin } from "yargs/helpers";
4
+ import { unstable_dev } from "./api";
4
5
  import { FatalError } from "./errors";
5
6
  import { main } from ".";
6
7
 
7
- main(hideBin(process.argv)).catch((e) => {
8
- // The logging of any error that was thrown from `main()` is handled in the `yargs.fail()` handler.
9
- // Here we just want to ensure that the process exits with a non-zero code.
10
- // We don't want to do this inside the `main()` function, since that would kill the process when running our tests.
11
- const exitCode = (e instanceof FatalError && e.code) || 1;
12
- process.exit(exitCode);
13
- });
8
+ /**
9
+ * The main entrypoint for the CLI.
10
+ * main only gets called when the script is run directly, not when it's imported as a module.
11
+ */
12
+ if (require.main) {
13
+ main(hideBin(process.argv)).catch((e) => {
14
+ // The logging of any error that was thrown from `main()` is handled in the `yargs.fail()` handler.
15
+ // Here we just want to ensure that the process exits with a non-zero code.
16
+ // We don't want to do this inside the `main()` function, since that would kill the process when running our tests.
17
+ const exitCode = (e instanceof FatalError && e.code) || 1;
18
+ process.exit(exitCode);
19
+ });
20
+ }
21
+
22
+ /**
23
+ * This is how we're exporting the API.
24
+ * It makes it possible to import wrangler from 'wrangler',
25
+ * and call wrangler.unstable_dev().
26
+ */
27
+ module.exports = { unstable_dev };