@saastemly/voidcommerce 0.9.0 → 0.10.0

package/dist/cli.js

@@ -21,7 +21,7 @@ import {
   runVoid,
   version,
   voidAppsIn
-} from "./index-0w66yc8y.js";
+} from "./index-mb1p1rh0.js";
 import {
   LOCAL_KEY_FILE,
   PRIVATE_KEY_VAR,
@@ -50,7 +50,7 @@ import {
   setVariable,
   variableNames,
   verifyCloudflareToken
-} from "./index-wykd4zmk.js";
+} from "./index-vhsq8jpy.js";
 import {
   LAYOUTS,
   oneOrigin,

package/dist/generate/frontend.d.ts

@@ -23,7 +23,7 @@ export declare const FRONTEND_BRANCH = "frontend-static";
 export declare function renderFrontendApiTs(manifest: Manifest): string;
 export declare function renderFrontendEnvProduction(manifest: Manifest): string;
 /** The Vite config for a static Void site. Deliberately small: this is yours. */
-export declare function renderFrontendViteConfig(): string;
+export declare function renderFrontendViteConfig(manifest: Manifest): string;
 /**
  * `target: node` because Void 0.10.13's Cloudflare prerender calls miniflare
  * with the single-worker shorthand that the miniflare its own dependencies

package/dist/{index-0w66yc8y.js → index-mb1p1rh0.js}

@@ -9,7 +9,7 @@ import {
   renderEnvLocal,
   renderEnvProduction,
   renderEnvTs
-} from "./index-wykd4zmk.js";
+} from "./index-vhsq8jpy.js";
 import {
   MANIFEST_FILE,
   has,
@@ -422,7 +422,33 @@ function renderFrontendEnvProduction(manifest) {
 VITE_API_ORIGIN=https://api.${manifest.shop.domain}
 `;
 }
-function renderFrontendViteConfig() {
+function renderFrontendViteConfig(manifest) {
+  if (oneOrigin(manifest.layout)) {
+    return `import { defineConfig } from "vite";
+import { voidPlugin } from "void";
+import { voidReact } from "@void/react/plugin";
+
+/**
+ * The storefront.
+ *
+ * In production one worker serves this page and the API it calls, so the
+ * client uses relative URLs and there is nothing to configure. In DEV they
+ * are two processes on two ports, and a relative /api call would hit this
+ * dev server instead of the worker — so it is proxied. Without this, local
+ * development is the only place the shop is broken.
+ *
+ * Start the worker first: it takes 5173, and this lands on the next port.
+ */
+export default defineConfig({
+  plugins: [voidPlugin(), voidReact()],
+  server: {
+    proxy: {
+      "/api": { target: "http://127.0.0.1:5173", changeOrigin: false },
+    },
+  },
+});
+`;
+  }
   return `import { defineConfig } from "vite";
 import { voidPlugin } from "void";
 import { voidReact } from "@void/react/plugin";
@@ -1344,7 +1370,7 @@ import color from "picocolors";
 // package.json
 var package_default = {
   name: "@saastemly/voidcommerce",
-  version: "0.9.0",
+  version: "0.10.0",
   description: "Void, with a shop in it. `vc init` walks you through Better Auth, betterCommerce and every plugin; everything else passes through to `void`.",
   type: "module",
   license: "MIT",
@@ -2457,7 +2483,7 @@ async function generateFrontend(root, dir, manifest, result) {
   const at = (file) => join4(dir, file);
   await put(root, at("lib/api.ts"), renderFrontendApiTs(manifest), result, "own");
   await put(root, at(".env.production"), renderFrontendEnvProduction(manifest), result, "regenerate");
-  await put(root, at("vite.config.ts"), renderFrontendViteConfig(), result, "own");
+  await put(root, at("vite.config.ts"), renderFrontendViteConfig(manifest), result, "own");
   await put(root, at("void.json"), renderFrontendVoidJson(), result, "own");
   await put(root, at("tsconfig.json"), renderFrontendTsconfig(), result, "own");
   await put(root, at("pages/index.tsx"), renderStorefrontPage(manifest), result, "own");
@@ -3405,4 +3431,4 @@ async function importHelp() {
   return 0;
 }
 
-export { renderAuthTs, FRONTEND_BRANCH, renderFrontendApiTs, renderFrontendEnvProduction, renderStorefrontPage, renderFrontendWorkflow, runVoid, runInherit, captureVoid, isVoidApp, voidAppsIn, STRICT_APP, VOID_VERSION, strictDependencies, renderVoidPatch, renderViteConfig, renderStrictTsconfig, renderVoidJson, renderDbSchema, renderDbSeed, renderLayoutTsx, renderAppCss, renderIndexServer, INDEX_PAGE, renderDashboardPage, CLIENT_ONLY, renderSignInPage, renderAuthClient, renderContentTs, renderCron, renderQueue, renderLiveStream, renderLiveRoute, renderStrictAppPackageJson, DATA_README, BRANDING_README, MIGRATIONS_README, finishStrict, line, row, box, fullHelp, initHelp, version, findProject, ensureGenerated, DIST_DIR, DIST_BRANCH, distCommand, distHelp, renderDistWorkflow, renderDeployReadme, renderRequirementsTs, renderDomainTs, generate, parseJsonc, upsertJsonc, findWrangler, parseWhoAmI, productionEnv, routeProblem, preflight, printPreflight, deployCloudflare, importCommand, importHelp };
+export { renderAuthTs, FRONTEND_BRANCH, renderFrontendApiTs, renderFrontendEnvProduction, renderFrontendViteConfig, renderStorefrontPage, renderFrontendWorkflow, runVoid, runInherit, captureVoid, isVoidApp, voidAppsIn, STRICT_APP, VOID_VERSION, strictDependencies, renderVoidPatch, renderViteConfig, renderStrictTsconfig, renderVoidJson, renderDbSchema, renderDbSeed, renderLayoutTsx, renderAppCss, renderIndexServer, INDEX_PAGE, renderDashboardPage, CLIENT_ONLY, renderSignInPage, renderAuthClient, renderContentTs, renderCron, renderQueue, renderLiveStream, renderLiveRoute, renderStrictAppPackageJson, DATA_README, BRANDING_README, MIGRATIONS_README, finishStrict, line, row, box, fullHelp, initHelp, version, findProject, ensureGenerated, DIST_DIR, DIST_BRANCH, distCommand, distHelp, renderDistWorkflow, renderDeployReadme, renderRequirementsTs, renderDomainTs, generate, parseJsonc, upsertJsonc, findWrangler, parseWhoAmI, productionEnv, routeProblem, preflight, printPreflight, deployCloudflare, importCommand, importHelp };

package/dist/{index-wykd4zmk.js → index-vhsq8jpy.js}

@@ -2,6 +2,7 @@ import {
   envKeysOf,
   hasFrontend,
   isApex,
+  oneOrigin,
   zone
 } from "./index-tjy6yygc.js";
 import {
@@ -247,7 +248,7 @@ function renderEnvLocal(manifest) {
     "# Local development. Gitignored; .env.example documents every key.",
     "",
     ...keys.map((key) => `${key.key}=${local[key.key] ?? key.dev ?? "unset"}`),
-    ...hasFrontend(manifest.layout) ? ["", "# The storefront, reaching the worker. Start the worker first.", "VITE_API_ORIGIN=http://localhost:5173"] : [],
+    ...hasFrontend(manifest.layout) && !oneOrigin(manifest.layout) ? ["", "# The storefront, reaching the worker. Start the worker first.", "VITE_API_ORIGIN=http://localhost:5173"] : [],
     ""
   ].join(`
 `);
@@ -384,7 +385,7 @@ async function decryptSecrets(project) {
   }
   const expected = committedPublicKey(root);
   if (expected) {
-    const { publicKeyFor } = await import("./keys-68c6vmds.js");
+    const { publicKeyFor } = await import("./keys-2q3qzntw.js");
     const derived = await publicKeyFor(privateKey);
     if (derived && derived.toLowerCase() !== expected.toLowerCase()) {
       return {

package/dist/index.d.ts

@@ -18,7 +18,7 @@ export { parseJsonc, upsertJsonc } from "./deploy/jsonc";
 export { parseWhoAmI, findWrangler } from "./deploy/wrangler";
 export { preflight, printPreflight, productionEnv, routeProblem } from "./deploy/preflight";
 export { deployCloudflare } from "./deploy/cloudflare";
-export { FRONTEND_BRANCH, renderFrontendApiTs, renderFrontendEnvProduction, renderFrontendWorkflow, renderStorefrontPage, } from "./generate/frontend";
+export { FRONTEND_BRANCH, renderFrontendViteConfig, renderFrontendApiTs, renderFrontendEnvProduction, renderFrontendWorkflow, renderStorefrontPage, } from "./generate/frontend";
 export { distCommand, DIST_BRANCH, DIST_DIR } from "./dist";
 export { renderDistWorkflow, renderDeployReadme } from "./generate/ci";
 export { importCommand } from "./import";

package/dist/index.js

@@ -34,6 +34,7 @@ import {
   renderDomainTs,
   renderFrontendApiTs,
   renderFrontendEnvProduction,
+  renderFrontendViteConfig,
   renderFrontendWorkflow,
   renderIndexServer,
   renderLayoutTsx,
@@ -51,7 +52,7 @@ import {
   routeProblem,
   strictDependencies,
   upsertJsonc
-} from "./index-0w66yc8y.js";
+} from "./index-mb1p1rh0.js";
 import {
   allEnvKeys,
   envSummary,
@@ -59,7 +60,7 @@ import {
   renderEnvLocal,
   renderEnvProduction,
   renderEnvTs
-} from "./index-wykd4zmk.js";
+} from "./index-vhsq8jpy.js";
 import {
   LAYOUTS,
   MANIFEST_FILE,
@@ -124,6 +125,7 @@ export {
   renderLayoutTsx,
   renderIndexServer,
   renderFrontendWorkflow,
+  renderFrontendViteConfig,
   renderFrontendEnvProduction,
   renderFrontendApiTs,
   renderEnvTs,

package/dist/{keys-68c6vmds.js → keys-2q3qzntw.js}

@@ -8,7 +8,7 @@ import {
   localPrivateKey,
   provisionKey,
   publicKeyFor
-} from "./index-wykd4zmk.js";
+} from "./index-vhsq8jpy.js";
 import"./index-tjy6yygc.js";
 import"./index-mnb7fz2t.js";
 import"./index-0v6na3yp.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saastemly/voidcommerce",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Void, with a shop in it. `vc init` walks you through Better Auth, betterCommerce and every plugin; everything else passes through to `void`.",
   "type": "module",
   "license": "MIT",

package/src/generate/env.ts

@@ -1,5 +1,5 @@
 import { type EnvKey } from "../catalog";
-import { type Manifest, envKeysOf, has, hasFrontend, isApex, zone } from "../manifest";
+import { type Manifest, envKeysOf, has, hasFrontend, isApex, zone , oneOrigin} from "../manifest";
 
 /**
  * `env.ts`, `.env.example` and `.env.production` — from the manifest.
@@ -123,7 +123,10 @@ export function renderEnvLocal(manifest: Manifest): string {
 		// One file for both halves in a strict repo, where the storefront and
 		// the worker share a root. The worker takes 5173 because it is started
 		// first; the storefront lands on the next free port and calls back here.
-		...(hasFrontend(manifest.layout)
+		// Only a monorepo bakes the API's address in. Where one worker serves
+		// both, the client uses relative URLs and dev proxies /api instead —
+		// so a VITE_API_ORIGIN here would be read by nothing.
+		...(hasFrontend(manifest.layout) && !oneOrigin(manifest.layout)
 			? ["", "# The storefront, reaching the worker. Start the worker first.", "VITE_API_ORIGIN=http://localhost:5173"]
 			: []),
 		"",

package/src/generate/frontend.ts

@@ -74,7 +74,33 @@ VITE_API_ORIGIN=https://api.${manifest.shop.domain}
 }
 
 /** The Vite config for a static Void site. Deliberately small: this is yours. */
-export function renderFrontendViteConfig(): string {
+export function renderFrontendViteConfig(manifest: Manifest): string {
+	if (oneOrigin(manifest.layout)) {
+		return `import { defineConfig } from "vite";
+import { voidPlugin } from "void";
+import { voidReact } from "@void/react/plugin";
+
+/**
+ * The storefront.
+ *
+ * In production one worker serves this page and the API it calls, so the
+ * client uses relative URLs and there is nothing to configure. In DEV they
+ * are two processes on two ports, and a relative /api call would hit this
+ * dev server instead of the worker — so it is proxied. Without this, local
+ * development is the only place the shop is broken.
+ *
+ * Start the worker first: it takes 5173, and this lands on the next port.
+ */
+export default defineConfig({
+  plugins: [voidPlugin(), voidReact()],
+  server: {
+    proxy: {
+      "/api": { target: "http://127.0.0.1:5173", changeOrigin: false },
+    },
+  },
+});
+`;
+	}
 	return `import { defineConfig } from "vite";
 import { voidPlugin } from "void";
 import { voidReact } from "@void/react/plugin";

package/src/generate/index.ts

@@ -314,7 +314,7 @@ async function generateFrontend(root: string, dir: string, manifest: Manifest, r
 
 	await put(root, at("lib/api.ts"), renderFrontendApiTs(manifest), result, "own");
 	await put(root, at(".env.production"), renderFrontendEnvProduction(manifest), result, "regenerate");
-	await put(root, at("vite.config.ts"), renderFrontendViteConfig(), result, "own");
+	await put(root, at("vite.config.ts"), renderFrontendViteConfig(manifest), result, "own");
 	await put(root, at("void.json"), renderFrontendVoidJson(), result, "own");
 	await put(root, at("tsconfig.json"), renderFrontendTsconfig(), result, "own");
 	await put(root, at("pages/index.tsx"), renderStorefrontPage(manifest), result, "own");

package/src/index.ts

@@ -27,6 +27,7 @@ export { preflight, printPreflight, productionEnv, routeProblem } from "./deploy
 export { deployCloudflare } from "./deploy/cloudflare";
 export {
 	FRONTEND_BRANCH,
+	renderFrontendViteConfig,
 	renderFrontendApiTs,
 	renderFrontendEnvProduction,
 	renderFrontendWorkflow,