It's a dev package

fixing a deps issue.
Updating based on changes to filedrop element.
2018-11-06 13:50:50 +00:00 · 2018-11-06 13:50:49 +00:00 · 2018-11-06 13:50:49 +00:00 · 2018-11-06 13:50:48 +00:00 · 2018-11-06 13:47:18 +00:00 · 2018-11-06 13:47:18 +00:00
21 changed files with 402 additions and 476 deletions
--- a/codecs/mozjpeg_enc/README.md
+++ b/codecs/mozjpeg_enc/README.md
@@ -39,5 +39,9 @@ struct MozJpegOptions {
  bool trellis_opt_zero;
  bool trellis_opt_table;
  int trellis_loops;
+  bool auto_subsample;
+  int chroma_subsample;
+  bool separate_chroma_quality;
+  int chroma_quality;
 };
 ```
--- a/codecs/mozjpeg_enc/example.html
+++ b/codecs/mozjpeg_enc/example.html
@@ -21,7 +21,7 @@
    console.log('Version:', module.version().toString(16));
    const image = await loadImage('../example.png');
    const result = module.encode(image.data, image.width, image.height, {
-      quality: 40,
+      quality: 75,
      baseline: false,
      arithmetic: false,
      progressive: true,
@@ -29,10 +29,14 @@
      smoothing: 0,
      color_space: 3,
      quant_table: 3,
-      trellis_multipass: true,
-      trellis_opt_zero: true,
-      trellis_opt_table: true,
+      trellis_multipass: false,
+      trellis_opt_zero: false,
+      trellis_opt_table: false,
      trellis_loops: 1,
+      auto_subsample: true,
+      chroma_subsample: 2,
+      separate_chroma_quality: false,
+      chroma_quality: 75,
    });

    const blob = new Blob([result], {type: 'image/jpeg'});
--- a/codecs/mozjpeg_enc/mozjpeg_enc.cpp
+++ b/codecs/mozjpeg_enc/mozjpeg_enc.cpp
@@ -29,6 +29,10 @@ struct MozJpegOptions {
  bool trellis_opt_zero;
  bool trellis_opt_table;
  int trellis_loops;
+  bool auto_subsample;
+  int chroma_subsample;
+  bool separate_chroma_quality;
+  int chroma_quality;
 };

 int version() {
@@ -119,9 +123,6 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio
   */
  jpeg_set_defaults(&cinfo);

-  /* Now you can set any non-default parameters you wish to.
-   * Here we just illustrate the use of quality (quantization table) scaling:
-   */
  jpeg_set_colorspace(&cinfo, (J_COLOR_SPACE) opts.color_space);

  if (opts.quant_table != -1) {
@@ -142,11 +143,23 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio
  jpeg_c_set_bool_param(&cinfo, JBOOLEAN_TRELLIS_Q_OPT, opts.trellis_opt_table);
  jpeg_c_set_int_param(&cinfo, JINT_TRELLIS_NUM_LOOPS, opts.trellis_loops);

+  // A little hacky to build a string for this, but it means we can use set_quality_ratings which
+  // does some useful heuristic stuff.
  std::string quality_str = std::to_string(opts.quality);
+
+  if (opts.separate_chroma_quality && opts.color_space == JCS_YCbCr) {
+    quality_str += "," + std::to_string(opts.chroma_quality);
+  }
+
  char const *pqual = quality_str.c_str();

  set_quality_ratings(&cinfo, (char*) pqual, opts.baseline);

+  if (!opts.auto_subsample && opts.color_space == JCS_YCbCr) {
+    cinfo.comp_info[0].h_samp_factor = opts.chroma_subsample;
+    cinfo.comp_info[0].v_samp_factor = opts.chroma_subsample;
+  }
+
  if (!opts.baseline && opts.progressive) {
    jpeg_simple_progression(&cinfo);
  } else {
@@ -209,6 +222,10 @@ EMSCRIPTEN_BINDINGS(my_module) {
    .field("trellis_opt_zero", &MozJpegOptions::trellis_opt_zero)
    .field("trellis_opt_table", &MozJpegOptions::trellis_opt_table)
    .field("trellis_loops", &MozJpegOptions::trellis_loops)
+    .field("chroma_subsample", &MozJpegOptions::chroma_subsample)
+    .field("auto_subsample", &MozJpegOptions::auto_subsample)
+    .field("separate_chroma_quality", &MozJpegOptions::separate_chroma_quality)
+    .field("chroma_quality", &MozJpegOptions::chroma_quality)
    ;

  function("version", &version);
--- a/codecs/mozjpeg_enc/mozjpeg_enc.js
+++ b/codecs/mozjpeg_enc/mozjpeg_enc.js
--- a/codecs/mozjpeg_enc/mozjpeg_enc.wasm
+++ b/codecs/mozjpeg_enc/mozjpeg_enc.wasm
--- a/package-lock.json
+++ b/package-lock.json
@@ -59,9 +59,9 @@
      "dev": true
    },
    "@types/node": {
-      "version": "9.6.31",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.31.tgz",
-      "integrity": "sha512-kIVlvUBizL51ALNMPbmcZoM7quHyB7J6fLRwQe22JsMp39nrVSHdBeVVS3fnQCK1orxI3O8LScmb8cuiihkAfA==",
+      "version": "9.6.35",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.35.tgz",
+      "integrity": "sha512-h5zvHS8wXHGa+Gcqs9K8vqCgOtqjr0+NqG/DDJmQIX1wpR9HivAfgV8bjcD3mGM4bPfQw5Aneb2Pn8355L83jA==",
      "dev": true
    },
    "@types/pretty-bytes": {
@@ -254,9 +254,9 @@
      }
    },
    "@webcomponents/custom-elements": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@webcomponents/custom-elements/-/custom-elements-1.2.0.tgz",
-      "integrity": "sha512-KegC4y9/xlZNlEcKNtMmKXxNNMMLROzVntX55NfSgMhaXjwNf8EG8ypA2lt20ZQ/LoL0QuGxMZnf3kO5DdQjEQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@webcomponents/custom-elements/-/custom-elements-1.2.1.tgz",
+      "integrity": "sha512-flmTp4rVbBkcUIF3eBO3LNoAaYvleTdhPZKzdzr6iztWLLrxCctcK+7MAQeC3/SPjc3JDdC3jYLMRF4R6C3f9g==",
      "dev": true
    },
    "@xtuc/ieee754": {
@@ -339,9 +339,9 @@
      "dev": true
    },
    "ansi-colors": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.0.5.tgz",
-      "integrity": "sha512-VVjWpkfaphxUBFarydrQ3n26zX5nIK7hcbT3/ielrvwDDyBBjuh2vuSw1P9zkPq0cfqvdw7lkYHnu+OLSfIBsg==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.1.0.tgz",
+      "integrity": "sha512-hTv1qPdi+sVEk3jYsdjox5nQI0C9HTbjKShbCdYLKb1LOfNbb7wsF4d7OEKIZoxIHx02tSp3m94jcPW2EfMjmA==",
      "dev": true
    },
    "ansi-escapes": {
@@ -904,67 +904,67 @@
    },
    "babel-plugin-syntax-async-functions": {
      "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=",
      "dev": true
    },
    "babel-plugin-syntax-async-generators": {
      "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
      "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
      "dev": true
    },
    "babel-plugin-syntax-class-constructor-call": {
      "version": "6.18.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz",
      "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=",
      "dev": true
    },
    "babel-plugin-syntax-class-properties": {
      "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
      "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=",
      "dev": true
    },
    "babel-plugin-syntax-decorators": {
      "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
      "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
      "dev": true
    },
    "babel-plugin-syntax-dynamic-import": {
      "version": "6.18.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=",
      "dev": true
    },
    "babel-plugin-syntax-exponentiation-operator": {
      "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=",
      "dev": true
    },
    "babel-plugin-syntax-export-extensions": {
      "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz",
      "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=",
      "dev": true
    },
    "babel-plugin-syntax-flow": {
      "version": "6.18.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
      "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=",
      "dev": true
    },
    "babel-plugin-syntax-jsx": {
      "version": "6.18.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "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-syntax-object-rest-spread": {
      "version": "6.13.0",
-      "resolved": "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=",
      "dev": true
    },
@@ -1339,9 +1339,9 @@
      }
    },
    "babel-plugin-transform-react-remove-prop-types": {
-      "version": "0.4.15",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.15.tgz",
-      "integrity": "sha512-bFxxYdkZBwTjTgtZEPTLqu9g8Ajz8x8uEP/O1iVuaZIz2RuxJ2gtx0EXDJRonC++KGsgsW/4Hqvk4KViEtE2nw==",
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.19.tgz",
+      "integrity": "sha512-f49NsaohQ1ByY20nUrpc30QFdbeT4ntV4PAL2vSZe6uCB5nqAcqXS/qzU+aI6ZfYhWASx5eIsTFvFrs1B2ffGg==",
      "dev": true
    },
    "babel-plugin-transform-regenerator": {
@@ -1639,7 +1639,6 @@
      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
      "dev": true,
-      "optional": true,
      "requires": {
        "tweetnacl": "^0.14.3"
      }
@@ -1795,7 +1794,7 @@
    },
    "browserify-aes": {
      "version": "1.2.0",
-      "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
      "dev": true,
      "requires": {
@@ -1832,7 +1831,7 @@
    },
    "browserify-rsa": {
      "version": "4.0.1",
-      "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
      "dev": true,
      "requires": {
@@ -1876,7 +1875,7 @@
    },
    "buffer": {
      "version": "4.9.1",
-      "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
      "dev": true,
      "requires": {
@@ -2604,9 +2603,9 @@
      "dev": true
    },
    "copy-webpack-plugin": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz",
-      "integrity": "sha512-zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.5.3.tgz",
+      "integrity": "sha512-VKCiNXQcc8zyznaepXfKpCH2cZD+/j3T3B+gsFY97P7qMlEsj34wr/sI9OCG7QPUUh7gAHVx3q8Q1rdQIDM4bA==",
      "dev": true,
      "requires": {
        "cacache": "^10.0.4",
@@ -2672,7 +2671,7 @@
    },
    "create-hash": {
      "version": "1.2.0",
-      "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
      "dev": true,
      "requires": {
@@ -2685,7 +2684,7 @@
    },
    "create-hmac": {
      "version": "1.1.7",
-      "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
      "dev": true,
      "requires": {
@@ -3139,7 +3138,7 @@
    },
    "diffie-hellman": {
      "version": "5.0.3",
-      "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
      "dev": true,
      "requires": {
@@ -3209,7 +3208,7 @@
    },
    "dom-converter": {
      "version": "0.1.4",
-      "resolved": "http://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz",
      "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=",
      "dev": true,
      "requires": {
@@ -3275,7 +3274,7 @@
    },
    "duplexer": {
      "version": "0.1.1",
-      "resolved": "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
      "dev": true
    },
@@ -3286,9 +3285,9 @@
      "dev": true
    },
    "duplexify": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz",
-      "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.1.tgz",
+      "integrity": "sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==",
      "dev": true,
      "requires": {
        "end-of-stream": "^1.0.0",
@@ -3302,7 +3301,6 @@
      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
      "dev": true,
-      "optional": true,
      "requires": {
        "jsbn": "~0.1.0",
        "safer-buffer": "^2.1.0"
@@ -3687,7 +3685,7 @@
    },
    "express": {
      "version": "4.16.3",
-      "resolved": "http://registry.npmjs.org/express/-/express-4.16.3.tgz",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
      "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
      "dev": true,
      "requires": {
@@ -3766,7 +3764,7 @@
    },
    "external-editor": {
      "version": "2.2.0",
-      "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
      "dev": true,
      "requires": {
@@ -3896,6 +3894,12 @@
        "escape-string-regexp": "^1.0.5"
      }
    },
+    "file-drop-element": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/file-drop-element/-/file-drop-element-0.0.7.tgz",
+      "integrity": "sha512-xqmRrLEc7hJP8bSRgCaC3PPTSlFpaqQH1vpCtmrDdFaHKFZzcVV3HbHmOIRrlXVoftyns9uwv7WziJDEHapOng==",
+      "dev": true
+    },
    "file-loader": {
      "version": "1.1.11",
      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz",
@@ -4014,9 +4018,9 @@
      }
    },
    "follow-redirects": {
-      "version": "1.5.8",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.8.tgz",
-      "integrity": "sha512-sy1mXPmv7kLAMKW/8XofG7o9T+6gAjzdZK4AJF6ryqQYUa/hnzgiypoeUecZ53x7XiqKNEpNqLtS97MshW2nxg==",
+      "version": "1.5.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.9.tgz",
+      "integrity": "sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==",
      "dev": true,
      "requires": {
        "debug": "=3.1.0"
@@ -4829,13 +4833,13 @@
      "dependencies": {
        "minimist": {
          "version": "0.1.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz",
          "integrity": "sha1-md9lelJXTCHJBXSX33QnkLK0wN4=",
          "dev": true
        },
        "yargs": {
          "version": "1.2.6",
-          "resolved": "http://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz",
          "integrity": "sha1-nHtKgv1dWVsr8Xq23MQxNUMv40s=",
          "dev": true,
          "requires": {
@@ -5025,12 +5029,12 @@
      "dev": true
    },
    "har-validator": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
-      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz",
+      "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==",
      "dev": true,
      "requires": {
-        "ajv": "^5.1.0",
+        "ajv": "^5.3.0",
        "har-schema": "^2.0.0"
      },
      "dependencies": {
@@ -5252,7 +5256,7 @@
    },
    "html-webpack-plugin": {
      "version": "3.2.0",
-      "resolved": "http://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
      "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
      "dev": true,
      "requires": {
@@ -5308,7 +5312,7 @@
        },
        "readable-stream": {
          "version": "1.0.34",
-          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
          "dev": true,
          "requires": {
@@ -5340,7 +5344,7 @@
    },
    "http-errors": {
      "version": "1.6.3",
-      "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
      "dev": true,
      "requires": {
@@ -5369,7 +5373,7 @@
    },
    "http-proxy-middleware": {
      "version": "0.18.0",
-      "resolved": "http://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz",
      "integrity": "sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==",
      "dev": true,
      "requires": {
@@ -5397,9 +5401,9 @@
      "dev": true
    },
    "husky": {
-      "version": "1.0.0-rc.14",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-1.0.0-rc.14.tgz",
-      "integrity": "sha512-lxdl0+FrKhRXvhOW978oCHCiaXQAtwoR0hdaPY1CwKd+dgbtktepEvk/3DXwQ7L1YriuG/9HDc4AHlzQ0T6cNw==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-1.1.2.tgz",
+      "integrity": "sha512-9TdkUpBeEOjz0AnFdUN4i3w8kEbOsVs9/WSeJqWLq2OO6bcKQhVW64Zi+pVd/AMRLpN3QTINb6ZXiELczvdmqQ==",
      "dev": true,
      "requires": {
        "cosmiconfig": "^5.0.6",
@@ -5643,7 +5647,7 @@
    },
    "inquirer": {
      "version": "5.2.0",
-      "resolved": "http://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
      "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
      "dev": true,
      "requires": {
@@ -5844,7 +5848,7 @@
    },
    "is-builtin-module": {
      "version": "1.0.0",
-      "resolved": "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
      "dev": true,
      "requires": {
@@ -6220,8 +6224,7 @@
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true,
-      "optional": true
+      "dev": true
    },
    "jscodeshift": {
      "version": "0.5.1",
@@ -6565,7 +6568,7 @@
        },
        "onetime": {
          "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
          "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
          "dev": true
        },
@@ -6583,7 +6586,7 @@
    },
    "load-json-file": {
      "version": "1.1.0",
-      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
      "dev": true,
      "requires": {
@@ -6612,9 +6615,9 @@
      }
    },
    "loader-runner": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz",
-      "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.1.tgz",
+      "integrity": "sha512-By6ZFY7ETWOc9RFaAIb23IjJVcM4dvJC/N57nmdz9RSkMXvAXGI7SyVlAw3v8vjtDRlqThgVDVmTnr9fqMlxkw==",
      "dev": true
    },
    "loader-utils": {
@@ -6765,7 +6768,7 @@
        },
        "onetime": {
          "version": "1.1.0",
-          "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
          "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
          "dev": true
        },
@@ -6892,13 +6895,14 @@
      "dev": true
    },
    "md5.js": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
-      "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=",
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
      "dev": true,
      "requires": {
        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
      }
    },
    "media-typer": {
@@ -7010,7 +7014,7 @@
      "dependencies": {
        "minimist": {
          "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
          "dev": true
        }
@@ -7100,7 +7104,7 @@
    },
    "mini-css-extract-plugin": {
      "version": "0.3.0",
-      "resolved": "http://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.3.0.tgz",
      "integrity": "sha512-xWifHy3fqq0HZeEZ0WTi22tek85YQqNFlGxtvSXJXBi1O6XgqKMyK6fsupSBaaIsyBdfpr9QsG93hrWu13pruQ==",
      "dev": true,
      "requires": {
@@ -7131,7 +7135,7 @@
    },
    "minimist": {
      "version": "0.0.8",
-      "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
      "dev": true
    },
@@ -7194,7 +7198,7 @@
    },
    "mkdirp": {
      "version": "0.5.1",
-      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
      "dev": true,
      "requires": {
@@ -7256,9 +7260,9 @@
      "dev": true
    },
    "nan": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
-      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
+      "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
      "dev": true
    },
    "nanomatch": {
@@ -7387,9 +7391,9 @@
      }
    },
    "node-sass": {
-      "version": "4.9.3",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.3.tgz",
-      "integrity": "sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==",
+      "version": "4.9.4",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.4.tgz",
+      "integrity": "sha512-MXyurANsUoE4/6KmfMkwGcBzAnJQ5xJBGW7Ei6ea8KnUKuzHr/SguVBIi3uaUAHtZCPUYkvlJ3Ef5T5VAwVpaA==",
      "dev": true,
      "requires": {
        "async-foreach": "^0.1.3",
@@ -7407,7 +7411,7 @@
        "nan": "^2.10.0",
        "node-gyp": "^3.8.0",
        "npmlog": "^4.0.0",
-        "request": "2.87.0",
+        "request": "^2.88.0",
        "sass-graph": "^2.2.4",
        "stdout-stream": "^1.4.0",
        "true-case-path": "^1.0.2"
@@ -7449,7 +7453,7 @@
        },
        "chalk": {
          "version": "0.4.0",
-          "resolved": "http://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
          "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
          "dev": true,
          "requires": {
@@ -7570,9 +7574,9 @@
      "dev": true
    },
    "oauth-sign": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
      "dev": true
    },
    "object-assign": {
@@ -7725,9 +7729,9 @@
      "dev": true
    },
    "opn": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
-      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
+      "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
      "dev": true,
      "requires": {
        "is-wsl": "^1.1.0"
@@ -7791,7 +7795,7 @@
    },
    "p-cancelable": {
      "version": "0.4.1",
-      "resolved": "http://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz",
      "integrity": "sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==",
      "dev": true
    },
@@ -7901,7 +7905,7 @@
    },
    "parse-asn1": {
      "version": "5.1.1",
-      "resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
      "dev": true,
      "requires": {
@@ -8028,7 +8032,7 @@
    },
    "pause-stream": {
      "version": "0.0.11",
-      "resolved": "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
      "dev": true,
      "requires": {
@@ -8036,9 +8040,9 @@
      }
    },
    "pbkdf2": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
-      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
      "dev": true,
      "requires": {
        "create-hash": "^1.1.2",
@@ -8803,17 +8807,24 @@
      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
      "dev": true
    },
+    "psl": {
+      "version": "1.1.29",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
+      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==",
+      "dev": true
+    },
    "public-encrypt": {
-      "version": "4.0.2",
-      "resolved": "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
-      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
      "dev": true,
      "requires": {
        "bn.js": "^4.1.0",
        "browserify-rsa": "^4.0.0",
        "create-hash": "^1.1.0",
        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1"
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
      }
    },
    "pump": {
@@ -8878,9 +8889,9 @@
      "dev": true
    },
    "querystringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.0.0.tgz",
-      "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
+      "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
      "dev": true
    },
    "randomatic": {
@@ -9293,31 +9304,31 @@
      "dev": true
    },
    "request": {
-      "version": "2.87.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
-      "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
      "dev": true,
      "requires": {
        "aws-sign2": "~0.7.0",
-        "aws4": "^1.6.0",
+        "aws4": "^1.8.0",
        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.5",
-        "extend": "~3.0.1",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.1",
-        "har-validator": "~5.0.3",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
        "http-signature": "~1.2.0",
        "is-typedarray": "~1.0.0",
        "isstream": "~0.1.2",
        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.17",
-        "oauth-sign": "~0.8.2",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
        "performance-now": "^2.1.0",
-        "qs": "~6.5.1",
-        "safe-buffer": "^5.1.1",
-        "tough-cookie": "~2.3.3",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.1.0"
+        "uuid": "^3.3.2"
      }
    },
    "require-directory": {
@@ -9578,9 +9589,9 @@
      "dev": true
    },
    "selfsigned": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.3.tgz",
-      "integrity": "sha512-vmZenZ+8Al3NLHkWnhBQ0x6BkML1eCP2xEi3JE+f3D9wW9fipD9NNJHYtE9XJM4TsPaHGZJIamrSI6MTg1dU2Q==",
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz",
+      "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==",
      "dev": true,
      "requires": {
        "node-forge": "0.7.5"
@@ -9695,7 +9706,7 @@
    },
    "sha.js": {
      "version": "2.4.11",
-      "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
      "dev": true,
      "requires": {
@@ -10071,9 +10082,9 @@
      "dev": true
    },
    "sshpk": {
-      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
-      "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.1.tgz",
+      "integrity": "sha512-mSdgNUaidk+dRU5MhYtN9zebdzF2iG0cNPWy8HG+W8y+fT1JnSkh0fzzpjOa0L7P8i1Rscz38t0h4gPcKz43xA==",
      "dev": true,
      "requires": {
        "asn1": "~0.2.3",
@@ -10330,7 +10341,7 @@
      "dependencies": {
        "rimraf": {
          "version": "2.2.8",
-          "resolved": "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
          "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=",
          "dev": true
        }
@@ -10350,7 +10361,7 @@
    },
    "through": {
      "version": "2.3.8",
-      "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
      "dev": true
    },
@@ -10455,11 +10466,12 @@
      "dev": true
    },
    "tough-cookie": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
-      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
      "dev": true,
      "requires": {
+        "psl": "^1.1.24",
        "punycode": "^1.4.1"
      },
      "dependencies": {
@@ -10756,8 +10768,7 @@
      "version": "0.14.5",
      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true,
-      "optional": true
+      "dev": true
    },
    "type-is": {
      "version": "1.6.16",
@@ -10924,18 +10935,18 @@
      "dev": true
    },
    "unique-filename": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz",
-      "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
      "dev": true,
      "requires": {
        "unique-slug": "^2.0.0"
      }
    },
    "unique-slug": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz",
-      "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz",
+      "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==",
      "dev": true,
      "requires": {
        "imurmurhash": "^0.1.4"
@@ -11038,12 +11049,6 @@
        }
      }
    },
-    "url-join": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz",
-      "integrity": "sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo=",
-      "dev": true
-    },
    "url-parse": {
      "version": "1.4.3",
      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.3.tgz",
@@ -11689,17 +11694,14 @@
      }
    },
    "webpack-dev-middleware": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.2.0.tgz",
-      "integrity": "sha512-YJLMF/96TpKXaEQwaLEo+Z4NDK8aV133ROF6xp9pe3gQoS7sxfpXh4Rv9eC+8vCvWfmDjRQaMSlRPbO+9G6jgA==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz",
+      "integrity": "sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==",
      "dev": true,
      "requires": {
-        "loud-rejection": "^1.6.0",
        "memory-fs": "~0.4.1",
        "mime": "^2.3.1",
-        "path-is-absolute": "^1.0.0",
        "range-parser": "^1.0.3",
-        "url-join": "^4.0.0",
        "webpack-log": "^2.0.0"
      },
      "dependencies": {
@@ -11712,9 +11714,9 @@
      }
    },
    "webpack-dev-server": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.8.tgz",
-      "integrity": "sha512-c+tcJtDqnPdxCAzEEZKdIPmg3i5i7cAHe+B+0xFNK0BlCc2HF/unYccbU7xTgfGc5xxhCztCQzFmsqim+KhI+A==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.1.9.tgz",
+      "integrity": "sha512-fqPkuNalLuc/hRC2QMkVYJkgNmRvxZQo7ykA2e1XRg/tMJm3qY7ZaD6d89/Fqjxtj9bOrn5wZzLD2n84lJdvWg==",
      "dev": true,
      "requires": {
        "ansi-html": "0.0.7",
@@ -11742,7 +11744,7 @@
        "spdy": "^3.4.1",
        "strip-ansi": "^3.0.0",
        "supports-color": "^5.1.0",
-        "webpack-dev-middleware": "3.2.0",
+        "webpack-dev-middleware": "3.4.0",
        "webpack-log": "^2.0.0",
        "yargs": "12.0.2"
      },
@@ -11795,9 +11797,9 @@
          }
        },
        "debug": {
-          "version": "3.2.5",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz",
-          "integrity": "sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
          "dev": true,
          "requires": {
            "ms": "^2.1.1"
@@ -12122,7 +12124,7 @@
    },
    "wrap-ansi": {
      "version": "2.1.0",
-      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
      "dev": true,
      "requires": {
@@ -12518,7 +12520,7 @@
        },
        "minimist": {
          "version": "1.2.0",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
          "dev": true
        },
--- a/package.json
+++ b/package.json
@@ -15,10 +15,10 @@
    }
  },
  "devDependencies": {
-    "@types/node": "^9.6.23",
+    "@types/node": "^9.6.35",
    "@types/pretty-bytes": "^5.1.0",
    "@types/webassembly-js-api": "0.0.1",
-    "@webcomponents/custom-elements": "^1.2.0",
+    "@webcomponents/custom-elements": "^1.2.1",
    "babel-loader": "^7.1.5",
    "babel-plugin-jsx-pragmatic": "^1.0.2",
    "babel-plugin-syntax-dynamic-import": "^6.18.0",
@@ -27,20 +27,20 @@
    "babel-plugin-transform-object-rest-spread": "^6.26.0",
    "babel-plugin-transform-react-constant-elements": "^6.23.0",
    "babel-plugin-transform-react-jsx": "^6.24.1",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.14",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.19",
    "babel-preset-env": "^1.7.0",
    "babel-register": "^6.26.0",
    "clean-webpack-plugin": "^0.1.19",
-    "copy-webpack-plugin": "^4.5.2",
+    "copy-webpack-plugin": "^4.5.3",
    "css-loader": "^0.28.11",
    "exports-loader": "^0.7.0",
    "file-loader": "^1.1.11",
    "html-webpack-plugin": "^3.2.0",
-    "husky": "^1.0.0-rc.13",
+    "husky": "^1.1.2",
    "if-env": "^1.0.4",
    "loader-utils": "^1.1.0",
    "mini-css-extract-plugin": "^0.3.0",
-    "node-sass": "^4.9.3",
+    "node-sass": "^4.9.4",
    "optimize-css-assets-webpack-plugin": "^4.0.3",
    "progress-bar-webpack-plugin": "^1.11.0",
    "raw-loader": "^0.5.1",
@@ -55,7 +55,7 @@
    "tslint-react": "^3.6.0",
    "typescript": "^2.9.2",
    "typings-for-css-modules-loader": "^1.7.0",
-    "webpack": "^4.19.1",
+    "webpack": "=4.19.1",
    "webpack-bundle-analyzer": "^2.13.1",
    "webpack-cli": "^2.1.5",
    "webpack-dev-server": "^3.1.5",
@@ -65,6 +65,7 @@
    "linkstate": "^1.1.1",
    "preact": "^8.3.1",
    "pretty-bytes": "^5.1.0",
-    "worker-plugin": "^1.1.1"
+    "worker-plugin": "^1.1.1",
+    "file-drop-element": "0.0.7"
  }
 }
--- a/src/codecs/mozjpeg/encoder-meta.ts
+++ b/src/codecs/mozjpeg/encoder-meta.ts
@@ -17,6 +17,10 @@ export interface EncodeOptions {
  trellis_opt_zero: boolean;
  trellis_opt_table: boolean;
  trellis_loops: number;
+  auto_subsample: boolean;
+  chroma_subsample: number;
+  separate_chroma_quality: boolean;
+  chroma_quality: number;
 }

 export interface EncoderState { type: typeof type; options: EncodeOptions; }
@@ -38,4 +42,8 @@ export const defaultOptions: EncodeOptions = {
  trellis_opt_zero: false,
  trellis_opt_table: false,
  trellis_loops: 1,
+  auto_subsample: true,
+  chroma_subsample: 2,
+  separate_chroma_quality: false,
+  chroma_quality: 75,
 };
--- a/src/codecs/mozjpeg/options.tsx
+++ b/src/codecs/mozjpeg/options.tsx
@@ -39,8 +39,13 @@ export default class MozJPEGEncoderOptions extends Component<Props, State> {
      trellis_multipass: inputFieldChecked(form.trellis_multipass, options.trellis_multipass),
      trellis_opt_zero: inputFieldChecked(form.trellis_opt_zero, options.trellis_opt_zero),
      trellis_opt_table: inputFieldChecked(form.trellis_opt_table, options.trellis_opt_table),
+      auto_subsample: inputFieldChecked(form.auto_subsample, options.auto_subsample),
+      separate_chroma_quality:
+        inputFieldChecked(form.separate_chroma_quality, options.separate_chroma_quality),
      // .value
      quality: inputFieldValueAsNumber(form.quality, options.quality),
+      chroma_quality: inputFieldValueAsNumber(form.chroma_quality, options.chroma_quality),
+      chroma_subsample: inputFieldValueAsNumber(form.chroma_subsample, options.chroma_subsample),
      smoothing: inputFieldValueAsNumber(form.smoothing, options.smoothing),
      color_space: inputFieldValueAsNumber(form.color_space, options.color_space),
      quant_table: inputFieldValueAsNumber(form.quant_table, options.quant_table),
@@ -75,6 +80,72 @@ export default class MozJPEGEncoderOptions extends Component<Props, State> {
        <Expander>
          {showAdvanced ?
            <div>
+              <label class={style.optionTextFirst}>
+                Channels:
+                <Select
+                  name="color_space"
+                  value={options.color_space}
+                  onChange={this.onChange}
+                >
+                  <option value={MozJpegColorSpace.GRAYSCALE}>Grayscale</option>
+                  <option value={MozJpegColorSpace.RGB}>RGB</option>
+                  <option value={MozJpegColorSpace.YCbCr}>YCbCr</option>
+                </Select>
+              </label>
+              <Expander>
+                {options.color_space === MozJpegColorSpace.YCbCr ?
+                  <div>
+                    <label class={style.optionInputFirst}>
+                      <Checkbox
+                        name="auto_subsample"
+                        checked={options.auto_subsample}
+                        onChange={this.onChange}
+                      />
+                      Auto subsample chroma
+                    </label>
+                    <Expander>
+                      {options.auto_subsample ? null :
+                        <div class={style.optionOneCell}>
+                          <Range
+                            name="chroma_subsample"
+                            min="1"
+                            max="4"
+                            value={options.chroma_subsample}
+                            onInput={this.onChange}
+                          >
+                            Subsample chroma by:
+                          </Range>
+                        </div>
+                      }
+                    </Expander>
+                    <label class={style.optionInputFirst}>
+                      <Checkbox
+                        name="separate_chroma_quality"
+                        checked={options.separate_chroma_quality}
+                        onChange={this.onChange}
+                      />
+                      Separate chroma quality
+                    </label>
+                    <Expander>
+                      {options.separate_chroma_quality ?
+                        <div class={style.optionOneCell}>
+                          <Range
+                            name="chroma_quality"
+                            min="0"
+                            max="100"
+                            value={options.chroma_quality}
+                            onInput={this.onChange}
+                          >
+                            Chroma quality:
+                          </Range>
+                        </div>
+                        : null
+                      }
+                    </Expander>
+                  </div>
+                  : null
+                }
+              </Expander>
              <label class={style.optionInputFirst}>
                <Checkbox
                  name="baseline"
@@ -119,18 +190,6 @@ export default class MozJPEGEncoderOptions extends Component<Props, State> {
                  Smoothing:
                </Range>
              </div>
-              <label class={style.optionTextFirst}>
-                Channels:
-                <Select
-                  name="color_space"
-                  value={options.color_space}
-                  onChange={this.onChange}
-                >
-                  <option value={MozJpegColorSpace.GRAYSCALE}>Grayscale</option>
-                  <option value={MozJpegColorSpace.RGB}>RGB</option>
-                  <option value={MozJpegColorSpace.YCbCr}>YCbCr</option>
-                </Select>
-              </label>
              <label class={style.optionTextFirst}>
                Quantization:
                <Select
--- a/src/codecs/webp/options.tsx
+++ b/src/codecs/webp/options.tsx
@@ -26,8 +26,10 @@ const losslessPresets:[number, number][] = [
 ];
 const losslessPresetDefault = 6;

-function determineLosslessQuality(quality: number): number {
-  const index = losslessPresets.findIndex(item => item[1] === quality);
+function determineLosslessQuality(quality: number, method: number): number {
+  const index = losslessPresets.findIndex(
+    ([presetMethod, presetQuality]) => presetMethod === method && presetQuality === quality,
+  );
  if (index !== -1) return index;
  // Quality doesn't match one of the presets.
  // This can happen when toggling 'lossless'.
@@ -45,7 +47,7 @@ export default class WebPEncoderOptions extends Component<Props, State> {
    const lossless = inputFieldCheckedAsNumber(form.lossless);
    const { options } = this.props;
    const losslessPresetValue = inputFieldValueAsNumber(
-      form.lossless_preset, determineLosslessQuality(options.quality),
+      form.lossless_preset, determineLosslessQuality(options.quality, options.method),
    );

    const newOptions: EncodeOptions = {
@@ -97,7 +99,7 @@ export default class WebPEncoderOptions extends Component<Props, State> {
            name="lossless_preset"
            min="0"
            max="9"
-            value={determineLosslessQuality(options.quality)}
+            value={determineLosslessQuality(options.quality, options.method)}
            onInput={this.onChange}
          >
            Effort:
--- a/src/components/App/custom-els/FileDrop/index.ts
+++ b/src/components/App/custom-els/FileDrop/index.ts
@@ -1,153 +0,0 @@
-import { bind } from '../../../../lib/initial-util';
-import './styles.css';
-
-// tslint:disable-next-line:max-line-length
-function firstMatchingItem(list: DataTransferItemList, acceptVal: string): DataTransferItem | undefined {
-  // Split accepts values by ',' then by '/'. Trim everything & lowercase.
-  const accepts = acceptVal.toLowerCase().split(',').map((accept) => {
-    return accept.trim().split('/').map(part => part.trim());
-  }).filter(acceptParts => acceptParts.length === 2); // Filter invalid values
-
-  return Array.from(list).find((item) => {
-    if (item.kind !== 'file') return false;
-
-    // 'Parse' the type.
-    const [typeMain, typeSub] = item.type.toLowerCase().split('/').map(s => s.trim());
-
-    for (const [acceptMain, acceptSub] of accepts) {
-      // Look for an exact match, or a partial match if * is accepted, eg image/*.
-      if (typeMain === acceptMain && (acceptSub === '*' || typeSub === acceptSub)) {
-        return true;
-      }
-    }
-    return false;
-  });
-}
-
-function getFileData(data: DataTransfer, accept: string): File | undefined {
-  const dragDataItem = firstMatchingItem(data.items, accept);
-  if (!dragDataItem) return;
-
-  return dragDataItem.getAsFile() || undefined;
-}
-
-interface FileDropEventInit extends EventInit {
-  action: FileDropAccept;
-  file: File;
-}
-
-type FileDropAccept = 'drop' | 'paste';
-
-// Safari and Edge don't quite support extending Event, this works around it.
-function fixExtendedEvent(instance: Event, type: Function) {
-  if (!(instance instanceof type)) {
-    Object.setPrototypeOf(instance, type.prototype);
-  }
-}
-
-export class FileDropEvent extends Event {
-  private _action: FileDropAccept;
-  private _file: File;
-  constructor(typeArg: string, eventInitDict: FileDropEventInit) {
-    super(typeArg, eventInitDict);
-    fixExtendedEvent(this, FileDropEvent);
-    this._file = eventInitDict.file;
-    this._action = eventInitDict.action;
-  }
-
-  get action() {
-    return this._action;
-  }
-
-  get file() {
-    return this._file;
-  }
-}
-
-/*
-  Example Usage.
-  <file-drop
-    accept='image/*'
-    class='drop-valid|drop-invalid'
-  >
-   [everything in here is a drop target.]
-  </file-drop>
-
-  dropElement.addEventListner('dropfile', (event) => console.log(event.detail))
-*/
-export class FileDrop extends HTMLElement {
-
-  private _dragEnterCount = 0;
-
-  constructor() {
-    super();
-    this.addEventListener('dragover', event => event.preventDefault());
-    this.addEventListener('drop', this._onDrop);
-    this.addEventListener('dragenter', this._onDragEnter);
-    this.addEventListener('dragend', () => this._reset());
-    this.addEventListener('dragleave', this._onDragLeave);
-    this.addEventListener('paste', this._onPaste);
-  }
-
-  get accept() {
-    return this.getAttribute('accept') || '';
-  }
-
-  set accept(val: string) {
-    this.setAttribute('accept', val);
-  }
-
-  @bind
-  private _onDragEnter(event: DragEvent) {
-    this._dragEnterCount += 1;
-    if (this._dragEnterCount > 1) return;
-
-    // We don't have data, attempt to get it and if it matches, set the correct state.
-    const validDrop: boolean = event.dataTransfer.items.length ?
-      !!firstMatchingItem(event.dataTransfer.items, this.accept) :
-      // Safari doesn't give file information on drag enter, so the best we can do is return valid.
-      true;
-
-    if (validDrop) {
-      this.classList.add('drop-valid');
-    } else {
-      this.classList.add('drop-invalid');
-    }
-  }
-
-  @bind
-  private _onDragLeave() {
-    this._dragEnterCount -= 1;
-    if (this._dragEnterCount === 0) {
-      this._reset();
-    }
-  }
-
-  @bind
-  private _onDrop(event: DragEvent) {
-    event.preventDefault();
-    this._reset();
-    const action = 'drop';
-    const file = getFileData(event.dataTransfer, this.accept);
-    if (file === undefined) return;
-
-    this.dispatchEvent(new FileDropEvent('filedrop', { action, file }));
-  }
-
-  @bind
-  private _onPaste(event: ClipboardEvent) {
-    const action = 'paste';
-    const file = getFileData(event.clipboardData, this.accept);
-    if (file === undefined) return;
-
-    this.dispatchEvent(new FileDropEvent('filedrop', { action, file }));
-  }
-
-  private _reset() {
-    this._dragEnterCount = 0;
-    this.classList.remove('drop-valid');
-    this.classList.remove('drop-invalid');
-  }
-}
-
-customElements.define('file-drop', FileDrop);
--- a/src/components/App/custom-els/FileDrop/missing-types.d.ts
+++ b/src/components/App/custom-els/FileDrop/missing-types.d.ts
@@ -1,19 +0,0 @@
-import { FileDropEvent, FileDrop } from '.';
-
-declare global {
-
-  interface HTMLElementEventMap {
-    'filedrop': FileDropEvent;
-  }
-
-  namespace JSX {
-    interface IntrinsicElements {
-      'file-drop': FileDropAttributes;
-    }
-
-    interface FileDropAttributes extends HTMLAttributes {
-      accept?: string;
-      onfiledrop?: ((this: FileDrop, ev: FileDropEvent) => any) | null;
-    }
-  }
-}
--- a/src/components/App/custom-els/FileDrop/styles.css
+++ b/src/components/App/custom-els/FileDrop/styles.css
@@ -1,3 +0,0 @@
-file-drop {
-  display: block;
-}
--- a/src/components/App/index.tsx
+++ b/src/components/App/index.tsx
@@ -2,9 +2,9 @@ import { h, Component } from 'preact';

 import { bind, linkRef, Fileish } from '../../lib/initial-util';
 import * as style from './style.scss';
-import { FileDropEvent } from './custom-els/FileDrop';
-import './custom-els/FileDrop';
-import SnackBarElement from '../../lib/SnackBar';
+import { FileDropEvent } from 'file-drop-element';
+import 'file-drop-element';
+import SnackBarElement, { SnackOptions } from '../../lib/SnackBar';
 import '../../lib/SnackBar';
 import Intro from '../intro';
 import '../custom-els/LoadingSpinner';
@@ -39,7 +39,7 @@ export default class App extends Component<Props, State> {
    import('../compress').then((module) => {
      this.setState({ Compress: module.default });
    }).catch(() => {
-      this.showError('Failed to load app');
+      this.showSnack('Failed to load app');
    });

    // In development, persist application state across hot reloads:
@@ -66,9 +66,9 @@ export default class App extends Component<Props, State> {
  }

  @bind
-  private showError(error: string) {
+  private showSnack(message: string, options: SnackOptions = {}): Promise<string> {
    if (!this.snackbar) throw Error('Snackbar missing');
-    this.snackbar.showSnackbar({ message: error });
+    return this.snackbar.showSnackbar(message, options);
  }

  render({}: Props, { file, Compress }: State) {
@@ -76,9 +76,9 @@ export default class App extends Component<Props, State> {
      <div id="app" class={style.app}>
        <file-drop accept="image/*" onfiledrop={this.onFileDrop} class={style.drop}>
          {(!file)
-            ? <Intro onFile={this.onIntroPickFile} onError={this.showError} />
+            ? <Intro onFile={this.onIntroPickFile} showSnack={this.showSnack} />
            : (Compress)
-              ? <Compress file={file} onError={this.showError} />
+              ? <Compress file={file} showSnack={this.showSnack} />
              : <loading-spinner class={style.appLoader}/>
          }
          <snack-bar ref={linkRef(this, 'snackbar')} />
--- a/src/components/Output/style.scss
+++ b/src/components/Output/style.scss
@@ -129,4 +129,8 @@

 .output-canvas {
  flex-shrink: 0;
+  // This fixes a severe painting bug in Chrome.
+  // We should try to remove this once the issue is fixed.
+  // https://bugs.chromium.org/p/chromium/issues/detail?id=870222#c10
+  will-change: auto;
 }
--- a/src/components/compress/index.tsx
+++ b/src/components/compress/index.tsx
@@ -35,6 +35,7 @@ import { VectorResizeOptions, BitmapResizeOptions } from '../../codecs/resize/pr
 import './custom-els/MultiPanel';
 import Results from '../results';
 import { ExpandIcon, CopyAcrossIconProps } from '../../lib/icons';
+import SnackBarElement from 'src/lib/SnackBar';

 export interface SourceImage {
  file: File | Fileish;
@@ -58,7 +59,7 @@ interface EncodedImage {

 interface Props {
  file: File | Fileish;
-  onError: (msg: string) => void;
+  showSnack: SnackBarElement['showSnackbar'];
 }

 interface State {
@@ -250,12 +251,24 @@ export default class Compress extends Component<Props, State> {
    }
  }

-  private onCopyToOtherClick(index: 0 | 1) {
+  private async onCopyToOtherClick(index: 0 | 1) {
    const otherIndex = (index + 1) % 2;
+    const oldSettings = this.state.images[otherIndex];

    this.setState({
      images: cleanSet(this.state.images, otherIndex, this.state.images[index]),
    });
+
+    const result = await this.props.showSnack('Settings copied across', {
+      timeout: 5000,
+      actions: ['undo', 'dismiss'],
+    });
+
+    if (result !== 'undo') return;
+
+    this.setState({
+      images: cleanSet(this.state.images, otherIndex, oldSettings),
+    });
  }

  @bind
@@ -318,7 +331,7 @@ export default class Compress extends Component<Props, State> {
      console.error(err);
      // Another file has been opened before this one processed.
      if (this.state.loadingCounter !== loadingCounter) return;
-      this.props.onError('Invalid image');
+      this.props.showSnack('Invalid image');
      this.setState({ loading: false });
    }
  }
@@ -377,7 +390,7 @@ export default class Compress extends Component<Props, State> {
        }
      } catch (err) {
        if (err.name === 'AbortError') return;
-        this.props.onError(`Processing error (type=${image.encoderState.type}): ${err}`);
+        this.props.showSnack(`Processing error (type=${image.encoderState.type}): ${err}`);
        throw err;
      }
    }
--- a/src/components/intro/index.tsx
+++ b/src/components/intro/index.tsx
@@ -12,6 +12,7 @@ import artworkIcon from './imgs/demos/artwork-icon.jpg';
 import deviceScreenIcon from './imgs/demos/device-screen-icon.jpg';
 import logoIcon from './imgs/demos/logo-icon.png';
 import * as style from './style.scss';
+import SnackBarElement from '../../lib/SnackBar';

 const demos = [
  {
@@ -42,7 +43,7 @@ const demos = [

 interface Props {
  onFile: (file: File | Fileish) => void;
-  onError: (error: string) => void;
+  showSnack: SnackBarElement['showSnackbar'];
 }
 interface State {
  fetchingDemoIndex?: number;
@@ -79,7 +80,7 @@ export default class Intro extends Component<Props, State> {
      this.props.onFile(file);
    } catch (err) {
      this.setState({ fetchingDemoIndex: undefined });
-      this.props.onError("Couldn't fetch demo image");
+      this.props.showSnack("Couldn't fetch demo image");
    }
  }

--- a/src/custom-els/RangeInput/index.ts
+++ b/src/custom-els/RangeInput/index.ts
@@ -57,6 +57,8 @@ class RangeInputElement extends HTMLElement {

    this.insertBefore(this._input, this.firstChild);
    this._valueDisplay = this.querySelector('.' + style.valueDisplay) as HTMLDivElement;
+    // Set inline styles (this is useful when used with frameworks which might clear inline styles)
+    this._update();
  }

  get labelPrecision(): string {
--- a/src/lib/SnackBar/index.ts
+++ b/src/lib/SnackBar/index.ts
@@ -1,114 +1,96 @@
-import './styles.css';
-
-const DEFAULT_TIMEOUT = 2750;
+import * as style from './styles.css';

 export interface SnackOptions {
-  message: string;
  timeout?: number;
-  actionText?: string;
-  actionHandler?: () => boolean | null;
+  actions?: string[];
 }

-export interface SnackShowResult {
-  action: boolean;
-}
+function createSnack(message: string, options: SnackOptions): [Element, Promise<string>] {
+  const {
+    timeout = 0,
+    actions = [],
+  } = options;

-class Snack {
-  private _onremove: ((result: SnackShowResult) => void)[] = [];
-  private _options: SnackOptions;
-  private _element: Element = document.createElement('div');
-  private _text: Element = document.createElement('div');
-  private _button: Element = document.createElement('button');
-  private _showing = false;
-  private _closeTimer?: number;
-  private _result: SnackShowResult = {
-    action: false,
-  };
+  // Provide a default 'dismiss' action
+  if (!timeout && actions.length === 0) actions.push('dismiss');

-  constructor (options: SnackOptions, callback?: (result: SnackShowResult) => void) {
-    this._options = options;
+  const el = document.createElement('div');
+  el.className = style.snackbar;
+  el.setAttribute('aria-live', 'assertive');
+  el.setAttribute('aria-atomic', 'true');
+  el.setAttribute('aria-hidden', 'false');

-    this._element.className = 'snackbar';
-    this._element.setAttribute('aria-live', 'assertive');
-    this._element.setAttribute('aria-atomic', 'true');
-    this._element.setAttribute('aria-hidden', 'true');
+  const text = document.createElement('div');
+  text.className = style.text;
+  text.textContent = message;
+  el.appendChild(text);

-    this._text.className = 'snackbar--text';
-    this._text.textContent = options.message;
-    this._element.appendChild(this._text);
+  const result = new Promise<string>((resolve) => {
+    let timeoutId: number;

-    if (options.actionText) {
-      this._button.className = 'snackbar--button';
-      this._button.textContent = options.actionText;
-      this._button.addEventListener('click', () => {
-        if (this._showing) {
-          if (options.actionHandler && options.actionHandler() === false) return;
-          this._result.action = true;
-        }
-        this.hide();
+    // Add action buttons
+    for (const action of actions) {
+      const button = document.createElement('button');
+      button.className = style.button;
+      button.textContent = action;
+      button.addEventListener('click', () => {
+        clearTimeout(timeoutId);
+        resolve(action);
      });
-      this._element.appendChild(this._button);
+      el.appendChild(button);
    }

-    if (callback) {
-      this._onremove.push(callback);
+    // Add timeout
+    if (timeout) {
+      timeoutId = self.setTimeout(
+        () => resolve(''),
+        timeout,
+      );
    }
-  }
+  });

-  cancelTimer () {
-    if (this._closeTimer != null) clearTimeout(this._closeTimer);
-  }
-
-  show (parent: Element): Promise<SnackShowResult> {
-    if (this._showing) return Promise.resolve(this._result);
-    this._showing = true;
-    this.cancelTimer();
-    if (parent !== this._element.parentNode) {
-      parent.appendChild(this._element);
-    }
-    this._element.removeAttribute('aria-hidden');
-    this._closeTimer = setTimeout(this.hide.bind(this), this._options.timeout || DEFAULT_TIMEOUT);
-    return new Promise((resolve) => {
-      this._onremove.push(resolve);
-    });
-  }
-
-  hide () {
-    if (!this._showing) return;
-    this._showing = false;
-    this.cancelTimer();
-    this._element.addEventListener('animationend', this.remove.bind(this));
-    this._element.setAttribute('aria-hidden', 'true');
-  }
-
-  remove () {
-    this.cancelTimer();
-    const parent = this._element.parentNode;
-    if (parent) parent.removeChild(this._element);
-    this._onremove.forEach(f => f(this._result));
-    this._onremove = [];
-  }
+  return [el, result];
 }

 export default class SnackBarElement extends HTMLElement {
-  private _snackbars: Snack[] = [];
-  private _processingStack = false;
+  private _snackbars: [string, SnackOptions, (action: Promise<string>) => void][] = [];
+  private _processingQueue = false;

-  showSnackbar (options: SnackOptions): Promise<SnackShowResult> {
-    return new Promise((resolve) => {
-      const snack = new Snack(options, resolve);
-      this._snackbars.push(snack);
-      this._processStack();
+  /**
+   * Show a snackbar. Returns a promise for the name of the action clicked, or an empty string if no
+   * action is clicked.
+   */
+  showSnackbar(message: string, options: SnackOptions = {}): Promise<string> {
+    return new Promise<string>((resolve) => {
+      this._snackbars.push([message, options, resolve]);
+      if (!this._processingQueue) this._processQueue();
    });
  }

-  private async _processStack () {
-    if (this._processingStack === true || this._snackbars.length === 0) return;
-    this._processingStack = true;
-    await this._snackbars[0].show(this);
-    this._snackbars.shift();
-    this._processingStack = false;
-    this._processStack();
+  private async _processQueue() {
+    this._processingQueue = true;
+
+    while (this._snackbars[0]) {
+      const [message, options, resolver] = this._snackbars[0];
+      const [el, result] = createSnack(message, options);
+      // Pass the result back to the original showSnackbar call.
+      resolver(result);
+      this.appendChild(el);
+
+      // Wait for the user to click an action, or for the snack to timeout.
+      await result;
+
+      // Transition the snack away.
+      el.setAttribute('aria-hidden', 'true');
+      await new Promise((resolve) => {
+        el.addEventListener('animationend', () => resolve());
+      });
+      el.remove();
+
+      this._snackbars.shift();
+    }
+
+    this._processingQueue = false;
  }
 }

--- a/src/lib/SnackBar/styles.css
+++ b/src/lib/SnackBar/styles.css
@@ -22,7 +22,6 @@ snack-bar {
  transform-origin: center;
  color: #eee;
  z-index: 100;
-  pointer-events: none;
  cursor: default;
  will-change: transform;
  animation: snackbar-show 300ms ease forwards 1;
@@ -53,13 +52,13 @@ snack-bar {
  }
 }

-.snackbar--text {
+.text {
  flex: 1 1 auto;
  padding: 16px;
  font-size: 100%;
 }

-.snackbar--button {
+.button {
  position: relative;
  flex: 0 1 auto;
  padding: 8px;
@@ -75,16 +74,15 @@ snack-bar {
  font-size: 100%;
  text-transform: uppercase;
  text-align: center;
-  pointer-events: all;
  cursor: pointer;
  overflow: hidden;
  transition: background-color 200ms ease;
  outline: none;
 }
-.snackbar--button:hover {
+.button:hover {
  background-color: rgba(0,0,0,0.15);
 }
-.snackbar--button:focus:before {
+.button:focus:before {
  content: '';
  position: absolute;
  left: 50%;
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -25,6 +25,7 @@ module.exports = function (_, env) {
    path.join(__dirname, 'src/components'),
    path.join(__dirname, 'src/codecs'),
    path.join(__dirname, 'src/custom-els'),
+    path.join(__dirname, 'src/lib'),
  ];

  return {
@@ -107,7 +108,7 @@ module.exports = function (_, env) {
              loader: 'typings-for-css-modules-loader',
              options: {
                modules: true,
-                localIdentName: '[local]__[hash:base64:5]',
+                localIdentName: isProd ? '[hash:base64:5]' : '[local]__[hash:base64:5]',
                namedExport: true,
                camelCase: true,
                importLoaders: 1,
@@ -199,8 +200,11 @@ module.exports = function (_, env) {

      new OptimizeCssAssetsPlugin({
        cssProcessorOptions: {
-          zindex: false,
-          discardComments: { removeAll: true }
+          postcssReduceIdents: {
+            counterStyle: false,
+            gridTemplate: false,
+            keyframes: false
+          }
        }
      }),
Author	SHA1	Message	Date
Jake Archibald	150e704d20	It's a dev package	2018-11-06 13:50:50 +00:00
Paul Kinlan	b2d47f0fb8	fixing a deps issue.	2018-11-06 13:50:49 +00:00
Paul Kinlan	bd3d33296d	Updating based on changes to filedrop element.	2018-11-06 13:50:49 +00:00
Paul Kinlan	f4c82ced97	#199 - Removes the file-drop custom element + Removes the custom element from the project + Replaces it with the externally maintined custom element	2018-11-06 13:50:48 +00:00
Jake Archibald	76188df0d3	Destructuring args.	2018-11-06 13:47:18 +00:00
Jake Archibald	9a58e4d339	Fixing lossless slider for webP. Previously you couldn't select "9" :D	2018-11-06 13:47:18 +00:00
Jake Archibald	f396a5b784	MozJPEG chroma subsampling and quality (#235 ) * Adding chroma subsampling for mozjpeg * Adding separate chroma quality. * Preact sometimes removes the inline styles, this fixes it. * Simplifying chroma subsample * Adding comments	2018-11-06 13:46:52 +00:00
Jake Archibald	e572b853e2	Snackbar defaults & copy undo (#233 ) * Fix snackbar defaults. Fixes #205. * Undo copy settings across. * Oops * Fixing stupid minification bug * Something weird happened with the last commit	2018-11-06 13:44:15 +00:00
Jake Archibald	726c2f195a	Fixing graphics glitch. Fixes #166 (#232 )	2018-11-06 13:41:08 +00:00