npm - @kenkaiiii/gg-pixel - Versions diffs - 4.3.80 → 4.3.81 - Mend

@kenkaiiii/gg-pixel 4.3.80 → 4.3.81

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/browser.iife.global.js +4 -0
package/dist/browser.iife.global.js.map +1 -0
package/dist/cli.js +168 -37
package/dist/cli.js.map +1 -1
package/dist/index.cjs +168 -37
package/dist/index.cjs.map +1 -1
package/dist/index.js +168 -37
package/dist/index.js.map +1 -1
package/package.json +1 -1

package/dist/index.cjs CHANGED Viewed

@@ -1076,6 +1076,7 @@ function wireRemix({ projectRoot, projectKey, ingestUrl }) {
   };
 }
 function wireElectron({ projectRoot, pkg, projectKey, ingestUrl }) {
+  const warnings = [];
   const isMainEsm = pkg.type === "module";
   const mainInitPath = isMainEsm ? (0, import_node_path2.join)(projectRoot, "gg-pixel.main.mjs") : (0, import_node_path2.join)(projectRoot, "gg-pixel.main.cjs");
   (0, import_node_fs3.writeFileSync)(
@@ -1083,50 +1084,62 @@ function wireElectron({ projectRoot, pkg, projectKey, ingestUrl }) {
     isMainEsm ? renderInitFile(ingestUrl, projectKey) : renderInitFileCjs(ingestUrl, projectKey),
     "utf8"
   );
-  const rendererInitPath = (0, import_node_path2.join)(projectRoot, "gg-pixel.renderer.mjs");
-  (0, import_node_fs3.writeFileSync)(rendererInitPath, renderBrowserInitFile(ingestUrl, projectKey), "utf8");
-  const mainEntry = pkg.main ? (0, import_node_path2.join)(projectRoot, pkg.main) : pickPath(projectRoot, [
-    "main.js",
-    "main.ts",
-    "src/main.js",
-    "src/main.ts",
-    "electron/main.js",
-    "electron/main.ts"
-  ]);
+  const mainEntry = resolveMainEntryFromPkg(projectRoot, pkg);
   let mainWiring = { kind: "no_entry_found" };
   if (mainEntry && (0, import_node_fs3.existsSync)(mainEntry)) {
     mainWiring = injectImport(mainEntry, mainInitPath);
   }
-  const rendererEntry = pickPath(projectRoot, [
-    "src/renderer/index.ts",
-    "src/renderer/index.tsx",
-    "src/renderer/index.js",
-    "src/renderer/main.ts",
-    "src/renderer/main.tsx",
-    "src/renderer/main.js",
-    "renderer/index.ts",
-    "renderer/index.tsx",
-    "renderer/index.js",
-    "renderer.ts",
-    "renderer.tsx",
-    "renderer.js",
-    "src/index.tsx",
-    "src/index.jsx",
-    "src/main.tsx",
-    "src/main.jsx"
-  ]);
-  if (rendererEntry) {
-    injectImport(rendererEntry, rendererInitPath);
-  }
-  const warnings = [];
-  if (!rendererEntry) {
-    warnings.push(
-      'Could not auto-detect the Electron renderer entry. Add `import "./gg-pixel.renderer.mjs";` to the top of your renderer entry file.'
-    );
+  const htmlFiles = findRendererHtmlFiles(projectRoot);
+  let rendererInitPath;
+  if (htmlFiles.length > 0) {
+    const rendererDir = (0, import_node_path2.dirname)(htmlFiles[0]);
+    rendererInitPath = (0, import_node_path2.join)(rendererDir, "gg-pixel.browser.iife.js");
+    if (!copyIifeBundle(projectRoot, rendererInitPath)) {
+      warnings.push(
+        "Could not copy gg-pixel browser IIFE bundle \u2014 install @kenkaiiii/gg-pixel and re-run."
+      );
+    }
+    let patchedAny = false;
+    for (const html of htmlFiles) {
+      if (patchRendererHtml(html, rendererInitPath, projectKey, ingestUrl) === "patched") {
+        patchedAny = true;
+      }
+    }
+    if (!patchedAny) {
+      warnings.push(
+        `Found HTML files in ${rendererDir} but couldn't patch any \u2014 they may have unusual CSP or no <head>.`
+      );
+    }
+  } else {
+    rendererInitPath = (0, import_node_path2.join)(projectRoot, "gg-pixel.renderer.mjs");
+    (0, import_node_fs3.writeFileSync)(rendererInitPath, renderBrowserInitFile(ingestUrl, projectKey), "utf8");
+    const rendererEntry = pickPath(projectRoot, [
+      "src/renderer/index.ts",
+      "src/renderer/index.tsx",
+      "src/renderer/index.js",
+      "src/renderer/main.ts",
+      "src/renderer/main.tsx",
+      "src/renderer/main.js",
+      "renderer/index.ts",
+      "renderer/index.tsx",
+      "renderer/index.js",
+      "renderer.ts",
+      "renderer.tsx",
+      "renderer.js",
+      "src/index.tsx",
+      "src/index.jsx",
+      "src/main.tsx",
+      "src/main.jsx"
+    ]);
+    if (rendererEntry) injectImport(rendererEntry, rendererInitPath);
+    else
+      warnings.push(
+        'Could not auto-detect the Electron renderer entry. Add `import "./gg-pixel.renderer.mjs";` to the top of your renderer entry file.'
+      );
   }
   return {
     primaryInitPath: rendererInitPath,
-    entryWiring: rendererEntry ? { kind: "injected", entryPath: rendererEntry } : { kind: "no_entry_found" },
+    entryWiring: { kind: "injected", entryPath: rendererInitPath },
     secondaryInit: {
       path: mainInitPath,
       description: "Electron main-process init" + (mainWiring.kind === "injected" ? ` (wired into ${mainEntry})` : "")
@@ -1134,6 +1147,124 @@ function wireElectron({ projectRoot, pkg, projectKey, ingestUrl }) {
     warnings
   };
 }
+function resolveMainEntryFromPkg(projectRoot, pkg) {
+  if (pkg.main) {
+    const sourceCandidates = [];
+    const main = pkg.main;
+    if (/^(dist|build|\.next|out)\//.test(main)) {
+      const swap = main.replace(/^(dist|build|\.next|out)\//, "src/");
+      if (swap.endsWith(".js")) {
+        sourceCandidates.push(swap.replace(/\.js$/, ".ts"));
+        sourceCandidates.push(swap.replace(/\.js$/, ".tsx"));
+      }
+      sourceCandidates.push(swap);
+    }
+    if (main.endsWith(".js")) {
+      sourceCandidates.push(main.replace(/\.js$/, ".ts"));
+      sourceCandidates.push(main.replace(/\.js$/, ".tsx"));
+    }
+    for (const c of sourceCandidates) {
+      const p = (0, import_node_path2.join)(projectRoot, c);
+      if ((0, import_node_fs3.existsSync)(p)) return p;
+    }
+    const literal = (0, import_node_path2.join)(projectRoot, main);
+    if ((0, import_node_fs3.existsSync)(literal)) return literal;
+  }
+  return pickPath(projectRoot, [
+    "main.js",
+    "main.ts",
+    "src/main.js",
+    "src/main.ts",
+    "src/main/index.ts",
+    "src/main/index.js",
+    "electron/main.js",
+    "electron/main.ts"
+  ]);
+}
+var RENDERER_HTML_DIRS = ["ui", "renderer", "src/renderer", "public", "static"];
+function findRendererHtmlFiles(projectRoot) {
+  for (const dir of RENDERER_HTML_DIRS) {
+    const root = (0, import_node_path2.join)(projectRoot, dir);
+    if (!(0, import_node_fs3.existsSync)(root)) continue;
+    const html = [];
+    let entries;
+    try {
+      entries = (0, import_node_fs3.readdirSync)(root);
+    } catch {
+      continue;
+    }
+    for (const e of entries) {
+      if (!e.endsWith(".html")) continue;
+      const p = (0, import_node_path2.join)(root, e);
+      try {
+        const c = (0, import_node_fs3.readFileSync)(p, "utf8");
+        if (/<meta[^>]+content-security-policy/i.test(c) || /<script[\s>]/i.test(c)) {
+          html.push(p);
+        }
+      } catch {
+      }
+    }
+    if (html.length > 0) return html;
+  }
+  return [];
+}
+function copyIifeBundle(projectRoot, dest) {
+  const candidates = [
+    (0, import_node_path2.join)(projectRoot, "node_modules/@kenkaiiii/gg-pixel/dist/browser.iife.global.js"),
+    (0, import_node_path2.join)(projectRoot, "node_modules/@kenkaiiii/gg-pixel/dist/browser.iife.js")
+  ];
+  for (const c of candidates) {
+    if ((0, import_node_fs3.existsSync)(c)) {
+      try {
+        (0, import_node_fs3.writeFileSync)(dest, (0, import_node_fs3.readFileSync)(c, "utf8"), "utf8");
+        return true;
+      } catch {
+      }
+    }
+  }
+  return false;
+}
+function patchRendererHtml(htmlPath, iifePath, projectKey, ingestUrl) {
+  let content;
+  try {
+    content = (0, import_node_fs3.readFileSync)(htmlPath, "utf8");
+  } catch {
+    return "not-applicable";
+  }
+  if (content.includes("gg-pixel.browser.iife")) return "already";
+  const ingestOrigin = new URL(ingestUrl).origin;
+  content = content.replace(
+    /(<meta[^>]+http-equiv=["']?content-security-policy["']?[^>]+content=["'])([^"']+)(["'])/i,
+    (_match, before, csp, after) => {
+      let updated = csp;
+      if (/connect-src\s/i.test(csp)) {
+        if (!csp.includes(ingestOrigin)) {
+          updated = csp.replace(/(connect-src[^;]*)/i, `$1 ${ingestOrigin}`);
+        }
+      } else {
+        updated = csp.trim().replace(/;?$/, `; connect-src 'self' ${ingestOrigin};`);
+      }
+      return before + updated + after;
+    }
+  );
+  const relScript = (0, import_node_path2.relative)((0, import_node_path2.dirname)(htmlPath), iifePath).split(import_node_path2.sep).join("/");
+  const inject = `
+  <!-- gg-pixel: auto-wired by ggcoder pixel install -->
+  <script src="${relScript}"></script>
+  <script>
+    if (window.GGPixel) GGPixel.initPixel({ projectKey: ${JSON.stringify(projectKey)}, ingestUrl: ${JSON.stringify(ingestUrl)} });
+  </script>
+`;
+  if (/<head[^>]*>/i.test(content)) {
+    content = content.replace(/(<head[^>]*>)/i, `$1${inject}`);
+  } else if (/<html[^>]*>/i.test(content)) {
+    content = content.replace(/(<html[^>]*>)/i, `$1<head>${inject}</head>`);
+  } else {
+    return "not-applicable";
+  }
+  (0, import_node_fs3.writeFileSync)(htmlPath, content, "utf8");
+  return "patched";
+}
 function wireTauri({ projectRoot, pkg, projectKey, ingestUrl }) {
   const initPath = (0, import_node_path2.join)(projectRoot, "gg-pixel.init.mjs");
   (0, import_node_fs3.writeFileSync)(initPath, renderBrowserInitFile(ingestUrl, projectKey), "utf8");