Skip to content

Commit f94bf00

Browse files
wangxiaowangxiao
committed
Merge pull request #135 from leeyeh/master
[feature]Support node runtiime
2 parents 465d2ce + d6242bd commit f94bf00

30 files changed

+4198
-2151
lines changed

‎.editorconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 2
6+
end_of_line = lf
7+
insert_final_newline = true

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
bower_components
2+
node_modules
3+
test/browser/runner.browser.js

‎.jscsrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"preset": "google",
3+
"maximumLineLength": null
4+
}

‎.jshintrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"node": true,
3+
"mocha": true,
4+
"predef": ["Promise"]
5+
}

‎.travis.yml

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
1-
script: "echo 1"
2-
after_success: |
3-
[ $TRAVIS_BRANCH == 'master' ] && \
4-
mkdir target && \
5-
cp -r demo target/ && \
6-
cp -r src target/ && \
7-
cp -r plugin target/ && \
8-
sudo pip install ghp-import && \
9-
ghp-import -n target && \
10-
git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
1+
language: node_js
2+
node_js:
3+
- "0.12"
4+
sudo: false
5+
before_install:
6+
- npm install bower grunt-cli -g
7+
- bower install
8+
after_success:
9+
- if [[ "$TRAVIS_BRANCH" == "master" ]] && [[ "${TRAVIS_PULL_REQUEST}" = "false" ]]; then
10+
echo "Deploy demos to github pages.";
11+
mkdir target;
12+
cp -r demo target/;
13+
cp -r dist target/;
14+
cp -r plugin target/;
15+
cp -r test target/;
16+
cp -r bower_components target/;
17+
cd target && git init;
18+
git config user.name "leancloud";
19+
git config user.email "[email protected]";
20+
git add .;
21+
git commit -m "Deploy demos to Github Pages [skip ci]";
22+
git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git master:gh-pages;
23+
fi

‎Gruntfile.js

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
module.exports = function(grunt) {
2+
require('load-grunt-tasks')(grunt);
3+
4+
var SAUCE_BROWSERS = [{
5+
browserName: 'chrome'
6+
}, {
7+
browserName: 'firefox'
8+
}, {
9+
browserName: 'internet explorer',
10+
version: '11.0'
11+
}, {
12+
browserName: 'internet explorer',
13+
version: '10.0'
14+
}, {
15+
browserName: 'internet explorer',
16+
version: '9.0'
17+
}, {
18+
browserName: 'internet explorer',
19+
version: '8.0'
20+
}];
21+
22+
var HINT_SRCS = ['src/**/*.js', 'test/**/*.js', 'demo/**/*.js', '*.js', '!**/*.browser.js'];
23+
24+
grunt.initConfig({
25+
browserify: {
26+
dist: {
27+
files: {
28+
'dist/AV.realtime.js': ['src/AV.realtime.js']
29+
}
30+
},
31+
test: {
32+
files: {
33+
'test/browser/runner.browser.js': 'test/browser/runner.js'
34+
}
35+
}
36+
},
37+
uglify: {
38+
dist: {
39+
files: {
40+
'dist/AV.realtime.min.js': ['dist/AV.realtime.js']
41+
}
42+
}
43+
},
44+
connect: {
45+
server: {
46+
options: {
47+
port: 8000,
48+
base: ''
49+
}
50+
}
51+
},
52+
simplemocha: {
53+
options: {
54+
timeout: 10000,
55+
ui: 'bdd'
56+
},
57+
all: {
58+
src: ['test/runner.js']
59+
}
60+
},
61+
'mocha_phantomjs': {
62+
all: {
63+
options: {
64+
urls: [
65+
'http://localhost:8000/test/browser/'
66+
]
67+
}
68+
}
69+
},
70+
'saucelabs-mocha': {
71+
all: {
72+
options: {
73+
urls: ['http://localhost:8000/test/browser/'],
74+
build: process.env.CI_BUILD_NUMBER,
75+
testname: 'Sauce Test for LeanCloud realtime SDK',
76+
browsers: SAUCE_BROWSERS
77+
}
78+
}
79+
},
80+
jshint: {
81+
all: {
82+
src: HINT_SRCS,
83+
options: {
84+
jshintrc: true
85+
}
86+
}
87+
},
88+
jscs: {
89+
src: HINT_SRCS
90+
}
91+
});
92+
grunt.registerTask('default', []);
93+
grunt.registerTask('hint', ['jshint', 'jscs']);
94+
grunt.registerTask('test', ['hint', 'browserify:test', 'connect', 'mocha_phantomjs', 'simplemocha']);
95+
grunt.registerTask('sauce', ['browserify:test', 'connect', 'saucelabs-mocha']);
96+
grunt.registerTask('release', ['browserify:dist', 'uglify:dist']);
97+
};

‎README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
# LeanCloud 实时通信 JavaScript SDK
1+
# LeanCloud 实时通信 JavaScript SDK [![Build Status](https://img.shields.io/travis/leancloud/js-realtime-sdk.svg)](https://travis-ci.org/leancloud/js-realtime-sdk) [![npm](https://img.shields.io/npm/v/leancloud-realtime.svg)](https://www.npmjs.com/package/leancloud-realtime) [![Bower](https://img.shields.io/bower/v/leancloud-realtime.svg)]() [![David](https://img.shields.io/david/leancloud/js-realtime-sdk.svg)](https://david-dm.org/leancloud/js-realtime-sdk)
22

