other changes

.gitignore

@@ -5,3 +5,5 @@ node_modules
 *.css.d.ts
 *.o
 .parcel-cache
+.cache
+/public

codecs/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "codecs",
+  "version": "0.0.0"
+}

package.json

@@ -15,86 +15,37 @@
       "pre-commit": "npm run lint"
     }
   },
-  "browserslist": ">0.5%, not IE 11, not op_mini all",
-  "postcss": {
-    "modules": true,
-    "plugins": {
-      "postcss-modules": {
-        "localsConvention": "camelCaseOnly",
-        "generateScopedName": "[name]__[local]"
-      }
-    }
-  },
-  "//": "See https://github.com/GoogleChromeLabs/pointer-tracker/pull/10",
-  "alias": {
-    "pointer-tracker": "./node_modules/pointer-tracker/dist/PointerTracker.mjs"
+  "dependencies": {
+    "codecs": "0.0.0"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-class-properties": "^7.10.4",
-    "@babel/plugin-proposal-decorators": "^7.10.5",
-    "@babel/plugin-transform-react-jsx": "^7.10.4",
-    "@babel/preset-typescript": "^7.10.4",
-    "@parcel/babel-preset-env": "^2.0.0-alpha.3",
-    "@parcel/types": "^2.0.0-alpha.3",
     "@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.2",
     "classnames": "2.2.6",
-    "clean-webpack-plugin": "1.0.1",
     "comlink": "3.1.1",
-    "copy-webpack-plugin": "5.0.4",
-    "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.2.0",
     "gzip-size": "5.1.1",
-    "html-webpack-plugin": "3.2.0",
     "husky": "3.0.4",
     "idb-keyval": "3.2.0",
     "linkstate": "1.1.1",
-    "loader-utils": "1.2.3",
-    "mini-css-extract-plugin": "0.8.0",
     "minimatch": "3.0.4",
     "node-fetch": "2.6.0",
     "node-sass": "4.13.0",
     "normalize-path": "^3.0.0",
-    "optimize-css-assets-webpack-plugin": "5.0.1",
-    "parcel": "^2.0.0-beta.1",
-    "pointer-tracker": "2.0.3",
-    "postcss-modules": "^3.2.0",
+    "pointer-tracker": "^2.4.0",
     "preact": "8.4.2",
-    "prerender-loader": "1.3.0",
     "pretty-bytes": "5.3.0",
-    "progress-bar-webpack-plugin": "1.12.1",
-    "raw-loader": "3.1.0",
     "readdirp": "3.1.2",
     "sass": "^1.26.10",
-    "sass-loader": "7.3.1",
-    "script-ext-html-webpack-plugin": "2.1.4",
-    "source-map-loader": "0.2.4",
-    "style-loader": "1.0.0",
-    "terser-webpack-plugin": "1.4.1",
     "travis-size-report": "1.1.0",
-    "ts-loader": "6.0.3",
     "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.3",
-    "url-loader": "2.1.0",
-    "webpack": "4.39.3",
-    "webpack-bundle-analyzer": "3.4.1",
-    "webpack-cli": "3.3.4",
-    "webpack-dev-server": "3.8.0",
-    "worker-plugin": "3.1.0"
+    "typescript": "3.5.3"
   }
 }

src/codec-impl

@@ -0,0 +1 @@
+../codecs

src/codecs/generic/quality-option.tsx

@@ -1,5 +1,4 @@
 import { h, Component } from 'preact';
-import { bind } from '../../lib/initial-util';
 import * as style from '../../components/Options/style.module.scss';
 import Range from '../../components/range';
 
