@remix-run/node 0.0.0-experimental-8d8ac4a52 → 0.0.0-experimental-e48b44da5

package/LICENSE.md

@@ -1,7 +1,22 @@
-Copyright 2021 Remix Software Inc.
+MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Copyright (c) Remix Software Inc. 2020-2021
+Copyright (c) Shopify Inc. 2022-2023
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/crypto.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-8d8ac4a52
+ * @remix-run/node v0.0.0-experimental-e48b44da5
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/globals.d.ts

@@ -1,13 +1,9 @@
-import { atob, btoa } from "./base64";
 declare global {
     namespace NodeJS {
         interface ProcessEnv {
             NODE_ENV: "development" | "production" | "test";
         }
         interface Global {
-            atob: typeof atob;
-            btoa: typeof btoa;
-            Blob: typeof Blob;
             File: typeof File;
             Headers: typeof Headers;
             Request: typeof Request;
@@ -16,7 +12,6 @@ declare global {
             FormData: typeof FormData;
             ReadableStream: typeof ReadableStream;
             WritableStream: typeof WritableStream;
-            AbortController: typeof AbortController;
         }
     }
 }

package/dist/globals.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-8d8ac4a52
+ * @remix-run/node v0.0.0-experimental-e48b44da5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,26 +12,31 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var webStream = require('@remix-run/web-stream');
-var abortController = require('abort-controller');
-var base64 = require('./base64.js');
-var fetch = require('./fetch.js');
-var webFile = require('@remix-run/web-file');
 var webFetch = require('@remix-run/web-fetch');
+var webStream = require('@remix-run/web-stream');
 
 function installGlobals() {
-  global.atob = base64.atob;
-  global.btoa = base64.btoa;
-  global.Blob = webFile.Blob;
-  global.File = webFile.File;
+  global.File = webFetch.File;
   global.Headers = webFetch.Headers;
-  global.Request = fetch.Request;
-  global.Response = fetch.Response;
-  global.fetch = fetch.fetch;
+  global.Request = webFetch.Request;
+  global.Response = webFetch.Response;
+  global.fetch = webFetch.fetch;
   global.FormData = webFetch.FormData;
+
+  // Export everything from https://developer.mozilla.org/en-US/docs/Web/API/Streams_API
+  global.ByteLengthQueuingStrategy = webStream.ByteLengthQueuingStrategy;
+  global.CountQueuingStrategy = webStream.CountQueuingStrategy;
+  global.ReadableByteStreamController = webStream.ReadableByteStreamController;
   global.ReadableStream = webStream.ReadableStream;
+  global.ReadableStreamBYOBReader = webStream.ReadableStreamBYOBReader;
+  global.ReadableStreamBYOBRequest = webStream.ReadableStreamBYOBRequest;
+  global.ReadableStreamDefaultController = webStream.ReadableStreamDefaultController;
+  global.ReadableStreamDefaultReader = webStream.ReadableStreamDefaultReader;
+  global.TransformStream = webStream.TransformStream;
+  global.TransformStreamDefaultController = webStream.TransformStreamDefaultController;
   global.WritableStream = webStream.WritableStream;
-  global.AbortController = global.AbortController || abortController.AbortController;
+  global.WritableStreamDefaultController = webStream.WritableStreamDefaultController;
+  global.WritableStreamDefaultWriter = webStream.WritableStreamDefaultWriter;
 }
 
 exports.installGlobals = installGlobals;

package/dist/implementations.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-8d8ac4a52
+ * @remix-run/node v0.0.0-experimental-e48b44da5
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/index.d.ts

@@ -1,10 +1,7 @@
-export { AbortController } from "abort-controller";
-export type { HeadersInit, RequestInfo, RequestInit, ResponseInit, } from "./fetch";
-export { fetch, FormData, Headers, Request, Response } from "./fetch";
 export { installGlobals } from "./globals";
 export { createFileSessionStorage } from "./sessions/fileStorage";
 export { createFileUploadHandler as unstable_createFileUploadHandler, NodeOnDiskFile, } from "./upload/fileUploadHandler";
 export { createCookie, createCookieSessionStorage, createMemorySessionStorage, createSessionStorage, } from "./implementations";
 export { createReadableStreamFromReadable, readableStreamToString, writeAsyncIterableToWritable, writeReadableStreamToWritable, } from "./stream";
-export { createRequestHandler, createSession, defer, isCookie, isSession, json, MaxPartSizeExceededError, redirect, unstable_composeUploadHandlers, unstable_createMemoryUploadHandler, unstable_parseMultipartFormData, } from "@remix-run/server-runtime";
-export type { ActionArgs, ActionFunction, AppData, AppLoadContext, Cookie, CookieOptions, CookieParseOptions, CookieSerializeOptions, CookieSignatureOptions, DataFunctionArgs, EntryContext, ErrorBoundaryComponent, HandleDataRequestFunction, HandleDocumentRequestFunction, HeadersFunction, HtmlLinkDescriptor, HtmlMetaDescriptor, JsonFunction, LinkDescriptor, LinksFunction, LoaderArgs, LoaderFunction, MemoryUploadHandlerFilterArgs, MemoryUploadHandlerOptions, MetaDescriptor, MetaFunction, PageLinkDescriptor, RequestHandler, RouteComponent, RouteHandle, SerializeFrom, ServerBuild, ServerEntryModule, V2_ServerRuntimeMetaArgs as V2_MetaArgs, V2_ServerRuntimeMetaDescriptor as V2_MetaDescriptor, V2_ServerRuntimeMetaDescriptor as V2_HtmlMetaDescriptor, V2_ServerRuntimeMetaFunction as V2_MetaFunction, Session, SessionData, SessionIdStorageStrategy, SessionStorage, SignFunction, TypedDeferredData, TypedResponse, UnsignFunction, UploadHandler, UploadHandlerPart, } from "@remix-run/server-runtime";
+export { createRequestHandler, createSession, defer, broadcastDevReady, logDevReady, isCookie, isSession, json, MaxPartSizeExceededError, redirect, redirectDocument, unstable_composeUploadHandlers, unstable_createMemoryUploadHandler, unstable_parseMultipartFormData, } from "@remix-run/server-runtime";
+export type { ActionFunction, ActionFunctionArgs, AppLoadContext, Cookie, CookieOptions, CookieParseOptions, CookieSerializeOptions, CookieSignatureOptions, DataFunctionArgs, EntryContext, ErrorResponse, HandleDataRequestFunction, HandleDocumentRequestFunction, HeadersArgs, HeadersFunction, HtmlLinkDescriptor, JsonFunction, LinkDescriptor, LinksFunction, LoaderFunction, LoaderFunctionArgs, MemoryUploadHandlerFilterArgs, MemoryUploadHandlerOptions, HandleErrorFunction, PageLinkDescriptor, RequestHandler, SerializeFrom, ServerBuild, ServerEntryModule, ServerRuntimeMetaArgs as MetaArgs, ServerRuntimeMetaDescriptor as MetaDescriptor, ServerRuntimeMetaFunction as MetaFunction, Session, SessionData, SessionIdStorageStrategy, SessionStorage, SignFunction, TypedDeferredData, TypedResponse, UnsignFunction, UploadHandler, UploadHandlerPart, } from "@remix-run/server-runtime";

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-8d8ac4a52
+ * @remix-run/node v0.0.0-experimental-e48b44da5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,30 +12,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var sourceMapSupport = require('source-map-support');
-var abortController = require('abort-controller');
-var fetch = require('./fetch.js');
 var globals = require('./globals.js');
 var fileStorage = require('./sessions/fileStorage.js');
 var fileUploadHandler = require('./upload/fileUploadHandler.js');
 var implementations = require('./implementations.js');
 var stream = require('./stream.js');
 var serverRuntime = require('@remix-run/server-runtime');
-var webFetch = require('@remix-run/web-fetch');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var sourceMapSupport__default = /*#__PURE__*/_interopDefaultLegacy(sourceMapSupport);
 
-sourceMapSupport__default["default"].install();
-
-Object.defineProperty(exports, 'AbortController', {
-  enumerable: true,
-  get: function () { return abortController.AbortController; }
-});
-exports.Request = fetch.Request;
-exports.Response = fetch.Response;
-exports.fetch = fetch.fetch;
 exports.installGlobals = globals.installGlobals;
 exports.createFileSessionStorage = fileStorage.createFileSessionStorage;
 exports.NodeOnDiskFile = fileUploadHandler.NodeOnDiskFile;
@@ -52,6 +37,10 @@ Object.defineProperty(exports, 'MaxPartSizeExceededError', {
   enumerable: true,
   get: function () { return serverRuntime.MaxPartSizeExceededError; }
 });
+Object.defineProperty(exports, 'broadcastDevReady', {
+  enumerable: true,
+  get: function () { return serverRuntime.broadcastDevReady; }
+});
 Object.defineProperty(exports, 'createRequestHandler', {
   enumerable: true,
   get: function () { return serverRuntime.createRequestHandler; }
@@ -76,10 +65,18 @@ Object.defineProperty(exports, 'json', {
   enumerable: true,
   get: function () { return serverRuntime.json; }
 });
+Object.defineProperty(exports, 'logDevReady', {
+  enumerable: true,
+  get: function () { return serverRuntime.logDevReady; }
+});
 Object.defineProperty(exports, 'redirect', {
   enumerable: true,
   get: function () { return serverRuntime.redirect; }
 });
+Object.defineProperty(exports, 'redirectDocument', {
+  enumerable: true,
+  get: function () { return serverRuntime.redirectDocument; }
+});
 Object.defineProperty(exports, 'unstable_composeUploadHandlers', {
   enumerable: true,
   get: function () { return serverRuntime.unstable_composeUploadHandlers; }
@@ -92,11 +89,3 @@ Object.defineProperty(exports, 'unstable_parseMultipartFormData', {
   enumerable: true,
   get: function () { return serverRuntime.unstable_parseMultipartFormData; }
 });
-Object.defineProperty(exports, 'FormData', {
-  enumerable: true,
-  get: function () { return webFetch.FormData; }
-});
-Object.defineProperty(exports, 'Headers', {
-  enumerable: true,
-  get: function () { return webFetch.Headers; }
-});

package/dist/sessions/fileStorage.d.ts

@@ -19,4 +19,5 @@ interface FileSessionStorageOptions {
  * @see https://remix.run/utils/sessions#createfilesessionstorage-node
  */
 export declare function createFileSessionStorage<Data = SessionData, FlashData = Data>({ cookie, dir, }: FileSessionStorageOptions): SessionStorage<Data, FlashData>;
+export declare function getFile(dir: string, id: string): string;
 export {};

package/dist/sessions/fileStorage.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-8d8ac4a52
+ * @remix-run/node v0.0.0-experimental-e48b44da5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,9 +12,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var crypto = require('crypto');
-var fs = require('fs');
-var path = require('path');
+var crypto = require('node:crypto');
+var node_fs = require('node:fs');
+var path = require('node:path');
 var implementations = require('../implementations.js');
 
 function _interopNamespace(e) {
@@ -58,9 +58,9 @@ function createFileSessionStorage({
         expires
       });
       while (true) {
-        // TODO: Once node v16 is available on AWS we should use the webcrypto
-        // API's crypto.getRandomValues() function here instead.
-        let randomBytes = crypto__namespace.randomBytes(8);
+        // TODO: Once Node v19 is supported we should use the globally provided
+        // Web Crypto API's crypto.getRandomValues() function here instead.
+        let randomBytes = crypto__namespace.webcrypto.getRandomValues(new Uint8Array(8));
         // This storage manages an id space of 2^64 ids, which is far greater
         // than the maximum number of files allowed on an NTFS or ext4 volume
         // (2^32). However, the larger id space should help to avoid collisions
@@ -68,10 +68,10 @@ function createFileSessionStorage({
         let id = Buffer.from(randomBytes).toString("hex");
         try {
           let file = getFile(dir, id);
-          await fs.promises.mkdir(path__namespace.dirname(file), {
+          await node_fs.promises.mkdir(path__namespace.dirname(file), {
             recursive: true
           });
-          await fs.promises.writeFile(file, content, {
+          await node_fs.promises.writeFile(file, content, {
             encoding: "utf-8",
             flag: "wx"
           });
@@ -84,7 +84,7 @@ function createFileSessionStorage({
     async readData(id) {
       try {
         let file = getFile(dir, id);
-        let content = JSON.parse(await fs.promises.readFile(file, "utf-8"));
+        let content = JSON.parse(await node_fs.promises.readFile(file, "utf-8"));
         let data = content.data;
         let expires = typeof content.expires === "string" ? new Date(content.expires) : null;
         if (!expires || expires > new Date()) {
@@ -92,7 +92,7 @@ function createFileSessionStorage({
         }
 
         // Remove expired session data.
-        if (expires) await fs.promises.unlink(file);
+        if (expires) await node_fs.promises.unlink(file);
         return null;
       } catch (error) {
         if (error.code !== "ENOENT") throw error;
@@ -105,10 +105,10 @@ function createFileSessionStorage({
         expires
       });
       let file = getFile(dir, id);
-      await fs.promises.mkdir(path__namespace.dirname(file), {
+      await node_fs.promises.mkdir(path__namespace.dirname(file), {
         recursive: true
       });
-      await fs.promises.writeFile(file, content, "utf-8");
+      await node_fs.promises.writeFile(file, content, "utf-8");
     },
     async deleteData(id) {
       // Return early if the id is empty, otherwise we'll end up trying to
@@ -117,7 +117,7 @@ function createFileSessionStorage({
         return;
       }
       try {
-        await fs.promises.unlink(getFile(dir, id));
+        await node_fs.promises.unlink(getFile(dir, id));
       } catch (error) {
         if (error.code !== "ENOENT") throw error;
       }
@@ -133,3 +133,4 @@ function getFile(dir, id) {
 }
 
 exports.createFileSessionStorage = createFileSessionStorage;
+exports.getFile = getFile;

package/dist/stream.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import type { Readable, Writable } from "stream";
+import type { Readable, Writable } from "node:stream";
 export declare function writeReadableStreamToWritable(stream: ReadableStream, writable: Writable): Promise<void>;
 export declare function writeAsyncIterableToWritable(iterable: AsyncIterable<Uint8Array>, writable: Writable): Promise<void>;
 export declare function readableStreamToString(stream: ReadableStream<Uint8Array>, encoding?: BufferEncoding): Promise<string>;

package/dist/stream.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v0.0.0-experimental-8d8ac4a52
+ * @remix-run/node v0.0.0-experimental-e48b44da5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,30 +12,26 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var stream = require('stream');
+var node_stream = require('node:stream');
 
 async function writeReadableStreamToWritable(stream, writable) {
   let reader = stream.getReader();
-  async function read() {
-    let {
-      done,
-      value
-    } = await reader.read();
-    if (done) {
-      writable.end();
-      return;
-    }
-    writable.write(value);
-
-    // If the stream is flushable, flush it to allow streaming to continue.
-    let flushable = writable;
-    if (typeof flushable.flush === "function") {
-      flushable.flush();
-    }
-    await read();
-  }
+  let flushable = writable;
   try {
-    await read();
+    while (true) {
+      let {
+        done,
+        value
+      } = await reader.read();
+      if (done) {
+        writable.end();
+        break;
+      }
+      writable.write(value);
+      if (typeof flushable.flush === "function") {
+        flushable.flush();
+      }
+    }
   } catch (error) {
     writable.destroy(error);
     throw error;
@@ -55,19 +51,18 @@ async function writeAsyncIterableToWritable(iterable, writable) {
 async function readableStreamToString(stream, encoding) {
   let reader = stream.getReader();
   let chunks = [];
-  async function read() {
+  while (true) {
     let {
       done,
       value
     } = await reader.read();
     if (done) {
-      return;
-    } else if (value) {
+      break;
+    }
+    if (value) {
       chunks.push(value);
     }
-    await read();
   }
-  await read();
   return Buffer.concat(chunks).toString(encoding);
 }
 const createReadableStreamFromReadable = source => {
@@ -76,10 +71,10 @@ const createReadableStreamFromReadable = source => {
   return stream;
 };
 class StreamPump {
-  constructor(stream$1) {
-    this.highWaterMark = stream$1.readableHighWaterMark || new stream.Stream.Readable().readableHighWaterMark;
+  constructor(stream) {
+    this.highWaterMark = stream.readableHighWaterMark || new node_stream.Stream.Readable().readableHighWaterMark;
     this.accumalatedSize = 0;
-    this.stream = stream$1;
+    this.stream = stream;
     this.enqueue = this.enqueue.bind(this);
     this.error = this.error.bind(this);
     this.close = this.close.bind(this);