@@ -31,7 +31,8 @@ nodejs_binary(
     name = "browserify-wrapped",
     data = [
         ":browserify-wrapped.js",
-        "//third_party/github.com/browserify/browserify:sources",
+        "//third_party/github.com/browserify/browserify:package_contents",
+        "//third_party/github.com/jhermsmeier/browserify-named-amd:package_contents",
     ],
     entry_point = ":browserify-wrapped.js",
     install_source_map_support = False,
 
@@ -34,18 +34,26 @@ nodejs_binary(
 )
 
 npm_umd_bundle(
-    name = "some-bundle",
-    package_name = "some-package-name",
+    name = "test-minimist-bundling",
+    package_name = "minimist",
     entry_point = "@npm//:node_modules/minimist/index.js",
     package = "@npm//minimist",
 )
 
+npm_umd_bundle(
+    name = "test-core-util-is-bundling",
+    package_name = "core-util-is",
+    entry_point = "@npm//:node_modules/core-util-is/lib/util.js",
+    package = "@npm//core-util-is",
+)
+
 jasmine_node_test(
     name = "browserify_test",
     srcs = ["browserify.spec.js"],
     data = [
-        ":some-package-name.umd.js",
+        ":core-util-is.umd.js",
+        ":minimist.umd.js",
         "//internal/npm_install:browserify-wrapped",
         "@npm//jasmine",
     ],
-)
+)
@@ -6,11 +6,15 @@ describe('our bundled, vendored browserify binary', () => {
         const idxFile = fs.readFileSync(require.resolve(mainFile), {encoding: 'utf-8'});
         expect(idxFile).toContain('Copyright Joyent');
         expect(idxFile).toMatch(/Copyright \d+ Mozilla/);
-        expect(idxFile).toContain('Feross Aboukhadijeh');
+        expect(idxFile).toContain('The Dojo Foundation');
+    });
+    it('should have a named AMD module', () => {
+        const minimistUmd = require.resolve('build_bazel_rules_nodejs/internal/npm_install/test/minimist.umd.js');
+        expect(fs.readFileSync(minimistUmd, {encoding: 'utf-8'})).toContain(`define('minimist'`);
     });
     it('should work', () => {
-        const minimistUmd = require('build_bazel_rules_nodejs/internal/npm_install/test/some-package-name.umd.js');
-        const result = minimistUmd('h');
+        const minimist = require('build_bazel_rules_nodejs/internal/npm_install/test/minimist.umd.js');
+        const result = minimist('h');
         expect(result._[0]).toBe('h');
     });
 });
@@ -20,6 +20,7 @@
         "browserify": "16.2.3",
         "clang-format": "1.2.2",
         "conventional-changelog-cli": "^2.0.21",
+        "core-util-is": "^1.0.2",
         "hello": "file:./tools/npm_packages/hello",
         "husky": "1.3.1",
         "is-builtin-module": "3.0.0",
 
@@ -19,11 +19,11 @@ exports_files(["LICENSE"])
 
 filegroup(
     name = "package_contents",
-    srcs = glob(["**/*.js"]) + [
+    srcs = glob(["*.js"]) + [
         "advanced.txt",
         "BUILD.bazel",
         "LICENSE",
         "usage.txt",
     ],
-    visibility = ["//:__pkg__"],
+    visibility = ["//:__subpackages__"],
 )
@@ -3413,9 +3413,6 @@ exports.realpath = function realpath(p, cache, cb) {
   }
 };
 
-    if (!this._skipValidation) {
-      this._validateMapping(generated, original, source, name);
-    }
 
 /***/ }),
 
@@ -12709,7 +12706,6 @@ pp$8.invalidStringToken = function(position, message) {
   } else {
     this.raise(position, message);
   }
-  return this;
 };
 
 pp$8.readTmplToken = function() {
@@ -15440,7 +15436,6 @@ Glob.prototype._processReaddir2 = function (prefix, read, abs, remain, index, in
     // This was the last one, and no stats were needed
     return cb()
   }
-  inherits(P192, MPrime);
 
   // now test all matched entries as stand-ins for that part
   // of the pattern.
@@ -22155,7 +22150,12 @@ function isNumber (x) {
 /***/ 731:
 /***/ (function(__unusedmodule, exports, __webpack_require__) {
 
-var inherits = __webpack_require__(207);
+/* -*- Mode: js; js-indent-level: 2; -*- */
+/*
+ * Copyright 2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
 
 var util = __webpack_require__(913);
 var has = Object.prototype.hasOwnProperty;
@@ -22211,7 +22211,6 @@ ArraySet.prototype.add = function ArraySet_add(aStr, aAllowDuplicates) {
     } else {
       this._set[sStr] = idx;
     }
-    return objects.join(' ');
   }
 };
 
@@ -22675,10 +22674,6 @@ module.exports = __webpack_require__(654).reduce(function (acc, x) {
     return acc;
 }, {});
 
-function hasOwnProperty(obj, prop) {
-  return Object.prototype.hasOwnProperty.call(obj, prop);
-}
-
 
 /***/ }),
 
 
@@ -1049,7 +1049,7 @@ core-js@^2.4.0, core-js@^2.5.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
   integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
 
-core-util-is@~1.0.0:
+core-util-is@^1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=