Fix failed to load config

hanejs · Feb 8, 2017 · e4bcd1f · e4bcd1f
1 parent f8e0e05
commit e4bcd1f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -6,6 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
+var _fs = require('fs');
+
+var _fs2 = _interopRequireDefault(_fs);
+
 var _path = require('path');
 
 var _path2 = _interopRequireDefault(_path);
@@ -18,13 +22,14 @@ var _lodash = require('lodash');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const configValidFields = ['blog', 'render', 'deployer'];
+const configValidFields = ['blog', 'render', 'theme', 'deployer'];
 
 class HaneConfig {
   static getDefault() {
     if (!HaneConfig.defaultConfig) {
       const root = _path2.default.join(__dirname, '..');
       HaneConfig.defaultConfig = new HaneConfig(root).config;
+      console.log(HaneConfig.defaultConfig);
     }
   }
   constructor(root) {
@@ -33,8 +38,8 @@ class HaneConfig {
     if (root) {
       try {
         const configPath = _path2.default.join(root, 'hane.yml');
-        const data = fs.readFileSync(configPath, 'utf8');
-        const _config = _jsYaml2.default.safeLoad(data);
+        const data = _fs2.default.readFileSync(configPath, 'utf8');
+        let _config = _jsYaml2.default.safeLoad(data);
         _config = (0, _lodash.pick)(_config, configValidFields);
         config = _extends({}, config, _config);
       } catch (e) {

diff --git a/src/index.es b/src/index.es
@@ -1,9 +1,10 @@
 
+import fs from 'fs'
 import path from 'path'
 import yaml from 'js-yaml'
 import { pick, cloneDeep } from 'lodash'
 
-const configValidFields = [ 'blog', 'render', 'deployer' ]
+const configValidFields = [ 'blog', 'render', 'theme', 'deployer' ]
 
 class HaneConfig {
   static defaultConfig = null
@@ -22,7 +23,7 @@ class HaneConfig {
       try {
         const configPath = path.join(root, 'hane.yml')
         const data = fs.readFileSync(configPath, 'utf8')
-        const _config = yaml.safeLoad(data)
+        let _config = yaml.safeLoad(data)
         _config = pick(_config, configValidFields)
         config = { ...config, ..._config }
       } catch (e) {