wrangler 0.0.0-fe5dcfd → 0.0.0-ff53f4e

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 (94) hide show
  1. package/bin/wrangler.js +2 -2
  2. package/package.json +28 -15
  3. package/pages/functions/buildWorker.ts +1 -1
  4. package/pages/functions/filepath-routing.test.ts +212 -28
  5. package/pages/functions/filepath-routing.ts +83 -130
  6. package/pages/functions/routes.ts +11 -18
  7. package/pages/functions/template-worker.ts +3 -9
  8. package/src/__tests__/configuration.test.ts +2237 -0
  9. package/src/__tests__/dev.test.tsx +397 -59
  10. package/src/__tests__/dev2.test.tsx +152 -0
  11. package/src/__tests__/guess-worker-format.test.ts +58 -0
  12. package/src/__tests__/{clipboardy-mock.js → helpers/clipboardy-mock.js} +0 -0
  13. package/src/__tests__/helpers/cmd-shim.d.ts +11 -0
  14. package/src/__tests__/helpers/faye-websocket.d.ts +6 -0
  15. package/src/__tests__/helpers/mock-account-id.ts +44 -0
  16. package/src/__tests__/helpers/mock-bin.ts +36 -0
  17. package/src/__tests__/{mock-cfetch.ts → helpers/mock-cfetch.ts} +46 -12
  18. package/src/__tests__/helpers/mock-console.ts +70 -0
  19. package/src/__tests__/{mock-dialogs.ts → helpers/mock-dialogs.ts} +1 -1
  20. package/src/__tests__/helpers/mock-kv.ts +33 -0
  21. package/src/__tests__/helpers/mock-stdin.ts +103 -0
  22. package/src/__tests__/helpers/mock-user.ts +27 -0
  23. package/src/__tests__/helpers/mock-web-socket.ts +29 -0
  24. package/src/__tests__/helpers/run-in-tmp.ts +29 -0
  25. package/src/__tests__/helpers/run-wrangler.ts +16 -0
  26. package/src/__tests__/helpers/write-wrangler-toml.ts +17 -0
  27. package/src/__tests__/https-options.test.ts +127 -0
  28. package/src/__tests__/index.test.ts +777 -75
  29. package/src/__tests__/jest.setup.ts +53 -6
  30. package/src/__tests__/kv.test.ts +662 -480
  31. package/src/__tests__/logout.test.ts +50 -0
  32. package/src/__tests__/package-manager.test.ts +206 -0
  33. package/src/__tests__/pages.test.ts +44 -0
  34. package/src/__tests__/parse.test.ts +322 -0
  35. package/src/__tests__/publish.test.ts +2218 -338
  36. package/src/__tests__/r2.test.ts +198 -0
  37. package/src/__tests__/route.test.ts +45 -0
  38. package/src/__tests__/secret.test.ts +425 -0
  39. package/src/__tests__/sentry.test.ts +146 -0
  40. package/src/__tests__/tail.test.ts +564 -0
  41. package/src/__tests__/whoami.test.tsx +7 -51
  42. package/src/bundle.ts +142 -0
  43. package/src/cfetch/index.ts +13 -19
  44. package/src/cfetch/internal.ts +88 -20
  45. package/src/cli.ts +10 -0
  46. package/src/config/README.md +107 -0
  47. package/src/config/config.ts +279 -0
  48. package/src/config/diagnostics.ts +80 -0
  49. package/src/config/environment.ts +305 -0
  50. package/src/config/index.ts +52 -0
  51. package/src/config/validation-helpers.ts +388 -0
  52. package/src/config/validation.ts +1027 -0
  53. package/src/{api/preview.ts → create-worker-preview.ts} +61 -23
  54. package/src/create-worker-upload-form.ts +217 -0
  55. package/src/dev/dev.tsx +357 -0
  56. package/src/dev/local.tsx +241 -0
  57. package/src/dev/remote.tsx +201 -0
  58. package/src/dev/use-esbuild.ts +100 -0
  59. package/src/dialogs.tsx +2 -2
  60. package/src/entry.ts +159 -0
  61. package/src/environment-variables.ts +33 -0
  62. package/src/https-options.ts +122 -0
  63. package/src/index.tsx +1122 -768
  64. package/src/inspect.ts +95 -21
  65. package/src/{kv.tsx → kv.ts} +119 -56
  66. package/src/module-collection.ts +215 -26
  67. package/src/open-in-browser.ts +25 -0
  68. package/src/package-manager.ts +126 -0
  69. package/src/pages.tsx +30 -25
  70. package/src/parse.ts +183 -0
  71. package/src/paths.ts +26 -0
  72. package/src/proxy.ts +175 -39
  73. package/src/publish.ts +282 -310
  74. package/src/r2.ts +50 -0
  75. package/src/reporting.ts +131 -0
  76. package/src/selfsigned.d.ts +29 -0
  77. package/src/sites.tsx +77 -48
  78. package/src/tail/filters.ts +279 -0
  79. package/src/tail/index.ts +299 -0
  80. package/src/tail/printing.ts +62 -0
  81. package/src/user.tsx +106 -60
  82. package/src/{api/worker.ts → worker.ts} +45 -37
  83. package/templates/new-worker.js +15 -0
  84. package/templates/new-worker.ts +15 -0
  85. package/{static-asset-facade.js → templates/static-asset-facade.js} +0 -0
  86. package/templates/tsconfig.json +105 -0
  87. package/wrangler-dist/cli.js +128970 -113025
  88. package/wrangler-dist/cli.js.map +3 -3
  89. package/src/__tests__/run-in-tmp.ts +0 -19
  90. package/src/__tests__/run-wrangler.ts +0 -32
  91. package/src/api/form_data.ts +0 -131
  92. package/src/config.ts +0 -646
  93. package/src/dev.tsx +0 -779
  94. package/src/tail.tsx +0 -73
