Skip to content

Commit 1034e40

Browse files
authored
Merge pull request #983 from getgridea/dev
update build dir and netlify deploy support
2 parents b71b190 + 62207c7 commit 1034e40

File tree

28 files changed

+2493
-2421
lines changed

28 files changed

+2493
-2421
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ module.exports = {
6464
'import/no-extraneous-dependencies': 0,
6565
'global-require': 0,
6666
'no-continue': 0,
67+
'linebreak-style': 0,
6768
},
6869
parserOptions: {
6970
parser: '@typescript-eslint/parser',

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
registry=https://registry.npmjs.org

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "gridea",
3-
"version": "0.9.2",
3+
"version": "0.9.3",
44
"private": true,
55
"description": "A static blog writing client. You can use it to record your life, mood, knowledge, notes and ideas...",
66
"keywords": [
77
"gridea",
88
"static-site",
99
"static-site-generator"
1010
],
11-
"homepage": "http://gridea.dev",
11+
"homepage": "https://gridea.dev",
1212
"license": "MIT",
1313
"author": {
1414
"name": "EryouHao",
@@ -25,7 +25,7 @@
2525
"@iktakahiro/markdown-it-katex": "^3.1.0",
2626
"@sentry/electron": "^1.2.0",
2727
"ant-design-vue": "^1.3.5",
28-
"axios": "^0.18.1",
28+
"axios": "^0.27.2",
2929
"bluebird": "^3.5.3",
3030
"ejs": "^2.6.1",
3131
"electron-google-analytics": "^0.1.0",
@@ -34,7 +34,7 @@
3434
"fs-extra": "^7.0.1",
3535
"gray-matter": "^4.0.1",
3636
"hpagent": "^1.0.0",
37-
"isomorphic-git": "^1.17.1",
37+
"isomorphic-git": "1.17.1",
3838
"junk": "^3.1.0",
3939
"less": "^3.9.0",
4040
"lowdb": "^1.0.0",

public/default-files/posts/hello-gridea.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ feature: /post-images/hello-gridea.png
1313

1414
[Github](https://github.com/getgridea/gridea)
1515
[Gridea 主页](https://gridea.dev/)
16-
[示例网站](http://fehey.com/)
16+
[示例网站](https://fehey.com/)
1717

1818
## 特性👇
1919
📝 你可以使用最酷的 **Markdown** 语法,进行快速创作
Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
2-
<meta charset="utf-8" >
3-
4-
<title><%= siteTitle %></title>
5-
<meta name="description" content="<%= themeConfig.siteDescription %>">
6-
7-
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
8-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css">
9-
10-
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
11-
<link rel="shortcut icon" href="<%= themeConfig.domain %>/favicon.ico?v=<%= site.utils.now %>">
12-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.css">
13-
<link rel="stylesheet" href="<%= themeConfig.domain %>/styles/main.css">
14-
15-
<% if (typeof commentSetting !== 'undefined' && commentSetting.showComment) { %>
16-
<% if (commentSetting.commentPlatform === 'gitalk') { %>
17-
<link rel="stylesheet" href="https://unpkg.com/gitalk/dist/gitalk.css" />
18-
<% } %>
19-
20-
<% if (commentSetting.commentPlatform === 'disqus') { %>
21-
<link rel="stylesheet" href="https://unpkg.com/disqusjs@1.1/dist/disqusjs.css" />
22-
<% } %>
23-
<% } %>
24-
25-
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
26-
<script src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
27-
28-
<% if (site.customConfig.ga) { %>
29-
<script async src="https://www.googletagmanager.com/gtag/js?id=<%= site.customConfig.ga %>"></script>
30-
<script>
31-
window.dataLayer = window.dataLayer || [];
32-
function gtag(){dataLayer.push(arguments);}
33-
gtag('js', new Date());
34-
35-
gtag('config', '<%= site.customConfig.ga %>');
36-
</script>
37-
<% } %>
1+
2+
<meta charset="utf-8" >
3+
4+
<title><%= siteTitle %></title>
5+
<meta name="description" content="<%= themeConfig.siteDescription %>">
6+
7+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
8+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css">
9+
10+
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
11+
<link rel="shortcut icon" href="<%= themeConfig.domain %>/favicon.ico?v=<%= site.utils.now %>">
12+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.css">
13+
<link rel="stylesheet" href="<%= themeConfig.domain %>/styles/main.css">
14+
15+
<% if (typeof commentSetting !== 'undefined' && commentSetting.showComment) { %>
16+
<% if (commentSetting.commentPlatform === 'gitalk') { %>
17+
<link rel="stylesheet" href="https://unpkg.com/gitalk/dist/gitalk.css" />
18+
<% } %>
19+
20+
<% if (commentSetting.commentPlatform === 'disqus') { %>
21+
<link rel="stylesheet" href="https://unpkg.com/disqusjs@1.1/dist/disqusjs.css" />
22+
<% } %>
23+
<% } %>
24+
25+
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
26+
<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.1/build/highlight.min.js"></script>
27+
28+
<% if (site.customConfig.ga) { %>
29+
<script async src="https://www.googletagmanager.com/gtag/js?id=<%= site.customConfig.ga %>"></script>
30+
<script>
31+
window.dataLayer = window.dataLayer || [];
32+
function gtag(){dataLayer.push(arguments);}
33+
gtag('js', new Date());
34+
35+
gtag('config', '<%= site.customConfig.ga %>');
36+
</script>
37+
<% } %>

public/default-files/themes/fly/templates/post.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</span>
3232
<% } %>
3333
</div>
34-
<div class="post-content">
34+
<div class="post-content" v-pre>
3535
<%- post.content %>
3636
</div>
3737
</div>

public/default-files/themes/notes/templates/post.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta name="description" content="<%- post.description %>" />
55
<meta name="keywords" content="<%- post.tags.map(tag => tag.name).join(',') %>" />
66
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.css">
7-
<script src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
7+
<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.1/build/highlight.min.js"></script>
88
</head>
99
<body>
1010
<div class="main">
@@ -32,7 +32,7 @@
3232
<img class="post-feature-image" src="<%= post.feature %>" alt="">
3333
<% } %>
3434
<div class="post-content-wrapper">
35-
<div class="post-content">
35+
<div class="post-content" v-pre>
3636
<%- post.content %>
3737
</div>
3838
<div class="toc-container">
Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
<meta charset="utf-8" >
2-
3-
<title><%= siteTitle %></title>
4-
<meta name="description" content="<%= themeConfig.siteDescription %>">
5-
6-
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
7-
<link rel="shortcut icon" href="<%= themeConfig.domain %>/favicon.ico?v=<%= site.utils.now %>">
8-
9-
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
10-
<link rel="stylesheet" href="https://unpkg.com/papercss@1.6.1/dist/paper.min.css" />
11-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.css">
12-
<link rel="stylesheet" href="<%= themeConfig.domain %>/styles/main.css">
13-
14-
<% if (typeof commentSetting !== 'undefined' && commentSetting.showComment) { %>
15-
<% if (commentSetting.commentPlatform === 'gitalk') { %>
16-
<link rel="stylesheet" href="https://unpkg.com/gitalk/dist/gitalk.css" />
17-
<% } %>
18-
19-
<% if (commentSetting.commentPlatform === 'disqus') { %>
20-
<link rel="stylesheet" href="https://unpkg.com/disqusjs@1.1/dist/disqusjs.css" />
21-
<% } %>
22-
<% } %>
23-
<script src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
24-
25-
26-
<link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css" />
27-
<% if (site.customConfig.ga) { %>
28-
<script async src="https://www.googletagmanager.com/gtag/js?id=<%= site.customConfig.ga %>"></script>
29-
<script>
30-
window.dataLayer = window.dataLayer || [];
31-
function gtag(){dataLayer.push(arguments);}
32-
gtag('js', new Date());
33-
34-
gtag('config', '<%= site.customConfig.ga %>');
35-
</script>
36-
<% } %>
1+
<meta charset="utf-8" >
2+
3+
<title><%= siteTitle %></title>
4+
<meta name="description" content="<%= themeConfig.siteDescription %>">
5+
6+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
7+
<link rel="shortcut icon" href="<%= themeConfig.domain %>/favicon.ico?v=<%= site.utils.now %>">
8+
9+
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.2/css/all.css" integrity="sha384-fnmOCqbTlWIlj8LyTjo7mOUStjsKC4pOpQbqyi7RrhN7udi9RwhKkMHpvLbHG9Sr" crossorigin="anonymous">
10+
<link rel="stylesheet" href="https://unpkg.com/papercss@1.6.1/dist/paper.min.css" />
11+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.10.0/katex.min.css">
12+
<link rel="stylesheet" href="<%= themeConfig.domain %>/styles/main.css">
13+
14+
<% if (typeof commentSetting !== 'undefined' && commentSetting.showComment) { %>
15+
<% if (commentSetting.commentPlatform === 'gitalk') { %>
16+
<link rel="stylesheet" href="https://unpkg.com/gitalk/dist/gitalk.css" />
17+
<% } %>
18+
19+
<% if (commentSetting.commentPlatform === 'disqus') { %>
20+
<link rel="stylesheet" href="https://unpkg.com/disqusjs@1.1/dist/disqusjs.css" />
21+
<% } %>
22+
<% } %>
23+
<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.1/build/highlight.min.js"></script>
24+
25+
26+
<link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css" />
27+
<% if (site.customConfig.ga) { %>
28+
<script async src="https://www.googletagmanager.com/gtag/js?id=<%= site.customConfig.ga %>"></script>
29+
<script>
30+
window.dataLayer = window.dataLayer || [];
31+
function gtag(){dataLayer.push(arguments);}
32+
gtag('js', new Date());
33+
34+
gtag('config', '<%= site.customConfig.ga %>');
35+
</script>
36+
<% } %>

public/default-files/themes/paper/templates/post.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<% if (post.feature) { %>
2323
<img src="<%= post.feature %>" alt="<%= post.title %>">
2424
<% } %>
25-
<div class="post-content">
25+
<div class="post-content" v-pre>
2626
<%- post.content %>
2727
</div>
2828
</article>

public/default-files/themes/simple/templates/_blocks/scripts.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var app = new Vue({
1313
</script>
1414

1515
<% if (site.customConfig.renderCode) { %>
16-
<script src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
16+
<script src="//cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.5.1/build/highlight.min.js"></script>
1717
<script>
1818
hljs.initHighlightingOnLoad()
1919
</script>

0 commit comments

Comments
 (0)