Fix frontend deploy and Heroku staging (badges#1288)

- Heroku reads the Node version from package.json. We're about to upgrade to Node 8 so this change to `engines` is only pre-emptive. It won't have any effect on the production servers.
- The production deploy scripts were missing the frontend files. This fixes that.
- This modifies the build setup to allow `BASE_URL=/`, which makes all requests relative to the page itself. That simplifies deploying the "debugging" frontend to the production servers, and makes it easy to host the frontend on Heroku.

.travis.yml

@@ -17,7 +17,7 @@ before_script:
 script:
   - npm run lint
   - npm run test:js
-  - if node_modules/.bin/check-node-version --node '< 8.0' > /dev/null; then echo "Skipping build."; else make website; fi
+  - if node_modules/.bin/check-node-version --node '< 8.0' > /dev/null; then echo "Skipping build."; else BASE_URL=/ npm run build; fi
 
 jobs:
   include:

Makefile

@@ -4,31 +4,28 @@ favicon:
 	node lib/badge-cli.js '' '' '#bada55' .png > favicon.png
 
 website:
-	LONG_CACHE=false BASE_URL=https://img.shields.io npm run build
+	LONG_CACHE=false BASE_URL=/ npm run build
 
-deploy: deploy-s0 deploy-s1 deploy-s2 deploy-gh-pages
+deploy: website deploy-s0 deploy-s1 deploy-s2 deploy-gh-pages
 
 deploy-s0:
 	# Ship a copy of the front end to each server for debugging.
 	# https://github.com/badges/shields/issues/1220
-	LONG_CACHE=false BASE_URL=https://s0.shields-server.com npm run build
-	git add -f Verdana.ttf private/secret.json index.html
+	git add -f Verdana.ttf private/secret.json build/
 	git commit -m'MUST NOT BE ON GITHUB'
 	git push -f s0 HEAD:master
 	git reset HEAD~1
 	git checkout master
 
 deploy-s1:
-	LONG_CACHE=false BASE_URL=https://s1.shields-server.com npm run build
-	git add -f Verdana.ttf private/secret.json index.html
+	git add -f Verdana.ttf private/secret.json build/
 	git commit -m'MUST NOT BE ON GITHUB'
 	git push -f s1 HEAD:master
 	git reset HEAD~1
 	git checkout master
 
 deploy-s2:
-	LONG_CACHE=false BASE_URL=https://s2.shields-server.com npm run build
-	git add -f Verdana.ttf private/secret.json index.html
+	git add -f Verdana.ttf private/secret.json build/
 	git commit -m'MUST NOT BE ON GITHUB'
 	git push -f s2 HEAD:master
 	git reset HEAD~1
@@ -43,7 +40,7 @@ deploy-gh-pages:
 	git checkout master
 
 deploy-heroku:
-	git add -f Verdana.ttf private/secret.json index.html
+	git add -f Verdana.ttf private/secret.json build/
 	git commit -m'MUST NOT BE ON GITHUB'
 	git push -f heroku HEAD:master
 	git reset HEAD~1

app.json

@@ -14,6 +14,10 @@
     "NPM_CONFIG_PRODUCTION": {
       "description": "Configure whether devDependencies are installed (they are needed for the build).",
       "value": "false"
+    },
+    "BASE_URL": {
+      "description": "The base URL to use in the frontend build",
+      "value": "/"
     }
   },
   "formation": {

frontend/components/badge-examples.js

@@ -1,13 +1,13 @@
-import { URL } from '../lib/url-api';
+import URLPath from 'url-path';
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 function resolveUri (uri, baseUri, options) {
   const { longCache } = options || {};
-  const result = new URL(uri, baseUri);
+  const result = new URLPath(uri, baseUri);
   if (longCache) {
-    result.searchParams.maxAge = '2592000';
+    result.searchParams.set('maxAge', '2592000');
   }
   return result.href;
 }

frontend/lib/static-badge-uri.js

@@ -1,12 +1,12 @@
-import { URL } from './url-api';
+import URLPath from 'url-path';
 
 export function encodeField(s) {
   return encodeURIComponent(s.replace(/-/g, '--').replace(/_/g, '__'));
 }
 
 export default function staticBadgeUri(baseUri, subject, status, color, options) {
   const path = [subject, status, color].map(encodeField).join('-');
-  const uri = new URL(`/badge/${path}.svg`, baseUri);
+  const uri = new URLPath(`/badge/${path}.svg`, baseUri);
   Object.keys(options || {}).forEach(k => {
     uri.searchParams.set(k, options[k]);
   })

package.json

@@ -124,10 +124,11 @@
     "rimraf": "^2.6.2",
     "sazerac": "^0.4.2",
     "semver-regex": "^1.0.0",
-    "sinon": "^4.0.1"
+    "sinon": "^4.0.1",
+    "url-path": "^0.1.1"
   },
   "engines": {
-    "node": "6.x",
+    "node": "8.x",
     "npm": "5.x"
   }
 }

public/_next

@@ -0,0 +1 @@
+../build/_next

public/index.html

@@ -1 +1 @@
-../index.html
+../build/index.html

public/static

@@ -0,0 +1 @@
+../build/static