Skip to content

Commit b04a376

Browse files
misterfreshmisterfresh
committed
server side rendering fixed
1 parent 92f5f32 commit b04a376

Some content is hidden

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

50 files changed

+1207
-341
lines changed

‎.babelrc‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
{
2-
"presets": ["es2015", "react", "stage-0"]
2+
"presets": ["es2015", "react", "stage-1"],
3+
"plugins": [
4+
"transform-es3-member-expression-literals",
5+
"transform-es3-property-literals"
6+
]
37
}

‎.editorconfig‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
root = true
2+
3+
[*]
4+
insert_final_newline = true
5+
charset = utf-8
6+
indent_style = space
7+
indent_size = 2
8+
trim_trailing_whitespace = true
9+
10+
[*.md]
11+
trim_trailing_whitespace = false

‎.eslintignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
examples/*/node_modules/
2+
examples/*/dist/

‎.eslintrc‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"extends": "rackt",
3+
"rules": {
4+
"react/jsx-uses-react": 1,
5+
"react/jsx-no-undef": 2,
6+
"react/wrap-multilines": 2
7+
},
8+
"plugins": [
9+
"react"
10+
]
11+
}

‎.gitignore‎

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,5 @@
1-
# Logs
2-
logs
3-
*.log
4-
npm-debug.log*
5-
6-
# Runtime data
7-
pids
8-
*.pid
9-
*.seed
10-
11-
# Directory for instrumented libs generated by jscoverage/JSCover
12-
lib-cov
13-
14-
# Coverage directory used by tools like istanbul
15-
coverage
16-
17-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
18-
.grunt
19-
20-
# node-waf configuration
21-
.lock-wscript
22-
23-
# Compiled binary addons (http://nodejs.org/api/addons.html)
24-
build/Release
25-
26-
# Dependency directory
1+
lib
272
node_modules
28-
29-
# Optional npm cache directory
30-
.npm
31-
32-
# Optional REPL history
33-
.node_repl_history
34-
35-
.idea
36-
lib
3+
coverage
4+
*.log
5+
.idea

‎.npmignore‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## [0.0.3](https://github.com/misterfresh/react-easy-transition/compare/v0.0.2...v0.0.3)
2+
3+
- Server rendering now works as expected. [Issue #1](https://github.com/misterfresh/react-easy-transition/issues/1)
4+
- Added optional leaveStyle parameter [PR #1](https://github.com/misterfresh/react-easy-transition/pull/2)
5+
- Bumped dependencies [PR #3](https://github.com/misterfresh/react-easy-transition/pull/3)

‎LICENSE‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
The MIT License (MIT)
1+
Copyright (c) 2015 James Long
22

3-
Copyright (c) 2016 Antoine S
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of
4+
this software and associated documentation files (the "Software"), to deal in
5+
the Software without restriction, including without limitation the rights to
6+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
7+
of the Software, and to permit persons to whom the Software is furnished to do
8+
so, subject to the following conditions:
119

1210
The above copyright notice and this permission notice shall be included in all
1311
copies or substantial portions of the Software.

‎README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Multiple transitions on different properties:
3636
</EasyTransition>
3737
```
3838

39-
Set leave animation transition on different properties:
39+
Optionally set a leaveStyle if it is different than the initialStyle:
4040

4141
```jsx
4242
<EasyTransition
@@ -52,7 +52,7 @@ Set leave animation transition on different properties:
5252

5353
## Live Demo
5454

55-
Live Demo here : http://misterfresh.github.io/react-easy-transition
55+
[Live Demo here](http://misterfresh.github.io/react-easy-transition)
5656

5757
## Why use this
5858

@@ -66,7 +66,9 @@ Live Demo here : http://misterfresh.github.io/react-easy-transition
6666

6767
* The fade-in effect when component mounts is rather straightforward to do with pure CSS transitions. However, the fade-out effect is impossible to do using only CSS because the component disappears immediately when unmounted.
6868
* The new component appears before the end of the fade-out transition of the previous component, so both are shown at the same time, one on top of the other.
69+
* Transition on initial render when rendering on the server
6970

70-
## Example
71+
## Examples
7172

72-
Go to the examples/basic directory to see an example of integration with react-router and redux
73+
* Integration with react-router and redux in examples/basic
74+
* Integration with server-side rendering in examples/server

‎examples/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
node_modules/
22
dist/
33
*.log
4+
.idea

0 commit comments

Comments
 (0)