sprockets-browserify 0.2.0 → 0.3.0

data/node_modules/browserify/node_modules/browser-resolve/node_modules/resolve/package.json

@@ -1,7 +1,7 @@
 {
   "name": "resolve",
   "description": "resolve like require.resolve() on behalf of files asynchronously and synchronously",
-  "version": "0.3.1",
+  "version": "0.6.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/substack/node-resolve.git"
@@ -25,8 +25,16 @@
     "email": "mail@substack.net",
     "url": "http://substack.net"
   },
-  "readme": "# resolve\n\nimplements the [node `require.resolve()`\nalgorithm](http://nodejs.org/docs/v0.4.8/api/all.html#all_Together...)\nsuch that you can `require.resolve()` on behalf of a file asynchronously and\nsynchronously\n\n[![build status](https://secure.travis-ci.org/substack/node-resolve.png)](http://travis-ci.org/substack/node-resolve)\n\n# example\n\nasynchronously resolve:\n\n``` js\nvar resolve = require('resolve');\nresolve('tap', { basedir: __dirname }, function (err, res) {\n    if (err) console.error(err)\n    else console.log(res)\n});\n```\n\n```\n$ node example/async.js\n/home/substack/projects/node-resolve/node_modules/tap/lib/main.js\n```\n\nsynchronously resolve:\n\n``` js\nvar resolve = require('resolve');\nvar res = resolve.sync('tap', { basedir: __dirname });\nconsole.log(res);\n```\n\n```\n$ node example/sync.js\n/home/substack/projects/node-resolve/node_modules/tap/lib/main.js\n```\n\n# methods\n\n``` js\nvar resolve = require('resolve')\n```\n\n## resolve(pkg, opts={}, cb)\n\nAsynchronously resolve the module path string `pkg` into `cb(err, res)`.\n\noptions are:\n\n* opts.basedir - directory to begin resolving from\n\n* opts.extensions - array of file extensions to search in order\n\n* opts.readFile - how to read files asynchronously\n\n* opts.isFile - function to asynchronously test whether a file exists\n\n* opts.packageFilter - transform the parsed package.json contents before looking\nat the \"main\" field\n\n* opts.paths - require.paths array to use if nothing is found on the normal\nnode_modules recursive walk (probably don't use this)\n\ndefault `opts` values:\n\n``` javascript\n{\n    paths: [],\n    basedir: __dirname,\n    extensions: [ '.js' ],\n    readFile: fs.readFile,\n    isFile: function (file, cb) {\n        fs.stat(file, function (err, stat) {\n            if (err && err.code === 'ENOENT') cb(null, false)\n            else if (err) cb(err)\n            else cb(null, stat.isFile())\n        });\n    }\n}\n```\n\n## resolve.sync(pkg, opts)\n\nSynchronously resolve the module path string `pkg`, returning the result and\nthrowing an error when `pkg` can't be resolved.\n\noptions are:\n\n* opts.basedir - directory to begin resolving from\n\n* opts.extensions - array of file extensions to search in order\n\n* opts.readFile - how to read files synchronously\n\n* opts.isFile - function to synchronously test whether a file exists\n\n* opts.packageFilter - transform the parsed package.json contents before looking\nat the \"main\" field\n\n* opts.paths - require.paths array to use if nothing is found on the normal\nnode_modules recursive walk (probably don't use this)\n\ndefault `opts` values:\n\n``` javascript\n{\n    paths: [],\n    basedir: __dirname,\n    extensions: [ '.js' ],\n    readFileSync: fs.readFileSync,\n    isFile: function (file) {\n        try { return fs.statSync(file).isFile() }\n        catch (e) { return false }\n    }\n}\n````\n\n## resolve.isCore(pkg)\n\nReturn whether a package is in core.\n\n# install\n\nWith [npm](https://npmjs.org) do:\n\n```\nnpm install resolve\n```\n\n# license\n\nMIT\n",
+  "readme": "# resolve\n\nimplements the [node `require.resolve()`\nalgorithm](http://nodejs.org/docs/v0.4.8/api/all.html#all_Together...)\nsuch that you can `require.resolve()` on behalf of a file asynchronously and\nsynchronously\n\n[![build status](https://secure.travis-ci.org/substack/node-resolve.png)](http://travis-ci.org/substack/node-resolve)\n\n# example\n\nasynchronously resolve:\n\n``` js\nvar resolve = require('resolve');\nresolve('tap', { basedir: __dirname }, function (err, res) {\n    if (err) console.error(err)\n    else console.log(res)\n});\n```\n\n```\n$ node example/async.js\n/home/substack/projects/node-resolve/node_modules/tap/lib/main.js\n```\n\nsynchronously resolve:\n\n``` js\nvar resolve = require('resolve');\nvar res = resolve.sync('tap', { basedir: __dirname });\nconsole.log(res);\n```\n\n```\n$ node example/sync.js\n/home/substack/projects/node-resolve/node_modules/tap/lib/main.js\n```\n\n# methods\n\n``` js\nvar resolve = require('resolve')\n```\n\n## resolve(pkg, opts={}, cb)\n\nAsynchronously resolve the module path string `pkg` into `cb(err, res)`.\n\noptions are:\n\n* opts.basedir - directory to begin resolving from\n\n* opts.package - package from which module is being loaded\n\n* opts.extensions - array of file extensions to search in order\n\n* opts.readFile - how to read files asynchronously\n\n* opts.isFile - function to asynchronously test whether a file exists\n\n* opts.packageFilter - transform the parsed package.json contents before looking\nat the \"main\" field\n\n* opts.paths - require.paths array to use if nothing is found on the normal\nnode_modules recursive walk (probably don't use this)\n\n* opts.moduleDirectory - directory to recursively look for modules in. default:\n`\"node_modules\"`\n\ndefault `opts` values:\n\n``` javascript\n{\n    paths: [],\n    basedir: __dirname,\n    extensions: [ '.js' ],\n    readFile: fs.readFile,\n    isFile: function (file, cb) {\n        fs.stat(file, function (err, stat) {\n            if (err && err.code === 'ENOENT') cb(null, false)\n            else if (err) cb(err)\n            else cb(null, stat.isFile())\n        });\n    },\n    moduleDirectory: 'node_modules'\n}\n```\n\n## resolve.sync(pkg, opts)\n\nSynchronously resolve the module path string `pkg`, returning the result and\nthrowing an error when `pkg` can't be resolved.\n\noptions are:\n\n* opts.basedir - directory to begin resolving from\n\n* opts.extensions - array of file extensions to search in order\n\n* opts.readFile - how to read files synchronously\n\n* opts.isFile - function to synchronously test whether a file exists\n\n* opts.packageFilter - transform the parsed package.json contents before looking\nat the \"main\" field\n\n* opts.paths - require.paths array to use if nothing is found on the normal\nnode_modules recursive walk (probably don't use this)\n\n* opts.moduleDirectory - directory to recursively look for modules in. default:\n`\"node_modules\"`\n\ndefault `opts` values:\n\n``` javascript\n{\n    paths: [],\n    basedir: __dirname,\n    extensions: [ '.js' ],\n    readFileSync: fs.readFileSync,\n    isFile: function (file) {\n        try { return fs.statSync(file).isFile() }\n        catch (e) { return false }\n    },\n    moduleDirectory: 'node_modules'\n}\n````\n\n## resolve.isCore(pkg)\n\nReturn whether a package is in core.\n\n# install\n\nWith [npm](https://npmjs.org) do:\n\n```\nnpm install resolve\n```\n\n# license\n\nMIT\n",
   "readmeFilename": "readme.markdown",
