Only include development dependencies when we requested development m…

…ode when generating from a lock file
svanderburg · Jan 4, 2018 · 56c093e · 56c093e
1 parent c6ed5bc
commit 56c093e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/Package.js b/lib/Package.js
@@ -225,8 +225,10 @@ Package.prototype.resolveDependenciesFromLockedDependencies = function(dependenc
 
             if(dependency.bundled) { // Bundled dependencies should not be included
                 callback();
+            } else if(self.production && dependency.dev) { // Development dependencies should not be included in production mode
+                callback();
             } else {
-                var pkg = new Package(self.deploymentConfig, self.lock, self, dependencyName, dependency.version, self.source.baseDir, true /* Never include development dependencies of transitive dependencies */, self.sourcesCache);
+                var pkg = new Package(self.deploymentConfig, self.lock, self, dependencyName, dependency.version, self.source.baseDir, self.production, self.sourcesCache);
                 self.providedDependencies[dependencyName] = pkg;
 
                 slasp.sequence([

diff --git a/lib/node2nix.js b/lib/node2nix.js
@@ -70,7 +70,7 @@ function npmToNix(inputJSON, outputNix, compositionNix, nodeEnvNix, lockJSON, su
                     expr = new PackageExpression(deploymentConfig, lock, baseDir, obj.name, baseDir);
 
                     // Display a warning if we expect a lock file to be used, but the user does not specify it
-                    displayLockWarning = bypassCache && fs.existsSync(path.join(path.dirname(inputJSON), path.basename(inputJSON, ".json")) + "-lock.json");
+                    displayLockWarning = bypassCache && !lockJSON && fs.existsSync(path.join(path.dirname(inputJSON), path.basename(inputJSON, ".json")) + "-lock.json");
                 }
 
                 expr.resolveDependencies(callback);