1 files changed, 12 insertions, 19 deletions

diff --git a/config/node.go b/config/node.go
index 438e715..a6a22ea 100644
--- a/config/node.go
+++ b/config/node.go
@@ -2,7 +2,6 @@ package config
 
 import (
 	"gerrit.wikimedia.org/r/blubber/build"
-	"path"
 )
 
 // NodeConfig holds configuration fields related to the Node environment and
@@ -27,53 +26,47 @@ func (nc *NodeConfig) Merge(nc2 NodeConfig) {
 }
 
 // InstructionsForPhase injects instructions into the build related to Node
-// dependency installation and setting of the NODE_ENV, NODE_PATH, and PATH
-// environment variables.
+// dependency installation and setting of the NODE_ENV.
 //
 // PhasePreInstall
 //
 // Installs Node package dependencies declared in requirements files into the
-// shared library directory (/opt/lib). Only production related packages are
-// install if NodeConfig.Env is set to "production" in which case `npm dedupe`
-// is also run. Installing dependencies during the build.PhasePreInstall phase
-// allows a compiler implementation (e.g. Docker) to produce cache-efficient
-// output so only changes to package.json will invalidate these steps of the
-// image build.
+// application directory. Only production related packages are install if
+// NodeConfig.Env is set to "production" in which case `npm dedupe` is also
+// run. Installing dependencies during the build.PhasePreInstall phase allows
+// a compiler implementation (e.g. Docker) to produce cache-efficient output
+// so only changes to package.json will invalidate these steps of the image
+// build.
 //
 // PhasePostInstall
 //
-// Injects build.Env instructions for NODE_ENV, NODE_PATH, and PATH, setting
-// the environment according to the configuration, ensuring that packages
-// installed during build.PhasePreInstall are found by Node, and that any
-// installed binaries are found by shells.
+// Injects build.Env instructions for NODE_ENV, setting the environment
+// according to the configuration.
 //
 func (nc NodeConfig) InstructionsForPhase(phase build.Phase) []build.Instruction {
 	switch phase {
 	case build.PhasePreInstall:
 		if len(nc.Requirements) > 0 {
 			npmInstall := build.RunAll{[]build.Run{
-				{"cd", []string{LocalLibPrefix}},
 				{"npm install", []string{}},
 			}}
 
 			if nc.Env == "production" {
-				npmInstall.Runs[1].Arguments = []string{"--production"}
+				npmInstall.Runs[0].Arguments = []string{"--production"}
 				npmInstall.Runs = append(npmInstall.Runs,
 					build.Run{"npm dedupe", []string{}},
 				)
 			}
 
 			return append(
-				build.SyncFiles(nc.Requirements, LocalLibPrefix),
+				build.SyncFiles(nc.Requirements, "."),
 				npmInstall,
 			)
 		}
 	case build.PhasePostInstall:
 		if nc.Env != "" || len(nc.Requirements) > 0 {
 			return []build.Instruction{build.Env{map[string]string{
-				"NODE_ENV":  nc.Env,
-				"NODE_PATH": path.Join(LocalLibPrefix, "node_modules"),
-				"PATH":      path.Join(LocalLibPrefix, "node_modules", ".bin") + ":${PATH}",
+				"NODE_ENV": nc.Env,
 			}}}
 		}
 	}