wrangler 0.0.0-ece06ea → 0.0.0-ed08df4

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 (121) hide show
  1. package/Cloudflare_CA.pem +18 -0
  2. package/README.md +27 -14
  3. package/bin/wrangler.js +34 -2
  4. package/miniflare-dist/index.mjs +4886 -0
  5. package/package.json +71 -36
  6. package/pages/functions/buildPlugin.ts +92 -0
  7. package/pages/functions/buildWorker.ts +138 -0
  8. package/pages/functions/filepath-routing.test.ts +234 -0
  9. package/pages/functions/filepath-routing.ts +189 -0
  10. package/pages/functions/identifiers.ts +78 -0
  11. package/pages/functions/routes.ts +156 -0
  12. package/pages/functions/template-plugin.ts +147 -0
  13. package/pages/functions/template-worker.ts +143 -0
  14. package/src/__tests__/config-cache.test.ts +36 -0
  15. package/src/__tests__/configuration.test.ts +3125 -0
  16. package/src/__tests__/dev.test.tsx +829 -0
  17. package/src/__tests__/guess-worker-format.test.ts +85 -0
  18. package/src/__tests__/{clipboardy-mock.js → helpers/clipboardy-mock.js} +0 -0
  19. package/src/__tests__/helpers/cmd-shim.d.ts +11 -0
  20. package/src/__tests__/helpers/faye-websocket.d.ts +6 -0
  21. package/src/__tests__/helpers/mock-account-id.ts +48 -0
  22. package/src/__tests__/helpers/mock-bin.ts +36 -0
  23. package/src/__tests__/helpers/mock-cfetch.ts +211 -0
  24. package/src/__tests__/helpers/mock-console.ts +87 -0
  25. package/src/__tests__/helpers/mock-dialogs.ts +90 -0
  26. package/src/__tests__/helpers/mock-http-server.ts +46 -0
  27. package/src/__tests__/helpers/mock-istty.ts +27 -0
  28. package/src/__tests__/helpers/mock-kv.ts +33 -0
  29. package/src/__tests__/helpers/mock-oauth-flow.ts +255 -0
  30. package/src/__tests__/helpers/mock-stdin.ts +103 -0
  31. package/src/__tests__/helpers/mock-web-socket.ts +29 -0
  32. package/src/__tests__/helpers/run-in-tmp.ts +39 -0
  33. package/src/__tests__/helpers/run-wrangler.ts +16 -0
  34. package/src/__tests__/helpers/write-worker-source.ts +31 -0
  35. package/src/__tests__/helpers/write-wrangler-toml.ts +17 -0
  36. package/src/__tests__/https-options.test.ts +130 -0
  37. package/src/__tests__/index.test.ts +221 -132
  38. package/src/__tests__/init.test.ts +1516 -0
  39. package/src/__tests__/jest.setup.ts +77 -0
  40. package/src/__tests__/kv.test.ts +1481 -0
  41. package/src/__tests__/logger.test.ts +115 -0
  42. package/src/__tests__/package-manager.test.ts +206 -0
  43. package/src/__tests__/pages.test.ts +327 -0
  44. package/src/__tests__/parse.test.ts +326 -0
  45. package/src/__tests__/publish.test.ts +4996 -0
  46. package/src/__tests__/r2.test.ts +210 -0
  47. package/src/__tests__/route.test.ts +45 -0
  48. package/src/__tests__/secret.test.ts +446 -0
  49. package/src/__tests__/tail.test.ts +690 -0
  50. package/src/__tests__/user.test.ts +131 -0
  51. package/src/__tests__/whoami.test.tsx +105 -0
  52. package/src/bundle.ts +169 -0
  53. package/src/cfetch/index.ts +104 -0
  54. package/src/cfetch/internal.ts +140 -0
  55. package/src/cli.ts +10 -7
  56. package/src/config/README.md +107 -0
  57. package/src/config/config.ts +234 -0
  58. package/src/config/diagnostics.ts +80 -0
  59. package/src/config/environment.ts +394 -0
  60. package/src/config/index.ts +63 -0
  61. package/src/config/validation-helpers.ts +575 -0
  62. package/src/config/validation.ts +1424 -0
  63. package/src/config-cache.ts +45 -0
  64. package/src/create-worker-preview.ts +175 -0
  65. package/src/create-worker-upload-form.ts +240 -0
  66. package/src/dev/dev-vars.ts +36 -0
  67. package/src/dev/dev.tsx +421 -0
  68. package/src/dev/local.tsx +312 -0
  69. package/src/dev/remote.tsx +213 -0
  70. package/src/dev/use-esbuild.ts +118 -0
  71. package/src/dialogs.tsx +22 -20
  72. package/src/entry.ts +322 -0
  73. package/src/environment-variables.ts +35 -0
  74. package/src/errors.ts +11 -0
  75. package/src/https-options.ts +123 -0
  76. package/src/index.tsx +1869 -1020
  77. package/src/inspect.ts +623 -0
  78. package/src/intl-polyfill.d.ts +139 -0
  79. package/src/kv.ts +344 -0
  80. package/src/logger.ts +66 -0
  81. package/src/miniflare-cli/README.md +30 -0
  82. package/src/miniflare-cli/enum-keys.ts +17 -0
  83. package/src/miniflare-cli/index.ts +41 -0
  84. package/src/miniflare-cli/request-context.ts +40 -0
  85. package/src/module-collection.ts +258 -0
  86. package/src/open-in-browser.ts +26 -0
  87. package/src/package-manager.ts +127 -0
  88. package/src/pages.tsx +1756 -218
  89. package/src/parse.ts +185 -0
  90. package/src/paths.ts +26 -0
  91. package/src/proxy.ts +449 -0
  92. package/src/publish.ts +377 -262
  93. package/src/r2.ts +50 -0
  94. package/src/selfsigned.d.ts +29 -0
  95. package/src/sites.tsx +237 -59
  96. package/src/tail/filters.ts +279 -0
  97. package/src/tail/index.ts +299 -0
  98. package/src/tail/printing.ts +67 -0
  99. package/src/update-check.ts +19 -0
  100. package/src/user.tsx +395 -221
  101. package/src/whoami.tsx +70 -0
  102. package/src/worker.ts +172 -0
  103. package/templates/gitignore +171 -0
  104. package/templates/new-worker.js +15 -0
  105. package/templates/new-worker.ts +15 -0
  106. package/{static-asset-facade.js → templates/static-asset-facade.js} +1 -1
  107. package/templates/tsconfig.json +105 -0
  108. package/wrangler-dist/cli.js +108921 -132528
  109. package/src/__tests__/fixtures/init/.gitkeep +0 -0
  110. package/src/__tests__/mock-cfetch.js +0 -46
  111. package/src/api/form_data.ts +0 -158
  112. package/src/api/inspect.ts +0 -441
  113. package/src/api/preview.ts +0 -123
  114. package/src/api/worker.ts +0 -161
  115. package/src/cfetch.ts +0 -72
  116. package/src/config.ts +0 -124
  117. package/src/dev.tsx +0 -736
  118. package/src/kv.tsx +0 -211
  119. package/src/tail.tsx +0 -71
  120. package/src/util/fetch.ts +0 -74
  121. package/wrangler-dist/cli.js.map +0 -7
