Merge 0307217 into 7ff4c8e

popomore · Dec 16, 2014 · 178bf40 · 178bf40
2 parents 7ff4c8e + 0307217
commit 178bf40
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 2 deletions.
diff --git a/lib/component-package.js b/lib/component-package.js
@@ -27,7 +27,7 @@ module.exports = ComponentPackage;
 
 function normalize(pkg) {
   var dest = path.dirname(pkg);
-  delete require.cache[pkg];
+  delete require.cache[require.resolve(pkg)];
   pkg = require(pkg);
   var scripts = pkg.scripts || [];
   var styles = pkg.styles || [];

diff --git a/lib/spm-package.js b/lib/spm-package.js
@@ -34,7 +34,7 @@ module.exports = SpmPackage;
 
 function normalize(pkg) {
   var dest = path.dirname(pkg);
-  delete require.cache[pkg];
+  delete require.cache[require.resolve(pkg)];
   pkg = require(pkg);
   pkg.spm = pkg.spm || {};
 

diff --git a/test/fixtures/spm/symlink-deps/b/index.js b/test/fixtures/spm/symlink-deps/b/index.js
diff --git a/test/fixtures/spm/symlink-deps/b/package.json b/test/fixtures/spm/symlink-deps/b/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "b",
+  "version": "0.1.0",
+  "spm": {
+    "dependencies": {
+      "c": "0.1.0"
+    }
+  }
+}
diff --git a/test/fixtures/spm/symlink-deps/c/index.js b/test/fixtures/spm/symlink-deps/c/index.js
diff --git a/test/fixtures/spm/symlink-deps/c/package.json b/test/fixtures/spm/symlink-deps/c/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "c",
+  "version": "0.1.0",
+  "spm": {
+  }
+}
diff --git a/test/fixtures/spm/symlink-deps/index.js b/test/fixtures/spm/symlink-deps/index.js
diff --git a/test/fixtures/spm/symlink-deps/package.json b/test/fixtures/spm/symlink-deps/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "a",
+  "version": "0.1.0",
+  "spm": {
+    "dependencies": {
+      "b": "0.1.0"
+    }
+  }
+}
diff --git a/test/fixtures/spm/symlink-deps/sea-modules/b/0.1.0 b/test/fixtures/spm/symlink-deps/sea-modules/b/0.1.0
@@ -0,0 +1 @@
+../../b
diff --git a/test/fixtures/spm/symlink-deps/sea-modules/c/0.1.0 b/test/fixtures/spm/symlink-deps/sea-modules/c/0.1.0
@@ -0,0 +1 @@
+../../c
diff --git a/test/spm.test.js b/test/spm.test.js
@@ -350,6 +350,13 @@ describe('Father.SpmPackage', function() {
     pkgB.main.should.eql('src/b.js');
   });
 
+  it('symlink deps', function() {
+    var pkg;
+    pkg = getPackage('symlink-deps');
+    pkg = getPackage('symlink-deps');
+    pkg.name.should.be.equal('a');
+  });
+
   describe('error', function() {
 
     it('not found ./b', function() {