33
## 详细使用方法请看 [官方文档](https://leancloud.cn/docs/js_realtime.html)
44

55
## 官方新版本发布流程
66

77
* 修改代码中版本号及修改日期
8-
* 修改 bower.json 中的版本号
8+
* 修改 package.json 与 bower.json 中的版本号
99
* 修改 changelog.md
10+
* `grunt test`
11+
* `grunt release`
1012
* 提交代码合并到 master
1113
* Github 生成 release 包
12-
* 发布到 bower
14+
* 发布到 npm 与 bower
1315

1416
```
1517
bower register leancloud-realtime [email protected]:leancloud/js-realtime-sdk.git

‎bower.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
{
22
"name": "leancloud-realtime.js",
3-
"version": "2.1.0",
3+
"version": "2.2.0",
44
"homepage": "http://github.com/leancloud/js-realtime-sdk/",
55
"authors": [
66
"WangXiao <[email protected]>"
77
],
88
"description": "LeanCloud JavaScript Realtime SDK",
9-
"main": "src/AV.realtime.js",
9+
"main": "dist/AV.realtime.js",
1010
"ignore": [
11+
"**/.*",
1112
"demo",
13+
"test",
14+
"Gruntfile.js",
1215
"README.md",
13-
".travis.yml",
1416
"changelog.md"
1517
],
1618
"moduleType": [
19+
"node",
1720
"amd",
1821
"globals"
1922
],
@@ -23,7 +26,6 @@
2326
],
2427
"license": "MIT",
2528
"devDependencies": {
26-
"mocha": "~2.2.5",
27-
"should": "~7.0.1"
29+
"mocha": "~2.2.5"
2830
}
2931
}

‎demo/demo1/index.html

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
<!doctype html>
22
<html>
3+
34
<head>
4-
<meta charset="utf-8">
5-
<title>LeanCloud Realtime JavaScript SDK</title>
6-
<meta name="description" content="">
7-
<meta name="viewport" content="width=device-width">
8-
<meta name="viewport" content="user-scalable=no">
9-
<meta name="viewport" content="initial-scale=1,maximum-scale=1">
10-
<link rel="stylesheet" href="style.css">
5+
<meta charset="utf-8">
6+
<title>LeanCloud Realtime JavaScript SDK</title>
7+
<meta name="description" content="">
8+
<meta name="viewport" content="width=device-width">
9+
<meta name="viewport" content="user-scalable=no">
10+
<meta name="viewport" content="initial-scale=1,maximum-scale=1">
11+
<link rel="stylesheet" href="style.css">
1112
</head>
13+
1214
<body>
13-
<h1>欢迎使用 LeanCloud 实时通信 SDK</h1>
14-
<div class="item">
15-
<p>这是无 UI 版本的 demo，接口覆盖全面</p>
16-
<p>请在浏览器「控制台」中查看 log 信息，也可以在浏览器中直接调用相关代码。</p>
17-
<p>SDK 详细使用方法，请看官方文档</p>
18-
<p>
19-
<a target="_blank" href="https://leancloud.cn/docs/js_realtime.html">https://leancloud.cn/docs/js_realtime.html</a>
20-
</p>
21-
</div>
22-
<script src="../../src/AV.realtime.js"></script>
23-
<script src="test.js"></script>
15+
<h1>欢迎使用 LeanCloud 实时通信 SDK</h1>
16+
<div class="item">
17+
<p>这是无 UI 版本的 demo，接口覆盖全面</p>
18+
<p>请在浏览器「控制台」中查看 log 信息，也可以在浏览器中直接调用相关代码。</p>
19+
<p>SDK 详细使用方法，请看官方文档</p>
20+
<p>
21+
<a target="_blank" href="https://leancloud.cn/docs/js_realtime.html">https://leancloud.cn/docs/js_realtime.html</a>
22+
</p>
23+
</div>
24+
<script src="../../dist/AV.realtime.js"></script>
25+
<script src="test.js"></script>
2426
</body>
27+
2528
</html>

‎demo/demo1/style.css

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
11
* {
2-
margin: 0px;
3-
padding: 0px;
2+
margin: 0px;
3+
padding: 0px;
44
}
5-
65
body {
7-
padding-top: 25%;
8-
text-align: center;
9-
font-size: 13px;
6+
padding-top: 25%;
7+
text-align: center;
8+
font-size: 13px;
109
}
11-
1210
h1 {
13-
font-size: 22px;
11+
font-size: 22px;
1412
}
15-
1613
a {
17-
color: #00f;
14+
color: #00f;
1815
}
19-
2016
.item {
21-
margin: 10px 0px;
17+
margin: 10px 0px;
2218
}
23-
2419
.item p {
25-
margin: 5px;
20+
margin: 5px;
2621
}

0 commit comments

Comments
 (0)