@react-router/node 7.0.0-pre.1 → 7.0.0-pre.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # `@remix-run/node`
 
+## 7.0.0-pre.2
+
+### Major Changes
+
+- Drop support for Node 18, update minimum Node vestion to 20 ([#12171](https://github.com/remix-run/react-router/pull/12171))
+
+  - Remove `installGlobals()` as this should no longer be necessary
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.0.0-pre.2`
+
 ## 7.0.0-pre.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,3 +1,2 @@
-export { installGlobals } from "./globals";
 export { createFileSessionStorage } from "./sessions/fileStorage";
 export { createReadableStreamFromReadable, readableStreamToString, writeAsyncIterableToWritable, writeReadableStreamToWritable, } from "./stream";

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v7.0.0-pre.1
+ * @react-router/node v7.0.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,13 +12,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var globals = require('./globals.js');
 var fileStorage = require('./sessions/fileStorage.js');
 var stream = require('./stream.js');
 
 
 
-exports.installGlobals = globals.installGlobals;
 exports.createFileSessionStorage = fileStorage.createFileSessionStorage;
 exports.createReadableStreamFromReadable = stream.createReadableStreamFromReadable;
 exports.readableStreamToString = stream.readableStreamToString;

package/dist/sessions/fileStorage.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v7.0.0-pre.1
+ * @react-router/node v7.0.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/stream.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v7.0.0-pre.1
+ * @react-router/node v7.0.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/node",
-  "version": "7.0.0-pre.1",
+  "version": "7.0.0-pre.2",
   "description": "Node.js platform abstractions for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
@@ -16,13 +16,7 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
-    },
-    "./install": {
-      "types": "./dist/install.d.ts",
-      "import": "./dist/install.mjs",
-      "require": "./dist/install.js"
+      "default": "./dist/index.js"
     },
     "./package.json": "./package.json"
   },
@@ -39,11 +33,11 @@
   "devDependencies": {
     "@types/source-map-support": "^0.5.4",
     "typescript": "^5.1.6",
-    "react-router": "7.0.0-pre.1"
+    "react-router": "7.0.0-pre.2"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
-    "react-router": "7.0.0-pre.1"
+    "react-router": "7.0.0-pre.2"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -51,7 +45,7 @@
     }
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "files": [
     "dist/",

package/dist/globals.d.ts

@@ -1,24 +0,0 @@
-/// <reference types="node" />
-import { webcrypto as nodeWebCrypto } from "node:crypto";
-declare global {
-    namespace NodeJS {
-        interface ProcessEnv {
-            NODE_ENV: "development" | "production" | "test";
-        }
-        interface Global {
-            File: typeof File;
-            Headers: typeof Headers;
-            Request: typeof Request;
-            Response: typeof Response;
-            fetch: typeof fetch;
-            FormData: typeof FormData;
-            ReadableStream: typeof ReadableStream;
-            WritableStream: typeof WritableStream;
-            crypto: typeof nodeWebCrypto;
-        }
-    }
-    interface RequestInit {
-        duplex?: "half";
-    }
-}
-export declare function installGlobals(): void;

package/dist/globals.js

@@ -1,36 +0,0 @@
-/**
- * @react-router/node v7.0.0-pre.1
- *
- * 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 undici = require('undici');
-var node_crypto = require('node:crypto');
-
-function installGlobals() {
-  global.File = undici.File;
-  // @ts-ignore - this shows as an error in VSCode but is not an error via TSC so we can't use `ts-expect-error`
-  global.Headers = undici.Headers;
-  // @ts-expect-error - overriding globals
-  global.Request = undici.Request;
-  // @ts-expect-error - overriding globals
-  global.Response = undici.Response;
-  // @ts-expect-error - overriding globals
-  global.fetch = undici.fetch;
-  // @ts-expect-error - overriding globals
-  global.FormData = undici.FormData;
-  if (!global.crypto) {
-    // @ts-expect-error - overriding globals
-    global.crypto = node_crypto.webcrypto;
-  }
-}
-
-exports.installGlobals = installGlobals;

package/dist/globals.mjs

@@ -1,32 +0,0 @@
-/**
- * @react-router/node v7.0.0-pre.1
- *
- * 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
- */
-import { File, Headers, Request, Response, fetch, FormData } from 'undici';
-import { webcrypto } from 'node:crypto';
-
-function installGlobals() {
-  global.File = File;
-  // @ts-ignore - this shows as an error in VSCode but is not an error via TSC so we can't use `ts-expect-error`
-  global.Headers = Headers;
-  // @ts-expect-error - overriding globals
-  global.Request = Request;
-  // @ts-expect-error - overriding globals
-  global.Response = Response;
-  // @ts-expect-error - overriding globals
-  global.fetch = fetch;
-  // @ts-expect-error - overriding globals
-  global.FormData = FormData;
-  if (!global.crypto) {
-    // @ts-expect-error - overriding globals
-    global.crypto = webcrypto;
-  }
-}
-
-export { installGlobals };

package/dist/index.mjs

@@ -1,13 +0,0 @@
-/**
- * @react-router/node v7.0.0-pre.1
- *
- * 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
- */
-export { installGlobals } from './globals.mjs';
-export { createFileSessionStorage } from './sessions/fileStorage.mjs';
-export { createReadableStreamFromReadable, readableStreamToString, writeAsyncIterableToWritable, writeReadableStreamToWritable } from './stream.mjs';

package/dist/install.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/install.js

@@ -1,15 +0,0 @@
-/**
- * @react-router/node v7.0.0-pre.1
- *
- * 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';
-
-var globals = require('./globals.js');
-
-globals.installGlobals();

package/dist/install.mjs

@@ -1,13 +0,0 @@
-/**
- * @react-router/node v7.0.0-pre.1
- *
- * 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
- */
-import { installGlobals } from './globals.mjs';
-
-installGlobals();

package/dist/sessions/fileStorage.mjs

@@ -1,106 +0,0 @@
-/**
- * @react-router/node v7.0.0-pre.1
- *
- * 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
- */
-import { promises } from 'node:fs';
-import * as path from 'node:path';
-import { createSessionStorage } from 'react-router';
-
-/**
- * Creates a SessionStorage that stores session data on a filesystem.
- *
- * The advantage of using this instead of cookie session storage is that
- * files may contain much more data than cookies.
- *
- * @see https://remix.run/utils/sessions#createfilesessionstorage-node
- */
-function createFileSessionStorage({
-  cookie,
-  dir
-}) {
-  return createSessionStorage({
-    cookie,
-    async createData(data, expires) {
-      let content = JSON.stringify({
-        data,
-        expires
-      });
-      while (true) {
-        let randomBytes = crypto.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
-        // with existing ids when creating new sessions, which speeds things up.
-        let id = Buffer.from(randomBytes).toString("hex");
-        try {
-          let file = getFile(dir, id);
-          await promises.mkdir(path.dirname(file), {
-            recursive: true
-          });
-          await promises.writeFile(file, content, {
-            encoding: "utf-8",
-            flag: "wx"
-          });
-          return id;
-        } catch (error) {
-          if (error.code !== "EEXIST") throw error;
-        }
-      }
-    },
-    async readData(id) {
-      try {
-        let file = getFile(dir, id);
-        let content = JSON.parse(await 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()) {
-          return data;
-        }
-        // Remove expired session data.
-        if (expires) await promises.unlink(file);
-        return null;
-      } catch (error) {
-        if (error.code !== "ENOENT") throw error;
-        return null;
-      }
-    },
-    async updateData(id, data, expires) {
-      let content = JSON.stringify({
-        data,
-        expires
-      });
-      let file = getFile(dir, id);
-      await promises.mkdir(path.dirname(file), {
-        recursive: true
-      });
-      await promises.writeFile(file, content, "utf-8");
-    },
-    async deleteData(id) {
-      // Return early if the id is empty, otherwise we'll end up trying to
-      // unlink the dir, which will cause the EPERM error.
-      if (!id) {
-        return;
-      }
-      try {
-        await promises.unlink(getFile(dir, id));
-      } catch (error) {
-        if (error.code !== "ENOENT") throw error;
-      }
-    }
-  });
-}
-function getFile(dir, id) {
-  // Divide the session id up into a directory (first 2 bytes) and filename
-  // (remaining 6 bytes) to reduce the chance of having very large directories,
-  // which should speed up file access. This is a maximum of 2^16 directories,
-  // each with 2^48 files.
-  return path.join(dir, id.slice(0, 4), id.slice(4));
-}
-
-export { createFileSessionStorage, getFile };

package/dist/stream.mjs

@@ -1,139 +0,0 @@
-/**
- * @react-router/node v7.0.0-pre.1
- *
- * 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
- */
-import { Stream } from 'node:stream';
-
-async function writeReadableStreamToWritable(stream, writable) {
-  let reader = stream.getReader();
-  let flushable = writable;
-  try {
-    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;
-  }
-}
-async function writeAsyncIterableToWritable(iterable, writable) {
-  try {
-    for await (let chunk of iterable) {
-      writable.write(chunk);
-    }
-    writable.end();
-  } catch (error) {
-    writable.destroy(error);
-    throw error;
-  }
-}
-async function readableStreamToString(stream, encoding) {
-  let reader = stream.getReader();
-  let chunks = [];
-  while (true) {
-    let {
-      done,
-      value
-    } = await reader.read();
-    if (done) {
-      break;
-    }
-    if (value) {
-      chunks.push(value);
-    }
-  }
-  return Buffer.concat(chunks).toString(encoding);
-}
-const createReadableStreamFromReadable = source => {
-  let pump = new StreamPump(source);
-  let stream = new ReadableStream(pump, pump);
-  return stream;
-};
-class StreamPump {
-  constructor(stream) {
-    this.highWaterMark = stream.readableHighWaterMark || new Stream.Readable().readableHighWaterMark;
-    this.accumalatedSize = 0;
-    this.stream = stream;
-    this.enqueue = this.enqueue.bind(this);
-    this.error = this.error.bind(this);
-    this.close = this.close.bind(this);
-  }
-  size(chunk) {
-    return (chunk === null || chunk === void 0 ? void 0 : chunk.byteLength) || 0;
-  }
-  start(controller) {
-    this.controller = controller;
-    this.stream.on("data", this.enqueue);
-    this.stream.once("error", this.error);
-    this.stream.once("end", this.close);
-    this.stream.once("close", this.close);
-  }
-  pull() {
-    this.resume();
-  }
-  cancel(reason) {
-    if (this.stream.destroy) {
-      this.stream.destroy(reason);
-    }
-    this.stream.off("data", this.enqueue);
-    this.stream.off("error", this.error);
-    this.stream.off("end", this.close);
-    this.stream.off("close", this.close);
-  }
-  enqueue(chunk) {
-    if (this.controller) {
-      try {
-        let bytes = chunk instanceof Uint8Array ? chunk : Buffer.from(chunk);
-        let available = (this.controller.desiredSize || 0) - bytes.byteLength;
-        this.controller.enqueue(bytes);
-        if (available <= 0) {
-          this.pause();
-        }
-      } catch (error) {
-        this.controller.error(new Error("Could not create Buffer, chunk must be of type string or an instance of Buffer, ArrayBuffer, or Array or an Array-like Object"));
-        this.cancel();
-      }
-    }
-  }
-  pause() {
-    if (this.stream.pause) {
-      this.stream.pause();
-    }
-  }
-  resume() {
-    if (this.stream.readable && this.stream.resume) {
-      this.stream.resume();
-    }
-  }
-  close() {
-    if (this.controller) {
-      this.controller.close();
-      delete this.controller;
-    }
-  }
-  error(error) {
-    if (this.controller) {
-      this.controller.error(error);
-      delete this.controller;
-    }
-  }
-}
-
-export { createReadableStreamFromReadable, readableStreamToString, writeAsyncIterableToWritable, writeReadableStreamToWritable };