WIP @trigger.dev/rsc package

ericallam · ericallam · commit 2c3dabad6d93 · 2024-11-18T13:41:12.000Z
diff --git a/packages/cli-v3/src/build/extensions.ts b/packages/cli-v3/src/build/extensions.ts
@@ -184,6 +184,12 @@ function applyLayerToManifest(layer: BuildLayer, manifest: BuildManifest): Build
     }
   }
 
+  if (layer.conditions) {
+    $manifest.customConditions ??= [];
+    $manifest.customConditions = $manifest.customConditions.concat(layer.conditions);
+    $manifest.customConditions = Array.from(new Set($manifest.customConditions));
+  }
+
   return $manifest;
 }
 
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -204,9 +204,9 @@
     "nanoid": "^3.3.4",
     "socket.io-client": "4.7.5",
     "superjson": "^2.2.1",
+    "zod": "3.22.3",
     "zod-error": "1.5.0",
-    "zod-validation-error": "^1.5.0",
-    "zod": "3.22.3"
+    "zod-validation-error": "^1.5.0"
   },
   "devDependencies": {
     "@ai-sdk/provider-utils": "^1.0.22",
diff --git a/packages/core/src/v3/build/extensions.ts b/packages/core/src/v3/build/extensions.ts
@@ -65,6 +65,7 @@ export interface BuildLayer {
     override?: boolean;
   };
   dependencies?: Record<string, string>;
+  conditions?: string[];
 }
 
 export type PluginPlacement = "first" | "last";
