1.9.1

optipng build improvements

.nvmrc

@@ -1 +1 @@
-10.16.0
+10.16.2

codecs/hqx/.gitignore

@@ -0,0 +1,5 @@
+**/*.rs.bk
+target
+Cargo.lock
+bin/
+pkg/README.md

codecs/hqx/Cargo.toml

@@ -0,0 +1,37 @@
+[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

codecs/hqx/Dockerfile

@@ -0,0 +1,12 @@
+FROM rust
+RUN rustup target add wasm32-unknown-unknown
+RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+
+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
+
+RUN mkdir /opt/wabt && \
+ curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.11/wabt-1.0.11-linux.tar.gz  | tar -xzf - -C /opt/wabt --strip 1
+
+ENV PATH="/opt/binaryen:/opt/wabt:${PATH}"
+WORKDIR /src

codecs/hqx/build.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+
+echo "============================================="
+echo "Compiling wasm"
+echo "============================================="
+(
+  wasm-pack build
+  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://crbug.com/974804 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 "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/hqx/package-lock.json

@@ -0,0 +1,4 @@
+{
+  "name": "hqx",
+  "lockfileVersion": 1
+}

codecs/hqx/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "hqx",
+  "scripts": {
+    "build:image": "docker build -t squoosh-hqx .",
+    "build": "docker run --rm -v $(pwd):/src squoosh-hqx ./build.sh"
+  }
+}

codecs/hqx/pkg/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "squooshhqx",
+  "collaborators": [
+    "Surma <surma@surma.link>"
+  ],
+  "version": "0.1.0",
+  "files": [
+    "squooshhqx_bg.wasm",
+    "squooshhqx.js",
+    "squooshhqx.d.ts"
+  ],
+  "module": "squooshhqx.js",
+  "types": "squooshhqx.d.ts",
+  "sideEffects": "false"
+}

codecs/hqx/pkg/squooshhqx.d.ts

@@ -0,0 +1,9 @@
+/* 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;

codecs/hqx/pkg/squooshhqx.js

@@ -0,0 +1,46 @@
+import * as wasm from './squooshhqx_bg.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;
+}
+
+let cachegetInt32Memory = null;
+function getInt32Memory() {
+    if (cachegetInt32Memory === null || cachegetInt32Memory.buffer !== wasm.memory.buffer) {
+        cachegetInt32Memory = new Int32Array(wasm.memory.buffer);
+    }
+    return cachegetInt32Memory;
+}
+
+function getArrayU32FromWasm(ptr, len) {
+    return getUint32Memory().subarray(ptr / 4, ptr / 4 + len);
+}
+/**
+* @param {Uint32Array} input_image
+* @param {number} input_width
+* @param {number} input_height
+* @param {number} factor
+* @returns {Uint32Array}
+*/
+export function resize(input_image, input_width, input_height, factor) {
+    const retptr = 8;
+    const ret = wasm.resize(retptr, passArray32ToWasm(input_image), WASM_VECTOR_LEN, input_width, input_height, factor);
+    const memi32 = getInt32Memory();
+    const v0 = getArrayU32FromWasm(memi32[retptr / 4 + 0], memi32[retptr / 4 + 1]).slice();
+    wasm.__wbindgen_free(memi32[retptr / 4 + 0], memi32[retptr / 4 + 1] * 4);
+    return v0;
+}
+

codecs/hqx/pkg/squooshhqx_bg.d.ts

@@ -0,0 +1,5 @@
+/* tslint:disable */
+export const memory: WebAssembly.Memory;
+export function __wbindgen_malloc(a: number): number;
+export function __wbindgen_free(a: number, b: number): void;
+export function resize(a: number, b: number, c: number, d: number, e: number, f: number): void;

codecs/hqx/src/lib.rs

@@ -0,0 +1,55 @@
+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;
+}

codecs/hqx/src/utils.rs

@@ -0,0 +1,17 @@
+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() {}
+    }
+}

codecs/optipng/build.sh

@@ -4,84 +4,40 @@ set -e
 
 export OPTIMIZE="-Os"
 export PREFIX="/src/build"
