react-client 1.0.25 → 1.0.27

package/dist/cli/commands/dev.js

@@ -5,7 +5,6 @@
  * - prebundles deps into .react-client/deps
  * - serves /@modules/<dep>
  * - serves /src/* with esbuild transform & inline sourcemap
- * - serves /@runtime/overlay -> src/runtime/overlay-runtime.js
  * - /@source-map returns a snippet for overlay mapping
  * - HMR broadcast via BroadcastManager (ws)
  *
@@ -183,32 +182,40 @@ async function dev() {
                 res.setHeader('Content-Type', 'application/javascript');
                 return res.end(await fs_extra_1.default.readFile(cacheFile, 'utf8'));
             }
-            // 🧠 Handle subpaths correctly: react-dom/client, react/jsx-runtime, etc.
-            let entryPath = null;
+            // 🧠 Handle subpath imports correctly (like react-dom/client)
+            let entryFile = null;
             try {
-                entryPath = require.resolve(id, { paths: [appRoot] });
+                entryFile = require.resolve(id, { paths: [appRoot] });
             }
             catch {
-                // Fallback: handle packages with subpaths dynamically
                 const parts = id.split('/');
-                if (parts.length > 1) {
-                    const pkgRoot = parts[0].startsWith('@') ? parts.slice(0, 2).join('/') : parts[0];
-                    const subPath = parts.slice(pkgRoot.startsWith('@') ? 2 : 1).join('/');
-                    const pkgDir = path_1.default.dirname(require.resolve(`${pkgRoot}/package.json`, { paths: [appRoot] }));
-                    // resolve full subpath from package root
-                    const tryPath = path_1.default.join(pkgDir, subPath);
-                    if (await fs_extra_1.default.pathExists(tryPath + '.js'))
-                        entryPath = tryPath + '.js';
-                    else if (await fs_extra_1.default.pathExists(tryPath + '.mjs'))
-                        entryPath = tryPath + '.mjs';
-                    else if (await fs_extra_1.default.pathExists(tryPath + '/index.js'))
-                        entryPath = tryPath + '/index.js';
+                const pkgRoot = parts[0].startsWith('@') ? parts.slice(0, 2).join('/') : parts[0];
+                const subPath = parts.slice(pkgRoot.startsWith('@') ? 2 : 1).join('/');
+                const pkgJsonPath = require.resolve(`${pkgRoot}/package.json`, { paths: [appRoot] });
+                const pkgDir = path_1.default.dirname(pkgJsonPath);
+                // Special case: react-dom/client
+                if (pkgRoot === 'react-dom' && subPath === 'client') {
+                    entryFile = path_1.default.join(pkgDir, 'client.js');
+                }
+                else {
+                    const candidates = [
+                        path_1.default.join(pkgDir, subPath),
+                        path_1.default.join(pkgDir, subPath, 'index.js'),
+                        path_1.default.join(pkgDir, subPath + '.js'),
+                        path_1.default.join(pkgDir, subPath + '.mjs'),
+                    ];
+                    for (const f of candidates) {
+                        if (await fs_extra_1.default.pathExists(f)) {
+                            entryFile = f;
+                            break;
+                        }
+                    }
                 }
             }
-            if (!entryPath)
-                throw new Error(`Could not resolve ${id}`);
+            if (!entryFile)
+                throw new Error(`Cannot resolve module: ${id}`);
             const result = await esbuild_1.default.build({
-                entryPoints: [entryPath],
+                entryPoints: [entryFile],
                 bundle: true,
                 platform: 'browser',
                 format: 'esm',
@@ -225,16 +232,105 @@ async function dev() {
             res.end(`// Failed to resolve module ${id}: ${err.message}`);
         }
     });
+    app.use(async (req, res, next) => {
+        if (req.url?.startsWith('/@prismjs')) {
+            const prismPath = require.resolve('prismjs', { paths: [appRoot] });
+            const code = await fs_extra_1.default.readFile(prismPath, 'utf8');
+            res.setHeader('Content-Type', 'application/javascript');
+            return res.end(code);
+        }
+        next();
+    });
     // --- Serve runtime overlay (local file) so overlay-runtime.js is loaded automatically
+    // --- Serve runtime overlay (inline in dev server)
+    const OVERLAY_RUNTIME = `
+import "/@prismjs";
+
+const overlayId = "__rc_error_overlay__";
+
+const style = document.createElement("style");
+style.textContent = \`
+  #\${overlayId} {
+    position: fixed;
+    inset: 0;
+    background: rgba(0, 0, 0, 0.9);
+    color: #fff;
+    font-family: Menlo, Consolas, monospace;
+    font-size: 14px;
+    z-index: 999999;
+    overflow: auto;
+    padding: 24px;
+    animation: fadeIn 0.2s ease-out;
+  }
+  @keyframes fadeIn { from {opacity: 0;} to {opacity: 1;} }
+  #\${overlayId} h2 { color: #ff6b6b; margin-bottom: 16px; }
+  #\${overlayId} pre { background: rgba(255,255,255,0.1); padding: 12px; border-radius: 6px; }
+  #\${overlayId} a { color: #9cf; text-decoration: underline; }
+  #\${overlayId} .frame { margin: 12px 0; }
+  #\${overlayId} .frame-file { color: #ffa500; cursor: pointer; font-weight: bold; margin-bottom: 4px; }
+  .line-number { opacity: 0.5; margin-right: 10px; }
+\`;
+document.head.appendChild(style);
+
+async function mapStackFrame(frame) {
+  const m = frame.match(/(\\/src\\/[^\s:]+):(\\d+):(\\d+)/);
+  if (!m) return frame;
+  const [, file, line, col] = m;
+  const resp = await fetch(\`/@source-map?file=\${file}&line=\${line}&column=\${col}\`);
+  if (!resp.ok) return frame;
+  const pos = await resp.json();
+  if (pos.source) {
+    return {
+      file: pos.source,
+      line: pos.line,
+      column: pos.column,
+      snippet: pos.snippet || ""
+    };
+  }
+  return frame;
+}
+
+async function renderOverlay(err) {
+  const overlay =
+    document.getElementById(overlayId) ||
+    document.body.appendChild(Object.assign(document.createElement("div"), { id: overlayId }));
+  overlay.innerHTML = "";
+  const title = document.createElement("h2");
+  title.textContent = "🔥 " + (err.message || "Error");
+  overlay.appendChild(title);
+
+  const frames = (err.stack || "").split("\\n").filter(l => /src\\//.test(l));
+  for (const frame of frames) {
+    const mapped = await mapStackFrame(frame);
+    if (typeof mapped === "string") continue;
+    const frameEl = document.createElement("div");
+    frameEl.className = "frame";
+
+    const link = document.createElement("div");
+    link.className = "frame-file";
+    link.textContent = \`\${mapped.file}:\${mapped.line}:\${mapped.column}\`;
+    link.onclick = () =>
+      window.open("vscode://file/" + location.origin.replace("http://", "") + mapped.file + ":" + mapped.line);
+    frameEl.appendChild(link);
+
+    if (mapped.snippet) {
+      const pre = document.createElement("pre");
+      pre.classList.add("language-jsx");
+      pre.innerHTML = Prism.highlight(mapped.snippet, Prism.languages.jsx, "jsx");
+      frameEl.appendChild(pre);
+    }
+
+    overlay.appendChild(frameEl);
+  }
+}
+
+window.showErrorOverlay = (err) => renderOverlay(err);
+window.clearErrorOverlay = () => document.getElementById(overlayId)?.remove();
+`;
     app.use(async (req, res, next) => {
         if (req.url === '/@runtime/overlay') {
-            const overlayPath = path_1.default.join(appRoot, 'src/runtime/overlay-runtime.js');
-            if (!(await fs_extra_1.default.pathExists(overlayPath))) {
-                res.writeHead(404);
-                return res.end('// overlay-runtime.js not found');
-            }
             res.setHeader('Content-Type', 'application/javascript');
-            return res.end(await fs_extra_1.default.readFile(overlayPath, 'utf8'));
+            return res.end(OVERLAY_RUNTIME);
         }
         next();
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-client",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "react-client is a lightweight CLI and runtime for building React apps with fast iteration.",
   "license": "MIT",
   "author": "Venkatesh Sundaram",