wrangler 0.0.0-e14e589 → 0.0.0-e928f94

package/src/publish.ts

@@ -8,6 +8,7 @@ import { readFile } from "fs/promises";
 import cfetch from "./cfetch";
 import assert from "node:assert";
 import { syncAssets } from "./sites";
+import makeModuleCollector from "./module-collection";
 
 type CfScriptFormat = void | "modules" | "service-worker";
 
@@ -22,6 +23,8 @@ type Props = {
   triggers?: (string | number)[];
   routes?: (string | number)[];
   legacyEnv?: boolean;
+  jsxFactory: void | string;
+  jsxFragment: void | string;
 };
 
 function sleep(ms: number) {
@@ -47,19 +50,25 @@ export default async function publish(props: Props): Promise<void> {
   const triggers = props.triggers || config.triggers?.crons;
   const routes = props.routes || config.routes;
 
+  const jsxFactory = props.jsxFactory || config.jsx_factory;
+  const jsxFragment = props.jsxFragment || config.jsx_fragment;
+
   assert(config.account_id, "missing account id");
 
+  let scriptName = props.name || config.name;
+  assert(
+    scriptName,
+    '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>"`'
+  );
+
   let file: string;
   if (props.script) {
     file = props.script;
-    assert(props.name, "name is required when using script");
   } else {
     assert(build?.upload?.main, "missing main file");
-    assert(config.name, "missing name");
     file = path.join(path.dirname(__path__), build.upload.main);
   }
 
-  let scriptName = props.script ? props.name : config.name;
   if (props.legacyEnv) {
     scriptName += props.env ? `-${props.env}` : "";
   }
@@ -67,6 +76,7 @@ export default async function publish(props: Props): Promise<void> {
 
   const destination = await tmp.dir({ unsafeCleanup: true });
 
+  const moduleCollector = makeModuleCollector();
   const result = await esbuild.build({
     ...(props.public
       ? {
@@ -89,6 +99,13 @@ export default async function publish(props: Props): Promise<void> {
     format: "esm",
     sourcemap: true,
     metafile: true,
+    conditions: ["worker", "browser"],
+    loader: {
+      ".js": "jsx",
+    },
+    plugins: [moduleCollector.plugin],
+    ...(jsxFactory && { jsxFactory }),
+    ...(jsxFragment && { jsxFragment }),
   });
 
   const chunks = Object.entries(result.metafile.outputs).find(
@@ -121,6 +138,46 @@ export default async function publish(props: Props): Promise<void> {
 
   const content = await readFile(chunks[0], { encoding: "utf-8" });
   destination.cleanup();
+
+  // if config.migrations
+  // get current migration tag
+  let migrations;
+  if ("migrations" in config) {
+    const scripts = await cfetch<{ id: string; migration_tag: string }[]>(
+      `/accounts/${accountId}/workers/scripts`
+    );
+    const script = scripts.find((script) => script.id === scriptName);
+    if (script?.migration_tag) {
+      // was already published once
+      const foundIndex = config.migrations.findIndex(
+        (migration) => migration.tag === script.migration_tag
+      );
+      if (foundIndex === -1) {
+        console.warn(
+          `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...`
+        );
+        migrations = {
+          old_tag: script.migration_tag,
+          new_tag: config.migrations[config.migrations.length - 1].tag,
+          steps: config.migrations.map(({ tag: _tag, ...rest }) => rest),
+        };
+      } else {
+        migrations = {
+          old_tag: script.migration_tag,
+          new_tag: config.migrations[config.migrations.length - 1].tag,
+          steps: config.migrations
+            .slice(foundIndex + 1)
+            .map(({ tag: _tag, ...rest }) => rest),
+        };
+      }
+    } else {
+      migrations = {
+        new_tag: config.migrations[config.migrations.length - 1].tag,
+        steps: config.migrations.map(({ tag: _tag, ...rest }) => rest),
+      };
+    }
+  }
+
   const assets =
     props.public || props.site || props.config.site?.bucket // TODO: allow both
       ? await syncAssets(
@@ -131,42 +188,53 @@ export default async function publish(props: Props): Promise<void> {
         )
       : { manifest: undefined, namespace: undefined };
 
-  const envRootObj = props.env ? config[`env.${props.env}`] : config;
+  const envRootObj = props.env ? config.env[props.env] || {} : config;
 
   const worker: CfWorkerInit = {
+    name: scriptName,
     main: {
-      name: scriptName,
+      name: path.basename(chunks[0]),
       content: content,
-      type:
-        (bundle.type === "esm" ? "modules" : "service-worker") === "modules"
-          ? "esm"
-          : "commonjs",
+      type: bundle.type === "esm" ? "esm" : "commonjs",
     },
     variables: {
       ...(envRootObj?.vars || {}),
       ...(envRootObj?.kv_namespaces || []).reduce(
-        (obj, { binding, preview_id, id }) => {
+        (obj, { binding, preview_id: _preview_id, id }) => {
           return { ...obj, [binding]: { namespaceId: id } };
         },
         {}
       ),
+      ...(envRootObj?.durable_objects?.bindings || []).reduce(
+        (obj, { name, class_name, script_name }) => {
+          return {
+            ...obj,
+            [name]: { class_name, ...(script_name && { script_name }) },
+          };
+        },
+        {}
+      ),
       ...(assets.namespace
         ? { __STATIC_CONTENT: { namespaceId: assets.namespace } }
         : {}),
     },
+    ...(migrations && { migrations }),
     modules: assets.manifest
-      ? [].concat({
+      ? moduleCollector.modules.concat({
           name: "__STATIC_CONTENT_MANIFEST",
           content: JSON.stringify(assets.manifest),
           type: "text",
         })
-      : [],
+      : moduleCollector.modules,
+    compatibility_date: config.compatibility_date,
+    compatibility_flags: config.compatibility_flags,
+    usage_model: config.usage_model,
   };
 
   const start = Date.now();
-  const formatTime = (duration) => {
+  function formatTime(duration: number) {
     return `(${(duration / 1000).toFixed(2)} sec)`;
-  };
+  }
 
   const notProd = !props.legacyEnv && props.env;
   const workerName = notProd ? `${scriptName} (${envName})` : scriptName;

package/src/sites.tsx

@@ -76,7 +76,7 @@ export async function syncAssets(
   scriptName: string,
   dirPath: string,
   preview: boolean,
-  env?: string
+  _env?: string
 ) {
   const title = `__${scriptName}_sites_assets${preview ? "_preview" : ""}`;
   const { id: namespace } = await createKVNamespaceIfNotAlreadyExisting(

package/src/tail.tsx

@@ -33,7 +33,7 @@ async function createTailButDontConnect(
 export async function createTail(
   accountId: string,
   workerName: string,
-  filters: Filters
+  _filters: Filters
 ): Promise<{
   tail: WebSocket;
   expiration: Date;