Skip to content
This repository was archived by the owner on Jun 26, 2022. It is now read-only.

Commit c7d14da

Browse files
committed
removed slugify
1 parent 19de148 commit c7d14da

File tree

7 files changed

+29
-8
lines changed

7 files changed

+29
-8
lines changed

drafts/pop.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: just a title
2+
title: 'just a title.yml : and seecd'
33
labels:
44
- label sample
55
---

package.json

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"pushstate-server": "3.0.0",
5959
"rimraf": "2.6.1",
6060
"sass-loader": "6.0.5",
61+
"slug": "0.9.1",
6162
"slugify": "1.1.0",
6263
"style-loader": "0.18.0",
6364
"webpack": "2.6.0",

scripts/dev.js

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ const chalk = require('chalk');
99
const mkdirp = require('mkdirp');
1010
const fs = require('fs');
1111
const path = require('path');
12-
const slugify = require('slugify');
1312

1413
// import configuration files
1514
const init = require('./init');

scripts/generate.js

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const mkdirp = require('mkdirp');
1010

1111
const fs = require('fs');
1212
const path = require('path');
13-
const slugify = require('slugify');
1413

1514
// import configuration files
1615
const init = require('./init');

scripts/init.js

+22-1
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,37 @@ const path = require('path');
44
const _nunjucks = require('./nunjucks_config.js');
55
const gitblog = require('github-blog-api');
66
const yaml = require('js-yaml');
7+
const slug = require('slug');
78

89
module.exports = {
910
init: ()=>{
1011
process.env.ROOT_DIR = path.resolve('.');
1112
const ROOT_DIR = process.env.ROOT_DIR;
13+
1214
const bc = yaml.safeLoad(fs.readFileSync(path.join(ROOT_DIR,'_config.yml'), 'utf8'));
15+
const THEME_DIR = path.join(ROOT_DIR,'themes',bc.meta.blog_theme);
16+
let tc = {};
17+
if(fs.existsSync(path.join(THEME_DIR,'_config.yml'))){
18+
tc = yaml.safeLoad(fs.readFileSync(path.join(THEME_DIR,'_config.yml'), 'utf8'));
19+
}
20+
1321
const nunjucks = _nunjucks.init();
22+
1423
const blog = gitblog({username:bc.username,repo:bc.repo,author:bc.author});
1524
blog.setPost({per_page:bc.posts_per_page});
16-
return {blog,nunjucks,bc};
25+
26+
27+
// init slug
28+
slug.defaults.modes['pretty'] = {
29+
replacement: '-',
30+
symbols: true,
31+
remove: /[.]/g,
32+
lower: true,
33+
charmap: slug.charmap,
34+
multicharmap: slug.multicharmap
35+
};
36+
37+
return {blog,nunjucks,bc,tc,slug};
1738
}
1839
}
1940

scripts/utils.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@ const mkdirp = require('mkdirp');
44
const marked = require('marked');
55
const fs = require('fs');
66
const map = require('async/map');
7-
const slugify = require('slugify');
7+
//const slugify = require('slugify');
88
const path = require('path');
99
const yamlFront = require('yaml-front-matter');
1010
const _nunjucks = require('./nunjucks_config.js');
1111
const init = require('./init');
1212

1313
// init nunjucks and blog and env variables
14-
const {nunjucks,bc} = init.init();
14+
const {nunjucks,bc,tc,slug} = init.init();
15+
console.log("TC:",tc);
1516

1617
// inits
1718
const ROOT_DIR = process.env.ROOT_DIR;
@@ -27,7 +28,8 @@ const contextObject = {
2728
const createPostObject = (fileName,cb) =>{
2829
let content = fs.readFileSync(path.join(ROOT_DIR,'drafts',fileName),{encoding:"utf8"});
2930
const post = yamlFront.loadFront(content);
30-
post.slug = slugify(post.title);
31+
post.slug = slug(post.title);
32+
console.log(post.slug);
3133
post.html = marked(post.__content);
3234
post.body = post.__content;
3335
post.fileName = fileName;

themes/lagom/.ruby-version

-1
This file was deleted.

0 commit comments

Comments
 (0)