-export CFLAGS="${OPTIMIZE} -I${PREFIX}/include/"
-export CPPFLAGS="${OPTIMIZE} -I${PREFIX}/include/"
-export LDFLAGS="${OPTIMIZE} -L${PREFIX}/lib/"
-
-apt-get update
-apt-get install -qqy autoconf libtool
-
-echo "============================================="
-echo "Compiling zlib"
-echo "============================================="
-test -n "$SKIP_ZLIB" || (
-  cd node_modules/zlib
-  emconfigure ./configure --prefix=${PREFIX}/
-  emmake make
-  emmake make install
-)
-echo "============================================="
-echo "Compiling zlib done"
-echo "============================================="
-
-echo "============================================="
-echo "Compiling libpng"
-echo "============================================="
-test -n "$SKIP_LIBPNG" || (
-  cd node_modules/libpng
-  autoreconf -i
-  emconfigure ./configure --with-zlib-prefix=${PREFIX}/ --prefix=${PREFIX}/
-  emmake make
-  emmake make install
-)
-echo "============================================="
-echo "Compiling libpng done"
-echo "============================================="
 
 echo "============================================="
 echo "Compiling optipng"
 echo "============================================="
 (
-  emcc \
+  cd node_modules/optipng
-    ${OPTIMIZE} \
+  CFLAGS="${OPTIMIZE} -Isrc/zlib" emconfigure ./configure --prefix=${PREFIX}
-    -Wno-implicit-function-declaration \
+  emmake make
-    -I ${PREFIX}/include \
+  emmake make install
-    -I node_modules/optipng/src/opngreduc \
+  mkdir -p ${PREFIX}/lib
-    -I node_modules/optipng/src/pngxtern \
+  mv ${PREFIX}/bin/optipng ${PREFIX}/lib/liboptipng.so
-    -I node_modules/optipng/src/cexcept \
-    -I node_modules/optipng/src/gifread \
-    -I node_modules/optipng/src/pnmio \
-    -I node_modules/optipng/src/minitiff \
-    --std=c99 -c \
-    node_modules/optipng/src/opngreduc/*.c \
-    node_modules/optipng/src/pngxtern/*.c \
-    node_modules/optipng/src/gifread/*.c \
-    node_modules/optipng/src/minitiff/*.c \
-    node_modules/optipng/src/pnmio/*.c \
-    node_modules/optipng/src/optipng/*.c
-
-  emcc \
-    --bind \
-    ${OPTIMIZE} \
-    -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME="optipng"' \
-    -I ${PREFIX}/include \
-    -I node_modules/optipng/src/opngreduc \
-    -I node_modules/optipng/src/pngxtern \
-    -I node_modules/optipng/src/cexcept \
-    -I node_modules/optipng/src/gifread \
-    -I node_modules/optipng/src/pnmio \
-    -I node_modules/optipng/src/minitiff \
-    -o "optipng.js" \
-    --std=c++11 \
-    optipng.cpp \
-    *.o \
-    ${PREFIX}/lib/libz.so ${PREFIX}/lib/libpng.a
 )
 echo "============================================="
 echo "Compiling optipng done"
 echo "============================================="
 
+echo "============================================="
+echo "Compiling optipng wrapper"
+echo "============================================="
+(
+  emcc \
+    --bind \
+    ${OPTIMIZE} \
+    -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME="optipng"' \
+    -o "optipng.js" \
+    --std=c++11 \
+    optipng.cpp \
+    ${PREFIX}/lib/liboptipng.so
+)
+echo "============================================="
+echo "Compiling optipng wrapper done"
+echo "============================================="
+
 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 echo "Did you update your docker image?"
-echo "Run \`docker pull trzeci/emscripten\`"
+echo "Run \`docker pull trzeci/emscripten-upstream\`"
 echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/optipng/package.json

@@ -1,9 +1,9 @@
 {
   "name": "optipng",
   "scripts": {
-    "install": "tar-dependency install && napa",
+    "install": "tar-dependency install",
     "build": "npm run build:wasm",
-    "build:wasm": "docker run --rm -v $(pwd):/src -e SKIP_ZLIB=\"${SKIP_ZLIB}\" -e SKIP_LIBPNG=\"${SKIP_LIBPNG}\" trzeci/emscripten ./build.sh"
+    "build:wasm": "docker run --rm -v $(pwd):/src trzeci/emscripten-upstream ./build.sh"
   },
   "tarDependencies": {
     "node_modules/optipng": {
@@ -11,12 +11,7 @@
       "strip": 1
     }
   },
-  "napa": {
-    "libpng": "emscripten-ports/libpng",
-    "zlib": "emscripten-ports/zlib"
-  },
   "dependencies": {
-    "napa": "3.0.0",
     "tar-dependency": "0.0.3"
   }
 }

codecs/resize/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "squooshresize"
+name = "resize"
 version = "0.1.0"
 authors = ["Surma <surma@surma.link>"]
 

codecs/resize/Dockerfile

@@ -1,18 +1,9 @@
-FROM ubuntu
-RUN apt-get update && \
-  apt-get install -qqy git build-essential cmake python2.7
-RUN git clone --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 && \
+RUN rustup target add wasm32-unknown-unknown
-  rustup target add --toolchain nightly wasm32-unknown-unknown && \
+RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-  cargo install wasm-pack
 
-COPY --from=0 /opt/wabt /opt/wabt
+RUN mkdir /opt/wabt && \
-ENV PATH="/opt/wabt/bin:${PATH}"
+ curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.11/wabt-1.0.11-linux.tar.gz  | tar -xzf - -C /opt/wabt --strip 1
+
+ENV PATH="/opt/wabt:${PATH}"
 WORKDIR /src

codecs/resize/benchmark.js

@@ -1,53 +0,0 @@
-// THIS IS NOT A NODE SCRIPT
-// This is a d8 script. Please install jsvu[1] and install v8.
-// Then run `npm run --silent benchmark`.
-// [1]: https://github.com/GoogleChromeLabs/jsvu
-
-self = global = this;
-load("./pkg/resize.js");
-
-async function init() {
-  //  Adjustable constants.
-  const inputDimensions = 2000;
-  const outputDimensions = 1500;
-  const algorithm = 3; // Lanczos
-  const iterations = new Array(100);
-
-  // Constants. Don’t change.
-  const imageByteSize = inputDimensions * inputDimensions * 4;
-  const imageBuffer = new Uint8ClampedArray(imageByteSize);
-
-  const module = await WebAssembly.compile(readbuffer("./pkg/resize_bg.wasm"));
-  await wasm_bindgen(module);
-  [[false, false], [true, false], [false, true], [true, true]].forEach(
-    opts => {
-      print(`\npremultiplication: ${opts[0]}`);
-      print(`color space conversion: ${opts[1]}`);
-      print(`==============================`);
-      for (let i = 0; i < 100; i++) {
-        const start = Date.now();
-        wasm_bindgen.resize(
-          imageBuffer,
-          inputDimensions,
-          inputDimensions,
-          outputDimensions,
-          outputDimensions,
-          algorithm,
-          ...opts
-        );
-        iterations[i] = Date.now() - start;
-      }
-      const average =
-        iterations.reduce((sum, c) => sum + c) / iterations.length;
-      const stddev = Math.sqrt(
-        iterations
-          .map(i => Math.pow(i - average, 2))
-          .reduce((sum, c) => sum + c) / iterations.length
-      );
-      print(`n = ${iterations.length}`);
-      print(`Average: ${average}`);
-      print(`StdDev: ${stddev}`);
-    }
-  );
-}
-init().catch(e => console.error(e, e.stack));

codecs/resize/build.sh

@@ -6,9 +6,9 @@ echo "============================================="
 echo "Compiling wasm"
 echo "============================================="
 (
-  rustup run nightly \
+  wasm-pack build
-    wasm-pack build --target no-modules
   wasm-strip pkg/resize_bg.wasm
+  rm pkg/.gitignore
 )
 echo "============================================="
 echo "Compiling wasm  done"

codecs/resize/package.json

@@ -2,7 +2,6 @@
   "name": "resize",
   "scripts": {
     "build:image": "docker build -t squoosh-resize .",
-    "build": "docker run --rm -v $(pwd):/src squoosh-resize ./build.sh",
+    "build": "docker run --rm -v $(pwd):/src squoosh-resize ./build.sh"
-    "benchmark": "v8 --no-liftoff --no-wasm-tier-up ./benchmark.js"
   }
 }

codecs/resize/pkg/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "resize",
+  "collaborators": [
+    "Surma <surma@surma.link>"
+  ],
+  "version": "0.1.0",
+  "files": [
+    "resize_bg.wasm",
+    "resize.js",
+    "resize.d.ts"
+  ],
+  "module": "resize.js",
+  "types": "resize.d.ts",
+  "sideEffects": "false"
+}

codecs/resize/pkg/resize.d.ts

@@ -1,13 +1,13 @@
 /* tslint:disable */
 /**
-* @param {Uint8Array} arg0 
+* @param {Uint8Array} input_image 
-* @param {number} arg1 
+* @param {number} input_width 
-* @param {number} arg2 
+* @param {number} input_height 
-* @param {number} arg3 
+* @param {number} output_width 
-* @param {number} arg4 
+* @param {number} output_height 
-* @param {number} arg5 
+* @param {number} typ_idx 
-* @param {boolean} arg6 
+* @param {boolean} premultiply 
-* @param {boolean} arg7 
+* @param {boolean} color_space_conversion 
 * @returns {Uint8Array} 
 */
-export function resize(arg0: Uint8Array, arg1: number, arg2: number, arg3: number, arg4: number, arg5: number, arg6: boolean, arg7: boolean): Uint8Array;
+export function resize(input_image: Uint8Array, input_width: number, input_height: number, output_width: number, output_height: number, typ_idx: number, premultiply: boolean, color_space_conversion: boolean): Uint8Array;

codecs/resize/pkg/resize.js

@@ -1,114 +1,50 @@
-(function() {
+import * as wasm from './resize_bg.wasm';
-    var wasm;
-    const __exports = {};
 
-
+let cachegetUint8Memory = null;
-    let cachegetUint8Memory = null;
+function getUint8Memory() {
-    function getUint8Memory() {
+    if (cachegetUint8Memory === null || cachegetUint8Memory.buffer !== wasm.memory.buffer) {
-        if (cachegetUint8Memory === null || cachegetUint8Memory.buffer !== wasm.memory.buffer) {
+        cachegetUint8Memory = new Uint8Array(wasm.memory.buffer);
-            cachegetUint8Memory = new Uint8Array(wasm.memory.buffer);
-        }
-        return cachegetUint8Memory;
     }
+    return cachegetUint8Memory;
+}
 
-    let WASM_VECTOR_LEN = 0;
+let WASM_VECTOR_LEN = 0;
 
-    function passArray8ToWasm(arg) {
+function passArray8ToWasm(arg) {
-        const ptr = wasm.__wbindgen_malloc(arg.length * 1);
+    const ptr = wasm.__wbindgen_malloc(arg.length * 1);
-        getUint8Memory().set(arg, ptr / 1);
+    getUint8Memory().set(arg, ptr / 1);
-        WASM_VECTOR_LEN = arg.length;
+    WASM_VECTOR_LEN = arg.length;
-        return ptr;
+    return ptr;
+}
+
+let cachegetInt32Memory = null;
+function getInt32Memory() {
+    if (cachegetInt32Memory === null || cachegetInt32Memory.buffer !== wasm.memory.buffer) {
+        cachegetInt32Memory = new Int32Array(wasm.memory.buffer);
     }
+    return cachegetInt32Memory;
+}
 
-    function getArrayU8FromWasm(ptr, len) {
+function getArrayU8FromWasm(ptr, len) {
-        return getUint8Memory().subarray(ptr / 1, ptr / 1 + len);
+    return getUint8Memory().subarray(ptr / 1, ptr / 1 + len);
-    }
+}
+/**
+* @param {Uint8Array} input_image
+* @param {number} input_width
+* @param {number} input_height
+* @param {number} output_width
+* @param {number} output_height
+* @param {number} typ_idx
+* @param {boolean} premultiply
+* @param {boolean} color_space_conversion
+* @returns {Uint8Array}
+*/
+export function resize(input_image, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion) {
+    const retptr = 8;
+    const ret = wasm.resize(retptr, passArray8ToWasm(input_image), WASM_VECTOR_LEN, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion);
+    const memi32 = getInt32Memory();
+    const v0 = getArrayU8FromWasm(memi32[retptr / 4 + 0], memi32[retptr / 4 + 1]).slice();
+    wasm.__wbindgen_free(memi32[retptr / 4 + 0], memi32[retptr / 4 + 1] * 1);
+    return v0;
+}
 
-    let cachedGlobalArgumentPtr = null;
-    function globalArgumentPtr() {
-        if (cachedGlobalArgumentPtr === null) {
-            cachedGlobalArgumentPtr = wasm.__wbindgen_global_argument_ptr();
-        }
-        return cachedGlobalArgumentPtr;
-    }
-
-    let cachegetUint32Memory = null;
-    function getUint32Memory() {
-        if (cachegetUint32Memory === null || cachegetUint32Memory.buffer !== wasm.memory.buffer) {
-            cachegetUint32Memory = new Uint32Array(wasm.memory.buffer);
-        }
-        return cachegetUint32Memory;
-    }
-    /**
-    * @param {Uint8Array} arg0
-    * @param {number} arg1
-    * @param {number} arg2
-    * @param {number} arg3
-    * @param {number} arg4
-    * @param {number} arg5
-    * @param {boolean} arg6
-    * @param {boolean} arg7
-    * @returns {Uint8Array}
-    */
-    __exports.resize = function(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7) {
-        const ptr0 = passArray8ToWasm(arg0);
-        const len0 = WASM_VECTOR_LEN;
-        const retptr = globalArgumentPtr();
-        wasm.resize(retptr, ptr0, len0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
-        const mem = getUint32Memory();
-        const rustptr = mem[retptr / 4];
-        const rustlen = mem[retptr / 4 + 1];
-
-        const realRet = getArrayU8FromWasm(rustptr, rustlen).slice();
-        wasm.__wbindgen_free(rustptr, rustlen * 1);
-        return realRet;
-
-    };
-
-    const heap = new Array(32);
-
-    heap.fill(undefined);
-
-    heap.push(undefined, null, true, false);
-
-    let heap_next = heap.length;
-
-    function dropObject(idx) {
-        if (idx < 36) return;
-        heap[idx] = heap_next;
-        heap_next = idx;
-    }
-
-    __exports.__wbindgen_object_drop_ref = function(i) { dropObject(i); };
-
-    function init(path_or_module) {
-        let instantiation;
-        const imports = { './resize': __exports };
-        if (path_or_module instanceof WebAssembly.Module) {
-            instantiation = WebAssembly.instantiate(path_or_module, imports)
-            .then(instance => {
-            return { instance, module: path_or_module }
-        });
-    } else {
-        const data = fetch(path_or_module);
-        if (typeof WebAssembly.instantiateStreaming === 'function') {
-            instantiation = WebAssembly.instantiateStreaming(data, 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 data
-                .then(r => r.arrayBuffer())
-                .then(bytes => WebAssembly.instantiate(bytes, imports));
-            });
-        } else {
-            instantiation = data
-            .then(response => response.arrayBuffer())
-            .then(buffer => WebAssembly.instantiate(buffer, imports));
-        }
-    }
-    return instantiation.then(({instance}) => {
-        wasm = init.wasm = instance.exports;
-
-    });
-};
-self.wasm_bindgen = Object.assign(init, __exports);
-})();

codecs/resize/pkg/resize_bg.d.ts

@@ -1,6 +1,5 @@
 /* tslint:disable */
 export const memory: WebAssembly.Memory;
-export function __wbindgen_global_argument_ptr(): number;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_free(a: number, b: number): void;
 export function resize(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number): void;

codecs/rotate/Dockerfile

@@ -1,17 +1,8 @@
-FROM ubuntu
-RUN apt-get update && \
-  apt-get install -qqy git build-essential cmake python2.7
-RUN git clone --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 && \
+RUN rustup target add wasm32-unknown-unknown
-  rustup target add --toolchain nightly wasm32-unknown-unknown
 
-COPY --from=0 /opt/wabt /opt/wabt
+RUN mkdir /opt/wabt && \
-ENV PATH="/opt/wabt/bin:${PATH}"
+ curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.11/wabt-1.0.11-linux.tar.gz  | tar -xzf - -C /opt/wabt --strip 1
+
+ENV PATH="/opt/wabt:${PATH}"
 WORKDIR /src

codecs/rotate/build.sh

@@ -6,8 +6,7 @@ echo "============================================="
 echo "Compiling wasm"
 echo "============================================="
 (
-  rustup run nightly \
+  cargo build \
-    cargo build \
     --target wasm32-unknown-unknown \
     --release
   cp target/wasm32-unknown-unknown/release/rotate.wasm .

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "squoosh",
-  "version": "1.7.0",
+  "version": "1.9.1",
   "license": "apache-2.0",
   "scripts": {
     "start": "webpack-dev-server --host 0.0.0.0 --hot",
@@ -16,32 +16,32 @@
     }
   },
   "devDependencies": {
-    "@types/node": "10.14.9",
+    "@types/node": "10.14.15",
     "@types/pretty-bytes": "5.1.0",
     "@types/webassembly-js-api": "0.0.3",
     "@webcomponents/custom-elements": "1.2.4",
     "@webpack-cli/serve": "0.1.8",
     "assets-webpack-plugin": "3.9.10",
     "chalk": "2.4.2",
-    "chokidar": "3.0.1",
+    "chokidar": "3.0.2",
     "classnames": "2.2.6",
     "clean-webpack-plugin": "1.0.1",
     "comlink": "3.1.1",
-    "copy-webpack-plugin": "5.0.3",
+    "copy-webpack-plugin": "5.0.4",
-    "critters-webpack-plugin": "2.3.0",
+    "critters-webpack-plugin": "2.4.0",
     "css-loader": "1.0.1",
     "ejs": "2.6.2",
     "escape-string-regexp": "2.0.0",
     "exports-loader": "0.7.0",
     "file-drop-element": "0.2.0",
-    "file-loader": "4.0.0",
+    "file-loader": "4.2.0",
     "gzip-size": "5.1.1",
     "html-webpack-plugin": "3.2.0",
-    "husky": "2.4.1",
+    "husky": "3.0.4",
     "idb-keyval": "3.2.0",
     "linkstate": "1.1.1",
     "loader-utils": "1.2.3",
-    "mini-css-extract-plugin": "0.7.0",
+    "mini-css-extract-plugin": "0.8.0",
     "minimatch": "3.0.4",
     "node-fetch": "2.6.0",
     "node-sass": "4.12.0",
@@ -49,28 +49,28 @@
     "pointer-tracker": "2.0.3",
     "preact": "8.4.2",
     "prerender-loader": "1.3.0",
-    "pretty-bytes": "5.2.0",
+    "pretty-bytes": "5.3.0",
     "progress-bar-webpack-plugin": "1.12.1",
-    "raw-loader": "3.0.0",
+    "raw-loader": "3.1.0",
-    "readdirp": "3.0.2",
+    "readdirp": "3.1.2",
-    "sass-loader": "7.1.0",
+    "sass-loader": "7.3.1",
-    "script-ext-html-webpack-plugin": "2.1.3",
+    "script-ext-html-webpack-plugin": "2.1.4",
     "source-map-loader": "0.2.4",
-    "style-loader": "0.23.1",
+    "style-loader": "1.0.0",
-    "terser-webpack-plugin": "1.3.0",
+    "terser-webpack-plugin": "1.4.1",
-    "travis-size-report": "1.0.1",
+    "travis-size-report": "1.1.0",
-    "ts-loader": "6.0.2",
+    "ts-loader": "6.0.3",
-    "tslint": "5.17.0",
+    "tslint": "5.19.0",
     "tslint-config-airbnb": "5.11.1",
     "tslint-config-semistandard": "8.0.1",
     "tslint-react": "4.0.0",
     "typed-css-modules": "0.4.2",
-    "typescript": "3.5.2",
+    "typescript": "3.5.3",
-    "url-loader": "2.0.0",
+    "url-loader": "2.1.0",
     "webpack": "4.28.0",
-    "webpack-bundle-analyzer": "3.3.2",
+    "webpack-bundle-analyzer": "3.4.1",
     "webpack-cli": "3.3.4",
-    "webpack-dev-server": "3.7.1",
+    "webpack-dev-server": "3.8.0",
     "worker-plugin": "3.1.0"
   }
 }

src/codecs/hqx/processor-meta.ts

@@ -0,0 +1,3 @@
+export interface HqxOptions {
+  factor: 2 | 3 | 4;
+}

src/codecs/hqx/processor.ts

@@ -0,0 +1,20 @@
+import { resize } from '../../../codecs/hqx/pkg';
+import { HqxOptions } from './processor-meta';
+
+export async function hqx(
+  data: ImageData,
+  opts: HqxOptions,
+): Promise<ImageData> {
+  const input = data;
+  const result = 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,
+  );
+}

src/codecs/processor-worker/index.ts

@@ -1,4 +1,6 @@
 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,
@@ -31,6 +33,18 @@ 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');
@@ -63,7 +77,15 @@ async function webpDecode(data: ArrayBuffer): Promise<ImageData> {
   return decode(data);
 }
 
-const exports = { mozjpegEncode, quantize, rotate, resize, optiPngEncode, webpEncode, webpDecode };
+const exports = {
+  mozjpegEncode,
+  quantize,
+  rotate,
+  resize,
+  optiPngEncode,
+  webpEncode,
+  webpDecode,
+};
 export type ProcessorWorkerApi = typeof exports;
 
 expose(exports, self);

src/codecs/processor.ts

@@ -16,6 +16,7 @@ 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;
 
@@ -94,14 +95,7 @@ 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._workerTimeoutId = self.setTimeout(this.terminateWorker, workerTimeout);
-      () => {
-        if (!this._worker) return;
-        this._worker.terminate();
-        this._worker = undefined;
-      },
-      workerTimeout,
-    );
   }
 
   /** Abort the current job, if any */
