Skip to content

Commit ff567f9

Browse files
author
Krit
committed
update react to version 15
1 parent 818c08f commit ff567f9

File tree

2 files changed

+5
-83
lines changed

2 files changed

+5
-83
lines changed

.gitignore

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -8,82 +8,4 @@ npm-debug.log
88

99
// vim .swp
1010
*.swp
11-
12-
### Node template
13-
# Logs
14-
logs
15-
*.log
16-
npm-debug.log*
17-
18-
# Runtime data
19-
pids
20-
*.pid
21-
*.seed
22-
23-
# Directory for instrumented libs generated by jscoverage/JSCover
24-
lib-cov
25-
26-
# Coverage directory used by tools like istanbul
27-
coverage
28-
29-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
30-
.grunt
31-
32-
# node-waf configuration
33-
.lock-wscript
34-
35-
# Compiled binary addons (http://nodejs.org/api/addons.html)
36-
build/Release
37-
38-
# Dependency directory
39-
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
40-
node_modules
41-
### JetBrains template
42-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
43-
44-
*.iml
45-
46-
## Directory-based project format:
47-
.idea/
48-
# if you remove the above rule, at least ignore the following:
49-
50-
# User-specific stuff:
51-
# .idea/workspace.xml
52-
# .idea/tasks.xml
53-
# .idea/dictionaries
54-
55-
# Sensitive or high-churn files:
56-
# .idea/dataSources.ids
57-
# .idea/dataSources.xml
58-
# .idea/sqlDataSources.xml
59-
# .idea/dynamic.xml
60-
# .idea/uiDesigner.xml
61-
62-
# Gradle:
63-
# .idea/gradle.xml
64-
# .idea/libraries
65-
66-
# Mongo Explorer plugin:
67-
# .idea/mongoSettings.xml
68-
69-
## File-based project format:
70-
*.ipr
71-
*.iws
72-
73-
## Plugin-specific files:
74-
75-
# IntelliJ
76-
/out/
77-
78-
# mpeltonen/sbt-idea plugin
79-
.idea_modules/
80-
81-
# JIRA plugin
82-
atlassian-ide-plugin.xml
83-
84-
# Crashlytics plugin (for Android Studio and IntelliJ)
85-
com_crashlytics_export_strings.xml
86-
crashlytics.properties
87-
crashlytics-build.properties
88-
8911
.env

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
"node-sass": "~3.4.2",
5454
"parse": "1.6.14",
5555
"prismjs": "~1.2.0",
56-
"react": "^0.14.0",
57-
"react-addons-test-utils": "^0.14.2",
58-
"react-dnd": "~2.0.2",
56+
"react": "^15.0.1",
57+
"react-addons-test-utils": "^15.0.1",
58+
"react-dnd": "~2.1.4",
5959
"react-dnd-html5-backend": "~2.0.0",
60-
"react-dom": "^0.14.0",
61-
"react-router": "2.0.0",
60+
"react-dom": "^15.0.1",
61+
"react-router": "2.3.0",
6262
"sass-loader": "~3.1.2",
6363
"style-loader": "~0.12.3",
6464
"svg-prep": "~1.0.0",

0 commit comments

Comments
 (0)