Merge branch 'develop' of github.com:jc21/nginx-proxy-manager

Author: Jamie Curnow

.version

@@ -1 +1 @@
-2.1.0
+2.1.1

README.md

@@ -2,7 +2,7 @@
 
 # Nginx Proxy Manager
 
-![Version](https://img.shields.io/badge/version-2.1.0-green.svg?style=for-the-badge)
+![Version](https://img.shields.io/badge/version-2.1.1-green.svg?style=for-the-badge)
 ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)
 

backend/internal/ip_ranges.js

@@ -3,7 +3,7 @@ const fs            = require('fs');
 const logger        = require('../logger').ip_ranges;
 const error         = require('../lib/error');
 const internalNginx = require('./nginx');
-const Liquid        = require('liquidjs');
+const { Liquid }    = require('liquidjs');
 
 const CLOUDFRONT_URL   = 'https://ip-ranges.amazonaws.com/ip-ranges.json';
 const CLOUDFARE_V4_URL = 'https://www.cloudflare.com/ips-v4';
@@ -116,7 +116,7 @@ const internalIpRanges = {
 	 * @returns {Promise}
 	 */
 	generateConfig: (ip_ranges) => {
-		let renderEngine = Liquid({
+		let renderEngine = new Liquid({
 			root: __dirname + '/../templates/'
 		});
 

backend/internal/nginx.js

@@ -1,9 +1,9 @@
 const _          = require('lodash');
 const fs         = require('fs');
-const Liquid     = require('liquidjs');
 const logger     = require('../logger').nginx;
 const utils      = require('../lib/utils');
 const error      = require('../lib/error');
+const { Liquid } = require('liquidjs');
 const debug_mode = process.env.NODE_ENV !== 'production' || !!process.env.DEBUG;
 
 const internalNginx = {
@@ -181,7 +181,7 @@ const internalNginx = {
 			logger.info('Generating ' + host_type + ' Config:', host);
 		}
 
-		let renderEngine = Liquid({
+		let renderEngine = new Liquid({
 			root: __dirname + '/../templates/'
 		});
 
@@ -263,7 +263,7 @@ const internalNginx = {
 			logger.info('Generating LetsEncrypt Request Config:', certificate);
 		}
 
-		let renderEngine = Liquid({
+		let renderEngine = new Liquid({
 			root: __dirname + '/../templates/'
 		});
 

backend/package.json

@@ -1,48 +1,45 @@
 {
-  "name": "nginx-proxy-manager",
-  "version": "2.1.0",
-  "description": "A beautiful interface for creating Nginx endpoints",
-  "main": "js/index.js",
-  "dependencies": {
-    "ajv": "^6.5.1",
-    "batchflow": "^0.4.0",
-    "bcrypt": "^3.0.0",
-    "body-parser": "^1.18.3",
-    "compression": "^1.7.2",
-    "config": "^2.0.1",
-    "diskdb": "^0.1.17",
-    "express": "^4.16.3",
-    "express-fileupload": "^0.4.0",
-    "gravatar": "^1.6.0",
-    "html-entities": "^1.2.1",
-    "json-schema-ref-parser": "^5.0.3",
-    "jsonwebtoken": "^8.3.0",
-    "knex": "^0.19.5",
-    "liquidjs": "^5.1.1",
-    "lodash": "^4.17.10",
-    "moment": "^2.22.2",
-    "mysql": "^2.15.0",
-    "node-rsa": "^1.0.0",
-    "nodemon": "^2.0.2",
-    "objection": "^1.1.10",
-    "path": "^0.12.7",
-    "restler": "^3.4.0",
-    "signale": "^1.2.1",
-    "temp-write": "^3.4.0",
-    "unix-timestamp": "^0.2.0"
-  },
-  "scripts": {
-    "build": "webpack --mode production"
-  },
-  "signale": {
-    "displayDate": true,
-    "displayTimestamp": true
-  },
-  "author": "Jamie Curnow <jc@jc21.com>",
-  "license": "MIT",
-  "devDependencies": {
-    "eslint": "^6.8.0",
-    "eslint-plugin-align-assignments": "^1.1.2",
-    "prettier": "^1.19.1"
-  }
+	"name": "nginx-proxy-manager",
+	"version": "2.1.1",
+	"description": "A beautiful interface for creating Nginx endpoints",
+	"main": "js/index.js",
+	"dependencies": {
+		"ajv": "^6.11.0",
+		"batchflow": "^0.4.0",
+		"bcrypt": "^3.0.8",
+		"body-parser": "^1.19.0",
+		"compression": "^1.7.4",
+		"config": "^3.2.5",
+		"diskdb": "^0.1.17",
+		"express": "^4.17.1",
+		"express-fileupload": "^1.1.6",
+		"gravatar": "^1.8.0",
+		"html-entities": "^1.2.1",
+		"json-schema-ref-parser": "^7.1.3",
+		"jsonwebtoken": "^8.5.1",
+		"knex": "^0.20.10",
+		"liquidjs": "^9.7.1",
+		"lodash": "^4.17.15",
+		"moment": "^2.24.0",
+		"mysql": "^2.18.1",
+		"node-rsa": "^1.0.7",
+		"nodemon": "^2.0.2",
+		"objection": "^2.1.3",
+		"path": "^0.12.7",
+		"restler": "^3.4.0",
+		"signale": "^1.4.0",
+		"temp-write": "^4.0.0",
+		"unix-timestamp": "^0.2.0"
+	},
+	"signale": {
+		"displayDate": true,
+		"displayTimestamp": true
+	},
+	"author": "Jamie Curnow <jc@jc21.com>",
+	"license": "MIT",
+	"devDependencies": {
+		"eslint": "^6.8.0",
+		"eslint-plugin-align-assignments": "^1.1.2",
+		"prettier": "^1.19.1"
+	}
 }