-  "_id": "resolve@0.3.1",
-  "_from": "resolve@~0.3.0"
+  "bugs": {
+    "url": "https://github.com/substack/node-resolve/issues"
+  },
+  "homepage": "https://github.com/substack/node-resolve",
+  "_id": "resolve@0.6.1",
+  "dist": {
+    "shasum": "4cb525a513e1cbe0d0921e68c62f74a8ecc493a4"
+  },
+  "_from": "resolve@~0.6.0",
+  "_resolved": "https://registry.npmjs.org/resolve/-/resolve-0.6.1.tgz"
 }

data/node_modules/browserify/node_modules/browser-resolve/node_modules/resolve/readme.markdown

@@ -51,6 +51,8 @@ options are:
 
 * opts.basedir - directory to begin resolving from
 
+* opts.package - package from which module is being loaded
+
 * opts.extensions - array of file extensions to search in order
 
 * opts.readFile - how to read files asynchronously
@@ -63,6 +65,9 @@ at the "main" field
 * opts.paths - require.paths array to use if nothing is found on the normal
 node_modules recursive walk (probably don't use this)
 
+* opts.moduleDirectory - directory to recursively look for modules in. default:
+`"node_modules"`
+
 default `opts` values:
 
 ``` javascript
@@ -77,7 +82,8 @@ default `opts` values:
             else if (err) cb(err)
             else cb(null, stat.isFile())
         });
-    }
+    },
+    moduleDirectory: 'node_modules'
 }
 ```
 
@@ -102,6 +108,9 @@ at the "main" field
 * opts.paths - require.paths array to use if nothing is found on the normal
 node_modules recursive walk (probably don't use this)
 
+* opts.moduleDirectory - directory to recursively look for modules in. default:
+`"node_modules"`
+
 default `opts` values:
 
 ``` javascript
@@ -113,7 +122,8 @@ default `opts` values:
     isFile: function (file) {
         try { return fs.statSync(file).isFile() }
         catch (e) { return false }
-    }
+    },
+    moduleDirectory: 'node_modules'
 }
 ````
 

data/node_modules/browserify/node_modules/browser-resolve/node_modules/resolve/test/filter.js

@@ -2,7 +2,7 @@ var test = require('tap').test;
 var resolve = require('../');
 
 test('filter', function (t) {
-    t.plan(1);
+    t.plan(2);
     var dir = __dirname + '/resolver';
     resolve('./baz', {
         basedir : dir,
@@ -10,8 +10,9 @@ test('filter', function (t) {
             pkg.main = 'doom';
             return pkg;
         }
-    }, function (err, res) {
+    }, function (err, res, pkg) {
         if (err) t.fail(err);
         t.equal(res, dir + '/baz/doom.js');
+        t.equal(pkg.main, 'doom');
     });
 });

data/node_modules/browserify/node_modules/browser-resolve/node_modules/resolve/test/mock.js

@@ -2,7 +2,7 @@ var test = require('tap').test;
 var resolve = require('../');
 
 test('mock', function (t) {
-    t.plan(4);
+    t.plan(6);
     
     var files = {
         '/foo/bar/baz.js' : 'beep'
@@ -20,27 +20,99 @@ test('mock', function (t) {
         }
     }
     
-    resolve('./baz', opts('/foo/bar'), function (err, res) {
+    resolve('./baz', opts('/foo/bar'), function (err, res, pkg) {
         if (err) t.fail(err);
         t.equal(res, '/foo/bar/baz.js');
+        t.equal(pkg, undefined);
     });
     
-    resolve('./baz.js', opts('/foo/bar'), function (err, res) {
+    resolve('./baz.js', opts('/foo/bar'), function (err, res, pkg) {
         if (err) t.fail(err);
         t.equal(res, '/foo/bar/baz.js');
+        t.equal(pkg, undefined);
     });
     
     resolve('baz', opts('/foo/bar'), function (err, res) {
-        t.equal(err.message, "Cannot find module 'baz'");
+        t.equal(err.message, "Cannot find module 'baz' from '/foo/bar'");
     });
     
     resolve('../baz', opts('/foo/bar'), function (err, res) {
-        t.equal(err.message, "Cannot find module '../baz'");
+        t.equal(err.message, "Cannot find module '../baz' from '/foo/bar'");
+    });
+});
+
+test('mock from package', function (t) {
+    t.plan(6);
+    
+    var files = {
+        '/foo/bar/baz.js' : 'beep'
+    };
+    
+    function opts (basedir) {
+        return {
+            basedir : basedir,
+            package : { main: 'bar' },
+            isFile : function (file, cb) {
+                cb(null, files.hasOwnProperty(file));
+            },
+            readFile : function (file, cb) {
+                cb(null, files[file]);
+            }
+        }
+    }
+    
+    resolve('./baz', opts('/foo/bar'), function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, '/foo/bar/baz.js');
+        t.equal(pkg.main, 'bar');
+    });
+    
+    resolve('./baz.js', opts('/foo/bar'), function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, '/foo/bar/baz.js');
+        t.equal(pkg.main, 'bar');
+    });
+    
+    resolve('baz', opts('/foo/bar'), function (err, res) {
+        t.equal(err.message, "Cannot find module 'baz' from '/foo/bar'");
+    });
+    
+    resolve('../baz', opts('/foo/bar'), function (err, res) {
+        t.equal(err.message, "Cannot find module '../baz' from '/foo/bar'");
     });
 });
 
 test('mock package', function (t) {
-    t.plan(1);
+    t.plan(2);
+    
+    var files = {
+        '/foo/node_modules/bar/baz.js' : 'beep',
+        '/foo/node_modules/bar/package.json' : JSON.stringify({
+            main : './baz.js'
+        })
+    };
+    
+    function opts (basedir) {
+        return {
+            basedir : basedir,
+            isFile : function (file, cb) {
+                cb(null, files.hasOwnProperty(file));
+            },
+            readFile : function (file, cb) {
+                cb(null, files[file]);
+            }
+        }
+    }
+    
+    resolve('bar', opts('/foo'), function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, '/foo/node_modules/bar/baz.js');
+        t.equal(pkg.main, './baz.js');
+    });
+});
+
+test('mock package from package', function (t) {
+    t.plan(2);
     
     var files = {
         '/foo/node_modules/bar/baz.js' : 'beep',
@@ -52,6 +124,7 @@ test('mock package', function (t) {
     function opts (basedir) {
         return {
             basedir : basedir,
+            package : { main: 'bar' },
             isFile : function (file, cb) {
                 cb(null, files.hasOwnProperty(file));
             },
@@ -61,8 +134,9 @@ test('mock package', function (t) {
         }
     }
     
-    resolve('bar', opts('/foo'), function (err, res) {
+    resolve('bar', opts('/foo'), function (err, res, pkg) {
         if (err) t.fail(err);
         t.equal(res, '/foo/node_modules/bar/baz.js');
+        t.equal(pkg.main, './baz.js');
     });
 });

data/node_modules/browserify/node_modules/browser-resolve/node_modules/resolve/test/resolver.js

@@ -1,77 +1,176 @@
+var path = require('path');
 var test = require('tap').test;
 var resolve = require('../');
 
 test('async foo', function (t) {
-    t.plan(3);
+    t.plan(9);
     var dir = __dirname + '/resolver';
     
-    resolve('./foo', { basedir : dir }, function (err, res) {
+    resolve('./foo', { basedir : dir }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/foo.js');
+        t.equal(pkg, undefined);
+    });
+    
+    resolve('./foo.js', { basedir : dir }, function (err, res, pkg) {
         if (err) t.fail(err);
         t.equal(res, dir + '/foo.js');
+        t.equal(pkg, undefined);
     });
     
-    resolve('./foo.js', { basedir : dir }, function (err, res) {
+    resolve('./foo', { basedir : dir, package: { main: 'resolver' } }, function (err, res, pkg) {
         if (err) t.fail(err);
         t.equal(res, dir + '/foo.js');
+        t.equal(pkg.main, 'resolver');
+    });
+    
+    resolve('./foo.js', { basedir : dir, package: { main: 'resolver' } }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/foo.js');
+        t.equal(pkg.main, 'resolver');
     });
     
     resolve('foo', { basedir : dir }, function (err) {
-        t.equal(err.message, "Cannot find module 'foo'");
+        t.equal(err.message, "Cannot find module 'foo' from '" + path.resolve(dir) + "'");
     });
 });
 
 test('bar', function (t) {
-    t.plan(2);
+    t.plan(6);
     var dir = __dirname + '/resolver';
     
-    resolve('foo', { basedir : dir + '/bar' }, function (err, res) {
+    resolve('foo', { basedir : dir + '/bar' }, function (err, res, pkg) {
         if (err) t.fail(err);
         t.equal(res, dir + '/bar/node_modules/foo/index.js');
+        t.equal(pkg, undefined);
     });
     
-    resolve('foo', { basedir : dir + '/bar' }, function (err, res) {
+    resolve('foo', { basedir : dir + '/bar' }, function (err, res, pkg) {
         if (err) t.fail(err);
         t.equal(res, dir + '/bar/node_modules/foo/index.js');
+        t.equal(pkg, undefined);
+    });
+    
+    resolve('foo', { basedir : dir + '/bar', package: { main: 'bar' } }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/bar/node_modules/foo/index.js');
+        t.equal(pkg, undefined);
     });
 });
 
 test('baz', function (t) {
-    t.plan(1);
+    t.plan(4);
     var dir = __dirname + '/resolver';
     
-    resolve('./baz', { basedir : dir }, function (err, res) {
+    resolve('./baz', { basedir : dir }, function (err, res, pkg) {
         if (err) t.fail(err);
         t.equal(res, dir + '/baz/quux.js');
+        t.equal(pkg.main, 'quux.js');
+    });
+    
+    resolve('./baz', { basedir : dir, package: { main: 'resolver' } }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/baz/quux.js');
+        t.equal(pkg.main, 'quux.js');
     });
 });
 
 test('biz', function (t) {
-    t.plan(3);
+    t.plan(24);
     var dir = __dirname + '/resolver/biz/node_modules';
     
-    resolve('./grux', { basedir : dir }, function (err, res) {
+    resolve('./grux', { basedir : dir }, function (err, res, pkg) {
         if (err) t.fail(err);
         t.equal(res, dir + '/grux/index.js');
+        t.equal(pkg, undefined);
+    });
+    
+    resolve('./grux', { basedir : dir, package: { main: 'biz' } }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/grux/index.js');
+        t.equal(pkg.main, 'biz');
+    });
+    
+    resolve('./garply', { basedir : dir }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/garply/lib/index.js');
+        t.equal(pkg.main, './lib');
+    });
+    
+    resolve('./garply', { basedir : dir, package: { main: 'biz' } }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/garply/lib/index.js');
+        t.equal(pkg.main, './lib');
+    });
+    
+    resolve('tiv', { basedir : dir + '/grux' }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/tiv/index.js');
+        t.equal(pkg, undefined);
+    });
+    
+    resolve('tiv', { basedir : dir + '/grux', package: { main: 'grux' } }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/tiv/index.js');
+        t.equal(pkg, undefined);
+    });
+    
+    resolve('tiv', { basedir : dir + '/garply' }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/tiv/index.js');
+        t.equal(pkg, undefined);
     });
     
-    resolve('tiv', { basedir : dir + '/grux' }, function (err, res) {
+    resolve('tiv', { basedir : dir + '/garply', package: { main: './lib' } }, function (err, res, pkg) {
         if (err) t.fail(err);
         t.equal(res, dir + '/tiv/index.js');
+        t.equal(pkg, undefined);
+    });
+    
+    resolve('grux', { basedir : dir + '/tiv' }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/grux/index.js');
+        t.equal(pkg, undefined);
     });
     
-    resolve('grux', { basedir : dir + '/tiv' }, function (err, res) {
+    resolve('grux', { basedir : dir + '/tiv', package: { main: 'tiv' }  }, function (err, res, pkg) {
         if (err) t.fail(err);
         t.equal(res, dir + '/grux/index.js');
+        t.equal(pkg, undefined);
+    });
+    
+    resolve('garply', { basedir : dir + '/tiv' }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/garply/lib/index.js');
+        t.equal(pkg.main, './lib');
+    });
+    
+    resolve('garply', { basedir : dir + '/tiv', package: { main: 'tiv' } }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/garply/lib/index.js');
+        t.equal(pkg.main, './lib');
+    });
+});
+
+test('quux', function (t) {
+    t.plan(2);
+    var dir = __dirname + '/resolver/quux';
+    
+    resolve('./foo', { basedir : dir, package: { main: 'quux' } }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/foo/index.js');
+        t.equal(pkg.main, 'quux');
     });
 });
 
 test('normalize', function (t) {
-    t.plan(1);
+    t.plan(2);
     var dir = __dirname + '/resolver/biz/node_modules/grux';
     
-    resolve('../grux', { basedir : dir }, function (err, res) {
+    resolve('../grux', { basedir : dir }, function (err, res, pkg) {
         if (err) t.fail(err);
         t.equal(res, dir + '/index.js');
+        t.equal(pkg, undefined);
     });
 });
 
@@ -92,7 +191,7 @@ test('cup', function (t) {
     
     resolve('./cup', { basedir : dir, extensions : [ '.js' ] },
     function (err, res) {
-        t.equal(err.message, "Cannot find module './cup'");
+        t.equal(err.message, "Cannot find module './cup' from '" + path.resolve(dir) + "'");
     });
 });
 
@@ -135,10 +234,48 @@ test('other path', function (t) {
     });
     
     resolve('root', { basedir : dir, }, function (err, res) {
-        t.equal(err.message, "Cannot find module 'root'");
+        t.equal(err.message, "Cannot find module 'root' from '" + path.resolve(dir) + "'");
     });
     
     resolve('zzz', { basedir : dir, paths: [otherDir] }, function (err, res) {
-        t.equal(err.message, "Cannot find module 'zzz'");
+        t.equal(err.message, "Cannot find module 'zzz' from '" + path.resolve(dir) + "'");
+    });
+});
+
+test('incorrect main', function (t) {
+    t.plan(1)
+
+    var resolverDir = __dirname + '/resolver';
+    var dir = resolverDir + '/incorrect_main';
+
+    resolve('./incorrect_main', { basedir : resolverDir }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, dir + '/index.js');
+    });
+});
+
+test('without basedir', function (t) {
+    t.plan(1);
+
+    var dir = __dirname + '/resolver/without_basedir';
+    var tester = require(dir + '/main.js');
+
+    tester(t, function (err, res, pkg){
+        if (err) {
+	  t.fail(err);
+	} else {
+          t.equal(res, dir + '/node_modules/mymodule.js');
+	}
+    });
+});
+
+test('#25: node modules with the same name as node stdlib modules', function (t) {
+    t.plan(1);
+
+    var resolverDir = __dirname + '/resolver/punycode';
+
+    resolve('punycode', { basedir : resolverDir }, function (err, res, pkg) {
+        if (err) t.fail(err);
+        t.equal(res, resolverDir + '/node_modules/punycode/index.js');
     });
 });