Separate prebuild step in log output (#646)

* Separate prebuild step in log output

bin/compile

@@ -238,8 +238,6 @@ restore_cache | output "$LOG_FILE"
 build_dependencies() {
   local cache_status start
 
-  run_if_present "$BUILD_DIR" 'heroku-prebuild'
-
   cache_status="$(get_cache_status "$CACHE_DIR")"
   start=$(nowms)
 
@@ -259,6 +257,8 @@ build_dependencies() {
   log_build_scripts "$BUILD_DIR"
 }
 
+run_prebuild_script "$BUILD_DIR" | output "$LOG_FILE"
+
 header "Installing dependencies" | output "$LOG_FILE"
 build_dependencies | output "$LOG_FILE"
 

lib/dependencies.sh

@@ -40,6 +40,19 @@ run_if_present() {
   fi
 }
 
+run_prebuild_script() {
+  local build_dir=${1:-}
+  local has_heroku_prebuild_script
+
+  has_heroku_prebuild_script=$(has_script "$build_dir/package.json" "heroku-prebuild")
+
+  if [[ "$has_heroku_prebuild_script" == "true" ]]; then
+    mcount "script.heroku-prebuild"
+    header "Prebuild"
+    run_if_present "$build_dir" 'heroku-prebuild'
+  fi
+}
+
 run_build_script() {
   local build_dir=${1:-}
   local has_build_script has_heroku_build_script

test/fixtures/pre-post-build-scripts/package.json

@@ -7,7 +7,7 @@
     "url" : "http://github.com/example/example.git"
   },
   "engines": {
-    "node": "~0.10.0"
+    "node": "10.x"
   },
   "scripts" : {
     "heroku-prebuild" : "echo heroku-prebuild hook message",

test/run

@@ -1058,7 +1058,7 @@ testBuildMetaData() {
   assertFileContains "build-uuid=" $log_file
 
   # binary versions
-  assertFileContains "node-version-request=~0.10.0" $log_file
+  assertFileContains "node-version-request=10.x" $log_file
   assertFileContains "npm-version-request= " $log_file
 
   # log build scripts