Update emscripten (#4)

cyrilwanner · Jul 22, 2020 · 09f32e9 · 09f32e9
1 parent 010d1f8
commit 09f32e9
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
  push:
- branches: [ master ]
+ branches: [ master, feature/fix-ci ]
  pull_request:
  branches: [ master ]
 

diff --git a/packages/mozjpeg/Dockerfile b/packages/mozjpeg/Dockerfile
@@ -1,4 +1,4 @@
-FROM trzeci/emscripten
+FROM trzeci/emscripten:1.39.18-upstream
 
 RUN apt-get update && \
  apt-get install -y \

diff --git a/packages/mozjpeg/__tests__/index.test.ts b/packages/mozjpeg/__tests__/index.test.ts
@@ -19,8 +19,6 @@ describe('mozjpeg', () => {
  // test all image sizes
  ['tiny', 'small', 'medium', 'large'].forEach((size) => {
  it(`encodes a ${size} image`, async () => {
- jest.setTimeout(60000);
-
  const {
  data,
  info: { width, height, channels },

diff --git a/packages/mozjpeg/__tests__/performance.test.ts b/packages/mozjpeg/__tests__/performance.test.ts
@@ -7,7 +7,7 @@ describe('mozjpeg performance', () => {
  });
 
  it('encodes many images', async () => {
- jest.setTimeout(600000);
+ jest.setTimeout(60000);
  process.setMaxListeners(0);
 
  const {

diff --git a/packages/mozjpeg/build.sh b/packages/mozjpeg/build.sh
@@ -12,7 +12,6 @@ emcc \
  -s WASM=1 \
  -Oz \
  -flto \
- --llvm-lto 1 \
  -s FILESYSTEM=0 \
  -I /lib/mozjpeg \
  -s 'EXPORT_NAME="mozjpeg"' \

diff --git a/packages/mozjpeg/src/index.ts b/packages/mozjpeg/src/index.ts
@@ -13,10 +13,13 @@ const initModule = (): Promise<void> => {
  return new Promise((resolve) => {
  // add a new job to the queue
  queue.push(() => {
- mozjpeg = Module();
- mozjpeg.onRuntimeInitialized = (): void => {
- resolve();
- };
+ Module({
+ onRuntimeInitialized: () => {
+ resolve();
+ },
+ }).then((instance) => {
+ mozjpeg = instance;
+ });
  });
 
  // start it if there is no queue

diff --git a/packages/mozjpeg/src/mozjpeg.d.ts b/packages/mozjpeg/src/mozjpeg.d.ts
@@ -4,4 +4,4 @@ export interface MozJPEGModule extends EmscriptenModule {
  freeImage(imagePointer: number): void;
 }
 
-export default function(): MozJPEGModule;
+export default function(mozjpeg: { onRuntimeInitialized: () => void }): MozJPEGModule;
diff --git a/packages/oxipng/Dockerfile b/packages/oxipng/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust
+FROM rust:1.44
 
 RUN rustup target add wasm32-unknown-unknown
 RUN mkdir /opt/wabt && \

diff --git a/packages/oxipng/__tests__/index.test.ts b/packages/oxipng/__tests__/index.test.ts
@@ -18,7 +18,7 @@ describe('oxipng', () => {
  // test all image sizes
  ['tiny', 'small', 'medium', 'large'].forEach((size) => {
  it(`encodes a ${size} image`, async () => {
- jest.setTimeout(60000);
+ jest.setTimeout(20000);
 
  const {
  data,

diff --git a/packages/oxipng/__tests__/performance.test.ts b/packages/oxipng/__tests__/performance.test.ts
@@ -7,7 +7,7 @@ describe('oxipng performance', () => {
  });
 
  it('encodes many images', async () => {
- jest.setTimeout(600000);
+ jest.setTimeout(60000);
  process.setMaxListeners(0);
 
  const { data } = await getImage('images/small.png');