diff --git a/packages/core/src/v3/runMetadata/index.ts b/packages/core/src/v3/runMetadata/index.ts
@@ -67,7 +67,7 @@ export class RunMetadataAPI implements RunMetadataManager {
 
   public stream<T>(
     key: string,
-    value: AsyncIterable<T>,
+    value: AsyncIterable<T> | ReadableStream<T>,
     signal?: AbortSignal
   ): Promise<AsyncIterable<T>> {
     return this.#getManager().stream(key, value, signal);
diff --git a/packages/core/src/v3/runMetadata/manager.ts b/packages/core/src/v3/runMetadata/manager.ts
@@ -164,11 +164,13 @@ export class StandardMetadataManager implements RunMetadataManager {
 
   public async stream<T>(
     key: string,
-    value: AsyncIterable<T>,
+    value: AsyncIterable<T> | ReadableStream<T>,
     signal?: AbortSignal
   ): Promise<AsyncIterable<T>> {
+    const $value = value as AsyncIterable<T>;
+
     if (!this.runId) {
-      return value;
+      return $value;
     }
 
     // Add the key to the special stream metadata object
@@ -179,7 +181,7 @@ export class StandardMetadataManager implements RunMetadataManager {
     const streamInstance = new MetadataStream({
       key,
       runId: this.runId,
-      iterator: value[Symbol.asyncIterator](),
+      iterator: $value[Symbol.asyncIterator](),
       baseUrl: this.streamsBaseUrl,
       signal,
     });
diff --git a/packages/core/src/v3/runMetadata/metadataStream.ts b/packages/core/src/v3/runMetadata/metadataStream.ts
@@ -63,8 +63,6 @@ export class MetadataStream<T> {
       cancel: () => this.controller.abort(),
     });
 
-    console.log("Posting server stream to ", this.options.baseUrl);
-
     return fetch(
       `${this.options.baseUrl}/realtime/v1/streams/${this.options.runId}/${this.options.key}`,
       {
diff --git a/packages/core/src/v3/runMetadata/types.ts b/packages/core/src/v3/runMetadata/types.ts
@@ -13,5 +13,9 @@ export interface RunMetadataManager {
   decrementKey(key: string, value: number): void;
   update(metadata: Record<string, DeserializedJson>): void;
   flush(requestOptions?: ApiRequestOptions): Promise<void>;
-  stream<T>(key: string, value: AsyncIterable<T>, signal?: AbortSignal): Promise<AsyncIterable<T>>;
+  stream<T>(
+    key: string,
+    value: AsyncIterable<T> | ReadableStream<T>,
+    signal?: AbortSignal
+  ): Promise<AsyncIterable<T>>;
 }
diff --git a/packages/rsc/CHANGELOG.md b/packages/rsc/CHANGELOG.md
@@ -0,0 +1 @@
+# @trigger.dev/rsc
diff --git a/packages/rsc/README.md b/packages/rsc/README.md
@@ -0,0 +1 @@
+## trigger.dev rsc
diff --git a/packages/rsc/package.json b/packages/rsc/package.json
@@ -0,0 +1,76 @@
+{
+  "name": "@trigger.dev/rsc",
+  "version": "3.1.2",
+  "description": "trigger.dev rsc",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/triggerdotdev/trigger.dev",
+    "directory": "packages/react-hooks"
+  },
+  "type": "module",
+  "files": [
+    "dist"
+  ],
+  "tshy": {
+    "selfLink": false,
+    "main": true,
+    "module": true,
+    "project": "./tsconfig.json",
+    "exports": {
+      "./package.json": "./package.json",
+      ".": "./src/index.ts"
+    },
+    "sourceDialects": [
+      "@triggerdotdev/source"
+    ]
+  },
+  "scripts": {
+    "clean": "rimraf dist",
+    "build": "tshy && pnpm run update-version",
+    "dev": "tshy --watch",
+    "typecheck": "tsc --noEmit",
+    "update-version": "tsx ../../scripts/updateVersion.ts",
+    "check-exports": "attw --pack ."
+  },
+  "dependencies": {
+    "@trigger.dev/core": "workspace:^3.1.2",
+    "mlly": "^1.7.1",
+    "react": "19.0.0-rc.1",
+    "react-dom": "19.0.0-rc.1"
+  },
+  "devDependencies": {
+    "@arethetypeswrong/cli": "^0.15.4",
+    "@trigger.dev/build": "workspace:^3.1.2",
+    "@types/node": "^20.14.14",
+    "@types/react": "*",
+    "@types/react-dom": "*",
+    "rimraf": "^3.0.2",
+    "tshy": "^3.0.2",
+    "tsx": "4.17.0",
+    "typescript": "^5.5.4"
+  },
+  "engines": {
+    "node": ">=18.20.0"
+  },
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "@triggerdotdev/source": "./src/index.ts",
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/index.d.ts",
+        "default": "./dist/commonjs/index.js"
+      }
+    }
+  },
+  "main": "./dist/commonjs/index.js",
+  "types": "./dist/commonjs/index.d.ts",
+  "module": "./dist/esm/index.js"
+}
diff --git a/packages/rsc/src/build.ts b/packages/rsc/src/build.ts
@@ -0,0 +1,108 @@
+import { BuildExtension } from "@trigger.dev/core/v3/build";
+import { sourceDir } from "./sourceDir.js";
+
+export function rscExtension(): BuildExtension {
+  return {
+    name: "rsc",
+    onBuildStart(context) {
+      context.addLayer({
+        id: "rsc",
+        conditions: ["react-server"],
+      });
+
+      context.config.build.conditions ??= [];
+      context.config.build.conditions.push("react-server");
+
+      context.registerPlugin({
+        name: "rsc",
+        async setup(build) {
+          const { resolvePathSync: esmResolveSync } = await import("mlly");
+
+          build.onResolve({ filter: /^react\/jsx-dev-runtime$/ }, (args) => {
+            context.logger.debug("Resolving jsx-dev-runtime", { args });
+
+            try {
+              const resolvedPath = esmResolveSync(args.path, {
+                url: sourceDir,
+                conditions: ["react-server"],
+              });
+
+              context.logger.debug("Resolved jsx-dev-runtime", { resolvedPath });
+
+              return {
+                path: resolvedPath,
+              };
+            } catch (error) {
+              context.logger.debug("Failed to resolve jsx-dev-runtime", { error });
+            }
+
+            return undefined;
+          });
+
+          build.onResolve({ filter: /^react\/jsx-runtime$/ }, (args) => {
+            context.logger.debug("Resolving jsx-runtime", { args });
+
+            try {
+              const resolvedPath = esmResolveSync(args.path, {
+                url: sourceDir,
+                conditions: ["react-server"],
+              });
+
+              context.logger.debug("Resolved jsx-runtime", { resolvedPath });
+
+              return {
+                path: resolvedPath,
+              };
+            } catch (error) {
+              context.logger.debug("Failed to resolve jsx-runtime", { error });
+            }
+
+            return undefined;
+          });
+
+          build.onResolve({ filter: /^(react|react-dom)$/ }, (args) => {
+            context.logger.debug("Resolving react", { args });
+
+            try {
+              const resolvedPath = esmResolveSync(args.path, {
+                url: sourceDir,
+                conditions: ["react-server"],
+              });
+
+              context.logger.debug("Resolved react", { resolvedPath });
+
+              return {
+                path: resolvedPath,
+              };
+            } catch (error) {
+              context.logger.debug("Failed to resolve react", { error });
+            }
+
+            return undefined;
+          });
+
+          build.onResolve({ filter: /^react-dom\/server$/ }, (args) => {
+            context.logger.debug("Resolving react-dom/server", { args });
+
+            try {
+              const resolvedPath = esmResolveSync(args.path, {
+                url: sourceDir,
+                conditions: ["worker"],
+              });
+
+              context.logger.debug("Resolved react-dom/server", { resolvedPath });
+
+              return {
+                path: resolvedPath,
+              };
+            } catch (error) {
+              context.logger.debug("Failed to resolve react-dom/server", { error });
+            }
+
+            return undefined;
+          });
+        },
+      });
+    },
+  };
+}
diff --git a/packages/rsc/src/index.ts b/packages/rsc/src/index.ts
@@ -0,0 +1 @@
+export * from "./build.js";
diff --git a/packages/rsc/src/sourceDir-cjs.cts b/packages/rsc/src/sourceDir-cjs.cts
@@ -0,0 +1,3 @@
+import { pathToFileURL } from "node:url";
+//@ts-ignore - Have to ignore because TSC thinks this is ESM
+export const sourceDir = pathToFileURL(__dirname).toString();
diff --git a/packages/rsc/src/sourceDir.ts b/packages/rsc/src/sourceDir.ts
@@ -0,0 +1,3 @@
+import { fileURLToPath } from "node:url";
+//@ts-ignore
+export const sourceDir = fileURLToPath(new URL(".", import.meta.url));
diff --git a/packages/rsc/tsconfig.json b/packages/rsc/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../.configs/tsconfig.base.json",
+  "compilerOptions": {
+    "isolatedDeclarations": false,
+    "composite": true,
+    "sourceMap": true,
+    "stripInternal": true
+  },
+  "include": ["./src/**/*.ts", "./src/**/*.tsx"]
+}
diff --git a/packages/trigger-sdk/src/v3/metadata.ts b/packages/trigger-sdk/src/v3/metadata.ts
@@ -142,7 +142,7 @@ async function flushMetadata(requestOptions?: ApiRequestOptions): Promise<void>
 
 async function stream<T>(
   key: string,
-  value: AsyncIterable<T>,
+  value: AsyncIterable<T> | ReadableStream<T>,
   signal?: AbortSignal
 ): Promise<AsyncIterable<T>> {
   return runMetadata.stream(key, value, signal);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/references/nextjs-realtime/package.json b/references/nextjs-realtime/package.json
diff --git a/references/nextjs-realtime/src/app/page.tsx b/references/nextjs-realtime/src/app/page.tsx
diff --git a/references/nextjs-realtime/src/trigger/rsc.tsx b/references/nextjs-realtime/src/trigger/rsc.tsx
diff --git a/references/nextjs-realtime/trigger.config.ts b/references/nextjs-realtime/trigger.config.ts

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,12 @@ function applyLayerToManifest(layer: BuildLayer, manifest: BuildManifest): Build`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`
	`187`	`+ if (layer.conditions) {`
	`188`	`+ $manifest.customConditions ??= [];`
	`189`	`+ $manifest.customConditions = $manifest.customConditions.concat(layer.conditions);`
	`190`	`+ $manifest.customConditions = Array.from(new Set($manifest.customConditions));`
	`191`	`+ }`
	`192`	`+`
`187`	`193`	`return $manifest;`
`188`	`194`	`}`
`189`	`195`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ export interface BuildLayer {`
`65`	`65`	`override?: boolean;`
`66`	`66`	`};`
`67`	`67`	`dependencies?: Record<string, string>;`
	`68`	`+ conditions?: string[];`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`export type PluginPlacement = "first" \| "last";`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,6 @@ export class MetadataStream<T> {`
`63`	`63`	`cancel: () => this.controller.abort(),`
`64`	`64`	`});`
`65`	`65`
`66`		`- console.log("Posting server stream to ", this.options.baseUrl);`
`67`		`-`
`68`	`66`	`return fetch(`
`69`	`67`	`${this.options.baseUrl}/realtime/v1/streams/${this.options.runId}/${this.options.key}`,
`70`	`68`	`{`