From d1765f746b9667fd7aea7f3c29436af22ea2efe5 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Sat, 26 Sep 2020 20:46:20 -0700 Subject: [PATCH] Updated next config. --- lib/request.js | 7 ++++++- next.config.js | 3 +++ package.json | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/request.js b/lib/request.js index 6975c170..15ab5722 100644 --- a/lib/request.js +++ b/lib/request.js @@ -3,6 +3,9 @@ import requestIp from 'request-ip'; import { browserName, detectOS } from 'detect-browser'; import isLocalhost from 'is-localhost-ip'; import maxmind from 'maxmind'; +import getConfig from 'next/config'; +const { serverRuntimeConfig } = getConfig(); + import { DESKTOP_OS, MOBILE_OS, @@ -60,7 +63,9 @@ export async function getCountry(req, ip) { } // Database lookup - const lookup = await maxmind.open(path.resolve(__dirname, '../geo/GeoLite2-Country.mmdb')); + const lookup = await maxmind.open( + path.resolve(serverRuntimeConfig.PROJECT_ROOT, '../geo/GeoLite2-Country.mmdb'), + ); const result = lookup.get(ip); diff --git a/next.config.js b/next.config.js index 0ddfc76a..c1e31d7b 100644 --- a/next.config.js +++ b/next.config.js @@ -5,6 +5,9 @@ module.exports = { env: { VERSION: pkg.version, }, + serverRuntimeConfig: { + PROJECT_ROOT: __dirname, + }, webpack(config) { config.module.rules.push({ test: /\.svg$/, diff --git a/package.json b/package.json index d615260d..a82cf4de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "umami", - "version": "0.57.0", + "version": "0.58.0", "description": "A simple, fast, website analytics alternative to Google Analytics. ", "author": "Mike Cao ", "license": "MIT",