Only allow iframe embedding

Fix caching headers for sdk
Remove that stupid async from setFile()
2025-11-12 00:37:19 +00:00 · 2019-03-20 17:51:32 +00:00 · 2019-03-20 17:29:09 +00:00 · 2019-03-20 17:15:20 +00:00 · 2019-03-20 17:15:20 +00:00 · 2019-03-20 17:15:19 +00:00
41 changed files with 8969 additions and 5135 deletions
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-10.16.0
+10.15.3
--- a/_headers.ejs
+++ b/_headers.ejs
@@ -1,6 +1,7 @@
 # Long-term cache by default.
 /*
  Cache-Control: max-age=31536000
  Access-Control-Allow-Origin: *
 # And here are the exceptions:
 /
@@ -9,6 +10,9 @@
 /serviceworker.js
  Cache-Control: no-cache
 /sdk.mjs
  Cache-Control: no-cache
 /manifest.json
  Cache-Control: must-revalidate, max-age=3600
--- a/codecs/hqx/.gitignore
+++ b/codecs/hqx/.gitignore
@@ -1,5 +0,0 @@
 **/*.rs.bk
 target
 Cargo.lock
 bin/
 pkg/README.md
--- a/codecs/hqx/Cargo.toml
+++ b/codecs/hqx/Cargo.toml
@@ -1,37 +0,0 @@
 [package]
 name = "squooshhqx"
 version = "0.1.0"
 authors = ["Surma <surma@surma.link>"]
 [lib]
 crate-type = ["cdylib"]
 [features]
 default = ["console_error_panic_hook", "wee_alloc"]
 [dependencies]
 cfg-if = "0.1.2"
 wasm-bindgen = "0.2.38"
 # lazy_static = "1.0.0"
 hqx = {git = "https://github.com/CryZe/wasmboy-rs", tag="v0.1.2"}
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires
 # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
 # code size when deploying.
 console_error_panic_hook = { version = "0.1.1", optional = true }
 # `wee_alloc` is a tiny allocator for wasm that is only ~1K in code size
 # compared to the default allocator's ~10K. It is slower than the default
 # allocator, however.
 #
 # Unfortunately, `wee_alloc` requires nightly Rust when targeting wasm for now.
 wee_alloc = { version = "0.4.2", optional = true }
 [dev-dependencies]
 wasm-bindgen-test = "0.2"
 [profile.release]
 # Tell `rustc` to optimize for small code size.
 opt-level = "s"
 lto = true
--- a/codecs/hqx/Dockerfile
+++ b/codecs/hqx/Dockerfile
@@ -1,21 +0,0 @@
 FROM ubuntu
 RUN apt-get update && \
  apt-get install -qqy git build-essential cmake python2.7
 RUN git clone --depth 1 --recursive https://github.com/WebAssembly/wabt /usr/src/wabt
 RUN mkdir -p /usr/src/wabt/build
 WORKDIR /usr/src/wabt/build
 RUN cmake .. -DCMAKE_INSTALL_PREFIX=/opt/wabt && \
  make && \
  make install
 FROM rust
 RUN rustup install nightly && \
  rustup target add --toolchain nightly wasm32-unknown-unknown && \
  cargo install wasm-pack
 COPY --from=0 /opt/wabt /opt/wabt
 RUN mkdir /opt/binaryen && \
 curl -L https://github.com/WebAssembly/binaryen/releases/download/1.38.32/binaryen-1.38.32-x86-linux.tar.gz  | tar -xzf - -C /opt/binaryen --strip 1
 ENV PATH="/opt/binaryen:/opt/wabt/bin:${PATH}"
 WORKDIR /src
--- a/codecs/hqx/build.sh
+++ b/codecs/hqx/build.sh
@@ -1,26 +0,0 @@
 #!/bin/bash
 set -e
 echo "============================================="
 echo "Compiling wasm"
 echo "============================================="
 (
  rustup run nightly \
    wasm-pack build --target no-modules
  wasm-strip pkg/squooshhqx_bg.wasm
  echo "Optimising WASM so it doesn't break Chrome (this takes like 10-15mins. get a cup of tea)"
  echo "Once https://bugs.chromium.org/p/chromium/issues/detail?id=97480 is fixed, we can remove this step"
  wasm-opt -Os --no-validation -o pkg/squooshhqx_bg.wasm pkg/squooshhqx_bg.wasm
  rm pkg/.gitignore
 )
 echo "============================================="
 echo "Compiling wasm  done"
 echo "============================================="
 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 echo "Did you update your docker image?"
 echo "Run \`docker pull ubuntu\`"
 echo "Run \`docker pull rust\`"
 echo "Run \`docker build -t squoosh-hqx .\`"
 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
--- a/codecs/hqx/index.html
+++ b/codecs/hqx/index.html
@@ -1,24 +0,0 @@
 <!doctype html>
 <script src ="./pkg/squooshhqx.js"></script>
 <script type="module">
  async function run() {
    await wasm_bindgen("./pkg/squooshhqx_bg.wasm");
    const bitmap = await createImageBitmap(await fetch("https://i.imgur.com/MNDnBSc.png").then(r => r.blob()));
    const canvas = document.createElement("canvas");
    canvas.width = bitmap.width;
    canvas.height = bitmap.height;
    const ctx = canvas.getContext("2d");
    ctx.drawImage(bitmap, 0, 0);
    const imgdata = ctx.getImageData(0, 0, bitmap.width, bitmap.height);
    const factor = 4;
    const r = wasm_bindgen.resize(new Uint32Array(imgdata.data.buffer), bitmap.width, bitmap.height, factor);
    canvas.width = bitmap.width * factor;
    canvas.height = bitmap.height * factor;
    const output = new ImageData(new Uint8ClampedArray(r.buffer), canvas.width, canvas.height);
    ctx.putImageData(output, 0, 0);
    canvas.style = `width: ${canvas.width}px; height: ${canvas.height}px; image-rendering: pixelated;`;
    document.body.append(canvas);
  }
  run();
 </script>
--- a/codecs/hqx/package-lock.json
+++ b/codecs/hqx/package-lock.json
@@ -1,4 +0,0 @@
 {
  "name": "hqx",
  "lockfileVersion": 1
 }
--- a/codecs/hqx/package.json
+++ b/codecs/hqx/package.json
@@ -1,7 +0,0 @@
 {
  "name": "hqx",
  "scripts": {
    "build:image": "docker build -t squoosh-hqx .",
    "build": "docker run --rm -v $(pwd):/src squoosh-hqx ./build.sh"
  }
 }
--- a/codecs/hqx/pkg/package.json
+++ b/codecs/hqx/pkg/package.json
@@ -1,14 +0,0 @@
 {
  "name": "squooshhqx",
  "collaborators": [
    "Surma <surma@surma.link>"
  ],
  "version": "0.1.0",
  "files": [
    "squooshhqx_bg.wasm",
    "squooshhqx.js",
    "squooshhqx.d.ts"
  ],
  "browser": "squooshhqx.js",
  "types": "squooshhqx.d.ts"
 }
--- a/codecs/hqx/pkg/squooshhqx.d.ts
+++ b/codecs/hqx/pkg/squooshhqx.d.ts
@@ -1,20 +0,0 @@
 /* tslint:disable */
 /**
 * @param {Uint32Array} input_image 
 * @param {number} input_width 
 * @param {number} input_height 
 * @param {number} factor 
 * @returns {Uint32Array} 
 */
 export function resize(input_image: Uint32Array, input_width: number, input_height: number, factor: number): Uint32Array;
 /**
 * If `module_or_path` is {RequestInfo}, makes a request and
 * for everything else, calls `WebAssembly.instantiate` directly.
 *
 * @param {RequestInfo | BufferSource | WebAssembly.Module} module_or_path
 *
 * @returns {Promise<any>}
 */
 export default function init (module_or_path: RequestInfo | BufferSource | WebAssembly.Module): Promise<any>;