@@ -111,7 +105,11 @@ 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;

src/codecs/resize/options.tsx

@@ -12,8 +12,9 @@ import Select from '../../components/select';
 
 interface Props {
   isVector: Boolean;
+  inputWidth: number;
+  inputHeight: number;
   options: ResizeOptions;
-  aspect: number;
   onChange(newOptions: ResizeOptions): void;
 }
 
@@ -21,12 +22,21 @@ 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,
   };
 
-  form?: HTMLFormElement;
+  private 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!;
@@ -53,18 +63,31 @@ 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.props.aspect);
+      this.form!.height.value = Math.round(Number(this.form!.width.value) / this.getAspect());
       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.props.aspect);
+      this.form!.height.value = Math.round(width / this.getAspect());
     }
 
     this.reportOptions();
@@ -74,12 +97,44 @@ 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.props.aspect);
+      this.form!.width.value = Math.round(height * this.getAspect());
     }
 
     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}>
@@ -95,12 +150,22 @@ 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

src/codecs/resize/processor-meta.ts

@@ -1,8 +1,26 @@
-type BrowserResizeMethods = 'browser-pixelated' | 'browser-low' | 'browser-medium' | 'browser-high';
+type BrowserResizeMethods =
-type WorkerResizeMethods = 'triangle' | 'catrom' | 'mitchell' | 'lanczos3';
+  | 'browser-pixelated'
-const workerResizeMethods: WorkerResizeMethods[] = ['triangle', 'catrom', 'mitchell', 'lanczos3'];
+  | 'browser-low'
+  | 'browser-medium'
+  | 'browser-high';
+type WorkerResizeMethods =
+  | 'triangle'
+  | 'catrom'
+  | 'mitchell'
+  | 'lanczos3'
+  | 'hqx';
+const workerResizeMethods: WorkerResizeMethods[] = [
+  'triangle',
+  'catrom',
+  'mitchell',
+  'lanczos3',
+  'hqx',
+];
 
