@vistagenic/vista 0.3.2 → 0.3.4

package/dist/build/standalone.js

@@ -1,168 +1,168 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateStandaloneOutput = generateStandaloneOutput;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const url_1 = require("url");
-const manifest_1 = require("./manifest");
-const EXCLUDED_DIRECTORIES = new Set([
-    '.git',
-    '.vista',
-    '.flash',
-    '.turbo',
-    '.next',
-    '.vercel',
-    'node_modules',
-    'coverage',
-]);
-const EXCLUDED_FILE_SUFFIXES = ['.log', '.tsbuildinfo'];
-function ensureDir(absolutePath) {
-    fs_1.default.mkdirSync(absolutePath, { recursive: true });
-}
-function isExcludedDirectory(name) {
-    return EXCLUDED_DIRECTORIES.has(name);
-}
-function isExcludedFile(name) {
-    return EXCLUDED_FILE_SUFFIXES.some((suffix) => name.endsWith(suffix));
-}
-function copyDirectoryRecursive(sourceDir, targetDir) {
-    if (!fs_1.default.existsSync(sourceDir)) {
-        return;
-    }
-    ensureDir(targetDir);
-    for (const entry of fs_1.default.readdirSync(sourceDir, { withFileTypes: true })) {
-        if (entry.isDirectory()) {
-            copyDirectoryRecursive(path_1.default.join(sourceDir, entry.name), path_1.default.join(targetDir, entry.name));
-            continue;
-        }
-        if (!entry.isFile()) {
-            continue;
-        }
-        ensureDir(targetDir);
-        fs_1.default.copyFileSync(path_1.default.join(sourceDir, entry.name), path_1.default.join(targetDir, entry.name));
-    }
-}
-function copyProjectSnapshot(sourceRoot, targetRoot) {
-    const copiedFiles = [];
-    const copiedDirectories = [];
-    const visit = (currentSource, currentTarget) => {
-        ensureDir(currentTarget);
-        const relativeDir = path_1.default.relative(sourceRoot, currentSource) || '.';
-        copiedDirectories.push(relativeDir.replace(/\\/g, '/'));
-        for (const entry of fs_1.default.readdirSync(currentSource, { withFileTypes: true })) {
-            if (entry.isDirectory()) {
-                if (isExcludedDirectory(entry.name)) {
-                    continue;
-                }
-                visit(path_1.default.join(currentSource, entry.name), path_1.default.join(currentTarget, entry.name));
-                continue;
-            }
-            if (!entry.isFile() || isExcludedFile(entry.name)) {
-                continue;
-            }
-            const sourceFile = path_1.default.join(currentSource, entry.name);
-            const targetFile = path_1.default.join(currentTarget, entry.name);
-            ensureDir(path_1.default.dirname(targetFile));
-            fs_1.default.copyFileSync(sourceFile, targetFile);
-            copiedFiles.push(path_1.default.relative(sourceRoot, sourceFile).replace(/\\/g, '/'));
-        }
-    };
-    visit(sourceRoot, targetRoot);
-    copiedFiles.sort();
-    copiedDirectories.sort();
-    return { copiedFiles, copiedDirectories };
-}
-function resolveFrameworkDistRoot(cwd) {
-    const candidates = [];
-    try {
-        const packageJsonPath = require.resolve('@vistagenic/vista/package.json', { paths: [cwd] });
-        candidates.push(path_1.default.join(path_1.default.dirname(packageJsonPath), 'dist'));
-    }
-    catch {
-        // fall through
-    }
-    candidates.push(path_1.default.resolve(__dirname, '..', '..', 'dist'));
-    for (const candidate of candidates) {
-        if (fs_1.default.existsSync(candidate)) {
-            return candidate;
-        }
-    }
-    throw new Error('[vista:build] Unable to locate the Vista runtime dist directory.');
-}
-function isWithinRoot(candidatePath, rootPath) {
-    const relative = path_1.default.relative(rootPath, candidatePath);
-    return relative === '' || (!relative.startsWith('..') && !path_1.default.isAbsolute(relative));
-}
-function rebaseAbsolutePath(absolutePath, context) {
-    const normalizedAbsolute = path_1.default.resolve(absolutePath);
-    if (isWithinRoot(normalizedAbsolute, context.projectRoot)) {
-        return path_1.default.join(context.runtimeRoot, path_1.default.relative(context.projectRoot, normalizedAbsolute));
-    }
-    if (isWithinRoot(normalizedAbsolute, context.frameworkDistRoot)) {
-        return path_1.default.join(context.frameworkRuntimeRoot, path_1.default.relative(context.frameworkDistRoot, normalizedAbsolute));
-    }
-    return absolutePath;
-}
-function rewriteStringValue(value, context) {
-    if (value.startsWith('file://')) {
-        try {
-            const parsed = new URL(value);
-            const preserveEmptyHash = value.endsWith('#') && parsed.hash === '';
-            const decoded = (0, url_1.fileURLToPath)(parsed);
-            const rebased = rebaseAbsolutePath(decoded, context);
-            if (rebased === decoded) {
-                return value;
-            }
-            const nextUrl = (0, url_1.pathToFileURL)(rebased);
-            nextUrl.hash = parsed.hash;
-            const rewritten = nextUrl
-                .toString()
-                .replace(/^file:\/\/\/([A-Z]):/, (_match, driveLetter) => {
-                return `file:///${driveLetter.toLowerCase()}:`;
-            });
-            return preserveEmptyHash && !rewritten.endsWith('#') ? `${rewritten}#` : rewritten;
-        }
-        catch {
-            return value;
-        }
-    }
-    if (!path_1.default.isAbsolute(value)) {
-        return value;
-    }
-    const rebased = rebaseAbsolutePath(value, context);
-    if (rebased === value) {
-        return value;
-    }
-    if (value.includes('\\')) {
-        return rebased;
-    }
-    return rebased.replace(/\\/g, '/');
-}
-function rewriteManifestValue(value, context) {
-    if (typeof value === 'string') {
-        return rewriteStringValue(value, context);
-    }
-    if (Array.isArray(value)) {
-        return value.map((entry) => rewriteManifestValue(entry, context));
-    }
-    if (value && typeof value === 'object') {
-        const next = {};
-        for (const [rawKey, rawValue] of Object.entries(value)) {
-            const nextKey = rewriteStringValue(rawKey, context);
-            next[nextKey] = rewriteManifestValue(rawValue, context);
-        }
-        return next;
-    }
-    return value;
-}
-function writeJsonFile(absolutePath, payload) {
-    ensureDir(path_1.default.dirname(absolutePath));
-    fs_1.default.writeFileSync(absolutePath, JSON.stringify(payload, null, 2));
-}
-function writeStandaloneServerEntry(standaloneDir) {
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateStandaloneOutput = generateStandaloneOutput;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const url_1 = require("url");
+const manifest_1 = require("./manifest");
+const EXCLUDED_DIRECTORIES = new Set([
+    '.git',
+    '.vista',
+    '.flash',
+    '.turbo',
+    '.next',
+    '.vercel',
+    'node_modules',
+    'coverage',
+]);
+const EXCLUDED_FILE_SUFFIXES = ['.log', '.tsbuildinfo'];
+function ensureDir(absolutePath) {
+    fs_1.default.mkdirSync(absolutePath, { recursive: true });
+}
+function isExcludedDirectory(name) {
+    return EXCLUDED_DIRECTORIES.has(name);
+}
+function isExcludedFile(name) {
+    return EXCLUDED_FILE_SUFFIXES.some((suffix) => name.endsWith(suffix));
+}
+function copyDirectoryRecursive(sourceDir, targetDir) {
+    if (!fs_1.default.existsSync(sourceDir)) {
+        return;
+    }
+    ensureDir(targetDir);
+    for (const entry of fs_1.default.readdirSync(sourceDir, { withFileTypes: true })) {
+        if (entry.isDirectory()) {
+            copyDirectoryRecursive(path_1.default.join(sourceDir, entry.name), path_1.default.join(targetDir, entry.name));
+            continue;
+        }
+        if (!entry.isFile()) {
+            continue;
+        }
+        ensureDir(targetDir);
+        fs_1.default.copyFileSync(path_1.default.join(sourceDir, entry.name), path_1.default.join(targetDir, entry.name));
+    }
+}
+function copyProjectSnapshot(sourceRoot, targetRoot) {
+    const copiedFiles = [];
+    const copiedDirectories = [];
+    const visit = (currentSource, currentTarget) => {
+        ensureDir(currentTarget);
+        const relativeDir = path_1.default.relative(sourceRoot, currentSource) || '.';
+        copiedDirectories.push(relativeDir.replace(/\\/g, '/'));
+        for (const entry of fs_1.default.readdirSync(currentSource, { withFileTypes: true })) {
+            if (entry.isDirectory()) {
+                if (isExcludedDirectory(entry.name)) {
+                    continue;
+                }
+                visit(path_1.default.join(currentSource, entry.name), path_1.default.join(currentTarget, entry.name));
+                continue;
+            }
+            if (!entry.isFile() || isExcludedFile(entry.name)) {
+                continue;
+            }
+            const sourceFile = path_1.default.join(currentSource, entry.name);
+            const targetFile = path_1.default.join(currentTarget, entry.name);
+            ensureDir(path_1.default.dirname(targetFile));
+            fs_1.default.copyFileSync(sourceFile, targetFile);
+            copiedFiles.push(path_1.default.relative(sourceRoot, sourceFile).replace(/\\/g, '/'));
+        }
+    };
+    visit(sourceRoot, targetRoot);
+    copiedFiles.sort();
+    copiedDirectories.sort();
+    return { copiedFiles, copiedDirectories };
+}
+function resolveFrameworkDistRoot(cwd) {
+    const candidates = [];
+    try {
+        const packageJsonPath = require.resolve('@vistagenic/vista/package.json', { paths: [cwd] });
+        candidates.push(path_1.default.join(path_1.default.dirname(packageJsonPath), 'dist'));
+    }
+    catch {
+        // fall through
+    }
+    candidates.push(path_1.default.resolve(__dirname, '..', '..', 'dist'));
+    for (const candidate of candidates) {
+        if (fs_1.default.existsSync(candidate)) {
+            return candidate;
+        }
+    }
+    throw new Error('[vista:build] Unable to locate the Vista runtime dist directory.');
+}
+function isWithinRoot(candidatePath, rootPath) {
+    const relative = path_1.default.relative(rootPath, candidatePath);
+    return relative === '' || (!relative.startsWith('..') && !path_1.default.isAbsolute(relative));
+}
+function rebaseAbsolutePath(absolutePath, context) {
+    const normalizedAbsolute = path_1.default.resolve(absolutePath);
+    if (isWithinRoot(normalizedAbsolute, context.projectRoot)) {
+        return path_1.default.join(context.runtimeRoot, path_1.default.relative(context.projectRoot, normalizedAbsolute));
+    }
+    if (isWithinRoot(normalizedAbsolute, context.frameworkDistRoot)) {
+        return path_1.default.join(context.frameworkRuntimeRoot, path_1.default.relative(context.frameworkDistRoot, normalizedAbsolute));
+    }
+    return absolutePath;
+}
+function rewriteStringValue(value, context) {
+    if (value.startsWith('file://')) {
+        try {
+            const parsed = new URL(value);
+            const preserveEmptyHash = value.endsWith('#') && parsed.hash === '';
+            const decoded = (0, url_1.fileURLToPath)(parsed);
+            const rebased = rebaseAbsolutePath(decoded, context);
+            if (rebased === decoded) {
+                return value;
+            }
+            const nextUrl = (0, url_1.pathToFileURL)(rebased);
+            nextUrl.hash = parsed.hash;
+            const rewritten = nextUrl
+                .toString()
+                .replace(/^file:\/\/\/([A-Z]):/, (_match, driveLetter) => {
+                return `file:///${driveLetter.toLowerCase()}:`;
+            });
+            return preserveEmptyHash && !rewritten.endsWith('#') ? `${rewritten}#` : rewritten;
+        }
+        catch {
+            return value;
+        }
+    }
+    if (!path_1.default.isAbsolute(value)) {
+        return value;
+    }
+    const rebased = rebaseAbsolutePath(value, context);
+    if (rebased === value) {
+        return value;
+    }
+    if (value.includes('\\')) {
+        return rebased;
+    }
+    return rebased.replace(/\\/g, '/');
+}
+function rewriteManifestValue(value, context) {
+    if (typeof value === 'string') {
+        return rewriteStringValue(value, context);
+    }
+    if (Array.isArray(value)) {
+        return value.map((entry) => rewriteManifestValue(entry, context));
+    }
+    if (value && typeof value === 'object') {
+        const next = {};
+        for (const [rawKey, rawValue] of Object.entries(value)) {
+            const nextKey = rewriteStringValue(rawKey, context);
+            next[nextKey] = rewriteManifestValue(rawValue, context);
+        }
+        return next;
+    }
+    return value;
+}
+function writeJsonFile(absolutePath, payload) {
+    ensureDir(path_1.default.dirname(absolutePath));
+    fs_1.default.writeFileSync(absolutePath, JSON.stringify(payload, null, 2));
+}
+function writeStandaloneServerEntry(standaloneDir) {
     const serverEntry = `#!/usr/bin/env node
 const path = require('path');
 const fs = require('fs');
@@ -236,102 +236,108 @@ function startStandaloneServer(options = {}) {
       : path.join(__dirname, 'runtime', 'vista', 'server', 'rsc-engine.js');
   const runtime = require(runtimeEntry);
   const start = runtime.startRSCServer || runtime.default;
-  start({
+  const listen = options.listen !== false;
+  return start({
     port: options.port || process.env.PORT || 3003,
     projectRoot,
     runtimeRoot,
+    listen,
   });
 }
 
-module.exports = { startStandaloneServer };
+function createRequestListener(options = {}) {
+  return startStandaloneServer({ ...options, listen: false });
+}
+
+module.exports = { startStandaloneServer, createRequestListener };
 
 if (require.main === module) {
   startStandaloneServer();
 }
-`;
-    fs_1.default.writeFileSync(path_1.default.join(standaloneDir, 'server.js'), serverEntry, 'utf-8');
-}
-function generateStandaloneOutput(options) {
-    const { cwd, vistaDir, buildId, serverManifest, debug = false } = options;
-    const standaloneDir = path_1.default.join(vistaDir, 'standalone');
-    const runtimeProjectRoot = path_1.default.join(standaloneDir, 'project');
-    const frameworkRuntimeRoot = path_1.default.join(standaloneDir, 'runtime', 'vista');
-    const runtimeManifestPath = path_1.default.join(vistaDir, 'server', 'runtime-manifest.json');
-    const fileTracePath = path_1.default.join(vistaDir, 'server', 'file-trace.json');
-    fs_1.default.rmSync(standaloneDir, { recursive: true, force: true });
-    ensureDir(standaloneDir);
-    const snapshotTrace = copyProjectSnapshot(cwd, runtimeProjectRoot);
-    const frameworkDistRoot = resolveFrameworkDistRoot(cwd);
-    copyDirectoryRecursive(frameworkDistRoot, frameworkRuntimeRoot);
-    writeStandaloneServerEntry(standaloneDir);
-    const rewriteContext = {
-        projectRoot: cwd,
-        runtimeRoot: runtimeProjectRoot,
-        frameworkDistRoot,
-        frameworkRuntimeRoot,
-    };
-    const rebasedServerManifest = rewriteManifestValue(serverManifest, rewriteContext);
-    writeJsonFile(path_1.default.join(vistaDir, 'server', 'server-manifest.json'), rebasedServerManifest);
-    const manifestFiles = [
-        'client-manifest.json',
-        'app-path-routes-manifest.json',
-        'routes-manifest.json',
-        'react-client-manifest.json',
-        'react-server-manifest.json',
-        'react-ssr-manifest.json',
-    ];
-    const rewrittenArtifacts = ['server/server-manifest.json'];
-    for (const relativePath of manifestFiles) {
-        const absolutePath = path_1.default.join(vistaDir, relativePath);
-        if (!fs_1.default.existsSync(absolutePath)) {
-            continue;
-        }
-        const payload = JSON.parse(fs_1.default.readFileSync(absolutePath, 'utf-8'));
-        writeJsonFile(absolutePath, rewriteManifestValue(payload, rewriteContext));
-        rewrittenArtifacts.push(relativePath);
-    }
-    const runtimeManifest = {
-        schemaVersion: 1,
-        buildId,
-        generatedAt: new Date().toISOString(),
-        runtimeRootRelative: path_1.default.relative(cwd, runtimeProjectRoot).replace(/\\/g, '/'),
-        frameworkRuntimeRelative: path_1.default.relative(cwd, frameworkRuntimeRoot).replace(/\\/g, '/'),
-        standaloneServerRelative: path_1.default.relative(cwd, path_1.default.join(standaloneDir, 'server.js')).replace(/\\/g, '/'),
-        fileTraceRelative: path_1.default.relative(cwd, fileTracePath).replace(/\\/g, '/'),
-        dependencyRootsRelative: [],
-    };
-    const frameworkNodeModules = path_1.default.join(path_1.default.dirname(frameworkDistRoot), 'node_modules');
-    if (fs_1.default.existsSync(frameworkNodeModules)) {
-        runtimeManifest.dependencyRootsRelative.push(path_1.default.relative(cwd, frameworkNodeModules).replace(/\\/g, '/'));
-    }
-    const fileTrace = {
-        schemaVersion: 1,
-        buildId,
-        generatedAt: new Date().toISOString(),
-        projectRoot: cwd,
-        runtimeRootRelative: runtimeManifest.runtimeRootRelative,
-        frameworkRuntimeRelative: runtimeManifest.frameworkRuntimeRelative,
-        copiedFiles: snapshotTrace.copiedFiles,
-        copiedDirectories: snapshotTrace.copiedDirectories,
-        rewrittenArtifacts,
-    };
-    writeJsonFile(runtimeManifestPath, runtimeManifest);
-    writeJsonFile(fileTracePath, fileTrace);
-    (0, manifest_1.writeVistaTrace)(vistaDir, fileTrace);
-    (0, manifest_1.generateRequiredServerFilesManifest)(cwd, vistaDir, [
-        `${path_1.default.basename(vistaDir)}/server/runtime-manifest.json`,
-        `${path_1.default.basename(vistaDir)}/server/file-trace.json`,
-        `${path_1.default.basename(vistaDir)}/standalone/server.js`,
-    ], runtimeProjectRoot);
-    (0, manifest_1.writeArtifactManifest)(vistaDir, buildId, {
-        serverManifest: 'server/server-manifest.json',
-        runtimeManifest: 'server/runtime-manifest.json',
-        fileTrace: 'server/file-trace.json',
-        standaloneServer: 'standalone/server.js',
-        types: 'types/routes.d.ts',
-        trace: 'trace',
-    });
-    if (debug) {
-        console.log(`[vista:build] Standalone output ready (${snapshotTrace.copiedFiles.length} files, ${snapshotTrace.copiedDirectories.length} directories)`);
-    }
-}
+`;
+    fs_1.default.writeFileSync(path_1.default.join(standaloneDir, 'server.js'), serverEntry, 'utf-8');
+}
+function generateStandaloneOutput(options) {
+    const { cwd, vistaDir, buildId, serverManifest, debug = false } = options;
+    const standaloneDir = path_1.default.join(vistaDir, 'standalone');
+    const runtimeProjectRoot = path_1.default.join(standaloneDir, 'project');
+    const frameworkRuntimeRoot = path_1.default.join(standaloneDir, 'runtime', 'vista');
+    const runtimeManifestPath = path_1.default.join(vistaDir, 'server', 'runtime-manifest.json');
+    const fileTracePath = path_1.default.join(vistaDir, 'server', 'file-trace.json');
+    fs_1.default.rmSync(standaloneDir, { recursive: true, force: true });
+    ensureDir(standaloneDir);
+    const snapshotTrace = copyProjectSnapshot(cwd, runtimeProjectRoot);
+    const frameworkDistRoot = resolveFrameworkDistRoot(cwd);
+    copyDirectoryRecursive(frameworkDistRoot, frameworkRuntimeRoot);
+    writeStandaloneServerEntry(standaloneDir);
+    const rewriteContext = {
+        projectRoot: cwd,
+        runtimeRoot: runtimeProjectRoot,
+        frameworkDistRoot,
+        frameworkRuntimeRoot,
+    };
+    const rebasedServerManifest = rewriteManifestValue(serverManifest, rewriteContext);
+    writeJsonFile(path_1.default.join(vistaDir, 'server', 'server-manifest.json'), rebasedServerManifest);
+    const manifestFiles = [
+        'client-manifest.json',
+        'app-path-routes-manifest.json',
+        'routes-manifest.json',
+        'react-client-manifest.json',
+        'react-server-manifest.json',
+        'react-ssr-manifest.json',
+    ];
+    const rewrittenArtifacts = ['server/server-manifest.json'];
+    for (const relativePath of manifestFiles) {
+        const absolutePath = path_1.default.join(vistaDir, relativePath);
+        if (!fs_1.default.existsSync(absolutePath)) {
+            continue;
+        }
+        const payload = JSON.parse(fs_1.default.readFileSync(absolutePath, 'utf-8'));
+        writeJsonFile(absolutePath, rewriteManifestValue(payload, rewriteContext));
+        rewrittenArtifacts.push(relativePath);
+    }
+    const runtimeManifest = {
+        schemaVersion: 1,
+        buildId,
+        generatedAt: new Date().toISOString(),
+        runtimeRootRelative: path_1.default.relative(cwd, runtimeProjectRoot).replace(/\\/g, '/'),
+        frameworkRuntimeRelative: path_1.default.relative(cwd, frameworkRuntimeRoot).replace(/\\/g, '/'),
+        standaloneServerRelative: path_1.default.relative(cwd, path_1.default.join(standaloneDir, 'server.js')).replace(/\\/g, '/'),
+        fileTraceRelative: path_1.default.relative(cwd, fileTracePath).replace(/\\/g, '/'),
+        dependencyRootsRelative: [],
+    };
+    const frameworkNodeModules = path_1.default.join(path_1.default.dirname(frameworkDistRoot), 'node_modules');
+    if (fs_1.default.existsSync(frameworkNodeModules)) {
+        runtimeManifest.dependencyRootsRelative.push(path_1.default.relative(cwd, frameworkNodeModules).replace(/\\/g, '/'));
+    }
+    const fileTrace = {
+        schemaVersion: 1,
+        buildId,
+        generatedAt: new Date().toISOString(),
+        projectRoot: cwd,
+        runtimeRootRelative: runtimeManifest.runtimeRootRelative,
+        frameworkRuntimeRelative: runtimeManifest.frameworkRuntimeRelative,
+        copiedFiles: snapshotTrace.copiedFiles,
+        copiedDirectories: snapshotTrace.copiedDirectories,
+        rewrittenArtifacts,
+    };
+    writeJsonFile(runtimeManifestPath, runtimeManifest);
+    writeJsonFile(fileTracePath, fileTrace);
+    (0, manifest_1.writeVistaTrace)(vistaDir, fileTrace);
+    (0, manifest_1.generateRequiredServerFilesManifest)(cwd, vistaDir, [
+        `${path_1.default.basename(vistaDir)}/server/runtime-manifest.json`,
+        `${path_1.default.basename(vistaDir)}/server/file-trace.json`,
+        `${path_1.default.basename(vistaDir)}/standalone/server.js`,
+    ], runtimeProjectRoot);
+    (0, manifest_1.writeArtifactManifest)(vistaDir, buildId, {
+        serverManifest: 'server/server-manifest.json',
+        runtimeManifest: 'server/runtime-manifest.json',
+        fileTrace: 'server/file-trace.json',
+        standaloneServer: 'standalone/server.js',
+        types: 'types/routes.d.ts',
+        trace: 'trace',
+    });
+    if (debug) {
+        console.log(`[vista:build] Standalone output ready (${snapshotTrace.copiedFiles.length} files, ${snapshotTrace.copiedDirectories.length} directories)`);
+    }
+}

package/dist/client/dynamic.react-server.d.ts

@@ -1,2 +1,2 @@
-export * from './dynamic';
-export { default } from './dynamic';
+export * from './dynamic';
+export { default } from './dynamic';

package/dist/client/dynamic.react-server.js

@@ -1,23 +1,23 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = void 0;
-__exportStar(require("./dynamic"), exports);
-var dynamic_1 = require("./dynamic");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(dynamic_1).default; } });
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = void 0;
+__exportStar(require("./dynamic"), exports);
+var dynamic_1 = require("./dynamic");
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(dynamic_1).default; } });

package/dist/client/link.js

@@ -118,7 +118,7 @@ function resolvePrefetchBehavior(prefetch) {
 exports.Link = react_1.default.forwardRef(({ href, as, replace, scroll = true, shallow, passHref, prefetch = 'auto', legacyBehavior, children, onClick, onMouseEnter, onTouchStart, onNavigate, target, ...props }, ref) => {
     // Try the RSC router first — if we're inside an RSCRouter, use
     // Flight-based navigation. Otherwise fall back to the legacy router.
-    const rscRouter = (0, react_1.useContext)(rsc_router_1.RSCRouterContext);
+    const rscRouter = (0, rsc_router_1.useRSCRouter)();
     const legacyRouter = (0, react_1.useContext)(router_1.RouterContext);
     const fallbackPathname = (0, router_1.usePathname)();
     const pathname = rscRouter?.pathname ?? legacyRouter?.pathname ?? fallbackPathname;

package/dist/client/link.react-server.d.ts

@@ -1,2 +1,2 @@
-export { default, Link, useLinkStatus, useIsActive } from './link';
-export type { LinkProps } from './link';
+export { default, Link, useLinkStatus, useIsActive } from './link';
+export type { LinkProps } from './link';

package/dist/client/link.react-server.js

@@ -1,11 +1,11 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useIsActive = exports.useLinkStatus = exports.Link = exports.default = void 0;
-var link_1 = require("./link");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(link_1).default; } });
-Object.defineProperty(exports, "Link", { enumerable: true, get: function () { return link_1.Link; } });
-Object.defineProperty(exports, "useLinkStatus", { enumerable: true, get: function () { return link_1.useLinkStatus; } });
-Object.defineProperty(exports, "useIsActive", { enumerable: true, get: function () { return link_1.useIsActive; } });
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useIsActive = exports.useLinkStatus = exports.Link = exports.default = void 0;
+var link_1 = require("./link");
+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(link_1).default; } });
+Object.defineProperty(exports, "Link", { enumerable: true, get: function () { return link_1.Link; } });
+Object.defineProperty(exports, "useLinkStatus", { enumerable: true, get: function () { return link_1.useLinkStatus; } });
+Object.defineProperty(exports, "useIsActive", { enumerable: true, get: function () { return link_1.useIsActive; } });

package/dist/client/navigation.js

@@ -59,7 +59,7 @@ const rsc_router_1 = require("./rsc-router");
  * to popstate events.
  */
 function usePathname() {
-    const rscCtx = React.useContext(rsc_router_1.RSCRouterContext);
+    const rscCtx = (0, rsc_router_1.useRSCRouter)();
     if (rscCtx)
         return rscCtx.pathname;
     const [pathname, setPathname] = React.useState(() => typeof window !== 'undefined' ? window.location.pathname : '/');
@@ -77,7 +77,7 @@ function usePathname() {
  * Uses the RSC router context when available.
  */
 function useSearchParams() {
-    const rscCtx = React.useContext(rsc_router_1.RSCRouterContext);
+    const rscCtx = (0, rsc_router_1.useRSCRouter)();
     if (rscCtx)
         return rscCtx.searchParams;
     const [searchParams, setSearchParams] = React.useState(() => typeof window !== 'undefined'

package/dist/client/navigation.react-server.d.ts

@@ -1 +1 @@
-export * from './navigation';
+export * from './navigation';