From 7dec0aca135a5633a67ca6a6739da8af09f4b88c Mon Sep 17 00:00:00 2001 From: Jesse Wright <63333554+jeswr@users.noreply.github.com> Date: Sat, 13 May 2023 12:46:19 +0200 Subject: [PATCH 1/6] chore: don't polyfill stream in webpack.browser.config.mjs --- src/test/browser/fixtures/webpack.browser.config.mjs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/browser/fixtures/webpack.browser.config.mjs b/src/test/browser/fixtures/webpack.browser.config.mjs index a2d889e0d..48827db5e 100644 --- a/src/test/browser/fixtures/webpack.browser.config.mjs +++ b/src/test/browser/fixtures/webpack.browser.config.mjs @@ -28,8 +28,7 @@ export default { aliasFields: ['browser'], fallback: { crypto: require.resolve('crypto-browserify'), - path: require.resolve('path-browserify'), - stream: require.resolve('stream-browserify') + path: require.resolve('path-browserify') } } } From 245e2420cc1ce4d2f71205b94b1289946c498e1e Mon Sep 17 00:00:00 2001 From: Jesse Wright <63333554+jeswr@users.noreply.github.com> Date: Sun, 14 May 2023 17:53:18 +0200 Subject: [PATCH 2/6] chore: remove unecessary fallbacks and plugins --- src/test/browser/fixtures/webpack.browser.config.mjs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/test/browser/fixtures/webpack.browser.config.mjs b/src/test/browser/fixtures/webpack.browser.config.mjs index 48827db5e..b9f6530a6 100644 --- a/src/test/browser/fixtures/webpack.browser.config.mjs +++ b/src/test/browser/fixtures/webpack.browser.config.mjs @@ -20,15 +20,8 @@ export default { banner: 'function setImmediate(fn, ...args) { setTimeout(() => fn(...args), 1) }', raw: true }), - new webpack.ProvidePlugin({ - process: require.resolve('process') - }) ], resolve: { aliasFields: ['browser'], - fallback: { - crypto: require.resolve('crypto-browserify'), - path: require.resolve('path-browserify') - } } } From dc0dda3da077c8affa1c5c19fc5cbede3445669f Mon Sep 17 00:00:00 2001 From: Jesse Wright <63333554+jeswr@users.noreply.github.com> Date: Sun, 14 May 2023 17:59:16 +0200 Subject: [PATCH 3/6] chore: remove unecessary banner plugin --- src/test/browser/fixtures/webpack.browser.config.mjs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/test/browser/fixtures/webpack.browser.config.mjs b/src/test/browser/fixtures/webpack.browser.config.mjs index b9f6530a6..e31dc7d9d 100644 --- a/src/test/browser/fixtures/webpack.browser.config.mjs +++ b/src/test/browser/fixtures/webpack.browser.config.mjs @@ -1,9 +1,6 @@ -import { createRequire } from 'module' import { resolve } from 'path' import { fileURLToPath } from 'url' -import webpack from 'webpack' -const require = createRequire(import.meta.url) const rootDir = resolve(fileURLToPath(new URL('.', import.meta.url)), '../../../') export default { @@ -15,12 +12,6 @@ export default { mode: 'production', target: 'web', performance: false, - plugins: [ - new webpack.BannerPlugin({ - banner: 'function setImmediate(fn, ...args) { setTimeout(() => fn(...args), 1) }', - raw: true - }), - ], resolve: { aliasFields: ['browser'], } From 9bcb6349c64caa138d096b69b8d69d4cf722690f Mon Sep 17 00:00:00 2001 From: Jesse Wright <63333554+jeswr@users.noreply.github.com> Date: Sun, 14 May 2023 18:14:45 +0200 Subject: [PATCH 4/6] chore: add breaking import-all webpack test --- .../browser/fixtures/webpack.browser.config.mjs | 2 +- test/browser/fixtures/webpack.config.mjs | 13 +++++++++++++ test/browser/import-all.js | 1 + test/browser/runner-prepare.mjs | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 test/browser/fixtures/webpack.config.mjs create mode 100644 test/browser/import-all.js diff --git a/src/test/browser/fixtures/webpack.browser.config.mjs b/src/test/browser/fixtures/webpack.browser.config.mjs index e31dc7d9d..642c5b19a 100644 --- a/src/test/browser/fixtures/webpack.browser.config.mjs +++ b/src/test/browser/fixtures/webpack.browser.config.mjs @@ -13,6 +13,6 @@ export default { target: 'web', performance: false, resolve: { - aliasFields: ['browser'], + aliasFields: ['browser'] } } diff --git a/test/browser/fixtures/webpack.config.mjs b/test/browser/fixtures/webpack.config.mjs new file mode 100644 index 000000000..2b61765a3 --- /dev/null +++ b/test/browser/fixtures/webpack.config.mjs @@ -0,0 +1,13 @@ +import { resolve } from 'path' +import { fileURLToPath } from 'url' + +const rootDir = resolve(fileURLToPath(new URL('.', import.meta.url)), '../../../') + +export default { + mode: 'development', + entry: './test/browser/import-all.js', + output: { + path: resolve(rootDir, 'tmp/webpack'), + filename: 'import-all.js' + } +} diff --git a/test/browser/import-all.js b/test/browser/import-all.js new file mode 100644 index 000000000..22ab73ce3 --- /dev/null +++ b/test/browser/import-all.js @@ -0,0 +1 @@ +import * as all from '../../lib/ours' diff --git a/test/browser/runner-prepare.mjs b/test/browser/runner-prepare.mjs index 76e38f850..853841cf1 100644 --- a/test/browser/runner-prepare.mjs +++ b/test/browser/runner-prepare.mjs @@ -98,6 +98,7 @@ async function main() { case 'webpack': await run('webpack -c test/browser/fixtures/webpack.browser.config.mjs') await run('webpack -c test/browser/fixtures/webpack.node.config.mjs') + await run('webpack -c test/browser/fixtures/webpack.config.mjs') } } From bd9a7855a154cb4d2ef4f4e5fd80b886cd48978b Mon Sep 17 00:00:00 2001 From: Jesse Wright <63333554+jeswr@users.noreply.github.com> Date: Sun, 14 May 2023 18:18:42 +0200 Subject: [PATCH 5/6] chore: add import for index and browser --- test/browser/import-all.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/browser/import-all.js b/test/browser/import-all.js index 22ab73ce3..897441b4a 100644 --- a/test/browser/import-all.js +++ b/test/browser/import-all.js @@ -1 +1,2 @@ import * as all from '../../lib/ours' +import * as allBrowser from '../../lib/ours/browser' From 3caace80d34bacaeb3d2aa760f3bd0fbdd9ae3d3 Mon Sep 17 00:00:00 2001 From: Jesse Wright <63333554+jeswr@users.noreply.github.com> Date: Mon, 15 May 2023 17:08:47 +0200 Subject: [PATCH 6/6] chore: remove stream require --- lib/stream/promises.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/stream/promises.js b/lib/stream/promises.js index b85c51f47..546c9a7ca 100644 --- a/lib/stream/promises.js +++ b/lib/stream/promises.js @@ -4,7 +4,7 @@ const { ArrayPrototypePop, Promise } = require('../ours/primordials') const { isIterable, isNodeStream, isWebStream } = require('../internal/streams/utils') const { pipelineImpl: pl } = require('../internal/streams/pipeline') const { finished } = require('../internal/streams/end-of-stream') -require('stream') + function pipeline(...streams) { return new Promise((resolve, reject) => { let signal