@@ -1,21 +1,96 @@
1
- import type { CfModule } from "./api/worker";
2
- import type esbuild from "esbuild";
3
- import path from "node:path";
4
- import { readFile } from "node:fs/promises";
5
1
  import crypto from "node:crypto";
2
+ import { readFile } from "node:fs/promises";
3
+ import path from "node:path";
4
+ import globToRegExp from "glob-to-regexp";
5
+ import type { Config, ConfigModuleRuleType } from "./config";
6
+ import type { CfModule, CfModuleType, CfScriptFormat } from "./worker";
7
+ import type esbuild from "esbuild";
8
+
9
+ const RuleTypeToModuleType: Record<ConfigModuleRuleType, CfModuleType> = {
10
+ ESModule: "esm",
11
+ CommonJS: "commonjs",
12
+ CompiledWasm: "compiled-wasm",
13
+ Data: "buffer",
14
+ Text: "text",
15
+ };
6
16
 
7
17
  // This is a combination of an esbuild plugin and a mutable array
8
18
  // that we use to collect module references from source code.
9
19
  // There will be modules that _shouldn't_ be inlined directly into
10
20
  // the bundle. (eg. wasm modules, some text files, etc). We can include
11
- // those files as modules in the multi part forker form upload. This
21
+ // those files as modules in the multi part worker form upload. This
12
22
  // plugin+array is used to collect references to these modules, reference
13
23
  // them correctly in the bundle, and add them to the form upload.
14
24
 
