Merge pull request #500 from openforge/develop

Merge Develop to Master

Author: Wholloran

.travis.yml

@@ -1,16 +1,21 @@
 language: node_js
+
 node_js:
-- 10.4.0
+- 10.10.0
+
 branches:
   only:
   - develop
   - qa
   - staging
   - master
+
 before_script:
 - npm install -g firebase-tools
+
 script:
 - npm run build
+- npm run build:functions
 
 after_success:
 - npm run firebase:deploy

budget.json

@@ -0,0 +1 @@
+[{"resourceSizes":[{"resourceType":"document","budget":20},{"resourceType":"stylesheet","budget":50},{"resourceType":"font","budget":50},{"resourceType":"image","budget":300},{"resourceType":"script","budget":100}]}]

functions/package.json

@@ -18,5 +18,8 @@
     "tslint": "^5.12.0",
     "typescript": "^3.2.2"
   },
-  "private": true
+  "private": true,
+  "engines": {
+    "node": "8"
+  }
 }

functions/src/index.ts

@@ -15,11 +15,11 @@ export const rebuildMaster = functions.https.onRequest((butterRequest, butterRes
             "Content-Type": "application/json",
             "Accept": "application/json",
             "Travis-API-Version": "3",
-            "Authorization": "token " + travisToken
+            "Authorization": `token ${travisToken}`
         }
       };
 
-    const body = '{"request": {"branch":"master"}}';
+    const body = `{"request": {"branch":"${functions.config().travis.rebuild_branch}"}}`;
 
     const travisRequest = https.request(options, (travisResponse: any) => {