@@ -26,8 +25,7 @@ export default function qualityOption(opts: QualityOptionArg = {}) {
   } = opts;
 
   class QualityOptions extends Component<Props, {}> {
-    @bind
-    onChange(event: Event) {
+    onChange = (event: Event) => {
       const el = event.currentTarget as HTMLInputElement;
       this.props.onChange({ quality: Number(el.value) });
     }

src/codecs/hqx/processor.ts

@@ -1,4 +1,4 @@
-import { resize } from '../../../codecs/hqx/pkg';
+import { resize } from '../../codec-impl/hqx/pkg';
 import { HqxOptions } from './processor-meta';
 
 export async function hqx(

src/codecs/imagequant/options.tsx

@@ -1,5 +1,4 @@
 import { h, Component } from 'preact';
-import { bind } from '../../lib/initial-util';
 import { inputFieldValueAsNumber, konami, preventDefault } from '../../lib/util';
 import { QuantizeOptions } from './processor-meta';
 import * as style from '../../components/Options/style.module.scss';
@@ -27,8 +26,7 @@ export default class QuantizerOptions extends Component<Props, State> {
     });
   }
 
-  @bind
-  onChange(event: Event) {
+  onChange = (event: Event) => {
     const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
     const { options } = this.props;
 

src/codecs/imagequant/processor.ts

@@ -1,5 +1,5 @@
-import imagequant, { QuantizerModule } from '../../../codecs/imagequant/imagequant';
-import wasmUrl from '../../../codecs/imagequant/imagequant.wasm';
+import imagequant, { QuantizerModule } from '../../codec-impl/imagequant/imagequant';
+import wasmUrl from 'url:../../codec-impl/imagequant/imagequant.wasm';
 import { QuantizeOptions } from './processor-meta';
 import { initEmscriptenModule } from '../util';
 

src/codecs/mozjpeg/encoder.ts

@@ -1,5 +1,6 @@
-import mozjpeg_enc, { MozJPEGModule } from '../../../codecs/mozjpeg_enc/mozjpeg_enc';
-import wasmUrl from '../../../codecs/mozjpeg_enc/mozjpeg_enc.wasm';
+import mozjpeg_enc, { MozJPEGModule } from '../../codec-impl/mozjpeg_enc/mozjpeg_enc';
+// import wasmUrl from 'url:../../codecs/mozjpeg_enc/mozjpeg_enc.wasm';
+import wasmUrl from 'url:../../codec-impl/mozjpeg_enc/mozjpeg_enc.wasm';
 import { EncodeOptions } from './encoder-meta';
 import { initEmscriptenModule } from '../util';
 

src/codecs/mozjpeg/options.tsx

@@ -1,5 +1,4 @@
 import { h, Component } from 'preact';
-import { bind } from '../../lib/initial-util';
 import { inputFieldChecked, inputFieldValueAsNumber, preventDefault } from '../../lib/util';
 import { EncodeOptions, MozJpegColorSpace } from './encoder-meta';
 import * as style from '../../components/Options/style.module.scss';
@@ -23,8 +22,7 @@ export default class MozJPEGEncoderOptions extends Component<Props, State> {
     showAdvanced: false,
   };
 
-  @bind
-  onChange(event: Event) {
+  onChange = (event: Event) => {
     const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
     const { options } = this.props;
 

src/codecs/oxipng/encoder.ts

@@ -1,4 +1,4 @@
-import { optimise } from '../../../codecs/oxipng/pkg';
+import { optimise } from '../../codec-impl/oxipng/pkg';
 import { EncodeOptions } from './encoder-meta';
 
 export async function compress(data: ArrayBuffer, options: EncodeOptions): Promise<ArrayBuffer> {

src/codecs/oxipng/options.tsx

@@ -1,5 +1,4 @@
 import { h, Component } from 'preact';
-import { bind } from '../../lib/initial-util';
 import { inputFieldValueAsNumber, preventDefault } from '../../lib/util';
 import { EncodeOptions } from './encoder-meta';
 import Range from '../../components/range';
@@ -11,8 +10,7 @@ type Props = {
 };
 
 export default class OxiPNGEncoderOptions extends Component<Props, {}> {
-  @bind
-  onChange(event: Event) {
+  onChange = (event: Event) => {
     const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
 
     const options: EncodeOptions = {

src/codecs/processor.ts

@@ -1,4 +1,5 @@
 import { proxy } from 'comlink';
+import workerURL from 'bundle:./processor-worker/index.ts';
 import { QuantizeOptions } from './imagequant/processor-meta';
 import { canvasEncode, blobToArrayBuffer } from '../lib/util';
 import { EncodeOptions as MozJPEGEncoderOptions } from './mozjpeg/encoder-meta';
@@ -16,7 +17,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;
 
@@ -55,7 +55,7 @@ export default class Processor {
   private _workerTimeoutId: number = 0;
 
   /** @private */
-  async runProcessingJob(options: ProcessingJobOptions, processingFunc: any, ...args: any[]) {
+  async _runProcessingJob(options: ProcessingJobOptions, job: Function) {
     const { needsWorker = false } = options;
 
     this._latestJobId += 1;
@@ -69,10 +69,13 @@ export default class Processor {
       // @ts-ignore - Typescript doesn't know about the 2nd param to new Worker, and the
       // definition can't be overwritten.
       this._worker = new Worker(
-        './processor-worker',
-        { name: 'processor-worker' },
+        // './processor-worker',
+        // new URL('./processor-worker/index.ts', import.meta.url),
+        workerURL,
+        { name: 'processor-worker', type: 'module' },
         // { name: 'processor-worker', type: 'module' },
       ) as Worker;
+      console.log(this._worker);
       // Need to do some TypeScript trickery to make the type match.
       this._workerApi = proxy(this._worker) as any as ProcessorWorkerApi;
     }
@@ -80,7 +83,7 @@ export default class Processor {
     this._busy = true;
 
     const returnVal = Promise.race([
-      processingFunc.call(this, ...args),
+      job(),
       new Promise((_, reject) => { this._abortRejector = reject; }),
     ]);
 
@@ -99,7 +102,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.terminateWorker, workerTimeout);
+    this._workerTimeoutId = self.setTimeout(this.terminateWorker.bind(this), workerTimeout);
   }
 
   /** Abort the current job, if any */
@@ -112,7 +115,6 @@ export default class Processor {
     this.terminateWorker();
   }
 
-  @bind
   terminateWorker() {
     if (!this._worker) return;
     this._worker.terminate();
@@ -120,93 +122,108 @@ export default class Processor {
   }
 
   // Off main thread jobs:
-  @processingJob({ needsWorker: true })
   imageQuant(data: ImageData, opts: QuantizeOptions): Promise<ImageData> {
-    return this._workerApi!.quantize(data, opts);
+    return this._runProcessingJob({ needsWorker: true }, () => {
+      return this._workerApi!.quantize(data, opts);
+    });
   }
 
-  @processingJob({ needsWorker: true })
   rotate(
     data: ImageData, opts: import('./rotate/processor-meta').RotateOptions,
-  ): Promise<ImageData> {
-    return this._workerApi!.rotate(data, opts);
+    ): Promise<ImageData> {
+    return this._runProcessingJob({ needsWorker: true }, () => {
+      return this._workerApi!.rotate(data, opts);
+    });
   }
 
-  @processingJob({ needsWorker: true })
   workerResize(
     data: ImageData, opts: import('./resize/processor-meta').WorkerResizeOptions,
   ): Promise<ImageData> {
-    return this._workerApi!.resize(data, opts);
+    return this._runProcessingJob({ needsWorker: true }, () => {
+      return this._workerApi!.resize(data, opts);
+    });
   }
 
-  @processingJob({ needsWorker: true })
   mozjpegEncode(
     data: ImageData, opts: MozJPEGEncoderOptions,
   ): Promise<ArrayBuffer> {
-    return this._workerApi!.mozjpegEncode(data, opts);
+    return this._runProcessingJob({ needsWorker: true }, () => {
+      return this._workerApi!.mozjpegEncode(data, opts);
+    });
   }
 
-  @processingJob({ needsWorker: true })
   async oxiPngEncode(
     data: ImageData, opts: OxiPNGEncoderOptions,
   ): Promise<ArrayBuffer> {
-    // OxiPNG expects PNG input.
-    const pngBlob = await canvasEncode(data, 'image/png');
-    const pngBuffer = await blobToArrayBuffer(pngBlob);
-    return this._workerApi!.oxiPngEncode(pngBuffer, opts);
+    return this._runProcessingJob({ needsWorker: true }, async () => {
+      // OxiPNG expects PNG input.
+      const pngBlob = await canvasEncode(data, 'image/png');
+      const pngBuffer = await blobToArrayBuffer(pngBlob);
+      return this._workerApi!.oxiPngEncode(pngBuffer, opts);
+    });
   }
 
-  @processingJob({ needsWorker: true })
   webpEncode(data: ImageData, opts: WebPEncoderOptions): Promise<ArrayBuffer> {
-    return this._workerApi!.webpEncode(data, opts);
+    return this._runProcessingJob({ needsWorker: true }, () => {
+      return this._workerApi!.webpEncode(data, opts);
+    });
   }
 
-  @processingJob({ needsWorker: true })
   async webpDecode(blob: Blob): Promise<ImageData> {
-    const data = await blobToArrayBuffer(blob);
-    return this._workerApi!.webpDecode(data);
+    return this._runProcessingJob({ needsWorker: true }, async () => {
+      const data = await blobToArrayBuffer(blob);
+      return this._workerApi!.webpDecode(data);
+    });
   }
 
   // Not-worker jobs:
 
-  @processingJob()
   browserBmpEncode(data: ImageData): Promise<Blob> {
-    return browserBMP.encode(data);
+    return this._runProcessingJob({}, () => {
+      return browserBMP.encode(data);
+    });
   }
 
-  @processingJob()
   browserPngEncode(data: ImageData): Promise<Blob> {
-    return browserPNG.encode(data);
+    return this._runProcessingJob({}, () => {
+      return browserPNG.encode(data);
+    });
   }
 
-  @processingJob()
   browserJpegEncode(data: ImageData, opts: BrowserJPEGOptions): Promise<Blob> {
-    return browserJPEG.encode(data, opts);
+    return this._runProcessingJob({}, () => {
+      return browserJPEG.encode(data, opts);
+    });
   }
 
-  @processingJob()
   browserWebpEncode(data: ImageData, opts: BrowserWebpEncodeOptions): Promise<Blob> {
-    return browserWebP.encode(data, opts);
+    return this._runProcessingJob({}, () => {
+      return browserWebP.encode(data, opts);
+    });
   }
 
-  @processingJob()
   browserGifEncode(data: ImageData): Promise<Blob> {
-    return browserGIF.encode(data);
+    return this._runProcessingJob({}, () => {
+      return browserGIF.encode(data);
+    });
   }
 
-  @processingJob()
   browserTiffEncode(data: ImageData): Promise<Blob> {
-    return browserTIFF.encode(data);
+    return this._runProcessingJob({}, () => {
+      return browserTIFF.encode(data);
+    });
   }
 
-  @processingJob()
   browserJp2Encode(data: ImageData): Promise<Blob> {
-    return browserJP2.encode(data);
+    return this._runProcessingJob({}, () => {
+      return browserJP2.encode(data);
+    });
   }
 
-  @processingJob()
   browserPdfEncode(data: ImageData): Promise<Blob> {
-    return browserPDF.encode(data);
+    return this._runProcessingJob({}, () => {
+      return browserPDF.encode(data);
+    });
   }
 
   // Synchronous jobs

src/codecs/resize/options.tsx

@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 import linkState from 'linkstate';
-import { bind, linkRef } from '../../lib/initial-util';
+import { linkRef } from '../../lib/initial-util';
 import {
   inputFieldValueAsNumber, inputFieldValue, preventDefault, inputFieldChecked,
 } from '../../lib/util';
@@ -58,8 +58,7 @@ export default class ResizerOptions extends Component<Props, State> {
     this.props.onChange(newOptions);
   }
 
-  @bind
-  private onChange() {
+  private onChange = () => {
     this.reportOptions();
   }
 
@@ -83,8 +82,7 @@ export default class ResizerOptions extends Component<Props, State> {
     }
   }
 
-  @bind
-  private onWidthInput() {
+  private onWidthInput = () => {
     if (this.state.maintainAspect) {
       const width = inputFieldValueAsNumber(this.form!.width);
       this.form!.height.value = Math.round(width / this.getAspect());
@@ -93,8 +91,7 @@ export default class ResizerOptions extends Component<Props, State> {
     this.reportOptions();
   }
 
-  @bind
-  private onHeightInput() {
+  private onHeightInput = () => {
     if (this.state.maintainAspect) {
       const height = inputFieldValueAsNumber(this.form!.height);
       this.form!.width.value = Math.round(height * this.getAspect());
@@ -123,8 +120,7 @@ export default class ResizerOptions extends Component<Props, State> {
     return 'custom';
   }
 
-  @bind
-  private onPresetChange(event: Event) {
+  private onPresetChange = (event: Event) => {
     const select = event.target as HTMLSelectElement;
     if (select.value === 'custom') return;
     const multiplier = Number(select.value);

src/codecs/rotate/processor.ts

@@ -1,4 +1,4 @@
-import wasmUrl from '../../../codecs/rotate/rotate.wasm';
+import wasmUrl from 'url:../../codec-impl/rotate/rotate.wasm';
 import { RotateOptions, RotateModuleInstance } from './processor-meta';
 
 // We are loading a 500B module here. Loading the code to feature-detect

src/codecs/webp/decoder.ts

@@ -1,5 +1,5 @@
-import webp_dec, { WebPModule } from '../../../codecs/webp/dec/webp_dec';
-import wasmUrl from '../../../codecs/webp/dec/webp_dec.wasm';
+import webp_dec, { WebPModule } from '../../codec-impl/webp/dec/webp_dec';
+import wasmUrl from 'url:../../codec-impl/webp/dec/webp_dec.wasm';
 import { initEmscriptenModule } from '../util';
 
 let emscriptenModule: Promise<WebPModule>;

src/codecs/webp/encoder.ts

@@ -1,5 +1,5 @@
-import webp_enc, { WebPModule } from '../../../codecs/webp/enc/webp_enc';
-import wasmUrl from '../../../codecs/webp/enc/webp_enc.wasm';
+import webp_enc, { WebPModule } from '../../codec-impl/webp/enc/webp_enc';
+import wasmUrl from 'url:../../codec-impl/webp/enc/webp_enc.wasm';
 import { EncodeOptions } from './encoder-meta';
 import { initEmscriptenModule } from '../util';
 

src/codecs/webp/options.tsx

@@ -1,5 +1,4 @@
 import { h, Component } from 'preact';
-import { bind } from '../../lib/initial-util';
 import { inputFieldCheckedAsNumber, inputFieldValueAsNumber, preventDefault } from '../../lib/util';
 import { EncodeOptions, WebPImageHint } from './encoder-meta';
 import * as style from '../../components/Options/style.module.scss';
@@ -41,8 +40,7 @@ export default class WebPEncoderOptions extends Component<Props, State> {
     showAdvanced: false,
   };
 
-  @bind
-  onChange(event: Event) {
+  onChange = (event: Event) => {
     const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
     const lossless = inputFieldCheckedAsNumber(form.lossless);
     const { options } = this.props;

src/components/App/index.tsx

@@ -1,13 +1,13 @@
 import { h, Component } from 'preact';
 
-import { bind, linkRef, Fileish } from '../../lib/initial-util';
+import { linkRef, Fileish } from '../../lib/initial-util';
 import * as style from './style.module.scss';
 import { FileDropEvent } from 'file-drop-element';
 import 'file-drop-element';
-import SnackBarElement, { SnackOptions } from '../../lib/SnackBar';
-import '../../lib/SnackBar';
-import Intro from '../intro';
-import '../custom-els/LoadingSpinner';
+import SnackBarElement, { SnackOptions } from '../../lib/SnackBar/index';
+import '../../lib/SnackBar/index';
+import Intro from '../intro/index';
+import '../custom-els/LoadingSpinner/index';
 
 const ROUTE_EDITOR = '/editor';
 
@@ -43,6 +43,12 @@ export default class App extends Component<Props, State> {
   constructor() {
     super();
 
+    this.onFileDrop = this.onFileDrop.bind(this);
+    this.onIntroPickFile = this.onIntroPickFile.bind(this);
+    this.showSnack = this.showSnack.bind(this);
+    this.onPopState = this.onPopState.bind(this);
+    this.openEditor = this.openEditor.bind(this);
+
     compressPromise.then((module) => {
       this.setState({ Compress: module.default });
     }).catch((e) => {
@@ -61,7 +67,8 @@ export default class App extends Component<Props, State> {
     });
 
     // In development, persist application state across hot reloads:
-    if (process.env.NODE_ENV === 'development') {
+    // if (process.env.NODE_ENV === 'development') {
+    if (module.hot) {
       this.setState(window.STATE);
       const oldCDU = this.componentDidUpdate;
       this.componentDidUpdate = (props, state, prev) => {
@@ -81,7 +88,6 @@ export default class App extends Component<Props, State> {
     window.addEventListener('popstate', this.onPopState);
   }
 
-  @bind
   private onFileDrop({ files }: FileDropEvent) {
     if (!files || files.length === 0) return;
     const file = files[0];
@@ -89,24 +95,20 @@ export default class App extends Component<Props, State> {
     this.setState({ file });
   }
 
-  @bind
   private onIntroPickFile(file: File | Fileish) {
     this.openEditor();
     this.setState({ file });
   }
 
-  @bind
   private showSnack(message: string, options: SnackOptions = {}): Promise<string> {
     if (!this.snackbar) throw Error('Snackbar missing');
     return this.snackbar.showSnackbar(message, options);
   }
 
-  @bind
   private onPopState() {
     this.setState({ isEditorOpen: location.pathname === ROUTE_EDITOR });
   }
 
-  @bind
   private openEditor() {
     if (this.state.isEditorOpen) return;
     // Change path, but preserve query string.

src/components/Options/index.tsx

@@ -1,7 +1,6 @@
 import { h, Component } from 'preact';
 
 import * as style from './style.module.scss';
-import { bind } from '../../lib/initial-util';
 import { cleanSet, cleanMerge } from '../../lib/clean-modify';
 import OxiPNGEncoderOptions from '../../codecs/oxipng/options';
 import MozJpegEncoderOptions from '../../codecs/mozjpeg/options';
@@ -82,8 +81,7 @@ export default class Options extends Component<Props, State> {
     encodersSupported.then(encoderSupportMap => this.setState({ encoderSupportMap }));
   }
 
-  @bind
-  private onEncoderTypeChange(event: Event) {
+  private onEncoderTypeChange = (event: Event) => {
     const el = event.currentTarget as HTMLSelectElement;
 
     // The select element only has values matching encoder types,
@@ -92,8 +90,7 @@ export default class Options extends Component<Props, State> {
     this.props.onEncoderTypeChange(type);
   }
 
-  @bind
-  private onPreprocessorEnabledChange(event: Event) {
+  private onPreprocessorEnabledChange = (event: Event) => {
     const el = event.currentTarget as HTMLInputElement;
     const preprocessor = el.name.split('.')[0] as keyof PreprocessorState;
 
@@ -102,15 +99,13 @@ export default class Options extends Component<Props, State> {
     );
   }
 
-  @bind
-  private onQuantizerOptionsChange(opts: QuantizeOptions) {
+  private onQuantizerOptionsChange = (opts: QuantizeOptions) => {
     this.props.onPreprocessorOptionsChange(
       cleanMerge(this.props.preprocessorState, 'quantizer', opts),
     );
   }
 
-  @bind
-  private onResizeOptionsChange(opts: ResizeOptions) {
+  private onResizeOptionsChange = (opts: ResizeOptions) => {
     this.props.onPreprocessorOptionsChange(
       cleanMerge(this.props.preprocessorState, 'resize', opts),
     );

src/components/Output/index.tsx

@@ -3,7 +3,7 @@ import PinchZoom, { ScaleToOpts } from './custom-els/PinchZoom';
 import './custom-els/PinchZoom';
 import './custom-els/TwoUp';
 import * as style from './style.module.scss';
-import { bind, linkRef } from '../../lib/initial-util';
+import { linkRef } from '../../lib/initial-util';
 import { shallowEqual, drawDataToCanvas } from '../../lib/util';
 import {
     ToggleBackgroundIcon,
@@ -135,29 +135,25 @@ export default class Output extends Component<Props, State> {
     return props.rightCompressed || (props.source && props.source.processed);
   }
 
-  @bind
-  private toggleBackground() {
+  private toggleBackground = () => {
     this.setState({
       altBackground: !this.state.altBackground,
     });
   }
 
-  @bind
-  private zoomIn() {
+  private zoomIn = () => {
     if (!this.pinchZoomLeft) throw Error('Missing pinch-zoom element');
 
     this.pinchZoomLeft.scaleTo(this.state.scale * 1.25, scaleToOpts);
   }
 
-  @bind
-  private zoomOut() {
+  private zoomOut = () => {
     if (!this.pinchZoomLeft) throw Error('Missing pinch-zoom element');
 
     this.pinchZoomLeft.scaleTo(this.state.scale / 1.25, scaleToOpts);
   }
 
-  @bind
-  private onRotateClick() {
+  private onRotateClick = () => {
     const { inputProcessorState } = this.props;
     if (!inputProcessorState) return;
 
@@ -170,8 +166,7 @@ export default class Output extends Component<Props, State> {
     this.props.onInputProcessorChange(newState);
   }
 
-  @bind
-  private onScaleValueFocus() {
+  private onScaleValueFocus = () => {
     this.setState({ editingScale: true }, () => {
       if (this.scaleInput) {
         // Firefox unfocuses the input straight away unless I force a style calculation here. I have
@@ -182,13 +177,11 @@ export default class Output extends Component<Props, State> {
     });
   }
 
-  @bind
-  private onScaleInputBlur() {
+  private onScaleInputBlur = () => {
     this.setState({ editingScale: false });
   }
 
-  @bind
-  private onScaleInputChanged(event: Event) {
+  private onScaleInputChanged = (event: Event) => {
     const target = event.target as HTMLInputElement;
     const percent = parseFloat(target.value);
     if (isNaN(percent)) return;
@@ -197,8 +190,7 @@ export default class Output extends Component<Props, State> {
     this.pinchZoomLeft.scaleTo(percent / 100, scaleToOpts);
   }
 
-  @bind
-  private onPinchZoomLeftChange(event: Event) {
+  private onPinchZoomLeftChange = (event: Event) => {
     if (!this.pinchZoomRight || !this.pinchZoomLeft) throw Error('Missing pinch-zoom element');
     this.setState({
       scale: this.pinchZoomLeft.scale,
@@ -218,8 +210,7 @@ export default class Output extends Component<Props, State> {
    *
    * @param event Event to redirect
    */
-  @bind
-  private onRetargetableEvent(event: Event) {
+  private onRetargetableEvent = (event: Event) => {
     const targetEl = event.target as HTMLElement;
     if (!this.pinchZoomLeft) throw Error('Missing pinch-zoom element');
     // If the event is on the handle of the two-up, let it through,

src/components/compress/index.tsx

@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { bind, Fileish } from '../../lib/initial-util';
+import { Fileish } from '../../lib/initial-util';
 import { blobToImg, drawableToImageData, blobToText } from '../../lib/util';
 import * as style from './style.module.scss';
 import Output from '../Output';
@@ -254,8 +254,7 @@ export default class Compress extends Component<Props, State> {
     import('../../lib/sw-bridge').then(({ mainAppLoaded }) => mainAppLoaded());
   }
 
-  @bind
-  private onMobileWidthChange() {
+  private onMobileWidthChange = () => {
     this.setState({ mobileView: this.widthQuery.matches });
   }
 
@@ -344,8 +343,7 @@ export default class Compress extends Component<Props, State> {
     });
   }
 
-  @bind
-  private async onInputProcessorChange(options: InputProcessorState): Promise<void> {
+  private onInputProcessorChange = async (options: InputProcessorState): Promise<void> => {
     const source = this.state.source;
     if (!source) return;
 
@@ -396,8 +394,7 @@ export default class Compress extends Component<Props, State> {
     }
   }
 
-  @bind
-  private async updateFile(file: File | Fileish) {
+  private updateFile = async (file: File | Fileish) => {
     const loadingCounter = this.state.loadingCounter + 1;
     // Either processor is good enough here.
     const processor = this.leftProcessor;

src/components/intro/index.tsx

@@ -1,6 +1,6 @@
 import { h, Component } from 'preact';
 
-import { bind, linkRef, Fileish } from '../../lib/initial-util';
+import { linkRef, Fileish } from '../../lib/initial-util';
 import '../custom-els/LoadingSpinner';
 
 import logo from 'url:./imgs/logo.svg';
@@ -67,13 +67,11 @@ export default class Intro extends Component<Props, State> {
     window.addEventListener('appinstalled', this.onAppInstalled);
   }
 
-  @bind
-  private resetFileInput() {
+  private resetFileInput = () => {
     this.fileInput!.value = '';
   }
 
-  @bind
-  private onFileChange(event: Event): void {
+  private onFileChange = (event: Event) => {
     const fileInput = event.target as HTMLInputElement;
     const file = fileInput.files && fileInput.files[0];
     if (!file) return;
@@ -81,13 +79,11 @@ export default class Intro extends Component<Props, State> {
     this.props.onFile(file);
   }
 
-  @bind
-  private onButtonClick() {
+  private onButtonClick = () => {
     this.fileInput!.click();
   }
 
-  @bind
-  private async onDemoClick(index: number, event: Event) {
+  private onDemoClick = async (index: number, event: Event) => {
     try {
       this.setState({ fetchingDemoIndex: index });
       const demo = demos[index];
@@ -104,8 +100,7 @@ export default class Intro extends Component<Props, State> {
     }
   }
 
-  @bind
-  private onBeforeInstallPromptEvent(event: BeforeInstallPromptEvent) {
+  private onBeforeInstallPromptEvent = (event: BeforeInstallPromptEvent) => {
     // Don't show the mini-infobar on mobile
     event.preventDefault();
 
@@ -121,8 +116,7 @@ export default class Intro extends Component<Props, State> {
     ga('send', 'event', gaEventInfo);
   }
 
-  @bind
-  private async onInstallClick(event: Event) {
+  private onInstallClick = async (event: Event) => {
     // Get the deferred beforeinstallprompt event
     const beforeInstallEvent = this.state.beforeInstallEvent;
     // If there's no deferred prompt, bail.
@@ -150,8 +144,7 @@ export default class Intro extends Component<Props, State> {
     }
   }
 
-  @bind
-  private onAppInstalled() {
+  private onAppInstalled = () => {
     // We don't need the install button, if it's shown
     this.setState({ beforeInstallEvent: undefined });
 

src/components/range/index.tsx

@@ -2,7 +2,7 @@ import { h, Component } from 'preact';
 import * as style from './style.module.scss';
 import RangeInputElement from '../../custom-els/RangeInput';
 import '../../custom-els/RangeInput';
-import { linkRef, bind } from '../../lib/initial-util';
+import { linkRef } from '../../lib/initial-util';
 
 interface Props extends JSX.HTMLAttributes {}
 interface State {}
@@ -10,8 +10,7 @@ interface State {}
 export default class Range extends Component<Props, State> {
   rangeWc?: RangeInputElement;
 
-  @bind
-  private onTextInput(event: Event) {
+  private onTextInput = (event: Event) => {
     const input = event.target as HTMLInputElement;
     const value = input.value.trim();
     if (!value) return;

src/components/results/index.tsx

@@ -5,7 +5,7 @@ import FileSize from './FileSize';
 import { DownloadIcon, CopyAcrossIcon, CopyAcrossIconProps } from '../../lib/icons';
 import '../custom-els/LoadingSpinner';
 import { SourceImage } from '../compress';
-import { Fileish, bind } from '../../lib/initial-util';
+import { Fileish } from '../../lib/initial-util';
 
 interface Props {
   loading: boolean;
@@ -52,14 +52,12 @@ export default class Results extends Component<Props, State> {
     }
   }
 
-  @bind
-  private onCopyToOtherClick(event: Event) {
+  private onCopyToOtherClick = (event: Event) => {
     event.preventDefault();
     this.props.onCopyToOtherClick();
   }
 
-  @bind
-  onDownload() {
+  onDownload = () => {
     // GA can’t do floats. So we round to ints. We're deliberately rounding to nearest kilobyte to
     // avoid cases where exact image sizes leak something interesting about the user.
     const before = Math.round(this.props.source!.file.size / 1024);

src/custom-els/RangeInput/index.ts

@@ -1,5 +1,4 @@
 import PointerTracker from 'pointer-tracker';
-import { bind } from '../../lib/initial-util';
 import * as style from './styles.module.css';
 
 const RETARGETED_EVENTS = ['focus', 'blur'];
@@ -23,6 +22,7 @@ class RangeInputElement extends HTMLElement {
 
   constructor() {
     super();
+
     this._input = document.createElement('input');
     this._input.type = 'range';
     this._input.className = style.input;
@@ -38,10 +38,12 @@ class RangeInputElement extends HTMLElement {
       },
     });
 
+    this._retargetEvent = this._retargetEvent.bind(this);
     for (const event of RETARGETED_EVENTS) {
       this._input.addEventListener(event, this._retargetEvent, true);
     }
 
+    this._update = this._update.bind(this);
     for (const event of UPDATE_EVENTS) {
       this._input.addEventListener(event, this._update, true);
     }
@@ -80,14 +82,12 @@ class RangeInputElement extends HTMLElement {
     this._update();
   }
 
-  @bind
   private _retargetEvent(event: Event) {
     event.stopImmediatePropagation();
     const retargetted = new Event(event.type, event);
     this.dispatchEvent(retargetted);
   }
 
-  @bind
   private _update() {
     const value = Number(this.value) || 0;
     const min = Number(this.min) || 0;

src/index.html

@@ -12,6 +12,6 @@
     <link rel="manifest" href="/manifest.json">
   </head>
   <body>
-    <script src="./index.ts"></script>
+    <script type="module" src="./index.ts"></script>
   </body>
 </html>

src/index.ts

@@ -1,18 +1,7 @@
 declare module '@webcomponents/custom-elements';
 
-// Patch Worker to ignore `importScripts("x.css")` generated by Parcel:
-const W = self.Worker;
-self.Worker = function (url: string | URL, options?: WorkerOptions) {
-  const code = `
-    importScripts=(function(){
-      return this.apply(self,[].slice.call(arguments).map(function(x){return !/\\.css$/i.test(x) && new URL(x,self.url).href}).filter(Boolean))
-    }).bind(importScripts);importScripts(self.url=${JSON.stringify(url)})
-  `.trim();
-  return new W(URL.createObjectURL(new Blob([code], { type: 'text/javascript' })), options);
-} as any as (typeof Worker);
-
 function init() {
-  require('./init-app.tsx');
+  import('./init-app.tsx');
 }
 
 if (!('customElements' in self)) {
@@ -21,7 +10,7 @@ if (!('customElements' in self)) {
   init();
 }
 
-if (typeof process.env.PRERENDER === 'undefined') {
+if (typeof window !== 'undefined') {
   // Determine the current display mode.
   let displayMode = 'browser';
   const mqStandAlone = '(display-mode: standalone)';

src/init-app.tsx

@@ -1,7 +1,7 @@
 import { h, render } from 'preact';
 import './lib/fix-pmc.mjs';
 import './style/index.scss';
-import App from './components/App';
+import App from './components/App/index.tsx';
 
 // Find the outermost Element in our server-rendered HTML structure.
 let root = document.getElementById('app_root') as Element;
@@ -10,12 +10,7 @@ let root = document.getElementById('app_root') as Element;
 root = render(<App />, document.body, root);
 root.setAttribute('id', 'app_root');
 
-if (process.env.NODE_ENV !== 'production') {
+if (module.hot) {
   // Enable support for React DevTools and some helpful console warnings:
-  require('preact/debug');
-
-  // Full HMR may not be working due to https://github.com/parcel-bundler/parcel/issues/5016
-  if (module.hot) {
-    module.hot.accept();
-  }
+  import('preact/debug');
 }

src/lib/initial-util.ts

@@ -1,33 +1,6 @@
 // This file contains the utils that are needed for the very first rendering of the page. They're
 // here because WebPack isn't quite smart enough to split things in the same file.
 
-/**
- * A decorator that binds values to their class instance.
- * @example
- * class C {
- *   @bind
- *   foo () {
- *     return this;
- *   }
- * }
- * let f = new C().foo;
- * f() instanceof C;    // true
- */
-export function bind(target: any, propertyKey: string, descriptor: PropertyDescriptor) {
-  return {
-    // the first time the prototype property is accessed for an instance,
-    // define an instance property pointing to the bound function.
-    // This effectively "caches" the bound prototype method as an instance property.
-    get() {
-      const bound = descriptor.value.bind(this);
-      Object.defineProperty(this, propertyKey, {
-        value: bound,
-      });
-      return bound;
-    },
-  };
-}
-
 /** Creates a function ref that assigns its value to a given property of an object.
  *  @example
  *  // element is stored as `this.foo` when rendered.

src/lib/sw-bridge.ts

@@ -60,11 +60,11 @@ export function getSharedImage(): Promise<File> {
 /** Set up the service worker and monitor changes */
 export async function offliner(showSnack: SnackBarElement['showSnackbar']) {
   // This needs to be a typeof because Webpack.
-  if (process.env.PRERENDER) return;
+  if (typeof window === 'undefined') return;
 
   if (!navigator.serviceWorker) return;
 
-  if (process.env.NODE_ENV === 'production') {
+  if (process.env.NODE_ENV === 'production' && !module.hot) {
     navigator.serviceWorker.register('../sw');
   }
 

src/missing-types.d.ts

@@ -45,6 +45,11 @@ declare module 'data-url:*' {
   export default value;
 }
 
+declare module 'bundle:*' {
+  const value: string;
+  export default value;
+}
+
 declare var VERSION: string;
 
 declare var ga: {

tsconfig.json

@@ -12,10 +12,18 @@
     "jsx": "react",
     "jsxFactory": "h",
     "allowJs": false,
-    "baseUrl": "."
+    "baseUrl": ".",
+    "paths": {
+      "codecs/*": [
+        "codecs/*"
+      ]
+    }
   },
   "exclude": [
     "src/sw/**/*",
-    "src/codecs/processor-worker/**/*"
+    "src/codecs/processor-worker/**/*",
+    ".cache",
+    "public",
+    "node_modules"
   ]
 }