From a165fd2efac3ad7c1248694fe8656934d116079d Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Wed, 4 Jul 2018 23:37:26 +0300 Subject: [PATCH 1/2] Fixed NexT `package.json` path on Windows. Fix for #298. --- scripts/helpers.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/helpers.js b/scripts/helpers.js index 9ee66109fe..d4ee1c2507 100644 --- a/scripts/helpers.js +++ b/scripts/helpers.js @@ -7,7 +7,9 @@ hexo.extend.helper.register('hexo_env', function(type) { }); hexo.extend.helper.register('next_env', function(type) { - var env = require('../package.json'); + var pathFn = require('path'); + var path = pathFn.normalize('../package.json'); + var env = require(path); return env[type]; }); From c25344d559b8102fc31eb4e2ace3b493b33badfd Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Wed, 4 Jul 2018 23:47:05 +0300 Subject: [PATCH 2/2] Merge branch 'fix/windows-backslashes' --- scripts/helpers.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/helpers.js b/scripts/helpers.js index d4ee1c2507..e4df2b26ed 100644 --- a/scripts/helpers.js +++ b/scripts/helpers.js @@ -7,9 +7,8 @@ hexo.extend.helper.register('hexo_env', function(type) { }); hexo.extend.helper.register('next_env', function(type) { - var pathFn = require('path'); - var path = pathFn.normalize('../package.json'); - var env = require(path); + var path = require('path'); + var env = require(path.normalize('../package.json')); return env[type]; });