package/src/publish.ts CHANGED
@@ -1,32 +1,39 @@
1
- import type { CfWorkerInit } from "./api/worker";
2
- import { toFormData } from "./api/form_data";
3
- import esbuild from "esbuild";
4
- import tmp from "tmp-promise";
5
- import type { Config } from "./config";
6
- import path from "path";
7
- import { readFile } from "fs/promises";
8
- import cfetch from "./cfetch";
9
1
  import assert from "node:assert";
2
+ import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
3
+ import path from "node:path";
4
+ import { URLSearchParams } from "node:url";
5
+ import tmp from "tmp-promise";
6
+ import { bundleWorker } from "./bundle";
7
+ import { fetchResult } from "./cfetch";
8
+ import { createWorkerUploadForm } from "./create-worker-upload-form";
9
+ import { logger } from "./logger";
10
10
  import { syncAssets } from "./sites";
11
- import NodeModulesPolyfills from "@esbuild-plugins/node-modules-polyfill";
12
- import NodeGlobalsPolyfills from "@esbuild-plugins/node-globals-polyfill";
13
-
14
- type CfScriptFormat = void | "modules" | "service-worker";
11
+ import type { Config } from "./config";
12
+ import type { Entry } from "./entry";
13
+ import type { AssetPaths } from "./sites";
14
+ import type { CfWorkerInit } from "./worker";
15
15
 
