@timber-js/app 0.1.2 → 0.1.4

package/dist/index.js

@@ -1,10 +1,10 @@
 import { r as setViteServer, t as formatSize } from "./_chunks/format-DNt20Kt8.js";
-import { i as scanRoutes, n as generateRouteMap, t as collectInterceptionRewrites } from "./_chunks/interception-DIaZN1bF.js";
+import { i as scanRoutes, n as generateRouteMap, t as collectInterceptionRewrites } from "./_chunks/interception-c-a3uODY.js";
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, extname, join, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import { createRequire } from "node:module";
 import react from "@vitejs/plugin-react";
-import { isRunnableDevEnvironment } from "vite";
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { createHash } from "node:crypto";
 import { gzipSync } from "node:zlib";
@@ -11273,7 +11273,7 @@ function transformUseCache(code, fileId) {
 		result = result.slice(0, fn.start) + replacement + result.slice(fn.end);
 		needsImport = true;
 	}
-	if (needsImport) result = `import { registerCachedFunction } from '@timber/app/cache';\n` + result;
+	if (needsImport) result = `import { registerCachedFunction } from '@timber-js/app/cache';\n` + result;
 	return {
 		code: result,
 		map: null,
@@ -11597,7 +11597,7 @@ function createTimberMiddleware(server, projectRoot) {
 		let handler;
 		try {
 			const rscEnv = server.environments.rsc;
-			if (!isRunnableDevEnvironment(rscEnv)) throw new Error("[timber] RSC environment is not runnable");
+			if (!rscEnv?.runner?.import) throw new Error("[timber] RSC environment is not runnable");
 			const rscModule = await rscEnv.runner.import(RSC_ENTRY_ID);
 			handler = rscModule.default;
 			const setHandler = rscModule.setDevPipelineErrorHandler;
@@ -11751,7 +11751,8 @@ function listenForClientErrors(server, projectRoot) {
 }
 //#endregion
 //#region src/plugins/entries.ts
-var SRC_DIR = resolve(dirname(fileURLToPath(import.meta.url)), "..");
+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 VIRTUAL_IDS = {
 	rscEntry: "virtual:timber-rsc-entry",
 	ssrEntry: "virtual:timber-ssr-entry",
@@ -12320,17 +12321,17 @@ var SHIM_MAP = {
 */
 var CLIENT_SHIM_OVERRIDES = { "next/navigation": resolve(SHIMS_DIR, "navigation-client.ts") };
 /**
-* Map from @timber/app/* subpath imports to real source files.
+* Map from @timber-js/app/* subpath imports to real source files.
 *
-* These resolve subpath imports like `@timber/app/server` to the
+* These resolve subpath imports like `@timber-js/app/server` to the
 * real entry files in the package source.
 */
 var TIMBER_SUBPATH_MAP = {
-	"@timber/app/server": resolve(__dirname, "..", "server", "index.ts"),
-	"@timber/app/client": resolve(__dirname, "..", "client", "index.ts"),
-	"@timber/app/cache": resolve(__dirname, "..", "cache", "index.ts"),
-	"@timber/app/search-params": resolve(__dirname, "..", "search-params", "index.ts"),
-	"@timber/app/routing": resolve(__dirname, "..", "routing", "index.ts")
+	"@timber-js/app/server": resolve(__dirname, "..", "server", "index.ts"),
+	"@timber-js/app/client": resolve(__dirname, "..", "client", "index.ts"),
+	"@timber-js/app/cache": resolve(__dirname, "..", "cache", "index.ts"),
+	"@timber-js/app/search-params": resolve(__dirname, "..", "search-params", "index.ts"),
+	"@timber-js/app/routing": resolve(__dirname, "..", "routing", "index.ts")
 };
 /**
 * Strip .js extension from an import specifier.
@@ -13542,7 +13543,7 @@ function containsUseDynamic(code) {
 *
 * Output:
 * ```tsx
-* import { markDynamic as __markDynamic } from '@timber/app/runtime';
+* import { markDynamic as __markDynamic } from '@timber-js/app/runtime';
 * export default async function AddToCartButton({ productId }) {
 *   __markDynamic();
 *   const user = await getUser()
@@ -13563,7 +13564,7 @@ function transformUseDynamic(code) {
 		const cleanBody = fn.bodyContent.replace(/['"]use dynamic['"];?/, "__markDynamic();");
 		result = result.slice(0, fn.bodyStart) + cleanBody + result.slice(fn.bodyEnd);
 	}
-	result = `import { markDynamic as __markDynamic } from '@timber/app/runtime';\n` + result;
+	result = `import { markDynamic as __markDynamic } from '@timber-js/app/runtime';\n` + result;
 	return {
 		code: result,
 		map: null
@@ -13961,7 +13962,7 @@ function extractCallerLocation(projectRoot) {
 * (render errors, action errors, route handler errors, etc.).
 *
 * Handles both monorepo paths (timber-app/src/plugins/) and installed
-* package paths (@timber/app/dist/plugins/).
+* package paths (@timber-js/app/dist/plugins/).
 */
 function isFrameworkInternalCaller() {
 	const stack = (/* @__PURE__ */ new Error()).stack;
@@ -13971,7 +13972,7 @@ function isFrameworkInternalCaller() {
 		const line = lines[i].trim();
 		if (line.includes("dev-logs")) continue;
 		if (line.includes("node:")) continue;
-		if (!(line.includes("timber-app/") || line.includes("@timber/app/"))) return false;
+		if (!(line.includes("timber-app/") || line.includes("@timber-js/app/"))) return false;
 		return line.includes("/plugins/") || line.includes("/adapters/");
 	}
 	return false;
@@ -14659,9 +14660,9 @@ function timber(config) {
 			else ctx.timer.start("dev-server-setup");
 		}
 	};
-	// @vitejs/plugin-rsc handles:
+	const rscPluginPath = createRequire(join(process.cwd(), "package.json")).resolve("@vitejs/plugin-rsc");
 	ctx.timer.start("rsc-plugin-import");
-	const rscPluginsPromise = import("@vitejs/plugin-rsc").then(({ default: vitePluginRsc }) => {
+	const rscPluginsPromise = import(pathToFileURL(rscPluginPath).href).then(({ default: vitePluginRsc }) => {
 		ctx.timer.end("rsc-plugin-import");
 		return vitePluginRsc({
 			serverHandler: false,