Skip to content

Improve the default site.json settings generated during init #525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yamgent merged 1 commit into from
Jan 13, 2019
Merged

Improve the default site.json settings generated during init #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/Site.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const Page = require('./Page');
const CLI_VERSION = require('../package.json').version;

const BOILERPLATE_FOLDER_NAME = '_markbind/boilerplates';
const CONFIG_FOLDER_NAME = '_markbind';
const HEADING_INDEXING_LEVEL_DEFAULT = 3;
const SITE_ASSET_FOLDER_NAME = 'asset';
const TEMP_FOLDER_NAME = '.temp';
Expand Down Expand Up @@ -57,6 +58,8 @@ const SITE_CONFIG_DEFAULT = {
'_site/*',
'site.json',
'*.md',
'*.mbd',
'.git/*',
],
pages: [
{
Expand All @@ -66,6 +69,9 @@ const SITE_CONFIG_DEFAULT = {
{
glob: '**/index.md',
},
{
glob: '**/*.+(md|mbd)',
},
],
deploy: {
message: 'Site Update.',
Expand Down Expand Up @@ -359,7 +365,7 @@ Site.prototype.collectAddressablePages = function () {
globPages.concat(walkSync(this.rootPath, {
directories: false,
globs: [addressableGlob.glob],
ignore: [BOILERPLATE_FOLDER_NAME],
ignore: [CONFIG_FOLDER_NAME],
}).map(globPath => ({
src: globPath,
searchable: addressableGlob.searchable,
Expand Down
7 changes: 6 additions & 1 deletion test/unit/utils/data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ module.exports.SITE_JSON_DEFAULT = '{\n'
+ ' "_markbind/logs/*",\n'
+ ' "_site/*",\n'
+ ' "site.json",\n'
+ ' "*.md"\n'
+ ' "*.md",\n'
+ ' "*.mbd",\n'
+ ' ".git/*"\n'
+ ' ],\n'
+ ' "pages": [\n'
+ ' {\n'
Expand All @@ -58,6 +60,9 @@ module.exports.SITE_JSON_DEFAULT = '{\n'
+ ' },\n'
+ ' {\n'
+ ' "glob" : "**/index.md"\n'
+ ' },\n'
+ ' {\n'
+ ' "glob" : "**/*.+(md|mbd)"\n'
+ ' }\n'
+ ' ],\n'
+ ' "deploy": {\n'
Expand Down