@tokamakdev/tok 0.1.1-beta.81 → 0.1.1-beta.82

package/dist/vite.d.mts

@@ -2,8 +2,9 @@ import { type Plugin } from "vite";
 import type { Config } from "./index.mjs";
 /**
  * Reports the app's tokamak configuration, and the development server's
- * address and Worker name, to `tok`, and makes the entry Worker import
- * `module`. Without `TOKAMAK_VITE_OUTPUT`, which `tok` sets, it adds no hooks.
+ * address, HTTPS certificate and Worker name, to `tok`, and makes the entry
+ * Worker import `module`. Without `TOKAMAK_VITE_OUTPUT`, which `tok` sets, it
+ * adds no hooks.
  */
 export declare function tokamak({ module, ...config }?: Config & {
     /**

package/dist/vite.mjs

@@ -1,3 +1,4 @@
+import { X509Certificate } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { normalizePath } from "vite";
@@ -5,10 +6,12 @@ import { normalizePath } from "vite";
 const DEFAULT_MODULES = ["src/tokamak.ts", "src/tokamak.js"];
 /** Wrangler configuration files Cloudflare's plugin tries in order. */
 const WRANGLER_FILES = ["wrangler.jsonc", "wrangler.json", "wrangler.toml"];
+const MIDDLEWARE_MODE_ERROR = "Vite is running in middleware mode, so tokamak cannot find the development server's address; tok dev needs Vite's own dev server";
 /**
  * Reports the app's tokamak configuration, and the development server's
- * address and Worker name, to `tok`, and makes the entry Worker import
- * `module`. Without `TOKAMAK_VITE_OUTPUT`, which `tok` sets, it adds no hooks.
+ * address, HTTPS certificate and Worker name, to `tok`, and makes the entry
+ * Worker import `module`. Without `TOKAMAK_VITE_OUTPUT`, which `tok` sets, it
+ * adds no hooks.
  */
 export function tokamak({ module, ...config } = {}) {
     const output = process.env.TOKAMAK_VITE_OUTPUT;
@@ -29,13 +32,22 @@ export function tokamak({ module, ...config } = {}) {
             },
             async configureServer(server) {
                 const httpServer = server.httpServer;
+                // A middleware-mode server beside a reported one, such as the server
+                // Astro syncs content with, leaves the report in place.
                 if (!httpServer) {
+                    if (!fs.existsSync(path.join(output, "server.json"))) {
+                        writeJson(output, "server.json", { error: MIDDLEWARE_MODE_ERROR });
+                    }
                     return;
                 }
                 const workerName = await readWorkerName(server.config.root);
                 httpServer.on("listening", () => {
                     const urls = server.resolvedUrls;
-                    writeJson(output, "server.json", { url: urls?.local[0] ?? urls?.network[0], workerName });
+                    writeJson(output, "server.json", {
+                        url: urls?.local[0] ?? urls?.network[0],
+                        workerName,
+                        certificates: endEntityCertificates(server.config.server.https),
+                    });
                 });
             },
             async buildApp(builder) {
@@ -92,6 +104,22 @@ async function readWorkerName(root) {
     const worker = unstable_readConfig({ config: file, env: process.env.CLOUDFLARE_ENV }, { hideWarnings: true });
     return worker.topLevelName ?? worker.name;
 }
+/**
+ * The PEM of the end-entity certificate of each chain in `https.cert`, which
+ * Vite reads from a file when a string names one.
+ */
+function endEntityCertificates(https) {
+    const cert = typeof https?.cert === "string" ? readFileIfExists(https.cert) : https?.cert;
+    return cert && [cert].flat().map((chain) => new X509Certificate(chain).toString()).join("");
+}
+function readFileIfExists(file) {
+    try {
+        return fs.readFileSync(path.resolve(file));
+    }
+    catch {
+        return file;
+    }
+}
 /**
  * Whether an environment builds from the entry Worker: Cloudflare's plugin
  * gives a manifest to its entry and prerender Workers, and Astro to its server

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokamakdev/tok",
-  "version": "0.1.1-beta.81",
+  "version": "0.1.1-beta.82",
   "description": "The tokamak CLI, Vite plugin and app API: build native apps from a Cloudflare Workers codebase",
   "repository": {
     "type": "git",
@@ -55,17 +55,17 @@
     "wrangler": "4.147.0"
   },
   "optionalDependencies": {
-    "@tokamakdev/platform-android-arm64": "0.1.1-beta.81",
-    "@tokamakdev/platform-ios-arm64": "0.1.1-beta.81",
-    "@tokamakdev/platform-ios-simulator-arm64": "0.1.1-beta.81",
-    "@tokamakdev/platform-ios-simulator-x64": "0.1.1-beta.81",
-    "@tokamakdev/platform-macos-arm64": "0.1.1-beta.81",
-    "@tokamakdev/platform-macos-x64": "0.1.1-beta.81",
-    "@tokamakdev/platform-windows-x64": "0.1.1-beta.81",
-    "@tokamakdev/tok-darwin-arm64": "0.1.1-beta.81",
-    "@tokamakdev/tok-darwin-x64": "0.1.1-beta.81",
-    "@tokamakdev/tok-linux-x64": "0.1.1-beta.81",
-    "@tokamakdev/tok-win32-x64": "0.1.1-beta.81"
+    "@tokamakdev/platform-android-arm64": "0.1.1-beta.82",
+    "@tokamakdev/platform-ios-arm64": "0.1.1-beta.82",
+    "@tokamakdev/platform-ios-simulator-arm64": "0.1.1-beta.82",
+    "@tokamakdev/platform-ios-simulator-x64": "0.1.1-beta.82",
+    "@tokamakdev/platform-macos-arm64": "0.1.1-beta.82",
+    "@tokamakdev/platform-macos-x64": "0.1.1-beta.82",
+    "@tokamakdev/platform-windows-x64": "0.1.1-beta.82",
+    "@tokamakdev/tok-darwin-arm64": "0.1.1-beta.82",
+    "@tokamakdev/tok-darwin-x64": "0.1.1-beta.82",
+    "@tokamakdev/tok-linux-x64": "0.1.1-beta.82",
+    "@tokamakdev/tok-win32-x64": "0.1.1-beta.82"
   },
   "publishConfig": {
     "access": "public"