Merge branch 'master' into master

CHANGES.md

@@ -1,14 +1,19 @@
 CHANGELOG
 ======================================================
 
-Version 2.X.X
+Branch 2.X.X
 ------------------------------------------------------
+
+### 2.0.1 ###
+* Bugfix: gulp4 compatibility
+
+### 2.0.0 ###
 * Added [koa](http://koajs.com/) support
 * Added support for multiple http frameworks
 * Changed: **express.js** error handler is encapsulated within the `express()` function
 * Changed: moved middleware example to `examples/`
 
-Version 1.X.X
+Branch 1.X.X
 ------------------------------------------------------
 
 ### 1.0.0 ###

LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (X11 License)
 
-Copyright (c) 2014-2019 Andi Dittrich
+Copyright (c) 2014-2020 Andi Dittrich
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

gulpfile.js

@@ -2,7 +2,7 @@ const _gulp = require('gulp');
 const _sass = require('gulp-sass');
 const _prettyError = require('gulp-prettyerror');
 const _cleanCSS = require('gulp-clean-css');
-const _concat = require('gulp-concat-util');
+const _concat = require('gulp-concat');
 
 _gulp.task('sass', function (){
     return _gulp.src('./assets/layout.scss')
@@ -16,6 +16,4 @@ _gulp.task('sass', function (){
 }); 
 
 _gulp.task('default', _gulp.series(['sass']));
- 
-
  

package.json

@@ -1,6 +1,6 @@
 {
     "name": "http-error-pages",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "description": "Simple HTTP Error Pages. standalone + static + koa + express",
     "engines": {
         "node": ">=7.6"
@@ -42,20 +42,20 @@
     "repository": "AndiDittrich/HttpErrorPages",
     "license": "MIT",
     "devDependencies": {
-        "commander": "^2.11.0",
-        "eslint": "^5.16.0",
+        "commander": "^6.2.0",
+        "eslint": "^7.4.0",
         "eslint-config-aenondynamics": "^0.2.0",
         "express": "^4.17.1",
         "gulp": "^4.0.2",
-        "gulp-clean-css": "^4.2.0",
-        "gulp-concat-util": "^0.5.5",
-        "gulp-prettyerror": "^1.2.1",
-        "gulp-sass": "^4.0.2",
-        "koa": "^2.4.1",
-        "less": "^3.9.0"
+        "gulp-clean-css": "^4.3.0",
+        "gulp-concat": "^2.6.1",
+        "gulp-prettyerror": "^2.0.0",
+        "gulp-sass": "^4.1.0",
+        "koa": "^2.13.0",
+        "less": "^3.11.3"
     },
     "dependencies": {
-        "ejs": "^2.5.7",
+        "ejs": "^3.1.3",
         "fs-magic": "^2.1.1"
     }
 }