Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: removes Readable.fromWeb and Readable.toWeb methods #506

Merged
merged 3 commits into from May 8, 2023
Merged

fix: removes Readable.fromWeb and Readable.toWeb methods #506

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de43dd6
removing obsolete methods from Readable class
RishabhKodes Feb 26, 2023
651395a
moved the logic to replacements.mjs
RishabhKodes Feb 27, 2023
13f8c64
using the replacements.mjs logic
RishabhKodes Feb 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions build/build.mjs
View file
Open in desktop
@@ -1,5 +1,5 @@
import { transform } from '@babel/core'
import { createReadStream } from 'node:fs'
import { createReadStream, writeFileSync } from 'node:fs'
import { mkdir, readdir, readFile, rm, writeFile } from 'node:fs/promises'
import { dirname, resolve } from 'node:path'
import process from 'node:process'
Expand All @@ -12,7 +12,7 @@ import prettierConfig from '../prettier.config.cjs'
import { aliases, skippedSources, sources } from './files.mjs'
import { footers } from './footers.mjs'
import { headers } from './headers.mjs'
import { replacements } from './replacements.mjs'
import { replacements, removeObsoleteReadableMethods } from './replacements.mjs'

const baseMatcher = /^(?:lib|test)/
const strictMatcher = /^(['"']use strict.+)/
Expand Down Expand Up @@ -172,6 +172,10 @@ async function main() {
await rm('lib', { recursive: true, force: true })
await rm('test', { recursive: true, force: true })

// remove obsolete methods from readable-stream
const methodNamesToRemove = ['fromWeb', 'toWeb']
await removeObsoleteReadableMethods(methodNamesToRemove)

// Download or open the tar file
let tarFile

Expand Down
15 changes: 15 additions & 0 deletions build/replacements.mjs
View file
Open in desktop
@@ -1,3 +1,7 @@
import { resolve } from 'node:path'
import { writeFileSync } from 'node:fs'
import { readFile } from 'node:fs/promises'

const legacyStreamsRequireStream = ["require\\('stream'\\)", "require('./stream')"]

const internalStreamsBufferPolyfill = [
Expand Down Expand Up @@ -152,6 +156,17 @@ const testParallelIncludeTap = [

const testParallelImportStreamInMjs = [" from 'stream';", "from '../../lib/ours/index.js';"]

export const removeObsoleteReadableMethods = async function(methodNames) {
const readableStreamPath = resolve(__dirname, '../lib/internal/streams/readable.js')
let readableStreamContent = await readFile(readableStreamPath, 'utf-8')

for (const method of methodNames) {
const regex = new RegExp(`Readable.+${method} = function\\s\\s*\\([^)]*\\)\\s*{[^}]*}`, 'g')
readableStreamContent = readableStreamContent.replace(regex, '')
writeFileSync(readableStreamPath, readableStreamContent, 'utf8')
}
}

const testParallelImportTapInMjs = ["(from 'assert';)", "$1\nimport tap from 'tap';"]

const testParallelDuplexFromBlob = [
Expand Down