-export type ResizeOptions = BrowserResizeOptions | WorkerResizeOptions | VectorResizeOptions;
+export type ResizeOptions =
+  | BrowserResizeOptions
+  | WorkerResizeOptions
+  | VectorResizeOptions;
 
 export interface ResizeOptionsCommon {
   width: number;
@@ -29,10 +47,21 @@ export interface VectorResizeOptions extends ResizeOptionsCommon {
  *
  * @param opts
  */
-export function isWorkerOptions(opts: ResizeOptions): opts is WorkerResizeOptions {
+export function isWorkerOptions(
+  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.

src/codecs/resize/processor.ts

@@ -1,17 +1,6 @@
-import wasmUrl from '../../../codecs/resize/pkg/resize_bg.wasm';
-import '../../../codecs/resize/pkg/resize';
 import { WorkerResizeOptions } from './processor-meta';
 import { getContainOffsets } from './util';
-
+import { resize as codecResize } from '../../../codecs/resize/pkg';
-interface WasmBindgenExports {
-  resize: typeof import('../../../codecs/resize/pkg/resize').resize;
-}
-
-type WasmBindgen = ((url: string) => Promise<void>) & WasmBindgenExports;
-
-declare var wasm_bindgen: WasmBindgen;
-
-const ready = wasm_bindgen(wasmUrl);
 
 function crop(data: ImageData, sx: number, sy: number, sw: number, sh: number): ImageData {
   const inputPixels = new Uint32Array(data.data.buffer);
@@ -41,9 +30,7 @@ export async function resize(data: ImageData, opts: WorkerResizeOptions): Promis
     input = crop(input, Math.round(sx), Math.round(sy), Math.round(sw), Math.round(sh));
   }
 
-  await ready;
+  const result = codecResize(
-
-  const result = wasm_bindgen.resize(
     new Uint8Array(input.data.buffer), input.width, input.height, opts.width, opts.height,
     resizeMethods.indexOf(opts.method), opts.premultiply, opts.linearRGB,
   );

src/codecs/util.ts

@@ -25,3 +25,12 @@ 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);
+}

src/components/App/index.tsx

@@ -110,7 +110,10 @@ export default class App extends Component<Props, State> {
   @bind
   private openEditor() {
     if (this.state.isEditorOpen) return;
-    history.pushState(null, '', ROUTE_EDITOR);
+    // Change path, but preserve query string.
+    const editorURL = new URL(location.href);
+    editorURL.pathname = ROUTE_EDITOR;
+    history.pushState(null, '', editorURL.href);
     this.setState({ isEditorOpen: true });
   }
 

src/components/Options/index.tsx

@@ -146,12 +146,14 @@ export default class Options extends Component<Props, State> {
                 {preprocessorState.resize.enabled ?
                   <ResizeOptionsComponent
                     isVector={Boolean(source && source.vectorImage)}
-                    aspect={source ? source.processed.width / source.processed.height : 1}
+                    inputWidth={source ? source.processed.width : 1}
+                    inputHeight={source ? source.processed.height : 1}
                     options={preprocessorState.resize}
                     onChange={this.onResizeOptionsChange}
                   />
                 : null}
               </Expander>
+
               <label class={style.sectionEnabler}>
                 <Checkbox
                   name="quantizer.enable"

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,
+  BrowserResizeOptions, isWorkerOptions as isWorkerResizeOptions, isHqx, WorkerResizeOptions,
 } from '../../codecs/resize/processor-meta';
 import './custom-els/MultiPanel';
 import Results from '../results';
@@ -106,6 +106,18 @@ 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 {

src/manifest.json

@@ -11,6 +11,12 @@
       "src": "/assets/icon-large.png",
       "type": "image/png",
       "sizes": "1024x1024"
+    },
+    {
+      "src": "/assets/icon-large-maskable.png",
+      "type": "image/png",
+      "sizes": "1024x1024",
+      "purpose": "maskable"
     }
   ],
   "share_target": {

tslint.json

@@ -12,7 +12,8 @@
     "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": [

webpack.config.js

@@ -1,4 +1,3 @@
-const fs = require('fs');
 const path = require('path');
 const webpack = require('webpack');
 const CleanPlugin = require('clean-webpack-plugin');
@@ -17,11 +16,7 @@ const CrittersPlugin = require('critters-webpack-plugin');
 const AssetTemplatePlugin = require('./config/asset-template-plugin');
 const addCssTypes = require('./config/add-css-types');
 
-function readJson (filename) {
+const VERSION = require('./package.json').version;
-  return JSON.parse(fs.readFileSync(filename));
-}
-
-const VERSION = readJson('./package.json').version;
 
 module.exports = async function (_, env) {
   const isProd = env.mode === 'production';
@@ -147,11 +142,14 @@ module.exports = async function (_, env) {
         },
         {
           // All the codec files define a global with the same name as their file name. `exports-loader` attaches those to `module.exports`.
-          test: /\/codecs\/.*\.js$/,
+          test: /\.js$/,
+          include: path.join(__dirname, 'src/codecs'),
           loader: 'exports-loader'
         },
         {
-          test: /\/codecs\/.*\.wasm$/,
+          // Emscripten modules don't work with Webpack's Wasm loader.
+          test: /\.wasm$/,
+          exclude: /_bg\.wasm$/,
           // This is needed to make webpack NOT process wasm files.
           // See https://github.com/webpack/webpack/issues/6725
           type: 'javascript/auto',
@@ -160,6 +158,11 @@ module.exports = async function (_, env) {
             name: '[name].[hash:5].[ext]',
           },
         },
+        {
+          // Wasm modules generated by Rust + wasm-pack work great with Webpack.
+          test: /_bg\.wasm$/,
+          type: 'webassembly/experimental',
+        },
         {
           test: /\.(png|svg|jpg|gif)$/,
           loader: 'file-loader',
@@ -172,7 +175,7 @@ module.exports = async function (_, env) {
     plugins: [
       new webpack.IgnorePlugin(
         /(fs|crypto|path)/,
-        new RegExp(`${path.sep}codecs${path.sep}`)
+        /[/\\]codecs[/\\]/
       ),
 
       // Pretty progressbar showing build progress:
@@ -239,7 +242,7 @@ module.exports = async function (_, env) {
           removeRedundantAttributes: true,
           removeComments: true
         },
-        manifest: readJson('./src/manifest.json'),
+        manifest: require('./src/manifest.json'),
         inject: 'body',
         compile: true
       }),