Merge pull request #1273 from substack/housekeeping

Housekeeping
browserify · May 20, 2015 · fbaee6e · fbaee6e
2 parents b065829 + 3842880
commit fbaee6e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 20 deletions.
diff --git a/bin/args.js b/bin/args.js
@@ -245,13 +245,6 @@ module.exports = function (args, opts) {
     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
@@ -63,14 +63,6 @@ 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 (err.stack) {
         console.error(err.stack);

diff --git a/index.js b/index.js
@@ -9,12 +9,10 @@ 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 defined = require('defined');
 var has = require('has');
@@ -423,7 +421,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
@@ -503,7 +501,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);

diff --git a/package.json b/package.json
@@ -57,7 +57,6 @@
     "read-only-stream": "^1.1.1",
     "readable-stream": "^1.1.13",
     "resolve": "^1.1.4",
-    "shallow-copy": "0.0.1",
     "shasum": "^1.0.0",
     "shell-quote": "~0.0.1",
     "stream-browserify": "^1.0.0",