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
@@ -1,5 +1,5 @@
1
1
  import { execSync, spawn } from "node:child_process";
2
- import { existsSync, readFileSync } from "node:fs";
2
+ import { existsSync, lstatSync, readFileSync } from "node:fs";
3
3
  import { homedir, tmpdir } from "node:os";
4
4
  import { join, resolve } from "node:path";
5
5
  import { watch } from "chokidar";
@@ -10,23 +10,24 @@ import { FatalError } from "../errors";
10
10
  import { logger } from "../logger";
11
11
  import * as metrics from "../metrics";
12
12
  import { getBasePath } from "../paths";
13
- import { buildFunctions } from "./build";
13
+ import { buildFunctions } from "./buildFunctions";
14
14
  import { ROUTES_SPEC_VERSION, SECONDS_TO_WAIT_FOR_PROXY } from "./constants";
15
15
  import { FunctionsNoRoutesError, getFunctionsNoRoutesWarning } from "./errors";
16
+ import { buildRawWorker, checkRawWorker } from "./functions/buildWorker";
16
17
  import { validateRoutes } from "./functions/routes-validation";
17
18
  import { CLEANUP, CLEANUP_CALLBACKS, pagesBetaWarning } from "./utils";
18
19
  import type { AdditionalDevProps } from "../dev";
19
- import type { YargsOptionsToInterface } from "../yargs-types";
20
+ import type {
21
+ CommonYargsArgv,
22
+ StrictYargsOptionsToInterface,
23
+ } from "../yargs-types";
20
24
  import type { RoutesJSONSpec } from "./functions/routes-transformation";
21
- import type { Argv } from "yargs";
22
25
 
23
26
  const DURABLE_OBJECTS_BINDING_REGEXP = new RegExp(
24
27
  /^(?<binding>[^=]+)=(?<className>[^@\s]+)(@(?<scriptName>.*)$)?$/
25
28
  );
26
29
 
