feat: support npm package as theme

benjycui · Jan 20, 2017 · 0d9dc61 · 0d9dc61
1 parent d7790d1
commit 0d9dc61
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 20 deletions.
diff --git a/src/utils/get-bisheng-config.js b/src/utils/get-bisheng-config.js
@@ -2,6 +2,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const resolve = require('resolve');
 
 const defaultConfig = {
   port: 8000,
@@ -24,5 +25,6 @@ const defaultConfig = {
 module.exports = function getBishengConfig(configFile) {
   const customizedConfig = fs.existsSync(configFile) ? require(configFile) : {};
   const config = Object.assign({}, defaultConfig, customizedConfig);
+  config.theme = resolve.sync(config.theme, { basedir: process.cwd() });
   return config;
 };
diff --git a/test/fixtures/_theme/index.js b/test/fixtures/_theme/index.js
@@ -0,0 +1 @@
+// placeholder
diff --git a/test/fixtures/bisheng.config.js b/test/fixtures/bisheng.config.js
@@ -2,4 +2,5 @@
 
 module.exports = {
   source: './content',
+  theme: './test/fixtures/_theme',
 };
diff --git a/test/utils/get-config.test.js b/test/utils/get-config.test.js
@@ -6,25 +6,6 @@ const getBishengConfig = require('../../lib/utils/get-bisheng-config');
 const getThemeConfig = require('../../lib/utils/get-theme-config');
 
 describe('utils/get-bisheng-config', function() {
-  it('should return default config when no custom config is provided', function() {
-    const bishengConfig = getBishengConfig('./no-such.config.js.');
-
-    assert.strictEqual(bishengConfig.webpackConfig(1), 1);
-    delete bishengConfig.webpackConfig;
-    delete bishengConfig.filePathMapper;
-
-    assert.deepEqual(bishengConfig, {
-      source: './posts',
-      output: './_site',
-      entryName: 'index',
-      theme: './_theme',
-      htmlTemplate: path.join(__dirname, '../../lib/template.html'),
-      port: 8000,
-      root: '/',
-      doraConfig: {},
-    });
-  });
-
   it('should merge custom config to default config', function() {
     const bishengConfig = getBishengConfig(path.join(__dirname, '../fixtures/bisheng.config.js'));
     delete bishengConfig.webpackConfig;
@@ -34,7 +15,7 @@ describe('utils/get-bisheng-config', function() {
       source: './content',
       output: './_site',
       entryName: 'index',
-      theme: './_theme',
+      theme: path.join(process.cwd(), './test/fixtures/_theme/index.js'),
       htmlTemplate: path.join(__dirname, '../../lib/template.html'),
       port: 8000,
       root: '/',