--- a/codecs/hqx/pkg/squooshhqx.js
+++ b/codecs/hqx/pkg/squooshhqx.js
@@ -1,97 +0,0 @@
 (function() {
    const __exports = {};
    let wasm;
    let cachegetUint32Memory = null;
    function getUint32Memory() {
        if (cachegetUint32Memory === null || cachegetUint32Memory.buffer !== wasm.memory.buffer) {
            cachegetUint32Memory = new Uint32Array(wasm.memory.buffer);
        }
        return cachegetUint32Memory;
    }
    let WASM_VECTOR_LEN = 0;
    function passArray32ToWasm(arg) {
        const ptr = wasm.__wbindgen_malloc(arg.length * 4);
        getUint32Memory().set(arg, ptr / 4);
        WASM_VECTOR_LEN = arg.length;
        return ptr;
    }
    function getArrayU32FromWasm(ptr, len) {
        return getUint32Memory().subarray(ptr / 4, ptr / 4 + len);
    }
    let cachedGlobalArgumentPtr = null;
    function globalArgumentPtr() {
        if (cachedGlobalArgumentPtr === null) {
            cachedGlobalArgumentPtr = wasm.__wbindgen_global_argument_ptr();
        }
        return cachedGlobalArgumentPtr;
    }
    /**
    * @param {Uint32Array} input_image
    * @param {number} input_width
    * @param {number} input_height
    * @param {number} factor
    * @returns {Uint32Array}
    */
    __exports.resize = function(input_image, input_width, input_height, factor) {
        const ptr0 = passArray32ToWasm(input_image);
        const len0 = WASM_VECTOR_LEN;
        const retptr = globalArgumentPtr();
        wasm.resize(retptr, ptr0, len0, input_width, input_height, factor);
        const mem = getUint32Memory();
        const rustptr = mem[retptr / 4];
        const rustlen = mem[retptr / 4 + 1];
        const realRet = getArrayU32FromWasm(rustptr, rustlen).slice();
        wasm.__wbindgen_free(rustptr, rustlen * 4);
        return realRet;
    };
    function init(module) {
        let result;
        const imports = {};
        if (module instanceof URL || typeof module === 'string' || module instanceof Request) {
            const response = fetch(module);
            if (typeof WebAssembly.instantiateStreaming === 'function') {
                result = WebAssembly.instantiateStreaming(response, imports)
                .catch(e => {
                    console.warn("`WebAssembly.instantiateStreaming` failed. Assuming this is because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
                    return response
                    .then(r => r.arrayBuffer())
                    .then(bytes => WebAssembly.instantiate(bytes, imports));
                });
            } else {
                result = response
                .then(r => r.arrayBuffer())
                .then(bytes => WebAssembly.instantiate(bytes, imports));
            }
        } else {
            result = WebAssembly.instantiate(module, imports)
            .then(result => {
                if (result instanceof WebAssembly.Instance) {
                    return { instance: result, module };
                } else {
                    return result;
                }
            });
        }
        return result.then(({instance, module}) => {
            wasm = instance.exports;
            init.__wbindgen_wasm_module = module;
            return wasm;
        });
    }
    self.wasm_bindgen = Object.assign(init, __exports);
 })();
--- a/codecs/hqx/pkg/squooshhqx_bg.d.ts
+++ b/codecs/hqx/pkg/squooshhqx_bg.d.ts
@@ -1,6 +0,0 @@
 /* tslint:disable */
 export const memory: WebAssembly.Memory;
 export function resize(a: number, b: number, c: number, d: number, e: number, f: number): void;
 export function __wbindgen_global_argument_ptr(): number;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_free(a: number, b: number): void;
--- a/codecs/hqx/pkg/squooshhqx_bg.wasm
+++ b/codecs/hqx/pkg/squooshhqx_bg.wasm
--- a/codecs/hqx/src/lib.rs
+++ b/codecs/hqx/src/lib.rs
@@ -1,55 +0,0 @@
 extern crate cfg_if;
 extern crate hqx;
 extern crate wasm_bindgen;
 mod utils;
 use cfg_if::cfg_if;
 use wasm_bindgen::prelude::*;
 cfg_if! {
    // When the `wee_alloc` feature is enabled, use `wee_alloc` as the global
    // allocator.
    if #[cfg(feature = "wee_alloc")] {
        extern crate wee_alloc;
        #[global_allocator]
        static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT;
    }
 }
 #[wasm_bindgen]
 #[no_mangle]
 pub fn resize(
    input_image: Vec<u32>,
    input_width: usize,
    input_height: usize,
    factor: usize,
 ) -> Vec<u32> {
    let num_output_pixels = input_width * input_height * factor * factor;
    let mut output_image = Vec::<u32>::with_capacity(num_output_pixels * 4);
    output_image.resize(num_output_pixels, 0);
    match factor {
        2 => hqx::hq2x(
            input_image.as_slice(),
            output_image.as_mut_slice(),
            input_width,
            input_height,
        ),
        3 => hqx::hq3x(
            input_image.as_slice(),
            output_image.as_mut_slice(),
            input_width,
            input_height,
        ),
        4 => hqx::hq4x(
            input_image.as_slice(),
            output_image.as_mut_slice(),
            input_width,
            input_height,
        ),
        _ => unreachable!(),
    };
    return output_image;
 }
--- a/codecs/hqx/src/utils.rs
+++ b/codecs/hqx/src/utils.rs
@@ -1,17 +0,0 @@
 use cfg_if::cfg_if;
 cfg_if! {
    // When the `console_error_panic_hook` feature is enabled, we can call the
    // `set_panic_hook` function at least once during initialization, and then
    // we will get better error messages if our code ever panics.
    //
    // For more details see
    // https://github.com/rustwasm/console_error_panic_hook#readme
    if #[cfg(feature = "console_error_panic_hook")] {
        extern crate console_error_panic_hook;
        pub use self::console_error_panic_hook::set_once as set_panic_hook;
    } else {
        #[inline]
        pub fn set_panic_hook() {}
    }
 }
