Skip to content

Commit

Permalink
Merge pull request #34 from nzzdev/release-1.4.1
Browse files Browse the repository at this point in the history
Release 1.4.1
  • Loading branch information
benib committed Oct 17, 2017
2 parents cbed318 + 8db76fc commit 2c322e8
Show file tree
Hide file tree
Showing 9 changed files with 5,951 additions and 1,548 deletions.
6 changes: 6 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
node_modules
jspm_packages
script_src
styles_src
tasks
test
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8.6
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
- docker
language: node_js
node_js:
- '8.1'
- '8.6'
install:
- npm install -g jspm
- npm install
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use following version of Node as the base image
FROM node:8.1
FROM node:8.6

# Set work directory for run/cmd
WORKDIR /app
Expand Down
7,467 changes: 5,928 additions & 1,539 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nzz/q-quiz",
"version": "1.4.0",
"version": "1.4.1",
"description": "Q quiz",
"keywords": [
"storytelling",
Expand Down Expand Up @@ -45,7 +45,7 @@
"inert": "^4.1.0",
"jsdom": "9.5.0",
"json-schema-faker": "^0.4.0",
"jspm": "^0.17.0-beta.41",
"jspm": "0.17.0-beta.41",
"mocha": "^3.2.0",
"node-fetch": "^1.7.1",
"node-sass": "^4.3.0",
Expand Down
10 changes: 10 additions & 0 deletions routes/health.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = {
path: '/health',
method: 'GET',
config: {
tags: ['api']
},
handler: (request, reply) => {
reply('ok');
}
}
4 changes: 0 additions & 4 deletions routes/rendering-info/html-js.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,6 @@ module.exports = {
},
{
content: loaderScript
},
{
url: 'https://storytelling.nzz.ch/track-manager/v0/track.js',
loadOnce: true
}
],
markup: staticTemplate.render(renderingData)
Expand Down
3 changes: 2 additions & 1 deletion routes/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ module.exports = [
require('./rendering-info/html-js.js'),
require('./stylesheet.js'),
require('./schema.js'),
require('./locales.js')
require('./locales.js'),
require('./health.js')
]
.concat(
require('./scripts.js'),
Expand Down

0 comments on commit 2c322e8

Please sign in to comment.