Skip to content

Commit 6e18c7b

Browse files
authored
Merge pull request #203 from regularjs/next
prepare to release stable V0.6
2 parents fade2d2 + da20674 commit 6e18c7b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+4743
-1340
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
*node_modules*
22
*sublime*
3+
*.idea*
34
example
45
npm-debug.log
56
*/tmp/*

.jshintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"funcscope" : false, // Tolerate declarations of variables inside of control structures while accessing them later from the outside.
6060
"globalstrict" : true, // Allow global "use strict" (also enables 'strict').
6161
"iterator" : false, // Allow usage of __iterator__ property.
62-
"lastsemic" : false, // Tolerat missing semicolons when the it is omitted for the last statement in a one-line block.
62+
"lastsemic" : true, // Tolerat missing semicolons when the it is omitted for the last statement in a one-line block.
6363
"laxbreak" : false, // Tolerate unsafe line breaks e.g. `return [\n] x` without semicolons.
6464
"laxcomma" : false, // Suppress warnings about comma-first coding style.
6565
"loopfunc" : false, // Allow functions to be defined within loops.

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- '0.10'
3+
- '6.9'
44
branches:
55
only:
66
- master

README.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
> Regularjs is a __living template engine__ that helps us to create data-driven components.
99
1010

11-
12-
1311
* __[✨中文指南 ](http://regularjs.github.io/guide/zh/index.html)__
1412
* __[✨中文API ](http://regularjs.github.io/reference/?api-zh)__
1513

@@ -201,3 +199,7 @@ __regularjs is still under heavy development__, and please help us with feedback
201199
## LICENSE
202200

203201
[MIT](https://github.com/regularjs/regular/blob/master/LICENSE).
202+
203+
## TODO
204+
205+
remove log code in production mode;

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "regularjs",
3-
"version": "0.5.2",
3+
"version": "0.6.0-beta.4",
44
"main": "dist/regular.js",
55
"description": "reactjs + angularjs = regularjs",
66
"authors": "@leeluolee <[email protected]>",

0 commit comments

Comments
 (0)