Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
* master:
  updated: fixed wrong text in the readme file
  updated: libraries sizes
  3.4.0
  added: support for style and class object attributes
  closes #2178
  updated: simplified the special expressions updates
  updated: cleaning up the update method
  updated: dbmon frames rendering strategy
  closes #2080
  closes #2103
  fixed: make sure that the riot version gets exported as string
  updated: dev dependencies
  Enable syntax highlighting of tag files
  updated: small optimization avoiding the shouldUpdate check for the anonymous tags
  updated: dev dependencies
  Delete a duplicate line
  • Loading branch information
GianlucaGuarini committed Mar 26, 2017
2 parents 5cb68f5 + 43f9151 commit c695119
Show file tree
Hide file tree
Showing 10 changed files with 380 additions and 249 deletions.
15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
| Framework | Version | Minified Size (gzip) |
|------------------------------------------------|-----------------|----------------------|
| Angular2 | 2 | too much |
| Ember | 2.11.2 | 130.99kb |
| Ember | 2.12.0 | 131.92kb |
| Polymer + Web Components Polyfill Lite | 1.8.0 | 66.3kb |
| Angular | 1.6.1 | 57.99kb |
| React | 15.4.2 | 45.06kb |
| Web Components Polyfill | 0.7.22 | 33.68kb |
| Vue | 2.2.1 | 27.52kb |
| __Riot__ | 3.3.2 | 9.73kb |
| Inferno | 1.2.2 | 9.17kb |
| Preact | 7.2.0 | 3.94kb |
| Vue | 2.2.5 | 27.86kb |
| __Riot__ | 3.4.0 | 9.81kb |
| Inferno | 1.4.0 | 9.00kb |
| Preact | 7.2.1 | 3.94kb |

### Browsers support

Expand All @@ -41,7 +41,6 @@ Riot is supported by all modern browsers and it does not require any additional
- Chrome
- Safari 7+
- Firefox
- Chrome
- Safari iOS
- Android

Expand Down Expand Up @@ -332,13 +331,13 @@ http://riotjs.com/

## Backers

Support us with a monthly donation and help us continue our activities. [[Become a backer][backers-image]][support-url]
Support us with a monthly donation and help us continue our activities. [Become a backer][support-url]

[![Backers][backers-image]][support-url]

## Sponsors

Become a sponsor to get your logo on our README. [[Become a sponsor][sponsors-image]][support-url]
Become a sponsor to get your logo on our README. [Become a sponsor][support-url]

[![Sponsors][sponsors-image]][support-url]

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "riot",
"version": "3.3.2",
"version": "3.4.0",
"description": "A React-like user interface micro-library",
"homepage": "http://riotjs.com/",
"repository": { "type": "git", "url": "git://github.com/riot/riot.git" },
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "riot",
"version": "3.3.2",
"version": "3.4.0",
"description": "A React-like user interface micro-library",
"repository": "riot/riot",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "riot",
"version": "3.3.2",
"version": "3.4.0",
"description": "A React-like user interface micro-library",
"homepage": "http://riotjs.com/",
"repository": "riot/riot",
Expand Down
Loading

0 comments on commit c695119

Please sign in to comment.