wip

Author: guybedford

chompfile.toml

@@ -8,8 +8,9 @@ deps = ['nodelibs/node', 'nodelibs/browser']
 
 [[task]]
 target = 'nodelibs/browser'
-deps = ['src-browser/**/*']
+deps = ['src-browser/**/*', 'rollup.config.mjs']
 run = 'rollup -c'
+# env = { JSPM_GENERATOR_LOG = '1' }
 
 [[task]]
 target = 'nodelibs/node'

package-lock.json

@@ -8,7 +8,7 @@
   "devDependencies": {
     "@jspm/plugin-rollup": "github:jspm/rollup-plugin-jspm#main",
     "@wasmer/wasi": "^0.12.0",
-    "assert": "=2.0.0",
+    "assert": "^2.1.0",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "console-browserify": "^1.2.0",
@@ -27,8 +27,8 @@
     "path-browserify": "^1.0.1",
     "punycode": "^2.3.1",
     "querystring": "^0.2.1",
+    "readable-stream": "^4.5.2",
     "rollup": "^4.20.0",
-    "stream-browserify": "^3.0.0",
     "stream-http": "^3.2.0",
     "string_decoder": "^1.3.0",
     "timers-browserify": "^2.0.12",

package.json

@@ -1,9 +1,13 @@
 import rollupPluginJspm from '@jspm/plugin-rollup';
-import { readdirSync } from 'fs';
+import { readFileSync, writeFileSync, readdirSync } from 'node:fs';
 import rimraf from 'rimraf';
 
 rimraf.sync('./nodelibs/browser');
 
+// Patch call-bind, pending https://github.com/ljharb/call-bind/pull/8.
+const callBindPath = './node_modules/call-bind/callBound.js';
+writeFileSync(callBindPath, readFileSync(callBindPath, 'utf8').replace('./', 'call-bind'));
+
 const input = Object.fromEntries(
   [
     ...readdirSync('./src-browser'),
@@ -15,7 +19,7 @@ const input = Object.fromEntries(
     'stream/promises.js',
     'stream/web.js',
     'timers/promises.js',
-    'util/types.js'
+    'util/types.js',
   ]
     .filter(n => !n.startsWith('__') && n.endsWith('.js'))
     .map(n => [n.slice(0, -3), './src-browser/' + n])
@@ -24,8 +28,6 @@ const input = Object.fromEntries(
 const jspmPlugin = rollupPluginJspm({
   env: ['browser'],
   inputMap: {
-    // TODO: better way to override scopes?
-    imports: input,
     scopes: {
       './node_modules/assert/': input,
       './node_modules/browserify-zlib/': input,
@@ -46,15 +48,14 @@ const jspmPlugin = rollupPluginJspm({
       './node_modules/punycode/': input,
       './node_modules/querystring/': input,
       './node_modules/rollup/': input,
-      './node_modules/stream-browserify/': input,
+      './node_modules/readable-stream/': input,
       './node_modules/stream-http/': input,
       './node_modules/string_decoder/': input,
       './node_modules/timers-browserify/': input,
       './node_modules/tty-browserify/': input,
       './node_modules/url/': input,
       './node_modules/util/': input,
-      './node_modules/vm-browserify/': input
-      
+      './node_modules/vm-browserify/': input 
     }
   }
 });
@@ -68,13 +69,5 @@ export default {
     format: 'esm'
   },
   onwarn () {},
-  plugins: [jspmPlugin, {
-    buildStart () {
-      // (async () => {
-      //   for await (const { type, message } of jspmPlugin.logStream()) {
-      //     console.log(`${type}: ${message}`);
-      //   }
-      // })();
-    }
-  }]
+  plugins: [jspmPlugin]
 }

rollup.config.mjs

@@ -1,3 +1,3 @@
-import stream from 'stream-browserify';
+import stream from './stream.js';
 export default stream.Duplex;
 export var from = stream.Duplex.from;

src-browser/_stream_duplex.js

@@ -1,2 +1,2 @@
-import stream from 'stream-browserify';
+import stream from './stream.js';
 export default stream.PassThrough;

src-browser/_stream_passthrough.js

@@ -1,2 +1,2 @@
-import stream from 'stream-browserify';
+import stream from './stream.js';
 export default stream.Transform;

src-browser/_stream_transform.js

@@ -1,3 +1,3 @@
-import stream from 'stream-browserify';
+import stream from './stream.js';
 export default stream.Writable;
 export var WritableState = stream.Writable.WritableState;

src-browser/_stream_writable.js

@@ -1,4 +1,4 @@
-import stream from 'stream-browserify';
+import stream from 'readable-stream';
 import { promisify } from './util.js';
 export default stream;
 
@@ -23,4 +23,4 @@ export var Stream = stream.Stream;
 export const promises = {
   finished: promisify(stream.finished),
   pipeline: promisify(stream.pipeline)
-};
+}

src-browser/stream.js

@@ -1,3 +1,3 @@
-import util from 'util';
-export * from 'util';
+import util from './util.js';
+export * from './util.js';
 export default util;