--- a/config/size-report.js
+++ b/config/size-report.js
@@ -0,0 +1,203 @@
 const path = require('path');
 const { URL } = require('url');
 const gzipSize = require('gzip-size');
 const fetch = require('node-fetch');
 const prettyBytes = require('pretty-bytes');
 const escapeRE = require('escape-string-regexp');
 const readdirp = require('readdirp');
 const chalk = new require('chalk').constructor({ level: 4 });
 function fetchTravis(path, options = {}) {
  const url = new URL(path, 'https://api.travis-ci.org');
  url.search = new URLSearchParams(options);
  return fetch(url, {
    headers: { 'Travis-API-Version': '3' },
  });
 }
 function fetchTravisBuildInfo(user, repo, branch) {
  return fetchTravis(`/repo/${encodeURIComponent(`${user}/${repo}`)}/builds`, {
    'branch.name': branch,
    state: 'passed',
    limit: 1,
    event_type: 'push',
  }).then(r => r.json());
 }
 function fetchTravisText(path) {
  return fetchTravis(path).then(r => r.text());
 }
 /**
 * Recursively-read a directory and turn it into an array of { name, size, gzipSize }
 */
 async function dirToInfoArray(startPath) {
  const results = await new Promise((resolve, reject) => {
    readdirp({ root: startPath }, (err, results) => {
      if (err) reject(err); else resolve(results);
    });
  });
  return Promise.all(
    results.files.map(async (entry) => ({
      name: entry.path,
      gzipSize: await gzipSize.file(entry.fullPath),
      size: entry.stat.size,
    })),
  );
 }
 /**
 * Try to treat two entries with different file name hashes as the same file.
 */
 function findHashedMatch(name, buildInfo) {
  const nameParts = /^(.+\.)[a-f0-9]+(\..+)$/.exec(name);
  if (!nameParts) return;
  const matchRe = new RegExp(`^${escapeRE(nameParts[1])}[a-f0-9]+${escapeRE(nameParts[2])}$`);
  const matchingEntry = buildInfo.find(entry => matchRe.test(entry.name));
  return matchingEntry;
 }
 const buildSizePrefix = '=== BUILD SIZES: ';
 const buildSizePrefixRe = new RegExp(`^${escapeRE(buildSizePrefix)}(.+)$`, 'm');
 async function getPreviousBuildInfo() {
  const buildData = await fetchTravisBuildInfo('GoogleChromeLabs', 'squoosh', 'master');
  const jobUrl = buildData.builds[0].jobs[0]['@href'];
  const log = await fetchTravisText(jobUrl + '/log.txt');
  const reResult = buildSizePrefixRe.exec(log);
  if (!reResult) return;
  return JSON.parse(reResult[1]);
 }
 /**
 * Generate an array that represents the difference between builds.
 * Returns an array of { beforeName, afterName, beforeSize, afterSize }.
 * Sizes are gzipped size.
 * Before/after properties are missing if resource isn't in the previous/new build.
 */
 function getChanges(previousBuildInfo, buildInfo) {
  const buildChanges = [];
  const alsoInPreviousBuild = new Set();
  for (const oldEntry of previousBuildInfo) {
    const newEntry = buildInfo.find(entry => entry.name === oldEntry.name) ||
      findHashedMatch(oldEntry.name, buildInfo);
    // Entry is in previous build, but not the new build.
    if (!newEntry) {
      buildChanges.push({
        beforeName: oldEntry.name,
        beforeSize: oldEntry.gzipSize,
      });
      continue;
    }
    // Mark this entry so we know we've dealt with it.
    alsoInPreviousBuild.add(newEntry);
    // If they're the same, just ignore.
    // Using size rather than gzip size. I've seen different platforms produce different zipped
    // sizes.
    if (
      oldEntry.size === newEntry.size &&
      oldEntry.name === newEntry.name
    ) continue;
    // Entry is in both builds (maybe renamed).
    buildChanges.push({
      beforeName: oldEntry.name,
      afterName: newEntry.name,
      beforeSize: oldEntry.gzipSize,
      afterSize: newEntry.gzipSize,
    });
  }
  // Look for entries that are only in the new build.
  for (const newEntry of buildInfo) {
    if (alsoInPreviousBuild.has(newEntry)) continue;
    buildChanges.push({
      afterName: newEntry.name,
      afterSize: newEntry.gzipSize,
    });
  }
  return buildChanges;
 }
 async function main() {
  // Output the current build sizes for later retrieval.
  const buildInfo = await dirToInfoArray(__dirname + '/../build');
  console.log(buildSizePrefix + JSON.stringify(buildInfo));
  console.log('\nBuild change report:');
  let previousBuildInfo;
  try {
    previousBuildInfo = await getPreviousBuildInfo();
  } catch (err) {
    console.log(`  Couldn't parse previous build info`);
    return;
  }
  if (!previousBuildInfo) {
    console.log(`  Couldn't find previous build info`);
    return;
  }
  const buildChanges = getChanges(previousBuildInfo, buildInfo);
  if (buildChanges.length === 0) {
    console.log('  No changes');
    return;
  }
  // One letter references, so it's easier to get the spacing right.
  const y = chalk.yellow;
  const g = chalk.green;
  const r = chalk.red;
  for (const change of buildChanges) {
    // New file.
    if (!change.beforeSize) {
      console.log(`  ${g('ADDED')}   ${change.afterName} - ${prettyBytes(change.afterSize)}`);
      continue;
    }
    // Removed file.
    if (!change.afterSize) {
      console.log(`  ${r('REMOVED')} ${change.beforeName} - was ${prettyBytes(change.beforeSize)}`);
      continue;
    }
    // Changed file.
    let size;
    if (change.beforeSize === change.afterSize) {
      // Just renamed.
      size = `${prettyBytes(change.afterSize)} -> no change`;
    } else {
      const color = change.afterSize > change.beforeSize ? r : g;
      const sizeDiff = prettyBytes(change.afterSize - change.beforeSize, { signed: true });
      const relativeDiff = Math.round((change.afterSize / change.beforeSize) * 1000) / 1000;
      size = `${prettyBytes(change.beforeSize)} -> ${prettyBytes(change.afterSize)}` +
        ' (' +
        color(`${sizeDiff}, ${relativeDiff}x`) +
        ')';
    }
    console.log(`  ${y('CHANGED')} ${change.afterName} - ${size}`);
    if (change.beforeName !== change.afterName) {
      console.log(`    Renamed from: ${change.beforeName}`);
    }
  }
 }
 main();
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,14 +1,15 @@
 {
  "private": true,
  "name": "squoosh",
-  "version": "1.8.1",
+  "version": "1.6.0",
  "license": "apache-2.0",
  "scripts": {
    "build:sdk": "microbundle --compress -f es -o build/sdk.mjs -i src/sdk.ts",
    "start": "webpack-dev-server --host 0.0.0.0 --hot",
-    "build": "webpack -p",
+    "build": "webpack -p && npm run build:sdk",
-    "lint": "tslint -c tslint.json  -p tsconfig.json -t verbose",
+    "lint": "tslint -c tslint.json -p tsconfig.json -t verbose 'src/**/*.{ts,tsx,js,jsx}'",
    "lintfix": "tslint -c tslint.json -p tsconfig.json -t verbose --fix 'src/**/*.{ts,tsx,js,jsx}'",
-    "sizereport": "sizereport --config"
+    "sizereport": "node config/size-report.js"
  },
  "husky": {
    "hooks": {
@@ -16,61 +17,61 @@
    }
  },
  "devDependencies": {
-    "@types/node": "10.14.9",
+    "@types/node": "10.14.1",
    "@types/pretty-bytes": "5.1.0",
-    "@types/webassembly-js-api": "0.0.3",
+    "@types/webassembly-js-api": "0.0.2",
-    "@webcomponents/custom-elements": "1.2.4",
+    "@webcomponents/custom-elements": "1.2.1",
-    "@webpack-cli/serve": "0.1.8",
+    "@webpack-cli/serve": "0.1.3",
    "assets-webpack-plugin": "3.9.10",
    "chalk": "2.4.2",
-    "chokidar": "3.0.1",
+    "chokidar": "2.1.2",
    "classnames": "2.2.6",
    "clean-webpack-plugin": "1.0.1",
-    "comlink": "3.1.1",
+    "copy-webpack-plugin": "5.0.1",
-    "copy-webpack-plugin": "5.0.3",
+    "comlink": "^3.2.0",
    "critters-webpack-plugin": "2.3.0",
    "css-loader": "1.0.1",
-    "ejs": "2.6.2",
+    "ejs": "2.6.1",
-    "escape-string-regexp": "2.0.0",
+    "escape-string-regexp": "1.0.5",
    "exports-loader": "0.7.0",
    "file-drop-element": "0.2.0",
-    "file-loader": "4.0.0",
+    "file-loader": "3.0.1",
-    "gzip-size": "5.1.1",
+    "gzip-size": "5.0.0",
    "html-webpack-plugin": "3.2.0",
-    "husky": "2.4.1",
+    "husky": "1.3.1",
-    "idb-keyval": "3.2.0",
+    "idb-keyval": "3.1.0",
    "linkstate": "1.1.1",
    "loader-utils": "1.2.3",
-    "mini-css-extract-plugin": "0.7.0",
+    "microbundle": "^0.10.1",
    "mini-css-extract-plugin": "0.5.0",
    "minimatch": "3.0.4",
-    "node-fetch": "2.6.0",
+    "node-fetch": "2.3.0",
-    "node-sass": "4.12.0",
+    "node-sass": "4.11.0",
    "optimize-css-assets-webpack-plugin": "5.0.1",
    "pointer-tracker": "2.0.3",
    "preact": "8.4.2",
    "prerender-loader": "1.3.0",
-    "pretty-bytes": "5.2.0",
+    "pretty-bytes": "5.1.0",
    "progress-bar-webpack-plugin": "1.12.1",
-    "raw-loader": "3.0.0",
+    "raw-loader": "2.0.0",
-    "readdirp": "3.0.2",
+    "readdirp": "2.2.1",
    "sass-loader": "7.1.0",
    "script-ext-html-webpack-plugin": "2.1.3",
    "source-map-loader": "0.2.4",
    "style-loader": "0.23.1",
-    "terser-webpack-plugin": "1.3.0",
+    "terser-webpack-plugin": "1.2.3",
-    "travis-size-report": "1.0.1",
+    "ts-loader": "5.3.3",
-    "ts-loader": "6.0.3",
+    "tslint": "5.14.0",
    "tslint": "5.17.0",
    "tslint-config-airbnb": "5.11.1",
-    "tslint-config-semistandard": "8.0.1",
+    "tslint-config-semistandard": "7.0.0",
-    "tslint-react": "4.0.0",
+    "tslint-react": "3.6.0",
    "typed-css-modules": "0.4.2",
-    "typescript": "3.5.2",
+    "typescript": "3.3.3333",
-    "url-loader": "2.0.0",
+    "url-loader": "1.1.2",
    "webpack": "4.28.0",
-    "webpack-bundle-analyzer": "3.3.2",
+    "webpack-bundle-analyzer": "3.1.0",
-    "webpack-cli": "3.3.4",
+    "webpack-cli": "3.3.0",
-    "webpack-dev-server": "3.7.1",
+    "webpack-dev-server": "3.2.1",
    "worker-plugin": "3.1.0"
  }
 }
--- a/sizereport.config.js
+++ b/sizereport.config.js
@@ -1,14 +0,0 @@
 const escapeRE = require("escape-string-regexp");
 module.exports = {
  repo: "GoogleChromeLabs/squoosh",
  path: "build/**/!(*.map)",
  branch: "master",
  findRenamed(path, newPaths) {
    const nameParts = /^(.+\.)[a-f0-9]+(\..+)$/.exec(path);
    if (!nameParts) return;
    const matchRe = new RegExp(`^${escapeRE(nameParts[1])}[a-f0-9]+${escapeRE(nameParts[2])}$`);
    return newPaths.find(newPath => matchRe.test(newPath));
  }
 };
--- a/src/codecs/hqx/processor-meta.ts
+++ b/src/codecs/hqx/processor-meta.ts
@@ -1,3 +0,0 @@
 export interface HqxOptions {
  factor: 2 | 3 | 4;
 }
--- a/src/codecs/hqx/processor.ts
+++ b/src/codecs/hqx/processor.ts
@@ -1,32 +0,0 @@
 import wasmUrl from '../../../codecs/hqx/pkg/squooshhqx_bg.wasm';
 import '../../../codecs/hqx/pkg/squooshhqx';
 import { HqxOptions } from './processor-meta';
 interface WasmBindgenExports {
  resize: typeof import('../../../codecs/hqx/pkg/squooshhqx').resize;
 }
 type WasmBindgen = ((url: string) => Promise<void>) & WasmBindgenExports;
 declare var wasm_bindgen: WasmBindgen;
 const ready = wasm_bindgen(wasmUrl);
 export async function hqx(
  data: ImageData,
  opts: HqxOptions,
 ): Promise<ImageData> {
  const input = data;
  await ready;
  const result = wasm_bindgen.resize(
    new Uint32Array(input.data.buffer),
    input.width,
    input.height,
    opts.factor,
  );
  return new ImageData(
    new Uint8ClampedArray(result.buffer),
    data.width * opts.factor,
    data.height * opts.factor,
  );
 }
