@omg-dev/vite-plugin 0.4.29 → 0.4.31

package/dist/index.mjs

@@ -3,7 +3,7 @@ import fs from "node:fs";
 import { schemaToCollections, schemaToDrizzle, schemaToZod } from "@omg-dev/schema";
 import { scanTriggers } from "@omg-dev/server/trigger-scan";
 //#region src/auth-bridge.ts
-const AUTH_RELAY_SKIP_HEADERS = new Set([
+const AUTH_RELAY_SKIP_HEADERS = /* @__PURE__ */ new Set([
 	"set-cookie",
 	"content-encoding",
 	"content-length",
@@ -48,7 +48,7 @@ async function fetchAuthUpstream(kind, init, qs = "") {
 }
 //#endregion
 //#region src/scanner.ts
-const HTTP_METHODS = new Set([
+const HTTP_METHODS = /* @__PURE__ */ new Set([
 	"GET",
 	"POST",
 	"PUT",
@@ -180,6 +180,8 @@ function extractExports(source) {
 const EXPORT_WORKFLOW_RE = /^export\s+const\s+(\w+)\s*(?::\s*[^=]+)?\s*=\s*workflow\s*\(\s*(.+?)\s*,/gm;
 const NAME_RE = /^[A-Za-z][A-Za-z0-9_]*$/;
 var WorkflowScanError = class extends Error {
+	file;
+	detail;
 	constructor(file, detail) {
 		super(`[vibes:workflows] ${file}: ${detail}`);
 		this.file = file;
@@ -457,29 +459,6 @@ function isAppEntry(id, root) {
 }
 //#endregion
 //#region src/index.ts
-async function pwaDeclaresSubpathExport(resolve, importer, subpath) {
-	try {
-		const rootEntry = await resolve("@omg-dev/pwa", importer);
-		if (!rootEntry?.id) return false;
-		let dir = path.dirname(rootEntry.id.split("?")[0]);
-		for (let i = 0; i < 12; i++) {
-			const pkgPath = path.join(dir, "package.json");
-			if (fs.existsSync(pkgPath)) try {
-				const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"));
-				if (pkg.name === "@omg-dev/pwa") {
-					const exp = pkg.exports;
-					return !!exp && typeof exp === "object" && subpath in exp;
-				}
-			} catch {}
-			const parent = path.dirname(dir);
-			if (parent === dir) break;
-			dir = parent;
-		}
-		return false;
-	} catch {
-		return false;
-	}
-}
 function vibes(opts = {}) {
 	let resolvedRoot;
 	let config;
@@ -487,9 +466,6 @@ function vibes(opts = {}) {
 	const pwaEnabled = opts.pwa !== false;
 	const pwaOpts = typeof opts.pwa === "object" ? opts.pwa : {};
 	let pwaAutoInjected = false;
-	let remixCtaInjected = false;
-	const feedbackEnabled = opts.feedback !== false;
-	let feedbackInjected = false;
 	const brandBadgeEnabled = opts.brandBadge !== false;
 	let brandBadgeInjected = false;
 	function existingIconFiles() {
@@ -508,10 +484,7 @@ function vibes(opts = {}) {
 		name: "vibes",
 		enforce: "pre",
 		config() {
-			return {
-				define: { __VIBES_BRAND_FEEDBACK__: JSON.stringify(brandBadgeEnabled && feedbackEnabled) },
-				server: { watch: { ignored: ["**/.vibes/**"] } }
-			};
+			return { server: { watch: { ignored: ["**/.vibes/**"] } } };
 		},
 		configResolved(resolvedConfig) {
 			config = resolvedConfig;
@@ -795,7 +768,8 @@ window.__VIBES_AUTH_SESSION_URL = "/__vibes/auth/session";
 					if (bearerProto) {
 						const token = bearerProto.slice(13);
 						try {
-							userId = (await subAuthMW(new Request("http://localhost/__vibes_sub", { headers: { authorization: `Bearer ${token}` } })))?.userId ?? null;
+							const fakeReq = new Request("http://localhost/__vibes_sub", { headers: { authorization: `Bearer ${token}` } });
+							userId = (await subAuthMW(fakeReq))?.userId ?? null;
 						} catch {}
 					}
 					wss.handleUpgrade(req, socket, head, (ws) => {
@@ -810,7 +784,8 @@ window.__VIBES_AUTH_SESSION_URL = "/__vibes/auth/session";
 						};
 						addSubClient(subClient);
 						ws.on("message", (data) => {
-							handleSubMessage(subClient, typeof data === "string" ? data : Buffer.isBuffer(data) ? data.toString("utf8") : Array.isArray(data) ? Buffer.concat(data).toString("utf8") : Buffer.from(data).toString("utf8"));
+							const raw = typeof data === "string" ? data : Buffer.isBuffer(data) ? data.toString("utf8") : Array.isArray(data) ? Buffer.concat(data).toString("utf8") : Buffer.from(data).toString("utf8");
+							handleSubMessage(subClient, raw);
 						});
 						const closeOut = () => {
 							if (subClient.readyState === 3) return;
@@ -1014,7 +989,7 @@ window.__VIBES_AUTH_SESSION_URL = "/__vibes/auth/session";
 		},
 		async transform(code, id) {
 			if (config?.command !== "build") return null;
-			if (!pwaEnabled && !feedbackEnabled && !brandBadgeEnabled) return null;
+			if (!pwaEnabled && !brandBadgeEnabled) return null;
 			if (!isAppEntry(id, resolvedRoot)) return null;
 			const imports = [];
 			if (brandBadgeEnabled && !brandBadgeInjected) if (!await this.resolve("@omg-dev/sdk/brand/auto", id)) this.warn("[vibes] brand badge: @omg-dev/sdk/brand/auto is not available — badge skipped. Update @omg-dev/sdk, or silence this with vibes({ brandBadge: false }).");
@@ -1022,22 +997,11 @@ window.__VIBES_AUTH_SESSION_URL = "/__vibes/auth/session";
 				brandBadgeInjected = true;
 				imports.push(`import "@omg-dev/sdk/brand/auto";`);
 			}
-			if (feedbackEnabled && !brandBadgeEnabled && !feedbackInjected) if (!await this.resolve("@omg-dev/sdk/feedback/auto", id)) this.warn("[vibes] feedback: @omg-dev/sdk is not installed — shake-to-report skipped. Add @omg-dev/sdk to dependencies, or silence this with vibes({ feedback: false }).");
-			else {
-				feedbackInjected = true;
-				imports.push(`import "@omg-dev/sdk/feedback/auto";`);
-			}
 			if (pwaEnabled && pwaOpts.autoPrompt !== false && !pwaAutoInjected) if (!await this.resolve("@omg-dev/pwa/auto", id)) this.warn("[vibes] pwa: @omg-dev/pwa is not installed — soft install prompt skipped. Add @omg-dev/pwa to dependencies, or silence this with vibes({ pwa: { autoPrompt: false } }).");
 			else {
 				pwaAutoInjected = true;
 				imports.push(`import "@omg-dev/pwa/auto";`);
 			}
-			if (pwaEnabled && !brandBadgeEnabled && !remixCtaInjected) {
-				if (await pwaDeclaresSubpathExport((source, importer) => this.resolve(source, importer), id, "./remix-cta")) {
-					remixCtaInjected = true;
-					imports.push(`import "@omg-dev/pwa/remix-cta";`);
-				}
-			}
 			if (imports.length === 0) return null;
 			return {
 				code: `${code}\n${imports.join("\n")}\n`,
@@ -1048,7 +1012,8 @@ window.__VIBES_AUTH_SESSION_URL = "/__vibes/auth/session";
 			if (!pwaEnabled) return;
 			if (userManifestHref()) return;
 			const indexPath = path.join(resolvedRoot, "index.html");
-			const cfg = resolvePwaConfig(pwaOpts, fs.existsSync(indexPath) ? fs.readFileSync(indexPath, "utf-8") : "");
+			const indexHtml = fs.existsSync(indexPath) ? fs.readFileSync(indexPath, "utf-8") : "";
+			const cfg = resolvePwaConfig(pwaOpts, indexHtml);
 			this.emitFile({
 				type: "asset",
 				fileName: MANIFEST_FILE,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omg-dev/vite-plugin",
-  "version": "0.4.29",
+  "version": "0.4.31",
   "type": "module",
   "exports": {
     ".": {
@@ -15,8 +15,8 @@
     "build": "vp pack src/index.ts --no-fail-on-warn"
   },
   "dependencies": {
-    "@omg-dev/server": "0.4.29",
-    "@omg-dev/schema": "0.4.29",
+    "@omg-dev/server": "0.4.31",
+    "@omg-dev/schema": "0.4.31",
     "ws": "^8.18.0"
   },
   "devDependencies": {

package/src/brand-badge-inject.test.ts

@@ -29,7 +29,7 @@ async function runTransform(
 }
 
 function buildPlugin(opts?: Parameters<typeof vibes>[0]) {
-  const plugin = vibes({ root: ROOT, pwa: false, feedback: false, ...opts })
+  const plugin = vibes({ root: ROOT, pwa: false, ...opts })
   const configResolved = plugin.configResolved as (cfg: unknown) => void
   configResolved({ command: "build", root: ROOT })
   return plugin
@@ -71,19 +71,6 @@ describe("brand badge injection", () => {
     expect(context.warnings.some((w) => w.includes("brand badge"))).toBe(true)
   })
 
-  test("badge ON bundles feedback + remix: no standalone imports injected", async () => {
-    // brand badge default ON, with feedback + pwa also on. The badge carries
-    // feedback (button-less) and the "Make it mine" CTA itself, so the
-    // standalone feedback/auto + remix-cta imports must NOT be appended.
-    const plugin = vibes({ root: ROOT })
-    const configResolved = plugin.configResolved as (cfg: unknown) => void
-    configResolved({ command: "build", root: ROOT })
-    const out = await runTransform(plugin, "export default 1", ENTRY, ctx())
-    expect(out?.code).toContain(BRAND_IMPORT)
-    expect(out?.code).not.toContain(`import "@omg-dev/sdk/feedback/auto";`)
-    expect(out?.code).not.toContain(`import "@omg-dev/pwa/remix-cta";`)
-  })
-
   test("serve mode never injects the badge", async () => {
     const plugin = vibes({ root: ROOT })
     const configResolved = plugin.configResolved as (cfg: unknown) => void

package/src/index.ts

@@ -34,59 +34,12 @@ export interface VibesOptions {
    * install prompt. Default ON; pass `false` to opt out, or an options
    * object to customize (see PwaOptions). */
   pwa?: boolean | PwaOptions
-  /** Shake-to-report feedback widget for published builds — auto-mounts
-   * <VibesFeedback/> outside the app's React tree (shake / two-finger press
-   * summons it; report → agent /_report → LFG triage). Default ON; pass
-   * `false` to opt out and place <VibesFeedback/> from @omg-dev/sdk/feedback
-   * manually. */
-  feedback?: boolean
   /** Small "omg" badge for published apps. Auto-mounts outside the app's React
    * tree and opens a built-in "What is omg?" dialog. Default ON; pass `false`
    * to omit it for a specific app while this rolls out. */
   brandBadge?: boolean
 }
 
-// Resolve @omg-dev/pwa for `importer` and report whether its package.json declares
-// the given subpath (e.g. "./remix-cta") in its `exports` map. Used to keep the
-// build-time CTA injection skew-safe: an older baked @omg-dev/pwa that predates a
-// subpath export must NOT get the import appended, or the bundle fails to resolve.
-// Returns false on any resolution / parse hiccup — the CTA is additive, so when
-// in doubt we skip it rather than risk breaking the user's build.
-async function pwaDeclaresSubpathExport(
-  resolve: (source: string, importer: string) => Promise<{ id: string } | null>,
-  importer: string,
-  subpath: string,
-): Promise<boolean> {
-  try {
-    // Resolve the always-present root export, then walk up to the owning
-    // package.json. We can't resolve "@omg-dev/pwa/package.json" directly because
-    // an older exports map may not expose "./package.json".
-    const rootEntry = await resolve("@omg-dev/pwa", importer)
-    if (!rootEntry?.id) return false
-    let dir = path.dirname(rootEntry.id.split("?")[0])
-    for (let i = 0; i < 12; i++) {
-      const pkgPath = path.join(dir, "package.json")
-      if (fs.existsSync(pkgPath)) {
-        try {
-          const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf-8"))
-          if (pkg.name === "@omg-dev/pwa") {
-            const exp = pkg.exports
-            return !!exp && typeof exp === "object" && subpath in exp
-          }
-        } catch {
-          // Unreadable/!JSON package.json — keep climbing toward the real one.
-        }
-      }
-      const parent = path.dirname(dir)
-      if (parent === dir) break
-      dir = parent
-    }
-    return false
-  } catch {
-    return false
-  }
-}
-
 // ── Plugin ────────────────────────────────────────────────────────────────────
 
 export default function vibes(opts: VibesOptions = {}): Plugin {
@@ -97,10 +50,7 @@ export default function vibes(opts: VibesOptions = {}): Plugin {
   const pwaEnabled = opts.pwa !== false
   const pwaOpts: PwaOptions = typeof opts.pwa === "object" ? opts.pwa : {}
   let pwaAutoInjected = false
-  let remixCtaInjected = false
 
-  const feedbackEnabled = opts.feedback !== false
-  let feedbackInjected = false
   const brandBadgeEnabled = opts.brandBadge !== false
   let brandBadgeInjected = false
 
@@ -137,13 +87,6 @@ export default function vibes(opts: VibesOptions = {}): Plugin {
     // browser, so blanket-ignore it.
     config() {
       return {
-        // When the brand badge is on (default), it bundles the feedback sheet
-        // (no separate floating button). Expose whether feedback is actually
-        // enabled so the badge can omit it when the app opts out via
-        // vibes({ feedback: false }).
-        define: {
-          __VIBES_BRAND_FEEDBACK__: JSON.stringify(brandBadgeEnabled && feedbackEnabled),
-        },
         server: {
           watch: {
             ignored: ["**/.vibes/**"],
@@ -813,16 +756,13 @@ window.__VIBES_AUTH_SESSION_URL = "/__vibes/auth/session";
     },
 
     // ── transform ─────────────────────────────────────────────────────────────
-    // Published builds get two side-effect imports appended to the app entry:
+    // Published builds get platform side-effect imports appended to the app entry:
     //   - @omg-dev/pwa/auto       — the soft install prompt (gated by autoPrompt)
-    //   - @omg-dev/pwa/remix-cta  — the "Make your own" remix bridge (always on
-    //                             when pwa is enabled; self-gates on the baked
-    //                             VITE_APP_SLUG, so it's inert if not published)
     // Build-time injection (not template source) so both survive agent rewrites
     // of main.tsx and never load in dev preview.
     async transform(code: string, id: string) {
       if (config?.command !== "build") return null
-      if (!pwaEnabled && !feedbackEnabled && !brandBadgeEnabled) return null
+      if (!pwaEnabled && !brandBadgeEnabled) return null
       if (!isAppEntry(id, resolvedRoot)) return null
 
       const imports: string[] = []
@@ -843,28 +783,6 @@ window.__VIBES_AUTH_SESSION_URL = "/__vibes/auth/session";
         }
       }
 
-      // Shake-to-report feedback widget — opt-out via vibes({ feedback: false }).
-      // Build-only + outside the React tree, so it survives agent rewrites of
-      // main.tsx and never arms a gesture listener in the dev preview iframe.
-      //
-      // When the brand badge is on (default) it ALREADY mounts a button-less
-      // feedback sheet and summons it from its dialog, so injecting the
-      // standalone widget here would double-mount it (two floating controls —
-      // the exact duplication we're collapsing). Only inject standalone feedback
-      // when the brand badge is disabled.
-      if (feedbackEnabled && !brandBadgeEnabled && !feedbackInjected) {
-        const resolvedFb = await this.resolve("@omg-dev/sdk/feedback/auto", id)
-        if (!resolvedFb) {
-          this.warn(
-            "[vibes] feedback: @omg-dev/sdk is not installed — shake-to-report skipped. " +
-              "Add @omg-dev/sdk to dependencies, or silence this with vibes({ feedback: false }).",
-          )
-        } else {
-          feedbackInjected = true
-          imports.push(`import "@omg-dev/sdk/feedback/auto";`)
-        }
-      }
-
       // Soft install prompt — opt-out via vibes({ pwa: { autoPrompt: false } }).
       if (pwaEnabled && pwaOpts.autoPrompt !== false && !pwaAutoInjected) {
         const resolved = await this.resolve("@omg-dev/pwa/auto", id)
@@ -879,33 +797,6 @@ window.__VIBES_AUTH_SESSION_URL = "/__vibes/auth/session";
         }
       }
 
-      // "Make your own" remix CTA — independent of autoPrompt. It self-gates at
-      // runtime on import.meta.env.VITE_APP_SLUG (baked by the orchestrator on
-      // deploy), so it renders nothing on a non-published build.
-      //
-      // Skew guard: the remix-cta subpath shipped in @omg-dev/pwa >= 0.4.16. An app
-      // whose baked @omg-dev/pwa predates it (e.g. 0.4.12) has no "./remix-cta" in
-      // its exports map, so injecting the import hard-fails the build with
-      // "Errored while resolving @omg-dev/pwa/remix-cta". this.resolve() alone is not
-      // a reliable gate across this version skew, so only inject once we've
-      // confirmed the resolved package actually declares the subpath export.
-      //
-      // The brand badge (default on) now hosts "Make it mine" itself: same omg
-      // mark, remix CTA first, and it collapses to the plain branding badge on
-      // dismiss. So only inject the standalone remix-cta when the brand badge is
-      // off — otherwise we'd render two corner pills with the same intent.
-      if (pwaEnabled && !brandBadgeEnabled && !remixCtaInjected) {
-        const exported = await pwaDeclaresSubpathExport(
-          (source, importer) => this.resolve(source, importer),
-          id,
-          "./remix-cta",
-        )
-        if (exported) {
-          remixCtaInjected = true
-          imports.push(`import "@omg-dev/pwa/remix-cta";`)
-        }
-      }
-
       if (imports.length === 0) return null
       return { code: `${code}\n${imports.join("\n")}\n`, map: null }
     },

package/src/feedback-inject.test.ts

@@ -1,79 +0,0 @@
-// Verifies the build-time injection of the shake-to-report feedback widget
-// (@omg-dev/sdk/feedback/auto) into the app entry. The brand badge bundles
-// feedback when it's on (the default), so the STANDALONE widget only injects
-// when the brand badge is disabled — these tests run with brandBadge:false.
-// Opt-out via vibes({ feedback: false }), build-only, app-entry-only.
-
-import { describe, expect, test } from "bun:test"
-import vibes from "./index.ts"
-
-const ROOT = "/app"
-const ENTRY = `${ROOT}/src/main.tsx`
-const FEEDBACK_IMPORT = `import "@omg-dev/sdk/feedback/auto";`
-
-// Minimal Rollup plugin-context stub: resolve() succeeds for everything,
-// warn() is captured. transform() is a plain async fn we bind `this` onto.
-function ctx() {
-  const warnings: string[] = []
-  return {
-    warnings,
-    resolve: async (src: string) => ({ id: src }),
-    warn: (msg: string) => warnings.push(msg),
-  }
-}
-
-async function runTransform(
-  plugin: ReturnType<typeof vibes>,
-  code: string,
-  id: string,
-  context: ReturnType<typeof ctx>,
-) {
-  const fn = plugin.transform as (this: unknown, code: string, id: string) => Promise<unknown>
-  return fn.call(context, code, id) as Promise<{ code: string } | null>
-}
-
-function buildPlugin(opts?: Parameters<typeof vibes>[0]) {
-  const plugin = vibes({ root: ROOT, brandBadge: false, ...opts })
-  // configResolved sets command + root that transform gates on.
-  const configResolved = plugin.configResolved as (cfg: unknown) => void
-  configResolved({ command: "build", root: ROOT })
-  return plugin
-}
-
-describe("feedback widget injection", () => {
-  test("default ON: appends the auto-mount import to the app entry", async () => {
-    const plugin = buildPlugin()
-    const out = await runTransform(plugin, "export default 1", ENTRY, ctx())
-    expect(out?.code).toContain(FEEDBACK_IMPORT)
-  })
-
-  test("opt-out via feedback:false omits the import", async () => {
-    const plugin = buildPlugin({ feedback: false, pwa: false })
-    const out = await runTransform(plugin, "export default 1", ENTRY, ctx())
-    // Nothing to inject → transform returns null.
-    expect(out).toBeNull()
-  })
-
-  test("injected exactly once across multiple entry transforms", async () => {
-    const plugin = buildPlugin({ pwa: false })
-    const first = await runTransform(plugin, "export default 1", ENTRY, ctx())
-    const second = await runTransform(plugin, "export default 2", ENTRY, ctx())
-    expect(first?.code).toContain(FEEDBACK_IMPORT)
-    expect(second).toBeNull() // already injected
-  })
-
-  test("non-entry modules are untouched", async () => {
-    const plugin = buildPlugin()
-    const out = await runTransform(plugin, "export const x = 1", `${ROOT}/src/util.ts`, ctx())
-    expect(out).toBeNull()
-  })
-
-  test("warns (and skips) when @omg-dev/sdk cannot be resolved", async () => {
-    const plugin = buildPlugin({ pwa: false })
-    const context = ctx()
-    context.resolve = async () => null // simulate missing dependency
-    const out = await runTransform(plugin, "export default 1", ENTRY, context)
-    expect(out).toBeNull()
-    expect(context.warnings.some((w) => w.includes("shake-to-report skipped"))).toBe(true)
-  })
-})