Skip to content

Commit 012fc84

Browse files
committed
Merge branch 'dependabot/npm_and_yarn/electron-7.2.4' of github.com:halfrost/vue-objccn into dependabot/npm_and_yarn/electron-7.2.4
2 parents 70fb01b + 6b78c7b commit 012fc84

File tree

5 files changed

+2204
-2053
lines changed

5 files changed

+2204
-2053
lines changed

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
<a href="https://github.com/halfrost/vue-objccn/pulls"><img src="https://img.shields.io/badge/PR-Welcome-brightgreen.svg"></a>
1111
<a href="http://weibo.com/halfrost"><img src="https://img.shields.io/badge/[email protected]?style=flat"></a>
1212
<img src="https://img.shields.io/badge/made%20with-%3C3-red.svg">
13+
<img src="https://visitor-badge.laobi.icu/badge?page_id=halfrost.vue-objccn">
1314
</p>
1415

1516
Use Vue.js to develop a cross-platform full stack application of [Objc china](https://objccn.io/).
1617

1718
- [x] ✅ Desktop application available for three platforms, Mac, Linux and Windows
1819
- [x] ✅ Web application supports desktop browsers and mobile browsers
19-
- [x] ✅ Mobile App which uses the Cordova framework, supports iOS,Androi,Windows Phone and BlackBerry platforms
20+
- [x] ✅ Mobile App which uses the Cordova framework, supports iOS, Android, Windows Phone and BlackBerry platforms
2021
- [ ] ❌ Native Mobile App, which can use Weex framework to support both iOS and Android
2122

2223
> Note: This project is just a bit of fun and purely for learning purpose, please support [喵神(@onevcat)](https://github.com/onevcat) and [Objc china](https://objccn.io/).

README_CN.md

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<a href="https://github.com/halfrost/vue-objccn/pulls"><img src="https://img.shields.io/badge/PR-Welcome-brightgreen.svg"></a>
1111
<a href="http://weibo.com/halfrost"><img src="https://img.shields.io/badge/[email protected]?style=flat"></a>
1212
<img src="https://img.shields.io/badge/made%20with-%3C3-red.svg">
13+
<img src="https://visitor-badge.laobi.icu/badge?page_id=halfrost.vue-objccn">
1314
</p>
1415

1516
利用 Vue.js 实现 [Objc中国](https://objccn.io/) 的跨平台全栈应用

build/webpack.base.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module.exports = {
4444
{
4545
test: /\.js$/,
4646
loader: 'babel-loader',
47-
include: [resolve('src'), resolve('test')]
47+
include: [resolve('src'), resolve('test'), resolve('node_modules/markdown-it-highlightjs/index.js'),]
4848
},
4949
{
5050
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,

0 commit comments

Comments
 (0)