Merge branch 'ithinkihaveacat-combo-update'

.gitpod

@@ -0,0 +1,5 @@
+tasks:
+  - command: "npm install && npm test"
+ports:
+  - port: 8080
+    protocol: "http"

.travis.yml

@@ -2,5 +2,6 @@ language: node_js
 node_js:
   - "6"
   - "8"
+  - "node"
 install: npm install
-script: npm test
+script: ./.travis_script.sh

.travis_script.sh

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+npm test || exit
+
+trap 'kill $(jobs -p)' EXIT
+
+fetch() {
+  echo "TESTING $1"
+  res=$(curl -ksSo /dev/null -w "status:%{http_code} time:%{time_total} (%{size_download} bytes)" $1)
+  if [[ $? -ne 0 ]]; then
+    echo "ERROR $res"
+    return
+  fi
+  if echo $res | grep -q "status:200" ; then
+    echo "PASS $res"
+  else
+    echo "FAIL $res"
+  fi
+}
+
+echo "STARTING AMPBENCH"
+
+npm start > npm_start.log 2>&1 &
+
+sleep 5 # wait for server to start
+
+echo
+echo "RUNNING TESTS"
+echo
+
+fetch 'http://localhost:8080/validate?url=http://www.bbc.com/news/amp/36884290'
+fetch 'http://localhost:8080/validate?url=https://www.bbc.com/news/amp/36884290'
+fetch 'http://localhost:8080/api2?url=https://www.bbc.com/news/amp/36884290'
+
+kill $(jobs -p)
+
+echo
+echo "NPM LOG"
+cat npm_start.log

amp-story/linter/amp-toolbox-cache-url.d.ts

@@ -0,0 +1,4 @@
+declare module "amp-toolbox-cache-url" {
+  function createCacheUrl(cacheSuffix: string, url: string): Promise<string>;
+  export = createCacheUrl;
+}

amp-story/linter/caches.json

@@ -0,0 +1,20 @@
+{
+  "caches": [
+    {
+      "id": "google",
+      "name": "Google AMP Cache",
+      "docs": "https://developers.google.com/amp/cache/",
+      "cacheDomain": "cdn.ampproject.org",
+      "updateCacheApiDomainSuffix": "cdn.ampproject.org",
+      "thirdPartyFrameDomainSuffix": "ampproject.net"
+    },
+    {
+      "id": "cloudflare",
+      "name": "Cloudflare AMP Cache",
+      "docs": "https://amp.cloudflare.com/",
+      "cacheDomain": "cdn.cloudflare.com",
+      "updateCacheApiDomainSuffix": "amp.cloudflare.com",
+      "thirdPartyFrameDomainSuffix": "cloudflareamp.net"
+    }
+  ]
+}