@remix-run/node 0.0.0-experimental-5ddceecc → 0.0.0-experimental-9aba8b51

package/base64.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-5ddceecc
+ * @remix-run/node v0.0.0-experimental-9aba8b51
  *
  * Copyright (c) Remix Software Inc.
  *

package/crypto.d.ts

@@ -0,0 +1,3 @@
+import type { SignFunction, UnsignFunction } from "@remix-run/server-runtime";
+export declare const sign: SignFunction;
+export declare const unsign: UnsignFunction;

package/{cookieSigning.js → crypto.js}

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-5ddceecc
+ * @remix-run/node v0.0.0-experimental-9aba8b51
  *
  * Copyright (c) Remix Software Inc.
  *

package/fetch.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-5ddceecc
+ * @remix-run/node v0.0.0-experimental-9aba8b51
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -96,7 +96,7 @@ class NodeRequest extends nodeFetch.Request {
   async formData(uploadHandler) {
     let contentType = this.headers.get("Content-Type");
 
-    if (contentType) {
+    if (contentType && (/application\/x-www-form-urlencoded/.test(contentType) || /multipart\/form-data/.test(contentType))) {
       return await parseMultipartFormData.internalParseFormData(contentType, this.body, this.abortController, uploadHandler);
     }
 

package/formData.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-5ddceecc
+ * @remix-run/node v0.0.0-experimental-9aba8b51
  *
  * Copyright (c) Remix Software Inc.
  *

package/globals.d.ts

@@ -1,4 +1,3 @@
-import type { InternalSignFunctionDoNotUseMe, InternalUnsignFunctionDoNotUseMe } from "@remix-run/server-runtime/cookieSigning";
 import { atob, btoa } from "./base64";
 declare global {
     namespace NodeJS {
@@ -15,8 +14,6 @@ declare global {
             Response: typeof Response;
             fetch: typeof fetch;
             FormData: typeof FormData;
-            sign: InternalSignFunctionDoNotUseMe;
-            unsign: InternalUnsignFunctionDoNotUseMe;
         }
     }
 }

package/globals.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-5ddceecc
+ * @remix-run/node v0.0.0-experimental-9aba8b51
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -14,7 +14,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var file = require('@web-std/file');
 var base64 = require('./base64.js');
-var cookieSigning = require('./cookieSigning.js');
 var fetch = require('./fetch.js');
 var formData = require('./formData.js');
 var nodeFetch = require('node-fetch');
@@ -29,8 +28,6 @@ function installGlobals() {
   global.Response = nodeFetch.Response;
   global.fetch = fetch.fetch;
   global.FormData = formData.FormData;
-  global.sign = cookieSigning.sign;
-  global.unsign = cookieSigning.unsign;
 }
 
 exports.installGlobals = installGlobals;

package/implementations.d.ts

@@ -0,0 +1,4 @@
+export declare const createCookie: import("@remix-run/server-runtime").CreateCookieFunction;
+export declare const createCookieSessionStorage: import("@remix-run/server-runtime").CreateCookieSessionStorageFunction;
+export declare const createSessionStorage: import("@remix-run/server-runtime").CreateSessionStorageFunction;
+export declare const createMemorySessionStorage: import("@remix-run/server-runtime").CreateMemorySessionStorageFunction;

package/implementations.js

@@ -0,0 +1,29 @@
+/**
+ * @remix-run/node v0.0.0-experimental-9aba8b51
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var serverRuntime = require('@remix-run/server-runtime');
+var crypto = require('./crypto.js');
+
+const createCookie = serverRuntime.createCookieFactory({
+  sign: crypto.sign,
+  unsign: crypto.unsign
+});
+const createCookieSessionStorage = serverRuntime.createCookieSessionStorageFactory(createCookie);
+const createSessionStorage = serverRuntime.createSessionStorageFactory(createCookie);
+const createMemorySessionStorage = serverRuntime.createMemorySessionStorageFactory(createSessionStorage);
+
+exports.createCookie = createCookie;
+exports.createCookieSessionStorage = createCookieSessionStorage;
+exports.createMemorySessionStorage = createMemorySessionStorage;
+exports.createSessionStorage = createSessionStorage;

package/index.d.ts

@@ -8,3 +8,6 @@ export { parseMultipartFormData as unstable_parseMultipartFormData } from "./par
 export { createFileSessionStorage } from "./sessions/fileStorage";
 export { createFileUploadHandler as unstable_createFileUploadHandler, NodeOnDiskFile, } from "./upload/fileUploadHandler";
 export { createMemoryUploadHandler as unstable_createMemoryUploadHandler } from "./upload/memoryUploadHandler";
+export { createCookie, createCookieSessionStorage, createMemorySessionStorage, createSessionStorage, } from "./implementations";
+export { createRequestHandler, createSession, isCookie, isSession, json, redirect, } from "@remix-run/server-runtime";
+export type { ActionFunction, AppData, AppLoadContext, CreateRequestHandlerFunction, 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, } from "@remix-run/server-runtime";

package/index.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-5ddceecc
+ * @remix-run/node v0.0.0-experimental-9aba8b51
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -21,6 +21,8 @@ var parseMultipartFormData = require('./parseMultipartFormData.js');
 var fileStorage = require('./sessions/fileStorage.js');
 var fileUploadHandler = require('./upload/fileUploadHandler.js');
 var memoryUploadHandler = require('./upload/memoryUploadHandler.js');
+var implementations = require('./implementations.js');
+var serverRuntime = require('@remix-run/server-runtime');
 var nodeFetch = require('node-fetch');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -42,6 +44,34 @@ exports.createFileSessionStorage = fileStorage.createFileSessionStorage;
 exports.NodeOnDiskFile = fileUploadHandler.NodeOnDiskFile;
 exports.unstable_createFileUploadHandler = fileUploadHandler.createFileUploadHandler;
 exports.unstable_createMemoryUploadHandler = memoryUploadHandler.createMemoryUploadHandler;
+exports.createCookie = implementations.createCookie;
+exports.createCookieSessionStorage = implementations.createCookieSessionStorage;
+exports.createMemorySessionStorage = implementations.createMemorySessionStorage;
+exports.createSessionStorage = implementations.createSessionStorage;
+Object.defineProperty(exports, 'createRequestHandler', {
+  enumerable: true,
+  get: function () { return serverRuntime.createRequestHandler; }
+});
+Object.defineProperty(exports, 'createSession', {
+  enumerable: true,
+  get: function () { return serverRuntime.createSession; }
+});
+Object.defineProperty(exports, 'isCookie', {
+  enumerable: true,
+  get: function () { return serverRuntime.isCookie; }
+});
+Object.defineProperty(exports, 'isSession', {
+  enumerable: true,
+  get: function () { return serverRuntime.isSession; }
+});
+Object.defineProperty(exports, 'json', {
+  enumerable: true,
+  get: function () { return serverRuntime.json; }
+});
+Object.defineProperty(exports, 'redirect', {
+  enumerable: true,
+  get: function () { return serverRuntime.redirect; }
+});
 Object.defineProperty(exports, 'Headers', {
   enumerable: true,
   get: function () { return nodeFetch.Headers; }

package/magicExports/esm/remix.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-5ddceecc
+ * @remix-run/node v0.0.0-experimental-9aba8b51
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,4 +8,4 @@
  *
  * @license MIT
  */
-export { createFileSessionStorage, unstable_createFileUploadHandler, unstable_createMemoryUploadHandler, unstable_parseMultipartFormData } from '@remix-run/node';
+export { createCookie, createCookieSessionStorage, createFileSessionStorage, createMemorySessionStorage, createSessionStorage, unstable_createFileUploadHandler, unstable_createMemoryUploadHandler, unstable_parseMultipartFormData } from '@remix-run/node';

package/magicExports/remix.d.ts

@@ -1,2 +1,2 @@
-export { createFileSessionStorage, unstable_createFileUploadHandler, unstable_createMemoryUploadHandler, unstable_parseMultipartFormData, } from "@remix-run/node";
+export { createCookie, createSessionStorage, createCookieSessionStorage, createMemorySessionStorage, createFileSessionStorage, unstable_createFileUploadHandler, unstable_createMemoryUploadHandler, unstable_parseMultipartFormData, } from "@remix-run/node";
 export type { UploadHandler, UploadHandlerArgs } from "@remix-run/node";

package/magicExports/remix.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-5ddceecc
+ * @remix-run/node v0.0.0-experimental-9aba8b51
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -16,10 +16,26 @@ var node = require('@remix-run/node');
 
 
 
+Object.defineProperty(exports, 'createCookie', {
+  enumerable: true,
+  get: function () { return node.createCookie; }
+});
+Object.defineProperty(exports, 'createCookieSessionStorage', {
+  enumerable: true,
+  get: function () { return node.createCookieSessionStorage; }
+});
 Object.defineProperty(exports, 'createFileSessionStorage', {
   enumerable: true,
   get: function () { return node.createFileSessionStorage; }
 });
+Object.defineProperty(exports, 'createMemorySessionStorage', {
+  enumerable: true,
+  get: function () { return node.createMemorySessionStorage; }
+});
+Object.defineProperty(exports, 'createSessionStorage', {
+  enumerable: true,
+  get: function () { return node.createSessionStorage; }
+});
 Object.defineProperty(exports, 'unstable_createFileUploadHandler', {
   enumerable: true,
   get: function () { return node.unstable_createFileUploadHandler; }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@remix-run/node",
   "description": "Node.js platform abstractions for Remix",
-  "version": "0.0.0-experimental-5ddceecc",
+  "version": "0.0.0-experimental-9aba8b51",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
     "url": "https://github.com/remix-run/remix/issues"
   },
   "dependencies": {
-    "@remix-run/server-runtime": "0.0.0-experimental-5ddceecc",
+    "@remix-run/server-runtime": "0.0.0-experimental-9aba8b51",
     "@types/busboy": "^0.3.1",
     "@types/node-fetch": "^2.5.12",
     "@web-std/file": "^3.0.0",

package/parseMultipartFormData.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-5ddceecc
+ * @remix-run/node v0.0.0-experimental-9aba8b51
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -35,72 +35,76 @@ async function internalParseFormData(contentType, body, abortController, uploadH
   let stream$1;
 
   if (typeof body === "string" || Buffer.isBuffer(body)) {
-    stream$1 = stream.Readable.from(body.toString());
+    stream$1 = stream.Readable.from(body);
   } else {
     stream$1 = body;
   }
 
   await new Promise(async (resolve, reject) => {
-    let busboy = new Busboy__default["default"]({
-      highWaterMark: 2 * 1024 * 1024,
-      headers: {
-        "content-type": contentType
+    try {
+      let busboy = new Busboy__default["default"]({
+        highWaterMark: 2 * 1024 * 1024,
+        headers: {
+          "content-type": contentType
+        }
+      });
+      let aborted = false;
+
+      function abort(error) {
+        if (aborted) return;
+        aborted = true;
+        stream$1.unpipe();
+        stream$1.removeAllListeners();
+        busboy.removeAllListeners();
+        abortController === null || abortController === void 0 ? void 0 : abortController.abort();
+        reject(error || new Error("failed to parse form data"));
       }
-    });
-    let aborted = false;
 
-    function abort(error) {
-      if (aborted) return;
-      aborted = true;
-      stream$1.unpipe();
-      stream$1.removeAllListeners();
-      busboy.removeAllListeners();
-      abortController === null || abortController === void 0 ? void 0 : abortController.abort();
-      reject(error || new Error("failed to parse form data"));
-    }
+      busboy.on("field", (name, value) => {
+        formData$1.append(name, value);
+      });
+      busboy.on("file", (name, filestream, filename, encoding, mimetype) => {
+        if (uploadHandler) {
+          fileWorkQueue.push((async () => {
+            try {
+              let value = await uploadHandler({
+                name,
+                stream: filestream,
+                filename,
+                encoding,
+                mimetype
+              });
 
-    busboy.on("field", (name, value) => {
-      formData$1.append(name, value);
-    });
-    busboy.on("file", (name, filestream, filename, encoding, mimetype) => {
-      if (uploadHandler) {
-        fileWorkQueue.push((async () => {
-          try {
-            let value = await uploadHandler({
-              name,
-              stream: filestream,
-              filename,
-              encoding,
-              mimetype
-            });
+              if (typeof value !== "undefined") {
+                formData$1.append(name, value);
+              }
+            } catch (error) {
+              // Emit error to busboy to bail early if possible
+              busboy.emit("error", error); // It's possible that the handler is doing stuff and fails
+              // *after* busboy has finished. Rethrow the error for surfacing
+              // in the Promise.all(fileWorkQueue) below.
 
-            if (typeof value !== "undefined") {
-              formData$1.append(name, value);
+              throw error;
+            } finally {
+              filestream.resume();
             }
-          } catch (error) {
-            // Emit error to busboy to bail early if possible
-            busboy.emit("error", error); // It's possible that the handler is doing stuff and fails
-            // *after* busboy has finished. Rethrow the error for surfacing
-            // in the Promise.all(fileWorkQueue) below.
-
-            throw error;
-          } finally {
-            filestream.resume();
-          }
-        })());
-      } else {
-        filestream.resume();
-      }
+          })());
+        } else {
+          filestream.resume();
+        }
 
-      if (!uploadHandler) {
-        console.warn(`Tried to parse multipart file upload for field "${name}" but no uploadHandler was provided.` + " Read more here: https://remix.run/api/remix#parseMultipartFormData-node");
-      }
-    });
-    stream$1.on("error", abort);
-    stream$1.on("aborted", abort);
-    busboy.on("error", abort);
-    busboy.on("finish", resolve);
-    stream$1.pipe(busboy);
+        if (!uploadHandler) {
+          console.warn(`Tried to parse multipart file upload for field "${name}" but no uploadHandler was provided.` + " Read more here: https://remix.run/api/remix#parseMultipartFormData-node");
+        }
+      });
+      stream$1.on("error", abort);
+      stream$1.on("aborted", abort);
+      busboy.on("error", abort);
+      busboy.on("finish", resolve);
+      stream$1.pipe(busboy);
+    } catch (err) {
+      reject(err);
+    }
   });
   await Promise.all(fileWorkQueue);
   return formData$1;

package/sessions/fileStorage.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-5ddceecc
+ * @remix-run/node v0.0.0-experimental-9aba8b51
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -15,7 +15,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var crypto = require('crypto');
 var fs = require('fs');
 var path = require('path');
-var serverRuntime = require('@remix-run/server-runtime');
+var implementations = require('../implementations.js');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -50,7 +50,7 @@ function createFileSessionStorage({
   cookie,
   dir
 }) {
-  return serverRuntime.createSessionStorage({
+  return implementations.createSessionStorage({
     cookie,
 
     async createData(data, expires) {

package/upload/fileUploadHandler.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-5ddceecc
+ * @remix-run/node v0.0.0-experimental-9aba8b51
  *
  * Copyright (c) Remix Software Inc.
  *

package/upload/memoryUploadHandler.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-5ddceecc
+ * @remix-run/node v0.0.0-experimental-9aba8b51
  *
  * Copyright (c) Remix Software Inc.
  *

package/upload/meter.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-5ddceecc
+ * @remix-run/node v0.0.0-experimental-9aba8b51
  *
  * Copyright (c) Remix Software Inc.
  *

package/cookieSigning.d.ts

@@ -1,3 +0,0 @@
-import type { InternalSignFunctionDoNotUseMe, InternalUnsignFunctionDoNotUseMe } from "@remix-run/server-runtime/cookieSigning";
-export declare const sign: InternalSignFunctionDoNotUseMe;
-export declare const unsign: InternalUnsignFunctionDoNotUseMe;