@tokamakdev/tok 0.1.1-beta.58 → 0.1.1-beta.60

package/dist/vite.d.mts

@@ -1,6 +1,7 @@
 import { type Plugin } from "vite";
 /**
  * Reports the build's tokamak configuration and development server address to
- * `tok`. Without `TOKAMAK_VITE_OUTPUT`, which `tok` sets, it adds no hooks.
+ * `tok`, and makes the entry Worker import the configuration file. Without
+ * `TOKAMAK_VITE_OUTPUT`, which `tok` sets, it adds no hooks.
  */
 export declare function tokamak(): Plugin[];

package/dist/vite.mjs

@@ -1,13 +1,14 @@
 import fs from "node:fs";
 import path from "node:path";
-import { normalizePath, runnerImport } from "vite";
+import { normalizePath, runnerImport, } from "vite";
 /** Configuration files tried in order when `tok` names none. */
 const CONFIG_FILES = ["src/tokamak.ts", "src/tokamak.js"];
 /** The files each output directory's `config.json` was read from, once written. */
 const written = new Map();
 /**
  * Reports the build's tokamak configuration and development server address to
- * `tok`. Without `TOKAMAK_VITE_OUTPUT`, which `tok` sets, it adds no hooks.
+ * `tok`, and makes the entry Worker import the configuration file. Without
+ * `TOKAMAK_VITE_OUTPUT`, which `tok` sets, it adds no hooks.
  */
 export function tokamak() {
     const output = process.env.TOKAMAK_VITE_OUTPUT;
@@ -15,8 +16,12 @@ export function tokamak() {
         return [];
     }
     let config;
+    let file;
+    /** The module IDs of each entry environment's inputs. */
+    const entryIds = new Map();
+    /** The entry environments whose input imports the configuration file. */
+    const importing = new Set();
     const write = () => {
-        const file = findConfigFile(config.root);
         const files = writeConfig(output, file, config);
         // A file that fails to load stays watched, so fixing it rewrites `config.json`.
         written.set(output, files.catch(() => (file ? [file] : [])));
@@ -27,6 +32,7 @@ export function tokamak() {
             name: "tokamak",
             async configResolved(resolved) {
                 config = resolved;
+                file = findConfigFile(resolved.root);
                 await (written.has(output) ? written.get(output) : write());
             },
             async watchChange(id) {
@@ -41,6 +47,34 @@ export function tokamak() {
                 });
             },
         },
+        {
+            name: "tokamak:entry",
+            // Server environments with a manifest are built from the entry Worker:
+            // Cloudflare's plugin gives one to the entry and prerender Workers, and
+            // Astro to its server and prerender environments.
+            applyToEnvironment: ({ config }) => file !== undefined && config.consumer === "server" && Boolean(config.build.manifest),
+            async transform(code, id) {
+                if (id === file) {
+                    return withoutConfig(this, code);
+                }
+                const environment = this.environment;
+                const ids = entryIds.get(environment.name) ??
+                    Promise.all(inputs(environment.config.build).map(async (input) => (await this.resolve(input))?.id));
+                entryIds.set(environment.name, ids);
+                if (!(await ids).includes(id)) {
+                    return;
+                }
+                importing.add(environment.name);
+                // In Cloudflare's Worker entry, which dev and build both start from,
+                // this follows the imports of its polyfills and of the app's entry.
+                return { code: `${code}\nimport ${JSON.stringify(file)};\n`, map: null };
+            },
+            generateBundle() {
+                if (!importing.has(this.environment.name)) {
+                    this.error(`the input of the ${this.environment.name} environment did not import ${file}`);
+                }
+            },
+        },
     ];
 }
 /** The configuration file `TOKAMAK_CONFIG` names, or the first default under `root` that exists. */
@@ -71,7 +105,43 @@ async function writeConfig(output, file, config) {
     writeJson(output, "config.json", { file, config: module.config ?? {} });
     return [file, ...dependencies.map(normalizePath)];
 }
