@timber-js/app 0.1.2 → 0.1.3

package/dist/plugins/dev-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/plugins/dev-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,MAAM,CAAC;AAIlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAiChD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAmD1D"}
+{"version":3,"file":"dev-server.d.ts","sourceRoot":"","sources":["../../src/plugins/dev-server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAiC,MAAM,MAAM,CAAC;AAGlE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAiChD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAmD1D"}

package/dist/plugins/entries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entries.d.ts","sourceRoot":"","sources":["../../src/plugins/entries.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAGnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AA8FhD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CA2FxD"}
+{"version":3,"file":"entries.d.ts","sourceRoot":"","sources":["../../src/plugins/entries.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAInC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAoGhD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CA2FxD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timber-js/app",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Vite-native React framework for Cloudflare Workers — correct HTTP semantics, real status codes, pages that work without JavaScript",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",
@@ -90,15 +90,15 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/context-async-hooks": "^2.6.0",
-    "@opentelemetry/sdk-trace-base": "^2.6.0",
-    "@vitejs/plugin-react": "^6.0.0",
-    "@vitejs/plugin-rsc": "~0.5.21"
+    "@opentelemetry/sdk-trace-base": "^2.6.0"
   },
   "peerDependencies": {
     "@content-collections/core": "^0.14.0",
     "@content-collections/mdx": "^0.2.0",
     "@content-collections/vite": "^0.2.0",
     "@mdx-js/rollup": "^3.0.0",
+    "@vitejs/plugin-react": "^6.0.0",
+    "@vitejs/plugin-rsc": ">=0.5.21",
     "nuqs": "^2.0.0",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",

package/src/index.ts

@@ -2,6 +2,7 @@ import type { Plugin, PluginOption } from 'vite';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { pathToFileURL } from 'node:url';
+import { createRequire } from 'node:module';
 import react from '@vitejs/plugin-react';
 import { cacheTransformPlugin } from './plugins/cache-transform';
 import { timberContent } from './plugins/content';
@@ -353,8 +354,14 @@ export function timber(config?: TimberUserConfig): PluginOption[] {
   // We do NOT set customBuildApp — the RSC plugin's orchestration is correct
   // and handles bundle ordering, asset manifest generation, and environment
   // imports manifest. See @vitejs/plugin-rsc's buildApp implementation.
+  // Resolve @vitejs/plugin-rsc from the consumer's project (process.cwd()),
+  // not from timber's own node_modules. This is critical for pnpm link:
+  // when linked, timber's node_modules has a separate vite instance, and
+  // the RSC plugin must use the same vite instance as the dev server.
+  const consumerRequire = createRequire(join(process.cwd(), 'package.json'));
+  const rscPluginPath = consumerRequire.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,

package/src/plugins/dev-server.ts

@@ -12,8 +12,7 @@
  * Design docs: 18-build-system.md §"Dev Server", 02-rendering-pipeline.md
  */
 
-import type { Plugin, ViteDevServer } from 'vite';
-import { isRunnableDevEnvironment } from 'vite';
+import type { Plugin, ViteDevServer, DevEnvironment } from 'vite';
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { join } from 'node:path';
 import type { PluginContext } from '#/index.js';
@@ -147,8 +146,11 @@ function createTimberMiddleware(server: ViteDevServer, projectRoot: string) {
     // environment's module runner for HMR-aware loading.
     let handler: (req: Request) => Promise<Response>;
     try {
-      const rscEnv = server.environments.rsc;
-      if (!isRunnableDevEnvironment(rscEnv)) {
+      const rscEnv = server.environments.rsc as DevEnvironment & { runner?: { import: (id: string) => Promise<any> } };
+      // Duck-type check instead of isRunnableDevEnvironment() — the vite
+      // import-based check fails across pnpm link boundaries where the
+      // linked package resolves a different vite module instance.
+      if (!rscEnv?.runner?.import) {
         throw new Error('[timber] RSC environment is not runnable');
       }
       const rscModule = await rscEnv.runner.import(RSC_ENTRY_ID);

package/src/plugins/entries.ts

@@ -14,10 +14,17 @@
 import type { Plugin } from 'vite';
 import { resolve, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { existsSync } from 'node:fs';
 import type { PluginContext } from '#/index.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const SRC_DIR = resolve(__dirname, '..');
+
+// In workspace dev, __dirname is src/plugins/ and src/ is the parent.
+// In published package, entries.ts is bundled into dist/index.js so
+// __dirname is dist/ and src/ is a sibling directory.
+const SRC_DIR = existsSync(resolve(__dirname, '..', 'server', 'rsc-entry', 'index.ts'))
+  ? resolve(__dirname, '..')
+  : resolve(__dirname, '..', 'src');
 
 // ─── Virtual Module IDs ──────────────────────────────────────────────────