Fix building for Cloudflare Nitro preset (#1726)

It seems that Rollup node-resolve module doesn't properly deal with
trailing slashes, causing it to thing that `string_decoder` is a
built-in Node.js dependency and attempt to import it from `unenv`, which
will obviously fail, because `string_decoder` is not, in fact, a Node.js
dependency, but an individual dependency of `readable-stream`.

This adds a small patch for `readable-stream@2.3.8` dependency, which
removes the leading slash, which seems to fix the builds.

This probably should be reported to relevant developers (Rollup
node-resolve plugin or Nitro?).
This commit is contained in:
Sasha Sorokin 2024-06-15 00:26:12 +02:00 committed by GitHub
parent 5db5f2251f
commit e0a9e62d84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 30 additions and 4 deletions

View File

@ -57,7 +57,8 @@
"packageManager": "pnpm@9.3.0", "packageManager": "pnpm@9.3.0",
"pnpm": { "pnpm": {
"patchedDependencies": { "patchedDependencies": {
"markdown-it@13.0.1": "patches/markdown-it@13.0.1.patch" "markdown-it@13.0.1": "patches/markdown-it@13.0.1.patch",
"readable-stream@2.3.8": "patches/readable-stream@2.3.8.patch"
} }
} }
} }

View File

@ -0,0 +1,22 @@
diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index 3af95cb2dbf1e9fa93d261b030b0b090df507ff7..376e6979c13264d80d96e045ddbba5258d219373 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -169,7 +169,7 @@ function ReadableState(options, stream) {
this.decoder = null;
this.encoding = null;
if (options.encoding) {
- if (!StringDecoder) StringDecoder = require('string_decoder/').StringDecoder;
+ if (!StringDecoder) StringDecoder = require('string_decoder').StringDecoder;
this.decoder = new StringDecoder(options.encoding);
this.encoding = options.encoding;
}
@@ -325,7 +325,7 @@ Readable.prototype.isPaused = function () {
// backwards compatibility.
Readable.prototype.setEncoding = function (enc) {
- if (!StringDecoder) StringDecoder = require('string_decoder/').StringDecoder;
+ if (!StringDecoder) StringDecoder = require('string_decoder').StringDecoder;
this._readableState.decoder = new StringDecoder(enc);
this._readableState.encoding = enc;
return this;

9
pnpm-lock.yaml generated
View File

@ -8,6 +8,9 @@ patchedDependencies:
markdown-it@13.0.1: markdown-it@13.0.1:
hash: 3vlxaukqep4gvqytxeznhg6wbq hash: 3vlxaukqep4gvqytxeznhg6wbq
path: patches/markdown-it@13.0.1.patch path: patches/markdown-it@13.0.1.patch
readable-stream@2.3.8:
hash: h52dazg37p4h3yox67pw36akse
path: patches/readable-stream@2.3.8.patch
importers: importers:
@ -9195,7 +9198,7 @@ snapshots:
dependencies: dependencies:
lie: 3.3.0 lie: 3.3.0
pako: 1.0.11 pako: 1.0.11
readable-stream: 2.3.8 readable-stream: 2.3.8(patch_hash=h52dazg37p4h3yox67pw36akse)
setimmediate: 1.0.5 setimmediate: 1.0.5
keyv@4.5.4: keyv@4.5.4:
@ -9217,7 +9220,7 @@ snapshots:
lazystream@1.0.1: lazystream@1.0.1:
dependencies: dependencies:
readable-stream: 2.3.8 readable-stream: 2.3.8(patch_hash=h52dazg37p4h3yox67pw36akse)
levn@0.4.1: levn@0.4.1:
dependencies: dependencies:
@ -10255,7 +10258,7 @@ snapshots:
parse-json: 5.2.0 parse-json: 5.2.0
type-fest: 0.6.0 type-fest: 0.6.0
readable-stream@2.3.8: readable-stream@2.3.8(patch_hash=h52dazg37p4h3yox67pw36akse):
dependencies: dependencies:
core-util-is: 1.0.3 core-util-is: 1.0.3
inherits: 2.0.4 inherits: 2.0.4