Merge pull request #43 from stranger26/master

Resolve typo in webpack config & react v15
booleanhunter · Jul 20, 2017 · c680ae4 · c680ae4
2 parents def8c30 + 8e79caf
commit c680ae4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "jquery": "^3.1.1",
     "jsx-loader": "^0.13.2",
     "raphael": "^2.1.4",
-    "react": "^0.14.8",
+    "react": "^15.6.1",
     "react-dom": "^15.4.2",
     "velocity-animate": "^1.4.0",
     "webpack": "^1.14.0",

diff --git a/webpack.config.js b/webpack.config.js
@@ -66,7 +66,7 @@ var config = {
         timeline: './src/pages/timeline-page/js/timeline-page',
         generalUIElements: './src/pages/ui-elements-page/general/js/page-ui-elements',
 
-        vendors: ['react', 'reactDom', 'jquery', 'velocity', 'jqueryUi', 'bootstrap', 'moment', 'bootstrapDatepicker'],
+        vendors: ['react', 'react-dom', 'jquery', 'velocity-animate', 'jqueryUi', 'bootstrap', 'moment', 'bootstrapDatepicker'],
         chartVendors: ['jquery', 'raphael', 'morris', 'jvectormap', 'jvectormapWorld'],
     },