hadars 0.2.0 → 0.2.1

package/dist/cli.js

@@ -1180,19 +1180,23 @@ var getReactResponse = async (req, opts) => {
   };
   const unsuspend = { cache: /* @__PURE__ */ new Map() };
   globalThis.__hadarsUnsuspend = unsuspend;
+  globalThis.__hadarsContext = context;
   const element = createElement(App, props);
   try {
     await renderPreflight(element);
   } finally {
     globalThis.__hadarsUnsuspend = null;
+    globalThis.__hadarsContext = null;
   }
   const status = context.head.status;
   const getAppBody = async () => {
     globalThis.__hadarsUnsuspend = unsuspend;
+    globalThis.__hadarsContext = context;
     try {
       return await renderToString(element);
     } finally {
       globalThis.__hadarsUnsuspend = null;
+      globalThis.__hadarsContext = null;
     }
   };
   const finalize = async () => {
@@ -2497,6 +2501,67 @@ async function loadConfig(configPath) {
   const mod = await import(url);
   return mod && (mod.default ?? mod);
 }
+async function bundleCloudflare(config, configPath, outputFile, cwd) {
+  console.log("Building hadars project...");
+  await build({ ...config, mode: "production" });
+  const ssrBundle = resolve(cwd, ".hadars", "index.ssr.js");
+  const outHtml = resolve(cwd, ".hadars", "static", "out.html");
+  if (!existsSync3(ssrBundle)) {
+    console.error(`SSR bundle not found: ${ssrBundle}`);
+    process.exit(1);
+  }
+  if (!existsSync3(outHtml)) {
+    console.error(`HTML template not found: ${outHtml}`);
+    process.exit(1);
+  }
+  const cloudflareModule = resolve(dirname(fileURLToPath3(import.meta.url)), "cloudflare.js");
+  const shimPath = join(cwd, `.hadars-cloudflare-shim-${Date.now()}.ts`);
+  const shim = [
+    `import * as ssrModule from ${JSON.stringify(ssrBundle)};`,
+    `import outHtml from ${JSON.stringify(outHtml)};`,
+    `import { createCloudflareHandler } from ${JSON.stringify(cloudflareModule)};`,
+    `import config from ${JSON.stringify(configPath)};`,
+    `export default createCloudflareHandler(config as any, { ssrModule: ssrModule as any, outHtml });`
+  ].join("\n") + "\n";
+  await writeFile(shimPath, shim, "utf-8");
+  try {
+    const { build: esbuild } = await import("esbuild");
+    console.log(`Bundling Cloudflare Worker \u2192 ${outputFile}`);
+    await esbuild({
+      entryPoints: [shimPath],
+      bundle: true,
+      // 'browser' avoids Node.js built-in shims; CF Workers uses Web APIs.
+      // If you use node:* APIs in your app code, add nodejs_compat to wrangler.toml.
+      platform: "browser",
+      format: "esm",
+      target: ["es2022"],
+      outfile: outputFile,
+      sourcemap: false,
+      loader: { ".html": "text", ".tsx": "tsx", ".ts": "ts" },
+      // @rspack/* is build-time only — never imported at Worker runtime.
+      external: ["@rspack/*"],
+      // Cloudflare Workers supports the Web Crypto API natively; suppress
+      // esbuild's attempt to polyfill node:crypto.
+      define: { "global": "globalThis" }
+    });
+    console.log(`Cloudflare Worker bundle written to ${outputFile}`);
+    console.log(`
+Deploy instructions:`);
+    console.log(`  1. Ensure wrangler.toml points to the output file:`);
+    console.log(`       name = "my-app"`);
+    console.log(`       main = "${outputFile}"`);
+    console.log(`       compatibility_date = "2024-09-23"`);
+    console.log(`       compatibility_flags = ["nodejs_compat"]`);
+    console.log(`  2. Upload .hadars/static/ assets to R2 (or another CDN):`);
+    console.log(`       wrangler r2 object put my-bucket/assets/ --file .hadars/static/ --recursive`);
+    console.log(`  3. Add a route rule in wrangler.toml to send *.js / *.css to R2`);
+    console.log(`     and all other requests to the Worker.`);
+    console.log(`  4. Deploy: wrangler deploy`);
+  } finally {
+    await unlink(shimPath).catch(() => {
+    });
+  }
+}
 async function bundleLambda(config, configPath, outputFile, cwd) {
   console.log("Building hadars project...");
   await build({ ...config, mode: "production" });
@@ -2598,7 +2663,7 @@ export default config;
 dist/
 `,
   "src/App.tsx": () => `import React from 'react';
-import { HadarsContext, HadarsHead, type HadarsApp } from 'hadars';
+import { HadarsHead, type HadarsApp } from 'hadars';
 
 const css = \`
   *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
@@ -2710,15 +2775,15 @@ const css = \`
 
 \`;
 
-const App: HadarsApp<{}> = ({ context }) => {
+const App: HadarsApp<{}> = () => {
   const [count, setCount] = React.useState(0);
 
   return (
-    <HadarsContext context={context}>
+    <>
       <HadarsHead status={200}>
         <title>My App</title>
-        <meta id="viewport" name="viewport" content="width=device-width, initial-scale=1" />
-        <style id="app-styles" dangerouslySetInnerHTML={{ __html: css }} />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <style data-id="app-styles" dangerouslySetInnerHTML={{ __html: css }} />
       </HadarsHead>
 
       <nav className="nav">
@@ -2776,7 +2841,7 @@ const App: HadarsApp<{}> = ({ context }) => {
         </div>
       </div>
 
-    </HadarsContext>
+    </>
   );
 };
 
@@ -2805,7 +2870,7 @@ Done! Next steps:
 `);
 }
 function usage() {
-  console.log("Usage: hadars <new <name> | dev | build | run | export lambda [output.mjs]>");
+  console.log("Usage: hadars <new <name> | dev | build | run | export lambda [output.mjs] | export cloudflare [output.mjs]>");
 }
 async function runCli(argv, cwd = process.cwd()) {
   const cmd = argv[2];
@@ -2848,13 +2913,18 @@ async function runCli(argv, cwd = process.cwd()) {
         process.exit(0);
       case "export": {
         const subCmd = argv[3];
-        if (subCmd !== "lambda") {
-          console.error(`Unknown export target: ${subCmd ?? "(none)"}. Did you mean: hadars export lambda`);
+        if (subCmd === "lambda") {
+          const outputFile = resolve(cwd, argv[4] ?? "lambda.mjs");
+          await bundleLambda(cfg, configPath, outputFile, cwd);
+          process.exit(0);
+        } else if (subCmd === "cloudflare") {
+          const outputFile = resolve(cwd, argv[4] ?? "cloudflare.mjs");
+          await bundleCloudflare(cfg, configPath, outputFile, cwd);
+          process.exit(0);
+        } else {
+          console.error(`Unknown export target: ${subCmd ?? "(none)"}. Supported: lambda, cloudflare`);
           process.exit(1);
         }
-        const outputFile = resolve(cwd, argv[4] ?? "lambda.mjs");
-        await bundleLambda(cfg, configPath, outputFile, cwd);
-        process.exit(0);
       }
       case "run":
         console.log("Running project...");