@remix-run/server-runtime - npm Package Compare versions

Comparing version 1.3.2 to 1.3.3-pre.0

cookies.d.ts

 import type { CookieParseOptions, CookieSerializeOptions } from "cookie";
-import "./cookieSigning";
+import type { SignFunction, UnsignFunction } from "./crypto";
 export type { CookieParseOptions, CookieSerializeOptions };
@@ -53,2 +53,3 @@ export interface CookieSignatureOptions {
 }
+export declare type CreateCookieFunction = (name: string, cookieOptions?: CookieOptions) => Cookie;
 /**
@@ -59,3 +60,7 @@ * Creates a logical container for managing a browser cookie from the server.
  */
-export declare function createCookie(name: string, cookieOptions?: CookieOptions): Cookie;
+export declare const createCookieFactory: ({ sign, unsign, }: {
+    sign: SignFunction;
+    unsign: UnsignFunction;
+}) => CreateCookieFunction;
+export declare type IsCookieFunction = (object: any) => object is Cookie;
 /**
@@ -66,2 +71,2 @@ * Returns true if an object is a Remix cookie container.
  */
-export declare function isCookie(object: any): object is Cookie;
+export declare const isCookie: IsCookieFunction;

cookies.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -22,3 +22,6 @@ * Copyright (c) Remix Software Inc.
  */
-function createCookie(name, cookieOptions = {}) {
+const createCookieFactory = ({
+  sign,
+  unsign
+}) => (name, cookieOptions = {}) => {
   let {
@@ -51,7 +54,7 @@ secrets,
       });
-      return name in cookies ? cookies[name] === "" ? "" : await decodeCookieValue(cookies[name], secrets) : null;
+      return name in cookies ? cookies[name] === "" ? "" : await decodeCookieValue(unsign, cookies[name], secrets) : null;
     },
 
     async serialize(value, serializeOptions) {
-      return cookie.serialize(name, value === "" ? "" : await encodeCookieValue(value, secrets), { ...options,
+      return cookie.serialize(name, value === "" ? "" : await encodeCookieValue(sign, value, secrets), { ...options,
         ...serializeOptions
@@ -62,3 +65,4 @@ });
   };
-}
+};
+
 /**
@@ -69,8 +73,7 @@ * Returns true if an object is a Remix cookie container.
  */
-
-function isCookie(object) {
+const isCookie = object => {
   return object != null && typeof object.name === "string" && typeof object.isSigned === "boolean" && typeof object.parse === "function" && typeof object.serialize === "function";
-}
+};
 