15
- export default function makeModuleCollector(): {
25
+ export const DEFAULT_MODULE_RULES: Config["rules"] = [
26
+ { type: "Text", globs: ["**/*.txt", "**/*.html"] },
27
+ { type: "Data", globs: ["**/*.bin"] },
28
+ { type: "CompiledWasm", globs: ["**/*.wasm"] },
29
+ ];
30
+
31
+ export default function createModuleCollector(props: {
32
+ format: CfScriptFormat;
33
+ rules?: Config["rules"];
34
+ // a collection of "legacy" style module references, which are just file names
35
+ // we will eventually deprecate this functionality, hence the verbose greppable name
36
+ wrangler1xlegacyModuleReferences: {
37
+ rootDirectory: string;
38
+ fileNames: Set<string>;
39
+ };
40
+ }): {
16
41
  modules: CfModule[];
17
42
  plugin: esbuild.Plugin;
18
43
  } {
44
+ const rules: Config["rules"] = [
45
+ ...(props.rules || []),
46
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
47
+ ...DEFAULT_MODULE_RULES!,
48
+ ];
49
+
50
+ // First, we want to add some validations to the module rules
51
+ // We want to warn if rules are accidentally configured in such a way that
52
+ // subsequent rules will never match because `fallthrough` hasn't been set
53
+
54
+ const completedRuleLocations: Record<string, number> = {};
55
+ let index = 0;
56
+ const rulesToRemove: Config["rules"] = [];
57
+ for (const rule of rules) {
58
+ if (rule.type in completedRuleLocations) {
59
+ if (rules[completedRuleLocations[rule.type]].fallthrough !== false) {
60
+ if (index < (props.rules || []).length) {
61
+ console.warn(
62
+ `The module rule at position ${index} (${JSON.stringify(
63
+ rule
64
+ )}) has the same type as a previous rule (at position ${
65
+ completedRuleLocations[rule.type]
66
+ }, ${JSON.stringify(
67
+ rules[completedRuleLocations[rule.type]]
68
+ )}). This rule will be ignored. To the previous rule, add \`fallthrough = true\` to allow this one to also be used, or \`fallthrough = false\` to silence this warning.`
69
+ );
70
+ } else {
71
+ console.warn(
72
+ `The default module rule ${JSON.stringify(
73
+ rule
74
+ )} has the same type as a previous rule (at position ${
75
+ completedRuleLocations[rule.type]
76
+ }, ${JSON.stringify(
77
+ rules[completedRuleLocations[rule.type]]
78
+ )}). This rule will be ignored. To the previous rule, add \`fallthrough = true\` to allow the default one to also be used, or \`fallthrough = false\` to silence this warning.`
79
+ );
80
+ }
81
+ }
82
+
83
+ rulesToRemove.push(rule);
84
+ }
85
+ if (!(rule.type in completedRuleLocations) && rule.fallthrough !== true) {
86
+ completedRuleLocations[rule.type] = index;
87
+ }
88
+ index++;
89
+ }
90
+
91
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
92
+ rulesToRemove.forEach((rule) => rules!.splice(rules!.indexOf(rule), 1));
93
+
19
94
  const modules: CfModule[] = [];
20
95
  return {
21
96
  modules,
@@ -23,41 +98,155 @@ export default function makeModuleCollector(): {
23
98
  name: "wrangler-module-collector",
24
99
  setup(build) {
25
100
  build.onStart(() => {
26
- // reset the moduels collection
101
+ // reset the module collection array
27
102
  modules.splice(0);
28
103
  });
29
104
 
105
+ // ~ start legacy module specifier support ~
106
+
107
+ // This section detects usage of "legacy" 1.x style module specifiers
108
+ // and modifies them so they "work" in wrangler v2, but with a warning
109
+
110
+ const rulesMatchers = rules.flatMap((rule) => {
111
+ return rule.globs.map((glob) => {
112
+ const regex = globToRegExp(glob);
113
+ return {
114
+ regex,
115
+ rule,
116
+ };
117
+ });
118
+ });
119
+
30
120
  build.onResolve(
31
- // filter on "known" file types,
32
- // we can expand this list later
33
- { filter: /.*\.(pem|txt|html|wasm)$/ },
121
+ {
122
+ filter: new RegExp(
123
+ [...props.wrangler1xlegacyModuleReferences.fileNames]
124
+ .map((fileName) => `^${fileName}$`)
125
+ .join("|")
126
+ ),
127
+ },
34
128
  async (args: esbuild.OnResolveArgs) => {
129
+ if (
130
+ args.kind !== "import-statement" &&
131
+ args.kind !== "require-call"
132
+ ) {
133
+ return;
134
+ }
135
+ // In the future, this will simply throw an error
136
+ console.warn(
137
+ `Deprecation warning: detected a legacy module import in "./${path.relative(
138
+ process.cwd(),
139
+ args.importer
140
+ )}". This will stop working in the future. Replace references to "${
141
+ args.path
142
+ }" with "./${args.path}";`
143
+ );
144
+
35
145
  // take the file and massage it to a
36
146
  // transportable/manageable format
37
- const fileExt = path.extname(args.path);
38
- const filePath = path.join(args.resolveDir, args.path);
147
+ const filePath = path.join(
148
+ props.wrangler1xlegacyModuleReferences.rootDirectory,
149
+ args.path
150
+ );
39
151
  const fileContent = await readFile(filePath);
40
152
  const fileHash = crypto
41
153
  .createHash("sha1")
42
154
  .update(fileContent)
43
155
  .digest("hex");
44
- const fileName = `${fileHash}-${path.basename(args.path)}`;
156
+ const fileName = `./${fileHash}-${path.basename(args.path)}`;
45
157
 
46
- // add the module to the array
47
- modules.push({
48
- name: fileName,
49
- content: fileContent,
50
- type: fileExt === ".wasm" ? "compiled-wasm" : "text",
51
- });
52
-
53
- return {
54
- path: fileName, // change the reference to the changed module
55
- external: true, // mark it as external in the bundle
56
- namespace: "wrangler-module-collector-ns", // just a tag, this isn't strictly necessary
57
- watchFiles: [filePath], // we also add the file to esbuild's watch list
58
- };
158
+ const { rule } =
159
+ rulesMatchers.find(({ regex }) => regex.test(fileName)) || {};
160
+ if (rule) {
161
+ // add the module to the array
162
+ modules.push({
163
+ name: fileName,
164
+ content: fileContent,
165
+ type: RuleTypeToModuleType[rule.type],
166
+ });
167
+ return {
168
+ path: fileName, // change the reference to the changed module
169
+ external: props.format === "modules", // mark it as external in the bundle
170
+ namespace: `wrangler-module-${rule.type}`, // just a tag, this isn't strictly necessary
171
+ watchFiles: [filePath], // we also add the file to esbuild's watch list
172
+ };
173
+ }
59
174
  }
60
175
  );
176
+ // ~ end legacy module specifier support ~
177
+
178
+ rules?.forEach((rule) => {
179
+ if (rule.type === "ESModule" || rule.type === "CommonJS") return; // TODO: we should treat these as js files, and use the jsx loader
180
+
181
+ rule.globs.forEach((glob) => {
182
+ build.onResolve(
183
+ { filter: globToRegExp(glob) },
184
+ async (args: esbuild.OnResolveArgs) => {
185
+ // take the file and massage it to a
186
+ // transportable/manageable format
187
+
188
+ const filePath = path.join(args.resolveDir, args.path);
189
+ const fileContent = await readFile(filePath);
190
+ const fileHash = crypto
191
+ .createHash("sha1")
192
+ .update(fileContent)
193
+ .digest("hex");
194
+ const fileName = `./${fileHash}-${path.basename(args.path)}`;
195
+
196
+ // add the module to the array
197
+ modules.push({
198
+ name: fileName,
199
+ content: fileContent,
200
+ type: RuleTypeToModuleType[rule.type],
201
+ });
202
+
203
+ return {
204
+ path: fileName, // change the reference to the changed module
205
+ external: props.format === "modules", // mark it as external in the bundle
206
+ namespace: `wrangler-module-${rule.type}`, // just a tag, this isn't strictly necessary
207
+ watchFiles: [filePath], // we also add the file to esbuild's watch list
208
+ };
209
+ }
210
+ );
211
+
212
+ if (props.format === "service-worker") {
213
+ build.onLoad(
214
+ { filter: globToRegExp(glob) },
215
+ async (args: esbuild.OnLoadArgs) => {
216
+ return {
217
+ // We replace the the module with an identifier
218
+ // that we'll separately add to the form upload
219
+ // as part of [wasm_modules]/[text_blobs]. This identifier has to be a valid
220
+ // JS identifier, so we replace all non alphanumeric characters
221
+ // with an underscore.
222
+ // TODO: what of "Data"?
223
+ contents: `export default ${args.path.replace(
224
+ /[^a-zA-Z0-9_$]/g,
225
+ "_"
226
+ )};`,
227
+ };
228
+ }
229
+ );
230
+ }
231
+ });
232
+ });
233
+
234
+ rulesToRemove.forEach((rule) => {
235
+ rule.globs.forEach((glob) => {
236
+ build.onResolve(
237
+ { filter: globToRegExp(glob) },
238
+ async (args: esbuild.OnResolveArgs) => {
239
+ throw new Error(
240
+ `The file ${
241
+ args.path
242
+ } matched a module rule in your configuration (${JSON.stringify(
243
+ rule
244
+ )}), but was ignored because a previous rule with the same type was not marked as \`fallthrough = true\`.`
245
+ );
246
+ }
247
+ );
248
+ });
249
+ });
61
250
  },
62
251
  },
63
252
  };
@@ -0,0 +1,25 @@
1
+ import open from "open";
2
+
3
+ /**
4
+ * An extremely simple wrapper around the open command.
5
+ * Specifically, it adds an 'error' event handler so that when this function
6
+ * is called in environments where we can't open the browser (e.g. github codespaces,
7
+ * stackblitz, remote servers), it doesn't just crash the process.
8
+ *
9
+ * @param url the URL to point the browser at
10
+ * @param options open a chromium-based browser instead of the default
11
+ */
12
+ export default async function openInBrowser(
13
+ url: string,
14
+ { forceChromium }: { forceChromium: boolean } = { forceChromium: false }
15
+ ): Promise<void> {
16
+ const options: open.Options | undefined = forceChromium
17
+ ? {
18
+ app: [{ name: open.apps.chrome }, { name: open.apps.edge }],
19
+ }
20
+ : undefined;
21
+ const childProcess = await open(url, options);
22
+ childProcess.on("error", () => {
23
+ console.warn(`Failed to open ${url} in a browser`);
24
+ });
25
+ }
@@ -0,0 +1,126 @@
1
+ import { existsSync } from "node:fs";
2
+ import { join } from "node:path";
3
+ import { execa, execaCommandSync } from "execa";
4
+
5
+ export interface PackageManager {
6
+ cwd: string;
7
+ type: "npm" | "yarn";
8
+ addDevDeps(...packages: string[]): Promise<void>;
9
+ install(): Promise<void>;
10
+ }
11
+
12
+ export async function getPackageManager(cwd: string): Promise<PackageManager> {
13
+ const [hasYarn, hasNpm] = await Promise.all([supportsYarn(), supportsNpm()]);
14
+ const hasYarnLock = existsSync(join(cwd, "yarn.lock"));
15
+ const hasNpmLock = existsSync(join(cwd, "package-lock.json"));
16
+
17
+ if (hasNpmLock) {
18
+ if (hasNpm) {
19
+ console.log(
20
+ "Using npm as package manager, as there is already a package-lock.json file."
21
+ );
22
+ return { ...NpmPackageManager, cwd };
23
+ } else if (hasYarn) {
24
+ console.log("Using yarn as package manager.");
25
+ console.warn(
26
+ "There is already a package-lock.json file but could not find npm on the PATH."
27
+ );
28
+ return { ...YarnPackageManager, cwd };
29
+ }
30
+ } else if (hasYarnLock) {
31
+ if (hasYarn) {
32
+ console.log(
33
+ "Using yarn as package manager, as there is already a yarn.lock file."
34
+ );
35
+ return { ...YarnPackageManager, cwd };
36
+ } else if (hasNpm) {
37
+ console.log("Using npm as package manager.");
38
+ console.warn(
39
+ "There is already a yarn.lock file but could not find yarn on the PATH."
40
+ );
41
+ return { ...NpmPackageManager, cwd };
42
+ }
43
+ }
44
+
45
+ if (hasNpm) {
46
+ console.log("Using npm as package manager.");
47
+ return { ...NpmPackageManager, cwd };
48
+ } else if (hasYarn) {
49
+ console.log("Using yarn as package manager.");
50
+ return { ...YarnPackageManager, cwd };
51
+ } else {
52
+ throw new Error(
53
+ "Unable to find a package manager. Supported managers are: npm and yarn."
54
+ );
55
+ }
56
+ }
57
+
58
+ /**
59
+ * Get the name of the given `packageManager`.
60
+ */
61
+ export function getPackageManagerName(packageManager: PackageManager): string {
62
+ return packageManager.type ?? "unknown";
63
+ }
64
+
65
+ /**
66
+ * Manage packages using npm
67
+ */
68
+ const NpmPackageManager: PackageManager = {
69
+ cwd: process.cwd(),
70
+ type: "npm",
71
+ /** Add and install a new devDependency into the local package.json. */
72
+ async addDevDeps(...packages: string[]): Promise<void> {
73
+ await execa("npm", ["install", ...packages, "--save-dev"], {
74
+ stdio: "inherit",
75
+ cwd: this.cwd,
76
+ });
77
+ },
78
+
79
+ /** Install all the dependencies in the local package.json. */
80
+ async install(): Promise<void> {
81
+ await execa("npm", ["install"], {
82
+ stdio: "inherit",
83
+ cwd: this.cwd,
84
+ });
85
+ },
86
+ };
87
+
88
+ /**
89
+ * Manage packages using yarn
90
+ */
91
+ const YarnPackageManager: PackageManager = {
92
+ cwd: process.cwd(),
93
+ type: "yarn",
94
+ /** Add and install a new devDependency into the local package.json. */
95
+ async addDevDeps(...packages: string[]): Promise<void> {
96
+ await execa("yarn", ["add", ...packages, "--dev"], {
97
+ stdio: "inherit",
98
+ cwd: this.cwd,
99
+ });
100
+ },
101
+
102
+ /** Install all the dependencies in the local package.json. */
103
+ async install(): Promise<void> {
104
+ await execa("yarn", ["install"], {
105
+ stdio: "inherit",
106
+ cwd: this.cwd,
107
+ });
108
+ },
109
+ };
110
+
111
+ async function supports(name: string): Promise<boolean> {
112
+ try {
113
+ execaCommandSync(`${name} --version`, { stdio: "ignore" });
114
+ return true;
115
+ } catch {
116
+ return false;
117
+ }
118
+ }
119
+
120
+ function supportsYarn(): Promise<boolean> {
121
+ return supports("yarn");
122
+ }
123
+
124
+ function supportsNpm(): Promise<boolean> {
125
+ return supports("npm");
126
+ }
package/src/pages.tsx CHANGED
@@ -1,25 +1,26 @@
1
1
  /* eslint-disable no-shadow */
2
2
 
3
- import type { BuilderCallback } from "yargs";
4
- import { join } from "path";
5
- import { tmpdir } from "os";
6
- import { existsSync, lstatSync, readFileSync, writeFileSync } from "fs";
7
- import { execSync, spawn } from "child_process";
8
- import { URL } from "url";
9
- import { getType } from "mime";
10
- import open from "open";
3
+ import { execSync, spawn } from "node:child_process";
4
+ import { existsSync, lstatSync, readFileSync, writeFileSync } from "node:fs";
5
+ import { tmpdir } from "node:os";
6
+ import { join } from "node:path";
7
+ import { URL } from "node:url";
11
8
  import { watch } from "chokidar";
12
- import type { BuildResult } from "esbuild";
9
+ import { getType } from "mime";
13
10
  import { buildWorker } from "../pages/functions/buildWorker";
14
- import type { Config } from "../pages/functions/routes";
15
- import { writeRoutesModule } from "../pages/functions/routes";
16
11
  import { generateConfigFromFileTree } from "../pages/functions/filepath-routing";
12
+ import { writeRoutesModule } from "../pages/functions/routes";
13
+ import openInBrowser from "./open-in-browser";
14
+ import { toUrlPath } from "./paths";
15
+ import type { Config } from "../pages/functions/routes";
16
+ import type { Headers, Request, fetch } from "@miniflare/core";
17
+ import type { BuildResult } from "esbuild";
18
+ import type { MiniflareOptions } from "miniflare";
19
+ import type { BuilderCallback } from "yargs";
17
20
 
18
21
  // Defer importing miniflare until we really need it. This takes ~0.5s
19
22
  // and also modifies some `stream/web` and `undici` prototypes, so we
20
23
  // don't want to do this if pages commands aren't being called.
21
- import type { Headers, Request, fetch } from "@miniflare/core";
22
- import type { MiniflareOptions } from "miniflare";
23
24
 
24
25
  const EXIT_CALLBACKS: (() => void)[] = [];
25
26
  const EXIT = (message?: string, code?: number) => {
@@ -665,16 +666,17 @@ async function buildFunctions({
665
666
  );
666
667
 
667
668
  const routesModule = join(tmpdir(), "./functionsRoutes.mjs");
669
+ const baseURL = toUrlPath("/");
668
670
 
669
671
  const config: Config = await generateConfigFromFileTree({
670
672
  baseDir: functionsDirectory,
671
- baseURL: "/",
673
+ baseURL,
672
674
  });
673
675
 
674
676
  if (outputConfigPath) {
675
677
  writeFileSync(
676
678
  outputConfigPath,
677
- JSON.stringify({ ...config, baseURL: "/" }, null, 2)
679
+ JSON.stringify({ ...config, baseURL }, null, 2)
678
680
  );
679
681
  }
680
682
 
@@ -769,7 +771,7 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
769
771
  kv: kvs = [],
770
772
  do: durableObjects = [],
771
773
  "live-reload": liveReload,
772
- "--": remaining = [],
774
+ _: [_pages, _dev, ...remaining],
773
775
  }) => {
774
776
  if (!local) {
775
777
  console.error("Only local mode is supported at the moment.");
@@ -793,8 +795,8 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
793
795
 
794
796
  let miniflareArgs: MiniflareOptions = {};
795
797
 
796
- let scriptReadyResolve;
797
- const scriptReadyPromise = new Promise(
798
+ let scriptReadyResolve: () => void;
799
+ const scriptReadyPromise = new Promise<void>(
798
800
  (resolve) => (scriptReadyResolve = resolve)
799
801
  );
800
802
 
@@ -828,6 +830,9 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
828
830
  scriptPath,
829
831
  };
830
832
  } else {
833
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
834
+ scriptReadyResolve!();
835
+
831
836
  const scriptPath =
832
837
  directory !== undefined
833
838
  ? join(directory, singleWorkerScriptPath)
@@ -890,13 +895,13 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
890
895
  // User bindings
891
896
  bindings: {
892
897
  ...Object.fromEntries(
893
- bindings.map((binding) => binding.toString().split("="))
898
+ bindings.map((binding) => binding.toString().split("=", 1))
894
899
  ),
895
900
  },
896
901
 
897
902
  // env.ASSETS.fetch
898
903
  serviceBindings: {
899
- async ASSETS(request) {
904
+ async ASSETS(request: Request) {
900
905
  if (proxyPort) {
901
906
  try {
902
907
  const url = new URL(request.url);
@@ -941,9 +946,7 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
941
946
  console.log(`Serving at http://localhost:${port}/`);
942
947
 
943
948
  if (process.env.BROWSER !== "none") {
944
- const childProcess = await open(`http://localhost:${port}/`);
945
- // fail silently if the open command doesn't work (e.g. in GitHub Codespaces)
946
- childProcess.on("error", (_err) => {});
949
+ await openInBrowser(`http://localhost:${port}/`);
947
950
  }
948
951
 
949
952
  if (directory !== undefined && liveReload) {
@@ -960,12 +963,14 @@ export const pages: BuilderCallback<unknown, unknown> = (yargs) => {
960
963
  miniflare.dispose().catch((err) => miniflare.log.error(err));
961
964
  });
962
965
  } catch (e) {
963
- miniflare.log.error(e);
966
+ miniflare.log.error(e as Error);
964
967
  EXIT("Could not start Miniflare.", 1);
965
968
  }
966
969
  }
967
970
  )
968
- .command("functions", "Cloudflare Pages Functions", (yargs) =>
971
+ .command("functions", false, (yargs) =>
972
+ // we hide this command from help output because
973
+ // it's not meant to be used directly right now
969
974
  yargs.command(
970
975
  "build [directory]",
971
976
  "Compile a folder of Cloudflare Pages Functions into a single Worker",