From 7fff29349acabd6e531514a70d4fb7c95e15c871 Mon Sep 17 00:00:00 2001
From: Sarah Thrasher <sarah.thrasher@acquia.com>
Date: Thu, 4 Aug 2016 14:32:32 -0400
Subject: [PATCH] issue-221: Adds a frontend:setup task and also passthru for
 target-hooks.

---
 template/build/core/phing/build.xml          | 2 +-
 template/build/core/phing/tasks/frontend.xml | 8 +++++++-
 template/project.yml                         | 8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/template/build/core/phing/build.xml b/template/build/core/phing/build.xml
index 27ba83241..ad9552d4e 100644
--- a/template/build/core/phing/build.xml
+++ b/template/build/core/phing/build.xml
@@ -65,7 +65,7 @@
         <if>
           <available file="${target-hooks.${hook-name}.dir}" type="dir" property="dirExists" />
           <then>
-            <exec dir="${target-hooks.${hook-name}.dir}" command="${target-hooks.${hook-name}.command}" logoutput="true" checkreturn="true" />
+            <exec dir="${target-hooks.${hook-name}.dir}" passthru="true" command="${target-hooks.${hook-name}.command}" logoutput="true" checkreturn="true" />
           </then>
           <else>
             <fail>The directory ${target-hooks.${hook-name}.dir} does not exist. Will not run command for ${hook-name}.</fail>
diff --git a/template/build/core/phing/tasks/frontend.xml b/template/build/core/phing/tasks/frontend.xml
index bf06c1fbd..712e9b2ed 100644
--- a/template/build/core/phing/tasks/frontend.xml
+++ b/template/build/core/phing/tasks/frontend.xml
@@ -1,4 +1,10 @@
-<project name="frontend" default="frontend:install">
+<project name="frontend" default="frontend:setup">
+
+  <target name="frontend:setup" description="Uses project.yml hooks to run custom defined commands to setup front end dependencies for frontend:build.">
+    <phingcall target="target-hook:invoke">
+      <property name="hook-name" value="frontend-setup"/>
+    </phingcall>
+  </target>
 
   <target name="frontend:build" description="Uses project.yml hooks to run custom defined commands to build front end dependencies for custom themes.">
     <phingcall target="target-hook:invoke">
diff --git a/template/project.yml b/template/project.yml
index 3a0e06589..5035003ad 100644
--- a/template/project.yml
+++ b/template/project.yml
@@ -46,11 +46,17 @@ drush:
 # The tasks hook into BLT's existing Phing targets. Available hooks keys are:
 # frontend-build, post-deploy-build, and post-setup-build.
 target-hooks:
+  # Executed when front end dependencies should be installed.
+  frontend-setup:
+    # E.g., ${docroot}/sites/all/themes/custom/mytheme.
+    dir: ${docroot}
+    # E.g., `npm install` or `bower install`.
+    command: echo 'No frontend setup configured.'
   # Executed when front end assets should be generated.
   frontend-build:
     # E.g., ${docroot}/sites/all/themes/custom/mytheme.
     dir: ${docroot}
-    # E.g., `npm install` or `bower install`.
+    # E.g., `npm run build`.
     command: echo 'No frontend build configured.'
   # Executed after deployment artifact is created.
   post-deploy-build: