@timber-js/app 0.1.16 → 0.1.18

package/dist/index.js

@@ -11752,7 +11752,7 @@ function listenForClientErrors(server, projectRoot) {
 //#endregion
 //#region src/plugins/entries.ts
 var __dirname$1 = dirname(fileURLToPath(import.meta.url));
-var SRC_DIR = existsSync(resolve(__dirname$1, "..", "server", "rsc-entry", "index.ts")) ? resolve(__dirname$1, "..") : resolve(__dirname$1, "..", "src");
+var SRC_DIR$1 = existsSync(resolve(__dirname$1, "..", "server", "rsc-entry", "index.ts")) ? resolve(__dirname$1, "..") : resolve(__dirname$1, "..", "src");
 var VIRTUAL_IDS = {
 	rscEntry: "virtual:timber-rsc-entry",
 	ssrEntry: "virtual:timber-ssr-entry",
@@ -11769,9 +11769,9 @@ var VIRTUAL_IDS = {
 * published package via the `files` field.
 */
 var ENTRY_FILE_MAP = {
-	[VIRTUAL_IDS.rscEntry]: resolve(SRC_DIR, "server", "rsc-entry", "index.ts"),
-	[VIRTUAL_IDS.ssrEntry]: resolve(SRC_DIR, "server", "ssr-entry.ts"),
-	[VIRTUAL_IDS.browserEntry]: resolve(SRC_DIR, "client", "browser-entry.ts")
+	[VIRTUAL_IDS.rscEntry]: resolve(SRC_DIR$1, "server", "rsc-entry", "index.ts"),
+	[VIRTUAL_IDS.ssrEntry]: resolve(SRC_DIR$1, "server", "ssr-entry.ts"),
+	[VIRTUAL_IDS.browserEntry]: resolve(SRC_DIR$1, "client", "browser-entry.ts")
 };
 /** The \0-prefixed resolved ID for virtual:timber-config */
 var RESOLVED_CONFIG_ID = `\0${VIRTUAL_IDS.config}`;
@@ -12288,6 +12288,7 @@ function generateManifestModule(tree) {
 //#region src/plugins/shims.ts
 var __dirname = dirname(fileURLToPath(import.meta.url));
 var PKG_ROOT = __dirname.endsWith("plugins") ? resolve(__dirname, "..", "..") : resolve(__dirname, "..");
+var SRC_DIR = resolve(PKG_ROOT, "src");
 var SHIMS_DIR = resolve(PKG_ROOT, "src", "shims");
 /**
 * Virtual module IDs for server-only and client-only poison pills.
@@ -12313,15 +12314,6 @@ var SHIM_MAP = {
 	"next/font/local": "\0@timber/fonts/local"
 };
 /**
-* Client-only shim overrides for the browser environment.
-*
-* next/navigation in the client environment resolves to navigation-client.ts
-* which only re-exports client hooks — not server functions like redirect()
-* and deny(). This prevents server/primitives.ts from being pulled into the
-* browser bundle via tree-shaking-resistant imports.
-*/
-var CLIENT_SHIM_OVERRIDES = { "next/navigation": resolve(SHIMS_DIR, "navigation-client.ts") };
-/**
 * Strip .js extension from an import specifier.
 *
 * Libraries like nuqs import `next/navigation.js` with an explicit
@@ -12331,6 +12323,34 @@ function stripJsExtension(id) {
 	return id.endsWith(".js") ? id.slice(0, -3) : id;
 }
 /**
+* Resolve a #/* subpath import to an absolute file path.
+*
+* The package.json "imports" field maps #/* → ./src/*. Vite's resolver
+* handles this via Node.js subpath imports, but in dev mode the resulting
+* module URL can differ from a relative import to the same file. This
+* causes module duplication — the same file loaded as two separate ES
+* modules with separate module-level state.
+*
+* This function resolves #/foo/bar.js to <PKG_ROOT>/src/foo/bar.ts
+* (trying .ts first, then .tsx, then .js, then the raw path).
+* Returns null if the import is not a #/ import or the file doesn't exist.
+*/
+function resolveSubpathImport(id) {
+	if (!id.startsWith("#/")) return null;
+	const basePath = resolve(SRC_DIR, id.slice(2));
+	const withoutJs = stripJsExtension(basePath);
+	for (const ext of [
+		".ts",
+		".tsx",
+		".js"
+	]) {
+		const candidate = withoutJs + ext;
+		if (existsSync(candidate)) return candidate;
+	}
+	if (existsSync(basePath)) return basePath;
+	return null;
+}
+/**
 * Create the timber-shims Vite plugin.
 *
 * Hooks: resolveId, load
@@ -12342,9 +12362,11 @@ function timberShims(_ctx) {
 		resolveId(id) {
 			if (id === "server-only") return SERVER_ONLY_VIRTUAL;
 			if (id === "client-only") return CLIENT_ONLY_VIRTUAL;
+			const subpathResolved = resolveSubpathImport(id);
+			if (subpathResolved) return subpathResolved;
 			const cleanId = stripJsExtension(id);
 			if (cleanId in SHIM_MAP) {
-				if (this.environment?.name === "client" && cleanId in CLIENT_SHIM_OVERRIDES) return CLIENT_SHIM_OVERRIDES[cleanId];
+				if (this.environment?.name === "client" && cleanId === "next/navigation") return resolve(SHIMS_DIR, "navigation-client.ts");
 				return SHIM_MAP[cleanId];
 			}
 			if (cleanId === "@timber-js/app/server") {