Use new node-module-lookup

dependents · Jul 4, 2015 · 5164d49 · 5164d49
1 parent f679ca7
commit 5164d49
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,3 +4,5 @@ node_js:
 
 notifications:
   email: false
+
+sudo: false
diff --git a/bin/approot.js b/bin/approot.js
@@ -6,7 +6,8 @@ var getAppRoots = require('../');
 var directory = process.argv[2];
 
 if (!directory) {
-  throw new Error('please supply a directory');
+  console.log('Please supply a directory');
+  process.exit(1);
 }
 
 getAppRoots({

diff --git a/index.js b/index.js
@@ -119,7 +119,7 @@ function getIndependentFiles(files, options) {
 
     deps.forEach(function(dep) {
       if (file.type === 'amd' && options.config) {
-        dep = lookup(options.config, dep);
+        dep = lookup(options.config, dep, file.path);
       }
 
       dep = resolveDep(dep, file.path, options.directory);

diff --git a/package.json b/package.json
@@ -28,12 +28,12 @@
   },
   "homepage": "https://github.com/mrjoelkemp/node-app-root",
   "dependencies": {
-    "module-definition": "~2.1.0",
-    "module-lookup-amd": "~1.0.0",
+    "module-definition": "^2.1.0",
+    "module-lookup-amd": "^2.0.0",
     "node-dir": "~0.1.6",
-    "precinct": "~2.3.1",
-    "q": "~1.0.1",
-    "resolve-dependency-path": "~1.0.1"
+    "precinct": "^2.3.1",
+    "q": "^1.0.1",
+    "resolve-dependency-path": "^1.0.1"
   },
   "devDependencies": {
     "jscs": "~1.8.0",

diff --git a/test/aliased/config.json b/test/aliased/config.json
@@ -1,4 +1,5 @@
 require.config({
+  "baseUrl": "js",
   "paths": {
     "bar": "./b",
   }

diff --git a/test/aliased/b.js → test/aliased/js/b.js b/test/aliased/b.js → test/aliased/js/b.js
diff --git a/test/aliased/c.js → test/aliased/js/c.js b/test/aliased/c.js → test/aliased/js/c.js
diff --git a/test/aliased/root.js → test/aliased/js/root.js b/test/aliased/root.js → test/aliased/js/root.js
diff --git a/test/index.js b/test/index.js
@@ -140,7 +140,7 @@ describe('app-root', function() {
 
     it('handles aliased modules with a supplied config', function(done) {
       var opts = {
-        directory: __dirname + '/aliased',
+        directory: __dirname + '/aliased/js',
         config: __dirname + '/aliased/config.json',
         success: function(root) {
           assert(root.length === 1);