+/** The modules an environment's build starts from. */
+function inputs(build) {
+    const { input } = build.rollupOptions;
+    return typeof input === "string" ? [input] : Object.values(input ?? {});
+}
+/**
+ * `code` without its `export const config = ...` statement, which is blanked
+ * so that every other position, and so the source map, is unchanged.
+ */
+function withoutConfig(context, code) {
+    const statements = context.parse(code).body;
+    const statement = statements.find(exportsConfig);
+    if (!statement) {
+        return;
+    }
+    if (statement.declaration?.declarations?.length !== 1) {
+        context.error("declare config in its own `export const config = ...` statement");
+    }
+    const blank = code.slice(statement.start, statement.end).replace(/[^\n]/g, " ");
+    return { code: code.slice(0, statement.start) + blank + code.slice(statement.end), map: null };
+}
+function exportsConfig(statement) {
+    if (statement.type !== "ExportNamedDeclaration") {
+        return false;
+    }
+    const declaration = statement.declaration;
+    const names = [
+        declaration?.id?.name,
+        ...(declaration?.declarations ?? []).map((declarator) => declarator.id.name),
+        ...(statement.specifiers ?? []).map((specifier) => specifier.exported.name),
+    ];
+    return names.includes("config");
+}
+/** Writes `value` to `name` whole, as `tok` reads the file as soon as it exists. */
 function writeJson(output, name, value) {
+    const file = path.join(output, name);
     fs.mkdirSync(output, { recursive: true });
-    fs.writeFileSync(path.join(output, name), `${JSON.stringify(value, null, 2)}\n`);
+    fs.writeFileSync(`${file}.tmp`, `${JSON.stringify(value, null, 2)}\n`);
+    fs.renameSync(`${file}.tmp`, file);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokamakdev/tok",
-  "version": "0.1.1-beta.58",
+  "version": "0.1.1-beta.60",
   "description": "The tokamak CLI, Vite plugin and app API: build native apps from a Cloudflare Workers codebase",
   "repository": {
     "type": "git",
@@ -35,7 +35,7 @@
     "node": ">=18"
   },
   "peerDependencies": {
-    "@cloudflare/vite-plugin": "^1.0.0",
+    "@cloudflare/vite-plugin": "^1.54.0",
     "vite": "^7.0.0 || ^8.0.0"
   },
   "peerDependenciesMeta": {
@@ -50,17 +50,17 @@
     "vite": "8.3.2"
   },
   "optionalDependencies": {
-    "@tokamakdev/platform-android-arm64": "0.1.1-beta.58",
-    "@tokamakdev/platform-ios-arm64": "0.1.1-beta.58",
-    "@tokamakdev/platform-ios-simulator-arm64": "0.1.1-beta.58",
-    "@tokamakdev/platform-ios-simulator-x64": "0.1.1-beta.58",
-    "@tokamakdev/platform-macos-arm64": "0.1.1-beta.58",
-    "@tokamakdev/platform-macos-x64": "0.1.1-beta.58",
-    "@tokamakdev/platform-windows-x64": "0.1.1-beta.58",
-    "@tokamakdev/tok-darwin-arm64": "0.1.1-beta.58",
-    "@tokamakdev/tok-darwin-x64": "0.1.1-beta.58",
-    "@tokamakdev/tok-linux-x64": "0.1.1-beta.58",
-    "@tokamakdev/tok-win32-x64": "0.1.1-beta.58"
+    "@tokamakdev/platform-android-arm64": "0.1.1-beta.60",
+    "@tokamakdev/platform-ios-arm64": "0.1.1-beta.60",
+    "@tokamakdev/platform-ios-simulator-arm64": "0.1.1-beta.60",
+    "@tokamakdev/platform-ios-simulator-x64": "0.1.1-beta.60",
+    "@tokamakdev/platform-macos-arm64": "0.1.1-beta.60",
+    "@tokamakdev/platform-macos-x64": "0.1.1-beta.60",
+    "@tokamakdev/platform-windows-x64": "0.1.1-beta.60",
+    "@tokamakdev/tok-darwin-arm64": "0.1.1-beta.60",
+    "@tokamakdev/tok-darwin-x64": "0.1.1-beta.60",
+    "@tokamakdev/tok-linux-x64": "0.1.1-beta.60",
+    "@tokamakdev/tok-win32-x64": "0.1.1-beta.60"
   },
   "publishConfig": {
     "access": "public"