Merge f0b5539 into 8797403

uxcore · Jun 21, 2018 · 7af84a8 · 7af84a8
2 parents 8797403 + f0b5539
commit 7af84a8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/index.html b/index.html
@@ -9,10 +9,9 @@
 <body>
     <div id="UXCoreDemo"></div>
     <script src="./node_modules/console-polyfill/index.js"></script>
-    <script src="./node_modules/es5-shim/es5-shim.min.js"></script>
-    <script src="./node_modules/es5-shim/es5-sham.min.js"></script>
-    <script src="./node_modules/react/dist/react-with-addons.js"></script>
-    <script src="./node_modules/react-dom/dist/react-dom.js"></script>
+    <script src="./node_modules/babel-polyfill/dist/polyfill.min.js"></script>
+        <script src="./node_modules/react/umd/react.development.js"></script>
+    <script src="./node_modules/react-dom/umd/react-dom.development.js"></script>
     <script src="./dist/demo.js"></script>
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -34,23 +34,23 @@
  "devDependencies": {
   "console-polyfill": "^0.2.2",
   "enzyme": "^3.0.0",
-  "enzyme-adapter-react-15": "^1.0.0",
-  "es5-shim": "^4.5.8",
+  "enzyme-adapter-react-16": "1.x",
   "expect.js": "~0.3.1",
   "kuma-base": "1.x",
-  "react": "15.x",
-  "react-dom": "15.x",
-  "react-test-renderer": "15.x",
-  "uxcore-button": "~0.3.1",
+  "react": "16.x",
+  "react-dom": "16.x",
+  "react-test-renderer": "16.x",
+  "uxcore-button": "^0.4.18",
   "uxcore-kuma": "*",
-  "uxcore-tools": "0.2.x"
+  "uxcore-tools": "^0.3.0",
+  "babel-polyfill": "6.x"
  },
  "dependencies": {
   "classnames": "^2.1.2",
   "object-assign": "^4.0.0",
-  "prop-types": "15.x",
+  "prop-types": "^15.6.2",
   "uxcore-icon": "^0.1.12"
  },
  "contributors": [],
  "license": "MIT"
-}
+}
diff --git a/src/Alert.jsx b/src/Alert.jsx
@@ -2,7 +2,7 @@
  * Alert Component for uxcore
  * @author eternaslky
  *
- * Copyright 2014-2015, Uxcore Team, Alinw.
+ * Copyright 2014-2018, Uxcore Team, Alinw.
  * All rights reserved.
  */
 

diff --git a/src/Alert.less b/src/Alert.less
@@ -2,7 +2,7 @@
  * Alert Component Style for uxcore
  * @author eternaslky
  *
- * Copyright 2014-2015, Uxcore Team, Alinw.
+ * Copyright 2014-2018, Uxcore Team, Alinw.
  * All rights reserved.
  */
 
@@ -45,7 +45,7 @@
             color: @brand-link;
         }
     }
-    
+
     .message-generator(@base-color, @base-color-light, @saturation-diff,  @value-diff){
         background: @base-color-light;
         .@{alertPrefixCls}-arrow {
@@ -186,12 +186,12 @@
         line-height: 1;
         cursor: pointer;
     }
-    
+
     &-size-large {
         padding: 8px 20px;
         font-size: 14px;
         .@{alertPrefixCls}-icon {
-            font-size: 22px;    
+            font-size: 22px;
         }
         .@{alertPrefixCls}-follow {
             padding-left: 38px;

diff --git a/src/index.js b/src/index.js
@@ -2,7 +2,7 @@
  * Alert Component for uxcore
  * @author eternaslky
  *
- * Copyright 2014-2015, Uxcore Team, Alinw.
+ * Copyright 2014-2018, Uxcore Team, Alinw.
  * All rights reserved.
  */