wrangler 0.0.0-e98613f8 → 0.0.0-e9a45766c

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 (244) hide show
  1. package/README.md +10 -4
  2. package/bin/wrangler.js +10 -2
  3. package/miniflare-dist/index.mjs +257 -132
  4. package/package.json +26 -19
  5. package/src/__tests__/api-dev.test.ts +65 -36
  6. package/src/__tests__/api-devregistry.test.ts +121 -0
  7. package/src/__tests__/api.test.ts +27 -5
  8. package/src/__tests__/configuration.test.ts +575 -39
  9. package/src/__tests__/constellation.test.ts +371 -0
  10. package/src/__tests__/d1/d1.test.ts +82 -0
  11. package/src/__tests__/d1/execute.test.ts +66 -0
  12. package/src/__tests__/d1/migrate.test.ts +257 -0
  13. package/src/__tests__/d1/splitter.test.ts +255 -0
  14. package/src/__tests__/delete.test.ts +11 -2
  15. package/src/__tests__/deployments.test.ts +330 -52
  16. package/src/__tests__/dev.test.tsx +146 -82
  17. package/src/__tests__/generate.test.ts +10 -8
  18. package/src/__tests__/guess-worker-format.test.ts +35 -0
  19. package/src/__tests__/helpers/end-event-loop.ts +6 -0
  20. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  21. package/src/__tests__/helpers/mock-console.ts +6 -0
  22. package/src/__tests__/helpers/mock-dialogs.ts +71 -85
  23. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
  24. package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -5
  25. package/src/__tests__/helpers/mock-known-routes.ts +7 -2
  26. package/src/__tests__/helpers/mock-kv.ts +29 -16
  27. package/src/__tests__/helpers/mock-oauth-flow.ts +99 -92
  28. package/src/__tests__/helpers/mock-process.ts +8 -13
  29. package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
  30. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  31. package/src/__tests__/helpers/msw/handlers/deployments.ts +127 -26
  32. package/src/__tests__/helpers/msw/handlers/namespaces.ts +18 -41
  33. package/src/__tests__/helpers/msw/handlers/r2.ts +14 -34
  34. package/src/__tests__/helpers/msw/handlers/script.ts +9 -28
  35. package/src/__tests__/helpers/msw/handlers/user.ts +13 -24
  36. package/src/__tests__/helpers/msw/handlers/zones.ts +6 -8
  37. package/src/__tests__/helpers/msw/index.ts +32 -1
  38. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  39. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
  40. package/src/__tests__/helpers/worker-scripts/parent-worker.js +4 -1
  41. package/src/__tests__/index.test.ts +92 -74
  42. package/src/__tests__/init.test.ts +909 -628
  43. package/src/__tests__/jest.setup.ts +19 -42
  44. package/src/__tests__/kv.test.ts +355 -231
  45. package/src/__tests__/logger.test.ts +68 -2
  46. package/src/__tests__/logout.test.ts +1 -1
  47. package/src/__tests__/metrics.test.ts +93 -50
  48. package/src/__tests__/middleware.scheduled.test.ts +42 -32
  49. package/src/__tests__/middleware.test.ts +212 -122
  50. package/src/__tests__/mtls-certificates.test.ts +589 -0
  51. package/src/__tests__/pages/deployment-list.test.ts +80 -0
  52. package/src/__tests__/pages/functions-build.test.ts +528 -0
  53. package/src/__tests__/pages/pages.test.ts +81 -0
  54. package/src/__tests__/pages/project-create.test.ts +63 -0
  55. package/src/__tests__/pages/project-list.test.ts +110 -0
  56. package/src/__tests__/pages/project-upload.test.ts +500 -0
  57. package/src/__tests__/pages/publish.test.ts +2864 -0
  58. package/src/__tests__/pages-deployment-tail.test.ts +239 -102
  59. package/src/__tests__/parse.test.ts +106 -0
  60. package/src/__tests__/publish.test.ts +2218 -1002
  61. package/src/__tests__/pubsub.test.ts +226 -100
  62. package/src/__tests__/queues.test.ts +42 -32
  63. package/src/__tests__/r2.test.ts +37 -56
  64. package/src/__tests__/secret.test.ts +179 -130
  65. package/src/__tests__/tail.test.ts +113 -23
  66. package/src/__tests__/test-old-node-version.js +3 -3
  67. package/src/__tests__/traverse-module-graph.test.ts +220 -0
  68. package/src/__tests__/tsconfig-sanity.ts +12 -0
  69. package/src/__tests__/tsconfig.json +8 -0
  70. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  71. package/src/__tests__/type-generation.test.ts +8 -0
  72. package/src/__tests__/user.test.ts +7 -18
  73. package/src/__tests__/whoami.test.tsx +8 -114
  74. package/src/__tests__/worker-namespace.test.ts +83 -69
  75. package/src/api/dev.ts +172 -61
  76. package/src/api/index.ts +10 -1
  77. package/src/api/mtls-certificate.ts +148 -0
  78. package/src/api/pages/create-worker-bundle-contents.ts +77 -0
  79. package/src/api/pages/index.ts +5 -0
  80. package/src/api/pages/publish.tsx +371 -0
  81. package/src/bundle.ts +139 -33
  82. package/src/cfetch/index.ts +0 -2
  83. package/src/cfetch/internal.ts +16 -21
  84. package/src/cli.ts +4 -4
  85. package/src/config/config.ts +14 -7
  86. package/src/config/environment.ts +80 -16
  87. package/src/config/index.ts +99 -30
  88. package/src/config/validation-helpers.ts +1 -1
  89. package/src/config/validation.ts +275 -9
  90. package/src/constellation/createProject.tsx +51 -0
  91. package/src/constellation/deleteProject.ts +51 -0
  92. package/src/constellation/deleteProjectModel.ts +68 -0
  93. package/src/constellation/index.ts +75 -0
  94. package/src/constellation/listCatalog.tsx +35 -0
  95. package/src/constellation/listModel.tsx +41 -0
  96. package/src/constellation/listProject.tsx +28 -0
  97. package/src/constellation/listRuntime.tsx +28 -0
  98. package/src/constellation/options.ts +17 -0
  99. package/src/constellation/types.ts +17 -0
  100. package/src/constellation/uploadModel.tsx +64 -0
  101. package/src/constellation/utils.ts +90 -0
  102. package/src/create-worker-preview.ts +19 -8
  103. package/src/create-worker-upload-form.ts +52 -5
  104. package/src/d1/backups.tsx +40 -44
  105. package/src/d1/create.tsx +50 -43
  106. package/src/d1/{delete.tsx → delete.ts} +8 -11
  107. package/src/d1/execute.tsx +171 -166
  108. package/src/d1/index.ts +5 -6
  109. package/src/d1/list.tsx +27 -13
  110. package/src/d1/migrations/apply.tsx +92 -64
  111. package/src/d1/migrations/create.tsx +31 -29
  112. package/src/d1/migrations/helpers.ts +66 -44
  113. package/src/d1/migrations/list.tsx +47 -31
  114. package/src/d1/migrations/options.ts +7 -2
  115. package/src/d1/options.ts +3 -3
  116. package/src/d1/splitter.ts +161 -0
  117. package/src/d1/{types.tsx → types.ts} +1 -0
  118. package/src/d1/utils.ts +2 -1
  119. package/src/delete.ts +8 -16
  120. package/src/deployments.ts +333 -42
  121. package/src/deprecated/index.ts +8 -302
  122. package/src/dev/dev.tsx +13 -22
  123. package/src/dev/local.tsx +131 -69
  124. package/src/dev/remote.tsx +35 -3
  125. package/src/dev/start-server.ts +83 -77
  126. package/src/dev/use-esbuild.ts +63 -52
  127. package/src/dev/validate-dev-props.ts +9 -0
  128. package/src/{dev-registry.tsx → dev-registry.ts} +9 -8
  129. package/src/dev.tsx +131 -110
  130. package/src/dialogs.ts +136 -0
  131. package/src/dispatch-namespace.ts +21 -17
  132. package/src/docs/helpers.ts +50 -0
  133. package/src/docs/index.ts +54 -0
  134. package/src/entry.ts +26 -11
  135. package/src/environment-variables/factory.ts +89 -0
  136. package/src/environment-variables/misc-variables.ts +30 -0
  137. package/src/generate/index.ts +298 -0
  138. package/src/{index.tsx → index.ts} +137 -56
  139. package/src/init.ts +254 -187
  140. package/src/inspect.ts +170 -9
  141. package/src/jest.d.ts +4 -0
  142. package/src/kv/helpers.ts +7 -4
  143. package/src/kv/index.ts +15 -17
  144. package/src/logger.ts +36 -5
  145. package/src/metrics/metrics-config.ts +1 -1
  146. package/src/metrics/send-event.ts +4 -1
  147. package/src/miniflare-cli/assets.ts +66 -31
  148. package/src/miniflare-cli/index.ts +5 -8
  149. package/src/miniflare-cli/tsconfig.json +9 -0
  150. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  151. package/src/miniflare-cli/types.ts +11 -0
  152. package/src/module-collection.ts +92 -26
  153. package/src/mtls-certificate/cli.ts +155 -0
  154. package/src/pages/build.ts +423 -0
  155. package/src/pages/buildFunctions.ts +140 -0
  156. package/src/pages/{deployment-tails.tsx → deployment-tails.ts} +7 -10
  157. package/src/pages/deployments.tsx +9 -9
  158. package/src/pages/{dev.tsx → dev.ts} +167 -139
  159. package/src/pages/errors.ts +1 -0
  160. package/src/pages/functions/buildPlugin.ts +61 -54
  161. package/src/pages/functions/buildWorker.ts +217 -33
  162. package/src/pages/functions/tsconfig.json +8 -0
  163. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  164. package/src/pages/{functions.tsx → functions.ts} +8 -4
  165. package/src/pages/{index.tsx → index.ts} +3 -3
  166. package/src/pages/projects.tsx +12 -22
  167. package/src/pages/publish.tsx +43 -227
  168. package/src/pages/types.ts +5 -0
  169. package/src/pages/upload.tsx +57 -14
  170. package/src/pages/utils.ts +1 -1
  171. package/src/parse.ts +23 -1
  172. package/src/paths.ts +1 -1
  173. package/src/publish/index.ts +20 -16
  174. package/src/publish/publish.ts +76 -46
  175. package/src/pubsub/{pubsub-commands.tsx → pubsub-commands.ts} +19 -20
  176. package/src/queues/cli/commands/consumer/add.ts +24 -24
  177. package/src/queues/cli/commands/consumer/index.ts +3 -6
  178. package/src/queues/cli/commands/consumer/remove.ts +11 -18
  179. package/src/queues/cli/commands/create.ts +8 -8
  180. package/src/queues/cli/commands/delete.ts +8 -8
  181. package/src/queues/cli/commands/index.ts +3 -4
  182. package/src/queues/cli/commands/list.ts +8 -8
  183. package/src/queues/client.ts +1 -0
  184. package/src/r2/helpers.ts +1 -0
  185. package/src/r2/index.ts +28 -28
  186. package/src/secret/index.ts +15 -16
  187. package/src/{sites.tsx → sites.ts} +165 -53
  188. package/src/tail/createTail.ts +37 -1
  189. package/src/tail/filters.ts +1 -1
  190. package/src/tail/index.ts +8 -11
  191. package/src/tail/printing.ts +25 -0
  192. package/src/traverse-module-graph.ts +54 -0
  193. package/src/tsconfig-sanity.ts +16 -0
  194. package/src/type-generation.ts +11 -3
  195. package/src/user/access.ts +0 -1
  196. package/src/user/auth-variables.ts +113 -0
  197. package/src/user/choose-account.tsx +1 -31
  198. package/src/user/index.ts +0 -1
  199. package/src/user/{user.tsx → user.ts} +114 -77
  200. package/src/utils/render.ts +93 -0
  201. package/src/{whoami.tsx → whoami.ts} +37 -71
  202. package/src/worker.ts +35 -1
  203. package/src/yargs-types.ts +18 -5
  204. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  205. package/templates/__tests__/tsconfig.json +8 -0
  206. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  207. package/templates/checked-fetch.js +9 -3
  208. package/templates/d1-beta-facade.js +42 -3
  209. package/templates/facade.d.ts +14 -0
  210. package/templates/first-party-worker-module-facade.ts +4 -3
  211. package/templates/format-dev-errors.ts +8 -6
  212. package/templates/gitignore +1 -0
  213. package/templates/init-tests/test-jest-new-worker.js +3 -5
  214. package/templates/init-tests/test-vitest-new-worker.js +3 -5
  215. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  216. package/templates/middleware/loader-modules.ts +2 -2
  217. package/templates/middleware/loader-sw.ts +6 -0
  218. package/templates/middleware/middleware-miniflare3-json-error.ts +17 -5
  219. package/templates/new-worker.ts +3 -0
  220. package/templates/pages-dev-pipeline.ts +4 -1
  221. package/templates/pages-shim.ts +4 -1
  222. package/templates/pages-template-plugin.ts +19 -10
  223. package/templates/serve-static-assets.ts +17 -14
  224. package/templates/service-bindings-module-facade.js +1 -0
  225. package/templates/tsconfig-sanity.ts +11 -0
  226. package/templates/tsconfig.init.json +105 -0
  227. package/templates/tsconfig.json +5 -103
  228. package/templates/tsconfig.tsbuildinfo +1 -0
  229. package/wrangler-dist/cli.d.ts +871 -73
  230. package/wrangler-dist/cli.js +80512 -90686
  231. package/wrangler-dist/wasm-sync.wasm +0 -0
  232. package/src/__tests__/api-devregistry.test.js +0 -56
  233. package/src/__tests__/d1.test.ts +0 -80
  234. package/src/__tests__/dialogs.test.tsx +0 -40
  235. package/src/__tests__/helpers/mock-cfetch.ts +0 -333
  236. package/src/__tests__/pages.test.ts +0 -2442
  237. package/src/dialogs.tsx +0 -168
  238. package/src/environment-variables.ts +0 -50
  239. package/src/pages/build.tsx +0 -270
  240. package/src/user/env-vars.ts +0 -46
  241. /package/src/{bundle-reporter.tsx → bundle-reporter.ts} +0 -0
  242. /package/src/d1/migrations/{index.tsx → index.ts} +0 -0
  243. /package/src/dev/{get-local-persistence-path.tsx → get-local-persistence-path.ts} +0 -0
  244. /package/src/pages/{hash.tsx → hash.ts} +0 -0
