diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..d8b83df9c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+package-lock.json
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 000000000..43c97e719
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/.travis.yml b/.travis.yml
index 74c57bf15..0ad727779 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,23 @@
 language: node_js
 node_js:
-  - "0.8"
-  - "0.10"
-  - "0.12"
+  - "10"
+  - "9"
+  - "8"
+  - "6"
+  - "4"
   - "iojs"
+  - "0.12"
+  - "0.10"
+  - "0.8"
+  - "0.6"
 before_install:
-  - npm install -g npm@~1.4.6
+  # Old npm certs are untrusted https://github.com/npm/npm/issues/20191
+  - 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ] || [ "${TRAVIS_NODE_VERSION}" = "0.8" ]; then export NPM_CONFIG_STRICT_SSL=false; fi'
+  - 'nvm install-latest-npm'
+install:
+  - 'if [ "${TRAVIS_NODE_VERSION}" = "0.6" ] || [ "${TRAVIS_NODE_VERSION}" = "0.9" ]; then nvm install --latest-npm 0.8 && npm install && nvm use "${TRAVIS_NODE_VERSION}"; else npm install; fi;'
+sudo: false
+matrix:
+  fast_finish: true
+  allow_failures:
+    - node_js: "0.6"
diff --git a/LICENSE b/LICENSE
index c9016780d..eff138cad 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,24 @@
+This software is released under the MIT license:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
 Some pieces from builtins/ taken from node core under this license:
 
 ----
@@ -29,7 +50,7 @@ buffer_ieee754.js has this license in it:
 
 ----
 
-Copyright (c) 2008-2014, Fair Oaks Labs, Inc.
+Copyright (c) 2008-2015, Fair Oaks Labs, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 000000000..d4dac1bd9
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,27 @@
+environment:
+  matrix:
+    - nodejs_version: "10"
+    - nodejs_version: "9"
+    - nodejs_version: "8"
+    - nodejs_version: "6"
+    - nodejs_version: "4"
+    - nodejs_version: "0.12"
+    - nodejs_version: "0.10"
+
+# Install scripts. (runs after repo cloning)
+install:
+  # Get the latest stable version of Node.js or io.js
+  - ps: Install-Product node $env:nodejs_version
+  # install modules
+  - npm install
+
+# Post-install test scripts.
+test_script:
+  # Output useful info for debugging.
+  - node --version
+  - npm --version
+  # run tests
+  - npm test
+
+# Don't actually build.
+build: off
diff --git a/assets/browserify.png b/assets/browserify.png
new file mode 100644
index 000000000..56a8f741d
Binary files /dev/null and b/assets/browserify.png differ
diff --git a/assets/logo.png b/assets/logo.png
new file mode 100644
index 000000000..98d6bf5f6
Binary files /dev/null and b/assets/logo.png differ
diff --git a/bin/advanced.txt b/bin/advanced.txt
index 23ed10f31..b23688c34 100644
--- a/bin/advanced.txt
+++ b/bin/advanced.txt
@@ -51,6 +51,24 @@ Advanced Options:
     to just "__filename,__dirname". This is handy if you want to run bundles in
     node.
 
+  --no-browser-field, --no-bf
+
+    Turn off package.json browser field resolution. This is also handy if you
+    need to run a bundle in node.
+
+  --transform-key
+
+    Instead of the default package.json#browserify#transform field to list
+    all transforms to apply when running browserify, a custom field, like, e.g.
+    package.json#browserify#production or package.json#browserify#staging
+    can be used, by for example running:
+    * `browserify index.js --transform-key=production > bundle.js`
+    * `browserify index.js --transform-key=staging > bundle.js`
+
+  --node
+
+    Alias for --bare and --no-browser-field.
+
   --full-paths
 
     Turn off converting module ids into numerical indexes. This is useful for
@@ -61,6 +79,10 @@ Advanced Options:
     Instead of standard bundle output, print the dependency array generated by
     module-deps.
 
+  --no-dedupe
+
+    Turn off deduping.
+
   --list
  
     Print each file in the dependency graph. Useful for makefiles.
@@ -70,7 +92,7 @@ Advanced Options:
     Consider files with specified EXTENSION as modules, this option can used
     multiple times.
 
-  --global-transform=MODULE, --g MODULE
+  --global-transform=MODULE, -g MODULE
 
     Use a transform module on all files after any ordinary transforms have run.
 
@@ -78,6 +100,10 @@ Advanced Options:
 
     Register MODULE as a plugin.
 
+  --preserve-symlinks
+
+    Preserves symlinks when resolving modules.
+
 Passing arguments to transforms and plugins:
 
   For -t, -g, and -p, you may use subarg syntax to pass options to the
diff --git a/bin/args.js b/bin/args.js
index d9fd01ccc..130ace75b 100644
--- a/bin/args.js
+++ b/bin/args.js
@@ -13,12 +13,14 @@ module.exports = function (args, opts) {
     var argv = subarg(args, {
         'boolean': [
             'deps', 'pack', 'ig', 'dg', 'im', 'd', 'list', 'builtins',
-            'commondir', 'bare', 'full-paths', 'bundle-external'
+            'commondir', 'bare', 'full-paths', 'bundle-external', 'bf',
+            'node', 'preserve-symlinks'
         ],
         string: [ 's', 'r', 'u', 'x', 't', 'i', 'o', 'e', 'c', 'it' ],
         alias: {
             ig: [ 'insert-globals', 'fast' ],
             dg: [ 'detect-globals', 'detectGlobals', 'dg' ],
+            bf: [ 'browser-field', 'browserField' ],
             im: 'ignore-missing',
             it: 'ignore-transform',
             igv: 'insert-global-vars',
@@ -43,7 +45,10 @@ module.exports = function (args, opts) {
             d: false,
             builtins: true,
             commondir: true,
-            'bundle-external': true
+            'bundle-external': true,
+            bf: true,
+            dedupe: true,
+            node: false
         }
     });
     
@@ -57,22 +62,31 @@ module.exports = function (args, opts) {
             s.resume();
             return rs;
         }
-        return path.resolve(process.cwd(), entry);
+        return entry;
     });
-    
-    if (argv.bare) {
-        argv.builtins = false;
-        argv.commondir = false;
-        argv.detectGlobals = false;
-        if (argv.igv === undefined) {
-            argv.igv = '__filename,__dirname';
-        }
-    }
 
