Resolves #221: Adding frontend-setup target-hook. (#291)

acquia · Aug 15, 2016 · 53eca01 · 53eca01
1 parent cd8d204
commit 53eca01
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/phing/build.xml b/phing/build.xml
@@ -79,7 +79,7 @@
           <then>
             <echo>Executing command in ${target-hooks.${hook-name}.dir}:</echo>
             <echo>${target-hooks.${hook-name}.command}</echo>
-            <exec dir="${target-hooks.${hook-name}.dir}" command="${target-hooks.${hook-name}.command}" logoutput="true" checkreturn="true" />
+            <exec dir="${target-hooks.${hook-name}.dir}" command="${target-hooks.${hook-name}.command}" logoutput="true" checkreturn="true" passthru="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/phing/tasks/frontend.xml b/phing/tasks/frontend.xml
@@ -1,4 +1,14 @@
-<project name="frontend" default="frontend:install">
+<project name="frontend" default="frontend">
+
+  <target name="frontend" description="Runs all frontend targets"
+          depends="frontend:setup, frontend:build">
+  </target>
+
+  <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
@@ -39,11 +39,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: