resolve conflicts with master

2025-05-12 01:01:32 -04:00 · 2018-11-23 10:54:16 +00:00 · 2018-11-23 10:54:16 +00:00 · 97e5e44723
commit 97e5e44723
parent 0a6d0d1352
11 changed files with 189 additions and 30 deletions
--- a/babel.config.js
+++ b/babel.config.js
@ -0,0 +1,24 @@
+module.exports = function(api) {
+    api.cache.forever();
+
+    return  {
+        "presets": [
+            ["@babel/preset-env", {
+                "targets": {
+                    "chrome": 40,
+                    "firefox": 35,
+                    "edge": 14,
+                    "safari": 11,
+                    "node": "6.5"
+                },
+                "modules": false,
+                "useBuiltIns": "entry"
+            }]
+        ],
+        "plugins": [
+            ["babel-plugin-transform-builtin-extend", {
+                "globals": ["Error"]
+            }]
+        ]
+    };
+};