fix: mark getLoadContext as optional (#461)

* fix: mark getLoadContext as optional Signed-off-by: Logan McAnsh <logan@mcan.sh> * Create late-lions-flow.md Signed-off-by: Logan McAnsh <logan@mcan.sh> * chore: use default export Signed-off-by: Logan McAnsh <logan@mcan.sh> --------- Signed-off-by: Logan McAnsh <logan@mcan.sh>
mcansh · Nov 23, 2024 · a8559e0 · a8559e0
1 parent 96c83d1
commit a8559e0
Show file tree

Hide file tree

Showing 12 changed files with 184 additions and 334 deletions.
diff --git a/.changeset/late-lions-flow.md b/.changeset/late-lions-flow.md
@@ -0,0 +1,5 @@
+---
+"@mcansh/remix-fastify": patch
+---
+
+fix: mark getLoadContext as optional
diff --git a/examples/react-router/app/routes.ts b/examples/react-router/app/routes.ts
@@ -1,4 +1,4 @@
 import type { RouteConfig } from "@react-router/dev/routes";
 import { index } from "@react-router/dev/routes";
 
-export const routes: RouteConfig = [index("routes/home.tsx")];
+export default [index("routes/home.tsx")] satisfies RouteConfig;
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "attw": "attw ./packages/** --pack",
     "lint": "eslint --ignore-path .gitignore --no-error-on-unmatched-pattern --cache --cache-location node_modules/.cache/eslint --fix .",
     "format": "prettier --ignore-path .prettierignore --ignore-path .gitignore --ignore-unknown --cache --cache-location node_modules/.cache/prettiercache --write .",
-    "validate": "run-p lint format publint typecheck",
+    "validate": "pnpm run --parallel lint format publint typecheck",
     "typecheck": "pnpm run --recursive typecheck",
     "changeset": "changeset",
     "changeset:version": "changeset version && node ./scripts/remove-prerelease-changelogs.js && node ./scripts/post-changeset.js",
@@ -32,7 +32,6 @@
     "eslint-plugin-prefer-let": "^4.0.0",
     "glob": "^11.0.0",
     "jsonfile": "^6.1.0",
-    "npm-run-all": "^4.1.5",
     "pkg-pr-new": "^0.0.30",
     "prettier": "^3.3.3",
     "prettier-plugin-tailwindcss": "^0.6.9",

diff --git a/packages/remix-fastify/src/plugins/index.ts b/packages/remix-fastify/src/plugins/index.ts
@@ -1,13 +1,15 @@
-import type { FastifyInstance } from "fastify";
-
 import path from "node:path";
 import url from "node:url";
-import type { InlineConfig, ViteDevServer } from "vite";
-import fastifyStatic, { type FastifyStaticOptions } from "@fastify/static";
+
+import fastifyStatic from "@fastify/static";
+import type { FastifyStaticOptions } from "@fastify/static";
+import type { FastifyInstance } from "fastify";
 import { cacheHeader } from "pretty-cache-header";
-import type { GetLoadContextFunction, HttpServer } from "../shared";
+import type { InlineConfig, ViteDevServer } from "vite";
+
 import type { CreateRequestHandlerFunction as RRCreateRequestHandlerFunction } from "../servers/react-router";
 import type { CreateRequestHandlerFunction as RemixCreateRequestHandlerFunction } from "../servers/remix";
+import type { GetLoadContextFunction, HttpServer } from "../shared";
 
 export type PluginOptions<
   Server extends HttpServer = HttpServer,
@@ -39,7 +41,7 @@ export type PluginOptions<
    * You can think of this as an escape hatch that allows you to pass
    * environment/platform-specific values through to your loader/action.
    */
-  getLoadContext: GetLoadContextFunction<Server, AppLoadContext>;
+  getLoadContext?: GetLoadContextFunction<Server, AppLoadContext>;
   mode?: string;
   /**
    * Options to pass to the Vite server in development.

diff --git a/packages/remix-fastify/src/plugins/react-router.ts b/packages/remix-fastify/src/plugins/react-router.ts
@@ -1,9 +1,11 @@
 import fp from "fastify-plugin";
-
-import type { HttpServer } from "../shared";
 import type { AppLoadContext, ServerBuild } from "react-router";
+
 import { createReactRouterRequestHandler } from "../servers/react-router";
-import { createPlugin, type PluginOptions } from ".";
+import type { HttpServer } from "../shared";
+
+import { createPlugin } from ".";
+import type { PluginOptions } from ".";
 
 export type ReactRouterFastifyOptions = Omit<
   PluginOptions<HttpServer, AppLoadContext, ServerBuild>,

diff --git a/packages/remix-fastify/src/plugins/remix.ts b/packages/remix-fastify/src/plugins/remix.ts
@@ -1,9 +1,11 @@
-import fp from "fastify-plugin";
 import type { AppLoadContext, ServerBuild } from "@remix-run/node";
+import fp from "fastify-plugin";
 
 import { createRemixRequestHandler } from "../servers/remix";
 import type { HttpServer } from "../shared";
-import { createPlugin, type PluginOptions } from ".";
+
+import { createPlugin } from ".";
+import type { PluginOptions } from ".";
 
 export type RemixFastifyOptions = Omit<
   PluginOptions<HttpServer, AppLoadContext, ServerBuild>,

diff --git a/packages/remix-fastify/src/react-router.ts b/packages/remix-fastify/src/react-router.ts
@@ -1,4 +1,5 @@
 import type { AppLoadContext } from "react-router";
+
 import type {
   HttpServer,
   GetLoadContextFunction as SharedGetLoadContextFunction,

diff --git a/packages/remix-fastify/src/remix.ts b/packages/remix-fastify/src/remix.ts
@@ -1,4 +1,5 @@
 import type { AppLoadContext } from "@remix-run/node";
+
 import type {
   HttpServer,
   GetLoadContextFunction as SharedGetLoadContextFunction,

diff --git a/packages/remix-fastify/src/servers/react-router.ts b/packages/remix-fastify/src/servers/react-router.ts
@@ -1,11 +1,12 @@
+import { createReadableStreamFromReadable } from "@react-router/node";
 import type {
   FastifyRequest,
   FastifyReply,
   RouteGenericInterface,
 } from "fastify";
 import type { AppLoadContext, ServerBuild } from "react-router";
 import { createRequestHandler } from "react-router";
-import { createReadableStreamFromReadable } from "@react-router/node";
+
 import { createRequest, sendResponse } from "../shared";
 import type {
   GetLoadContextFunction as GenericGetLoadContextFunction,

diff --git a/packages/remix-fastify/src/servers/remix.ts b/packages/remix-fastify/src/servers/remix.ts
@@ -1,13 +1,14 @@
-import type {
-  FastifyRequest,
-  FastifyReply,
-  RouteGenericInterface,
-} from "fastify";
 import type { AppLoadContext, ServerBuild } from "@remix-run/node";
 import {
   createRequestHandler,
   createReadableStreamFromReadable,
 } from "@remix-run/node";
+import type {
+  FastifyRequest,
+  FastifyReply,
+  RouteGenericInterface,
+} from "fastify";
+
 import { createRequest, sendResponse } from "../shared";
 import type {
   GetLoadContextFunction as GenericGetLoadContextFunction,

diff --git a/packages/remix-fastify/src/shared.ts b/packages/remix-fastify/src/shared.ts
@@ -1,16 +1,17 @@
-import { Readable } from "node:stream";
 import type * as http from "node:http";
 import type * as http2 from "node:http2";
 import type * as https from "node:https";
+import { Readable } from "node:stream";
+
+import type { createReadableStreamFromReadable as RRCreateReadableStreamFromReadable } from "@react-router/node";
+import type { createReadableStreamFromReadable as RemixCreateReadableStreamFromReadable } from "@remix-run/node";
 import type {
   FastifyReply,
   FastifyRequest,
   RawReplyDefaultExpression,
   RawRequestDefaultExpression,
   RouteGenericInterface,
 } from "fastify";
-import type { createReadableStreamFromReadable as RRCreateReadableStreamFromReadable } from "@react-router/node";
-import type { createReadableStreamFromReadable as RemixCreateReadableStreamFromReadable } from "@remix-run/node";
 
 export type HttpServer =
   | http.Server