27
- type PagesDevArgs = YargsOptionsToInterface<typeof Options>;
28
-
29
- export function Options(yargs: Argv) {
30
+ export function Options(yargs: CommonYargsArgv) {
30
31
  return yargs
31
32
  .positional("directory", {
32
33
  type: "string",
@@ -78,6 +79,16 @@ export function Options(yargs: Argv) {
78
79
  description:
79
80
  "The location of the single Worker script if not using functions",
80
81
  },
82
+ bundle: {
83
+ type: "boolean",
84
+ default: undefined,
85
+ hidden: true,
86
+ },
87
+ "no-bundle": {
88
+ type: "boolean",
89
+ default: false,
90
+ description: "Whether to run bundling on `_worker.js`",
91
+ },
81
92
  binding: {
82
93
  type: "array",
83
94
  description: "Bind variable/secret (KEY=VALUE)",
@@ -129,11 +140,16 @@ export function Options(yargs: Argv) {
129
140
  requiresArg: true,
130
141
  },
131
142
  "node-compat": {
132
- describe: "Enable node.js compatibility",
143
+ describe: "Enable Node.js compatibility",
133
144
  default: false,
134
145
  type: "boolean",
135
146
  hidden: true,
136
147
  },
148
+ "experimental-local": {
149
+ describe: "Run on my machine using the Cloudflare Workers runtime",
150
+ type: "boolean",
151
+ default: false,
152
+ },
137
153
  config: {
138
154
  describe: "Pages does not support wrangler.toml",
139
155
  type: "string",
@@ -150,35 +166,36 @@ export function Options(yargs: Argv) {
150
166
  export const Handler = async ({
151
167
  local,
152
168
  directory,
153
- "compatibility-date": compatibilityDate,
154
- "compatibility-flags": compatibilityFlags,
169
+ compatibilityDate,
170
+ compatibilityFlags,
155
171
  ip,
156
172
  port,
157
- "inspector-port": inspectorPort,
173
+ inspectorPort,
158
174
  proxy: requestedProxyPort,
159
- "script-path": singleWorkerScriptPath,
175
+ bundle,
176
+ noBundle,
177
+ scriptPath: singleWorkerScriptPath,
160
178
  binding: bindings = [],
161
179
  kv: kvs = [],
162
180
  do: durableObjects = [],
163
181
  d1: d1s = [],
164
182
  r2: r2s = [],
165
- "live-reload": liveReload,
166
- "local-protocol": localProtocol,
183
+ liveReload,
184
+ localProtocol,
167
185
  experimentalEnableLocalPersistence,
168
186
  persist,
169
187
  persistTo,
170
- "node-compat": nodeCompat,
188
+ nodeCompat: legacyNodeCompat,
189
+ experimentalLocal,
171
190
  config: config,
172
191
  _: [_pages, _dev, ...remaining],
173
192
  logLevel,
174
- }: PagesDevArgs) => {
193
+ }: StrictYargsOptionsToInterface<typeof Options>) => {
175
194
  // Beta message for `wrangler pages <commands>` usage
176
195
  logger.log(pagesBetaWarning);
177
196
 
178
- type LogLevelArg = "debug" | "info" | "log" | "warn" | "error" | "none";
179
197
  if (logLevel) {
180
- // The YargsOptionsToInterface doesn't handle the passing in of Unions from choices in Yargs
181
- logger.loggerLevel = logLevel as LogLevelArg;
198
+ logger.loggerLevel = logLevel;
182
199
  }
183
200
 
184
201
  if (!local) {
@@ -238,33 +255,53 @@ export const Handler = async ({
238
255
  directory !== undefined
239
256
  ? join(directory, singleWorkerScriptPath)
240
257
  : singleWorkerScriptPath;
258
+ const usingWorkerDirectory =
259
+ existsSync(workerScriptPath) && lstatSync(workerScriptPath).isDirectory();
241
260
  const usingWorkerScript = existsSync(workerScriptPath);
261
+ // TODO: Here lies a known bug. If you specify both `--bundle` and `--no-bundle`, this behavior is undefined and you will get unexpected results.
262
+ // There is no sane way to get the true value out of yargs, so here we are.
263
+ const enableBundling = bundle ?? !noBundle;
242
264
 
243
265
  const functionsDirectory = "./functions";
244
266
  let usingFunctions = !usingWorkerScript && existsSync(functionsDirectory);
245
267
 
246
268
  let scriptPath = "";
247
269
 
248
- if (usingWorkerScript) {
249
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
250
- scriptReadyResolve!();
270
+ const nodejsCompat = compatibilityFlags?.includes("nodejs_compat");
251
271
 
272
+ if (usingWorkerScript) {
252
273
  scriptPath = workerScriptPath;
253
-
254
- const runBuild = async () => {
255
- try {
256
- await esbuild.build({
257
- entryPoints: [scriptPath],
258
- write: false,
259
- // we need it to be bundled so that any imports that are used are affected by the blocker plugin
260
- bundle: true,
261
- plugins: [blockWorkerJsImports],
262
- });
263
- } catch {}
274
+ let runBuild = async () => {
275
+ await checkRawWorker(workerScriptPath, () => scriptReadyResolve());
264
276
  };
265
277
 
278
+ if (enableBundling) {
279
+ // We want to actually run the `_worker.js` script through the bundler
280
+ // So update the final path to the script that will be uploaded and
281
+ // change the `runBuild()` function to bundle the `_worker.js`.
282
+ scriptPath = join(tmpdir(), `./bundledWorker-${Math.random()}.mjs`);
283
+ runBuild = async () => {
284
+ try {
285
+ await buildRawWorker({
286
+ workerScriptPath: usingWorkerDirectory
287
+ ? join(workerScriptPath, "index.js")
288
+ : workerScriptPath,
289
+ outfile: scriptPath,
290
+ directory: directory ?? ".",
291
+ nodejsCompat,
292
+ local: true,
293
+ sourcemap: true,
294
+ watch: true,
295
+ onEnd: () => scriptReadyResolve(),
296
+ });
297
+ } catch (e: unknown) {
298
+ logger.warn("Failed to bundle _worker.js.", e);
299
+ }
300
+ };
301
+ }
302
+
266
303
  await runBuild();
267
- watch([scriptPath], {
304
+ watch([workerScriptPath], {
268
305
  persistent: true,
269
306
  ignoreInitial: true,
270
307
  }).on("all", async () => {
@@ -272,47 +309,47 @@ export const Handler = async ({
272
309
  });
273
310
  } else if (usingFunctions) {
274
311
  // Try to use Functions
275
- const outfile = join(tmpdir(), `./functionsWorker-${Math.random()}.mjs`);
276
- scriptPath = outfile;
312
+ scriptPath = join(tmpdir(), `./functionsWorker-${Math.random()}.mjs`);
277
313
 
278
- if (nodeCompat) {
314
+ if (legacyNodeCompat) {
279
315
  console.warn(
280
- "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."
316
+ "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."
317
+ );
318
+ }
319
+
320
+ if (legacyNodeCompat && nodejsCompat) {
321
+ throw new FatalError(
322
+ "The `nodejs_compat` compatibility flag cannot be used in conjunction with the legacy `--node-compat` flag. If you want to use the Workers runtime Node.js compatibility features, please remove the `--node-compat` argument from your CLI command or `node_compat = true` from your config file.",
323
+ 1
281
324
  );
282
325
  }
283
326
 
284
- logger.log(`Compiling worker to "${outfile}"...`);
327
+ logger.log(`Compiling worker to "${scriptPath}"...`);
285
328
  const onEnd = () => scriptReadyResolve();
286
329
  try {
287
- await buildFunctions({
288
- outfile,
289
- functionsDirectory,
290
- sourcemap: true,
291
- watch: true,
292
- onEnd,
293
- buildOutputDirectory: directory,
294
- nodeCompat,
295
- local: true,
296
- });
297
- await metrics.sendMetricsEvent("build pages functions");
330
+ const buildFn = async () => {
331
+ await buildFunctions({
332
+ outfile: scriptPath,
333
+ functionsDirectory,
334
+ sourcemap: true,
335
+ watch: true,
336
+ onEnd,
337
+ buildOutputDirectory: directory,
338
+ legacyNodeCompat,
339
+ nodejsCompat,
340
+ local: true,
341
+ });
342
+ await metrics.sendMetricsEvent("build pages functions");
343
+ };
298
344
 
345
+ await buildFn();
299
346
  // If Functions found routes, continue using Functions
300
347
  watch([functionsDirectory], {
301
348
  persistent: true,
302
349
  ignoreInitial: true,
303
350
  }).on("all", async () => {
304
351
  try {
305
- await buildFunctions({
306
- outfile,
307
- functionsDirectory,
308
- sourcemap: true,
309
- watch: true,
310
- onEnd,
311
- buildOutputDirectory: directory,
312
- nodeCompat,
313
- local: true,
314
- });
315
- await metrics.sendMetricsEvent("build pages functions");
352
+ await buildFn();
316
353
  } catch (e) {
317
354
  if (e instanceof FunctionsNoRoutesError) {
318
355
  logger.warn(
@@ -353,7 +390,7 @@ export const Handler = async ({
353
390
 
354
391
  if (scriptPath === "") {
355
392
  // Failed to get a script with or without Functions,
356
- // something really bad must have happend.
393
+ // something really bad must have happened.
357
394
  throw new FatalError(
358
395
  "Failed to start wrangler pages dev due to an unknown error",
359
396
  1
@@ -363,7 +400,10 @@ export const Handler = async ({
363
400
  let entrypoint = scriptPath;
364
401
 
365
402
  // custom _routes.json apply only to Functions or Advanced Mode Pages projects
366
- if (directory && (usingFunctions || usingWorkerScript)) {
403
+ if (
404
+ directory &&
405
+ (usingFunctions || usingWorkerScript || usingWorkerDirectory)
406
+ ) {
367
407
  const routesJSONPath = join(directory, "_routes.json");
368
408
 
369
409
  if (existsSync(routesJSONPath)) {
@@ -435,7 +475,7 @@ export const Handler = async ({
435
475
  * If _routes.json is invalid, don't exit but instead fallback to a sensible default
436
476
  * and continue to serve the assets. At the same time make sure we warn users that we
437
477
  * we detected an invalid file and that we'll be using a default.
438
- * This basically equivalates to serving a Functions or _worker.js project as is,
478
+ * This basically equates to serving a Functions or _worker.js project as is,
439
479
  * without applying any additional routing rules on top.
440
480
  */
441
481
  const error =
@@ -464,77 +504,86 @@ export const Handler = async ({
464
504
  }
465
505
  }
466
506
 
467
- const { stop, waitUntilExit } = await unstable_dev(
468
- entrypoint,
469
- {
470
- ip,
471
- port,
472
- inspectorPort,
473
- watch: true,
474
- localProtocol,
475
- liveReload,
476
- compatibilityDate,
477
- compatibilityFlags,
478
- nodeCompat,
479
- vars: Object.fromEntries(
480
- bindings
481
- .map((binding) => binding.toString().split("="))
482
- .map(([key, ...values]) => [key, values.join("=")])
483
- ),
484
- kv: kvs.map((binding) => ({
485
- binding: binding.toString(),
486
- id: "",
487
- })),
488
- durableObjects: durableObjects
489
- .map((durableObject) => {
490
- const { binding, className, scriptName } =
491
- DURABLE_OBJECTS_BINDING_REGEXP.exec(durableObject.toString())
492
- ?.groups || {};
493
-
494
- if (!binding || !className) {
495
- logger.warn(
496
- "Could not parse Durable Object binding:",
497
- durableObject.toString()
498
- );
499
- return;
500
- }
501
-
502
- return {
503
- name: binding,
504
- class_name: className,
505
- script_name: scriptName,
506
- };
507
- })
508
- .filter(Boolean) as AdditionalDevProps["durableObjects"],
509
- r2: r2s.map((binding) => {
510
- return { binding: binding.toString(), bucket_name: "" };
511
- }),
507
+ const { stop, waitUntilExit } = await unstable_dev(entrypoint, {
508
+ ip,
509
+ port,
510
+ inspectorPort,
511
+ localProtocol,
512
+ compatibilityDate,
513
+ compatibilityFlags,
514
+ nodeCompat: legacyNodeCompat,
515
+ vars: Object.fromEntries(
516
+ bindings
517
+ .map((binding) => binding.toString().split("="))
518
+ .map(([key, ...values]) => [key, values.join("=")])
519
+ ),
520
+ kv: kvs.map((binding) => ({
521
+ binding: binding.toString(),
522
+ id: "",
523
+ })),
524
+ durableObjects: durableObjects
525
+ .map((durableObject) => {
526
+ const { binding, className, scriptName } =
527
+ DURABLE_OBJECTS_BINDING_REGEXP.exec(durableObject.toString())
528
+ ?.groups || {};
529
+
530
+ if (!binding || !className) {
531
+ logger.warn(
532
+ "Could not parse Durable Object binding:",
533
+ durableObject.toString()
534
+ );
535
+ return;
536
+ }
512
537
 
538
+ return {
539
+ name: binding,
540
+ class_name: className,
541
+ script_name: scriptName,
542
+ };
543
+ })
544
+ .filter(Boolean) as AdditionalDevProps["durableObjects"],
545
+ r2: r2s.map((binding) => {
546
+ return { binding: binding.toString(), bucket_name: "" };
547
+ }),
548
+ processEntrypoint: true,
549
+ moduleRoot: workerScriptPath,
550
+ rules: usingWorkerDirectory
551
+ ? [
552
+ {
553
+ type: "ESModule",
554
+ globs: ["**/*.js"],
555
+ },
556
+ ]
557
+ : undefined,
558
+ bundle: enableBundling,
559
+ persist,
560
+ persistTo,
561
+ inspect: undefined,
562
+ logLevel,
563
+ experimental: {
513
564
  d1Databases: d1s.map((binding) => ({
514
565
  binding: binding.toString(),
515
566
  database_id: "", // Required for types, but unused by dev
516
567
  database_name: `local-${binding}`,
517
568
  })),
518
-
569
+ disableExperimentalWarning: true,
519
570
  enablePagesAssetsServiceBinding: {
520
571
  proxyPort,
521
572
  directory,
522
573
  },
574
+ experimentalLocal,
575
+ liveReload,
523
576
  forceLocal: true,
524
- persist,
525
- persistTo,
526
577
  showInteractiveDevSession: undefined,
527
- inspect: undefined,
528
- logPrefix: "pages",
529
- logLevel: logLevel ?? "warn",
578
+ testMode: false,
579
+ watch: true,
530
580
  },
531
- { testMode: false, disableExperimentalWarning: true }
532
- );
581
+ });
533
582
  await metrics.sendMetricsEvent("run pages dev");
534
583
 
535
584
  CLEANUP_CALLBACKS.push(stop);
536
585
 
537
- waitUntilExit().then(() => {
586
+ void waitUntilExit().then(() => {
538
587
  CLEANUP();
539
588
  process.exit(0);
540
589
  });
@@ -683,24 +732,3 @@ async function spawnProxyProcess({
683
732
 
684
733
  return port;
685
734
  }
686
-
687
- // TODO: Kill this once we have https://github.com/cloudflare/wrangler2/issues/2153
688
- const blockWorkerJsImports: esbuild.Plugin = {
689
- name: "block-worker-js-imports",
690
- setup(build) {
691
- build.onResolve({ filter: /.*/g }, (args) => {
692
- // If it's the entrypoint, let it be as is
693
- if (args.kind === "entry-point") {
694
- return {
695
- path: args.path,
696
- };
697
- }
698
- // Otherwise, block any imports that the file is requesting
699
- logger.error(
700
- `_worker.js is importing from another file. This will throw an error if deployed.\nYou should bundle your Worker or remove the import if it is unused.`
701
- );
702
- // Miniflare will error with this briefly down the line -- there's no point in continuing.
703
- process.exit(1);
704
- });
705
- },
706
- };
@@ -9,6 +9,7 @@ import { RoutesValidationError } from "./functions/routes-validation";
9
9
  * Exit code for `pages functions build` when no routes are found.
10
10
  */
11
11
  export const EXIT_CODE_FUNCTIONS_NO_ROUTES_ERROR = 156;
12
+ export const EXIT_CODE_FUNCTIONS_NOTHING_TO_BUILD_ERROR = 157;
12
13
 
13
14
  /**
14
15
  * Pages error when no routes are found in the functions directory
@@ -1,20 +1,24 @@
1
1
  import { access, lstat } from "node:fs/promises";
2
- import { dirname, relative, resolve } from "node:path";
2
+ import { relative, resolve } from "node:path";
3
3
  import { bundleWorker } from "../../bundle";
4
4
  import { getBasePath } from "../../paths";
5
5
  import { D1_BETA_PREFIX } from "../../worker";
6
+ import { buildNotifierPlugin } from "./buildWorker";
6
7
  import type { Options as WorkerOptions } from "./buildWorker";
7
8
 
8
- type Options = Omit<WorkerOptions, "fallbackService" | "buildOutputDirectory">;
9
+ type Options = Omit<
10
+ WorkerOptions,
11
+ "outfile" | "fallbackService" | "buildOutputDirectory" | "nodejsCompat"
12
+ > & { outdir: string };
9
13
 
10
14
  export function buildPlugin({
11
15
  routesModule,
12
- outfile = "bundle.js",
16
+ outdir,
13
17
  minify = false,
14
18
  sourcemap = false,
15
19
  watch = false,
16
20
  onEnd = () => {},
17
- nodeCompat,
21
+ legacyNodeCompat,
18
22
  functionsDirectory,
19
23
  local,
20
24
  betaD1Shims,
@@ -24,84 +28,87 @@ export function buildPlugin({
24
28
  file: resolve(getBasePath(), "templates/pages-template-plugin.ts"),
25
29
  directory: functionsDirectory,
26
30
  format: "modules",
31
+ moduleRoot: functionsDirectory,
27
32
  },
28
- resolve(outfile),
33
+ resolve(outdir),
29
34
  {
30
35
  inject: [routesModule],
36
+ entryName: "index",
31
37
  minify,
32
38
  sourcemap,
33
39
  watch,
34
- nodeCompat,
40
+ legacyNodeCompat,
41
+ // We don't currently have a mechanism for Plugins 'requiring' a specific compat date/flag,
42
+ // but if someone wants to publish a Plugin which does require this new `nodejs_compat` flag
43
+ // and they document that on their README.md, we should let them.
44
+ nodejsCompat: true,
35
45
  define: {},
36
46
  betaD1Shims: (betaD1Shims || []).map(
37
47
  (binding) => `${D1_BETA_PREFIX}${binding}`
38
48
  ),
49
+ doBindings: [], // Pages functions don't support internal Durable Objects
39
50
  plugins: [
40
- {
41
- name: "wrangler notifier and monitor",
42
- setup(pluginBuild) {
43
- pluginBuild.onEnd((result) => {
44
- if (result.errors.length > 0) {
45
- console.error(
46
- `${result.errors.length} error(s) and ${result.warnings.length} warning(s) when compiling Worker.`
47
- );
48
- } else if (result.warnings.length > 0) {
49
- console.warn(
50
- `${result.warnings.length} warning(s) when compiling Worker.`
51
- );
52
- onEnd();
53
- } else {
54
- console.log("Compiled Worker successfully.");
55
- onEnd();
56
- }
57
- });
58
- },
59
- },
51
+ buildNotifierPlugin(onEnd),
60
52
  {
61
53
  name: "Assets",
62
54
  setup(pluginBuild) {
63
- if (pluginBuild.initialOptions.outfile) {
64
- const outdir = dirname(pluginBuild.initialOptions.outfile);
65
-
66
- pluginBuild.onResolve({ filter: /^assets:/ }, async (args) => {
67
- const directory = resolve(
68
- args.resolveDir,
69
- args.path.slice("assets:".length)
70
- );
55
+ pluginBuild.onResolve({ filter: /^assets:/ }, async (args) => {
56
+ const directory = resolve(
57
+ args.resolveDir,
58
+ args.path.slice("assets:".length)
59
+ );
71
60
 
72
- const exists = await access(directory)
73
- .then(() => true)
74
- .catch(() => false);
61
+ const exists = await access(directory)
62
+ .then(() => true)
63
+ .catch(() => false);
75
64
 
76
- const isDirectory =
77
- exists && (await lstat(directory)).isDirectory();
65
+ const isDirectory =
66
+ exists && (await lstat(directory)).isDirectory();
78
67
 
79
- if (!isDirectory) {
80
- return {
81
- errors: [
82
- {
83
- text: `'${directory}' does not exist or is not a directory.`,
84
- },
85
- ],
86
- };
87
- }
68
+ if (!isDirectory) {
69
+ return {
70
+ errors: [
71
+ {
72
+ text: `'${directory}' does not exist or is not a directory.`,
73
+ },
74
+ ],
75
+ };
76
+ }
88
77
 
89
- const path = `assets:./${relative(outdir, directory)}`;
78
+ const path = `assets:./${relative(outdir, directory)}`;
90
79
 
91
- return { path, external: true, namespace: "assets" };
92
- });
93
- }
80
+ return { path, external: true, namespace: "assets" };
81
+ });
82
+ },
83
+ },
84
+ // TODO: Replace this with a proper outdir solution for Plugins
85
+ // But for now, let's just mark all wasm/bin files as external
86
+ {
87
+ name: "Mark externals",
88
+ setup(pluginBuild) {
89
+ pluginBuild.onResolve(
90
+ { filter: /.*\.(wasm|bin)$/ },
91
+ async (args) => {
92
+ return {
93
+ external: true,
94
+ path: `./${relative(
95
+ outdir,
96
+ resolve(args.resolveDir, args.path)
97
+ )}`,
98
+ };
99
+ }
100
+ );
94
101
  },
95
102
  },
96
103
  ],
97
- isOutfile: true,
98
104
  serveAssetsFromWorker: false,
99
- disableModuleCollection: true,
105
+ disableModuleCollection: false,
100
106
  rules: [],
101
107
  checkFetch: local,
102
108
  targetConsumer: local ? "dev" : "publish",
103
109
  local,
104
110
  experimentalLocal: false,
111
+ forPages: true,
105
112
  }
106
113
  );
107
114
  }