Merge branch 'release/1.2.4'

.travis.yml

@@ -3,6 +3,7 @@ sudo: false
 node_js:
 - '8'
 - '10'
+- '12'
 script:
 - yarn test
 before_install: yarn global add greenkeeper-lockfile@1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.2.4, 2019-09-05
+
+- Upgrade embetty-base, fix cloudflare error
+
 ## v1.2.3, 2019-06-11
 
 - Upgraded dependencies.

bin/www

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const app = require('../')
-const debug = require('debug')('embetty.web:server')
+const debug = require('debug')('embetty-server:www')
 const http = require('http')
 
 const port = normalizePort(process.env.PORT || '3000')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heise/embetty-server",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "main": "index.js",
   "repository": "[email protected]:heiseonline/embetty-server.git",
   "author": "Philipp Busse <[email protected]>",
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@heise/embetty": "^1.1.0",
-    "@heise/embetty-base": "^1.0.0-beta.5",
+    "@heise/embetty-base": "^1.0.9",
     "commander": "^2.15.1",
     "cors": "^2.8.4",
     "debug": "^4.1.0",

routes/index.js

@@ -1,6 +1,6 @@
 const { Forbidden } = require('../lib/exceptions')
 const cors = require('cors')
-const debug = require('debug')('embetty.web:server')
+const debug = require('debug')('embetty-server:index')
 const express = require('express')
 const fs = require('fs')
 const tweet = require('./tweet')

test/cli.js

@@ -37,7 +37,7 @@ describe('CLI', () => {
     const { stderr } = spawnSync(embettyBin, ['start', '--debug'], { timeout: 3000 })
     const out = stderr.toString()
     assert.ok(out.includes('express:router'))
-    assert.ok(out.includes('embetty.base'))
+    assert.ok(out.includes('embetty-base'))
   })
 
   it('embetty start --cache <cache>', () => {