--- a/src/codecs/processor-worker/index.ts
+++ b/src/codecs/processor-worker/index.ts
@@ -1,6 +1,4 @@
 import { expose } from 'comlink';
 import { isHqx } from '../resize/processor-meta';
 import { clamp } from '../util';
 async function mozjpegEncode(
  data: ImageData, options: import('../mozjpeg/encoder-meta').EncodeOptions,
@@ -33,18 +31,6 @@ async function rotate(
 async function resize(
  data: ImageData, opts: import('../resize/processor-meta').WorkerResizeOptions,
 ): Promise<ImageData> {
  if (isHqx(opts)) {
    const { hqx } = await import(
      /* webpackChunkName: "process-hqx" */
      '../hqx/processor');
    const widthRatio = opts.width / data.width;
    const heightRatio = opts.height / data.height;
    const ratio = Math.max(widthRatio, heightRatio);
    if (ratio <= 1) return data;
    const factor = clamp(Math.ceil(ratio), { min: 2, max: 4 }) as 2|3|4;
    return hqx(data, { factor });
  }
  const { resize } = await import(
    /* webpackChunkName: "process-resize" */
    '../resize/processor');
@@ -77,15 +63,7 @@ async function webpDecode(data: ArrayBuffer): Promise<ImageData> {
  return decode(data);
 }
-const exports = {
+const exports = { mozjpegEncode, quantize, rotate, resize, optiPngEncode, webpEncode, webpDecode };
  mozjpegEncode,
  quantize,
  rotate,
  resize,
  optiPngEncode,
  webpEncode,
  webpDecode,
 };
 export type ProcessorWorkerApi = typeof exports;
 expose(exports, self);
--- a/src/codecs/processor.ts
+++ b/src/codecs/processor.ts
@@ -16,7 +16,6 @@ import * as browserGIF from './browser-gif/encoder';
 import * as browserTIFF from './browser-tiff/encoder';
 import * as browserJP2 from './browser-jp2/encoder';
 import * as browserPDF from './browser-pdf/encoder';
 import { bind } from '../lib/initial-util';
 type ProcessorWorkerApi = import('./processor-worker').ProcessorWorkerApi;
@@ -95,7 +94,14 @@ export default class Processor {
    if (!this._worker) return;
    // If the worker is unused for 10 seconds, remove it to save memory.
-    this._workerTimeoutId = self.setTimeout(this.terminateWorker, workerTimeout);
+    this._workerTimeoutId = self.setTimeout(
      () => {
        if (!this._worker) return;
        this._worker.terminate();
        this._worker = undefined;
      },
      workerTimeout,
    );
  }
  /** Abort the current job, if any */
@@ -105,11 +111,7 @@ export default class Processor {
    this._abortRejector(new DOMException('Aborted', 'AbortError'));
    this._abortRejector = undefined;
    this._busy = false;
    this.terminateWorker();
  }
  @bind
  terminateWorker() {
    if (!this._worker) return;
    this._worker.terminate();
    this._worker = undefined;
--- a/src/codecs/resize/options.tsx
+++ b/src/codecs/resize/options.tsx
@@ -12,9 +12,8 @@ import Select from '../../components/select';
 interface Props {
  isVector: Boolean;
  inputWidth: number;
  inputHeight: number;
  options: ResizeOptions;
  aspect: number;
  onChange(newOptions: ResizeOptions): void;
 }
@@ -22,21 +21,12 @@ interface State {
  maintainAspect: boolean;
 }
 const sizePresets = [0.25, 0.3333, 0.5, 1, 2, 3, 4];
 export default class ResizerOptions extends Component<Props, State> {
  state: State = {
    maintainAspect: true,
  };
-  private form?: HTMLFormElement;
+  form?: HTMLFormElement;
  private presetWidths: { [idx: number]: number } = {};
  private presetHeights: { [idx: number]: number } = {};
  constructor(props: Props) {
    super(props);
    this.generatePresetValues(props.inputWidth, props.inputHeight);
  }
  private reportOptions() {
    const form = this.form!;
@@ -63,31 +53,18 @@ export default class ResizerOptions extends Component<Props, State> {
    this.reportOptions();
  }
  private getAspect() {
    return this.props.inputWidth / this.props.inputHeight;
  }
  componentDidUpdate(prevProps: Props, prevState: State) {
    if (!prevState.maintainAspect && this.state.maintainAspect) {
-      this.form!.height.value = Math.round(Number(this.form!.width.value) / this.getAspect());
+      this.form!.height.value = Math.round(Number(this.form!.width.value) / this.props.aspect);
      this.reportOptions();
    }
  }
  componentWillReceiveProps(nextProps: Props) {
    if (
      this.props.inputWidth !== nextProps.inputWidth ||
      this.props.inputHeight !== nextProps.inputHeight
    ) {
      this.generatePresetValues(nextProps.inputWidth, nextProps.inputHeight);
    }
  }
  @bind
  private onWidthInput() {
    if (this.state.maintainAspect) {
      const width = inputFieldValueAsNumber(this.form!.width);
-      this.form!.height.value = Math.round(width / this.getAspect());
+      this.form!.height.value = Math.round(width / this.props.aspect);
    }
    this.reportOptions();
@@ -97,44 +74,12 @@ export default class ResizerOptions extends Component<Props, State> {
  private onHeightInput() {
    if (this.state.maintainAspect) {
      const height = inputFieldValueAsNumber(this.form!.height);
-      this.form!.width.value = Math.round(height * this.getAspect());
+      this.form!.width.value = Math.round(height * this.props.aspect);
    }
    this.reportOptions();
  }
  private generatePresetValues(width: number, height: number) {
    for (const preset of sizePresets) {
      this.presetWidths[preset] = Math.round(width * preset);
      this.presetHeights[preset] = Math.round(height * preset);
    }
  }
  private getPreset(): number | string {
    const { width, height } = this.props.options;
    for (const preset of sizePresets) {
      if (
        width === this.presetWidths[preset] &&
        height === this.presetHeights[preset]
      ) return preset;
    }
    return 'custom';
  }
  @bind
  private onPresetChange(event: Event) {
    const select = event.target as HTMLSelectElement;
    if (select.value === 'custom') return;
    const multiplier = Number(select.value);
    (this.form!.width as HTMLInputElement).value =
      Math.round(this.props.inputWidth * multiplier) + '';
    (this.form!.height as HTMLInputElement).value =
      Math.round(this.props.inputHeight * multiplier) + '';
    this.reportOptions();
  }
  render({ options, isVector }: Props, { maintainAspect }: State) {
    return (
      <form ref={linkRef(this, 'form')} class={style.optionsSection} onSubmit={preventDefault}>
@@ -150,22 +95,12 @@ export default class ResizerOptions extends Component<Props, State> {
            <option value="mitchell">Mitchell</option>
            <option value="catrom">Catmull-Rom</option>
            <option value="triangle">Triangle (bilinear)</option>
            <option value="hqx">hqx (pixel art)</option>
            <option value="browser-pixelated">Browser pixelated</option>
            <option value="browser-low">Browser low quality</option>
            <option value="browser-medium">Browser medium quality</option>
            <option value="browser-high">Browser high quality</option>
          </Select>
        </label>
        <label class={style.optionTextFirst}>
          Preset:
          <Select value={this.getPreset()} onChange={this.onPresetChange}>
            {sizePresets.map(preset =>
              <option value={preset}>{preset * 100}%</option>,
            )}
            <option value="custom">Custom</option>
          </Select>
        </label>
        <label class={style.optionTextFirst}>
          Width:
          <input
--- a/src/codecs/resize/processor-meta.ts
+++ b/src/codecs/resize/processor-meta.ts
@@ -1,26 +1,8 @@
-type BrowserResizeMethods =
+type BrowserResizeMethods = 'browser-pixelated' | 'browser-low' | 'browser-medium' | 'browser-high';
-  | 'browser-pixelated'
+type WorkerResizeMethods = 'triangle' | 'catrom' | 'mitchell' | 'lanczos3';
-  | 'browser-low'
+const workerResizeMethods: WorkerResizeMethods[] = ['triangle', 'catrom', 'mitchell', 'lanczos3'];
  | 'browser-medium'
  | 'browser-high';
 type WorkerResizeMethods =
  | 'triangle'
  | 'catrom'
  | 'mitchell'
  | 'lanczos3'
  | 'hqx';
 const workerResizeMethods: WorkerResizeMethods[] = [
  'triangle',
  'catrom',
  'mitchell',
  'lanczos3',
  'hqx',
 ];
-export type ResizeOptions =
+export type ResizeOptions = BrowserResizeOptions | WorkerResizeOptions | VectorResizeOptions;
  | BrowserResizeOptions
  | WorkerResizeOptions
  | VectorResizeOptions;
 export interface ResizeOptionsCommon {
  width: number;
@@ -47,21 +29,10 @@ export interface VectorResizeOptions extends ResizeOptionsCommon {
 *
 * @param opts
 */
-export function isWorkerOptions(
+export function isWorkerOptions(opts: ResizeOptions): opts is WorkerResizeOptions {
  opts: ResizeOptions,
 ): opts is WorkerResizeOptions {
  return (workerResizeMethods as string[]).includes(opts.method);
 }
 /**
 * Return whether a set of options are from the HQ<n>X set
 *
 * @param opts
 */
 export function isHqx(opts: ResizeOptions): opts is WorkerResizeOptions {
  return opts.method === 'hqx';
 }
 export const defaultOptions: ResizeOptions = {
  // Width and height will always default to the image size.
  // This is set elsewhere.
--- a/src/codecs/util.ts
+++ b/src/codecs/util.ts
@@ -25,12 +25,3 @@ export function initEmscriptenModule<T extends EmscriptenWasm.Module>(
    });
  });
 }
 interface ClampOpts {
  min?: number;
  max?: number;
 }
 export function clamp(x: number, opts: ClampOpts): number {
  return Math.min(Math.max(x, opts.min || Number.MIN_VALUE), opts.max || Number.MAX_VALUE);
 }
--- a/src/components/App/client-api.ts
+++ b/src/components/App/client-api.ts
@@ -0,0 +1,106 @@
 import App from './index';
 import { SquooshStartEventType, SquooshSideEventType } from '../compress/index';
 import { expose } from 'comlink';
 export interface ReadyMessage {
  type: 'READY';
  version: string;
 }
 export function exposeAPI(app: App) {
  if (window === top) {
    // Someone opened Squoosh in a window rather than an iframe.
    // This can be deceiving and we won’t allow that.
    return;
  }
  self.parent.postMessage({ type: 'READY', version: MAJOR_VERSION }, '*');
  self.addEventListener('message', (event: MessageEvent) => {
    if (event.data !== 'READY?') {
      return;
    }
    event.stopImmediatePropagation();
    self.parent.postMessage({ type: 'READY', version: MAJOR_VERSION } as ReadyMessage, '*');
  });
  expose(new API(app), self.parent);
 }
 function addRemovableGlobalListener<
  K extends keyof GlobalEventHandlersEventMap
 >(name: K, listener: (ev: GlobalEventHandlersEventMap[K]) => void): () => void {
  document.addEventListener(name, listener);
  return () => document.removeEventListener(name, listener);
 }
 /**
 * The API class contains the methods that are exposed via Comlink to the
 * outside world.
 */
 export class API {
  /**
   * Internal constructor. Do not call.
   */
  constructor(private _app: App) {}
  /**
   * Loads a given file into Squoosh.
   * @param blob The `Blob` to load
   * @param name The name of the file. The extension of this name will be used
   * to deterime which decoder to use.
   */
  setFile(blob: Blob, name: string) {
    return new Promise((resolve) => {
      document.addEventListener(SquooshStartEventType.START, () => resolve(), {
        once: true,
      });
      this._app.openFile(new File([blob], name));
    });
  }
  /**
   * Grabs one side from Squoosh as a `File`.
   * @param side The side which to grab. 0 = left, 1 = right.
   */
  async getBlob(side: 0 | 1) {
    if (!this._app.state.file || !this._app.compressInstance) {
      throw new Error('No file has been loaded');
    }
    if (
      !this._app.compressInstance!.state.loading &&
      !this._app.compressInstance!.state.sides[side].loading
    ) {
      return this._app.compressInstance!.state.sides[side].file;
    }
    const listeners: ReturnType<typeof addRemovableGlobalListener>[] = [];
    const r = new Promise((resolve, reject) => {
      listeners.push(
        addRemovableGlobalListener(SquooshSideEventType.DONE, (event) => {
          if (event.side !== side) {
            return;
          }
          resolve(this._app.compressInstance!.state.sides[side].file);
        }),
      );
      listeners.push(
        addRemovableGlobalListener(SquooshSideEventType.ABORT, (event) => {
          if (event.side !== side) {
            return;
          }
          reject(new DOMException('Aborted', 'AbortError'));
        }),
      );
      listeners.push(
        addRemovableGlobalListener(SquooshSideEventType.ERROR, (event) => {
          if (event.side !== side) {
            return;
          }
          reject(event.error);
        }),
      );
    });
    r.then(() => listeners.forEach(remove => remove()));
    return r;
  }
 }
--- a/src/components/App/index.tsx
+++ b/src/components/App/index.tsx
@@ -14,10 +14,9 @@ const ROUTE_EDITOR = '/editor';
 const compressPromise = import(
  /* webpackChunkName: "main-app" */
  '../compress');
-
+const offlinerPromise = import(
-const swBridgePromise = import(
+  /* webpackChunkName: "offliner" */
-  /* webpackChunkName: "sw-bridge" */
+  '../../lib/offliner');
  '../../lib/sw-bridge');
 function back() {
  window.history.back();
@@ -26,7 +25,6 @@ function back() {
 interface Props {}
 interface State {
  awaitingShareTarget: boolean;
  file?: File | Fileish;
  isEditorOpen: Boolean;
  Compress?: typeof import('../compress').default;
@@ -34,11 +32,11 @@ interface State {
 export default class App extends Component<Props, State> {
  state: State = {
    awaitingShareTarget: new URL(location.href).searchParams.has('share-target'),
    isEditorOpen: false,
    file: undefined,
    Compress: undefined,
  };
  compressInstance?: import('../compress').default;
  snackbar?: SnackBarElement;
@@ -51,15 +49,7 @@ export default class App extends Component<Props, State> {
      this.showSnack('Failed to load app');
    });
-    swBridgePromise.then(async ({ offliner, getSharedImage }) => {
+    offlinerPromise.then(({ offliner }) => offliner(this.showSnack));
      offliner(this.showSnack);
      if (!this.state.awaitingShareTarget) return;
      const file = await getSharedImage();
      // Remove the ?share-target from the URL
      history.replaceState('', '', '/');
      this.openEditor();
      this.setState({ file, awaitingShareTarget: false });
    });
    // In development, persist application state across hot reloads:
    if (process.env.NODE_ENV === 'development') {
@@ -80,6 +70,14 @@ export default class App extends Component<Props, State> {
    });
    window.addEventListener('popstate', this.onPopState);
    import(
      /* webpackChunkName: "client-api" */
      './client-api').then(m => m.exposeAPI(this));
  }
  @bind openFile(file: File | Fileish) {
    this.openEditor();
    this.setState({ file });
  }
  @bind
@@ -92,8 +90,7 @@ export default class App extends Component<Props, State> {
  @bind
  private onIntroPickFile(file: File | Fileish) {
-    this.openEditor();
+    return this.openFile(file);
    this.setState({ file });
  }
  @bind
@@ -110,25 +107,24 @@ export default class App extends Component<Props, State> {
  @bind
  private openEditor() {
    if (this.state.isEditorOpen) return;
-    // Change path, but preserve query string.
+    history.pushState(null, '', ROUTE_EDITOR);
    const editorURL = new URL(location.href);
    editorURL.pathname = ROUTE_EDITOR;
    history.pushState(null, '', editorURL.href);
    this.setState({ isEditorOpen: true });
  }
-  render({}: Props, { file, isEditorOpen, Compress, awaitingShareTarget }: State) {
+  render({}: Props, { file, isEditorOpen, Compress }: State) {
    const showSpinner = awaitingShareTarget || (isEditorOpen && !Compress);
    return (
      <div id="app" class={style.app}>
        <file-drop accept="image/*" onfiledrop={this.onFileDrop} class={style.drop}>
-          {
+          {!isEditorOpen
-            showSpinner
+            ? <Intro onFile={this.onIntroPickFile} showSnack={this.showSnack} />
-              ? <loading-spinner class={style.appLoader}/>
+            : (Compress)
-              : isEditorOpen
+              ? <Compress
-                ? Compress && <Compress file={file!} showSnack={this.showSnack} onBack={back} />
+                  ref={i => this.compressInstance = i}
-                : <Intro onFile={this.onIntroPickFile} showSnack={this.showSnack} />
+                  file={file!}
                  showSnack={this.showSnack}
                  onBack={back}
              />
              : <loading-spinner class={style.appLoader}/>
          }
          <snack-bar ref={linkRef(this, 'snackbar')} />
        </file-drop>
--- a/src/components/Options/index.tsx
+++ b/src/components/Options/index.tsx
@@ -146,14 +146,12 @@ export default class Options extends Component<Props, State> {
                {preprocessorState.resize.enabled ?
                  <ResizeOptionsComponent
                    isVector={Boolean(source && source.vectorImage)}
-                    inputWidth={source ? source.processed.width : 1}
+                    aspect={source ? source.processed.width / source.processed.height : 1}
                    inputHeight={source ? source.processed.height : 1}
                    options={preprocessorState.resize}
                    onChange={this.onResizeOptionsChange}
                  />
                : null}
              </Expander>
              <label class={style.sectionEnabler}>
                <Checkbox
                  name="quantizer.enable"
@@ -180,7 +178,6 @@ export default class Options extends Component<Props, State> {
          {encoderSupportMap ?
            <Select value={encoderState.type} onChange={this.onEncoderTypeChange} large>
              {encoders.filter(encoder => encoderSupportMap[encoder.type]).map(encoder => (
                // tslint:disable-next-line:jsx-key
                <option value={encoder.type}>{encoder.label}</option>
              ))}
            </Select>
--- a/src/components/compress/index.tsx
+++ b/src/components/compress/index.tsx
@@ -24,7 +24,7 @@ import { decodeImage } from '../../codecs/decoders';
 import { cleanMerge, cleanSet } from '../../lib/clean-modify';
 import Processor from '../../codecs/processor';
 import {
-  BrowserResizeOptions, isWorkerOptions as isWorkerResizeOptions, isHqx, WorkerResizeOptions,
+  BrowserResizeOptions, isWorkerOptions as isWorkerResizeOptions,
 } from '../../codecs/resize/processor-meta';
 import './custom-els/MultiPanel';
 import Results from '../results';
@@ -32,6 +32,51 @@ import { ExpandIcon, CopyAcrossIconProps } from '../../lib/icons';
 import SnackBarElement from '../../lib/SnackBar';
 import { InputProcessorState, defaultInputProcessorState } from '../../codecs/input-processors';
 // 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 enum SquooshStartEventType {
  START = 'squoosh:start',
 }
 export class SquooshStartEvent extends Event {
  constructor(init?: EventInit) {
    super(SquooshStartEventType.START, init);
    fixExtendedEvent(this, SquooshStartEvent);
  }
 }
 export const enum SquooshSideEventType {
  DONE = 'squoosh:done',
  ABORT = 'squoosh:abort',
  ERROR = 'squoosh:error',
 }
 export interface SquooshSideEventInit extends EventInit {
  side: 0|1;
  error?: Error;
 }
 export class SquooshSideEvent extends Event {
  public side: 0|1;
  public error?: Error;
  constructor(name: SquooshSideEventType, init: SquooshSideEventInit) {
    super(name, init);
    fixExtendedEvent(this, SquooshSideEvent);
    this.side = init.side;
    this.error = init.error;
  }
 }
 declare global {
  interface GlobalEventHandlersEventMap {
    [SquooshStartEventType.START]: SquooshStartEvent;
    [SquooshSideEventType.DONE]: SquooshSideEvent;
    [SquooshSideEventType.ABORT]: SquooshSideEvent;
    [SquooshSideEventType.ERROR]: SquooshSideEvent;
  }
 }
 export interface SourceImage {
  file: File | Fileish;
  decoded: ImageData;
@@ -106,18 +151,6 @@ async function preprocessImage(
        source.vectorImage,
        preprocessData.resize,
      );
    } else if (isHqx(preprocessData.resize)) {
      // Hqx can only do x2, x3 or x4.
      result = await processor.workerResize(result, preprocessData.resize);
      // Seems like the globals from Rust from hqx and resize are conflicting.
      // For now we can fix that by terminating the worker.
      // TODO: Use wasm-bindgen’s new --web target to create a proper ES6 module
      // and remove this.
      processor.terminateWorker();
      // If the target size is not a clean x2, x3 or x4, use Catmull-Rom
      // for the remaining scaling.
      const pixelOpts = { ...preprocessData.resize, method: 'catrom' };
      result = await processor.workerResize(result, pixelOpts as WorkerResizeOptions);
    } else if (isWorkerResizeOptions(preprocessData.resize)) {
      result = await processor.workerResize(result, preprocessData.resize);
    } else {
@@ -256,7 +289,7 @@ export default class Compress extends Component<Props, State> {
    this.widthQuery.addListener(this.onMobileWidthChange);
    this.updateFile(props.file);
-    import('../../lib/sw-bridge').then(({ mainAppLoaded }) => mainAppLoaded());
+    import('../../lib/offliner').then(({ mainAppLoaded }) => mainAppLoaded());
  }
  @bind
@@ -407,8 +440,7 @@ export default class Compress extends Component<Props, State> {
    // Either processor is good enough here.
    const processor = this.leftProcessor;
-    this.setState({ loadingCounter, loading: true });
+    this.setState({ loadingCounter, loading: true }, this.signalLoadingStart);
    // Abort any current encode jobs, as they're redundant now.
    this.leftProcessor.abortCurrent();
    this.rightProcessor.abortCurrent();
@@ -486,6 +518,35 @@ export default class Compress extends Component<Props, State> {
    );
  }
  @bind
  private dispatchSideEvent(type: SquooshSideEventType, init: SquooshSideEventInit) {
    document.dispatchEvent(
      new SquooshSideEvent(type, init),
    );
  }
  @bind
  private signalLoadingStart() {
    document.dispatchEvent(
      new SquooshStartEvent(),
    );
  }
  @bind
  private signalProcessingDone(side: 0|1) {
    this.dispatchSideEvent(SquooshSideEventType.DONE, { side });
  }
  @bind
  private signalProcessingAbort(side: 0|1) {
    this.dispatchSideEvent(SquooshSideEventType.ABORT, { side });
  }
  @bind
  private signalProcessingError(side: 0|1, msg: string) {
    this.dispatchSideEvent(SquooshSideEventType.ERROR, { side, error: new Error(msg) });
  }
  private async updateImage(index: number, options: UpdateImageOptions = {}): Promise<void> {
    const {
      skipPreprocessing = false,
@@ -547,8 +608,13 @@ export default class Compress extends Component<Props, State> {
          });
        }
      } catch (err) {
-        if (err.name === 'AbortError') return;
+        if (err.name === 'AbortError') {
-        this.props.showSnack(`Processing error (type=${settings.encoderState.type}): ${err}`);
+          this.signalProcessingAbort(index as 0|1);
          return;
        }
        const errorMsg = `Processing error (type=${settings.encoderState.type}): ${err}`;
        this.signalProcessingError(index as 0|1, errorMsg);
        this.props.showSnack(errorMsg);
        throw err;
      }
    }
@@ -571,7 +637,7 @@ export default class Compress extends Component<Props, State> {
      encodedSettings: settings,
    });
-    this.setState({ sides });
+    this.setState({ sides }, () => this.signalProcessingDone(index as 0|1));
  }
  render({ onBack }: Props, { loading, sides, source, mobileView }: State) {
@@ -579,7 +645,6 @@ export default class Compress extends Component<Props, State> {
    const [leftImageData, rightImageData] = sides.map(i => i.data);
    const options = sides.map((side, index) => (
      // tslint:disable-next-line:jsx-key
      <Options
        source={source}
        mobileView={mobileView}
@@ -595,7 +660,6 @@ export default class Compress extends Component<Props, State> {
      (mobileView ? ['down', 'up'] : ['right', 'left']) as CopyAcrossIconProps['copyDirection'][];
    const results = sides.map((side, index) => (
      // tslint:disable-next-line:jsx-key
      <Results
        downloadUrl={side.downloadUrl}
        imageFile={side.file}
--- a/src/components/intro/imgs/logo.svg
+++ b/src/components/intro/imgs/logo.svg
--- a/src/components/intro/index.tsx
+++ b/src/components/intro/index.tsx
@@ -53,17 +53,11 @@ export default class Intro extends Component<Props, State> {
  state: State = {};
  private fileInput?: HTMLInputElement;
  @bind
  private resetFileInput() {
    this.fileInput!.value = '';
  }
  @bind
  private onFileChange(event: Event): void {
    const fileInput = event.target as HTMLInputElement;
    const file = fileInput.files && fileInput.files[0];
    if (!file) return;
    this.resetFileInput();
    this.props.onFile(file);
  }
--- a/src/lib/sw-bridge.ts
+++ b/src/lib/sw-bridge.ts
@@ -40,23 +40,6 @@ async function updateReady(reg: ServiceWorkerRegistration): Promise<void> {
  });
 }
 /** Wait for a shared image */
 export function getSharedImage(): Promise<File> {
  return new Promise((resolve) => {
    const onmessage = (event: MessageEvent) => {
      if (event.data.action !== 'load-image') return;
      resolve(event.data.file);
      navigator.serviceWorker.removeEventListener('message', onmessage);
    };
    navigator.serviceWorker.addEventListener('message', onmessage);
    // This message is picked up by the service worker - it's how it knows we're ready to receive
    // the file.
    navigator.serviceWorker.controller!.postMessage('share-ready');
  });
 }
 /** Set up the service worker and monitor changes */
 export async function offliner(showSnack: SnackBarElement['showSnackbar']) {
  // This needs to be a typeof because Webpack.
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -12,18 +12,5 @@
      "type": "image/png",
      "sizes": "1024x1024"
    }
-  ],
+  ]
  "share_target": {
    "action": "/?share-target",
    "method": "POST",
    "enctype": "multipart/form-data",
    "params": {
      "files": [
        {
          "name": "file",
          "accept": ["image/*"]
        }
      ]
    }
  }
 }
--- a/src/missing-types.d.ts
+++ b/src/missing-types.d.ts
@@ -34,6 +34,7 @@ declare module 'url-loader!*' {
 }
 declare var VERSION: string;
 declare var MAJOR_VERSION: string;
 declare var ga: {
  (...args: any[]): void;
--- a/src/sdk.ts
+++ b/src/sdk.ts
@@ -0,0 +1,41 @@
 import { proxy, ProxyResult } from 'comlink';
 import { API, ReadyMessage } from './components/App/client-api';
 // @ts-ignore
 import { version } from '../package.json';
 const MAJOR_VERSION = (version.split('.')[0] as string);
 /**
 * This function will load an iFrame
 * @param {HTMLIFrameElement} ifr iFrame that will be used to load squoosh
 * @param {string} src URL of squoosh instance to use
 */
 export default async function loader(
  ifr: HTMLIFrameElement,
  src: string = 'https://squoosh.app',
 ): Promise<ProxyResult<API>> {
  ifr.src = src;
  await new Promise(resolve => (ifr.onload = resolve));
  ifr.contentWindow!.postMessage('READY?', '*');
  await new Promise((resolve) => {
    window.addEventListener('message', function l(ev) {
      const msg = ev.data as ReadyMessage;
      if (!msg || msg.type !== 'READY') {
        return;
      }
      if (msg.version !== MAJOR_VERSION) {
        throw Error(
          `Version mismatch. SDK version ${MAJOR_VERSION}, Squoosh version ${
            msg.version
          }`,
        );
      }
      ev.stopPropagation();
      window.removeEventListener('message', l);
      resolve();
    });
  });
  return proxy(ifr.contentWindow!);
 }
--- a/src/sw/index.ts
+++ b/src/sw/index.ts
@@ -1,6 +1,5 @@
 import {
  cacheOrNetworkAndCache, cleanupCache, cacheOrNetwork, cacheBasics, cacheAdditionalProcessors,
  serveShareTarget,
 } from './util';
 import { get } from 'idb-keyval';
@@ -41,23 +40,14 @@ self.addEventListener('activate', (event) => {
 });
 self.addEventListener('fetch', (event) => {
  // We only care about GET.
  if (event.request.method !== 'GET') return;
  const url = new URL(event.request.url);
  // Don't care about other-origin URLs
  if (url.origin !== location.origin) return;
  if (
    url.pathname === '/' &&
    url.searchParams.has('share-target') &&
    event.request.method === 'POST'
  ) {
    serveShareTarget(event);
    return;
  }
  // We only care about GET from here on in.
  if (event.request.method !== 'GET') return;
  if (url.pathname.startsWith('/demo-') || url.pathname.startsWith('/wc-polyfill')) {
    cacheOrNetworkAndCache(event, dynamicCache);
    cleanupCache(event, dynamicCache, BUILD_ASSETS);
--- a/src/sw/util.ts
+++ b/src/sw/util.ts
@@ -1,11 +1,8 @@
 import webpDataUrl from 'url-loader!../codecs/tiny.webp';
 // Give TypeScript the correct global.
 declare var self: ServiceWorkerGlobalScope;
 export function cacheOrNetwork(event: FetchEvent): void {
  event.respondWith(async function () {
-    const cachedResponse = await caches.match(event.request, { ignoreSearch: true });
+    const cachedResponse = await caches.match(event.request);
    return cachedResponse || fetch(event.request);
  }());
 }
@@ -32,23 +29,6 @@ export function cacheOrNetworkAndCache(event: FetchEvent, cacheName: string): vo
  }());
 }
 export function serveShareTarget(event: FetchEvent): void {
  const dataPromise = event.request.formData();
  // Redirect so the user can refresh the page without resending data.
  // @ts-ignore It doesn't like me giving a response to respondWith, although it's allowed.
  event.respondWith(Response.redirect('/?share-target'));
  event.waitUntil(async function () {
    // The page sends this message to tell the service worker it's ready to receive the file.
    await nextMessage('share-ready');
    const client = await self.clients.get(event.resultingClientId);
    const data = await dataPromise;
    const file = data.get('file');
    client.postMessage({ file, action: 'load-image' });
  }());
 }
 export function cleanupCache(event: FetchEvent, cacheName: string, keepAssets: string[]) {
  event.waitUntil(async function () {
    const cache = await caches.open(cacheName);
@@ -124,26 +104,3 @@ export async function cacheAdditionalProcessors(cacheName: string, buildAssets:
  const cache = await caches.open(cacheName);
  await cache.addAll(toCache);
 }
 const nextMessageResolveMap = new Map<string, (() => void)[]>();
 /**
 * Wait on a message with a particular event.data value.
 *
 * @param dataVal The event.data value.
 */
 function nextMessage(dataVal: string): Promise<void> {
  return new Promise((resolve) => {
    if (!nextMessageResolveMap.has(dataVal)) {
      nextMessageResolveMap.set(dataVal, []);
    }
    nextMessageResolveMap.get(dataVal)!.push(resolve);
  });
 }
 self.addEventListener('message', (event) => {
  const resolvers = nextMessageResolveMap.get(event.data);
  if (!resolvers) return;
  nextMessageResolveMap.delete(event.data);
  for (const resolve of resolvers) resolve();
 });
--- a/tslint.json
+++ b/tslint.json
@@ -12,8 +12,7 @@
    "variable-name": [true, "check-format", "allow-leading-underscore"],
    "no-duplicate-imports": false,
    "prefer-template": [true, "allow-single-concat"],
-    "import-name": false,
+    "import-name": false
    "jsx-key": false
  },
  "linterOptions": {
    "exclude": [
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -263,6 +263,7 @@ module.exports = async function (_, env) {
      // Inline constants during build, so they can be folded by UglifyJS.
      new webpack.DefinePlugin({
        VERSION: JSON.stringify(VERSION),
        MAJOR_VERSION: JSON.stringify(VERSION.split(".")[0]),
        // We set node.process=false later in this config.
        // Here we make sure if (process && process.foo) still works:
        process: '{}'
Author	SHA1	Message	Date
Surma	956e064c8c	Only allow iframe embedding	2019-03-20 17:51:32 +00:00
Surma	5270553f27	Fix caching headers for sdk	2019-03-20 17:29:09 +00:00
Surma	3005098f67	Remove that stupid async from setFile()	2019-03-20 17:15:20 +00:00
Surma	9b879609f3	Add CORS to sdk file	2019-03-20 17:15:20 +00:00
Surma	9008d1c380	Use microbundle for SDK	2019-03-20 17:15:19 +00:00
Surma	915f4cd4e6	Revert wepack changes	2019-03-20 17:13:13 +00:00
Surma	7dd842a870	Fixup sdk.js deployment	2019-03-20 17:13:12 +00:00
Surma	2e478b323a	Trying to bend webpack to my will	2019-03-20 17:13:11 +00:00
Jason Miller	f24d41ba74	fix prerender-loader with multientry	2019-03-20 17:12:13 +00:00
Surma	cb3c66fc5b	Rename loading event	2019-03-20 17:12:12 +00:00
Surma	3315188bb3	Jake code review	2019-03-20 17:12:12 +00:00
Surma	efad4f612f	Use MAJOR_VERSION from package.json	2019-03-20 17:12:11 +00:00
Surma	7998cf247b	Another fix from rebasing	2019-03-20 17:12:11 +00:00
Surma	0041d24aa3	Create a SideEvent	2019-03-20 17:12:10 +00:00
Surma	2fa2e567a6	Address minor nits	2019-03-20 17:12:09 +00:00
Surma	98f61ba60c	Add chunk name	2019-03-20 17:12:09 +00:00
Surma	672c57b61f	Switch to an event-based architecture	2019-03-20 17:12:08 +00:00
Surma	bfe74b5fb2	Update for API changes	2019-03-20 17:12:08 +00:00
Surma	1507a44141	Lazy-load API	2019-03-20 17:12:07 +00:00
Surma	bb3bd2d46a	Restore compressor settings after load via API	2019-03-20 17:12:06 +00:00
Surma	4df3a7df83	Build a demo batch app	2019-03-20 17:12:06 +00:00
Surma	853b305465	Remove raceyness of getter API	2019-03-20 17:12:05 +00:00
Surma	9a230adc03	Simple API test	2019-03-20 17:12:00 +00:00