Browse Source

Replace yo-yo with preact, add babel jsx transforms

Artur Paikin 7 years ago
parent
commit
0c829bcf99
3 changed files with 106 additions and 53 deletions
  1. 2 1
      .babelrc
  2. 100 46
      package-lock.json
  3. 4 6
      package.json

+ 2 - 1
.babelrc

@@ -8,6 +8,7 @@
     "add-module-exports",
     "transform-object-assign",
     "es6-promise",
-    "yo-yoify"
+    ["transform-react-jsx", { "pragma":"preact.h" }]
+    // "yo-yoify"
   ]
 }

+ 100 - 46
package-lock.json

@@ -73,7 +73,8 @@
     "acorn": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz",
-      "integrity": "sha1-xGDfCEkUY/AozLguqzcwvwEIez0="
+      "integrity": "sha1-xGDfCEkUY/AozLguqzcwvwEIez0=",
+      "dev": true
     },
     "acorn-globals": {
       "version": "3.1.0",
@@ -662,6 +663,47 @@
         "trim-right": "1.0.1"
       }
     },
+    "babel-helper-builder-react-jsx": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz",
+      "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.26.0",
+        "babel-types": "6.26.0",
+        "esutils": "2.0.2"
+      },
+      "dependencies": {
+        "babel-runtime": {
+          "version": "6.26.0",
+          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+          "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+          "dev": true,
+          "requires": {
+            "core-js": "2.4.1",
+            "regenerator-runtime": "0.11.1"
+          }
+        },
+        "babel-types": {
+          "version": "6.26.0",
+          "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+          "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+          "dev": true,
+          "requires": {
+            "babel-runtime": "6.26.0",
+            "esutils": "2.0.2",
+            "lodash": "4.17.4",
+            "to-fast-properties": "1.0.3"
+          }
+        },
+        "regenerator-runtime": {
+          "version": "0.11.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+          "dev": true
+        }
+      }
+    },
     "babel-helper-call-delegate": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
@@ -837,6 +879,12 @@
       "integrity": "sha1-r+3IU70/jcNUjqZx++adA8wsF2c=",
       "dev": true
     },
+    "babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=",
+      "dev": true
+    },
     "babel-plugin-transform-es2015-arrow-functions": {
       "version": "6.22.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
@@ -1090,6 +1138,17 @@
         "lodash": "4.17.4"
       }
     },
+    "babel-plugin-transform-react-jsx": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
+      "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
+      "dev": true,
+      "requires": {
+        "babel-helper-builder-react-jsx": "6.26.0",
+        "babel-plugin-syntax-jsx": "6.18.0",
+        "babel-runtime": "6.23.0"
+      }
+    },
     "babel-plugin-transform-regenerator": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz",
@@ -1118,7 +1177,7 @@
         "@f/is-svg": "1.0.0",
         "@f/svg-namespace": "1.0.1",
         "camel-case": "3.0.0",
-        "hyperx": "2.3.0",
+        "hyperx": "2.3.2",
         "is-boolean-attribute": "0.0.1",
         "normalize-html-whitespace": "0.2.0",
         "on-load": "3.2.0",
@@ -1443,16 +1502,6 @@
         "tweetnacl": "0.14.5"
       }
     },
-    "bel": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/bel/-/bel-4.6.0.tgz",
-      "integrity": "sha1-Ot4W4jarIgTY0cZurEvVc3k6yZk=",
-      "requires": {
-        "global": "4.3.2",
-        "hyperx": "2.3.0",
-        "on-load": "3.2.0"
-      }
-    },
     "better-assert": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
@@ -3107,7 +3156,8 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
     },
     "count-lines": {
       "version": "0.1.2",
@@ -3689,7 +3739,8 @@
     "dom-walk": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
-      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg="
+      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=",
+      "dev": true
     },
     "domain-browser": {
       "version": "1.1.7",
@@ -4724,6 +4775,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/falafel/-/falafel-2.1.0.tgz",
       "integrity": "sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=",
+      "dev": true,
       "requires": {
         "acorn": "5.0.3",
         "foreach": "2.0.5",
@@ -4734,7 +4786,8 @@
         "isarray": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
         }
       }
     },
@@ -4965,7 +5018,8 @@
     "foreach": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
     },
     "forever-agent": {
       "version": "0.6.1",
@@ -6128,6 +6182,7 @@
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
       "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
+      "dev": true,
       "requires": {
         "min-document": "2.19.0",
         "process": "0.5.2"
@@ -7121,9 +7176,9 @@
       "integrity": "sha1-glMI1Ju44pV5I/cxmBvMgRytev8="
     },
     "hyperx": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/hyperx/-/hyperx-2.3.0.tgz",
-      "integrity": "sha1-cPRz1m1K1VDd0cg+S+JlEna78eI=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/hyperx/-/hyperx-2.3.2.tgz",
+      "integrity": "sha512-fYFJn0kVMHpkLJKzqGXfs0+p26NH0R3PsLWQGZ5Enbp1jcyEK9U9uJGnsRKPgBCoQ6bVzkV+srwHVFc2+pHfYQ==",
       "requires": {
         "hyperscript-attribute-to-property": "1.0.0"
       }
@@ -7207,7 +7262,8 @@
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
     },
     "ini": {
       "version": "1.3.4",
@@ -9423,6 +9479,7 @@
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
       "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
+      "dev": true,
       "requires": {
         "dom-walk": "0.1.1"
       }
@@ -9631,11 +9688,6 @@
         }
       }
     },
