JSPM inside the build

guardian · Feb 13, 2015 · 83349b2 · 83349b2
1 parent 0d6dcfe
commit 83349b2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -42,7 +42,7 @@ module.exports = function (grunt) {
     }
 
     // Default task
-    grunt.registerTask('default', ['clean', 'validate', 'compile', 'test', 'analyse']);
+    grunt.registerTask('default', ['clean', 'validate', 'prepare', 'compile', 'test', 'analyse']);
 
     /**
      * Validate tasks
@@ -102,6 +102,10 @@ module.exports = function (grunt) {
         'compile:conf'
     ]);
 
+    grunt.registerTask('prepare', ['jspm']);
+
+    grunt.registerTask('jspm', ['shell:jspmFaciaTool']);
+
     /**
      * compile:js:<requiretask> tasks. Generate one for each require task
      */

diff --git a/dist-root-tc b/dist-root-tc
@@ -4,7 +4,7 @@ set -o xtrace
 set -o nounset
 set -o errexit
 
-./grunt-tc clean validate:sass validate:js test:unit compile emitAbTestInfo
+./grunt-tc clean validate:sass validate:js prepare test:unit compile emitAbTestInfo
 ./sbt-tc "project root" compile test dist
 
 echo "Disting everything."

diff --git a/facia-tool/public/package.json b/facia-tool/public/package.json
@@ -7,8 +7,8 @@
     },
     "configFile": "js/jspm-config.js",
     "dependencies": {
+      "EventEmitter": "npm:wolfy87-eventemitter@4.2.11",
       "css": "^0.1.0",
-      "eventEmitter": "npm:wolfy87-eventemitter@4.2.11",
       "font-awesome": "4.2.0",
       "jquery": "2.1.3",
       "jquery-mockjax": "npm:jquery-mockjax@^1.6.1",

diff --git a/grunt-configs/shell.js b/grunt-configs/shell.js
@@ -22,6 +22,15 @@ module.exports = function(grunt, options) {
             command: 'node tools/ab-test-info/ab-test-info.js ' +
                      'static/src/javascripts/modules/experiments/tests ' +
                      'static/abtests.json'
+        },
+
+        jspmFaciaTool: {
+            command: 'jspm install',
+            options: {
+                execOptions: {
+                    cwd: 'facia-tool/public'
+                }
+            }
         }
     };
 };
diff --git a/test-root-tc b/test-root-tc
@@ -4,7 +4,7 @@ set -o nounset
 set -o errexit
 
 
-./grunt-tc clean validate test:unit compile
+./grunt-tc clean validate prepare test:unit compile
 ./sbt-tc "project root" test
 
 echo "Tested everything."