package/src/dialogs.tsx DELETED
@@ -1,168 +0,0 @@
1
- import chalk from "chalk";
2
- import { Box, Text, useInput, render } from "ink";
3
- import SelectInput from "ink-select-input";
4
- import TextInput from "ink-text-input";
5
- import * as React from "react";
6
- import { useState } from "react";
7
-
8
- import { CI } from "./is-ci";
9
- import isInteractive from "./is-interactive";
10
- import { logger } from "./logger";
11
-
12
- type ConfirmProps = {
13
- text: string;
14
- onConfirm: (answer: boolean) => void;
15
- };
16
- function Confirm(props: ConfirmProps) {
17
- useInput((input: string, key) => {
18
- if (input === "y" || key.return === true) {
19
- props.onConfirm(true);
20
- } else if (input === "n") {
21
- props.onConfirm(false);
22
- } else {
23
- logger.warn("Unrecognised input:", input);
24
- }
25
- });
26
- return (
27
- <Box>
28
- <Text>
29
- {props.text} ({chalk.bold("y")}/n)
30
- </Text>
31
- </Box>
32
- );
33
- }
34
-
35
- export function confirm(
36
- text: string,
37
- beforeConfirm?: JSX.Element
38
- ): Promise<boolean> {
39
- return new Promise((resolve) => {
40
- const { unmount } = render(
41
- <Box flexDirection="column">
42
- {beforeConfirm}
43
- <Confirm
44
- text={text}
45
- onConfirm={(answer: boolean) => {
46
- unmount();
47
- resolve(answer);
48
- }}
49
- />
50
- </Box>
51
- );
52
- });
53
- }
54
-
55
- type PromptProps = {
56
- text: string;
57
- defaultValue?: string;
58
- type?: "text" | "password";
59
- onSubmit: (text: string) => void;
60
- };
61
-
62
- function Prompt(props: PromptProps) {
63
- const [value, setValue] = useState(props.defaultValue || "");
64
-
65
- return (
66
- <Box>
67
- <Text>{props.text} </Text>
68
- <Box>
69
- <TextInput
70
- mask={props.type === "password" ? "*" : undefined}
71
- value={value}
72
- onChange={setValue}
73
- onSubmit={props.onSubmit}
74
- />
75
- </Box>
76
- </Box>
77
- );
78
- }
79
-
80
- export async function prompt(
81
- text: string,
82
- type: "text" | "password" = "text",
83
- defaultValue?: string
84
- ): Promise<string> {
85
- return new Promise((resolve) => {
86
- const { unmount } = render(
87
- <Prompt
88
- text={text}
89
- defaultValue={defaultValue}
90
- type={type}
91
- onSubmit={(inputText) => {
92
- unmount();
93
- resolve(inputText);
94
- }}
95
- />
96
- );
97
- });
98
- }
99
-
100
- type SelectOption = {
101
- value: string;
102
- label: string;
103
- };
104
-
105
- type SelectProps = {
106
- text: string;
107
- options: SelectOption[];
108
- initialIndex: number;
109
- onSelect: (value: string) => void;
110
- };
111
-
112
- function Select(props: SelectProps) {
113
- return (
114
- <Box flexDirection="column">
115
- <Text>{props.text}</Text>
116
- <SelectInput
117
- initialIndex={props.initialIndex}
118
- items={props.options}
119
- onSelect={async (selected) => {
120
- props.onSelect(selected.value);
121
- }}
122
- />
123
- </Box>
124
- );
125
- }
126
-
127
- export function select(
128
- text: string,
129
- options: SelectOption[],
130
- initialIndex: number
131
- ): Promise<string> {
132
- return new Promise((resolve) => {
133
- const { unmount } = render(
134
- <Select
135
- text={text}
136
- options={options}
137
- initialIndex={initialIndex}
138
- onSelect={(option: string) => {
139
- unmount();
140
- resolve(option);
141
- }}
142
- />
143
- );
144
- });
145
- }
146
-
147
- export function logDim(msg: string) {
148
- console.log(chalk.gray(msg));
149
- }
150
-
151
- export async function fromDashMessagePrompt(
152
- deploySource: "dash" | "wrangler" | "api"
153
- ): Promise<boolean | void> {
154
- if (deploySource === "dash") {
155
- logger.warn(
156
- `You are about to publish a Workers Service that was last published via the Cloudflare Dashboard.\nEdits that have been made via the dashboard will be overridden by your local code and config.`
157
- );
158
-
159
- if (!isInteractive() || CI.isCI()) return true;
160
-
161
- return await confirm("Would you like to continue?");
162
- }
163
- }
164
- export async function tailDOLogPrompt(): Promise<boolean | void> {
165
- if (!isInteractive() || CI.isCI()) return true;
166
-
167
- return await confirm("Would you like to continue?");
168
- }
@@ -1,50 +0,0 @@
1
- import { logger } from "./logger";
2
-
3
- type VariableNames =
4
- | "CLOUDFLARE_ACCOUNT_ID"
5
- | "CLOUDFLARE_API_TOKEN"
6
- | "CLOUDFLARE_API_KEY"
7
- | "CLOUDFLARE_EMAIL"
8
- | "WRANGLER_SEND_METRICS"
9
- | "CLOUDFLARE_API_BASE_URL"
10
- | "WRANGLER_LOG";
11
-
12
- type DeprecatedNames =
13
- | "CF_ACCOUNT_ID"
14
- | "CF_API_TOKEN"
15
- | "CF_API_KEY"
16
- | "CF_EMAIL"
17
- | "CF_API_BASE_URL";
18
- /**
19
- * Create a function used to access an environment variable.
20
- *
21
- * This is not memoized to allow us to change the value at runtime, such as in testing.
22
- * A warning is shown if the client is using a deprecated version - but only once.
23
- */
24
- export function getEnvironmentVariableFactory({
25
- variableName,
26
- deprecatedName,
27
- defaultValue,
28
- }: {
29
- variableName: VariableNames;
30
- deprecatedName?: DeprecatedNames;
31
- defaultValue?: string;
32
- }) {
33
- let hasWarned = false;
34
- return () => {
35
- if (process.env[variableName]) {
36
- return process.env[variableName];
37
- } else if (deprecatedName && process.env[deprecatedName]) {
38
- if (!hasWarned) {
39
- // Only show the warning once.
40
- hasWarned = true;
41
- logger.warn(
42
- `Using "${deprecatedName}" environment variable. This is deprecated. Please use "${variableName}", instead.`
43
- );
44
- }
45
- return process.env[deprecatedName];
46
- } else {
47
- return defaultValue;
48
- }
49
- };
50
- }
@@ -1,270 +0,0 @@
1
- import { writeFileSync } from "node:fs";
2
- import { tmpdir } from "node:os";
3
- import { dirname, join, resolve } from "node:path";
4
- import { FatalError } from "../errors";
5
- import { logger } from "../logger";
6
- import * as metrics from "../metrics";
7
- import { toUrlPath } from "../paths";
8
- import { isInPagesCI } from "./constants";
9
- import {
10
- EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR,
11
- FunctionsNoRoutesError,
12
- getFunctionsNoRoutesWarning,
13
- } from "./errors";
14
- import { buildPlugin } from "./functions/buildPlugin";
15
- import { buildWorker } from "./functions/buildWorker";
16
- import { generateConfigFromFileTree } from "./functions/filepath-routing";
17
- import { writeRoutesModule } from "./functions/routes";
18
- import { convertRoutesToRoutesJSONSpec } from "./functions/routes-transformation";
19
- import { pagesBetaWarning, RUNNING_BUILDERS } from "./utils";
20
- import type { YargsOptionsToInterface } from "../yargs-types";
21
- import type { Config } from "./functions/routes";
22
- import type { Argv } from "yargs";
23
-
24
- type PagesBuildArgs = YargsOptionsToInterface<typeof Options>;
25
-
26
- export function Options(yargs: Argv) {
27
- return yargs
28
- .positional("directory", {
29
- type: "string",
30
- default: "functions",
31
- description: "The directory of Pages Functions",
32
- })
33
- .options({
34
- outfile: {
35
- type: "string",
36
- default: "_worker.js",
37
- description: "The location of the output Worker script",
38
- },
39
- "output-config-path": {
40
- type: "string",
41
- description: "The location for the output config file",
42
- },
43
- "output-routes-path": {
44
- type: "string",
45
- description: "The location for the output _routes.json file",
46
- },
47
- minify: {
48
- type: "boolean",
49
- default: false,
50
- description: "Minify the output Worker script",
51
- },
52
- sourcemap: {
53
- type: "boolean",
54
- default: false,
55
- description: "Generate a sourcemap for the output Worker script",
56
- },
57
- "fallback-service": {
58
- type: "string",
59
- default: "ASSETS",
60
- description:
61
- "The service to fallback to at the end of the `next` chain. Setting to '' will fallback to the global `fetch`.",
62
- },
63
- watch: {
64
- type: "boolean",
65
- default: false,
66
- description:
67
- "Watch for changes to the functions and automatically rebuild the Worker script",
68
- },
69
- plugin: {
70
- type: "boolean",
71
- default: false,
72
- description: "Build a plugin rather than a Worker script",
73
- },
74
- "build-output-directory": {
75
- type: "string",
76
- description: "The directory to output static assets to",
77
- },
78
- "node-compat": {
79
- describe: "Enable node.js compatibility",
80
- default: false,
81
- type: "boolean",
82
- hidden: true,
83
- },
84
- bindings: {
85
- type: "string",
86
- describe:
87
- "Bindings used in Functions (used to register beta product shims)",
88
- deprecated: true,
89
- hidden: true,
90
- },
91
- })
92
- .epilogue(pagesBetaWarning);
93
- }
94
-
95
- export const Handler = async ({
96
- directory,
97
- outfile,
98
- outputConfigPath,
99
- outputRoutesPath: routesOutputPath,
100
- minify,
101
- sourcemap,
102
- fallbackService,
103
- watch,
104
- plugin,
105
- buildOutputDirectory,
106
- nodeCompat,
107
- bindings,
108
- }: PagesBuildArgs) => {
109
- if (!isInPagesCI) {
110
- // Beta message for `wrangler pages <commands>` usage
111
- logger.log(pagesBetaWarning);
112
- }
113
-
114
- if (nodeCompat) {
115
- console.warn(
116
- "Enabling node.js compatibility mode for builtins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details."
117
- );
118
- }
119
-
120
- let d1Databases: string[] | undefined = undefined;
121
- if (bindings) {
122
- try {
123
- const decodedBindings = JSON.parse(bindings);
124
- d1Databases = Object.keys(decodedBindings?.d1_databases || {});
125
- } catch {
126
- throw new FatalError("Could not parse a valid set of 'bindings'.", 1);
127
- }
128
- }
129
-
130
- buildOutputDirectory ??= dirname(outfile);
131
- try {
132
- await buildFunctions({
133
- outfile,
134
- outputConfigPath,
135
- functionsDirectory: directory,
136
- minify,
137
- sourcemap,
138
- fallbackService,
139
- watch,
140
- plugin,
141
- buildOutputDirectory,
142
- nodeCompat,
143
- routesOutputPath,
144
- local: false,
145
- d1Databases,
146
- });
147
- } catch (e) {
148
- if (e instanceof FunctionsNoRoutesError) {
149
- throw new FatalError(
150
- getFunctionsNoRoutesWarning(directory),
151
- EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR
152
- );
153
- } else {
154
- throw e;
155
- }
156
- }
157
- await metrics.sendMetricsEvent("build pages functions");
158
- };
159
-
160
- /**
161
- * Builds a Functions worker based on the functions directory, with filepath and handler based routing.
162
- * @throws FunctionsNoRoutesError when there are no routes found in the functions directory
163
- */
164
- export async function buildFunctions({
165
- outfile,
166
- outputConfigPath,
167
- functionsDirectory,
168
- minify = false,
169
- sourcemap = false,
170
- fallbackService = "ASSETS",
171
- watch = false,
172
- onEnd,
173
- plugin = false,
174
- buildOutputDirectory,
175
- routesOutputPath,
176
- nodeCompat,
177
- local,
178
- d1Databases,
179
- }: Partial<
180
- Pick<
181
- PagesBuildArgs,
182
- | "outputConfigPath"
183
- | "minify"
184
- | "sourcemap"
185
- | "fallbackService"
186
- | "watch"
187
- | "plugin"
188
- | "buildOutputDirectory"
189
- | "nodeCompat"
190
- >
191
- > & {
192
- functionsDirectory: string;
193
- onEnd?: () => void;
194
- outfile: Required<PagesBuildArgs>["outfile"];
195
- routesOutputPath?: PagesBuildArgs["outputRoutesPath"];
196
- local: boolean;
197
- d1Databases?: string[];
198
- }) {
199
- RUNNING_BUILDERS.forEach(
200
- (runningBuilder) => runningBuilder.stop && runningBuilder.stop()
201
- );
202
-
203
- const routesModule = join(tmpdir(), `./functionsRoutes-${Math.random()}.mjs`);
204
- const baseURL = toUrlPath("/");
205
-
206
- const config: Config = await generateConfigFromFileTree({
207
- baseDir: functionsDirectory,
208
- baseURL,
209
- });
210
-
211
- if (!config.routes || config.routes.length === 0) {
212
- throw new FunctionsNoRoutesError(
213
- `Failed to find any routes while compiling Functions in: ${functionsDirectory}`
214
- );
215
- }
216
-
217
- if (routesOutputPath) {
218
- const routesJSON = convertRoutesToRoutesJSONSpec(config.routes);
219
- writeFileSync(routesOutputPath, JSON.stringify(routesJSON, null, 2));
220
- }
221
-
222
- if (outputConfigPath) {
223
- writeFileSync(
224
- outputConfigPath,
225
- JSON.stringify({ ...config, baseURL }, null, 2)
226
- );
227
- }
228
-
229
- await writeRoutesModule({
230
- config,
231
- srcDir: functionsDirectory,
232
- outfile: routesModule,
233
- });
234
-
235
- const absoluteFunctionsDirectory = resolve(functionsDirectory);
236
-
237
- if (plugin) {
238
- RUNNING_BUILDERS.push(
239
- await buildPlugin({
240
- routesModule,
241
- outfile,
242
- minify,
243
- sourcemap,
244
- watch,
245
- nodeCompat,
246
- functionsDirectory: absoluteFunctionsDirectory,
247
- local,
248
- betaD1Shims: d1Databases,
249
- onEnd,
250
- })
251
- );
252
- } else {
253
- RUNNING_BUILDERS.push(
254
- await buildWorker({
255
- routesModule,
256
- outfile,
257
- minify,
258
- sourcemap,
259
- fallbackService,
260
- watch,
261
- functionsDirectory: absoluteFunctionsDirectory,
262
- local,
263
- betaD1Shims: d1Databases,
264
- onEnd,
265
- buildOutputDirectory,
266
- nodeCompat,
267
- })
268
- );
269
- }
270
- }
@@ -1,46 +0,0 @@
1
- import { getEnvironmentVariableFactory } from "../environment-variables";
2
-
3
- export type ApiCredentials =
4
- | {
5
- apiToken: string;
6
- }
7
- | {
8
- authKey: string;
9
- authEmail: string;
10
- };
11
-
12
- const getCloudflareAPITokenFromEnv = getEnvironmentVariableFactory({
13
- variableName: "CLOUDFLARE_API_TOKEN",
14
- deprecatedName: "CF_API_TOKEN",
15
- });
16
- const getCloudflareGlobalAuthKeyFromEnv = getEnvironmentVariableFactory({
17
- variableName: "CLOUDFLARE_API_KEY",
18
- deprecatedName: "CF_API_KEY",
19
- });
20
- const getCloudflareGlobalAuthEmailFromEnv = getEnvironmentVariableFactory({
21
- variableName: "CLOUDFLARE_EMAIL",
22
- deprecatedName: "CF_EMAIL",
23
- });
24
-
25
- /**
26
- * Try to read an API token or Global Auth from the environment.
27
- */
28
- export function getAuthFromEnv(): ApiCredentials | undefined {
29
- const globalApiKey = getCloudflareGlobalAuthKeyFromEnv();
30
- const globalApiEmail = getCloudflareGlobalAuthEmailFromEnv();
31
- const apiToken = getCloudflareAPITokenFromEnv();
32
-
33
- if (globalApiKey && globalApiEmail) {
34
- return { authKey: globalApiKey, authEmail: globalApiEmail };
35
- } else if (apiToken) {
36
- return { apiToken };
37
- }
38
- }
39
-
40
- /**
41
- * Try to read the account ID from the environment.
42
- */
43
- export const getCloudflareAccountIdFromEnv = getEnvironmentVariableFactory({
44
- variableName: "CLOUDFLARE_ACCOUNT_ID",
45
- deprecatedName: "CF_ACCOUNT_ID",
46
- });
File without changes
File without changes
File without changes