Revert "install: do not descend into directory deps' child modules"

This reverts commit 45772af.

Fix: https://npm.community/t/6-11-1-some-dependencies-are-no-longer-being-installed/9586/4

lib/install/inflate-shrinkwrap.js

@@ -50,12 +50,8 @@ function inflateShrinkwrap (topPath, tree, swdeps, opts) {
 
   return BB.each(Object.keys(swdeps), (name) => {
     const sw = swdeps[name]
+    const dependencies = sw.dependencies || {}
     const requested = realizeShrinkwrapSpecifier(name, sw, topPath)
-    // We should not muck about in the node_modules folder of
-    // symlinked packages.  Treat its dependencies as if they
-    // were empty, since it's none of our business.
-    const dependencies = requested.type === 'directory' ? {}
-      : sw.dependencies || {}
     return inflatableChild(
       onDisk[name], name, topPath, tree, sw, requested, opts
     ).then((child) => {
@@ -145,10 +141,6 @@ function isGit (sw) {
 }
 
 function makeFakeChild (name, topPath, tree, sw, requested) {
-  // We should not muck about in the node_modules folder of
-  // symlinked packages.  Treat its dependencies as if they
-  // were empty, since it's none of our business.
-  const isDirectory = requested.type === 'directory'
   const from = sw.from || requested.raw
   const pkg = {
     name: name,
@@ -164,7 +156,7 @@ function makeFakeChild (name, topPath, tree, sw, requested) {
     _spec: requested.rawSpec,
     _where: topPath,
     _args: [[requested.toString(), topPath]],
-    dependencies: isDirectory ? {} : sw.requires
+    dependencies: sw.requires
   }
 
   if (!sw.bundled) {
@@ -175,16 +167,16 @@ function makeFakeChild (name, topPath, tree, sw, requested) {
   }
   const child = createChild({
     package: pkg,
-    loaded: isDirectory,
+    loaded: true,
     parent: tree,
     children: [],
     fromShrinkwrap: requested,
     fakeChild: sw,
     fromBundle: sw.bundled ? tree.fromBundle || tree : null,
     path: childPath(tree.path, pkg),
-    realpath: isDirectory ? requested.fetchSpec : childPath(tree.realpath, pkg),
+    realpath: requested.type === 'directory' ? requested.fetchSpec : childPath(tree.realpath, pkg),
     location: (tree.location === '/' ? '' : tree.location + '/') + pkg.name,
-    isLink: isDirectory,
+    isLink: requested.type === 'directory',
     isInLink: tree.isLink || tree.isInLink,
     swRequires: sw.requires
   })
@@ -203,7 +195,7 @@ function fetchChild (topPath, tree, sw, requested) {
     var isLink = pkg._requested.type === 'directory'
     const child = createChild({
       package: pkg,
-      loaded: isLink,
+      loaded: false,
       parent: tree,
       fromShrinkwrap: requested,
       path: childPath(tree.path, pkg),

test/tap/install-from-local-multipath.js

@@ -167,13 +167,9 @@ test('\'npm install\' should install local packages', function (t) {
       'install', '.'
     ],
     EXEC_OPTS,
-    function (err, code, stdout, stderr) {
+    function (err, code) {
       t.ifError(err, 'error should not exist')
       t.notOk(code, 'npm install exited with code 0')
-      // if the test fails, let's see why
-      if (err || code) {
-        console.error({code, stdout, stderr})
-      }
       t.end()
     }
   )