From 084b2698650bae88f04ac336b44dd37bc3c025ed Mon Sep 17 00:00:00 2001 From: Daniel Date: Sun, 12 Jun 2016 02:44:28 +0100 Subject: [PATCH] Rename package variable to pkg, as "package" is reserved. --- src/server.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server.js b/src/server.js index b0937058..77d8679f 100644 --- a/src/server.js +++ b/src/server.js @@ -1,5 +1,5 @@ var _ = require("lodash"); -var package = require("../package.json"); +var pkg = require("../package.json"); var bcrypt = require("bcrypt-nodejs"); var Client = require("./client"); var ClientManager = require("./clientManager"); @@ -62,11 +62,11 @@ module.exports = function(options) { manager.sockets = sockets; - log.info("The Lounge v" + package.version + " is now running on", protocol + "://" + config.host + ":" + config.port + "/"); + log.info("The Lounge v" + pkg.version + " is now running on", protocol + "://" + config.host + ":" + config.port + "/"); log.info("Press ctrl-c to stop\n"); - if (!require("semver").satisfies(process.version, package.engines.node)) { - log.warn("The oldest supported Node.js version is ", package.engines.node); + if (!require("semver").satisfies(process.version, pkg.engines.node)) { + log.warn("The oldest supported Node.js version is ", pkg.engines.node); log.warn("We strongly encourage you to upgrade, see https://nodejs.org/en/download/package-manager/ for more details\n"); } @@ -98,7 +98,7 @@ function index(req, res, next) { return fs.readFile("client/index.html", "utf-8", function(err, file) { var data = _.merge( - package, + pkg, config ); var template = _.template(file);