Merge 5f500ca6f4 into e8ba7ece29

1 year ago · 8f46a0b5ca
parent e8ba7ece29 5f500ca6f4
commit 8f46a0b5ca
4 changed files with 6759 additions and 4509 deletions
--- a/.eslintrc
+++ b/.eslintrc
@ -14,6 +14,7 @@
  "rules": {
    "no-param-reassign": 0,
    "no-control-regex": 0,
+    "import/no-cycle": 0,
    "import/prefer-default-export": 0,
    "generator-star-spacing": 0,
    "babel/generator-star-spacing": 0,
--- a/dist/mercury.js
+++ b/dist/mercury.js
--- a/dist/mercury.js.map
+++ b/dist/mercury.js.map
--- a/yarn.lock
+++ b/yarn.lock