+    if (argv.igv) {
+        var insertGlobalVars = {};
+        var wantedGlobalVars = argv.igv.split(',');
+        Object.keys(insertGlobals.vars).forEach(function (x) {
+            if (wantedGlobalVars.indexOf(x) === -1) {
+                insertGlobalVars[x] = undefined;
+            }
+        });
+    }
+    
     var ignoreTransform = argv['ignore-transform'] || argv.it;
     var b = browserify(xtend({
+        node: argv.node,
+        bare: argv.bare,
         noParse: Array.isArray(argv.noParse) ? argv.noParse : [argv.noParse],
-        extensions: [].concat(argv.extension).filter(Boolean),
+        extensions: [].concat(argv.extension).filter(Boolean).map(function (extension) {
+            if (extension.charAt(0) != '.') { 
+                return '.' + extension;
+            } else {
+                return extension
+            }
+        }),
         ignoreTransform: [].concat(ignoreTransform).filter(Boolean),
         entries: entries,
         fullPaths: argv['full-paths'],
@@ -80,7 +94,11 @@ module.exports = function (args, opts) {
         commondir: argv.commondir === false ? false : undefined,
         bundleExternal: argv['bundle-external'],
         basedir: argv.basedir,
-        
+        browserField: argv.browserField,
+        transformKey: argv['transform-key'] ? ['browserify', argv['transform-key']] : undefined,
+        dedupe: argv['dedupe'],
+        preserveSymlinks: argv['preserve-symlinks'],
+
         detectGlobals: argv.detectGlobals,
         insertGlobals: argv['insert-globals'] || argv.ig,
         insertGlobalVars: insertGlobalVars,
@@ -225,24 +243,9 @@ module.exports = function (args, opts) {
         return b;
     }
     
-    var insertGlobalVars;
-    if (argv.igv) {
-        insertGlobalVars = argv.igv.split(',').reduce(function (vars, x) {
-            vars[x] = insertGlobals.vars[x];
-            return vars;
-        }, {});
-    }
-    
     return b;
 };
 
-function copy (obj) {
-    return Object.keys(obj).reduce(function (acc, key) {
-        acc[key] = obj[key];
-        return acc;
-    }, {});
-}
-
 function splitOnColon (f) {
     var pos = f.lastIndexOf(':');
     if (pos == -1) {
diff --git a/bin/cmd.js b/bin/cmd.js
index d61bf1ea9..1a63b19ac 100755
--- a/bin/cmd.js
+++ b/bin/cmd.js
@@ -2,6 +2,8 @@
 var fs = require('fs');
 var JSONStream = require('JSONStream');
 var through = require('through2');
+var mkdirp = require('mkdirp');
+var path = require('path');
 
 var b = require('./args')(process.argv.slice(2));
 process.stdout.on('error', process.exit);
@@ -20,7 +22,7 @@ if (b.argv._[0] === 'help' || b.argv.h || b.argv.help
         .on('close', function () { process.exit(1) })
     ;
 }
-if (b.argv.v || b.argv.version) {
+if (b.argv.version) {
     return console.log(require('../package.json').version);
 }
 
@@ -54,24 +56,25 @@ if (b.argv.list) {
 
 var bundle = b.bundle();
 bundle.on('error', errorExit);
+bundle.on('end', successExit);
 
+var tmpfile;
 var outfile = b.argv.o || b.argv.outfile;
 if (outfile) {
-    bundle.pipe(fs.createWriteStream(outfile));
+    mkdirp.sync(path.dirname(outfile));
+    
+    // we'll output to a temp file within same filesystem, then atomically overwrite outfile once successful
+    tmpfile = outfile + ".tmp-browserify-" + Math.random().toFixed(20).slice(2)
+    bundle.pipe(fs.createWriteStream(tmpfile));
 }
 else {
     bundle.pipe(process.stdout);
 }
 
-function packageFilter (info) {
-    if (info && typeof info.browserify === 'string' && !info.browser) {
-        info.browser = info.browserify;
-        delete info.browserify;
-    }
-    return info || {};
-}
-
 function errorExit(err) {
+    if (tmpfile) fs.unlink(tmpfile, function (err) {
+      if (err) /* no-op, we're already exiting unhappily… */;
+    });
     if (err.stack) {
         console.error(err.stack);
     }
@@ -80,3 +83,9 @@ function errorExit(err) {
     }
     process.exit(1);
 }
+
+function successExit() {
+  if (tmpfile && outfile) fs.rename(tmpfile, outfile, function (err) {
+    if (err) errorExit(err);
+  });
+}
diff --git a/changelog.markdown b/changelog.markdown
index 4cbbdb7be..ec63d8c91 100644
--- a/changelog.markdown
+++ b/changelog.markdown
@@ -1,3 +1,393 @@
+# 16.2.3
+
+add empty stub for the `inspector` builtin module.
+
+https://github.com/browserify/browserify/pull/1854
+
+change the "browser" field link to the browser-field-spec repo instead of the old gist.
+
+https://github.com/browserify/browserify/pull/1845
+
+# 16.2.2
+
+Remove some extraneous files from the published package.
+
+# 16.2.1
+
+Fix relative `--external` paths on Windows.
+
+https://github.com/browserify/browserify/pull/1704
+
+Fix tests to work on Windows, and add Appveyor CI for Windows testing.
+
+https://github.com/browserify/browserify/pull/1819
+
+# 16.2.0
+
+update the browser versions of `vm-browserify` and `string_decoder`.
+
+`string_decoder` updates to the Node 8+ API.
+`vm-browserify` replaces an unlicensed dependency by an MIT one.
+
+https://github.com/browserify/browserify/pull/1829
+
+# 16.1.1
+
+add empty stub for the `perf_hooks` builtin module.
+
+https://github.com/browserify/browserify/pull/1815
+
+# 16.1.0
+
+add `bare` and `node` options to the API, same as the `--bare` and `--node` CLI arguments.
+
+https://github.com/browserify/browserify/pull/1804
+
+# 16.0.0
+
+add `--preserve-symlinks` option from Node 6.3
+
+https://github.com/browserify/browserify/pull/1742
+https://github.com/browserify/browserify/pull/1801
+
+update the browser version of `events` to 2.0.0—this version adds methods like `prependListener` that were introduced in recent node versions, but it is also twice the size of events v1.x (2KB instead of 1KB).
+
+https://github.com/browserify/browserify/pull/1803
+
+Dynamically calculate `__dirname` and `__filename` when `--node` is passed
+
+https://github.com/browserify/browserify/pull/1725
+
+upgrade module-deps, see https://github.com/browserify/module-deps/releases/tag/v6.0.0
+
+https://github.com/browserify/browserify/commit/e5e1ec8799f1007a56118ae46646e0048385ed84
+
+# 15.2.0
+
+create parent directories if they do not exist when `--outfile /x/y/z/bundle.js` is used
+
+https://github.com/browserify/browserify/pull/995
+
+add regression test for object rest spread syntax
+
+https://github.com/browserify/browserify/pull/1798
+
+# 15.1.0
+
+restore support for node `< 4.0` until we can decide on a support schedule
+
+# 15.0.0
+
+fixed repository url in package.json.
+
+https://github.com/browserify/browserify/commit/5ec19eed48a5f46cb48d44be8ffc2f6bfb73fbfb
+
+update `module-deps` to 5.0.0, which enables requiring modules in backtick-enclosed strings.
+
+https://github.com/browserify/browserify/pull/1785
+
+dropped testing in node 0.10 and 0.12, set supported node versions to `>=4`
+
+https://github.com/browserify/browserify/pull/1743
+https://github.com/browserify/browserify/pull/1793
+
+add support for passing arrays to the `exclude` and `ignore` methods.
+
+https://github.com/browserify/browserify/pull/1769
+
+# 14.5.0
+
+update `os-browserify` to 0.3.0, which adds a shim for node.js's `os.homedir` method.
+
+https://github.com/browserify/browserify/pull/1767
+
+update `browserify-zlib` to 0.2.0, which adds support for dictionaries.
+
+https://github.com/browserify/browserify/pull/1733
+
+# 14.4.0
+
+update `string_decoder` to 1.0.0, which matches the latest node.js behavior more closely.
+
+https://github.com/substack/node-browserify/pull/1714
+
+# 14.3.0
+
+update `https-browserify` to 1.0.0, which matches node.js behavior more closely.
+
+- throw exception if non-https URL is passed to `https.request` or `https.get`
+- support passing string URL as first argument to `https.request` and `https.get`
+
+https://github.com/substack/node-browserify/pull/1710
+
+# 14.2.0
+
+adds a --transform-key flag to the command-line tool
+
+https://github.com/substack/node-browserify/pull/1709
+
+# 14.1.0
+
+writes to a temp outfile until success
+
+Previously, browserify would overwrite output files when an error occurs.
+
+https://github.com/substack/node-browserify/pull/1673
+https://github.com/substack/node-browserify/issues/899
+
+# 14.0.0
+
+Updates the version of the buffer package, which drops support for IE8-10.
+
+buffer v5 removes the `Object` implementation and relies on a single,
+fast Typed Array (`Uint8Array`) implementation, greatly simplifying the
+maintanence of the buffer package.
+
+If IE8-10 support is critical to your web app, you can continue to rely on
+browserify v13, or see the PR for other workarounds.
+
+https://github.com/substack/node-browserify/pull/1678
+
+# 13.3.0
+
+updates the version for the assert package
+
+https://github.com/substack/node-browserify/pull/1611
+
+# 13.2.0
+
+allow configuring transformKey from module-deps
+https://github.com/substack/node-browserify/pull/1670
+
+# 13.1.1
+
+boost performance by memoizing calls to path.relative()
+
+https://github.com/substack/node-browserify/pull/1544
+
+# 13.1.0
+
+exposes `opts.dedupe` and `--no-deupe` to optionally turn off deduping behavior:
+[#1581](https://github.com/substack/node-browserify/pull/1581)
+
+# 13.0.1
+
+## Internal
+
+[#1552](https://github.com/substack/node-browserify/pull/1552), [#1555](https://github.com/substack/node-browserify/pull/1555): Use native `Array.isArray` and drop `isarray` dep. ([@kt3k](https://github.com/kt3k))
+
+# 13.0.0
+
+This release bumps the [`buffer`](https://www.npmjs.com/package/buffer) dependency
+to v4, which has one possible breaking change:
+
+- The `buffer.toArrayBuffer()` method on `Buffer` instances has been removed.
+
+(This is probably not a problem for 99.9% of users.)
+
+This API was added in node v0.11.8 and
+[removed before v0.12 was released](https://github.com/nodejs/node-v0.x-archive/issues/7609#issuecomment-42903457).
+It was added to browserify's `buffer` implementation but was never removed when v0.12
+ was released. `buffer` v4 removes it so we have full parity with node.js.
+
+Going forward, to get an `ArrayBuffer` from a node.js-style `Buffer`, users should
+just use `buffer.buffer`. This works because `Buffer` is a subclass of `Uint8Array`
+in both the browser and node.js (since v3).
+
+On the plus side, this release also includes:
+
+- Performance improvements to `buffer` that
+[increase the speed](https://github.com/feross/buffer/pull/92) of some buffer
+methods by as much as 30%!
+
+# 12.0.2
+
+normalizes module paths on windows to consistently use `/`
+
+https://github.com/substack/node-browserify/pull/1424#issuecomment-170143099
+
+# 12.0.1
+
+adds the previously failing tests and a small change necessary for transforms to
+be applied properly for symlinked packages
+
+https://github.com/substack/node-browserify/pull/1392
+
+# 12.0.0
+
+Node support changes: now testing against the latest node (currently 4.2.1).
+node 0.8 is no longer supported, and iojs isn't actively tested.
+
+Stream3 everywhere! Everything has been updated to use streams3.
+
+Sourcemaps charset now uses an `=` instead of a `:`. This fixes certain issues
+with Chinese characters in sourcemaps. See #753.
+
+module-deps has been updated to fix root transforms on symlinked modules. See
+https://github.com/substack/module-deps/pull/99.
+
+stream-http, the module that provides `http` support, dropped IE8 support. If
+you depend on this, see https://github.com/jhiesey/stream-http#ie8-note.
+
+Removed `builtins` and `commondir` – both unused dependencies.
+
+# 11.2.0
+
+When `bundleExternal` is set to `false`, `process` and `buffer` are now correctly excluded. Also, using `--igv` via the CLI now works. That also means that `--bare` and `--node` actually insert `__filename` and `__dirname`.
+
+https://github.com/substack/node-browserify/pull/1361
+
+# 11.1.0
+
+adds a `'.'` to extensions if it wasn't added
+
+https://github.com/substack/node-browserify/pull/1380
+
+# 11.0.1
+
+The callback form of bundle() uses the returned output stream instead of the
+pipeline so that the `'end'` event will fire on the bundle instance.
+
+https://github.com/substack/watchify/pull/249#issuecomment-126061169
+
+# 11.0.0
+
+## streams3
+
+The [`readable-stream`](https://npmjs.com/package/readable-stream) dependency was updated to `^2.0.0`. This package is inserted into bundles as `require('stream')`. Bundles will now get the latest streams implementation from io.js/node.js core, instead of an old version from node.js 0.11.x. Go forth and stream ALL THE DATA without fear!
+
+## shiny new HTTP package
+
+[John Hiesey](https://github.com/jhiesey) rewrote the [http-browserify](https://npmjs.org/package/http-browserify) package
+to create [stream-http](https://npmjs.org/package/stream-http), an implemention of `http` that supports streaming in modern browsers. Before v11.0.0, in most situations when you used `http.get` or `http.request`, the entire request would buffer in memory until the download was complete, and a single `'data'` event was emitted with the entire response as a string.
+
+`stream-http` uses the [Fetch API](https://fetch.spec.whatwg.org/) and various browser-specific XHR extensions to make binary streaming http requests work in as many browsers as possible.
+
+The following browsers support true streaming, where only a small amount of the request has to be held in memory at once:
+
+* Chrome >= 43 (using the `fetch` api)
+* Firefox >= 9 (using `moz-chunked-arraybuffer` responseType with XHR)
+
+The following browsers support pseudo-streaming, where the data is available before the request finishes, but the entire response must be held in memory:
+
+* Safari >= 5
+* IE >= 10
+* Most other Webkit-based browsers, including the default Android browser
+
+Older browsers will work, without streaming support. There is no support for IE6 or IE7.
+
+Compared to `http-browserify`, it is not necessary to set `options.responseType`. The `responseType` property of the XHR object will be set automatically depending on what features are detected in the browser (although see `options.mode` in the [readme](https://github.com/jhiesey/stream-http) to see how you can optimize this choice manually).
+
+The `response` is a streams3 stream, so all data is passed as `Buffer`s, unlike the variable types provided by the `'data'` event in `http-browserify`. This behavior tries to mimic the node core `http` module as closely as possible.
+
+* [#1327](https://github.com/substack/node-browserify/pull/1327)
+
+If you're brave, go ahead and give v11.0.0 a try today!
+
+# 10.2.6
+
+uses the non-sync version of fs.realpath
+
+# 10.2.5
+
+fixes an issue with symlinked files executing multiple times
+
+https://github.com/substack/node-browserify/issues/1063
+https://github.com/substack/node-browserify/pull/1318
+
+# 10.2.4
+
+fixes requiring an entry from another entry
+
+remove unused dep "deep-equal" and unused file "lib/_exclude.js"
+
+https://github.com/substack/node-browserify/pull/1268
+
+# 10.2.3
+
+fixes an errant space in the `--no-browser-field` flag alias
+that kept it from working
+
+https://github.com/substack/node-browserify/issues/1286
+
+# 10.2.2
+
+fix tests for tap@^1.1.0 (and update tap)
+
+https://github.com/substack/node-browserify/pull/1276
+
+# 10.2.1
+
+housekeeping - removed unused code
+
+https://github.com/substack/node-browserify/pull/1273
+
+# 10.2.0
+
+remove unnecessary "isDedupe" json check. this was a hack-fix for watchify <=2.4.
+
+https://github.com/substack/node-browserify/pull/1244
+
+fixes for the "noParse" path matcher.
+
+https://github.com/substack/node-browserify/pull/1259
+
+add syntax check cache. this speeds up rebuilds (like when using watchify).
+
+https://github.com/substack/node-browserify/pull/1253
+
+update to browser-pack@^5.0.0 - includes several fixes related to source maps.
+
+https://github.com/substack/node-browserify/pull/1257
+
+# 10.1.3
+
+Replace jsonstream with JSONStream
+
+https://github.com/substack/node-browserify/pull/1252
+
+# 10.1.2
+
+Replace JSONStream with jsonstream
+Update deps to avoid jsonstream npm case problems
+
+https://github.com/substack/node-browserify/pull/1247
+https://github.com/substack/node-browserify/commit/1ca71e23
+
+# 10.1.1
+
+ensures that entry paths are always full paths
+
+https://github.com/substack/node-browserify/pull/1248
+
+# 10.1.0
+
+adds `--no-browser-field` and `opts.browserField = false` behavior to turn off
+the package.json browser field. This is useful if you want to make a bundle with
+a target of node or some environment with shimmed node primitives.
+
+A new alias `--node` sets `--no-browser-field` and `--bare`.
+
+https://github.com/substack/node-browserify/pull/1240
+
+# 10.0.0
+
+## Possibly Breaking Change
+The ‘process’ dependency was updated to ~0.11.0, this module is inserted into bundles as the ‘process’ global/dependency.
+Previously, an unhandled error thrown in a ‘process.nextTick’ task would prevent any subsequent tasks from running, forever.
+The task queue now recovers from this condition, but may do so on a future browser tick.
+As part of this update, ‘process.nextTick’ now accepts variadic arguments, passed to the task, added to io.js in 1.8.1.
+
+* [#1231](https://github.com/substack/node-browserify/pull/1231)
+* [defunctzombie/node-process#38](https://github.com/defunctzombie/node-process/pull/38)
+* [iojs/io.js#1077](https://github.com/iojs/io.js/pull/1077)
+
+## Other changes
+
+* Escapes JavaScript-unsafe characters from JSON. [#1211](https://github.com/substack/node-browserify/pull/1211)
+* Removes ‘-v’ shortcut for ‘--version’ (conflicted with watchify) [#1222](https://github.com/substack/node-browserify/pull/1222)
+* Updated ‘defined’, ‘punycode’, ‘module-deps’, and ‘xtend’ dependencies to reduce install size [#1230](https://github.com/substack/node-browserify/pull/1230)
+
 # 9.0.8
 
 makes `.require({ expose: 'name' })` and `require('name')` work at the same time
@@ -442,7 +832,7 @@ adds an untracked test
 At a glance:
 
 * extensible internal labeled-stream-splicer pipeline
-* bundle() - no longer accepts `opts`, callback gets a buffer 
+* bundle() - no longer accepts `opts`, callback gets a buffer
 * b.deps(), b.pack(), opts.pack, opts.deps are gone
 * can call bundle() multiple times on the same instance
 * a better --noparse matcher
@@ -637,7 +1027,7 @@ renders complete stack traces where before they were getting truncated https://g
 
 # 3.44.2
 
-slims down the dependency payload by 20M https://github.com/substack/node-browserify/pull/736 
+slims down the dependency payload by 20M https://github.com/substack/node-browserify/pull/736
 
 # 3.44.1
 
@@ -653,39 +1043,39 @@ lets b.transform(opts, t) args to be swapped around since opts is more common as
 
 # 3.42.0
 
-passes through the dir parameter in opts.packageFilter from module-deps 1.10.0 https://github.com/substack/node-browserify/pull/731 
+passes through the dir parameter in opts.packageFilter from module-deps 1.10.0 https://github.com/substack/node-browserify/pull/731
 
 # 3.41.0
 
-has an option to disable external files, making it easier to run bundles in node for code coverage https://github.com/substack/node-browserify/pull/672 
+has an option to disable external files, making it easier to run bundles in node for code coverage https://github.com/substack/node-browserify/pull/672
 
 # 3.40.4
 
-makes --list work again https://github.com/substack/node-browserify/pull/727 
+makes --list work again https://github.com/substack/node-browserify/pull/727
 
 # 3.40.3
 
-merges a patch for piping via stdin and --require at the same time https://github.com/substack/node-browserify/pull/728 
+merges a patch for piping via stdin and --require at the same time https://github.com/substack/node-browserify/pull/728
 
 # 3.40.2
 
-upgrades module-deps to fix --list for $NODE_PATH https://github.com/substack/node-browserify/issues/726 
+upgrades module-deps to fix --list for $NODE_PATH https://github.com/substack/node-browserify/issues/726
 
 # 3.40.1
 
-upgrades module-deps to get this packageTransform bugfix https://github.com/substack/module-deps/pull/32 
+upgrades module-deps to get this packageTransform bugfix https://github.com/substack/module-deps/pull/32
 
 # 3.40.0
 
-modifies the behavior of opts.builtins to be more useful and intuitive https://github.com/substack/node-browserify/pull/717 
+modifies the behavior of opts.builtins to be more useful and intuitive https://github.com/substack/node-browserify/pull/717
 
 # 3.39.0
 
-adds a zlib that has parity with node https://github.com/substack/node-browserify/pull/721 
+adds a zlib that has parity with node https://github.com/substack/node-browserify/pull/721
 
 # 3.38.0
 
-upgrades derequire which uses esprima-fb https://github.com/substack/node-browserify/pull/710 
+upgrades derequire which uses esprima-fb https://github.com/substack/node-browserify/pull/710
 
 # 3.37.2
 
@@ -701,7 +1091,7 @@ also reverts that require('process') thing which was mistakenly briefly put in t
 
 # 3.37.0
 
-gives streams2 semantics for bundle() https://github.com/substack/node-browserify/pull/646 
+gives streams2 semantics for bundle() https://github.com/substack/node-browserify/pull/646
 
 # 3.36.1
 
@@ -713,35 +1103,35 @@ adds require('process') and removes the path resolution for process out of inser
 
 # 3.35.0
 
-adds an empty tls stub to the builtins list https://github.com/substack/node-browserify/issues/703 
+adds an empty tls stub to the builtins list https://github.com/substack/node-browserify/issues/703
 
 # 3.34.0
 
-fixes a bug with transforms not being applied in deps() https://github.com/substack/node-browserify/pull/708 
+fixes a bug with transforms not being applied in deps() https://github.com/substack/node-browserify/pull/708
 
 # 3.33.1
 
-fixes a bug with options in --global-transform on the command-line https://github.com/substack/node-browserify/pull/705 
+fixes a bug with options in --global-transform on the command-line https://github.com/substack/node-browserify/pull/705
 
 # 3.33.0
 
-fixes parsing errors while maintaining es6 support by switching to esprima-fb https://github.com/substack/node-browserify/issues/698 
+fixes parsing errors while maintaining es6 support by switching to esprima-fb https://github.com/substack/node-browserify/issues/698
 
 # 3.32.1
 
-should be easier to shinkwrap and install on windows https://github.com/substack/node-browserify/pull/684 
+should be easier to shinkwrap and install on windows https://github.com/substack/node-browserify/pull/684
 
 # 3.32.0
 
-adds --full-path and opts.fullPath to always expand ids to full paths https://github.com/substack/node-browserify/pull/668#issuecomment-36586786 
+adds --full-path and opts.fullPath to always expand ids to full paths https://github.com/substack/node-browserify/pull/668#issuecomment-36586786
 
 # 3.31.2
 
-fixes a bug in the subarg argument parsing for multiple transforms https://github.com/substack/node-browserify/issues/678 
+fixes a bug in the subarg argument parsing for multiple transforms https://github.com/substack/node-browserify/issues/678
 
 # 3.31.1
 
-uses process.cwd() as the default rebase target instead of commondir https://github.com/substack/node-browserify/pull/669#issuecomment-36078282 
+uses process.cwd() as the default rebase target instead of commondir https://github.com/substack/node-browserify/pull/669#issuecomment-36078282
 
 # 3.31.0
 
@@ -749,23 +1139,23 @@ merges https://github.com/substack/node-browserify/pull/669  which should help w
 
 # 3.30.4
 
-fixes parsing the --insert-global-vars argument properly https://github.com/substack/node-browserify/pull/674 
+fixes parsing the --insert-global-vars argument properly https://github.com/substack/node-browserify/pull/674
 
 # 3.30.3
 
-fixes exclude globbing in the arg parser https://github.com/substack/node-browserify/pull/676 
+fixes exclude globbing in the arg parser https://github.com/substack/node-browserify/pull/676
 
 # 3.30.2
 
-included a fix for --no-builtins for non-wrapped modules https://github.com/substack/node-browserify/pull/666 
+included a fix for --no-builtins for non-wrapped modules https://github.com/substack/node-browserify/pull/666
 
 # 3.30.1
 
-upgrades buffer for a utf8 fix https://github.com/substack/node-browserify/pull/656 
+upgrades buffer for a utf8 fix https://github.com/substack/node-browserify/pull/656
 
 # 3.30.0
 
-adds globs for -u, -i, and -x https://github.com/substack/node-browserify/issues/654 
+adds globs for -u, -i, and -x https://github.com/substack/node-browserify/issues/654
 
 # 3.29.1
 
@@ -781,11 +1171,11 @@ now always includes the full package.json content in the 'package' event
 
 # 3.28.1
 
-fixes a bug with stream entry order https://github.com/substack/node-browserify/pull/643 
+fixes a bug with stream entry order https://github.com/substack/node-browserify/pull/643
 
 # 3.28.0
 
-adds plugins for doing super fancy things like factored bundle output https://github.com/substack/node-browserify#plugins 
+adds plugins for doing super fancy things like factored bundle output https://github.com/substack/node-browserify#plugins
 
 # 3.27.1
 
@@ -793,11 +1183,11 @@ fixes a bug resolving transform modules when browserify is under a symlink
 
 # 3.27.0
 
-adds transform configuration in the package.json browserify.transform field https://github.com/substack/module-deps#packagejson-transformkey 
+adds transform configuration in the package.json browserify.transform field https://github.com/substack/module-deps#packagejson-transformkey
 
 # 3.26.0
 
-you can pass arguments to transforms https://github.com/substack/node-browserify/blob/master/bin/advanced.txt#L67-L77 
+you can pass arguments to transforms https://github.com/substack/node-browserify/blob/master/bin/advanced.txt#L67-L77
 
 # 3.25.2
 
@@ -809,7 +1199,7 @@ fixes the transform docs
 
 # 3.25.0
 
-adds 'bundle' and 'transform' events https://github.com/substack/node-browserify#bonbundle-function-bundle- 
+adds 'bundle' and 'transform' events https://github.com/substack/node-browserify#bonbundle-function-bundle-
 
 # 3.24.11
 
@@ -817,15 +1207,15 @@ upgrades derequire to 0.6.0. That should be the last piece needed for full es6 s
 
 # 3.24.10
 
-expands the documentation for the package.json browser and browserify.transform fields https://github.com/substack/node-browserify#packagejson 
+expands the documentation for the package.json browser and browserify.transform fields https://github.com/substack/node-browserify#packagejson
 
 # 3.24.9
 
-fixes generator syntax and other es6-isms in browserify https://github.com/substack/node-browserify/issues/614 
+fixes generator syntax and other es6-isms in browserify https://github.com/substack/node-browserify/issues/614
 
 # 3.24.7
 
-fixes noParse, which had accidentally been disabled in the insert-module-global changes and also closes https://github.com/substack/node-browserify/issues/504 
+fixes noParse, which had accidentally been disabled in the insert-module-global changes and also closes https://github.com/substack/node-browserify/issues/504
 
 # 3.24.6
 
@@ -833,15 +1223,15 @@ similar to 3.24.5, 3.24.6 fixes some error reporting propagation from the browse
 
 # 3.24.3
 
-fixes how require('buffer').Buffer wasn't the same as implicit Buffer https://github.com/substack/node-browserify/issues/612 
+fixes how require('buffer').Buffer wasn't the same as implicit Buffer https://github.com/substack/node-browserify/issues/612
 
 # 3.24.2
 
-fixes where the output stream didn't emit "close" in standalone mode https://github.com/substack/node-browserify/pull/608 
+fixes where the output stream didn't emit "close" in standalone mode https://github.com/substack/node-browserify/pull/608
 
 # 3.24.1
 
-fixes an issue where --standalone combined with expose caused a syntax error https://github.com/substack/node-browserify/issues/489 
+fixes an issue where --standalone combined with expose caused a syntax error https://github.com/substack/node-browserify/issues/489
 
 # 3.24.0
 
@@ -849,7 +1239,7 @@ removes require() calls from --standalone so you can require() a standalone bund
 
 # 3.23.0
 
-merges this tiny fix returning `this` in noParse() https://github.com/substack/node-browserify/pull/592 
+merges this tiny fix returning `this` in noParse() https://github.com/substack/node-browserify/pull/592
 
 # 3.22.0
 
@@ -865,7 +1255,7 @@ has a fix for the case where stdin is implicitly treated as the input stream ins
 
 # 3.20.0
 
-3.20.0 is out: parity with how $NODE_PATH works in node https://github.com/substack/node-browserify/issues/593 
+3.20.0 is out: parity with how $NODE_PATH works in node https://github.com/substack/node-browserify/issues/593
 
 # 3.19.1
 
@@ -883,7 +1273,7 @@ There are 2 big changes in v3 but most code should be relatively unaffected.
 
 [feross](https://github.com/feross) forked
 the [buffer-browserify](https://npmjs.org/package/buffer-browserify) package
-to create 
+to create
 [native-buffer-browserify](https://npmjs.org/package/native-buffer-browserify),
 a `Buffer` implementation that uses `Uint8Array` to get `buf[i]` notation and
 parity with the node core `Buffer` api without the performance hit of the
diff --git a/code-of-conduct.md b/code-of-conduct.md
new file mode 100644
index 000000000..4a324853b
--- /dev/null
+++ b/code-of-conduct.md
@@ -0,0 +1,78 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at (any one or all of these):
+
+* substack@gmail.com
+
+All complaints will be reviewed and investigated and will result in a response
+that is deemed necessary and appropriate to the circumstances. The project team
+is obligated to maintain confidentiality with regard to the reporter of an
+incident. Further details of specific enforcement policies may be posted
+separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/index.js b/index.js
index 1216cdc81..54dcf2c6e 100644
--- a/index.js
+++ b/index.js
@@ -1,3 +1,4 @@
+var path = require('path');
 var mdeps = require('module-deps');
 var depsSort = require('deps-sort');
 var bpack = require('browser-pack');
@@ -9,15 +10,15 @@ var builtins = require('./lib/builtins.js');
 var splicer = require('labeled-stream-splicer');
 var through = require('through2');
 var concat = require('concat-stream');
-var duplexer = require('duplexer2');
 
 var inherits = require('inherits');
 var EventEmitter = require('events').EventEmitter;
 var xtend = require('xtend');
-var copy = require('shallow-copy');
-var isarray = require('isarray');
+var isArray = Array.isArray;
 var defined = require('defined');
 var has = require('has');
+var sanitize = require('htmlescape').sanitize;
+var shasum = require('shasum');
 
 var bresolve = require('browser-resolve');
 var resolve = require('resolve');
@@ -27,7 +28,10 @@ var readonly = require('read-only-stream');
 module.exports = Browserify;
 inherits(Browserify, EventEmitter);
 
+var fs = require('fs');
 var path = require('path');
+var cachedPathRelative = require('cached-path-relative');
+
 var paths = {
     empty: path.join(__dirname, 'lib/_empty.js')
 };
@@ -37,10 +41,27 @@ function Browserify (files, opts) {
     if (!(this instanceof Browserify)) return new Browserify(files, opts);
     if (!opts) opts = {};
     
-    if (typeof files === 'string' || isarray(files) || isStream(files)) {
+    if (typeof files === 'string' || isArray(files) || isStream(files)) {
         opts = xtend(opts, { entries: [].concat(opts.entries || [], files) });
     }
     else opts = xtend(files, opts);
+
+    if (opts.node) {
+        opts.bare = true;
+        opts.browserField = false;
+    }
+    if (opts.bare) {
+        opts.builtins = false;
+        opts.commondir = false;
+        if (opts.insertGlobalVars === undefined) {
+            opts.insertGlobalVars = {}
+            Object.keys(insertGlobals.vars).forEach(function (name) {
+                if (name !== '__dirname' && name !== '__filename') {
+                    opts.insertGlobalVars[name] = undefined;
+                }
+            })
+        }
+    }
     
     self._options = opts;
     if (opts.noparse) opts.noParse = opts.noparse;
@@ -48,7 +69,9 @@ function Browserify (files, opts) {
     if (opts.basedir !== undefined && typeof opts.basedir !== 'string') {
         throw new Error('opts.basedir must be either undefined or a string.');
     }
-    
+
+    opts.dedupe = opts.dedupe === false ? false : true;
+
     self._external = [];
     self._exclude = [];
     self._ignore = [];
@@ -60,10 +83,18 @@ function Browserify (files, opts) {
     self._transforms = [];
     self._entryOrder = 0;
     self._ticked = false;
+    self._bresolve = opts.browserField === false
+        ? function (id, opts, cb) {
+            if (!opts.basedir) opts.basedir = path.dirname(opts.filename)
+            resolve(id, opts, cb)
+        }
+        : bresolve
+    ;
+    self._syntaxCache = {};
 
     var ignoreTransform = [].concat(opts.ignoreTransform).filter(Boolean);
     self._filterTransform = function (tr) {
-        if (Array.isArray(tr)) {
+        if (isArray(tr)) {
             return ignoreTransform.indexOf(tr[0]) === -1;
         }
         return ignoreTransform.indexOf(tr) === -1;
@@ -91,7 +122,7 @@ function Browserify (files, opts) {
 
 Browserify.prototype.require = function (file, opts) {
     var self = this;
-    if (isarray(file)) {
+    if (isArray(file)) {
         file.forEach(function (x) {
             if (typeof x === 'object') {
                 self.require(x.file, xtend(opts, x));
@@ -105,13 +136,13 @@ Browserify.prototype.require = function (file, opts) {
     var basedir = defined(opts.basedir, self._options.basedir, process.cwd());
     var expose = opts.expose;
     if (file === expose && /^[\.]/.test(expose)) {
-        expose = '/' + path.relative(basedir, expose);
+        expose = '/' + relativePath(basedir, expose);
     }
     if (expose === undefined && this._options.exposeAll) {
         expose = true;
     }
     if (expose === true) {
-        expose = '/' + path.relative(basedir, file);
+        expose = '/' + relativePath(basedir, file);
     }
     
     if (isStream(file)) {
@@ -148,16 +179,16 @@ Browserify.prototype.require = function (file, opts) {
     if (typeof file === 'object') {
         row = xtend(file, opts);
     }
-    else if (isExternalModule(file)) {
+    else if (!opts.entry && isExternalModule(file)) {
         // external module or builtin
         row = xtend(opts, { id: expose || file, file: file });
     }
     else {
-        row = xtend(opts, { file: file });
+        row = xtend(opts, { file: path.resolve(basedir, file) });
     }
     
     if (!row.id) {
-        row.id = expose || file;
+        row.id = expose || row.file;
     }
     if (expose || !row.entry) {
         // Make this available to mdeps so that it can assign the value when it
@@ -173,6 +204,7 @@ Browserify.prototype.require = function (file, opts) {
     }
     
     if (row.entry) row.order = self._entryOrder ++;
+    
     if (opts.transform === false) row.transform = false;
     self.pipeline.write(row);
     return self;
@@ -181,7 +213,7 @@ Browserify.prototype.require = function (file, opts) {
 Browserify.prototype.add = function (file, opts) {
     var self = this;
     if (!opts) opts = {};
-    if (isarray(file)) {
+    if (isArray(file)) {
         file.forEach(function (x) { self.add(x, opts) });
         return this;
     }
@@ -190,7 +222,7 @@ Browserify.prototype.add = function (file, opts) {
 
 Browserify.prototype.external = function (file, opts) {
     var self = this;
-    if (isarray(file)) {
+    if (isArray(file)) {
         file.forEach(function (f) {
             if (typeof f === 'object') {
                 self.external(f, xtend(opts, f));
@@ -242,20 +274,34 @@ Browserify.prototype.external = function (file, opts) {
     if (!opts) opts = {};
     var basedir = defined(opts.basedir, process.cwd());
     this._external.push(file);
-    this._external.push('/' + path.relative(basedir, file));
+    this._external.push('/' + relativePath(basedir, file));
     return this;
 };
 
 Browserify.prototype.exclude = function (file, opts) {
     if (!opts) opts = {};
+    if (isArray(file)) {
+        var self = this;
+        file.forEach(function(file) {
+            self.exclude(file, opts);
+        });
+        return this;
+    }
     var basedir = defined(opts.basedir, process.cwd());
     this._exclude.push(file);
-    this._exclude.push('/' + path.relative(basedir, file));
+    this._exclude.push('/' + relativePath(basedir, file));
     return this;
 };
 
 Browserify.prototype.ignore = function (file, opts) {
     if (!opts) opts = {};
+    if (isArray(file)) {
+        var self = this;
+        file.forEach(function(file) {
+            self.ignore(file, opts);
+        });
+        return this;
+    }
     var basedir = defined(opts.basedir, process.cwd());
 
     // Handle relative paths
@@ -273,7 +319,7 @@ Browserify.prototype.transform = function (tr, opts) {
     if (typeof opts === 'function' || typeof opts === 'string') {
         tr = [ opts, tr ];
     }
-    if (isarray(tr)) {
+    if (isArray(tr)) {
         opts = tr[1];
         tr = tr[0];
     }
@@ -329,7 +375,7 @@ Browserify.prototype.transform = function (tr, opts) {
 };
 
 Browserify.prototype.plugin = function (p, opts) {
-    if (isarray(p)) {
+    if (isArray(p)) {
         opts = p[1];
         p = p[0];
     }
@@ -368,7 +414,7 @@ Browserify.prototype._createPipeline = function (opts) {
     
     var dopts = {
         index: !opts.fullPaths && !opts.exposeAll,
-        dedupe: true,
+        dedupe: opts.dedupe,
         expose: this._expose
     };
     this._bpack = bpack(xtend(opts, { raw: true }));
@@ -395,10 +441,10 @@ Browserify.prototype._createPipeline = function (opts) {
             if (self._external.indexOf(row.file) >= 0) return next();
             
             if (isAbsolutePath(row.id)) {
-                row.id = '/' + path.relative(basedir, row.file);
+                row.id = '/' + relativePath(basedir, row.file);
             }
             Object.keys(row.deps || {}).forEach(function (key) {
-                row.deps[key] = '/' + path.relative(basedir, row.deps[key]);
+                row.deps[key] = '/' + relativePath(basedir, row.deps[key]);
             });
             this.push(row);
             next();
@@ -409,7 +455,7 @@ Browserify.prototype._createPipeline = function (opts) {
 
 Browserify.prototype._createDeps = function (opts) {
     var self = this;
-    var mopts = copy(opts);
+    var mopts = xtend(opts);
     var basedir = defined(opts.basedir, process.cwd());
 
     // Let mdeps populate these values since it will be resolving file paths
@@ -419,7 +465,7 @@ Browserify.prototype._createDeps = function (opts) {
     self._extensions = mopts.extensions;
 
     mopts.transform = [];
-    mopts.transformKey = [ 'browserify', 'transform' ];
+    mopts.transformKey = defined(opts.transformKey, [ 'browserify', 'transform' ]);
     mopts.postFilter = function (id, file, pkg) {
         if (opts.postFilter && !opts.postFilter(id, file, pkg)) return false;
         if (self._external.indexOf(file) >= 0) return false;
@@ -446,12 +492,12 @@ Browserify.prototype._createDeps = function (opts) {
     mopts.resolve = function (id, parent, cb) {
         if (self._ignore.indexOf(id) >= 0) return cb(null, paths.empty, {});
         
-        bresolve(id, parent, function (err, file, pkg) {
+        self._bresolve(id, parent, function (err, file, pkg) {
             if (file && self._ignore.indexOf(file) >= 0) {
                 return cb(null, paths.empty, {});
             }
             if (file && self._ignore.length) {
-                var nm = file.split('/node_modules/')[1];
+                var nm = file.replace(/\\/g, '/').split('/node_modules/')[1];
                 if (nm) {
                     nm = nm.split('/')[0];
                     if (self._ignore.indexOf(nm) >= 0) {
@@ -461,7 +507,7 @@ Browserify.prototype._createDeps = function (opts) {
             }
             
             if (file) {
-                var ex = '/' + path.relative(basedir, file);
+                var ex = '/' + relativePath(basedir, file);
                 if (self._external.indexOf(ex) >= 0) {
                     return cb(null, ex);
                 }
@@ -472,7 +518,16 @@ Browserify.prototype._createDeps = function (opts) {
                     return cb(null, paths.empty, {});
                 }
             }
-            cb(err, file, pkg);
+            if (err) cb(err, file, pkg)
+            else if (file) {
+                if (opts.preserveSymlinks && parent.id !== self._mdeps.top.id) {
+                    return cb(err, path.resolve(file), pkg, file)
+                }
+
+                fs.realpath(file, function (err, res) {
+                    cb(err, res, pkg, file);
+                });
+            } else cb(err, null, pkg)
         });
     };
     
@@ -480,7 +535,7 @@ Browserify.prototype._createDeps = function (opts) {
         mopts.modules = {};
         self._exclude.push.apply(self._exclude, Object.keys(builtins));
     }
-    else if (opts.builtins && isarray(opts.builtins)) {
+    else if (opts.builtins && isArray(opts.builtins)) {
         mopts.modules = {};
         opts.builtins.forEach(function (key) {
             mopts.modules[key] = builtins[key];
@@ -489,7 +544,7 @@ Browserify.prototype._createDeps = function (opts) {
     else if (opts.builtins && typeof opts.builtins === 'object') {
         mopts.modules = opts.builtins;
     }
-    else mopts.modules = copy(builtins);
+    else mopts.modules = xtend(builtins);
     
     Object.keys(builtins).forEach(function (key) {
         if (!has(mopts.modules, key)) self._exclude.push(key);
@@ -506,17 +561,21 @@ Browserify.prototype._createDeps = function (opts) {
         });
     }
     
+    var no = [].concat(opts.noParse).filter(Boolean);
+    var absno = no.filter(function(x) {
+        return typeof x === 'string';
+    }).map(function (x) {
+        return path.resolve(basedir, x);
+    });
+    
     function globalTr (file) {
         if (opts.detectGlobals === false) return through();
         
         if (opts.noParse === true) return through();
-        var no = [].concat(opts.noParse).filter(Boolean);
         if (no.indexOf(file) >= 0) return through();
-        if (no.map(function (x){return path.resolve(x)}).indexOf(file)>=0){
-            return through();
-        }
+        if (absno.indexOf(file) >= 0) return through();
         
-        var parts = file.split('/node_modules/');
+        var parts = file.replace(/\\/g, '/').split('/node_modules/');
         for (var i = 0; i < no.length; i++) {
             if (typeof no[i] === 'function' && no[i](file)) {
                 return through();
@@ -528,20 +587,33 @@ Browserify.prototype._createDeps = function (opts) {
                 return through();
             }
         }
+
+        if (opts.commondir === false && opts.builtins === false) {
+          opts.insertGlobalVars = xtend({
+            __dirname: function(file, basedir) {
+              var dir = path.dirname(path.relative(basedir, file));
+              return 'require("path").join(__dirname,' + dir.split(path.sep).map(JSON.stringify).join(',') + ')';
+            },
+            __filename: function(file, basedir) {
+              var filename = path.relative(basedir, file);
+              return 'require("path").join(__dirname,' + filename.split(path.sep).map(JSON.stringify).join(',') + ')';
+            }
+          }, opts.insertGlobalVars);
+        }
         
         var vars = xtend({
             process: function () { return "require('_process')" },
         }, opts.insertGlobalVars);
         
         if (opts.bundleExternal === false) {
-            delete vars.process;
-            delete vars.buffer;
+            vars.process = undefined;
+            vars.buffer = undefined;
         }
-        
+
         return insertGlobals(file, xtend(opts, {
             debug: opts.debug,
             always: opts.insertGlobals,
-            basedir: opts.commondir === false
+            basedir: opts.commondir === false && isArray(opts.builtins)
                 ? '/'
                 : opts.basedir || process.cwd()
             ,
@@ -582,8 +654,8 @@ Browserify.prototype._recorder = function (opts) {
 
 Browserify.prototype._json = function () {
     return through.obj(function (row, enc, next) {
-        if (/\.json$/.test(row.file) && !isdedupe(row.source)) {
-            row.source = 'module.exports=' + row.source;
+        if (/\.json$/.test(row.file)) {
+            row.source = 'module.exports=' + sanitize(row.source);
         }
         this.push(row);
         next();
@@ -611,20 +683,19 @@ Browserify.prototype._unshebang = function () {
 };
 
 Browserify.prototype._syntax = function () {
+    var self = this;
     return through.obj(function (row, enc, next) {
-        var err = syntaxError(row.source, row.file || row.id);
-        if (err) return this.emit('error', err);
+        var h = shasum(row.source);
+        if (typeof self._syntaxCache[h] === 'undefined') {
+            var err = syntaxError(row.source, row.file || row.id);
+            if (err) return this.emit('error', err);
+            self._syntaxCache[h] = true;
+        }
         this.push(row);
         next();
     });
 };
 
-function isdedupe (src) { // mega-hack
-    return /^arguments\[4\]\[/.test(src)
-        && /\]\[0\]\.apply\(exports,arguments\)$/.test(src)
-    ;
-}
-
 Browserify.prototype._dedupe = function () {
     return through.obj(function (row, enc, next) {
         if (!row.dedupeIndex && row.dedupe) {
@@ -657,7 +728,7 @@ Browserify.prototype._label = function (opts) {
         var prev = row.id;
 
         if (self._external.indexOf(row.id) >= 0) return next();
-        if (self._external.indexOf('/' + path.relative(basedir, row.id)) >= 0) {
+        if (self._external.indexOf('/' + relativePath(basedir, row.id)) >= 0) {
             return next();
         }
         if (self._external.indexOf(row.file) >= 0) return next();
@@ -674,7 +745,7 @@ Browserify.prototype._label = function (opts) {
             }
 
             var afile = path.resolve(path.dirname(row.file), key);
-            var rfile = '/' + path.relative(basedir, afile);
+            var rfile = '/' + relativePath(basedir, afile);
             if (self._external.indexOf(rfile) >= 0) {
                 row.deps[key] = rfile;
             }
@@ -717,8 +788,7 @@ Browserify.prototype._debug = function (opts) {
     return through.obj(function (row, enc, next) {
         if (opts.debug) {
             row.sourceRoot = 'file://localhost';
-            row.sourceFile = path.relative(basedir, row.file)
-                .replace(/\\/g, '/');
+            row.sourceFile = relativePath(basedir, row.file);
         }
         this.push(row);
         next();
@@ -753,7 +823,7 @@ Browserify.prototype.bundle = function (cb) {
     var output = readonly(this.pipeline);
     if (cb) {
         output.on('error', cb);
-        this.pipeline.pipe(concat(function (body) {
+        output.pipe(concat(function (body) {
             cb(null, body);
         }));
     }
@@ -783,3 +853,7 @@ function isExternalModule (file) {
         /^[\/.]/;
     return !regexp.test(file);
 }
+function relativePath (from, to) {
+    // Replace \ with / for OS-independent behavior
+    return cachedPathRelative(from, to).replace(/\\/g, '/');
+}
diff --git a/lib/builtins.js b/lib/builtins.js
index 743265150..3aaa280e6 100644
--- a/lib/builtins.js
+++ b/lib/builtins.js
@@ -10,12 +10,14 @@ exports.dns = require.resolve('./_empty.js');
 exports.domain = require.resolve('domain-browser');
 exports.events = require.resolve('events/');
 exports.fs = require.resolve('./_empty.js');
-exports.http = require.resolve('http-browserify');
+exports.http = require.resolve('stream-http');
 exports.https = require.resolve('https-browserify');
+exports.inspector = require.resolve('./_empty.js');
 exports.module = require.resolve('./_empty.js');
 exports.net = require.resolve('./_empty.js');
 exports.os = require.resolve('os-browserify/browser.js');
 exports.path = require.resolve('path-browserify');
+exports.perf_hooks = require.resolve('./_empty.js')
 exports.punycode = require.resolve('punycode/');
 exports.querystring = require.resolve('querystring-es3/');
 exports.readline = require.resolve('./_empty.js');
diff --git a/package.json b/package.json
index 4fbe037f5..c29b5f621 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "browserify",
-  "version": "9.0.8",
+  "version": "16.2.3",
   "description": "browser-side require() the node way",
   "main": "index.js",
   "bin": {
@@ -8,7 +8,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "http://github.com/substack/node-browserify.git"
+    "url": "http://github.com/browserify/browserify.git"
+  },
+  "engines": {
+    "node": ">= 0.8"
   },
   "keywords": [
     "browser",
@@ -20,66 +23,67 @@
     "javascript"
   ],
   "dependencies": {
-    "JSONStream": "~0.10.0",
-    "assert": "~1.3.0",
-    "browser-pack": "^4.0.0",
-    "browser-resolve": "^1.7.1",
-    "browserify-zlib": "~0.1.2",
-    "buffer": "^3.0.0",
-    "builtins": "~0.0.3",
-    "commondir": "0.0.1",
-    "concat-stream": "~1.4.1",
+    "JSONStream": "^1.0.3",
+    "assert": "^1.4.0",
+    "browser-pack": "^6.0.1",
+    "browser-resolve": "^1.11.0",
+    "browserify-zlib": "~0.2.0",
+    "buffer": "^5.0.2",
+    "cached-path-relative": "^1.0.0",
+    "concat-stream": "^1.6.0",
     "console-browserify": "^1.1.0",
-    "constants-browserify": "~0.0.1",
+    "constants-browserify": "~1.0.0",
     "crypto-browserify": "^3.0.0",
-    "deep-equal": "^1.0.0",
-    "defined": "~0.0.0",
-    "deps-sort": "^1.3.5",
-    "domain-browser": "~1.1.0",
-    "duplexer2": "~0.0.2",
-    "events": "~1.0.0",
-    "glob": "^4.0.5",
+    "defined": "^1.0.0",
+    "deps-sort": "^2.0.0",
+    "domain-browser": "^1.2.0",
+    "duplexer2": "~0.1.2",
+    "events": "^2.0.0",
+    "glob": "^7.1.0",
     "has": "^1.0.0",
-    "http-browserify": "^1.4.0",
-    "https-browserify": "~0.0.0",
+    "htmlescape": "^1.1.0",
+    "https-browserify": "^1.0.0",
     "inherits": "~2.0.1",
-    "insert-module-globals": "^6.2.0",
-    "isarray": "0.0.1",
-    "labeled-stream-splicer": "^1.0.0",
-    "module-deps": "^3.7.0",
-    "os-browserify": "~0.1.1",
+    "insert-module-globals": "^7.0.0",
+    "labeled-stream-splicer": "^2.0.0",
+    "mkdirp": "^0.5.0",
+    "module-deps": "^6.0.0",
+    "os-browserify": "~0.3.0",
     "parents": "^1.0.1",
     "path-browserify": "~0.0.0",
-    "process": "^0.10.0",
-    "punycode": "~1.2.3",
+    "process": "~0.11.0",
+    "punycode": "^1.3.2",
     "querystring-es3": "~0.2.0",
-    "read-only-stream": "^1.1.1",
-    "readable-stream": "^1.1.13",
+    "read-only-stream": "^2.0.0",
+    "readable-stream": "^2.0.2",
     "resolve": "^1.1.4",
-    "shallow-copy": "0.0.1",
     "shasum": "^1.0.0",
-    "shell-quote": "~0.0.1",
-    "stream-browserify": "^1.0.0",
-    "string_decoder": "~0.10.0",
+    "shell-quote": "^1.6.1",
+    "stream-browserify": "^2.0.0",
+    "stream-http": "^2.0.0",
+    "string_decoder": "^1.1.1",
     "subarg": "^1.0.0",
     "syntax-error": "^1.1.1",
-    "through2": "^1.0.0",
+    "through2": "^2.0.0",
     "timers-browserify": "^1.0.1",
-    "tty-browserify": "~0.0.0",
-    "url": "~0.10.1",
+    "tty-browserify": "0.0.1",
+    "url": "~0.11.0",
     "util": "~0.10.1",
-    "vm-browserify": "~0.0.1",
-    "xtend": "^3.0.0"
+    "vm-browserify": "^1.0.0",
+    "xtend": "^4.0.0"
   },
   "devDependencies": {
     "backbone": "~0.9.2",
-    "browser-unpack": "~0.0.0",
-    "coffee-script": "~1.5.0",
-    "coffeeify": "~0.6.0",
-    "es6ify": "~0.4.8",
+    "browser-unpack": "^1.1.1",
+    "coffee-script": "~1.10.0",
+    "coffeeify": "~1.1.0",
+    "has-object-spread": "^1.0.0",
+    "has-template-literals": "^1.0.0",
     "isstream": "^0.1.2",
-    "seq": "0.3.3",
-    "tap": "~0.4.0",
+    "make-generator-function": "^1.1.0",
+    "semver": "^5.5.0",
+    "seq": "0.3.5",
+    "tap": "^10.7.2",
     "temp": "^0.8.1",
     "through": "^2.3.4"
   },
diff --git a/readme.markdown b/readme.markdown
index e8972e9cc..7d6f87e62 100644
--- a/readme.markdown
+++ b/readme.markdown
@@ -9,25 +9,22 @@ browserify will recursively analyze all the `require()` calls in your app in
 order to build a bundle you can serve up to the browser in a single `<script>`
 tag.
 
-[![build status](https://secure.travis-ci.org/substack/node-browserify.png)](http://travis-ci.org/substack/node-browserify)
+[![build status](https://img.shields.io/travis/browserify/browserify/master.svg)](https://travis-ci.org/browserify/browserify)
 
-![browserify!](http://substack.net/images/browserify_logo.png)
+![browserify!](./assets/logo.png)
 
 # getting started
 
 If you're new to browserify, check out the
-[browserify handbook](https://github.com/substack/browserify-handbook)
+[browserify handbook](https://github.com/browserify/browserify-handbook)
 and the resources on [browserify.org](http://browserify.org/).
 
-Check out [browserify search](http://browserifysearch.org/) to find
-browserify-compatible packages on npm.
-
 # example
 
 Whip up a file, `main.js` with some `require()`s in it. You can use relative
 paths like `'./foo.js'` and `'../lib/bar.js'` or module paths like `'gamma'`
 that will search `node_modules/` using
-[node's module lookup algorithm](https://github.com/substack/node-resolve).
+[node's module lookup algorithm](https://github.com/browserify/resolve).
 
 ``` js
 var foo = require('./foo.js');
@@ -60,7 +57,7 @@ html!
 
 # install
 
-With [npm](http://npmjs.org) do:
+With [npm](https://www.npmjs.com/) do:
 
 ```
 npm install -g browserify
@@ -80,21 +77,21 @@ Standard Options:
                    Optionally use a colon separator to set the target.
 
       --entry, -e  An entry point of your app
-  
+
      --ignore, -i  Replace a file with an empty stub. Files can be globs.
- 
+
     --exclude, -u  Omit a file from the output bundle. Files can be globs.
 
    --external, -x  Reference a file from another bundle. Files can be globs.
-  
+
   --transform, -t  Use a transform module on top-level files.
- 
+
     --command, -c  Use a transform command on top-level files.
-   
+
   --standalone -s  Generate a UMD bundle for the supplied export name.
                    This bundle works with other module systems and sets the name
                    given as a window global if no module system is found.
-  
+
        --debug -d  Enable source maps that allow you to debug your files
                    separately.
 
@@ -112,15 +109,15 @@ Advanced Options:
 
     Skip detection and always insert definitions for process, global,
     __filename, and __dirname.
-                  
+
     benefit: faster builds
     cost: extra bytes
- 
+
   --insert-global-vars, --igv
 
     Comma-separated list of global variables to detect and define.
     Default: __filename,__dirname,process,Buffer,global
- 
+
   --detect-globals, --dg            [default: true]
 
     Detect the presence of process, global, __filename, and __dirname and define
@@ -144,33 +141,55 @@ Advanced Options:
     provides the core builtins.
 
   --no-commondir
- 
+
     Turn off setting a commondir. This is useful if you want to preserve the
-    original paths that a bundle was generated with. 
- 
+    original paths that a bundle was generated with.
+
   --no-bundle-external
 
     Turn off bundling of all external modules. This is useful if you only want
     to bundle your local files.
 
-  --bare 
+  --bare
 
     Alias for both --no-builtins, --no-commondir, and sets --insert-global-vars
     to just "__filename,__dirname". This is handy if you want to run bundles in
     node.
 
+  --no-browser-field, --no-bf
+
+    Turn off package.json browser field resolution. This is also handy if you
+    need to run a bundle in node.
+
+  --transform-key
+
+    Instead of the default package.json#browserify#transform field to list
+    all transforms to apply when running browserify, a custom field, like, e.g.
+    package.json#browserify#production or package.json#browserify#staging
+    can be used, by for example running:
+    * `browserify index.js --transform-key=production > bundle.js`
+    * `browserify index.js --transform-key=staging > bundle.js`
+
+  --node
+
+    Alias for --bare and --no-browser-field.
+
   --full-paths
 
     Turn off converting module ids into numerical indexes. This is useful for
     preserving the original paths that a bundle was generated with.
 
   --deps
-  
+
     Instead of standard bundle output, print the dependency array generated by
     module-deps.
 
+  --no-dedupe
+
+    Turn off deduping.
+
   --list
- 
+
     Print each file in the dependency graph. Useful for makefiles.
 
   --extension=EXTENSION
@@ -178,15 +197,14 @@ Advanced Options:
     Consider files with specified EXTENSION as modules, this option can used
     multiple times.
 
-  --ignore-transform=MODULE, --it MODULE
-
-    Any transforms matching the given name will be ignored, including
-    those in your module dependencies. 
-
   --global-transform=MODULE, -g MODULE
 
     Use a transform module on all files after any ordinary transforms have run.
 
+  --ignore-transform=MODULE, -it MODULE
+
+    Do not run certain transformations, even if specified elsewhere.
+
   --plugin=MODULE, -p MODULE
 
     Register MODULE as a plugin.
@@ -206,7 +224,7 @@ Passing arguments to transforms and plugins:
 
 # compatibility
 
-Many [npm](http://npmjs.org) modules that don't do IO will just work after being
+Many [npm](https://www.npmjs.com/) modules that don't do IO will just work after being
 browserified. Others take more work.
 
 Many node built-in modules have been wrapped to work in the browser, but only
@@ -220,13 +238,13 @@ When you `require()` any of these modules, you will get a browser-specific shim:
 * [constants](https://www.npmjs.com/package/constants-browserify)
 * [crypto](https://www.npmjs.com/package/crypto-browserify)
 * [domain](https://www.npmjs.com/package/domain-browser)
-* [events](https://www.npmjs.com/package/events-browserify)
-* [http](https://www.npmjs.com/package/http-browserify)
+* [events](https://www.npmjs.com/package/events)
+* [http](https://www.npmjs.com/package/stream-http)
 * [https](https://www.npmjs.com/package/https-browserify)
 * [os](https://www.npmjs.com/package/os-browserify)
 * [path](https://www.npmjs.com/package/path-browserify)
 * [punycode](https://www.npmjs.com/package/punycode)
-* [querystring](https://www.npmjs.com/package/querystring)
+* [querystring](https://www.npmjs.com/package/querystring-es3)
 * [stream](https://www.npmjs.com/package/stream-browserify)
 * [string_decoder](https://www.npmjs.com/package/string_decoder)
 * [timers](https://www.npmjs.com/package/timers-browserify)
@@ -237,7 +255,7 @@ When you `require()` any of these modules, you will get a browser-specific shim:
 * [zlib](https://www.npmjs.com/package/browserify-zlib)
 
 Additionally, if you use any of these variables, they
-[will be defined](https://github.com/substack/insert-module-globals)
+[will be defined](https://github.com/browserify/insert-module-globals)
 in the bundled output in a browser-appropriate way:
 
 * [process](https://www.npmjs.com/package/process)
@@ -277,7 +295,7 @@ If you prefer the source maps be saved to a separate `.js.map` source map file,
 [exorcist](https://github.com/thlorenz/exorcist) in order to achieve that. It's as simple as:
 
 ```
-$ browserify main.js --debug | exorcist bundle.js.map > bundle.js 
+$ browserify main.js --debug | exorcist bundle.js.map > bundle.js
 ```
 
 Learn about additional options [here](https://github.com/thlorenz/exorcist#usage).
@@ -336,7 +354,7 @@ while the boop page can have:
 This approach using `-r` and `-x` works fine for a small number of split assets,
 but there are plugins for automatically factoring out components which are
 described in the
-[partitioning section of the browserify handbook](https://github.com/substack/browserify-handbook#partitioning).
+[partitioning section of the browserify handbook](https://github.com/browserify/browserify-handbook#partitioning).
 
 ## api example
 
@@ -355,19 +373,55 @@ b.bundle().pipe(process.stdout);
 var browserify = require('browserify')
 ```
 
-## var b = browserify(files=[] or opts={})
+## `browserify([files] [, opts])`
+
+Returns a new browserify instance.
+
+<dl>
+<dt>
+files
+</dt>
+
+<dd>
+String, file object, or array of those types (they may be mixed) specifying entry file(s).
+</dd>
+
+<dt>
+opts
+</dt>
+
+<dd>
+Object.
+</dd>
+</dl>
+
+`files` and `opts` are both optional, but must be in the order shown if both are
+passed.
+
+Entry files may be passed in `files` and / or `opts.entries`.
 
-Create a browserify instance `b` from the entry main `files` or `opts.entries`.
-`files` can be an array of files or a single file.
+External requires may be specified in `opts.require`, accepting the same formats
+that the `files` argument does.
 
-For each `file` in `files`, if `file` is a stream, its contents will be used.
-You should use `opts.basedir` when using streaming files so that relative
-requires will know where to resolve from.
+If an entry file is a stream, its contents will be used. You should pass
+`opts.basedir` when using streaming files so that relative requires can be
+resolved.
+
+`opts.entries` has the same definition as `files`.
 
 `opts.noParse` is an array which will skip all require() and global parsing for
 each file in the array. Use this for giant libs like jquery or threejs that
 don't have any requires or node-style globals but take forever to parse.
 
+`opts.transform` is an array of transform functions or modules names which will
+transform the source code before the parsing.
+
+`opts.ignoreTransform` is an array of transformations that will not be run,
+even if specified elsewhere.
+
+`opts.plugin` is an array of plugin functions or module names to use. See the
+plugins section below for details.
+
 `opts.extensions` is an array of optional extra extensions for the module lookup
 machinery to use when the extension has not been specified.
 By default browserify considers only `.js` and `.json` files in such cases.
@@ -393,6 +447,8 @@ useful for preserving the original paths that a bundle was generated with.
 `opts.bundleExternal` boolean option to set if external modules should be
 bundled. Defaults to true.
 
+When `opts.browserField` is false, the package.json browser field will be ignored.
+
 When `opts.insertGlobals` is true, always insert `process`, `global`,
 `__filename`, and `__dirname` without analyzing the AST for faster builds but
 larger output bundles. Default false.
@@ -401,6 +457,9 @@ When `opts.detectGlobals` is true, scan all files for `process`, `global`,
 `__filename`, and `__dirname`, defining as necessary. With this option npm
 modules are more likely to work but bundling takes longer. Default true.
 
+When `opts.ignoreMissing` is true, ignore `require()` statements that don't
+resolve to anything.
+
 When `opts.debug` is true, add a source map inline to the end of the bundle.
 This makes debugging easier because you can see all the original files if
 you are in a modern enough browser.
@@ -408,7 +467,8 @@ you are in a modern enough browser.
 When `opts.standalone` is a non-empty string, a standalone module is created
 with that name and a [umd](https://github.com/forbeslindesay/umd) wrapper.
 You can use namespaces in the standalone global export using a `.` in the string
-name as a separator. For example: `'A.B.C'` 
+name as a separator, for example `'A.B.C'`. The global export will be [sanitized
+and camel cased](https://github.com/ForbesLindesay/umd#name-casing-and-characters).
 
 Note that in standalone mode the `require()` calls from the original source will
 still be around, which may trip up AMD loaders scanning for `require()` calls.
@@ -421,12 +481,18 @@ $ browserify main.js --standalone Foo | derequire > bundle.js
 ```
 
 `opts.insertGlobalVars` will be passed to
-[insert-module-globals](http://npmjs.org/package/insert-module-globals)
+[insert-module-globals](https://www.npmjs.com/package/insert-module-globals)
 as the `opts.vars` parameter.
 
 `opts.externalRequireName` defaults to `'require'` in `expose` mode but you can
 use another name.
 
+`opts.bare` creates a bundle that does not include Node builtins, and does not
+replace global Node variables except for `__dirname` and `__filename`.
+
+`opts.node` creates a bundle that runs in Node and does not use the browser
+versions of dependencies. Same as passing `{ bare: true, browserField: false }`.
+
 Note that if files do not contain javascript source code then you also need to
 specify a corresponding transform for them.
 
@@ -444,7 +510,9 @@ If `file` is an array, each item in `file` will be added as an entry file.
 
 Make `file` available from outside the bundle with `require(file)`.
 
-The `file` param is anything that can be resolved by `require.resolve()`.
+The `file` param is anything that can be resolved by `require.resolve()`,
+including files from `node_modules`. Like with `require.resolve()`, you must
+prefix `file` with `./` to require a local file (not in `node_modules`).
 
 `file` can also be a stream, but you should also use `opts.basedir` so that
 relative requires will be resolvable.
@@ -454,7 +522,7 @@ In `file` array form, you can use a string or object for each item. Object items
 should have a `file` property and the rest of the parameters will be used for
 the `opts`.
 
-Use the `expose` property of opts to specify a custom dependency name. 
+Use the `expose` property of opts to specify a custom dependency name.
 `require('./vendor/angular/angular.js', {expose: 'angular'})` enables `require('angular')`
 
 ## b.bundle(cb)
@@ -478,12 +546,16 @@ from the current bundle as the bundle in `file` gets bundled.
 
 Prevent the module name or file at `file` from showing up in the output bundle.
 
+If `file` is an array, each item in `file` will be ignored.
+
 Instead you will get a file with `module.exports = {}`.
 
 ## b.exclude(file)
 
 Prevent the module name or file at `file` from showing up in the output bundle.
 
+If `file` is an array, each item in `file` will be excluded.
+
 If your code tries to `require()` that file it will throw unless you've provided
 another mechanism for loading it.
 
@@ -497,7 +569,7 @@ If `tr` is a function, it will be called with `tr(file)` and it should return a
 that takes the raw file contents and produces the transformed source.
 
 If `tr` is a string, it should be a module name or file path of a
-[transform module](https://github.com/substack/module-deps#transforms)
+[transform module](https://github.com/browserify/module-deps#transforms)
 with a signature of:
 
 ``` js
@@ -506,7 +578,10 @@ module.exports = function (file) { return through() };
 ```
 
 You don't need to necessarily use the
-[through](https://www.npmjs.com/package/through) module. Browserify is compatible with the newer, more verbose [Transform streams](http://nodejs.org/api/stream.html#stream_class_stream_transform_1) built into Node v0.10.
+[through](https://www.npmjs.com/package/through) module.
+Browserify is compatible with the newer, more verbose
+[Transform streams](http://nodejs.org/api/stream.html#stream_class_stream_transform_1)
+built into Node v0.10.
 
 Here's how you might compile coffee script on the fly using `.transform()`:
 
@@ -517,7 +592,7 @@ var through = require('through');
 b.transform(function (file) {
     var data = '';
     return through(write, end);
-    
+
     function write (buf) { data += buf }
     function end () {
         this.queue(coffee.compile(data));
@@ -602,11 +677,11 @@ pipeline with these labels:
 * `'pack'` - [browser-pack](https://www.npmjs.com/package/browser-pack)
 * `'wrap'` - apply final wrapping, `require=` and a newline and semicolon
 
-You can call `b.get()` with a label name to get a handle on a stream pipeline
+You can call `b.pipeline.get()` with a label name to get a handle on a stream pipeline
 that you can `push()`, `unshift()`, or `splice()` to insert your own transform
 streams.
 
-# b.reset(opts)
+## b.reset(opts)
 
 Reset the pipeline back to a normal state. This function is called automatically
 when `bundle()` is called multiple times.
@@ -623,7 +698,7 @@ sophisticated things you can do in the package.json:
 
 ## browser field
 
-There is a special "[browser](https://gist.github.com/4339901)" field you can
+There is a special "[browser](https://github.com/defunctzombie/package-browser-field-spec)" field you can
 set in your package.json on a per-module basis to override file resolution for
 browser-specific versions of files.
 
@@ -651,7 +726,7 @@ transforms, it doesn't apply into `node_modules` directories.
 You can specify source transforms in the package.json in the
 `browserify.transform` field. There is more information about how source
 transforms work in package.json on the
-[module-deps readme](https://github.com/substack/module-deps#transforms).
+[module-deps readme](https://github.com/browserify/module-deps#transforms).
 
 For example, if your module requires [brfs](https://www.npmjs.com/package/brfs), you
 can add
@@ -724,7 +799,7 @@ on npm.
 # list of source transforms
 
 There is a [wiki page that lists the known browserify
-transforms](https://github.com/substack/node-browserify/wiki/list-of-transforms).
+transforms](https://github.com/browserify/browserify/wiki/list-of-transforms).
 
 If you write a transform, make sure to add your transform to that wiki page and
 add a package.json keyword of `browserify-transform` so that
@@ -734,7 +809,7 @@ transforms](https://www.npmjs.com/browse/keyword/browserify-transform) on npmjs.
 # third-party tools
 
 There is a [wiki page that lists the known browserify
-tools](https://github.com/substack/node-browserify/wiki/browserify-tools).
+tools](https://github.com/browserify/browserify/wiki/browserify-tools).
 
 If you write a tool, make sure to add it to that wiki page and
 add a package.json keyword of `browserify-tool` so that
@@ -749,6 +824,6 @@ Releases are documented in
 
 # license
 
-MIT
+[MIT](./LICENSE)
 
-![browserify!](http://substack.net/images/browserify/browserify.png)
+![browserify!](./assets/browserify.png)
diff --git a/test/array.js b/test/array.js
index 990bc6509..31d4c89ee 100644
--- a/test/array.js
+++ b/test/array.js
@@ -7,7 +7,7 @@ test('array add', function (t) {
     t.plan(expected.length);
     
     var b = browserify();
-    var files = [ 
+    var files = [
         __dirname + '/array/one.js',
         __dirname + '/array/two.js',
         __dirname + '/array/three.js'
@@ -25,14 +25,14 @@ test('array require', function (t) {
     t.plan(3);
     
     var b = browserify();
-    var files = [ 'isarray', 'subarg' ];
+    var files = [ 'defined', 'subarg' ];
     b.require(files);
     b.bundle(function (err, src) {
         var c = {};
         vm.runInNewContext(src, c);
-        
-        t.equal(c.require('isarray')([]), true);
-        t.equal(c.require('isarray')({}), false);
+
+        t.equal(c.require('defined')(undefined, true), true);
+        t.equal(c.require('defined')(undefined, false), false);
         t.deepEqual(c.require('subarg')(['-x', '3']), { x: 3, _: [] });
     });
 });
@@ -42,16 +42,16 @@ test('array require opts', function (t) {
     
     var b = browserify();
     var files = [
-        { file: require.resolve('isarray'), expose: 'abc' },
+        { file: require.resolve('defined'), expose: 'abc' },
         { file: require.resolve('subarg'), expose: 'def' }
     ];
     b.require(files);
     b.bundle(function (err, src) {
         var c = {};
         vm.runInNewContext(src, c);
-        
-        t.equal(c.require('abc')([]), true);
-        t.equal(c.require('abc')({}), false);
+
+        t.equal(c.require('abc')(undefined, true), true);
+        t.equal(c.require('abc')(undefined, false), false);
         t.deepEqual(c.require('def')(['-x', '3']), { x: 3, _: [] });
     });
 });
diff --git a/test/async.js b/test/async.js
new file mode 100644
index 000000000..e9bd246aa
--- /dev/null
+++ b/test/async.js
@@ -0,0 +1,24 @@
+var browserify = require('../');
+var fs = require('fs');
+var vm = require('vm');
+var test = require('tap').test;
+
+var src = fs.readFileSync(__dirname + '/async/src.js','utf8');
+var canAsync = true;
+try { Function(src) } catch (err) { canAsync = false }
+
+if (!canAsync) console.error('# async/await unsupported in this environment')
+else test('async/await', function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/async/src.js');
+    b.bundle(function (err, src) {
+        t.error(err)
+        var c = {
+            console: { log: log },
+            setTimeout: setTimeout,
+            clearTimeout: clearTimeout
+        }
+        vm.runInNewContext(src, c);
+        function log (msg) { t.equal(msg, 60) }
+    });
+});
diff --git a/test/async/src.js b/test/async/src.js
new file mode 100644
index 000000000..7a50fbcd5
--- /dev/null
+++ b/test/async/src.js
@@ -0,0 +1,8 @@
+function f (x) { return new Promise(resolve => {
+  process.nextTick(() => { resolve(x) }) }) }
+
+async function add (x) {
+  return x + await f(20) + await f(30)
+}
+
+add(10).then(v => { console.log(v) })
diff --git a/test/bare.js b/test/bare.js
index 2ef1031ba..039c587a8 100644
--- a/test/bare.js
+++ b/test/bare.js
@@ -1,8 +1,14 @@
 var test = require('tap').test;
 var spawn = require('child_process').spawn;
+var browserify = require('../');
 var path = require('path');
 var concat = require('concat-stream');
 var vm = require('vm');
+var fs = require('fs');
+var through = require('through2');
+var temp = require('temp');
+temp.track();
+var tmpdir = temp.mkdirSync({prefix: 'browserify-test'});
 
 test('bare', function (t) {
     t.plan(4);
@@ -37,3 +43,131 @@ test('bare', function (t) {
         t.equal(code, 0);
     });
 });
+
+test('bare api', function (t) {
+    t.plan(3);
+    
+    var input = through();
+    var b = browserify(input, { bare: true });
+    b.bundle().pipe(concat(function (body) {
+        vm.runInNewContext(body, {
+            Buffer: function (s) { return s.toLowerCase() },
+            console: {
+                log: function (msg) { t.equal(msg, 'abc') }
+            }
+        });
+        vm.runInNewContext(body, {
+            Buffer: Buffer,
+            console: {
+                log: function (msg) {
+                    t.ok(Buffer.isBuffer(msg));
+                    t.equal(msg.toString('utf8'), 'ABC')
+                }
+            }
+        });
+    }));
+    input.end('console.log(Buffer("ABC"))');
+});
+
+test('bare inserts __filename,__dirname but not process,global,Buffer', function (t) {
+    t.plan(2);
+    
+    var file = path.resolve(__dirname, 'bare/main.js');
+    var ps = spawn(process.execPath, [
+        path.resolve(__dirname, '../bin/cmd.js'),
+        file,
+        '--bare'
+    ]);
+    
+    ps.stdout.pipe(concat(function (body) {
+        vm.runInNewContext(body, {
+            require: require,
+            __dirname: process.cwd(),
+            console: {
+                log: function (msg) {
+                    t.same(msg, [
+                        path.join(__dirname, 'bare'),
+                        path.join(__dirname, 'bare/main.js'),
+                        'undefined',
+                        'undefined',
+                        'undefined'
+                    ]);
+                }
+            }
+        });
+    }));
+    ps.stdin.end();
+    
+    ps.on('exit', function (code) {
+        t.equal(code, 0);
+    });
+});
+
+test('bare inserts dynamic __filename,__dirname', function (t) {
+    t.plan(2);
+    
+    var file = path.join(tmpdir, 'dirname-filename.js');
+
+    fs.writeFileSync(
+        file,
+        fs.readFileSync(path.resolve(__dirname, 'bare/dirname-filename.js'))
+    );
+
+    var ps = spawn(process.execPath, [
+        path.resolve(__dirname, '../bin/cmd.js'),
+        file,
+        '--bare'
+    ]);
+    
+    ps.stdout.pipe(concat(function (body) {
+        vm.runInNewContext(body, {
+            require: require,
+            __dirname: process.cwd(),
+            console: {
+                log: function (msg) {
+                    t.same(msg, [
+                        path.dirname(file),
+                        file
+                    ]);
+                }
+            }
+        });
+    }));
+    ps.stdin.end();
+    
+    ps.on('exit', function (code) {
+        t.equal(code, 0);
+    });
+});
+
+test('bare inserts dynamic __filename,__dirname with basedir', function (t) {
+    t.plan(2);
+    
+    var file = 'dirname-filename.js';
+    var ps = spawn(process.execPath, [
+        path.resolve(__dirname, '../bin/cmd.js'),
+        file,
+        '--bare',
+        '--basedir=' + path.join(__dirname, 'bare')
+    ]);
+    
+    ps.stdout.pipe(concat(function (body) {
+        vm.runInNewContext(body, {
+            require: require,
+            __dirname: process.cwd(),
+            console: {
+                log: function (msg) {
+                    t.same(msg, [
+                        __dirname,
+                        path.join(__dirname, file)
+                    ]);
+                }
+            }
+        });
+    }));
+    ps.stdin.end();
+    
+    ps.on('exit', function (code) {
+        t.equal(code, 0);
+    });
+});
diff --git a/test/bare/dirname-filename.js b/test/bare/dirname-filename.js
new file mode 100644
index 000000000..c10337d07
--- /dev/null
+++ b/test/bare/dirname-filename.js
@@ -0,0 +1,4 @@
+console.log([
+  __dirname,
+  __filename
+]);
diff --git a/test/bare/main.js b/test/bare/main.js
new file mode 100644
index 000000000..e79174303
--- /dev/null
+++ b/test/bare/main.js
@@ -0,0 +1,7 @@
+console.log([
+  __dirname,
+  __filename,
+  typeof process,
+  typeof global,
+  typeof Buffer
+]);
diff --git a/test/bin_tr_error.js b/test/bin_tr_error.js
index 039704cca..a68127545 100644
--- a/test/bin_tr_error.js
+++ b/test/bin_tr_error.js
@@ -2,8 +2,12 @@ var browserify = require('../');
 var spawn = require('child_process').spawn;
 var test = require('tap').test;
 var path = require('path')
+var semver = require('semver');
 
-test('function transform', function (t) {
+// TODO this should be fixable I guess
+var flaky = process.platform === 'win32' && semver.satisfies(process.version, 'v0.10.x');
+
+test('function transform', { skip: flaky }, function (t) {
     t.plan(3);
     var ps = spawn(process.execPath, [
         path.resolve(__dirname, '../bin/cmd.js'),
diff --git a/test/browser_field_resolve.js b/test/browser_field_resolve.js
new file mode 100644
index 000000000..0b26fef4a
--- /dev/null
+++ b/test/browser_field_resolve.js
@@ -0,0 +1,124 @@
+var browserify = require('../');
+var vm = require('vm');
+var test = require('tap').test;
+
+test('browser field resolve (a)', function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/browser_field_resolve/a/main.js');
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        vm.runInNewContext(src, { console: { log: log } });
+        function log (x) { t.equal(x, 555) }
+    });
+});
+
+test('browser field resolve (b)', function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/browser_field_resolve/b/main.js');
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        vm.runInNewContext(src, { console: { log: log } });
+        function log (x) { t.equal(x, 444) }
+    });
+});
+
+test('browser field resolve (c)', function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/browser_field_resolve/c/main.js');
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        vm.runInNewContext(src, { console: { log: log } });
+        function log (x) { t.equal(x, 333) }
+    });
+    
+});
+
+test('browser field resolve (d)', function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/browser_field_resolve/d/main.js');
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        vm.runInNewContext(src, { console: { log: log } });
+        function log (x) { t.equal(x, 222) }
+    });
+});
+
+test('browser field resolve (e)', function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/browser_field_resolve/e/main.js');
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        vm.runInNewContext(src, { console: { log: log } });
+        function log (x) { t.equal(x, 111) }
+    });
+});
+
+test('browser field resolve (f)', function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/browser_field_resolve/f/main.js');
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        vm.runInNewContext(src, { console: { log: log } });
+        function log (x) { t.equal(x, 999) }
+    });
+});
+
+test('browser field resolve (g)', function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/browser_field_resolve/g/main.js');
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        vm.runInNewContext(src, { console: { log: log } });
+        function log (x) { t.deepEqual(x, {}) }
+    });
+});
+
+test('browser field resolve (h)', function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/browser_field_resolve/h/main.js');
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        vm.runInNewContext(src, { console: { log: log } });
+        function log (x) { t.deepEqual(x, {}) }
+    });
+});
+
+test('browser field resolve (i)', function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/browser_field_resolve/i/main.js');
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        vm.runInNewContext(src, { console: { log: log } });
+        function log (x) { t.deepEqual(x, 5000) }
+    });
+});
+
+test('browser field resolve (j)', function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/browser_field_resolve/j/main.js');
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        vm.runInNewContext(src, { console: { log: log } });
+        function log (x) { t.deepEqual(x, 5000) }
+    });
+});
+
+test('browser field resolve (k)', function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/browser_field_resolve/k/main.js');
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        vm.runInNewContext(src, { console: { log: log } });
+        function log (x) { t.deepEqual(x, 3000) }
+    });
+});
+
+test('browser field resolve (l)', function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/browser_field_resolve/l/main.js');
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        vm.runInNewContext(src, { console: { log: log } });
+        function log (x) { t.deepEqual(x, 3000) }
+    });
+});
diff --git a/test/browser_field_resolve/a/main.js b/test/browser_field_resolve/a/main.js
new file mode 100644
index 000000000..04798b6ba
--- /dev/null
+++ b/test/browser_field_resolve/a/main.js
@@ -0,0 +1 @@
+console.log(require('zzz'))
diff --git a/test/browser_field_resolve/a/node_modules/aaa/main.js b/test/browser_field_resolve/a/node_modules/aaa/main.js
new file mode 100644
index 000000000..3e842e734
--- /dev/null
+++ b/test/browser_field_resolve/a/node_modules/aaa/main.js
@@ -0,0 +1 @@
+module.exports = 555
diff --git a/test/browser_field_resolve/a/node_modules/aaa/package.json b/test/browser_field_resolve/a/node_modules/aaa/package.json
new file mode 100644
index 000000000..c13b8cf6a
--- /dev/null
+++ b/test/browser_field_resolve/a/node_modules/aaa/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "main.js"
+}
diff --git a/test/browser_field_resolve/a/package.json b/test/browser_field_resolve/a/package.json
new file mode 100644
index 000000000..36ad48686
--- /dev/null
+++ b/test/browser_field_resolve/a/package.json
@@ -0,0 +1,5 @@
+{
+  "browser": {
+    "zzz": "aaa"
+  }
+}
diff --git a/test/browser_field_resolve/b/main.js b/test/browser_field_resolve/b/main.js
new file mode 100644
index 000000000..04798b6ba
--- /dev/null
+++ b/test/browser_field_resolve/b/main.js
@@ -0,0 +1 @@
+console.log(require('zzz'))
diff --git a/test/browser_field_resolve/b/package.json b/test/browser_field_resolve/b/package.json
new file mode 100644
index 000000000..ed91400b5
--- /dev/null
+++ b/test/browser_field_resolve/b/package.json
@@ -0,0 +1,5 @@
+{
+  "browser": {
+    "zzz": "./x"
+  }
+}
diff --git a/test/browser_field_resolve/b/x.js b/test/browser_field_resolve/b/x.js
new file mode 100644
index 000000000..41a4973b3
--- /dev/null
+++ b/test/browser_field_resolve/b/x.js
@@ -0,0 +1 @@
+module.exports = 444
diff --git a/test/browser_field_resolve/c/main.js b/test/browser_field_resolve/c/main.js
new file mode 100644
index 000000000..d2bbb5368
--- /dev/null
+++ b/test/browser_field_resolve/c/main.js
@@ -0,0 +1 @@
+console.log(require('./z.js'))
diff --git a/test/browser_field_resolve/c/package.json b/test/browser_field_resolve/c/package.json
new file mode 100644
index 000000000..2bd5e9ded
--- /dev/null
+++ b/test/browser_field_resolve/c/package.json
@@ -0,0 +1,5 @@
+{
+  "browser": {
+    "./z": "./x"
+  }
+}
diff --git a/test/browser_field_resolve/c/x.js b/test/browser_field_resolve/c/x.js
new file mode 100644
index 000000000..91238822e
--- /dev/null
+++ b/test/browser_field_resolve/c/x.js
@@ -0,0 +1 @@
+module.exports = 333
diff --git a/test/browser_field_resolve/d/main.js b/test/browser_field_resolve/d/main.js
new file mode 100644
index 000000000..d2bbb5368
--- /dev/null
+++ b/test/browser_field_resolve/d/main.js
@@ -0,0 +1 @@
+console.log(require('./z.js'))
diff --git a/test/browser_field_resolve/d/package.json b/test/browser_field_resolve/d/package.json
new file mode 100644
index 000000000..deeed5621
--- /dev/null
+++ b/test/browser_field_resolve/d/package.json
@@ -0,0 +1,5 @@
+{
+  "browser": {
+    "./z.js": "./x.js"
+  }
+}
diff --git a/test/browser_field_resolve/d/x.js b/test/browser_field_resolve/d/x.js
new file mode 100644
index 000000000..fb98b131b
--- /dev/null
+++ b/test/browser_field_resolve/d/x.js
@@ -0,0 +1 @@
+module.exports = 222
diff --git a/test/browser_field_resolve/e/main.js b/test/browser_field_resolve/e/main.js
new file mode 100644
index 000000000..d2bbb5368
--- /dev/null
+++ b/test/browser_field_resolve/e/main.js
@@ -0,0 +1 @@
+console.log(require('./z.js'))
diff --git a/test/browser_field_resolve/e/package.json b/test/browser_field_resolve/e/package.json
new file mode 100644
index 000000000..8538725e4
--- /dev/null
+++ b/test/browser_field_resolve/e/package.json
@@ -0,0 +1,5 @@
+{
+  "browser": {
+    "./z": "./x.js"
+  }
+}
diff --git a/test/browser_field_resolve/e/x.js b/test/browser_field_resolve/e/x.js
new file mode 100644
index 000000000..409ecf48a
--- /dev/null
+++ b/test/browser_field_resolve/e/x.js
@@ -0,0 +1 @@
+module.exports = 111
diff --git a/test/browser_field_resolve/f/main.js b/test/browser_field_resolve/f/main.js
new file mode 100644
index 000000000..9e1be0024
--- /dev/null
+++ b/test/browser_field_resolve/f/main.js
@@ -0,0 +1 @@
+console.log(require('aaa/what.js'))
diff --git a/test/browser_field_resolve/f/package.json b/test/browser_field_resolve/f/package.json
new file mode 100644
index 000000000..339004096
--- /dev/null
+++ b/test/browser_field_resolve/f/package.json
@@ -0,0 +1,5 @@
+{
+  "browser": {
+    "aaa/what": "./x.js"
+  }
+}
diff --git a/test/browser_field_resolve/f/x.js b/test/browser_field_resolve/f/x.js
new file mode 100644
index 000000000..95c041e1a
--- /dev/null
+++ b/test/browser_field_resolve/f/x.js
@@ -0,0 +1 @@
+module.exports = 999
diff --git a/test/browser_field_resolve/g/main.js b/test/browser_field_resolve/g/main.js
new file mode 100644
index 000000000..3100f1d9b
--- /dev/null
+++ b/test/browser_field_resolve/g/main.js
@@ -0,0 +1,2 @@
+try { var x = require('./x') } catch (err) {}
+console.log(x)
diff --git a/test/browser_field_resolve/g/package.json b/test/browser_field_resolve/g/package.json
new file mode 100644
index 000000000..3d0142ce6
--- /dev/null
+++ b/test/browser_field_resolve/g/package.json
@@ -0,0 +1,5 @@
+{
+  "browser": {
+    "./x.js": false
+  }
+}
diff --git a/test/browser_field_resolve/g/x.js b/test/browser_field_resolve/g/x.js
new file mode 100644
index 000000000..ae629b69b
--- /dev/null
+++ b/test/browser_field_resolve/g/x.js
@@ -0,0 +1 @@
+module.exports = 1000
diff --git a/test/browser_field_resolve/h/main.js b/test/browser_field_resolve/h/main.js
new file mode 100644
index 000000000..29ad627e9
--- /dev/null
+++ b/test/browser_field_resolve/h/main.js
@@ -0,0 +1,2 @@
+try { var x = require('./x.js') } catch (err) {}
+console.log(x)
diff --git a/test/browser_field_resolve/h/package.json b/test/browser_field_resolve/h/package.json
new file mode 100644
index 000000000..d8bf9d12e
--- /dev/null
+++ b/test/browser_field_resolve/h/package.json
@@ -0,0 +1,5 @@
+{
+  "browser": {
+    "./x": false
+  }
+}
diff --git a/test/browser_field_resolve/h/x.js b/test/browser_field_resolve/h/x.js
new file mode 100644
index 000000000..ae629b69b
--- /dev/null
+++ b/test/browser_field_resolve/h/x.js
@@ -0,0 +1 @@
+module.exports = 1000
diff --git a/test/browser_field_resolve/i/browser.js b/test/browser_field_resolve/i/browser.js
new file mode 100644
index 000000000..7651b1ab7
--- /dev/null
+++ b/test/browser_field_resolve/i/browser.js
@@ -0,0 +1 @@
+module.exports = 5000
diff --git a/test/browser_field_resolve/i/main.js b/test/browser_field_resolve/i/main.js
new file mode 100644
index 000000000..164cd233e
--- /dev/null
+++ b/test/browser_field_resolve/i/main.js
@@ -0,0 +1,2 @@
+var x = require('./x.js')
+console.log(x)
diff --git a/test/browser_field_resolve/i/package.json b/test/browser_field_resolve/i/package.json
new file mode 100644
index 000000000..aac08b068
--- /dev/null
+++ b/test/browser_field_resolve/i/package.json
@@ -0,0 +1,5 @@
+{
+  "browser": {
+    "./x": "./browser"
+  }
+}
diff --git a/test/browser_field_resolve/i/x.js b/test/browser_field_resolve/i/x.js
new file mode 100644
index 000000000..ae629b69b
--- /dev/null
+++ b/test/browser_field_resolve/i/x.js
@@ -0,0 +1 @@
+module.exports = 1000
diff --git a/test/browser_field_resolve/j/browser.js b/test/browser_field_resolve/j/browser.js
new file mode 100644
index 000000000..7651b1ab7
--- /dev/null
+++ b/test/browser_field_resolve/j/browser.js
@@ -0,0 +1 @@
+module.exports = 5000
diff --git a/test/browser_field_resolve/j/main.js b/test/browser_field_resolve/j/main.js
new file mode 100644
index 000000000..b9f40553b
--- /dev/null
+++ b/test/browser_field_resolve/j/main.js
@@ -0,0 +1,2 @@
+var x = require('./x')
+console.log(x)
diff --git a/test/browser_field_resolve/j/package.json b/test/browser_field_resolve/j/package.json
new file mode 100644
index 000000000..8f617288f
--- /dev/null
+++ b/test/browser_field_resolve/j/package.json
@@ -0,0 +1,5 @@
+{
+  "browser": {
+    "./x.js": "./browser.js"
+  }
+}
diff --git a/test/browser_field_resolve/j/x.js b/test/browser_field_resolve/j/x.js
new file mode 100644
index 000000000..ae629b69b
--- /dev/null
+++ b/test/browser_field_resolve/j/x.js
@@ -0,0 +1 @@
+module.exports = 1000
diff --git a/test/browser_field_resolve/k/main.js b/test/browser_field_resolve/k/main.js
new file mode 100644
index 000000000..993b834eb
--- /dev/null
+++ b/test/browser_field_resolve/k/main.js
@@ -0,0 +1,2 @@
+var zzz = require('x/zzz')
+console.log(zzz)
diff --git a/test/browser_field_resolve/k/node_modules/x/hey.js b/test/browser_field_resolve/k/node_modules/x/hey.js
new file mode 100644
index 000000000..6202b34c2
--- /dev/null
+++ b/test/browser_field_resolve/k/node_modules/x/hey.js
@@ -0,0 +1 @@
+module.exports = 3000
diff --git a/test/browser_field_resolve/k/node_modules/x/package.json b/test/browser_field_resolve/k/node_modules/x/package.json
new file mode 100644
index 000000000..cf1ec93f4
--- /dev/null
+++ b/test/browser_field_resolve/k/node_modules/x/package.json
@@ -0,0 +1,5 @@
+{
+  "browser": {
+    "./zzz": "./hey"
+  }
+}
diff --git a/test/browser_field_resolve/l/main.js b/test/browser_field_resolve/l/main.js
new file mode 100644
index 000000000..993b834eb
--- /dev/null
+++ b/test/browser_field_resolve/l/main.js
@@ -0,0 +1,2 @@
+var zzz = require('x/zzz')
+console.log(zzz)
diff --git a/test/browser_field_resolve/l/node_modules/x/hey.js b/test/browser_field_resolve/l/node_modules/x/hey.js
new file mode 100644
index 000000000..6202b34c2
--- /dev/null
+++ b/test/browser_field_resolve/l/node_modules/x/hey.js
@@ -0,0 +1 @@
+module.exports = 3000
diff --git a/test/browser_field_resolve/l/node_modules/x/package.json b/test/browser_field_resolve/l/node_modules/x/package.json
new file mode 100644
index 000000000..aa9ac588b
--- /dev/null
+++ b/test/browser_field_resolve/l/node_modules/x/package.json
@@ -0,0 +1,5 @@
+{
+  "browser": {
+    "./zzz.js": "./hey"
+  }
+}
diff --git a/test/buffer.js b/test/buffer.js
index 5a2747f79..7cfdb1c0f 100644
--- a/test/buffer.js
+++ b/test/buffer.js
@@ -2,6 +2,8 @@ var browserify = require('../');
 var test = require('tap').test;
 var vm = require('vm');
 
+if (!ArrayBuffer.isView) ArrayBuffer.isView = function () { return false; };
+
 test('utf8 buffer to base64', function (t) {
     t.plan(1);
     var b = browserify();
diff --git a/test/bundle.js b/test/bundle.js
index 025714414..115317a61 100644
--- a/test/bundle.js
+++ b/test/bundle.js
@@ -13,6 +13,7 @@ test('bundle', function (t) {
         
         var c = {
             setTimeout : setTimeout,
+            clearTimeout : clearTimeout,
             console : console
         };
         vm.runInNewContext(src, c);
diff --git a/test/bundle_external_global.js b/test/bundle_external_global.js
index 47a9c943d..ae02b8105 100644
--- a/test/bundle_external_global.js
+++ b/test/bundle_external_global.js
@@ -18,7 +18,7 @@ test('bundle external global', function (t) {
             process: process
         });
         function log (msg) {
-            t.equal(typeof msg.nextTick, 'function');
+            t.equal(msg, process);
         }
     });
 });
diff --git a/test/coffeeify.js b/test/coffeeify.js
index e63416af9..176008c00 100644
--- a/test/coffeeify.js
+++ b/test/coffeeify.js
@@ -11,7 +11,8 @@ test('coffeeify with an implicit global', function (t) {
         if (err) t.fail(err);
         vm.runInNewContext(src, {
             console: { log: log },
-            setTimeout: setTimeout
+            setTimeout: setTimeout,
+            clearTimeout: clearTimeout
         });
         function log (msg) { t.equal(msg, 'eyo') }
     });
diff --git a/test/crypto.js b/test/crypto.js
index 23d77cb04..7edb25594 100644
--- a/test/crypto.js
+++ b/test/crypto.js
@@ -11,6 +11,8 @@ var tmpdir = temp.mkdirSync({prefix: 'browserify-test'});
 
 fs.writeFileSync(tmpdir + '/main.js', 'beep(require("crypto"))\n');
 
+if (!ArrayBuffer.isView) ArrayBuffer.isView = function () { return false; };
+
 test('*-browserify libs from node_modules/', function (t) {
     t.plan(2);
     
diff --git a/test/crypto_ig.js b/test/crypto_ig.js
index 67965fcd3..c60b5bf60 100644
--- a/test/crypto_ig.js
+++ b/test/crypto_ig.js
@@ -11,6 +11,8 @@ var tmpdir = temp.mkdirSync({prefix: 'browserify-test'});
 
 fs.writeFileSync(tmpdir + '/main.js', 'beep(require("crypto"))\n');
 
+if (!ArrayBuffer.isView) ArrayBuffer.isView = function () { return false; };
+
 test('crypto --insertGlobals', function (t) {
     t.plan(2);
     
diff --git a/test/debug_standalone.js b/test/debug_standalone.js
index 0d9fcdfcb..207090c3a 100644
--- a/test/debug_standalone.js
+++ b/test/debug_standalone.js
@@ -16,7 +16,7 @@ test('ordinary debug', function (t) {
         var src = buf.toString('utf8');
         var last = src.split('\n').slice(-2)[0];
         t.ok(
-            /\/\/# sourceMappingURL=data:application\/json;base64,[\w+\/=]+$/
+            /\/\/# sourceMappingURL=data:application\/json;charset=utf-8;base64,[\w+\/=]+$/
             .test(last)
         );
     });
@@ -35,7 +35,7 @@ test('debug standalone', function (t) {
         var src = buf.toString('utf8');
         var last = src.split('\n').slice(-2)[0];
         t.ok(
-            /\/\/# sourceMappingURL=data:application\/json;base64,[\w+\/=]+$/
+            /\/\/# sourceMappingURL=data:application\/json;charset=utf-8;base64,[\w+\/=]+$/
             .test(last)
         );
     });
@@ -54,7 +54,7 @@ test('debug standalone exposed', function (t) {
         var src = buf.toString('utf8');
         var last = src.split('\n').slice(-2)[0];
         t.ok(
-            /\/\/# sourceMappingURL=data:application\/json;base64,[\w+\/=]+$/
+            /\/\/# sourceMappingURL=data:application\/json;charset=utf-8;base64,[\w+\/=]+$/
             .test(last)
         );
         var c = { window: {} };
diff --git a/test/dedupe-deps.js b/test/dedupe-deps.js
index 4fab4dae1..ebb6dedc2 100644
--- a/test/dedupe-deps.js
+++ b/test/dedupe-deps.js
@@ -41,3 +41,19 @@ test('identical content gets deduped with fullPaths', function (t) {
     );
   }
 })
+
+test('identical content does not get deduped with dedupe option false', function (t) {
+  t.plan(1)
+
+  var rows = [];
+  browserify({fullPaths: true, dedupe: false})
+    .on('dep', [].push.bind(rows))
+    .require(require.resolve('./dup'), { entry: true })
+    .bundle(check);
+
+  function check(err, src) {
+    if (err) return t.fail(err);
+    var deduped = rows.filter(function (x) { return x.dedupe });
+    t.equal(deduped.length, 0, 'does not dedupe');
+  }
+})
diff --git a/test/delay.js b/test/delay.js
index 6335ee832..63c1d8785 100644
--- a/test/delay.js
+++ b/test/delay.js
@@ -1,5 +1,6 @@
 var browserify = require('../');
 var vm = require('vm');
+var path = require('path');
 var test = require('tap').test;
 var through = require('through2');
 
@@ -9,8 +10,8 @@ test('delay for pipelines', function (t) {
     var b = browserify(__dirname + '/delay/main.js');
     b.pipeline.get('record').push(through.obj(function (row, enc, next) {
         if (row.file) {
-            t.equal(row.file, __dirname + '/delay/main.js');
-            row.file = __dirname + '/delay/diverted.js';
+            t.equal(row.file, path.join(__dirname, 'delay/main.js'));
+            row.file = path.join(__dirname, 'delay/diverted.js');
         }
         this.push(row);
         next();
diff --git a/test/double_buffer.js b/test/double_buffer.js
index 1535eb9b1..dfda808f9 100644
--- a/test/double_buffer.js
+++ b/test/double_buffer.js
@@ -2,6 +2,8 @@ var browserify = require('../');
 var test = require('tap').test;
 var vm = require('vm');
 
+if (!ArrayBuffer.isView) ArrayBuffer.isView = function () { return false; };
+
 test('double buffer', function (t) {
     t.plan(1);
     
@@ -9,6 +11,6 @@ test('double buffer', function (t) {
     b.require('buffer');
     b.bundle(function (err, src) {
         if (err) return t.fail(err);
-        vm.runInNewContext(src, { t: t });
+        vm.runInNewContext(src, { t: t, Uint8Array: Uint8Array });
     });
 });
diff --git a/test/double_bundle_json.js b/test/double_bundle_json.js
index f692404fc..ac72709b7 100644
--- a/test/double_bundle_json.js
+++ b/test/double_bundle_json.js
@@ -1,6 +1,8 @@
 var browserify = require('../');
 var vm = require('vm');
 var test = require('tap').test;
+var through = require('through2');
+var xtend = require('xtend');
 
 test('double bundle json', function (t) {
     t.plan(6);
@@ -12,11 +14,16 @@ test('double bundle json', function (t) {
     
     var cache = {};
     var b = browserify(__dirname + '/double_bundle_json/index.js', {
-        cache: cache, fullPaths: true
-    });
-    b.on('dep', function (row) {
-        cache[row.id] = row;
+        cache: cache
     });
+    b.pipeline.get('deps').push(through.obj(function(row, enc, next) {
+        cache[row.file] = {
+            source: row.source,
+            deps: xtend(row.deps)
+        };
+        this.push(row);
+        next();
+    }));
     b.bundle(function (err, src0) {
         t.ifError(err);
         vm.runInNewContext(src0, { console: { log: log0 } });
diff --git a/test/entry.js b/test/entry.js
index f9b37d06c..23a2ee254 100644
--- a/test/entry.js
+++ b/test/entry.js
@@ -1,11 +1,35 @@
 var browserify = require('../');
 var vm = require('vm');
+var path = require('path');
 var test = require('tap').test;
 
 test('entry', function (t) {
-    t.plan(2);
+    t.plan(3);
     
     var b = browserify(__dirname + '/entry/main.js');
+    b.on('dep', function(row) {
+        if (row.entry) t.equal(row.file, path.join(__dirname, 'entry/main.js'));
+    });
+    b.bundle(function (err, src) {
+        var c = {
+            done : function (one, two) {
+                t.equal(one, 1);
+                t.equal(two, 2);
+                t.end();
+            }
+        };
+        vm.runInNewContext(src, c);
+    });
+});
+
+test('entry via add', function (t) {
+    t.plan(3);
+    
+    var b = browserify();
+    b.add(__dirname + '/entry/main.js');
+    b.on('dep', function(row) {
+        if (row.entry) t.equal(row.file, path.join(__dirname, 'entry/main.js'));
+    });
     b.bundle(function (err, src) {
         var c = {
             done : function (one, two) {
diff --git a/test/entry_expose.js b/test/entry_expose.js
index 2323c2cb9..381bdc5f5 100644
--- a/test/entry_expose.js
+++ b/test/entry_expose.js
@@ -1,6 +1,5 @@
 var test = require('tap').test;
 var browserify = require('../');
-var path = require('path');
 var vm = require('vm');
 
 test('entry expose', function (t) {
diff --git a/test/entry_relative.js b/test/entry_relative.js
new file mode 100644
index 000000000..178a8ac1b
--- /dev/null
+++ b/test/entry_relative.js
@@ -0,0 +1,45 @@
+var browserify = require('../');
+var vm = require('vm');
+var path = require('path');
+var test = require('tap').test;
+
+test('entry - relative path', function (t) {
+    process.chdir(__dirname);
+    
+    t.plan(3);
+    
+    var b = browserify('entry/main.js');
+    b.on('dep', function(row) {
+        if (row.entry) t.equal(row.file, path.join(__dirname, 'entry/main.js'));
+    });
+    b.bundle(function (err, src) {
+        var c = {
+            done : function (one, two) {
+                t.equal(one, 1);
+                t.equal(two, 2);
+                t.end();
+            }
+        };
+        vm.runInNewContext(src, c);
+    });
+});
+
+test('entry - relative path via add', function (t) {
+    t.plan(3);
+    
+    var b = browserify({basedir: __dirname});
+    b.add('entry/main.js');
+    b.on('dep', function(row) {
+        if (row.entry) t.equal(row.file, path.join(__dirname, 'entry/main.js'));
+    });
+    b.bundle(function (err, src) {
+        var c = {
+            done : function (one, two) {
+                t.equal(one, 1);
+                t.equal(two, 2);
+                t.end();
+            }
+        };
+        vm.runInNewContext(src, c);
+    });
+});
diff --git a/test/error_code.js b/test/error_code.js
index 2f3734c24..5d0b2b1d7 100644
--- a/test/error_code.js
+++ b/test/error_code.js
@@ -1,8 +1,12 @@
 var test = require('tap').test;
 var spawn = require('child_process').spawn;
 var path = require('path');
+var semver = require('semver');
 
-test('error code', function (t) {
+// TODO this should be fixable I guess
+var knownFailure = process.platform === 'win32' && semver.satisfies(process.version, 'v0.10.x');
+
+test('error code', { skip: knownFailure }, function (t) {
     t.plan(2);
     
     var cwd = process.cwd();
diff --git a/test/exclude.js b/test/exclude.js
new file mode 100644
index 000000000..382967737
--- /dev/null
+++ b/test/exclude.js
@@ -0,0 +1,21 @@
+var browserify = require('../');
+var test = require('tap').test;
+var vm = require('vm');
+
+test('exclude array', function(t) {
+	t.plan(2);
+
+	var b = browserify();
+	b.add(__dirname + '/exclude/array.js');
+	b.exclude([
+		__dirname + '/exclude/skip.js',
+		__dirname + '/exclude/skip2.js'
+	]);
+
+	b.bundle(function (err, src) {
+		if (err) {
+			t.fail(err);
+		}
+		vm.runInNewContext(src, { t: t });
+	});
+});
diff --git a/test/exclude/array.js b/test/exclude/array.js
new file mode 100644
index 000000000..de417c40e
--- /dev/null
+++ b/test/exclude/array.js
@@ -0,0 +1,2 @@
+t.throws(function () { require('./skip.js') });
+t.throws(function () { require('./skip2.js') });
diff --git a/test/exclude/skip.js b/test/exclude/skip.js
new file mode 100644
index 000000000..006521e56
--- /dev/null
+++ b/test/exclude/skip.js
@@ -0,0 +1 @@
+t.fail('this file should have been skipped');
diff --git a/test/exclude/skip2.js b/test/exclude/skip2.js
new file mode 100644
index 000000000..006521e56
--- /dev/null
+++ b/test/exclude/skip2.js
@@ -0,0 +1 @@
+t.fail('this file should have been skipped');
diff --git a/test/external_shim.js b/test/external_shim.js
index 4f595389c..1c251242a 100644
--- a/test/external_shim.js
+++ b/test/external_shim.js
@@ -3,6 +3,7 @@ var vm = require('vm');
 var test = require('tap').test;
 
 test('requiring a shimmed module name from an external bundle', function (t) {
+    t.plan(1);
     var b1 = browserify();
     var b2 = browserify();
 
@@ -12,9 +13,12 @@ test('requiring a shimmed module name from an external bundle', function (t) {
 
     b1.bundle(function (err, src1) {
         b2.bundle(function (err, src2) {
-            t.plan(1);
 
-            var c = {setTimeout: setTimeout, console: console};
+            var c = {
+                console: console,
+                setTimeout: setTimeout,
+                clearTimeout: clearTimeout
+            };
             vm.runInNewContext(src1 + src2, c);
 
             t.ok(c.require('bundle1').shim === c.require('bundle2').shim);
diff --git a/test/externalize.js b/test/externalize.js
index b290a3a85..8d76055bb 100644
--- a/test/externalize.js
+++ b/test/externalize.js
@@ -26,18 +26,18 @@ fs.writeFileSync(
 
 test('externalize bin', function (t) {
     t.plan(5);
-    
+
     var commands = [
         [ '-r', './robot.js', '-o', path.join(pubdir, 'common.js') ],
         [ '-x', './robot.js', 'beep.js', '-o', path.join(pubdir, 'beep.js') ],
-        [ '-x', './robot.js', 'boop.js', '-o', path.join(pubdir, 'boop.js') ]
+        [ '-x', './robot.js', 'boop.js', '-o', path.join(pubdir, 'boop/bop.js') ]
     ];
     (function next () {
         if (commands.length === 0) {
             var common = fs.readFileSync(path.join(pubdir, 'common.js'));
             var beep = fs.readFileSync(path.join(pubdir, 'beep.js'));
-            var boop = fs.readFileSync(path.join(pubdir, 'boop.js'));
-            
+            var boop = fs.readFileSync(path.join(pubdir, 'boop/bop.js'));
+
             vm.runInNewContext(common + beep, {
                 console: { log: function (msg) { t.equal(msg, 'BEEP!') } }
             });
diff --git a/test/file_event.js b/test/file_event.js
index 285ccafa6..33ac36ce5 100644
--- a/test/file_event.js
+++ b/test/file_event.js
@@ -8,7 +8,7 @@ test('file event', function (t) {
     
     var b = browserify(__dirname + '/entry/main.js');
     var files = {
-        'main.js': __dirname + '/entry/main.js',
+        'main.js': path.join(__dirname, 'entry/main.js'),
         'one.js': './one',
         'two.js': './two'
     };
diff --git a/test/global.js b/test/global.js
index 954c0c371..8026bcfb3 100644
--- a/test/global.js
+++ b/test/global.js
@@ -2,6 +2,8 @@ var browserify = require('../');
 var vm = require('vm');
 var test = require('tap').test;
 
+if (!ArrayBuffer.isView) ArrayBuffer.isView = function () { return false; };
+
 test('global', function (t) {
     t.plan(2);
     
@@ -26,7 +28,7 @@ test('__filename and __dirname with insertGlobals: true', function (t) {
     });
     b.require(__dirname + '/global/filename.js', { expose: 'x' });
     b.bundle(function (err, src) {
-        var c = {};
+        var c = { Uint8Array: Uint8Array };
         c.self = c;
         vm.runInNewContext(src, c);
         var x = c.require('x');
@@ -69,7 +71,7 @@ test('process.nextTick', function (t) {
     var b = browserify();
     b.add(__dirname + '/global/tick.js');
     b.bundle(function (err, src) {
-        var c = { t: t, setTimeout: setTimeout };
+        var c = { t: t, setTimeout: setTimeout, clearTimeout: clearTimeout };
         vm.runInNewContext(src, c);
     });
 });
@@ -83,7 +85,7 @@ test('Buffer', function (t) {
         var c = {
             t: t,
             Uint8Array: Uint8Array,
-            DataView: DataView
+            ArrayBuffer: ArrayBuffer
         };
         vm.runInNewContext(src, c);
     });
diff --git a/test/global/node_modules/aaa/index.js b/test/global/node_modules/aaa/index.js
new file mode 100644
index 000000000..85dc112bf
--- /dev/null
+++ b/test/global/node_modules/aaa/index.js
@@ -0,0 +1,2 @@
+exports.filename = __filename;
+exports.dirname = __dirname;
diff --git a/test/global/node_modules/robot/index.js b/test/global/node_modules/robot/index.js
new file mode 100644
index 000000000..dc8377968
--- /dev/null
+++ b/test/global/node_modules/robot/index.js
@@ -0,0 +1 @@
+module.exports = require('./lib/beep');
diff --git a/test/global/node_modules/robot/lib/beep.js b/test/global/node_modules/robot/lib/beep.js
new file mode 100644
index 000000000..85dc112bf
--- /dev/null
+++ b/test/global/node_modules/robot/lib/beep.js
@@ -0,0 +1,2 @@
+exports.filename = __filename;
+exports.dirname = __dirname;
diff --git a/test/global_coffeeify.js b/test/global_coffeeify.js
index 47e6da41d..00aa54a1d 100644
--- a/test/global_coffeeify.js
+++ b/test/global_coffeeify.js
@@ -11,7 +11,8 @@ test('coffeeify globally', function (t) {
         if (err) t.fail(err);
         vm.runInNewContext(src, {
             console: { log: log },
-            setTimeout: setTimeout
+            setTimeout: setTimeout,
+            clearTimeout: clearTimeout
         });
         function log (msg) { t.equal(msg, 'eyo') }
     });
diff --git a/test/global_noparse.js b/test/global_noparse.js
new file mode 100644
index 000000000..a4e5a7051
--- /dev/null
+++ b/test/global_noparse.js
@@ -0,0 +1,102 @@
+var browserify = require('../');
+var vm = require('vm');
+var path = require('path');
+var test = require('tap').test;
+
+test('global noparse module', function (t) {
+    t.plan(2);
+    
+    var b = browserify({
+        noParse: 'aaa'
+    });
+    b.require(__dirname + '/global/node_modules/aaa', { expose: 'x' });
+    b.bundle(function (err, src) {
+        var c = {
+            __filename: __filename,
+            __dirname: __dirname
+        };
+        vm.runInNewContext(src, c);
+        var x = c.require('x');
+        t.equal(x.filename, __filename);
+        t.equal(x.dirname, __dirname);
+    });
+});
+
+test('global noparse module file', function (t) {
+    t.plan(2);
+    
+    var b = browserify({
+        noParse: 'aaa/index.js'
+    });
+    b.require(__dirname + '/global/node_modules/aaa', { expose: 'x' });
+    b.bundle(function (err, src) {
+        var c = {
+            __filename: __filename,
+            __dirname: __dirname
+        };
+        vm.runInNewContext(src, c);
+        var x = c.require('x');
+        t.equal(x.filename, __filename);
+        t.equal(x.dirname, __dirname);
+    });
+});
+
+test('global noparse module deep file', function (t) {
+    t.plan(2);
+    
+    var b = browserify({
+        noParse: 'robot/lib/beep.js'
+    });
+    b.require(__dirname + '/global/node_modules/robot', { expose: 'x' });
+    b.bundle(function (err, src) {
+        var c = {
+            __filename: __filename,
+            __dirname: __dirname
+        };
+        vm.runInNewContext(src, c);
+        var x = c.require('x');
+        t.equal(x.filename, __filename);
+        t.equal(x.dirname, __dirname);
+    });
+});
+
+test('global noparse basedir', function (t) {
+    t.plan(2);
+    
+    var b = browserify({
+        basedir: __dirname + '/global',
+        noParse: 'filename.js'
+    });
+    b.require(__dirname + '/global/filename.js', { expose: 'x' });
+    b.bundle(function (err, src) {
+        var c = {
+            __filename: __filename,
+            __dirname: __dirname
+        };
+        vm.runInNewContext(src, c);
+        var x = c.require('x');
+        t.equal(x.filename, __filename);
+        t.equal(x.dirname, __dirname);
+    });
+});
+
+test('global noparse function', function (t) {
+    t.plan(2);
+
+    var b = browserify({
+        noParse: function(file) {
+            return file === path.join(__dirname, 'global/filename.js');
+        }
+    });
+    b.require(__dirname + '/global/filename.js', { expose: 'x' });
+    b.bundle(function (err, src) {
+        var c = {
+            __filename: __filename,
+            __dirname: __dirname
+        };
+        vm.runInNewContext(src, c);
+        var x = c.require('x');
+        t.equal(x.filename, __filename);
+        t.equal(x.dirname, __dirname);
+    });
+});
diff --git a/test/ignore.js b/test/ignore.js
index e4ad9775b..4cb70971f 100644
--- a/test/ignore.js
+++ b/test/ignore.js
@@ -1,72 +1,91 @@
-var browserify = require('../');
-var test = require('tap').test;
-var vm = require('vm');
-
-test('ignore', function (t) {
-    t.plan(1);
-    
-    var b = browserify();
-    b.add(__dirname + '/ignore/main.js');
-    b.ignore( __dirname + '/ignore/skip.js');
-    
-    b.bundle(function (err, src) {
-        if (err) t.fail(err);
-        vm.runInNewContext(src, { t: t });
-    });
-});
-
-test('ignore by package or id', function (t) {
-    t.plan(3);
-  
-    var b = browserify();
-    b.add(__dirname + '/ignore/by-id.js');
-    b.ignore('events');
-    b.ignore('beep');
-    b.ignore('bad id');
-
-    b.bundle(function (err, src) {
-        if (err) t.fail(err);
-        vm.runInNewContext(src, { t: t });
-    });
-});
-
-test('ignore files referenced by relative path', function (t) {
-	// Change the current working directory relative to this file
-	var cwd = process.cwd();
-	process.chdir(__dirname);
-
-	t.plan(1);
-
-	var b = browserify();
-	b.add(__dirname + '/ignore/by-relative.js');
-	b.ignore('./ignore/ignored/skip.js');
-
-	b.bundle(function (err, src) {
-		if (err) t.fail(err);
-		vm.runInNewContext(src, { t: t });
-	});
-
-	// Revert CWD
-	process.chdir(cwd);
-});
-
-test('do not ignore files with relative paths that do not resolve', function (t) {
-	// Change the current working directory to the ignore folder
-	var cwd = process.cwd();
-	process.chdir(__dirname + '/ignore');
-
-	t.plan(2);
-
-	var b = browserify();
-	b.add(__dirname + '/ignore/double-skip.js');
-
-	b.ignore('./skip.js');
-
-	b.bundle(function (err, src) {
-		if (err) t.fail(err);
-		vm.runInNewContext(src, { t: t });
-	});
-
-	// Revert CWD
-	process.chdir(cwd);
-});
+var browserify = require('../');
+var test = require('tap').test;
+var vm = require('vm');
+var path = require('path');
+
+test('ignore', function (t) {
+    t.plan(1);
+
+    var b = browserify();
+    b.add(__dirname + '/ignore/main.js');
+    b.ignore(path.join(__dirname, 'ignore/skip.js'));
+
+    b.bundle(function (err, src) {
+        if (err) t.fail(err);
+        vm.runInNewContext(src, { t: t });
+    });
+});
+
+test('ignore array', function(t) {
+	t.plan(2);
+
+	var b = browserify();
+	b.add(__dirname + '/ignore/array.js');
+	b.ignore([
+		path.join(__dirname, 'ignore/skip.js'),
+		path.join(__dirname, 'ignore/skip2.js')
+	]);
+
+	b.bundle(function (err, src) {
+		if (err) {
+			t.fail(err);
+		}
+		vm.runInNewContext(src, { t: t });
+	});
+});
+
+test('ignore by package or id', function (t) {
+    t.plan(3);
+
+    var b = browserify();
+    b.add(__dirname + '/ignore/by-id.js');
+    b.ignore('events');
+    b.ignore('beep');
+    b.ignore('bad id');
+
+    b.bundle(function (err, src) {
+        if (err) t.fail(err);
+        vm.runInNewContext(src, { t: t });
+    });
+});
+
+test('ignore files referenced by relative path', function (t) {
+	// Change the current working directory relative to this file
+	var cwd = process.cwd();
+	process.chdir(__dirname);
+
+	t.plan(1);
+
+	var b = browserify();
+	b.add(__dirname + '/ignore/by-relative.js');
+	b.ignore('./ignore/ignored/skip.js');
+
+	b.bundle(function (err, src) {
+		if (err) t.fail(err);
+		vm.runInNewContext(src, { t: t });
+	});
+
+	// Revert CWD
+	process.chdir(cwd);
+});
+
+test('do not ignore files with relative paths that do not resolve', function (t) {
+	// Change the current working directory to the ignore folder
+	var cwd = process.cwd();
+	process.chdir(__dirname + '/ignore');
+
+	t.plan(2);
+
+	var b = browserify();
+	b.add(__dirname + '/ignore/double-skip.js');
+
+	b.ignore('./skip.js');
+
+	b.bundle(function (err, src) {
+		if (err) t.fail(err);
+		vm.runInNewContext(src, { t: t });
+	});
+
+	// Revert CWD
+	process.chdir(cwd);
+});
diff --git a/test/ignore/array.js b/test/ignore/array.js
new file mode 100644
index 000000000..837e179b5
--- /dev/null
+++ b/test/ignore/array.js
@@ -0,0 +1,2 @@
+t.deepEqual(require('./skip.js'), {});
+t.deepEqual(require('./skip2.js'), {});
diff --git a/test/ignore/skip2.js b/test/ignore/skip2.js
new file mode 100644
index 000000000..006521e56
--- /dev/null
+++ b/test/ignore/skip2.js
@@ -0,0 +1 @@
+t.fail('this file should have been skipped');
diff --git a/test/ignore_browser_field.js b/test/ignore_browser_field.js
new file mode 100644
index 000000000..a925f2e62
--- /dev/null
+++ b/test/ignore_browser_field.js
@@ -0,0 +1,21 @@
+var test = require('tap').test;
+var browserify = require('../');
+var path = require('path');
+var mainfile = path.join(__dirname, 'ignore_browser_field/main.js');
+var vm = require('vm');
+
+test('ignore browser field', function (t) {
+    t.plan(3);
+    var b = browserify(mainfile, { browserField: false });
+    var expected = [ 'A:NODE', 'B:X.JS' ];
+    
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        var c = { console: { log: log } };
+        vm.runInNewContext(src, c);
+        
+        function log (msg) {
+            t.equal(msg, expected.shift());
+        }
+    });
+});
diff --git a/test/ignore_browser_field/main.js b/test/ignore_browser_field/main.js
new file mode 100644
index 000000000..bae4a2290
--- /dev/null
+++ b/test/ignore_browser_field/main.js
@@ -0,0 +1,2 @@
+console.log(require('a'));
+console.log(require('b'));
diff --git a/test/ignore_browser_field/node_modules/a/browser.js b/test/ignore_browser_field/node_modules/a/browser.js
new file mode 100644
index 000000000..229aa83cb
--- /dev/null
+++ b/test/ignore_browser_field/node_modules/a/browser.js
@@ -0,0 +1 @@
+module.exports = 'A:BROWSER'
diff --git a/test/ignore_browser_field/node_modules/a/main.js b/test/ignore_browser_field/node_modules/a/main.js
new file mode 100644
index 000000000..1f95fc3c3
--- /dev/null
+++ b/test/ignore_browser_field/node_modules/a/main.js
@@ -0,0 +1 @@
+module.exports = 'A:NODE'
diff --git a/test/ignore_browser_field/node_modules/a/package.json b/test/ignore_browser_field/node_modules/a/package.json
new file mode 100644
index 000000000..d7572b6f9
--- /dev/null
+++ b/test/ignore_browser_field/node_modules/a/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "a",
+  "version": "1.0.0",
+  "main": "main.js",
+  "browser": "browser.js"
+}
diff --git a/test/ignore_browser_field/node_modules/b/browser-x.js b/test/ignore_browser_field/node_modules/b/browser-x.js
new file mode 100644
index 000000000..aca586288
--- /dev/null
+++ b/test/ignore_browser_field/node_modules/b/browser-x.js
@@ -0,0 +1 @@
+module.exports = 'browser-x.js'
diff --git a/test/ignore_browser_field/node_modules/b/main.js b/test/ignore_browser_field/node_modules/b/main.js
new file mode 100644
index 000000000..5b7a8817b
--- /dev/null
+++ b/test/ignore_browser_field/node_modules/b/main.js
@@ -0,0 +1 @@
+module.exports = ('b:' + require('./x.js')).toUpperCase();
diff --git a/test/ignore_browser_field/node_modules/b/package.json b/test/ignore_browser_field/node_modules/b/package.json
new file mode 100644
index 000000000..021d8bb38
--- /dev/null
+++ b/test/ignore_browser_field/node_modules/b/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "b",
+  "version": "1.0.0",
+  "main": "main.js",
+  "browser": {
+    "./x.js": "./browser-x.js"
+  }
+}
diff --git a/test/ignore_browser_field/node_modules/b/x.js b/test/ignore_browser_field/node_modules/b/x.js
new file mode 100644
index 000000000..43396403b
--- /dev/null
+++ b/test/ignore_browser_field/node_modules/b/x.js
@@ -0,0 +1 @@
+module.exports = 'x.js';
diff --git a/test/ignore_missing.js b/test/ignore_missing.js
index e7410cb28..ddf72ed20 100644
--- a/test/ignore_missing.js
+++ b/test/ignore_missing.js
@@ -3,6 +3,8 @@ var test = require('tap').test;
 
 test('ignoreMissing option', function (t) {
     t.test('on browserify', function(t) {
+        t.plan(1);
+        
         var ignored = browserify({
             entries: [__dirname + '/ignore_missing/main.js'],
             ignoreMissing: true
@@ -10,27 +12,30 @@ test('ignoreMissing option', function (t) {
 
         ignored.bundle(function(err) {
             t.ok(!err, "bundle completed with missing file ignored");
-            t.end()
         });
     });
 
     t.test('on .bundle', function(t) {
+        t.plan(1);
+        
         var ignored = browserify(__dirname + '/ignore_missing/main.js', {
             ignoreMissing: true
         });
 
         ignored.bundle(function(err) {
             t.ok(!err, "bundle completed with missing file ignored");
-            t.end();
         });
     });
 
-    test('defaults to false', function (t) {
+    t.test('defaults to false', function (t) {
+        t.plan(1);
+        
         var expected = browserify(__dirname + '/ignore_missing/main.js');
 
         expected.bundle(function(err) {
             t.ok(err, 'ignoreMissing was false, an error was raised');
-            t.end();
         });
     });
+    
+    t.end();
 });
diff --git a/test/ignore_transform_key.js b/test/ignore_transform_key.js
new file mode 100644
index 000000000..253f64051
--- /dev/null
+++ b/test/ignore_transform_key.js
@@ -0,0 +1,17 @@
+var browserify = require('../');
+var test = require('tap').test;
+var vm = require('vm');
+
+test('ignore transform', function(t) {
+  t.plan(1);
+
+  var b = browserify({
+    transformKey: false
+  });
+  b.add(__dirname + '/ignore_transform_key/main.js');
+
+  b.bundle(function(err, src) {
+    if (err) t.fail(err);
+    vm.runInNewContext(src, {t: t});
+  });
+});
diff --git a/test/ignore_transform_key/main.js b/test/ignore_transform_key/main.js
new file mode 100644
index 000000000..97be0ea7c
--- /dev/null
+++ b/test/ignore_transform_key/main.js
@@ -0,0 +1,3 @@
+var a = require('a');
+
+t.equal(a, 'good');
diff --git a/test/ignore_transform_key/node_modules/a/index.js b/test/ignore_transform_key/node_modules/a/index.js
new file mode 100644
index 000000000..1f9bee291
--- /dev/null
+++ b/test/ignore_transform_key/node_modules/a/index.js
@@ -0,0 +1 @@
+module.exports = 'good';
diff --git a/test/ignore_transform_key/node_modules/a/package.json b/test/ignore_transform_key/node_modules/a/package.json
new file mode 100644
index 000000000..7d9c4b3d5
--- /dev/null
+++ b/test/ignore_transform_key/node_modules/a/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "a",
+  "version": "1.0.0",
+  "private": true,
+  "browserify": {
+    "transform": [
+      "evil-transform"
+    ]
+  }
+}
diff --git a/test/ignore_transform_key/node_modules/evil-transform/index.js b/test/ignore_transform_key/node_modules/evil-transform/index.js
new file mode 100644
index 000000000..a4dd44451
--- /dev/null
+++ b/test/ignore_transform_key/node_modules/evil-transform/index.js
@@ -0,0 +1,12 @@
+const through2 = require('through2');
+
+module.exports = function() {
+
+  return through2.obj(function(row, enc, next) {
+      return next();
+    },
+    function(next) {
+      next(null, "module.exports = 'evil';");
+    }
+  )
+};
diff --git a/test/ignore_transform_key/node_modules/evil-transform/package.json b/test/ignore_transform_key/node_modules/evil-transform/package.json
new file mode 100644
index 000000000..81ca8df1a
--- /dev/null
+++ b/test/ignore_transform_key/node_modules/evil-transform/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "evil-transform",
+  "version": "1.0.0",
+  "private": true
+}
diff --git a/test/json.js b/test/json.js
index 33dbbecfb..e0f2e27ea 100644
--- a/test/json.js
+++ b/test/json.js
@@ -1,5 +1,7 @@
 var browserify = require('../');
+var fs = require('fs');
 var vm = require('vm');
+var semver = require('semver');
 var test = require('tap').test;
 
 test('json', function (t) {
@@ -16,3 +18,31 @@ test('json', function (t) {
         vm.runInNewContext(src, c);
     });
 });
+
+// This works in Node v10 and up thanks to the JSON superset proposal, which
+// allows the evil chars in javascript strings.
+// https://github.com/tc39/proposal-json-superset
+test('verify evil json', { skip: semver.gte(process.version, 'v10.0.0') }, function(t) {
+    t.plan(1);
+    fs.readFile(__dirname + '/json/evil-chars.json', function(err, data) {
+        if (err) t.fail(err);
+        t.throws(function() {
+            vm.runInNewContext('(' + data.toString() + ')');
+        });
+    });
+});
+
+test('evil json', function (t) {
+    t.plan(2);
+    var b = browserify();
+    b.add(__dirname + '/json/evil.js');
+    b.bundle(function (err, src) {
+        if (err) t.fail(err);
+        var c = {
+            ex : function (obj) {
+                t.same(obj, { evil : '\u2028\u2029' });
+            }
+        };
+        vm.runInNewContext(src, c);
+    });
+});
diff --git a/test/json/evil-chars.json b/test/json/evil-chars.json
new file mode 100644
index 000000000..4a5851bb6
--- /dev/null
+++ b/test/json/evil-chars.json
@@ -0,0 +1,3 @@
+{
+    "evil": "

"
+}
diff --git a/test/json/evil.js b/test/json/evil.js
new file mode 100644
index 000000000..767e9cb27
--- /dev/null
+++ b/test/json/evil.js
@@ -0,0 +1,2 @@
+ex(require('./evil-chars.json'));
+ex(require('./evil-chars'));
diff --git a/test/leak.js b/test/leak.js
index 2e2fa8d21..06881655d 100644
--- a/test/leak.js
+++ b/test/leak.js
@@ -13,6 +13,8 @@ var dir = path.join(
 );
 var dirstring = dir.split(path.sep).slice(-2).join(path.sep);
 
+if (!ArrayBuffer.isView) ArrayBuffer.isView = function () { return false; };
+
 test('leaking information about system paths (process)', function (t) {
     t.plan(4);
     
@@ -30,7 +32,11 @@ test('leaking information about system paths (process)', function (t) {
         t.equal(src.indexOf(dirstring), -1, 'temp directory visible');
         t.equal(src.indexOf(process.cwd()), -1, 'cwd directory visible');
         t.equal(src.indexOf('/home'), -1, 'home directory visible');
-        vm.runInNewContext(src, { t: t, setTimeout: setTimeout });
+        vm.runInNewContext(src, {
+            t: t,
+            setTimeout: setTimeout,
+            clearTimeout: clearTimeout
+        });
     });
 });
 
@@ -48,6 +54,6 @@ test('leaking information about system paths (Buffer)', function (t) {
         t.equal(src.indexOf(dirstring), -1, 'temp directory visible');
         t.equal(src.indexOf(process.cwd()), -1, 'cwd directory visible');
         t.equal(src.indexOf('/home'), -1, 'home directory visible');
-        vm.runInNewContext(src, { t: t, setTimeout: setTimeout });
+        vm.runInNewContext(src, { t: t, setTimeout: setTimeout, Uint8Array: Uint8Array, ArrayBuffer: ArrayBuffer });
     });
 });
diff --git a/test/multi_entry.js b/test/multi_entry.js
index 3b5812cf3..e38a7b3b4 100644
--- a/test/multi_entry.js
+++ b/test/multi_entry.js
@@ -1,23 +1,58 @@
 var browserify = require('../');
 var vm = require('vm');
+var path = require('path');
 var test = require('tap').test;
 var fs = require('fs');
 
 var testFiles = [
-    __dirname + '/multi_entry/a.js',
-    __dirname + '/multi_entry/b.js',
-    __dirname + '/multi_entry/c.js'
+    path.join(__dirname, 'multi_entry/a.js'),
+    path.join(__dirname, 'multi_entry/b.js'),
+    path.join(__dirname, 'multi_entry/c.js')
 ];
 
 test('multi entry', function (t) {
-    t.plan(3);
+    t.plan(6);
     
     var b = browserify([
         testFiles[0],
         testFiles[1]
     ]);
     b.add(testFiles[2]);
+    
+    b.on('dep', function(row) {
+        if (row.entry) {
+            t.ok(testFiles.indexOf(row.file) > -1, 'should contain full entry path');
+        }
+    });
+    
+    b.bundle(function (err, src) {
+        var c = {
+            times : 0,
+            t : t
+        };
+        vm.runInNewContext(src, c);
+    });
+});
 
+test('multi entry relative', function (t) {
+    t.plan(6);
+    
+    var rTestFiles = testFiles.map(function(x) {
+        return x.replace(__dirname + '/', '');
+    });
+
+    var b = browserify({
+        entries: [rTestFiles[0], rTestFiles[1]],
+        basedir: __dirname
+    });
+    b.add(rTestFiles[2]);
+    
+    b.on('dep', function(row) {
+        if (row.entry) {
+            t.ok(testFiles.indexOf(row.file) > -1, 'should contain full entry path');
+        }
+    });
+    
     b.bundle(function (err, src) {
         var c = {
             times : 0,
@@ -27,22 +62,55 @@ test('multi entry', function (t) {
     });
 });
 
-test('entries as streams', function (t) {
-    t.plan(3);
+test('multi entry relative cwd', function (t) {
+    t.plan(6);
+    
+    var rTestFiles = testFiles.map(function(x) {
+        return x.replace(__dirname + '/', './');
+    });
+
+    var b = browserify({
+        entries: [rTestFiles[0], rTestFiles[1]],
+        basedir: __dirname
+    });
+    b.add(rTestFiles[2]);
+    
+    b.on('dep', function(row) {
+        if (row.entry) {
+            t.ok(testFiles.indexOf(row.file) > -1, 'should contain full entry path');
+        }
+    });
     
-    // transform paths to streams
-    for (var i = 0; i < testFiles.length; i++) {
-        testFiles[i] = fs.createReadStream(testFiles[i]);
-    }
+    b.bundle(function (err, src) {
+        var c = {
+            times : 0,
+            t : t
+        };
+        vm.runInNewContext(src, c);
+    });
+});
+
+test('entries as streams', function (t) {
+    t.plan(6);
     
     // commondir blows up with streams and without basedir
     var opts = { basedir: __dirname + '/multi_entry' };
     
     var b = browserify([
-        testFiles[0],
-        testFiles[1]
+        fs.createReadStream(testFiles[0]),
+        fs.createReadStream(testFiles[1])
     ], opts);
-    b.add(testFiles[2]);
+    b.add(fs.createReadStream(testFiles[2]));
+    
+    b.on('dep', function(row) {
+        if (row.entry) {
+            t.similar(
+                row.file,
+                RegExp(path.join(__dirname, 'multi_entry/_stream_').replace(/\\/g, '\\\\') + '[\\d].js'),
+                'should be full entry path'
+            );
+        }
+    });
     
     b.bundle(function (err, src) {
         var c = {
diff --git a/test/multi_entry_cross_require.js b/test/multi_entry_cross_require.js
new file mode 100644
index 000000000..43f04ea51
--- /dev/null
+++ b/test/multi_entry_cross_require.js
@@ -0,0 +1,93 @@
+var browserify = require('../');
+var vm = require('vm');
+var path = require('path');
+var test = require('tap').test;
+
+var testFiles = [
+    path.join(__dirname, 'multi_entry_cross_require/a.js'),
+    path.join(__dirname, 'multi_entry_cross_require/lib/b.js'),
+    path.join(__dirname, 'multi_entry_cross_require/c.js')
+];
+
+test('multi entry cross require', function (t) {
+    t.plan(8);
+
+    var b = browserify([
+        testFiles[0],
+        testFiles[1]
+    ]);
+    b.add(testFiles[2]);
+    
+    b.on('dep', function(row) {
+        if (row.entry) {
+            t.ok(testFiles.indexOf(row.file) > -1, 'should contain full entry path');
+        }
+    });
+    
+    b.bundle(function (err, src) {
+        if (err) throw err;
+        var c = {
+            times : 0,
+            t : t
+        };
+        vm.runInNewContext(src, c);
+    });
+});
+
+test('multi entry cross require - relative cwd', function (t) {
+    t.plan(8);
+
+    var dsTestFiles = testFiles.map(function(x) {
+        return x.replace(__dirname + '/', './');
+    });
+
+    var b = browserify({
+        entries: [dsTestFiles[0], dsTestFiles[1]],
+        basedir: __dirname
+    });
+    b.add(dsTestFiles[2]);
+    
+    b.on('dep', function(row) {
+        if (row.entry) {
+            t.ok(testFiles.indexOf(row.file) > -1, 'should contain full entry path');
+        }
+    });
+    
+    b.bundle(function (err, src) {
+        if (err) throw err;
+        var c = {
+            times : 0,
+            t : t
+        };
+        vm.runInNewContext(src, c);
+    });
+});
+
+test('multi entry cross require - relative', function (t) {
+    t.plan(8);
+
+    var rTestFiles = testFiles.map(function(x) {
+        return x.replace(__dirname + '/', '');
+    });
+
+    var b = browserify({
+        entries: [rTestFiles[0], rTestFiles[1]],
+        basedir: __dirname
+    });
+    b.add(rTestFiles[2]);
+    
+    b.on('dep', function(row) {
+        if (row.entry) {
+            t.ok(testFiles.indexOf(row.file) > -1, 'should contain full entry path');
+        }
+    });
+    
+    b.bundle(function (err, src) {
+        if (err) throw err;
+        var c = {
+            times : 0,
+            t : t
+        };
+        vm.runInNewContext(src, c);
+    });
+});
diff --git a/test/multi_entry_cross_require/a.js b/test/multi_entry_cross_require/a.js
new file mode 100644
index 000000000..0223dafc0
--- /dev/null
+++ b/test/multi_entry_cross_require/a.js
@@ -0,0 +1,8 @@
+times ++;
+t.equal(times, 1);
+
+var b = require('./lib/b');
+t.equal(times, 2);
+
+b.foo();
+t.equal(times, 3);
diff --git a/test/multi_entry_cross_require/c.js b/test/multi_entry_cross_require/c.js
new file mode 100644
index 000000000..e1918384b
--- /dev/null
+++ b/test/multi_entry_cross_require/c.js
@@ -0,0 +1,7 @@
+times++;
+t.equal(times, 4);
+
+var b = require('./lib/b');
+b.foo();
+
+t.equal(times, 5);
diff --git a/test/multi_entry_cross_require/lib/b.js b/test/multi_entry_cross_require/lib/b.js
new file mode 100644
index 000000000..e7d2dad1f
--- /dev/null
+++ b/test/multi_entry_cross_require/lib/b.js
@@ -0,0 +1,5 @@
+times++;
+
+module.exports.foo = function() {
+  times++;
+};
diff --git a/test/multi_symlink.js b/test/multi_symlink.js
new file mode 100644
index 000000000..08a5b1dd6
--- /dev/null
+++ b/test/multi_symlink.js
@@ -0,0 +1,13 @@
+var browserify = require('../');
+var vm = require('vm');
+var test = require('tap').test;
+
+test('multiple symlink execution', { skip: process.platform === 'win32' }, function (t) {
+    t.plan(1);
+    var b = browserify(__dirname + '/multi_symlink/main.js');
+    b.bundle(function (err, src) {
+        var c = { console: { log: log } };
+        vm.runInNewContext(src, c);
+        function log (msg) { t.equal(msg, 'X') }
+    });
+});
diff --git a/test/multi_symlink/main.js b/test/multi_symlink/main.js
new file mode 100644
index 000000000..0f904dc91
--- /dev/null
+++ b/test/multi_symlink/main.js
@@ -0,0 +1,2 @@
+require('./x.js');
+require('./y.js');
diff --git a/test/multi_symlink/x.js b/test/multi_symlink/x.js
new file mode 100644
index 000000000..e894542cb
--- /dev/null
+++ b/test/multi_symlink/x.js
@@ -0,0 +1 @@
+console.log('X');
diff --git a/test/multi_symlink/y.js b/test/multi_symlink/y.js
new file mode 120000
index 000000000..ca52ee1f4
--- /dev/null
+++ b/test/multi_symlink/y.js
@@ -0,0 +1 @@
+./x.js
\ No newline at end of file
diff --git a/test/no_builtins.js b/test/no_builtins.js
index 900754a01..4a25c93f2 100644
--- a/test/no_builtins.js
+++ b/test/no_builtins.js
@@ -1,12 +1,14 @@
 var browserify = require('../');
 var test = require('tap').test;
+var path = require('path');
 var vm = require('vm');
 
 test('builtins false', function (t) {
     t.plan(1);
-    
+
+    var file = __dirname + '/no_builtins/main.js';
     var b = browserify({
-        entries: [ __dirname + '/no_builtins/main.js' ],
+        entries: [ file ],
         commondir: false,
         builtins: false
     });
@@ -15,7 +17,8 @@ test('builtins false', function (t) {
             console: { log: function (msg) {
                 t.equal(msg, 'beep boop\n');
             } },
-            require: require
+            require: require,
+            __dirname: process.cwd()
         };
         vm.runInNewContext(src, c);
     });
diff --git a/test/noparse.js b/test/noparse.js
new file mode 100644
index 000000000..ddb024df1
--- /dev/null
+++ b/test/noparse.js
@@ -0,0 +1,31 @@
+var browserify = require('../');
+var test = require('tap').test;
+var path = require('path');
+
+test('noParse array', function (t) {
+    process.chdir(__dirname);
+    
+    t.plan(2);
+    
+    var actual = [];
+    var expected = [
+        'noparse/a.js',
+        'noparse/b.js',
+        'noparse/dir1/1.js',
+        'noparse/node_modules/robot/main.js'
+    ].map(function (x) {return path.resolve(x);}).sort();
+    
+    var b = browserify({
+        entries: [ __dirname + '/noparse/a.js' ],
+        noParse: [
+            path.join(__dirname, 'noparse/dir1/1.js'),
+            path.join(__dirname, 'noparse/node_modules/robot/main.js')
+        ]
+    });
+    b.on('dep', function(dep) { actual.push(dep.file); });
+    b.bundle(function (err, src) {
+        actual.sort();
+        t.ifError(err);
+        t.deepEqual(actual, expected);
+    });
+});
diff --git a/test/noparse/a.js b/test/noparse/a.js
new file mode 100644
index 000000000..076812a66
--- /dev/null
+++ b/test/noparse/a.js
@@ -0,0 +1,4 @@
+module.exports = {
+    a: true,
+    b: require('./b')
+};
diff --git a/test/noparse/b.js b/test/noparse/b.js
new file mode 100644
index 000000000..de0ba559a
--- /dev/null
+++ b/test/noparse/b.js
@@ -0,0 +1,5 @@
+module.exports = {
+    b: true,
+    1: require('./dir1/1'),
+    robot: require('robot')
+};
diff --git a/test/noparse/dir1/1.js b/test/noparse/dir1/1.js
new file mode 100644
index 000000000..960968b0b
--- /dev/null
+++ b/test/noparse/dir1/1.js
@@ -0,0 +1,4 @@
+module.exports = {
+    1: true,
+    2: require('./dir2/2')
+};
diff --git a/test/noparse/dir1/dir2/2.js b/test/noparse/dir1/dir2/2.js
new file mode 100644
index 000000000..ef4ba1962
--- /dev/null
+++ b/test/noparse/dir1/dir2/2.js
@@ -0,0 +1,3 @@
+module.exports = {
+    2: true
+};
diff --git a/test/noparse/node_modules/robot/lib/beep.js b/test/noparse/node_modules/robot/lib/beep.js
new file mode 100644
index 000000000..6529dd85c
--- /dev/null
+++ b/test/noparse/node_modules/robot/lib/beep.js
@@ -0,0 +1,4 @@
+module.exports = {
+    beep: true,
+    boop: require('./boop')
+};
diff --git a/test/noparse/node_modules/robot/lib/boop.js b/test/noparse/node_modules/robot/lib/boop.js
new file mode 100644
index 000000000..696a67245
--- /dev/null
+++ b/test/noparse/node_modules/robot/lib/boop.js
@@ -0,0 +1,3 @@
+module.exports = {
+    boop: true
+};
diff --git a/test/noparse/node_modules/robot/main.js b/test/noparse/node_modules/robot/main.js
new file mode 100644
index 000000000..87af6096a
--- /dev/null
+++ b/test/noparse/node_modules/robot/main.js
@@ -0,0 +1,4 @@
+module.exports = {
+    robot: true,
+    beep: require('./lib/beep')
+};
diff --git a/test/noparse/node_modules/robot/package.json b/test/noparse/node_modules/robot/package.json
new file mode 100644
index 000000000..c13b8cf6a
--- /dev/null
+++ b/test/noparse/node_modules/robot/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "main.js"
+}
diff --git a/test/preserve-symlinks.js b/test/preserve-symlinks.js
new file mode 100644
index 000000000..83940ddc4
--- /dev/null
+++ b/test/preserve-symlinks.js
@@ -0,0 +1,27 @@
+var browserify = require('../');
+var vm = require('vm');
+var test = require('tap').test;
+
+test('optionally preserves symlinks', { skip: process.platform === 'win32' }, function (t) {
+    t.plan(2);
+
+    var b = browserify(__dirname + '/preserve_symlinks/a/index.js', {preserveSymlinks: true});
+    b.bundle(function (err, buf) {
+        t.ifError(err);
+        t.ok(buf);
+        var src = buf.toString('utf8');
+        vm.runInNewContext(src, {});
+    });
+});
+
+test('always resolve entry point symlink', { skip: process.platform === 'win32' }, function (t) {
+    t.plan(2);
+
+    var b = browserify(__dirname + '/preserve_symlinks/linked-entry.js', {preserveSymlinks: true});
+    b.bundle(function (err, buf) {
+        t.ifError(err);
+        t.ok(buf);
+        var src = buf.toString('utf8');
+        vm.runInNewContext(src, {});
+    });
+})
diff --git a/test/preserve_symlinks/a/index.js b/test/preserve_symlinks/a/index.js
new file mode 100644
index 000000000..5f6937c38
--- /dev/null
+++ b/test/preserve_symlinks/a/index.js
@@ -0,0 +1 @@
+require('b');
diff --git a/test/preserve_symlinks/a/node_modules/b b/test/preserve_symlinks/a/node_modules/b
new file mode 120000
index 000000000..d04c0141d
--- /dev/null
+++ b/test/preserve_symlinks/a/node_modules/b
@@ -0,0 +1 @@
+../../b/
\ No newline at end of file
diff --git a/lib/_exclude.js b/test/preserve_symlinks/a/node_modules/c/index.js
similarity index 100%
rename from lib/_exclude.js
rename to test/preserve_symlinks/a/node_modules/c/index.js
diff --git a/test/preserve_symlinks/b/index.js b/test/preserve_symlinks/b/index.js
new file mode 100644
index 000000000..a56a50847
--- /dev/null
+++ b/test/preserve_symlinks/b/index.js
@@ -0,0 +1 @@
+require('c');
diff --git a/test/preserve_symlinks/linked-entry.js b/test/preserve_symlinks/linked-entry.js
new file mode 120000
index 000000000..1d7813582
--- /dev/null
+++ b/test/preserve_symlinks/linked-entry.js
@@ -0,0 +1 @@
+a/index.js
\ No newline at end of file
diff --git a/test/process.js b/test/process.js
index 0660d5429..83ffa14ff 100644
--- a/test/process.js
+++ b/test/process.js
@@ -13,7 +13,8 @@ test('implicit process global', function (t) {
                 t.equal(two, 2);
                 t.end();
             },
-            setTimeout: setTimeout
+            setTimeout: setTimeout,
+            clearTimeout: clearTimeout
         };
         vm.runInNewContext(src, c);
     });
diff --git a/test/quotes.js b/test/quotes.js
new file mode 100644
index 000000000..4c82b7ebe
--- /dev/null
+++ b/test/quotes.js
@@ -0,0 +1,38 @@
+var browserify = require('../');
+var vm = require('vm');
+var test = require('tap').test;
+
+var hasTemplateLiterals = require('has-template-literals')();
+
+test('quotes', function (t) {
+    t.plan(2);
+
+    var b = browserify(__dirname + '/quotes/main.js');
+    b.bundle(function (err, src) {
+        var c = {
+            done : function (single, double) {
+                t.equal(single, 'success', 'single quotes');
+                t.equal(double, 'success', 'double quotes');
+                t.end();
+            }
+        };
+        vm.runInNewContext(src, c);
+    });
+});
+
+test('interpolation literals', { skip: !hasTemplateLiterals }, function (t) {
+    t.plan(3);
+
+    var b = browserify(__dirname + '/quotes/backtick.js');
+    b.bundle(function (err, src) {
+        var c = {
+            done : function (single, double, backtick) {
+                t.equal(single, 'success', 'single quotes');
+                t.equal(double, 'success', 'double quotes');
+                t.equal(backtick, 'success', 'backtick quotes');
+                t.end();
+            }
+        };
+        vm.runInNewContext(src, c);
+    });
+});
diff --git a/test/quotes/backtick.js b/test/quotes/backtick.js
new file mode 100644
index 000000000..7dd85f1f3
--- /dev/null
+++ b/test/quotes/backtick.js
@@ -0,0 +1 @@
+done(require('./one.js'), require("./two.js"), require(`./three.js`));
diff --git a/test/quotes/main.js b/test/quotes/main.js
new file mode 100644
index 000000000..327b5826b
--- /dev/null
+++ b/test/quotes/main.js
@@ -0,0 +1 @@
+done(require('./one.js'), require("./two.js"));
diff --git a/test/quotes/one.js b/test/quotes/one.js
new file mode 100644
index 000000000..52b5cbb33
--- /dev/null
+++ b/test/quotes/one.js
@@ -0,0 +1 @@
+module.exports = 'success';
diff --git a/test/quotes/three.js b/test/quotes/three.js
new file mode 100644
index 000000000..52b5cbb33
--- /dev/null
+++ b/test/quotes/three.js
@@ -0,0 +1 @@
+module.exports = 'success';
diff --git a/test/quotes/two.js b/test/quotes/two.js
new file mode 100644
index 000000000..52b5cbb33
--- /dev/null
+++ b/test/quotes/two.js
@@ -0,0 +1 @@
+module.exports = 'success';
diff --git a/test/reset.js b/test/reset.js
index 10499c860..dad18b3af 100644
--- a/test/reset.js
+++ b/test/reset.js
@@ -18,6 +18,7 @@ test('reset', function (t) {
         t.ifError(err);
         var c = {
             setTimeout : setTimeout,
+            clearTimeout : clearTimeout,
             console : console
         };
         vm.runInNewContext(src, c);
diff --git a/test/reverse_multi_bundle.js b/test/reverse_multi_bundle.js
index 06f273375..8d9f8325f 100644
--- a/test/reverse_multi_bundle.js
+++ b/test/reverse_multi_bundle.js
@@ -38,6 +38,7 @@ test('reverse multi bundle', function (t) {
             var src = appSrc + ';' + lazySrc;
             var c = {
                 setTimeout: setTimeout,
+                clearTimeout: clearTimeout,
                 t: t
             };
             vm.runInNewContext(src, c);
diff --git a/test/shared_symlink.js b/test/shared_symlink.js
new file mode 100644
index 000000000..f10d57339
--- /dev/null
+++ b/test/shared_symlink.js
@@ -0,0 +1,16 @@
+// https://github.com/substack/node-browserify/issues/1325
+
+var browserify = require('../');
+var vm = require('vm');
+var test = require('tap').test;
+
+test('shared symlink', { skip: process.platform === 'win32' }, function (t) {
+    t.plan(1);
+    var b = browserify(__dirname + '/shared_symlink/main.js');
+    b.bundle(function (err, src) {
+        // does the same thing as node: crashes
+        t.equal(err.message, "Cannot find module 'foo' from '"
+            + __dirname + "/shared_symlink/shared'"
+        );
+    });
+});
diff --git a/test/shared_symlink/app/index.js b/test/shared_symlink/app/index.js
new file mode 100644
index 000000000..489c017f6
--- /dev/null
+++ b/test/shared_symlink/app/index.js
@@ -0,0 +1 @@
+module.exports = require('shared') + require('foo')
diff --git a/test/shared_symlink/app/node_modules/foo/index.js b/test/shared_symlink/app/node_modules/foo/index.js
new file mode 100644
index 000000000..7afe02674
--- /dev/null
+++ b/test/shared_symlink/app/node_modules/foo/index.js
@@ -0,0 +1 @@
+module.exports = 1234
diff --git a/test/shared_symlink/app/node_modules/shared b/test/shared_symlink/app/node_modules/shared
new file mode 120000
index 000000000..0ab0cb2b3
--- /dev/null
+++ b/test/shared_symlink/app/node_modules/shared
@@ -0,0 +1 @@
+../../shared
\ No newline at end of file
diff --git a/test/shared_symlink/main.js b/test/shared_symlink/main.js
new file mode 100644
index 000000000..a13f52481
--- /dev/null
+++ b/test/shared_symlink/main.js
@@ -0,0 +1 @@
+console.log(require('./app'))
diff --git a/test/shared_symlink/shared/index.js b/test/shared_symlink/shared/index.js
new file mode 100644
index 000000000..176676407
--- /dev/null
+++ b/test/shared_symlink/shared/index.js
@@ -0,0 +1 @@
+module.exports = require('foo') * 2
diff --git a/test/spread.js b/test/spread.js
new file mode 100644
index 000000000..ba4fd3745
--- /dev/null
+++ b/test/spread.js
@@ -0,0 +1,14 @@
+var browserify = require('../');
+var test = require('tap').test;
+var vm = require('vm');
+var hasObjectSpread = require('has-object-spread')();
+
+test('yield', { skip: !hasObjectSpread }, function (t) {
+    t.plan(2);
+    var b = browserify(__dirname + '/spread/main.js');
+    
+    b.bundle(function (err, src) {
+        t.error(err);
+        t.notEqual(src.indexOf('...b'), -1, 'passed through spread syntax')
+    });
+});
diff --git a/test/spread/main.js b/test/spread/main.js
new file mode 100644
index 000000000..c3e1a4008
--- /dev/null
+++ b/test/spread/main.js
@@ -0,0 +1 @@
+var a = { ...b }
diff --git a/test/symlink_dedupe.js b/test/symlink_dedupe.js
new file mode 100644
index 000000000..dbc7afe63
--- /dev/null
+++ b/test/symlink_dedupe.js
@@ -0,0 +1,16 @@
+var browserify = require('../');
+var vm = require('vm');
+var test = require('tap').test;
+
+test('hash instances with hashed contexts', { skip: process.platform === 'win32' }, function (t) {
+    t.plan(5);
+
+    var b = browserify(__dirname + '/symlink_dedupe/main.js');
+    b.bundle(function (err, buf) {
+        var c = { t: t };
+        var src = buf.toString('utf8');
+        t.equal(src.match(RegExp('// FILE F ONE', 'g')).length, 1);
+        t.equal(src.match(RegExp('// FILE G ONE', 'g')).length, 1);
+        vm.runInNewContext(src, c);
+    });
+});
diff --git a/test/symlink_dedupe/main.js b/test/symlink_dedupe/main.js
new file mode 100644
index 000000000..92ff18df1
--- /dev/null
+++ b/test/symlink_dedupe/main.js
@@ -0,0 +1,6 @@
+var A = require('./one/f.js');
+var B = require('./one/dir/f.js');
+t.equal(A, B);
+t.equal(A(), 555);
+t.equal(B(), 555);
+
diff --git a/test/symlink_dedupe/one/dir b/test/symlink_dedupe/one/dir
new file mode 120000
index 000000000..945c9b46d
--- /dev/null
+++ b/test/symlink_dedupe/one/dir
@@ -0,0 +1 @@
+.
\ No newline at end of file
diff --git a/test/symlink_dedupe/one/f.js b/test/symlink_dedupe/one/f.js
new file mode 100644
index 000000000..a315c1e7d
--- /dev/null
+++ b/test/symlink_dedupe/one/f.js
@@ -0,0 +1,3 @@
+// FILE F ONE
+var G = require('./g.js');
+module.exports = function () { return 111 * G };
diff --git a/test/symlink_dedupe/one/g.js b/test/symlink_dedupe/one/g.js
new file mode 100644
index 000000000..837303206
--- /dev/null
+++ b/test/symlink_dedupe/one/g.js
@@ -0,0 +1,2 @@
+// FILE G ONE
+module.exports = 5
diff --git a/test/syntax_cache.js b/test/syntax_cache.js
new file mode 100644
index 000000000..ff2a5deec
--- /dev/null
+++ b/test/syntax_cache.js
@@ -0,0 +1,47 @@
+var Seq = require('seq');
+var browserify = require('../');
+var test = require('tap').test;
+var shasum = require('shasum');
+
+test('syntax cache - valid', function (t) {
+    t.plan(2);
+    
+    var expectedCache = {}
+    var cacheKey;
+    
+    var b = browserify(__dirname + '/syntax_cache/valid.js');    
+    b.once('dep', function(row) {
+        cacheKey = shasum(row.source);
+        expectedCache[cacheKey] = true;
+    });
+    
+    Seq()
+        .seq(function() { b.bundle(this); })
+        .seq(function() {
+            t.deepEqual(b._syntaxCache, expectedCache);
+            b._syntaxCache[cacheKey] = expectedCache[cacheKey] = 'beep';
+            b.bundle(function(err, src) {
+                // if the cache worked, the "cacheKey"
+                // should not be reset to "true"
+                t.deepEqual(b._syntaxCache, expectedCache);
+            });
+        });
+});
+
+test('syntax cache - skip invalid', function (t) {
+    t.plan(5);
+    
+    var b = browserify(__dirname + '/syntax_cache/invalid.js');
+    
+    Seq()
+        .seq(function() { b.bundle(this); })
+        .catch(function(lastErr) {
+            t.deepEqual(b._syntaxCache, {});
+            t.similar(String(lastErr), /ParseError/);
+            b.bundle(function(err, src) {
+                t.deepEqual(b._syntaxCache, {});
+                t.similar(String(err), /ParseError/);
+                t.notEqual(lastErr, err, 'errors should be unique');
+            });
+        });
+});
diff --git a/test/syntax_cache/invalid.js b/test/syntax_cache/invalid.js
new file mode 100644
index 000000000..e85c07cca
--- /dev/null
+++ b/test/syntax_cache/invalid.js
@@ -0,0 +1,2 @@
+var x = {
+var y = 6;
diff --git a/test/syntax_cache/valid.js b/test/syntax_cache/valid.js
new file mode 100644
index 000000000..cf4f426f5
--- /dev/null
+++ b/test/syntax_cache/valid.js
@@ -0,0 +1,2 @@
+var x = {};
+var y = 6;
diff --git a/test/tr_no_entry.js b/test/tr_no_entry.js
index f31be8265..f41d9ceb5 100644
--- a/test/tr_no_entry.js
+++ b/test/tr_no_entry.js
@@ -3,6 +3,8 @@ var test = require('tap').test;
 var path = require('path')
 
 test('transform with no entry files', function (t) {
+    process.chdir(__dirname);
+    
     t.plan(2);
     var b = browserify();
     b.transform('tr');
diff --git a/test/tr_symlink.js b/test/tr_symlink.js
new file mode 100644
index 000000000..9fcca56de
--- /dev/null
+++ b/test/tr_symlink.js
@@ -0,0 +1,27 @@
+// based on this scenario:
+// https://github.com/substack/node-browserify/pull/831#issuecomment-49546902
+
+var browserify = require('../');
+var vm = require('vm');
+var test = require('tap').test;
+var through = require('through2');
+
+test('transform symlink', { skip: process.platform === 'win32' }, function (t) {
+    t.plan(4);
+    var expected = [ 9, 555, 777 ];
+    var b = browserify(__dirname + '/tr_symlink/app/main.js', {
+        basedir: __dirname + '/tr_symlink/app'
+    });
+    b.transform(function (file) {
+        return through(function (buf, enc, next) {
+            this.push(String(buf).replace(/7/g, 9));
+            next();
+        })
+    });
+    b.bundle(function (err, src) {
+        t.ifError(err);
+        var c = { console: { log: log } };
+        vm.runInNewContext(src, c);
+        function log (msg) { t.equal(msg, expected.shift()) }
+    });
+});
diff --git a/test/tr_symlink/a-module/index.js b/test/tr_symlink/a-module/index.js
new file mode 100644
index 000000000..3e842e734
--- /dev/null
+++ b/test/tr_symlink/a-module/index.js
@@ -0,0 +1 @@
+module.exports = 555
diff --git a/test/tr_symlink/app/main.js b/test/tr_symlink/app/main.js
new file mode 100644
index 000000000..da0ac769b
--- /dev/null
+++ b/test/tr_symlink/app/main.js
@@ -0,0 +1,6 @@
+var a = require('aaa');
+var b = require('bbb');
+
+console.log(5);
+console.log(a);
+console.log(b);
diff --git a/test/tr_symlink/app/node_modules/aaa b/test/tr_symlink/app/node_modules/aaa
new file mode 120000
index 000000000..fcd5624d4
--- /dev/null
+++ b/test/tr_symlink/app/node_modules/aaa
@@ -0,0 +1 @@
+../../a-module
\ No newline at end of file
diff --git a/test/tr_symlink/app/node_modules/bbb b/test/tr_symlink/app/node_modules/bbb
new file mode 120000
index 000000000..bbded2ad5
--- /dev/null
+++ b/test/tr_symlink/app/node_modules/bbb
@@ -0,0 +1 @@
+../../b-module
\ No newline at end of file
diff --git a/test/tr_symlink/app/node_modules/tr/index.js b/test/tr_symlink/app/node_modules/tr/index.js
new file mode 100644
index 000000000..f9d056885
--- /dev/null
+++ b/test/tr_symlink/app/node_modules/tr/index.js
@@ -0,0 +1,14 @@
+var through = require('through2');
+
+module.exports = function () {
+    var bufs = [];
+    return through(write, end);
+    function write (buf, enc, next) {
+        bufs.push(buf);
+        next();
+    }
+    function end () {
+        this.push(Buffer.concat(bufs).toString().replace(/5/g, 9));
+        this.push(null);
+    }
+};
diff --git a/test/tr_symlink/app/package.json b/test/tr_symlink/app/package.json
new file mode 100644
index 000000000..2f2bbfff8
--- /dev/null
+++ b/test/tr_symlink/app/package.json
@@ -0,0 +1,5 @@
+{
+  "browserify": {
+    "transform": [ "tr" ]
+  }
+}
diff --git a/test/tr_symlink/b-module/ext.js b/test/tr_symlink/b-module/ext.js
new file mode 100644
index 000000000..2fad98701
--- /dev/null
+++ b/test/tr_symlink/b-module/ext.js
@@ -0,0 +1 @@
+module.exports = 777;
diff --git a/test/tr_symlink/b-module/index.js b/test/tr_symlink/b-module/index.js
new file mode 100644
index 000000000..dae6275e7
--- /dev/null
+++ b/test/tr_symlink/b-module/index.js
@@ -0,0 +1,2 @@
+var ext = require('./ext');
+module.exports = ext;
diff --git a/test/yield.js b/test/yield.js
index 666c0e28d..164a5aaf7 100644
--- a/test/yield.js
+++ b/test/yield.js
@@ -1,18 +1,18 @@
 var browserify = require('../');
 var test = require('tap').test;
 var vm = require('vm');
+var generatorFunction = require('make-generator-function');
 
-test('yield', function (t) {
+test('yield', { skip: !generatorFunction }, function (t) {
     t.plan(6);
     var b = browserify(__dirname + '/yield/main.js');
-    b.transform('es6ify');
-    
+
     b.bundle(function (err, src) {
         t.error(err);
         var c = { console: { log: log } };
         var index = 0;
         vm.runInNewContext(src, c);
-        
+
         function log (msg) {
             t.equal(index++, msg);
         }