react-client 1.0.24 → 1.0.25

package/dist/cli/commands/dev.js

@@ -29,7 +29,6 @@ const chalk_1 = __importDefault(require("chalk"));
 const child_process_1 = require("child_process");
 const loadConfig_1 = require("../../utils/loadConfig");
 const broadcastManager_1 = require("../../server/broadcastManager");
-const RUNTIME_OVERLAY = '/src/runtime/overlay-runtime.js';
 async function dev() {
     const root = process.cwd();
     const userConfig = (await (0, loadConfig_1.loadReactClientConfig)(root));
@@ -169,7 +168,7 @@ async function dev() {
         });
     }
     // --- Serve /@modules/<dep> (prebundled or on-demand esbuild bundle)
-    app.use((async (req, res, next) => {
+    app.use(async (req, res, next) => {
         const url = req.url ?? '';
         if (!url.startsWith('/@modules/'))
             return next();
@@ -182,21 +181,41 @@ async function dev() {
             const cacheFile = path_1.default.join(cacheDir, id.replace(/[\\/]/g, '_') + '.js');
             if (await fs_extra_1.default.pathExists(cacheFile)) {
                 res.setHeader('Content-Type', 'application/javascript');
-                res.end(await fs_extra_1.default.readFile(cacheFile, 'utf8'));
-                return;
+                return res.end(await fs_extra_1.default.readFile(cacheFile, 'utf8'));
+            }
+            // 🧠 Handle subpaths correctly: react-dom/client, react/jsx-runtime, etc.
+            let entryPath = null;
+            try {
+                entryPath = 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';
+                }
             }
-            // Resolve and bundle on-demand
-            const entryResolved = require.resolve(id, { paths: [appRoot] });
+            if (!entryPath)
+                throw new Error(`Could not resolve ${id}`);
             const result = await esbuild_1.default.build({
-                entryPoints: [entryResolved],
+                entryPoints: [entryPath],
                 bundle: true,
-                write: false,
                 platform: 'browser',
                 format: 'esm',
+                write: false,
                 target: ['es2020'],
             });
             const output = result.outputFiles?.[0]?.text ?? '';
-            // Persist to cache so next request is faster
             await fs_extra_1.default.writeFile(cacheFile, output, 'utf8');
             res.setHeader('Content-Type', 'application/javascript');
             res.end(output);
@@ -205,20 +224,20 @@ async function dev() {
             res.writeHead(500);
             res.end(`// Failed to resolve module ${id}: ${err.message}`);
         }
-    }));
+    });
     // --- Serve runtime overlay (local file) so overlay-runtime.js is loaded automatically
-    app.use((async (req, res, next) => {
-        const url = req.url ?? '';
-        if (url !== '/@runtime/overlay')
-            return next();
-        const overlayPath = path_1.default.join(appRoot, RUNTIME_OVERLAY);
-        if (!(await fs_extra_1.default.pathExists(overlayPath))) {
-            res.writeHead(404);
-            return res.end('// overlay-runtime not found');
+    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'));
         }
-        res.setHeader('Content-Type', 'application/javascript');
-        res.end(await fs_extra_1.default.readFile(overlayPath, 'utf8'));
-    }));
+        next();
+    });
     // --- minimal /@source-map: return snippet around requested line of original source file
     app.use((async (req, res, next) => {
         const url = req.url ?? '';

package/package.json

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