@react-router/node 0.0.0-experimental-9c1812606 → 0.0.0-experimental-a26b992a1

package/dist/globals.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import { webcrypto as nodeWebCrypto } from "node:crypto";
 declare global {
     namespace NodeJS {
         interface ProcessEnv {
@@ -12,6 +14,7 @@ declare global {
             FormData: typeof FormData;
             ReadableStream: typeof ReadableStream;
             WritableStream: typeof WritableStream;
+            crypto: typeof nodeWebCrypto;
         }
     }
     interface RequestInit {

package/dist/globals.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-9c1812606
+ * @react-router/node v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,6 +13,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var undici = require('undici');
+var node_crypto = require('node:crypto');
 
 function installGlobals() {
   global.File = undici.File;
@@ -26,6 +27,10 @@ function installGlobals() {
   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,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-9c1812606
+ * @react-router/node v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -9,6 +9,7 @@
  * @license MIT
  */
 import { File, Headers, Request, Response, fetch, FormData } from 'undici';
+import { webcrypto } from 'node:crypto';
 
 function installGlobals() {
   global.File = File;
@@ -22,6 +23,10 @@ function installGlobals() {
   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.d.ts

@@ -1,5 +1,4 @@
 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";

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-9c1812606
+ * @react-router/node v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -15,7 +15,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 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');
 
 
@@ -24,10 +23,6 @@ exports.installGlobals = globals.installGlobals;
 exports.createFileSessionStorage = fileStorage.createFileSessionStorage;
 exports.NodeOnDiskFile = fileUploadHandler.NodeOnDiskFile;
 exports.unstable_createFileUploadHandler = fileUploadHandler.createFileUploadHandler;
-exports.createCookie = implementations.createCookie;
-exports.createCookieSessionStorage = implementations.createCookieSessionStorage;
-exports.createMemorySessionStorage = implementations.createMemorySessionStorage;
-exports.createSessionStorage = implementations.createSessionStorage;
 exports.createReadableStreamFromReadable = stream.createReadableStreamFromReadable;
 exports.readableStreamToString = stream.readableStreamToString;
 exports.writeAsyncIterableToWritable = stream.writeAsyncIterableToWritable;

package/dist/index.mjs

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-9c1812606
+ * @react-router/node v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -11,5 +11,4 @@
 export { installGlobals } from './globals.mjs';
 export { createFileSessionStorage } from './sessions/fileStorage.mjs';
 export { NodeOnDiskFile, createFileUploadHandler as unstable_createFileUploadHandler } from './upload/fileUploadHandler.mjs';
-export { createCookie, createCookieSessionStorage, createMemorySessionStorage, createSessionStorage } from './implementations.mjs';
 export { createReadableStreamFromReadable, readableStreamToString, writeAsyncIterableToWritable, writeReadableStreamToWritable } from './stream.mjs';

package/dist/install.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-9c1812606
+ * @react-router/node v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/install.mjs

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-9c1812606
+ * @react-router/node v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/sessions/fileStorage.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-9c1812606
+ * @react-router/node v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,10 +12,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var crypto = require('node:crypto');
 var node_fs = require('node:fs');
 var path = require('node:path');
-var implementations = require('../implementations.js');
+var reactRouter = require('react-router');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -35,7 +34,6 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var crypto__namespace = /*#__PURE__*/_interopNamespace(crypto);
 var path__namespace = /*#__PURE__*/_interopNamespace(path);
 
 /**
@@ -50,7 +48,7 @@ function createFileSessionStorage({
   cookie,
   dir
 }) {
-  return implementations.createSessionStorage({
+  return reactRouter.createSessionStorage({
     cookie,
     async createData(data, expires) {
       let content = JSON.stringify({
@@ -58,9 +56,7 @@ function createFileSessionStorage({
         expires
       });
       while (true) {
-        // 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));
+        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

package/dist/sessions/fileStorage.mjs

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-9c1812606
+ * @react-router/node v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,10 +8,9 @@
  *
  * @license MIT
  */
-import * as crypto from 'node:crypto';
 import { promises } from 'node:fs';
 import * as path from 'node:path';
-import { createSessionStorage } from '../implementations.mjs';
+import { createSessionStorage } from 'react-router';
 
 /**
  * Creates a SessionStorage that stores session data on a filesystem.
@@ -33,9 +32,7 @@ function createFileSessionStorage({
         expires
       });
       while (true) {
-        // TODO: Once Node v19 is supported we should use the globally provided
-        // Web Crypto API's crypto.getRandomValues() function here instead.
-        let randomBytes = crypto.webcrypto.getRandomValues(new Uint8Array(8));
+        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

package/dist/stream.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-9c1812606
+ * @react-router/node v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/stream.mjs

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-9c1812606
+ * @react-router/node v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/upload/fileUploadHandler.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-9c1812606
+ * @react-router/node v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,7 +12,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var crypto = require('node:crypto');
+var node_crypto = require('node:crypto');
 var node_fs = require('node:fs');
 var promises = require('node:fs/promises');
 var node_os = require('node:os');
@@ -52,7 +52,7 @@ let defaultFilePathResolver = ({
   filename
 }) => {
   let ext = filename ? path.extname(filename) : "";
-  return "upload_" + crypto.randomBytes(4).readUInt32LE(0) + ext;
+  return "upload_" + node_crypto.randomBytes(4).readUInt32LE(0) + ext;
 };
 async function uniqueFile(filepath) {
   let ext = path.extname(filepath);

package/dist/upload/fileUploadHandler.mjs

@@ -1,5 +1,5 @@
 /**
- * @react-router/node v0.0.0-experimental-9c1812606
+ * @react-router/node v0.0.0-experimental-a26b992a1
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/node",
-  "version": "0.0.0-experimental-9c1812606",
+  "version": "0.0.0-experimental-a26b992a1",
   "description": "Node.js platform abstractions for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
@@ -32,20 +32,18 @@
   ],
   "dependencies": {
     "@web3-storage/multipart-parser": "^1.0.0",
-    "cookie-signature": "^1.1.0",
     "source-map-support": "^0.5.21",
     "stream-slice": "^0.1.2",
     "undici": "^6.19.2"
   },
   "devDependencies": {
-    "@types/cookie-signature": "^1.0.3",
     "@types/source-map-support": "^0.5.4",
     "typescript": "^5.1.6",
-    "react-router": "0.0.0-experimental-9c1812606"
+    "react-router": "0.0.0-experimental-a26b992a1"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
-    "react-router": "0.0.0-experimental-9c1812606"
+    "react-router": "0.0.0-experimental-a26b992a1"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/dist/crypto.d.ts

@@ -1,3 +0,0 @@
-import type { SignFunction, UnsignFunction } from "react-router";
-export declare const sign: SignFunction;
-export declare const unsign: UnsignFunction;

package/dist/crypto.js

@@ -1,29 +0,0 @@
-/**
- * @react-router/node v0.0.0-experimental-9c1812606
- *
- * 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 cookieSignature = require('cookie-signature');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var cookieSignature__default = /*#__PURE__*/_interopDefaultLegacy(cookieSignature);
-
-const sign = async (value, secret) => {
-  return cookieSignature__default["default"].sign(value, secret);
-};
-const unsign = async (signed, secret) => {
-  return cookieSignature__default["default"].unsign(signed, secret);
-};
-
-exports.sign = sign;
-exports.unsign = unsign;

package/dist/crypto.mjs

@@ -1,20 +0,0 @@
-/**
- * @react-router/node v0.0.0-experimental-9c1812606
- *
- * 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 cookieSignature from 'cookie-signature';
-
-const sign = async (value, secret) => {
-  return cookieSignature.sign(value, secret);
-};
-const unsign = async (signed, secret) => {
-  return cookieSignature.unsign(signed, secret);
-};
-
-export { sign, unsign };

package/dist/implementations.d.ts

@@ -1,4 +0,0 @@
-export declare const createCookie: import("react-router").CreateCookieFunction;
-export declare const createCookieSessionStorage: import("react-router").CreateCookieSessionStorageFunction;
-export declare const createSessionStorage: import("react-router").CreateSessionStorageFunction;
-export declare const createMemorySessionStorage: import("react-router").CreateMemorySessionStorageFunction;

package/dist/implementations.js

@@ -1,29 +0,0 @@
-/**
- * @react-router/node v0.0.0-experimental-9c1812606
- *
- * 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 reactRouter = require('react-router');
-var crypto = require('./crypto.js');
-
-const createCookie = reactRouter.createCookieFactory({
-  sign: crypto.sign,
-  unsign: crypto.unsign
-});
-const createCookieSessionStorage = reactRouter.createCookieSessionStorageFactory(createCookie);
-const createSessionStorage = reactRouter.createSessionStorageFactory(createCookie);
-const createMemorySessionStorage = reactRouter.createMemorySessionStorageFactory(createSessionStorage);
-
-exports.createCookie = createCookie;
-exports.createCookieSessionStorage = createCookieSessionStorage;
-exports.createMemorySessionStorage = createMemorySessionStorage;
-exports.createSessionStorage = createSessionStorage;

package/dist/implementations.mjs

@@ -1,22 +0,0 @@
-/**
- * @react-router/node v0.0.0-experimental-9c1812606
- *
- * 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 { createCookieFactory, createCookieSessionStorageFactory, createSessionStorageFactory, createMemorySessionStorageFactory } from 'react-router';
-import { sign, unsign } from './crypto.mjs';
-
-const createCookie = createCookieFactory({
-  sign,
-  unsign
-});
-const createCookieSessionStorage = createCookieSessionStorageFactory(createCookie);
-const createSessionStorage = createSessionStorageFactory(createCookie);
-const createMemorySessionStorage = createMemorySessionStorageFactory(createSessionStorage);
-
-export { createCookie, createCookieSessionStorage, createMemorySessionStorage, createSessionStorage };