From 8581785869e34b5a1be64e9b66680d714d5aba19 Mon Sep 17 00:00:00 2001 From: Ingvar Stepanyan Date: Wed, 18 Nov 2020 19:47:51 +0000 Subject: [PATCH] Rebase fixes --- src/copy/_headers | 4 ++++ src/features/encoders/webP/worker/webpEncode.ts | 13 ++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/copy/_headers b/src/copy/_headers index 1de137cc..403ffae5 100644 --- a/src/copy/_headers +++ b/src/copy/_headers @@ -8,3 +8,7 @@ /* Cross-Origin-Embedder-Policy: require-corp Cross-Origin-Opener-Policy: same-origin +# Origin trial for WebAssembly SIMD. +# ATTENTION: This one is configured for merge-v2-codecs--squoosh.netlify.app preview. +# For production squoosh.app, replace with AgoKiDqjr0GVPtrwV/vuVlrrSvbDa5Yb99s+q66ly816DrrAQ8Cdas33NgDtmhxM4BtDP9PEdyuxHPyTQHD5ZAcAAABUeyJvcmlnaW4iOiJodHRwczovL3NxdW9vc2guYXBwOjQ0MyIsImZlYXR1cmUiOiJXZWJBc3NlbWJseVNpbWQiLCJleHBpcnkiOjE2MDg2NzI5OTR9. + Origin-Trial: Anr6rjkQpYjMoR5pS5JZUJvCBZfYCHkrevHoDVENE+km6fqRscjRrsY0CWTKY0FH1KX+gv0aw/W2liJw8H58Uw8AAABteyJvcmlnaW4iOiJodHRwczovL21lcmdlLXYyLWNvZGVjcy0tc3F1b29zaC5uZXRsaWZ5LmFwcDo0NDMiLCJmZWF0dXJlIjoiV2ViQXNzZW1ibHlTaW1kIiwiZXhwaXJ5IjoxNjA5MzU3MTg5fQ== diff --git a/src/features/encoders/webP/worker/webpEncode.ts b/src/features/encoders/webP/worker/webpEncode.ts index f8ba2eaf..4725cfbd 100644 --- a/src/features/encoders/webP/worker/webpEncode.ts +++ b/src/features/encoders/webP/worker/webpEncode.ts @@ -17,26 +17,17 @@ import { initEmscriptenModule } from 'features/worker-utils'; import { simd } from 'wasm-feature-detect'; import wasmUrl from 'url:codecs/webp/enc/webp_enc.wasm'; - import wasmUrlWithMTAndSIMD from 'url:codecs/webp/enc/webp_enc_simd.wasm'; -import workerUrlWithSIMD from 'omt:codecs/webp/enc/webp_enc_simd.worker.js'; let emscriptenModule: Promise; async function init() { if (await simd()) { const webpEncoder = await import('codecs/webp/enc/webp_enc_simd'); - return initEmscriptenModule( - webpEncoder.default, - wasmUrlWithMTAndSIMD, - workerUrlWithSIMD, - ); + return initEmscriptenModule(webpEncoder.default, wasmUrlWithMTAndSIMD); } const webpEncoder = await import('codecs/webp/enc/webp_enc'); - return initEmscriptenModule( - webpEncoder.default, - wasmUrl, - ); + return initEmscriptenModule(webpEncoder.default, wasmUrl); } export default async function encode(