wrangler 0.0.0-e2b7352 → 0.0.0-e2f9bb2

package/src/dialogs.tsx

@@ -1,24 +1,28 @@
+import chalk from "chalk";
 import { Box, Text, useInput, render } from "ink";
 import TextInput from "ink-text-input";
 import * as React from "react";
 import { useState } from "react";
+import { logger } from "./logger";
 type ConfirmProps = {
   text: string;
   onConfirm: (answer: boolean) => void;
 };
 function Confirm(props: ConfirmProps) {
-  useInput((input: string) => {
-    if (input === "y") {
+  useInput((input: string, key) => {
+    if (input === "y" || key.return === true) {
       props.onConfirm(true);
     } else if (input === "n") {
       props.onConfirm(false);
     } else {
-      console.log("Unrecognised input");
+      logger.warn("Unrecognised input:", input);
     }
   });
   return (
     <Box>
-      <Text>{props.text} (y/n) </Text>
+      <Text>
+        {props.text} ({chalk.bold("y")}/n)
+      </Text>
     </Box>
   );
 }
@@ -39,12 +43,13 @@ export function confirm(text: string): Promise<boolean> {
 
 type PromptProps = {
   text: string;
+  defaultValue?: string;
   type?: "text" | "password";
   onSubmit: (text: string) => void;
 };
 
 function Prompt(props: PromptProps) {
-  const [value, setValue] = useState("");
+  const [value, setValue] = useState(props.defaultValue || "");
 
   return (
     <Box>
@@ -61,11 +66,16 @@ function Prompt(props: PromptProps) {
   );
 }
 
-export async function prompt(text: string, type: "text" | "password" = "text") {
+export async function prompt(
+  text: string,
+  type: "text" | "password" = "text",
+  defaultValue?: string
+): Promise<string> {
   return new Promise((resolve) => {
     const { unmount } = render(
       <Prompt
         text={text}
+        defaultValue={defaultValue}
         type={type}
         onSubmit={(inputText) => {
           unmount();

package/src/entry.ts

@@ -3,6 +3,7 @@ import { existsSync } from "node:fs";
 import path from "node:path";
 import * as esbuild from "esbuild";
 import { execaCommand } from "execa";
+import { logger } from "./logger";
 import type { Config } from "./config";
 import type { CfScriptFormat } from "./worker";
 import type { Metafile } from "esbuild";
@@ -28,9 +29,17 @@ export async function getEntry(
     // If the script name comes from the command line it is relative to the current working directory.
     file = path.resolve(args.script);
   } else if (config.main === undefined) {
-    throw new Error(
-      `Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler ${command} path/to/script\`) or the \`main\` config field.`
-    );
+    if (config.site?.["entry-point"]) {
+      directory = path.resolve(path.dirname(config.configPath ?? "."));
+      file = path.extname(config.site?.["entry-point"])
+        ? path.resolve(config.site?.["entry-point"])
+        : // site.entry-point could be a directory
+          path.resolve(config.site?.["entry-point"], "index.js");
+    } else {
+      throw new Error(
+        `Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler ${command} path/to/script\`) or the \`main\` config field.`
+      );
+    }
   } else {
     directory = path.resolve(path.dirname(config.configPath ?? "."));
     file = path.resolve(directory, config.main);
@@ -54,8 +63,8 @@ export async function getEntry(
     partitionDurableObjectBindings(config);
 
   if (command === "dev" && remoteBindings.length > 0) {
-    console.warn(
-      "WARNING: You have Durable Object bindings, which are not defined locally in the worker being developed.\n" +
+    logger.warn(
+      "WARNING: You have Durable Object bindings that are not defined locally in the worker being developed.\n" +
         "Be aware that changes to the data stored in these Durable Objects will be permanent and affect the live instances.\n" +
         "Remote Durable Objects that are affected:\n" +
         remoteBindings.map((b) => `- ${JSON.stringify(b)}`).join("\n")
@@ -64,7 +73,7 @@ export async function getEntry(
 
   if (format === "service-worker" && localBindings.length > 0) {
     const errorMessage =
-      "You seem to be trying to use Durable Objects in a Worker written with Service Worker syntax.";
+      "You seem to be trying to use Durable Objects in a Worker written as a service-worker.";
     const addScriptName =
       "You can use Durable Objects defined in other Workers by specifying a `script_name` in your wrangler.toml, where `script_name` is the name of the Worker that implements that Durable Object. For example:";
     const addScriptNameExamples = generateAddScriptNameExamples(localBindings);
@@ -86,12 +95,13 @@ export async function runCustomBuild(
 ) {
   if (build?.command) {
     // TODO: add a deprecation message here?
-    console.log("running:", build.command);
+    logger.log("Running custom build:", build.command);
     await execaCommand(build.command, {
       shell: true,
+      // we keep these two as "inherit" so that
+      // logs are still visible.
       stdout: "inherit",
       stderr: "inherit",
-      timeout: 1000 * 30,
       ...(build.cwd && { cwd: build.cwd }),
     });
 
@@ -126,6 +136,7 @@ export default async function guessWorkerFormat(
     metafile: true,
     bundle: false,
     format: "esm",
+    target: "es2020",
     write: false,
     loader: {
       ".js": "jsx",
@@ -150,14 +161,30 @@ export default async function guessWorkerFormat(
     "More than one entry-point found for generated bundle." +
       listEntryPoints(entryPoints)
   );
-  const guessedWorkerFormat =
-    entryPoints[0][1].exports.length > 0 ? "modules" : "service-worker";
+
+  let guessedWorkerFormat: CfScriptFormat;
+  const scriptExports = entryPoints[0][1].exports;
+  if (scriptExports.length > 0) {
+    if (scriptExports.includes("default")) {
+      guessedWorkerFormat = "modules";
+    } else {
+      logger.warn(
+        `The entrypoint ${path.relative(
+          process.cwd(),
+          entryFile
+        )} has exports like an ES Module, but hasn't defined a default export like a module worker normally would. Building the worker using "service-worker" format...`
+      );
+      guessedWorkerFormat = "service-worker";
+    }
+  } else {
+    guessedWorkerFormat = "service-worker";
+  }
 
   if (hint) {
     if (hint !== guessedWorkerFormat) {
       if (hint === "service-worker") {
         throw new Error(
-          "You configured this worker to be a 'service-worker', but the file you are trying to build appears to have ES module exports. Please pass `--format modules`, or simply remove the configuration."
+          "You configured this worker to be a 'service-worker', but the file you are trying to build appears to have a `default` export like a module worker. Please pass `--format modules`, or simply remove the configuration."
         );
       } else {
         throw new Error(

package/src/environment-variables.ts

@@ -1,3 +1,5 @@
+import { logger } from "./logger";
+
 /**
  * Create a function used to access an environment variable.
  *
@@ -21,7 +23,7 @@ export function getEnvironmentVariableFactory({
       if (!hasWarned) {
         // Only show the warning once.
         hasWarned = true;
-        console.warn(
+        logger.warn(
           `Using "${deprecatedName}" environment variable. This is deprecated. Please use "${variableName}", instead.`
         );
       }

package/src/errors.ts

@@ -0,0 +1,11 @@
+export class DeprecationError extends Error {
+  constructor(message: string) {
+    super(`Deprecation:\n${message}`);
+  }
+}
+
+export class FatalError extends Error {
+  constructor(message?: string, readonly code?: number) {
+    super(message);
+  }
+}

package/src/https-options.ts

@@ -2,6 +2,7 @@ import * as fs from "node:fs";
 import { homedir, networkInterfaces } from "node:os";
 import * as path from "node:path";
 import { promisify } from "node:util";
+import { logger } from "./logger";
 import type { Attributes, Options } from "selfsigned";
 
 // Most of this file has been borrowed from the implementation in Miniflare.
@@ -26,7 +27,7 @@ export async function getHttpsOptions() {
     hasCertificateExpired(keyPath, certPath);
 
   if (regenerate) {
-    console.log("Generating new self-signed certificate...");
+    logger.log("Generating new self-signed certificate...");
     const { key, cert } = await generateCertificate();
     try {
       // Write certificate files so we can reuse them later.
@@ -35,7 +36,7 @@ export async function getHttpsOptions() {
       fs.writeFileSync(certPath, cert, "utf8");
     } catch (e) {
       const message = e instanceof Error ? e.message : `${e}`;
-      console.warn(
+      logger.warn(
         `Unable to cache generated self-signed certificate in ${certDirectory}.\n${message}`
       );
     }