@remix-run/node 1.19.3 → 2.0.0-pre.0

package/dist/upload/fileUploadHandler.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/node v1.19.3
+ * @remix-run/node v2.0.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,16 +12,16 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var crypto = require('crypto');
-var fs = require('fs');
-var promises = require('fs/promises');
-var os = require('os');
-var path = require('path');
-var stream = require('stream');
-var util = require('util');
+var crypto = require('node:crypto');
+var node_fs = require('node:fs');
+var promises = require('node:fs/promises');
+var node_os = require('node:os');
+var path = require('node:path');
+var node_stream = require('node:stream');
+var node_util = require('node:util');
 var serverRuntime = require('@remix-run/server-runtime');
 var streamSlice = require('stream-slice');
-var stream$1 = require('../stream.js');
+var stream = require('../stream.js');
 
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
@@ -63,7 +63,7 @@ async function uniqueFile(filepath) {
   return uniqueFilepath;
 }
 function createFileUploadHandler({
-  directory = os.tmpdir(),
+  directory = node_os.tmpdir(),
   avoidFileConflicts = true,
   file = defaultFilePathResolver,
   filter,
@@ -106,7 +106,7 @@ function createFileUploadHandler({
     await promises.mkdir(path.dirname(filepath), {
       recursive: true
     }).catch(() => {});
-    let writeFileStream = fs.createWriteStream(filepath);
+    let writeFileStream = node_fs.createWriteStream(filepath);
     let size = 0;
     let deleteFile = false;
     try {
@@ -120,17 +120,27 @@ function createFileUploadHandler({
       }
     } finally {
       writeFileStream.end();
-      await util.promisify(stream.finished)(writeFileStream);
+      await node_util.promisify(node_stream.finished)(writeFileStream);
       if (deleteFile) {
         await promises.rm(filepath).catch(() => {});
       }
     }
+
+    // TODO: remove this typecast once TS fixed File class regression
+    //  https://github.com/microsoft/TypeScript/issues/52166
     return new NodeOnDiskFile(filepath, contentType);
   };
 }
+
+// TODO: remove this `Omit` usage once TS fixed File class regression
+//  https://github.com/microsoft/TypeScript/issues/52166
 class NodeOnDiskFile {
   lastModified = 0;
   webkitRelativePath = "";
+
+  // TODO: remove this property once TS fixed File class regression
+  //  https://github.com/microsoft/TypeScript/issues/52166
+  prototype = File.prototype;
   constructor(filepath, type, slicer) {
     this.filepath = filepath;
     this.type = type;
@@ -138,7 +148,7 @@ class NodeOnDiskFile {
     this.name = path.basename(filepath);
   }
   get size() {
-    let stats = fs.statSync(this.filepath);
+    let stats = node_fs.statSync(this.filepath);
     if (this.slicer) {
       let slice = this.slicer.end - this.slicer.start;
       return slice < 0 ? 0 : slice > stats.size ? stats.size : slice;
@@ -155,10 +165,14 @@ class NodeOnDiskFile {
     return new NodeOnDiskFile(this.filepath, typeof type === "string" ? type : this.type, {
       start,
       end
-    });
+    }
+    // TODO: remove this typecast once TS fixed File class regression
+    //  https://github.com/microsoft/TypeScript/issues/52166
+    );
   }
+
   async arrayBuffer() {
-    let stream = fs.createReadStream(this.filepath);
+    let stream = node_fs.createReadStream(this.filepath);
     if (this.slicer) {
       stream = stream.pipe(streamSlice__namespace.slice(this.slicer.start, this.slicer.end));
     }
@@ -170,14 +184,14 @@ class NodeOnDiskFile {
     });
   }
   stream() {
-    let stream = fs.createReadStream(this.filepath);
+    let stream$1 = node_fs.createReadStream(this.filepath);
     if (this.slicer) {
-      stream = stream.pipe(streamSlice__namespace.slice(this.slicer.start, this.slicer.end));
+      stream$1 = stream$1.pipe(streamSlice__namespace.slice(this.slicer.start, this.slicer.end));
     }
-    return stream$1.createReadableStreamFromReadable(stream);
+    return stream.createReadableStreamFromReadable(stream$1);
   }
   async text() {
-    return stream$1.readableStreamToString(this.stream());
+    return stream.readableStreamToString(this.stream());
   }
   get [Symbol.toStringTag]() {
     return "File";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/node",
-  "version": "1.19.3",
+  "version": "2.0.0-pre.0",
   "description": "Node.js platform abstractions for Remix",
   "bugs": {
     "url": "https://github.com/remix-run/remix/issues"
@@ -17,22 +17,30 @@
     "./install.js"
   ],
   "dependencies": {
-    "@remix-run/server-runtime": "1.19.3",
-    "@remix-run/web-fetch": "^4.3.6",
+    "@remix-run/server-runtime": "2.0.0-pre.0",
+    "@remix-run/web-fetch": "^4.3.7",
     "@remix-run/web-file": "^3.0.3",
     "@remix-run/web-stream": "^1.0.4",
     "@web3-storage/multipart-parser": "^1.0.0",
-    "abort-controller": "^3.0.0",
     "cookie-signature": "^1.1.0",
     "source-map-support": "^0.5.21",
     "stream-slice": "^0.1.2"
   },
   "devDependencies": {
     "@types/cookie-signature": "^1.0.3",
-    "@types/source-map-support": "^0.5.4"
+    "@types/source-map-support": "^0.5.4",
+    "typescript": "^5.1.6"
+  },
+  "peerDependencies": {
+    "typescript": "^5.1.0"
+  },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=18.0.0"
   },
   "files": [
     "dist/",

package/dist/magicExports/esm/remix.js

@@ -1,11 +0,0 @@
-/**
- * @remix-run/node v1.19.3
- *
- * 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 { createCookie, createCookieSessionStorage, createFileSessionStorage, createMemorySessionStorage, createSessionStorage, unstable_createFileUploadHandler, unstable_createMemoryUploadHandler, unstable_parseMultipartFormData } from '@remix-run/node';

package/dist/magicExports/remix.d.ts

@@ -1,42 +0,0 @@
-/**
- * @remix-run/node v1.19.3
- *
- * 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 * as node from '@remix-run/node';
-
-/** @deprecated Import `createCookie` from `@remix-run/node` instead. */
-export declare const createCookie: typeof node.createCookie;
-
-/** @deprecated Import `createCookieSessionStorage` from `@remix-run/node` instead. */
-export declare const createCookieSessionStorage: typeof node.createCookieSessionStorage;
-
-/** @deprecated Import `createFileSessionStorage` from `@remix-run/node` instead. */
-export declare const createFileSessionStorage: typeof node.createFileSessionStorage;
-
-/** @deprecated Import `createMemorySessionStorage` from `@remix-run/node` instead. */
-export declare const createMemorySessionStorage: typeof node.createMemorySessionStorage;
-
-/** @deprecated Import `createSessionStorage` from `@remix-run/node` instead. */
-export declare const createSessionStorage: typeof node.createSessionStorage;
-
-/** @deprecated Import `unstable_createFileUploadHandler` from `@remix-run/node` instead. */
-export declare const unstable_createFileUploadHandler: typeof node.unstable_createFileUploadHandler;
-
-/** @deprecated Import `unstable_createMemoryUploadHandler` from `@remix-run/node` instead. */
-export declare const unstable_createMemoryUploadHandler: typeof node.unstable_createMemoryUploadHandler;
-
-/** @deprecated Import `unstable_parseMultipartFormData` from `@remix-run/node` instead. */
-export declare const unstable_parseMultipartFormData: typeof node.unstable_parseMultipartFormData;
-import * as NodeTypes from '@remix-run/node';
-
-/** @deprecated Import type `UploadHandler` from `@remix-run/node` instead. */
-export declare type UploadHandler = NodeTypes.UploadHandler;
-
-/** @deprecated Import type `UploadHandlerPart` from `@remix-run/node` instead. */
-export declare type UploadHandlerPart = NodeTypes.UploadHandlerPart;

package/dist/magicExports/remix.js

@@ -1,36 +0,0 @@
-/**
- * @remix-run/node v1.19.3
- *
- * 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 node = require('@remix-run/node');
-/** @deprecated Import `createCookie` from `@remix-run/node` instead. */
-exports.createCookie = node.createCookie;
-
-/** @deprecated Import `createCookieSessionStorage` from `@remix-run/node` instead. */
-exports.createCookieSessionStorage = node.createCookieSessionStorage;
-
-/** @deprecated Import `createFileSessionStorage` from `@remix-run/node` instead. */
-exports.createFileSessionStorage = node.createFileSessionStorage;
-
-/** @deprecated Import `createMemorySessionStorage` from `@remix-run/node` instead. */
-exports.createMemorySessionStorage = node.createMemorySessionStorage;
-
-/** @deprecated Import `createSessionStorage` from `@remix-run/node` instead. */
-exports.createSessionStorage = node.createSessionStorage;
-
-/** @deprecated Import `unstable_createFileUploadHandler` from `@remix-run/node` instead. */
-exports.unstable_createFileUploadHandler = node.unstable_createFileUploadHandler;
-
-/** @deprecated Import `unstable_createMemoryUploadHandler` from `@remix-run/node` instead. */
-exports.unstable_createMemoryUploadHandler = node.unstable_createMemoryUploadHandler;
-
-/** @deprecated Import `unstable_parseMultipartFormData` from `@remix-run/node` instead. */
-exports.unstable_parseMultipartFormData = node.unstable_parseMultipartFormData;