-    "morphdom": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/morphdom/-/morphdom-2.3.2.tgz",
-      "integrity": "sha1-anEAH1XlGPBrQuDh8QhP6vjaICQ="
-    },
     "ms": {
       "version": "0.7.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz",
@@ -9710,11 +9762,6 @@
       "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=",
       "dev": true
     },
-    "nanoraf": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/nanoraf/-/nanoraf-3.0.1.tgz",
-      "integrity": "sha1-q5+5wle5rcxx2CmCy1jY+jUDdko="
-    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -10397,7 +10444,8 @@
     "object-keys": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
-      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
+      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
+      "dev": true
     },
     "object-path": {
       "version": "0.9.2",
@@ -10445,6 +10493,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/on-load/-/on-load-3.2.0.tgz",
       "integrity": "sha1-3TFF06XC+qVmaSDR32dLafDC9m8=",
+      "dev": true,
       "requires": {
         "global": "4.3.2"
       }
@@ -11255,6 +11304,11 @@
         }
       }
     },
+    "preact": {
+      "version": "8.2.7",
+      "resolved": "https://registry.npmjs.org/preact/-/preact-8.2.7.tgz",
+      "integrity": "sha512-m34Ke8U32HyKRVzUOCAcaiIBLR2ye6syiuRclU5DxyixDPDFqdLbIElhERBrF6gDbPKQR+Vpv5bZ9CCbvN6pdQ=="
+    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -11308,12 +11362,14 @@
     "process": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
-      "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8="
+      "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=",
+      "dev": true
     },
     "process-nextick-args": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+      "dev": true
     },
     "progress": {
       "version": "1.1.8",
@@ -11812,6 +11868,7 @@
       "version": "2.2.11",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.11.tgz",
       "integrity": "sha512-h+8+r3MKEhkiVrwdKL8aWs1oc1VvBu33ueshOvS26RsZQ3Amhx/oO3TKe4lApSV9ueY6as8EAh7mtuFjdlhg9Q==",
+      "dev": true,
       "requires": {
         "core-util-is": "1.0.2",
         "inherits": "2.0.3",
@@ -11825,7 +11882,8 @@
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
         }
       }
     },
@@ -13226,6 +13284,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.2.tgz",
       "integrity": "sha1-sp4fThEl+pehA4K4pTNze3SR4Xk=",
+      "dev": true,
       "requires": {
         "safe-buffer": "5.0.1"
       }
@@ -13517,6 +13576,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+      "dev": true,
       "requires": {
         "readable-stream": "2.2.11",
         "xtend": "4.0.1"
@@ -14192,7 +14252,8 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
     },
     "utils-merge": {
       "version": "1.0.0",
@@ -15523,7 +15584,8 @@
     "xtend": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
     },
     "y18n": {
       "version": "3.2.1",
@@ -15595,23 +15657,15 @@
       "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
       "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
     },
-    "yo-yo": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/yo-yo/-/yo-yo-1.4.0.tgz",
-      "integrity": "sha1-wykeUSu0dD+etRS5ttuyZHV+Mlc=",
-      "requires": {
-        "bel": "4.6.0",
-        "morphdom": "2.3.2"
-      }
-    },
     "yo-yoify": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/yo-yoify/-/yo-yoify-3.7.2.tgz",
       "integrity": "sha1-f7snuzbJyJRwSjZpI1XBo1ItdOw=",
+      "dev": true,
       "requires": {
         "acorn": "5.0.3",
         "falafel": "2.1.0",
-        "hyperx": "2.3.0",
+        "hyperx": "2.3.2",
         "on-load": "3.2.0",
         "through2": "2.0.3"
       }

+ 4 - 6
package.json

@@ -54,7 +54,7 @@
     "babel-plugin-es6-promise": "1.0.0",
     "babel-plugin-transform-object-assign": "6.8.0",
     "babel-plugin-transform-proto-to-assign": "6.9.0",
-    "babel-plugin-yo-yoify": "0.6.0",
+    "babel-plugin-transform-react-jsx": "^6.24.1",
     "babel-polyfill": "6.9.1",
     "babel-preset-es2015": "6.24.0",
     "babel-register": "6.9.0",
@@ -105,19 +105,17 @@
     "drag-drop": "2.13.2",
     "es6-promise": "3.2.1",
     "get-form-data": "^1.2.5",
+    "hyperx": "^2.3.2",
     "lodash.throttle": "4.1.1",
     "mime-match": "^1.0.2",
     "namespace-emitter": "^2.0.0",
-    "nanoraf": "3.0.1",
-    "on-load": "3.2.0",
+    "preact": "^8.2.7",
     "prettier-bytes": "1.0.4",
     "prop-types": "^15.5.10",
     "socket.io-client": "2.0.1",
     "tus-js-client": "^1.4.4",
     "url-parse": "1.1.9",
-    "whatwg-fetch": "2.0.3",
-    "yo-yo": "1.4.0",
-    "yo-yoify": "3.7.2"
+    "whatwg-fetch": "2.0.3"
   },
   "scripts": {
     "build:bundle": "node ./bin/build-js.js",