Merge 49372df into d89828e

uxcore · Jun 21, 2018 · ba02ac4 · ba02ac4
2 parents d89828e + 49372df
commit ba02ac4
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 54 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,5 @@ spm_modules
 dist
 build
 assets/**/*.css
+coverage
+package-lock.json
diff --git a/index.html b/index.html
@@ -7,9 +7,8 @@
 <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/babel-polyfill/dist/polyfill.min.js"></script>
+        <script src="./node_modules/react/umd/react.development.js"></script>
     <script src="./dist/demo.js"></script>
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,52 +1,52 @@
 {
- "name": "uxcore-formatter",
- "version": "0.1.11",
- "description": "a formatter library for uxcore",
- "repository": "https://github.com/uxcore/uxcore-formatter.git",
- "author": "eternalsky",
- "main": "build/index.js",
- "scripts": {
-  "start": "uxcore-tools run start",
-  "server": "uxcore-tools run server",
-  "lint": "uxcore-tools run lint",
-  "build": "uxcore-tools run build",
-  "test": "uxcore-tools run test",
-  "coverage": "uxcore-tools run coverage",
-  "pub": "uxcore-tools run pub",
-  "dep": "uxcore-tools run dep",
-  "tnpm-dep": "uxcore-tools run tnpm-dep",
-  "chrome": "uxcore-tools run chrome",
-  "browsers": "uxcore-tools run browsers",
-  "saucelabs": "uxcore-tools run saucelabs",
-  "update": "uxcore-tools run update",
-  "tnpm-update": "uxcore-tools run tnpm-update"
- },
- "bugs": {
-  "url": "http://github.com/uxcore/uxcore-formatter/issues"
- },
- "keywords": [
-  "react",
-  "react-component",
-  "uxcore-formatter",
-  "Formatter",
-  ""
- ],
- "devDependencies": {
-  "console-polyfill": "^0.2.2",
-  "enzyme": "^3.0.0",
-  "enzyme-adapter-react-15": "^1.0.0",
-  "es5-shim": "^4.5.8",
-  "expect.js": "~0.3.1",
-  "kuma-base": "1.x",
-  "react": "15.x",
-  "react-dom": "15.x",
-  "react-test-renderer": "15.x",
-  "uxcore-kuma": "*",
-  "uxcore-tools": "0.2.x"
- },
- "dependencies": {
-  "big.js": "^5.0.3"
- },
- "contributors": [],
- "license": "MIT"
-}
+  "name": "uxcore-formatter",
+  "version": "0.1.11",
+  "description": "a formatter library for uxcore",
+  "repository": "https://github.com/uxcore/uxcore-formatter.git",
+  "author": "eternalsky",
+  "main": "build/index.js",
+  "scripts": {
+    "start": "uxcore-tools run start",
+    "server": "uxcore-tools run server",
+    "lint": "uxcore-tools run lint",
+    "build": "uxcore-tools run build",
+    "test": "uxcore-tools run test",
+    "coverage": "uxcore-tools run coverage",
+    "pub": "uxcore-tools run pub",
+    "dep": "uxcore-tools run dep",
+    "tnpm-dep": "uxcore-tools run tnpm-dep",
+    "chrome": "uxcore-tools run chrome",
+    "browsers": "uxcore-tools run browsers",
+    "saucelabs": "uxcore-tools run saucelabs",
+    "update": "uxcore-tools run update",
+    "tnpm-update": "uxcore-tools run tnpm-update"
+  },
+  "bugs": {
+    "url": "http://github.com/uxcore/uxcore-formatter/issues"
+  },
+  "keywords": [
+    "react",
+    "react-component",
+    "uxcore-formatter",
+    "Formatter",
+    ""
+  ],
+  "devDependencies": {
+    "babel-polyfill": "6.x",
+    "console-polyfill": "^0.2.2",
+    "enzyme": "^3.0.0",
+    "enzyme-adapter-react-16": "1.x",
+    "expect.js": "~0.3.1",
+    "kuma-base": "1.x",
+    "react": "16.x",
+    "react-dom": "16.x",
+    "react-test-renderer": "16.x",
+    "uxcore-kuma": "*",
+    "uxcore-tools": "^0.3.0"
+  },
+  "dependencies": {
+    "big.js": "^5.0.3"
+  },
+  "contributors": [],
+  "license": "MIT"
+}