16
16
  type Props = {
17
17
  config: Config;
18
- format?: CfScriptFormat;
19
- script?: string;
20
- name?: string;
21
- env?: string;
22
- public?: string;
23
- site?: string;
24
- triggers?: (string | number)[];
25
- routes?: (string | number)[];
26
- legacyEnv?: boolean;
27
- jsxFactory: void | string;
28
- jsxFragment: void | string;
29
- polyfillNode: void | boolean;
18
+ accountId: string;
19
+ entry: Entry;
20
+ rules: Config["rules"];
21
+ name: string | undefined;
22
+ env: string | undefined;
23
+ compatibilityDate: string | undefined;
24
+ compatibilityFlags: string[] | undefined;
25
+ assetPaths: AssetPaths | undefined;
26
+ triggers: string[] | undefined;
27
+ routes: string[] | undefined;
28
+ legacyEnv: boolean | undefined;
29
+ jsxFactory: string | undefined;
30
+ jsxFragment: string | undefined;
31
+ tsconfig: string | undefined;
32
+ experimentalPublic: boolean;
33
+ minify: boolean | undefined;
34
+ nodeCompat: boolean | undefined;
35
+ outDir: string | undefined;
36
+ dryRun: boolean | undefined;
30
37
  };
31
38
 
32
39
  function sleep(ms: number) {
@@ -34,281 +41,349 @@ function sleep(ms: number) {
34
41
  }
35
42
 
36
43
  export default async function publish(props: Props): Promise<void> {
37
- if (props.public && props.format === "service-worker") {
38
- // TODO: check config too
39
- throw new Error(
40
- "You cannot use the service worker format with a public directory."
41
- );
42
- }
43
44
  // TODO: warn if git/hg has uncommitted changes
44
- const { config } = props;
45
- const {
46
- account_id: accountId,
47
- build,
48
- // @ts-expect-error hidden
49
- __path__,
50
- } = config;
45
+ const { config, accountId } = props;
46
+
47
+ assert(
48
+ props.compatibilityDate || config.compatibility_date,
49
+ "A compatibility_date is required when publishing. Add one to your wrangler.toml file, or pass it in your terminal as --compatibility-date. See https://developers.cloudflare.com/workers/platform/compatibility-dates for more information."
50
+ );
51
51
 
52
52
  const triggers = props.triggers || config.triggers?.crons;
53
- const routes = props.routes || config.routes;
53
+ const routes =
54
+ props.routes ?? config.routes ?? (config.route ? [config.route] : []) ?? [];
55
+
56
+ // deployToWorkersDev defaults to true only if there aren't any routes defined
57
+ const deployToWorkersDev = config.workers_dev ?? routes.length === 0;
54
58
 
55
59
  const jsxFactory = props.jsxFactory || config.jsx_factory;
56
60
  const jsxFragment = props.jsxFragment || config.jsx_fragment;
57
61
 
58
- assert(config.account_id, "missing account id");
62
+ const minify = props.minify ?? config.minify;
63
+
64
+ const nodeCompat = props.nodeCompat ?? config.node_compat;
65
+ if (nodeCompat) {
66
+ logger.warn(
67
+ "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."
68
+ );
69
+ }
59
70
 
60
- let scriptName = props.name || config.name;
71
+ const scriptName = props.name;
61
72
  assert(
62
73
  scriptName,
63
74
  'You need to provide a name when publishing a worker. Either pass it as a cli arg with `--name <name>` or in your config file as `name = "<name>"`'
64
75
  );
65
76
 
66
- let file: string;
67
- if (props.script) {
68
- file = props.script;
69
- } else {
70
- assert(build?.upload?.main, "missing main file");
71
- file = path.join(path.dirname(__path__), build.upload.main);
72
- }
77
+ assert(
78
+ !config.site || config.site.bucket,
79
+ "A [site] definition requires a `bucket` field with a path to the site's public directory."
80
+ );
73
81
 
74
- if (props.legacyEnv) {
75
- scriptName += props.env ? `-${props.env}` : "";
82
+ if (props.outDir) {
83
+ // we're using a custom output directory,
84
+ // so let's first ensure it exists
85
+ mkdirSync(props.outDir, { recursive: true });
86
+ // add a README
87
+ const readmePath = path.join(props.outDir, "README.md");
88
+ writeFileSync(
89
+ readmePath,
90
+ `This folder contains the built output assets for the worker "${scriptName}" generated at ${new Date().toISOString()}.`
91
+ );
76
92
  }
93
+
94
+ const destination = props.outDir ?? (await tmp.dir({ unsafeCleanup: true }));
77
95
  const envName = props.env ?? "production";
78
96
 
79
- const destination = await tmp.dir({ unsafeCleanup: true });
80
-
81
- const result = await esbuild.build({
82
- ...(props.public
83
- ? {
84
- stdin: {
85
- contents: (
86
- await readFile(
87
- path.join(__dirname, "../static-asset-facade.js"),
88
- "utf8"
89
- )
90
- ).replace("__ENTRY_POINT__", path.join(process.cwd(), file)),
91
- sourcefile: "static-asset-facade.js",
92
- resolveDir: path.dirname(file),
93
- },
94
- }
95
- : { entryPoints: [file] }),
96
- bundle: true,
97
- define: {
98
- ...((props.polyfillNode ?? config.polyfill_node) && {
99
- global: "globalThis",
100
- }),
101
- },
102
- nodePaths: props.public ? [path.join(__dirname, "../vendor")] : undefined,
103
- outdir: destination.path,
104
- external: ["__STATIC_CONTENT_MANIFEST"],
105
- format: "esm",
106
- plugins:
107
- props.polyfillNode ?? config.polyfill_node
108
- ? [NodeGlobalsPolyfills({ buffer: true }), NodeModulesPolyfills()]
109
- : undefined,
110
- sourcemap: true,
111
- metafile: true,
112
- loader: {
113
- ".js": "jsx",
114
- },
115
- ...(jsxFactory && { jsxFactory }),
116
- ...(jsxFragment && { jsxFragment }),
117
- });
118
-
119
- const chunks = Object.entries(result.metafile.outputs).find(
120
- ([_path, { entryPoint }]) =>
121
- entryPoint ===
122
- (props.public
123
- ? path.join(path.dirname(file), "static-asset-facade.js")
124
- : file)
125
- );
97
+ const start = Date.now();
98
+ const notProd = !props.legacyEnv && props.env;
99
+ const workerName = notProd ? `${scriptName} (${envName})` : scriptName;
100
+ const workerUrl = notProd
101
+ ? `/accounts/${accountId}/workers/services/${scriptName}/environments/${envName}`
102
+ : `/accounts/${accountId}/workers/scripts/${scriptName}`;
126
103
 
127
- const { format } = props;
128
- const bundle = {
129
- type: chunks[1].exports.length > 0 ? "esm" : "commonjs",
130
- exports: chunks[1].exports,
131
- };
104
+ let available_on_subdomain; // we'll set this later
132
105
 
133
- // TODO: instead of bundling the facade with the worker, we should just bundle the worker and expose it as a module.
134
- // That way we'll be able to accurately tell if this is a service worker or not.
106
+ const { format } = props.entry;
135
107
 
136
- if (format === "modules" && bundle.type === "commonjs") {
137
- console.error("⎔ Cannot use modules with a commonjs bundle.");
138
- // TODO: a much better error message here, with what to do next
139
- return;
108
+ if (props.experimentalPublic && format === "service-worker") {
109
+ throw new Error(
110
+ "You cannot publish in the service-worker format with a public directory."
111
+ );
140
112
  }
141
- if (format === "service-worker" && bundle.type !== "esm") {
142
- console.error("⎔ Cannot use service-worker with a esm bundle.");
143
- // TODO: a much better error message here, with what to do next
144
- return;
113
+
114
+ if (config.wasm_modules && format === "modules") {
115
+ throw new Error(
116
+ "You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code"
117
+ );
145
118
  }
146
119
 
147
- const content = await readFile(chunks[0], { encoding: "utf-8" });
148
- destination.cleanup();
120
+ if (config.text_blobs && format === "modules") {
121
+ throw new Error(
122
+ "You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure `[rules]` in your wrangler.toml"
123
+ );
124
+ }
149
125
 
150
- // if config.migrations
151
- // get current migration tag
152
- let migrations;
153
- if ("migrations" in config) {
154
- const scripts = await cfetch<{ id: string; migration_tag: string }[]>(
155
- `/accounts/${accountId}/workers/scripts`
126
+ if (config.data_blobs && format === "modules") {
127
+ throw new Error(
128
+ "You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure `[rules]` in your wrangler.toml"
156
129
  );
157
- const script = scripts.find((script) => script.id === scriptName);
158
- if (script?.migration_tag) {
159
- // was already published once
160
- const foundIndex = config.migrations.findIndex(
161
- (migration) => migration.tag === script.migration_tag
130
+ }
131
+ try {
132
+ const { modules, resolvedEntryPointPath, bundleType } = await bundleWorker(
133
+ props.entry,
134
+ typeof destination === "string" ? destination : destination.path,
135
+ {
136
+ serveAssetsFromWorker: props.experimentalPublic,
137
+ jsxFactory,
138
+ jsxFragment,
139
+ rules: props.rules,
140
+ tsconfig: props.tsconfig ?? config.tsconfig,
141
+ minify,
142
+ nodeCompat,
143
+ }
144
+ );
145
+
146
+ // Some validation of durable objects + migrations
147
+ if (config.durable_objects.bindings.length > 0) {
148
+ // intrinsic [durable_objects] implies [migrations]
149
+ const exportedDurableObjects = config.durable_objects.bindings.filter(
150
+ (binding) => !binding.script_name
162
151
  );
163
- if (foundIndex === -1) {
164
- console.warn(
165
- `The published script ${scriptName} has a migration tag "${script.migration_tag}, which was not found in wrangler.toml. You may have already delated it. Applying all available migrations to the script...`
152
+ if (exportedDurableObjects.length > 0 && config.migrations.length === 0) {
153
+ logger.warn(
154
+ `In wrangler.toml, you have configured [durable_objects] exported by this Worker (${exportedDurableObjects.map(
155
+ (durable) => durable.class_name
156
+ )}), but no [migrations] for them. This may not work as expected until you add a [migrations] section to your wrangler.toml. Refer to https://developers.cloudflare.com/workers/learning/using-durable-objects/#durable-object-migrations-in-wranglertoml for more details.`
166
157
  );
167
- migrations = {
168
- old_tag: script.migration_tag,
169
- new_tag: config.migrations[config.migrations.length - 1].tag,
170
- steps: config.migrations.map(({ tag: _tag, ...rest }) => rest),
171
- };
158
+ }
159
+ }
160
+
161
+ const content = readFileSync(resolvedEntryPointPath, {
162
+ encoding: "utf-8",
163
+ });
164
+
165
+ // if config.migrations
166
+ let migrations;
167
+ if (config.migrations.length > 0) {
168
+ // get current migration tag
169
+ type ScriptData = { id: string; migration_tag?: string };
170
+ let script: ScriptData | undefined;
171
+ if (!props.legacyEnv) {
172
+ try {
173
+ if (props.env) {
174
+ const scriptData = await fetchResult<{
175
+ script: ScriptData;
176
+ }>(
177
+ `/accounts/${accountId}/workers/services/${scriptName}/environments/${props.env}`
178
+ );
179
+ script = scriptData.script;
180
+ } else {
181
+ const scriptData = await fetchResult<{
182
+ default_environment: {
183
+ script: ScriptData;
184
+ };
185
+ }>(`/accounts/${accountId}/workers/services/${scriptName}`);
186
+ script = scriptData.default_environment.script;
187
+ }
188
+ } catch (err) {
189
+ if (
190
+ ![
191
+ 10090, // corresponds to workers.api.error.service_not_found, so the script wasn't previously published at all
192
+ 10092, // workers.api.error.environment_not_found, so the script wasn't published to this environment yet
193
+ ].includes((err as { code: number }).code)
194
+ ) {
195
+ throw err;
196
+ }
197
+ // else it's a 404, no script found, and we can proceed
198
+ }
199
+ } else {
200
+ const scripts = await fetchResult<ScriptData[]>(
201
+ `/accounts/${accountId}/workers/scripts`
202
+ );
203
+ script = scripts.find(({ id }) => id === scriptName);
204
+ }
205
+
206
+ if (script?.migration_tag) {
207
+ // was already published once
208
+ const scriptMigrationTag = script.migration_tag;
209
+ const foundIndex = config.migrations.findIndex(
210
+ (migration) => migration.tag === scriptMigrationTag
211
+ );
212
+ if (foundIndex === -1) {
213
+ logger.warn(
214
+ `The published script ${scriptName} has a migration tag "${script.migration_tag}, which was not found in wrangler.toml. You may have already deleted it. Applying all available migrations to the script...`
215
+ );
216
+ migrations = {
217
+ old_tag: script.migration_tag,
218
+ new_tag: config.migrations[config.migrations.length - 1].tag,
219
+ steps: config.migrations.map(({ tag: _tag, ...rest }) => rest),
220
+ };
221
+ } else {
222
+ if (foundIndex !== config.migrations.length - 1) {
223
+ // there are new migrations to send up
224
+ migrations = {
225
+ old_tag: script.migration_tag,
226
+ new_tag: config.migrations[config.migrations.length - 1].tag,
227
+ steps: config.migrations
228
+ .slice(foundIndex + 1)
229
+ .map(({ tag: _tag, ...rest }) => rest),
230
+ };
231
+ }
232
+ // else, we're up to date, no migrations to send
233
+ }
172
234
  } else {
235
+ // first time publishing durable objects to this script,
236
+ // so we send all the migrations
173
237
  migrations = {
174
- old_tag: script.migration_tag,
175
238
  new_tag: config.migrations[config.migrations.length - 1].tag,
176
- steps: config.migrations
177
- .slice(foundIndex + 1)
178
- .map(({ tag: _tag, ...rest }) => rest),
239
+ steps: config.migrations.map(({ tag: _tag, ...rest }) => rest),
179
240
  };
180
241
  }
181
- } else {
182
- migrations = {
183
- new_tag: config.migrations[config.migrations.length - 1].tag,
184
- steps: config.migrations.map(({ tag: _tag, ...rest }) => rest),
185
- };
186
242
  }
187
- }
188
243
 
189
- const assets =
190
- props.public || props.site || props.config.site?.bucket // TODO: allow both
191
- ? await syncAssets(
192
- accountId,
193
- scriptName,
194
- props.public || props.site || props.config.site?.bucket,
195
- false
196
- )
197
- : { manifest: undefined, namespace: undefined };
198
-
199
- const envRootObj = props.env ? config.env[props.env] || {} : config;
200
-
201
- const worker: CfWorkerInit = {
202
- name: scriptName,
203
- main: {
204
- name: path.basename(chunks[0]),
205
- content: content,
206
- type: bundle.type === "esm" ? "esm" : "commonjs",
207
- },
208
- variables: {
209
- ...(envRootObj?.vars || {}),
210
- ...(envRootObj?.kv_namespaces || []).reduce(
211
- (obj, { binding, preview_id: _preview_id, id }) => {
212
- return { ...obj, [binding]: { namespaceId: id } };
213
- },
214
- {}
215
- ),
216
- ...(envRootObj?.durable_objects?.bindings || []).reduce(
217
- (obj, { name, class_name, script_name }) => {
218
- return {
219
- ...obj,
220
- [name]: { class_name, ...(script_name && { script_name }) },
221
- };
222
- },
223
- {}
244
+ const assets = await syncAssets(
245
+ accountId,
246
+ // When we're using the newer service environments, we wouldn't
247
+ // have added the env name on to the script name. However, we must
248
+ // include it in the kv namespace name regardless (since there's no
249
+ // concept of service environments for kv namespaces yet).
250
+ scriptName + (!props.legacyEnv && props.env ? `-${props.env}` : ""),
251
+ props.assetPaths,
252
+ false,
253
+ props.dryRun
254
+ );
255
+
256
+ const bindings: CfWorkerInit["bindings"] = {
257
+ kv_namespaces: (config.kv_namespaces || []).concat(
258
+ assets.namespace
259
+ ? { binding: "__STATIC_CONTENT", id: assets.namespace }
260
+ : []
224
261
  ),
225
- ...(assets.namespace
226
- ? { __STATIC_CONTENT: { namespaceId: assets.namespace } }
227
- : {}),
228
- },
229
- ...(migrations && { migrations }),
230
- modules: assets.manifest
231
- ? [].concat({
232
- name: "__STATIC_CONTENT_MANIFEST",
233
- content: JSON.stringify(assets.manifest),
234
- type: "text",
235
- })
236
- : [],
237
- compatibility_date: config.compatibility_date,
238
- compatibility_flags: config.compatibility_flags,
239
- usage_model: config.usage_model,
240
- };
262
+ vars: config.vars,
263
+ wasm_modules: config.wasm_modules,
264
+ text_blobs: {
265
+ ...config.text_blobs,
266
+ ...(assets.manifest &&
267
+ format === "service-worker" && {
268
+ __STATIC_CONTENT_MANIFEST: "__STATIC_CONTENT_MANIFEST",
269
+ }),
270
+ },
271
+ data_blobs: config.data_blobs,
272
+ durable_objects: config.durable_objects,
273
+ r2_buckets: config.r2_buckets,
274
+ unsafe: config.unsafe?.bindings,
275
+ };
276
+
277
+ if (assets.manifest) {
278
+ modules.push({
279
+ name: "__STATIC_CONTENT_MANIFEST",
280
+ content: JSON.stringify(assets.manifest),
281
+ type: "text",
282
+ });
283
+ }
241
284
 
242
- const start = Date.now();
243
- function formatTime(duration: number) {
244
- return `(${(duration / 1000).toFixed(2)} sec)`;
285
+ const worker: CfWorkerInit = {
286
+ name: scriptName,
287
+ main: {
288
+ name: path.basename(resolvedEntryPointPath),
289
+ content: content,
290
+ type: bundleType,
291
+ },
292
+ bindings,
293
+ migrations,
294
+ modules,
295
+ compatibility_date: props.compatibilityDate ?? config.compatibility_date,
296
+ compatibility_flags:
297
+ props.compatibilityFlags ?? config.compatibility_flags,
298
+ usage_model: config.usage_model,
299
+ };
300
+
301
+ if (!props.dryRun) {
302
+ // Upload the script so it has time to propagate.
303
+ // We can also now tell whether available_on_subdomain is set
304
+ available_on_subdomain = (
305
+ await fetchResult<{ available_on_subdomain: boolean }>(
306
+ workerUrl,
307
+ {
308
+ method: "PUT",
309
+ body: createWorkerUploadForm(worker),
310
+ },
311
+ new URLSearchParams({ include_subdomain_availability: "true" })
312
+ )
313
+ ).available_on_subdomain;
314
+ }
315
+ } finally {
316
+ if (typeof destination !== "string") {
317
+ // this means we're using a temp dir,
318
+ // so let's clean up before we proceed
319
+ await destination.cleanup();
320
+ }
245
321
  }
246
322
 
247
- const notProd = !props.legacyEnv && props.env;
248
- const workerName = notProd ? `${scriptName} (${envName})` : scriptName;
249
- const workerUrl = notProd
250
- ? `/accounts/${accountId}/workers/services/${scriptName}/environments/${envName}`
251
- : `/accounts/${accountId}/workers/scripts/${scriptName}`;
252
-
253
- // Upload the script so it has time to propogate.
254
- const { available_on_subdomain } = await cfetch(
255
- `${workerUrl}?available_on_subdomain=true`,
256
- {
257
- method: "PUT",
258
- // @ts-expect-error: TODO: fix this type error!
259
- body: toFormData(worker),
260
- }
261
- );
323
+ if (props.dryRun) {
324
+ logger.log(`--dry-run: exiting now.`);
325
+ return;
326
+ }
262
327
 
263
328
  const uploadMs = Date.now() - start;
264
- console.log("Uploaded", workerName, formatTime(uploadMs));
265
329
  const deployments: Promise<string[]>[] = [];
266
330
 
267
- const userSubdomain = (
268
- await cfetch<{ subdomain: string }>(
269
- `/accounts/${accountId}/workers/subdomain`
270
- )
271
- ).subdomain;
272
-
273
- const scriptURL =
274
- props.legacyEnv || !props.env
275
- ? `${scriptName}.${userSubdomain}.workers.dev`
276
- : `${envName}.${scriptName}.${userSubdomain}.workers.dev`;
277
-
278
- // Enable the `workers.dev` subdomain.
279
- // TODO: Make this configurable.
280
- if (!available_on_subdomain) {
281
- deployments.push(
282
- cfetch(`${workerUrl}/subdomain`, {
331
+ if (deployToWorkersDev) {
332
+ // Deploy to a subdomain of `workers.dev`
333
+ const userSubdomain = await getSubdomain(accountId);
334
+ const scriptURL =
335
+ props.legacyEnv || !props.env
336
+ ? `${scriptName}.${userSubdomain}.workers.dev`
337
+ : `${envName}.${scriptName}.${userSubdomain}.workers.dev`;
338
+ if (!available_on_subdomain) {
339
+ // Enable the `workers.dev` subdomain.
340
+ deployments.push(
341
+ fetchResult(`${workerUrl}/subdomain`, {
342
+ method: "POST",
343
+ body: JSON.stringify({ enabled: true }),
344
+ headers: {
345
+ "Content-Type": "application/json",
346
+ },
347
+ })
348
+ .then(() => [scriptURL])
349
+ // Add a delay when the subdomain is first created.
350
+ // This is to prevent an issue where a negative cache-hit
351
+ // causes the subdomain to be unavailable for 30 seconds.
352
+ // This is a temporary measure until we fix this on the edge.
353
+ .then(async (url) => {
354
+ await sleep(3000);
355
+ return url;
356
+ })
357
+ );
358
+ } else {
359
+ deployments.push(Promise.resolve([scriptURL]));
360
+ }
361
+ } else {
362
+ if (available_on_subdomain) {
363
+ // Disable the workers.dev deployment
364
+ await fetchResult(`${workerUrl}/subdomain`, {
283
365
  method: "POST",
284
- body: JSON.stringify({ enabled: true }),
366
+ body: JSON.stringify({ enabled: false }),
285
367
  headers: {
286
368
  "Content-Type": "application/json",
287
369
  },
288
- })
289
- .then(() => [scriptURL])
290
- // Add a delay when the subdomain is first created.
291
- // This is to prevent an issue where a negative cache-hit
292
- // causes the subdomain to be unavailable for 30 seconds.
293
- // This is a temporary measure until we fix this on the edge.
294
- .then((url) => {
295
- sleep(3000);
296
- return url;
297
- })
298
- );
299
- } else {
300
- deployments.push(Promise.resolve([scriptURL]));
370
+ });
371
+ }
301
372
  }
302
373
 
374
+ logger.log("Uploaded", workerName, formatTime(uploadMs));
375
+
303
376
  // Update routing table for the script.
304
- if (routes && routes.length) {
377
+ if (routes.length > 0) {
305
378
  deployments.push(
306
- cfetch(`${workerUrl}/routes`, {
307
- // TODO: PATCH will not delete previous routes on this script,
308
- // whereas PUT will. We need to decide on the default behaviour
309
- // and how to configure it.
379
+ fetchResult(`${workerUrl}/routes`, {
380
+ // Note: PUT will delete previous routes on this script.
310
381
  method: "PUT",
311
- body: JSON.stringify(routes.map((pattern) => ({ pattern }))),
382
+ body: JSON.stringify(
383
+ routes.map((route) =>
384
+ typeof route !== "object" ? { pattern: route } : route
385
+ )
386
+ ),
312
387
  headers: {
313
388
  "Content-Type": "application/json",
314
389
  },
@@ -316,10 +391,22 @@ export default async function publish(props: Props): Promise<void> {
316
391
  if (routes.length > 10) {
317
392
  return routes
318
393
  .slice(0, 9)
319
- .map(String)
394
+ .map((route) =>
395
+ typeof route === "string"
396
+ ? route
397
+ : "zone_id" in route
398
+ ? `${route.pattern} (zone id: ${route.zone_id})`
399
+ : `${route.pattern} (zone name: ${route.zone_name})`
400
+ )
320
401
  .concat([`...and ${routes.length - 10} more routes`]);
321
402
  }
322
- return routes.map(String);
403
+ return routes.map((route) =>
404
+ typeof route === "string"
405
+ ? route
406
+ : "zone_id" in route
407
+ ? `${route.pattern} (zone id: ${route.zone_id})`
408
+ : `${route.pattern} (zone name: ${route.zone_name})`
409
+ );
323
410
  })
324
411
  );
325
412
  }
@@ -328,27 +415,55 @@ export default async function publish(props: Props): Promise<void> {
328
415
  // TODO: rename this to `schedules`?
329
416
  if (triggers && triggers.length) {
330
417
  deployments.push(
331
- cfetch(`${workerUrl}/schedules`, {
332
- // TODO: Unlike routes, this endpoint does not support PATCH.
333
- // So technically, this will override any previous schedules.
334
- // We should change the endpoint to support PATCH.
418
+ fetchResult(`${workerUrl}/schedules`, {
419
+ // Note: PUT will override previous schedules on this script.
335
420
  method: "PUT",
336
421
  body: JSON.stringify(triggers.map((cron) => ({ cron }))),
337
422
  headers: {
338
423
  "Content-Type": "application/json",
339
424
  },
340
- }).then(() => triggers.map(String))
425
+ }).then(() => triggers.map((trigger) => `schedule: ${trigger}`))
341
426
  );
342
427
  }
343
428
 
344
- if (!deployments.length) {
345
- return;
346
- }
347
-
348
429
  const targets = await Promise.all(deployments);
349
430
  const deployMs = Date.now() - start - uploadMs;
350
- console.log("Deployed", workerName, formatTime(deployMs));
351
- for (const target of targets.flat()) {
352
- console.log(" ", target);
431
+
432
+ if (deployments.length > 0) {
433
+ logger.log("Published", workerName, formatTime(deployMs));
434
+ for (const target of targets.flat()) {
435
+ logger.log(" ", target);
436
+ }
437
+ } else {
438
+ logger.log("No publish targets for", workerName, formatTime(deployMs));
439
+ }
440
+ }
441
+
442
+ function formatTime(duration: number) {
443
+ return `(${(duration / 1000).toFixed(2)} sec)`;
444
+ }
445
+
446
+ async function getSubdomain(accountId: string): Promise<string> {
447
+ try {
448
+ const { subdomain } = await fetchResult(
449
+ `/accounts/${accountId}/workers/subdomain`
450
+ );
451
+ return subdomain;
452
+ } catch (e) {
453
+ const error = e as { code?: number };
454
+ if (typeof error === "object" && !!error && error.code === 10007) {
455
+ // 10007 error code: not found
456
+ // https://api.cloudflare.com/#worker-subdomain-get-subdomain
457
+
458
+ const errorMessage =
459
+ "Error: You need to register a workers.dev subdomain before publishing to workers.dev";
460
+ const solutionMessage =
461
+ "You can either publish your worker to one or more routes by specifying them in wrangler.toml, or register a workers.dev subdomain here:";
462
+ const onboardingLink = `https://dash.cloudflare.com/${accountId}/workers/onboarding`;
463
+
464
+ throw new Error(`${errorMessage}\n${solutionMessage}\n${onboardingLink}`);
465
+ } else {
466
+ throw e;
467
+ }
353
468
  }
354
469
  }