Skip to content

Commit a98eda7

Browse files
committed
fix(builtin): process/browser should resolve from browserify
Previously I marked the action local:1 but this masked a real failure in downstream project We can workaround the linked ncc issue to make browserify run correctly
1 parent 1e156e6 commit a98eda7

3 files changed

Lines changed: 4 additions & 7 deletions

File tree

internal/npm_install/npm_umd_bundle.bzl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@ def _npm_umd_bundle(ctx):
4848
inputs = inputs,
4949
outputs = [output],
5050
arguments = [args],
51-
# browserify may load files from nodejs but these aren't declared as action inputs
52-
# looks like:
53-
# ERROR: /workdir/internal/npm_install/test/BUILD.bazel:50:1: Couldn't build file internal/npm_install/test/sinon.umd.js: Generated UMD bundle for sinon npm package [browserify] failed (Exit 1)
54-
# Error: Cannot find module 'process/browser.js' from '/b/f/w/bazel-out/host/bin/external/build_bazel_rules_nodejs/internal/npm_install/browserify-wrapped.runfiles/build_bazel_rules_nodejs/third_party/github.com/browserify/browserify
55-
# TODO(alexeagle): remove this line and make the tests work with RBE
56-
execution_requirements = {"local": "1"},
5751
)
5852

5953
return [

scripts/vendor_browserify.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ echo "Compiling browserify with ncc"
1111
echo "Local mod: revert https://github.com/browserify/browserify/pull/1801"
1212
sed -i 's#parent.id !== self._mdeps.top.id#parent.id#' third_party/github.com/browserify/browserify/index.js
1313

14+
echo "Local mod: workaround https://github.com/zeit/ncc/issues/461"
15+
sed -i "s#require('process/browser.js')#require('./browser1')#" third_party/github.com/browserify/browserify/main.js
16+
1417
echo "Copy LICENSE"
1518
cp -f ./node_modules/browserify/LICENSE ./third_party/github.com/browserify/browserify
1619

third_party/github.com/browserify/browserify/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var nextTick = require('process/browser.js').nextTick;
1+
var nextTick = require('./browser1').nextTick;
22
var apply = Function.prototype.apply;
33
var slice = Array.prototype.slice;
44
var immediateIds = {};

0 commit comments

Comments
 (0)