-async function encodeCookieValue(value, secrets) {
+async function encodeCookieValue(sign, value, secrets) {
   let encoded = encodeData(value);
@@ -85,3 +88,3 @@
 
-async function decodeCookieValue(value, secrets) {
+async function decodeCookieValue(unsign, value, secrets) {
   if (secrets.length > 0) {
@@ -114,3 +117,3 @@ for (let secret of secrets) {
 
-exports.createCookie = createCookie;
+exports.createCookieFactory = createCookieFactory;
 exports.isCookie = isCookie;

data.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -30,3 +30,7 @@ * Copyright (c) Remix Software Inc.
   if (!action) {
-    throw new Error(`You made a ${request.method} request to ${request.url} but did not provide ` + `an \`action\` for route "${match.route.id}", so there is no way to handle the ` + `request.`);
+    let response = new Response(null, {
+      status: 405
+    });
+    response.headers.set("X-Remix-Catch", "yes");
+    return response;
   }
@@ -33,0 +37,0 @@

entry.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

errors.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

esm/cookies.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -18,3 +18,6 @@ * Copyright (c) Remix Software Inc.
  */
-function createCookie(name, cookieOptions = {}) {
+const createCookieFactory = ({
+  sign,
+  unsign
+}) => (name, cookieOptions = {}) => {
   let {
@@ -47,7 +50,7 @@ secrets,
       });
-      return name in cookies ? cookies[name] === "" ? "" : await decodeCookieValue(cookies[name], secrets) : null;
+      return name in cookies ? cookies[name] === "" ? "" : await decodeCookieValue(unsign, cookies[name], secrets) : null;
     },
 
     async serialize(value, serializeOptions) {
-      return serialize(name, value === "" ? "" : await encodeCookieValue(value, secrets), { ...options,
+      return serialize(name, value === "" ? "" : await encodeCookieValue(sign, value, secrets), { ...options,
         ...serializeOptions
@@ -58,3 +61,4 @@ });
   };
-}
+};
+
 /**
@@ -65,8 +69,7 @@ * Returns true if an object is a Remix cookie container.
  */
-
-function isCookie(object) {
+const isCookie = object => {
   return object != null && typeof object.name === "string" && typeof object.isSigned === "boolean" && typeof object.parse === "function" && typeof object.serialize === "function";
-}
+};
 
-async function encodeCookieValue(value, secrets) {
+async function encodeCookieValue(sign, value, secrets) {
   let encoded = encodeData(value);
@@ -81,3 +84,3 @@
 
-async function decodeCookieValue(value, secrets) {
+async function decodeCookieValue(unsign, value, secrets) {
   if (secrets.length > 0) {
@@ -110,2 +113,2 @@ for (let secret of secrets) {
 
-export { createCookie, isCookie };
+export { createCookieFactory, isCookie };

esm/data.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -26,3 +26,7 @@ * Copyright (c) Remix Software Inc.
   if (!action) {
-    throw new Error(`You made a ${request.method} request to ${request.url} but did not provide ` + `an \`action\` for route "${match.route.id}", so there is no way to handle the ` + `request.`);
+    let response = new Response(null, {
+      status: 405
+    });
+    response.headers.set("X-Remix-Catch", "yes");
+    return response;
   }
@@ -29,0 +33,0 @@

esm/entry.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

esm/errors.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

esm/headers.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

esm/index.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -11,7 +11,7 @@ * Copyright (c) Remix Software Inc.
  */
-export { createCookie, isCookie } from './cookies.js';
+export { createCookieFactory, isCookie } from './cookies.js';
 export { json, redirect } from './responses.js';
 export { createRequestHandler } from './server.js';
-export { createSession, createSessionStorage, isSession } from './sessions.js';
-export { createCookieSessionStorage } from './sessions/cookieStorage.js';
-export { createMemorySessionStorage } from './sessions/memoryStorage.js';
+export { createSession, createSessionStorageFactory, isSession } from './sessions.js';
+export { createCookieSessionStorageFactory } from './sessions/cookieStorage.js';
+export { createMemorySessionStorageFactory } from './sessions/memoryStorage.js';

esm/mode.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

esm/responses.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -17,3 +17,3 @@ * Copyright (c) Remix Software Inc.
  */
-function json(data, init = {}) {
+const json = (data, init = {}) => {
   let responseInit = init;
@@ -36,3 +36,4 @@
   });
-}
+};
+
 /**
@@ -44,4 +45,3 @@ * A redirect response. Sets the status code and the `Location` header.
  */
-
-function redirect(url, init = 302) {
+const redirect = (url, init = 302) => {
   let responseInit = init;
@@ -62,3 +62,3 @@
   });
-}
+};
 function isResponse(value) {
@@ -65,0 +65,0 @@ return value != null && typeof value.status === "number" && typeof value.statusText === "string" && typeof value.headers === "object" && typeof value.body !== "undefined";

esm/routeMatching.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

esm/routes.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

esm/server.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -15,4 +15,4 @@ * Copyright (c) Remix Software Inc.
 import { getDocumentHeaders } from './headers.js';
+import { isServerMode, ServerMode } from './mode.js';
 import { matchServerRoutes } from './routeMatching.js';
-import { isServerMode, ServerMode } from './mode.js';
 import { createRoutes } from './routes.js';
@@ -22,12 +22,3 @@ import { isRedirectResponse, isCatchResponse, json } from './responses.js';
 
-/**
- * The main request handler for a Remix server. This handler runs in the context
- * of a cloud provider's server (e.g. Express on Firebase) or locally via their
- * dev tools.
- */
-
-/**
- * Creates a function that serves HTTP requests.
- */
-function createRequestHandler(build, platform, mode) {
+const createRequestHandler = (build, mode) => {
   let routes = createRoutes(build.routes);
@@ -38,35 +29,28 @@ let serverMode = isServerMode(mode) ? mode : ServerMode.Production;
     let matches = matchServerRoutes(routes, url.pathname);
-    let requestType = getRequestType(url, matches);
     let response;
 
-    switch (requestType) {
-      case "data":
-        response = await handleDataRequest({
-          request,
-          loadContext,
-          matches: matches,
-          handleDataRequest: build.entry.module.handleDataRequest,
-          serverMode
-        });
-        break;
-
-      case "document":
-        response = await renderDocumentRequest({
-          build,
-          loadContext,
-          matches,
-          request,
-          routes,
-          serverMode
-        });
-        break;
-
-      case "resource":
-        response = await handleResourceRequest({
-          request,
-          loadContext,
-          matches: matches,
-          serverMode
-        });
-        break;
+    if (url.searchParams.has("_data")) {
+      response = await handleDataRequest({
+        request,
+        loadContext,
+        matches: matches,
+        handleDataRequest: build.entry.module.handleDataRequest,
+        serverMode
+      });
+    } else if (matches && !matches[matches.length - 1].route.module.default) {
+      response = await handleResourceRequest({
+        request,
+        loadContext,
+        matches,
+        serverMode
+      });
+    } else {
+      response = await handleDocumentRequest({
+        build,
+        loadContext,
+        matches,
+        request,
+        routes,
+        serverMode
+      });
     }
@@ -84,3 +68,3 @@
   };
-}
+};
 
@@ -143,2 +127,7 @@ async function handleDataRequest({
       headers.delete("Location");
+
+      if (response.headers.get("Set-Cookie") !== null) {
+        headers.set("X-Remix-Revalidate", "yes");
+      }
+
       return new Response(null, {
@@ -172,3 +161,3 @@ status: 204,
 
-async function renderDocumentRequest({
+async function handleDocumentRequest({
   build,
@@ -284,3 +273,3 @@ loadContext,
   let actionCatchBoundaryRouteId = appState.catchBoundaryRouteId;
-  let actionLoaderBoundaryRouteId = appState.loaderBoundaryRouteId; // Reset the app error and catch state to propogate the loader states
+  let actionLoaderBoundaryRouteId = appState.loaderBoundaryRouteId; // Reset the app error and catch state to propagate the loader states
   // from the results into the app state.
@@ -487,20 +476,2 @@
 
-function getRequestType(url, matches) {
-  if (url.searchParams.has("_data")) {
-    return "data";
-  }
-
-  if (!matches) {
-    return "document";
-  }
-
-  let match = matches.slice(-1)[0];
-
-  if (!match.route.module.default) {
-    return "resource";
-  }
-
-  return "document";
-}
-
 function isActionRequest(request) {
@@ -507,0 +478,0 @@ let method = request.method.toLowerCase();

esm/serverHandoff.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

esm/sessions.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -11,3 +11,3 @@ * Copyright (c) Remix Software Inc.
  */
-import { isCookie, createCookie } from './cookies.js';
+import { isCookie } from './cookies.js';
 import { warnOnce } from './warnings.js';
@@ -22,2 +22,3 @@
 }
+
 /**
@@ -31,5 +32,3 @@ * Creates a new Session object.
  */
-
-
-function createSession(initialData = {}, id = "") {
+const createSession = (initialData = {}, id = "") => {
   let map = new Map(Object.entries(initialData));
@@ -75,3 +74,4 @@ return {
   };
-}
+};
+
 /**
@@ -82,6 +82,5 @@ * Returns true if an object is a Remix session.
  */
-
-function isSession(object) {
+const isSession = object => {
   return object != null && typeof object.id === "string" && typeof object.data !== "undefined" && typeof object.has === "function" && typeof object.get === "function" && typeof object.set === "function" && typeof object.flash === "function" && typeof object.unset === "function";
-}
+};
 /**
@@ -103,3 +102,3 @@ * SessionStorage stores session data between HTTP requests and knows how to
  */
-function createSessionStorage({
+const createSessionStorageFactory = createCookie => ({
   cookie: cookieArg,
@@ -110,3 +109,3 @@ createData,
   deleteData
-}) {
+}) => {
   let cookie = isCookie(cookieArg) ? cookieArg : createCookie((cookieArg === null || cookieArg === void 0 ? void 0 : cookieArg.name) || "__session", cookieArg);
@@ -144,3 +143,3 @@ warnOnceAboutSigningSessionCookie(cookie);
   };
-}
+};
 function warnOnceAboutSigningSessionCookie(cookie) {
@@ -150,2 +149,2 @@ warnOnce(cookie.isSigned, `The "${cookie.name}" cookie is not signed, but session cookies should be ` + `signed to prevent tampering on the client before they are sent back to the ` + `server. See https://remix.run/api/remix#signing-cookies ` + `for more information.`);
 
-export { createSession, createSessionStorage, isSession, warnOnceAboutSigningSessionCookie };
+export { createSession, createSessionStorageFactory, isSession, warnOnceAboutSigningSessionCookie };

esm/sessions/cookieStorage.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -11,3 +11,3 @@ * Copyright (c) Remix Software Inc.
  */
-import { isCookie, createCookie } from '../cookies.js';
+import { isCookie } from '../cookies.js';
 import { warnOnceAboutSigningSessionCookie, createSession } from '../sessions.js';
@@ -26,5 +26,5 @@
  */
-function createCookieSessionStorage({
+const createCookieSessionStorageFactory = createCookie => ({
   cookie: cookieArg
-} = {}) {
+} = {}) => {
   let cookie = isCookie(cookieArg) ? cookieArg : createCookie((cookieArg === null || cookieArg === void 0 ? void 0 : cookieArg.name) || "__session", cookieArg);
@@ -48,4 +48,4 @@ warnOnceAboutSigningSessionCookie(cookie);
   };
-}
+};
 
-export { createCookieSessionStorage };
+export { createCookieSessionStorageFactory };

esm/sessions/memoryStorage.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -11,4 +11,2 @@ * Copyright (c) Remix Software Inc.
  */
-import { createSessionStorage } from '../sessions.js';
-
 /**
@@ -23,5 +21,5 @@ * Creates and returns a simple in-memory SessionStorage object, mostly useful
  */
-function createMemorySessionStorage({
+const createMemorySessionStorageFactory = createSessionStorage => ({
   cookie
-} = {}) {
+} = {}) => {
   let uniqueId = 0;
@@ -71,4 +69,4 @@ let map = new Map();
   });
-}
+};
 
-export { createMemorySessionStorage };
+export { createMemorySessionStorageFactory };

esm/warnings.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

headers.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

index.d.ts

@@ -1,15 +0,8 @@
-export type { ServerBuild, ServerEntryModule, HandleDataRequestFunction, HandleDocumentRequestFunction, } from "./build";
-export type { CookieParseOptions, CookieSerializeOptions, CookieSignatureOptions, CookieOptions, Cookie, } from "./cookies";
-export { createCookie, isCookie } from "./cookies";
-export type { AppLoadContext, AppData } from "./data";
-export type { EntryContext } from "./entry";
-export type { LinkDescriptor, HtmlLinkDescriptor, PageLinkDescriptor, } from "./links";
-export type { ServerPlatform } from "./platform";
-export type { ActionFunction, DataFunctionArgs, ErrorBoundaryComponent, HeadersFunction, HtmlMetaDescriptor, LinksFunction, LoaderFunction, MetaDescriptor, MetaFunction, RouteComponent, RouteHandle, } from "./routeModules";
+export { createCookieFactory, isCookie } from "./cookies";
 export { json, redirect } from "./responses";
-export type { RequestHandler } from "./server";
 export { createRequestHandler } from "./server";
-export type { SessionData, Session, SessionStorage, SessionIdStorageStrategy, } from "./sessions";
-export { createSession, isSession, createSessionStorage } from "./sessions";
-export { createCookieSessionStorage } from "./sessions/cookieStorage";
-export { createMemorySessionStorage } from "./sessions/memoryStorage";
+export { createSession, isSession, createSessionStorageFactory, } from "./sessions";
+export { createCookieSessionStorageFactory } from "./sessions/cookieStorage";
+export { createMemorySessionStorageFactory } from "./sessions/memoryStorage";
+export type { CreateCookieFunction, CreateCookieSessionStorageFunction, CreateMemorySessionStorageFunction, CreateRequestHandlerFunction, CreateSessionFunction, CreateSessionStorageFunction, IsCookieFunction, IsSessionFunction, JsonFunction, RedirectFunction, } from "./interface";
+export type { ActionFunction, AppData, AppLoadContext, Cookie, CookieOptions, CookieParseOptions, CookieSerializeOptions, CookieSignatureOptions, DataFunctionArgs, EntryContext, ErrorBoundaryComponent, HandleDataRequestFunction, HandleDocumentRequestFunction, HeadersFunction, HtmlLinkDescriptor, HtmlMetaDescriptor, LinkDescriptor, LinksFunction, LoaderFunction, MetaDescriptor, MetaFunction, PageLinkDescriptor, RequestHandler, RouteComponent, RouteHandle, ServerBuild, ServerEntryModule, Session, SessionData, SessionIdStorageStrategy, SessionStorage, SignFunction, UnsignFunction, } from "./reexport";

index.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -24,3 +24,3 @@ * Copyright (c) Remix Software Inc.
 
-exports.createCookie = cookies.createCookie;
+exports.createCookieFactory = cookies.createCookieFactory;
 exports.isCookie = cookies.isCookie;
@@ -31,5 +31,5 @@ exports.json = responses.json;
 exports.createSession = sessions.createSession;
-exports.createSessionStorage = sessions.createSessionStorage;
+exports.createSessionStorageFactory = sessions.createSessionStorageFactory;
 exports.isSession = sessions.isSession;
-exports.createCookieSessionStorage = cookieStorage.createCookieSessionStorage;
-exports.createMemorySessionStorage = memoryStorage.createMemorySessionStorage;
+exports.createCookieSessionStorageFactory = cookieStorage.createCookieSessionStorageFactory;
+exports.createMemorySessionStorageFactory = memoryStorage.createMemorySessionStorageFactory;

magicExports/esm/remix.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -11,2 +11,2 @@ * Copyright (c) Remix Software Inc.
  */
-export { createCookie, createCookieSessionStorage, createMemorySessionStorage, createSession, createSessionStorage, isCookie, isSession, json, redirect } from '@remix-run/server-runtime';
+export { createSession, isCookie, isSession, json, redirect } from '@remix-run/server-runtime';

magicExports/remix.d.ts

 export type { ServerBuild, ServerEntryModule, HandleDataRequestFunction, HandleDocumentRequestFunction, CookieParseOptions, CookieSerializeOptions, CookieSignatureOptions, CookieOptions, Cookie, AppLoadContext, AppData, EntryContext, LinkDescriptor, HtmlLinkDescriptor, PageLinkDescriptor, ErrorBoundaryComponent, ActionFunction, HeadersFunction, LinksFunction, LoaderFunction, MetaDescriptor, HtmlMetaDescriptor, MetaFunction, RouteComponent, RouteHandle, RequestHandler, SessionData, Session, SessionStorage, SessionIdStorageStrategy, } from "@remix-run/server-runtime";
-export { createCookie, isCookie, createSession, isSession, createSessionStorage, createCookieSessionStorage, createMemorySessionStorage, json, redirect, } from "@remix-run/server-runtime";
+export { isCookie, createSession, isSession, json, redirect, } from "@remix-run/server-runtime";

magicExports/remix.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -19,14 +19,2 @@ * Copyright (c) Remix Software Inc.
 
-Object.defineProperty(exports, 'createCookie', {
-  enumerable: true,
-  get: function () { return serverRuntime.createCookie; }
-});
-Object.defineProperty(exports, 'createCookieSessionStorage', {
-  enumerable: true,
-  get: function () { return serverRuntime.createCookieSessionStorage; }
-});
-Object.defineProperty(exports, 'createMemorySessionStorage', {
-  enumerable: true,
-  get: function () { return serverRuntime.createMemorySessionStorage; }
-});
 Object.defineProperty(exports, 'createSession', {
@@ -36,6 +24,2 @@ enumerable: true,
 });
-Object.defineProperty(exports, 'createSessionStorage', {
-  enumerable: true,
-  get: function () { return serverRuntime.createSessionStorage; }
-});
 Object.defineProperty(exports, 'isCookie', {
@@ -42,0 +26,0 @@ enumerable: true,

mode.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

package.json

 {
   "name": "@remix-run/server-runtime",
   "description": "Server runtime for Remix",
-  "version": "1.3.2",
+  "version": "1.3.3-pre.0",
   "license": "MIT",
@@ -6,0 +6,0 @@ "main": "./index.js",

README.md

@@ -1,13 +0,26 @@
-# Welcome to Remix!
+# @remix-run/server-runtime
 
-[Remix](https://remix.run) is a web framework that helps you build better websites with React.
+[Remix](https://remix.run) supports multiple server runtimes:
 
-To get started, open a new shell and run:
+- [Node](https://nodejs.org/en/)
+- [Cloudflare](https://developers.cloudflare.com/workers/learning/how-workers-works/)
+- [Deno](https://deno.land/) (Experimental 🧪)
 
-```sh
-npx create-remix@latest
-```
+Support for each runtime is provided by a corresponding Remix package:
 
-Then follow the prompts you see in your terminal.
+- [`@remix-run/node`](https://github.com/remix-run/remix/tree/main/packages/remix-node)
+- [`@remix-run/cloudflare`](https://github.com/remix-run/remix/tree/main/packages/remix-cloudflare)
+- [`remix-deno`](https://github.com/remix-run/remix/tree/main/templates/deno-ts/remix-deno) (will be renamed to `@remix-run/deno` when Deno support is stable)
 
-For more information about Remix, [visit remix.run](https://remix.run)!
+This package defines a "Remix server runtime interface" that each runtime package must conform to.
+
+Each Remix server runtime package MUST:
+
+- Implement and export values for each type in [`interface.ts`](./interface.ts)
+- Re-export types in [`reexport.ts`](./reexport.ts)
+
+Each Remix server runtime package MAY:
+
+- Re-export the [default implementations](./index.ts) as its implementations
+- Export custom implementations adhering to the [interface types](./interface.ts)
+- Provide additional exports relevant for that runtime

responses.d.ts

@@ -0,1 +1,2 @@
+export declare type JsonFunction = <Data>(data: Data, init?: number | ResponseInit) => Response;
 /**
@@ -7,3 +8,4 @@ * This is a shortcut for creating `application/json` responses. Converts `data`
  */
-export declare function json<Data>(data: Data, init?: number | ResponseInit): Response;
+export declare const json: JsonFunction;
+export declare type RedirectFunction = (url: string, init?: number | ResponseInit) => Response;
 /**
@@ -15,3 +17,3 @@ * A redirect response. Sets the status code and the `Location` header.
  */
-export declare function redirect(url: string, init?: number | ResponseInit): Response;
+export declare const redirect: RedirectFunction;
 export declare function isResponse(value: any): value is Response;
@@ -18,0 +20,0 @@ export declare function isRedirectResponse(response: Response): boolean;

responses.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -21,3 +21,3 @@ * Copyright (c) Remix Software Inc.
  */
-function json(data, init = {}) {
+const json = (data, init = {}) => {
   let responseInit = init;
@@ -40,3 +40,4 @@
   });
-}
+};
+
 /**
@@ -48,4 +49,3 @@ * A redirect response. Sets the status code and the `Location` header.
  */
-
-function redirect(url, init = 302) {
+const redirect = (url, init = 302) => {
   let responseInit = init;
@@ -66,3 +66,3 @@
   });
-}
+};
 function isResponse(value) {
@@ -69,0 +69,0 @@ return value != null && typeof value.status === "number" && typeof value.statusText === "string" && typeof value.headers === "object" && typeof value.body !== "undefined";

routeMatching.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

routeModules.d.ts

@@ -78,3 +78,3 @@ import type { Location } from "history";
 export interface HtmlMetaDescriptor {
-    [name: string]: string | string[];
+    [name: string]: string | string[] | null | undefined;
 }
@@ -81,0 +81,0 @@ export declare type MetaDescriptor = HtmlMetaDescriptor;

routes.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

server.d.ts

 import type { AppLoadContext } from "./data";
 import type { ServerBuild } from "./build";
-import type { ServerPlatform } from "./platform";
-/**
- * The main request handler for a Remix server. This handler runs in the context
- * of a cloud provider's server (e.g. Express on Firebase) or locally via their
- * dev tools.
- */
-export interface RequestHandler {
-    (request: Request, loadContext?: AppLoadContext): Promise<Response>;
-}
-/**
- * Creates a function that serves HTTP requests.
- */
-export declare function createRequestHandler(build: ServerBuild, platform: ServerPlatform, mode?: string): RequestHandler;
+export declare type RequestHandler = (request: Request, loadContext?: AppLoadContext) => Promise<Response>;
+export declare type CreateRequestHandlerFunction = (build: ServerBuild, mode?: string) => RequestHandler;
+export declare const createRequestHandler: CreateRequestHandlerFunction;

server.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -19,4 +19,4 @@ * Copyright (c) Remix Software Inc.
 var headers = require('./headers.js');
+var mode = require('./mode.js');
 var routeMatching = require('./routeMatching.js');
-var mode = require('./mode.js');
 var routes = require('./routes.js');
@@ -26,12 +26,3 @@ var responses = require('./responses.js');
 
-/**
- * The main request handler for a Remix server. This handler runs in the context
- * of a cloud provider's server (e.g. Express on Firebase) or locally via their
- * dev tools.
- */
-
-/**
- * Creates a function that serves HTTP requests.
- */
-function createRequestHandler(build, platform, mode$1) {
+const createRequestHandler = (build, mode$1) => {
   let routes$1 = routes.createRoutes(build.routes);
@@ -42,35 +33,28 @@ let serverMode = mode.isServerMode(mode$1) ? mode$1 : mode.ServerMode.Production;
     let matches = routeMatching.matchServerRoutes(routes$1, url.pathname);
-    let requestType = getRequestType(url, matches);
     let response;
 
-    switch (requestType) {
-      case "data":
-        response = await handleDataRequest({
-          request,
-          loadContext,
-          matches: matches,
-          handleDataRequest: build.entry.module.handleDataRequest,
-          serverMode
-        });
-        break;
-
-      case "document":
-        response = await renderDocumentRequest({
-          build,
-          loadContext,
-          matches,
-          request,
-          routes: routes$1,
-          serverMode
-        });
-        break;
-
-      case "resource":
-        response = await handleResourceRequest({
-          request,
-          loadContext,
-          matches: matches,
-          serverMode
-        });
-        break;
+    if (url.searchParams.has("_data")) {
+      response = await handleDataRequest({
+        request,
+        loadContext,
+        matches: matches,
+        handleDataRequest: build.entry.module.handleDataRequest,
+        serverMode
+      });
+    } else if (matches && !matches[matches.length - 1].route.module.default) {
+      response = await handleResourceRequest({
+        request,
+        loadContext,
+        matches,
+        serverMode
+      });
+    } else {
+      response = await handleDocumentRequest({
+        build,
+        loadContext,
+        matches,
+        request,
+        routes: routes$1,
+        serverMode
+      });
     }
@@ -88,3 +72,3 @@
   };
-}
+};
 
@@ -147,2 +131,7 @@ async function handleDataRequest({
       headers.delete("Location");
+
+      if (response.headers.get("Set-Cookie") !== null) {
+        headers.set("X-Remix-Revalidate", "yes");
+      }
+
       return new Response(null, {
@@ -176,3 +165,3 @@ status: 204,
 
-async function renderDocumentRequest({
+async function handleDocumentRequest({
   build,
@@ -288,3 +277,3 @@ loadContext,
   let actionCatchBoundaryRouteId = appState.catchBoundaryRouteId;
-  let actionLoaderBoundaryRouteId = appState.loaderBoundaryRouteId; // Reset the app error and catch state to propogate the loader states
+  let actionLoaderBoundaryRouteId = appState.loaderBoundaryRouteId; // Reset the app error and catch state to propagate the loader states
   // from the results into the app state.
@@ -491,20 +480,2 @@
 
-function getRequestType(url, matches) {
-  if (url.searchParams.has("_data")) {
-    return "data";
-  }
-
-  if (!matches) {
-    return "document";
-  }
-
-  let match = matches.slice(-1)[0];
-
-  if (!match.route.module.default) {
-    return "resource";
-  }
-
-  return "document";
-}
-
 function isActionRequest(request) {
@@ -511,0 +482,0 @@ let method = request.method.toLowerCase();

serverHandoff.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

sessions.d.ts

 import type { CookieParseOptions, CookieSerializeOptions } from "cookie";
-import type { Cookie, CookieOptions } from "./cookies";
+import type { Cookie, CookieOptions, CreateCookieFunction } from "./cookies";
 /**
@@ -52,2 +52,3 @@ * An object of name/value pairs to be used in the session.
 }
+export declare type CreateSessionFunction = (initialData?: SessionData, id?: string) => Session;
 /**
@@ -61,3 +62,4 @@ * Creates a new Session object.
  */
-export declare function createSession(initialData?: SessionData, id?: string): Session;
+export declare const createSession: CreateSessionFunction;
+export declare type IsSessionFunction = (object: any) => object is Session;
 /**
@@ -68,3 +70,3 @@ * Returns true if an object is a Remix session.
  */
-export declare function isSession(object: any): object is Session;
+export declare const isSession: IsSessionFunction;
 /**
@@ -129,2 +131,3 @@ * SessionStorage stores session data between HTTP requests and knows how to
 }
+export declare type CreateSessionStorageFunction = (strategy: SessionIdStorageStrategy) => SessionStorage;
 /**
@@ -138,3 +141,3 @@ * Creates a SessionStorage object using a SessionIdStorageStrategy.
  */
-export declare function createSessionStorage({ cookie: cookieArg, createData, readData, updateData, deleteData, }: SessionIdStorageStrategy): SessionStorage;
+export declare const createSessionStorageFactory: (createCookie: CreateCookieFunction) => CreateSessionStorageFunction;
 export declare function warnOnceAboutSigningSessionCookie(cookie: Cookie): void;

sessions.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -25,2 +25,3 @@ * Copyright (c) Remix Software Inc.
 }
+
 /**
@@ -34,5 +35,3 @@ * Creates a new Session object.
  */
-
-
-function createSession(initialData = {}, id = "") {
+const createSession = (initialData = {}, id = "") => {
   let map = new Map(Object.entries(initialData));
@@ -78,3 +77,4 @@ return {
   };
-}
+};
+
 /**
@@ -85,6 +85,5 @@ * Returns true if an object is a Remix session.
  */
-
-function isSession(object) {
+const isSession = object => {
   return object != null && typeof object.id === "string" && typeof object.data !== "undefined" && typeof object.has === "function" && typeof object.get === "function" && typeof object.set === "function" && typeof object.flash === "function" && typeof object.unset === "function";
-}
+};
 /**
@@ -106,3 +105,3 @@ * SessionStorage stores session data between HTTP requests and knows how to
  */
-function createSessionStorage({
+const createSessionStorageFactory = createCookie => ({
   cookie: cookieArg,
@@ -113,4 +112,4 @@ createData,
   deleteData
-}) {
-  let cookie = cookies.isCookie(cookieArg) ? cookieArg : cookies.createCookie((cookieArg === null || cookieArg === void 0 ? void 0 : cookieArg.name) || "__session", cookieArg);
+}) => {
+  let cookie = cookies.isCookie(cookieArg) ? cookieArg : createCookie((cookieArg === null || cookieArg === void 0 ? void 0 : cookieArg.name) || "__session", cookieArg);
   warnOnceAboutSigningSessionCookie(cookie);
@@ -147,3 +146,3 @@ return {
   };
-}
+};
 function warnOnceAboutSigningSessionCookie(cookie) {
@@ -154,4 +153,4 @@ warnings.warnOnce(cookie.isSigned, `The "${cookie.name}" cookie is not signed, but session cookies should be ` + `signed to prevent tampering on the client before they are sent back to the ` + `server. See https://remix.run/api/remix#signing-cookies ` + `for more information.`);
 exports.createSession = createSession;
-exports.createSessionStorage = createSessionStorage;
+exports.createSessionStorageFactory = createSessionStorageFactory;
 exports.isSession = isSession;
 exports.warnOnceAboutSigningSessionCookie = warnOnceAboutSigningSessionCookie;

sessions/cookieStorage.d.ts

@@ -0,1 +1,2 @@
+import type { CreateCookieFunction } from "../cookies";
 import type { SessionStorage, SessionIdStorageStrategy } from "../sessions";
@@ -9,2 +10,3 @@ interface CookieSessionStorageOptions {
 }
+export declare type CreateCookieSessionStorageFunction = (options?: CookieSessionStorageOptions) => SessionStorage;
 /**
@@ -21,3 +23,3 @@ * Creates and returns a SessionStorage object that stores all session data
  */
-export declare function createCookieSessionStorage({ cookie: cookieArg, }?: CookieSessionStorageOptions): SessionStorage;
+export declare const createCookieSessionStorageFactory: (createCookie: CreateCookieFunction) => CreateCookieSessionStorageFunction;
 export {};

sessions/cookieStorage.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -29,6 +29,6 @@ * Copyright (c) Remix Software Inc.
  */
-function createCookieSessionStorage({
+const createCookieSessionStorageFactory = createCookie => ({
   cookie: cookieArg
-} = {}) {
-  let cookie = cookies.isCookie(cookieArg) ? cookieArg : cookies.createCookie((cookieArg === null || cookieArg === void 0 ? void 0 : cookieArg.name) || "__session", cookieArg);
+} = {}) => {
+  let cookie = cookies.isCookie(cookieArg) ? cookieArg : createCookie((cookieArg === null || cookieArg === void 0 ? void 0 : cookieArg.name) || "__session", cookieArg);
   sessions.warnOnceAboutSigningSessionCookie(cookie);
@@ -51,4 +51,4 @@ return {
   };
-}
+};
 
-exports.createCookieSessionStorage = createCookieSessionStorage;
+exports.createCookieSessionStorageFactory = createCookieSessionStorageFactory;

sessions/memoryStorage.d.ts

@@ -1,2 +0,2 @@
-import type { SessionStorage, SessionIdStorageStrategy } from "../sessions";
+import type { SessionStorage, SessionIdStorageStrategy, CreateSessionStorageFunction } from "../sessions";
 interface MemorySessionStorageOptions {
@@ -9,2 +9,3 @@ /**
 }
+export declare type CreateMemorySessionStorageFunction = (options?: MemorySessionStorageOptions) => SessionStorage;
 /**
@@ -19,3 +20,3 @@ * Creates and returns a simple in-memory SessionStorage object, mostly useful
  */
-export declare function createMemorySessionStorage({ cookie, }?: MemorySessionStorageOptions): SessionStorage;
+export declare const createMemorySessionStorageFactory: (createSessionStorage: CreateSessionStorageFunction) => CreateMemorySessionStorageFunction;
 export {};

sessions/memoryStorage.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -15,4 +15,2 @@ * Copyright (c) Remix Software Inc.
 
-var sessions = require('../sessions.js');
-
 /**
@@ -27,8 +25,8 @@ * Creates and returns a simple in-memory SessionStorage object, mostly useful
  */
-function createMemorySessionStorage({
+const createMemorySessionStorageFactory = createSessionStorage => ({
   cookie
-} = {}) {
+} = {}) => {
   let uniqueId = 0;
   let map = new Map();
-  return sessions.createSessionStorage({
+  return createSessionStorage({
     cookie,
@@ -75,4 +73,4 @@
   });
-}
+};
 
-exports.createMemorySessionStorage = createMemorySessionStorage;
+exports.createMemorySessionStorageFactory = createMemorySessionStorageFactory;

warnings.js

 /**
- * @remix-run/server-runtime v1.3.2
+ * @remix-run/server-runtime v1.3.3-pre.0
  *
@@ -4,0 +4,0 @@ * Copyright (c) Remix Software Inc.

New alerts

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

114824

increased by0.73%

Number of package files

62

increased by1.64%

Number of lines in readme file

27

increased by92.86%

Worsened metrics

Lines of code

3168

decreased by-1.74%

Number of low quality alerts

2

increased by100%

No dependency changes