start spring cleaning, use rollup instead of both webpack and rollup

3 files changed, 4 insertions, 4 deletions

diff --git a/src/crypto/workers/cryptoApi.ts b/src/crypto/workers/cryptoApi.ts
index d3b12e26d..46dc7dfaf 100644
--- a/src/crypto/workers/cryptoApi.ts
+++ b/src/crypto/workers/cryptoApi.ts
@@ -110,7 +110,7 @@ export interface CryptoWorkerFactory {
 export class BrowserCryptoWorkerFactory implements CryptoWorkerFactory {
   startWorker(): CryptoWorker {
     const workerCtor = Worker;
-    const workerPath = "/dist/cryptoWorker-bundle.js";
+    const workerPath = "/dist/webextension/browserWorkerEntry.js";
     return new workerCtor(workerPath) as CryptoWorker;
   }
 
@@ -206,7 +206,7 @@ export class CryptoApi {
     };
     this.resetWorkerTimeout(ws);
     work.startTime = timer.performanceNow();
-    setImmediate(() => ws.w!.postMessage(msg));
+    setTimeout(() => ws.w!.postMessage(msg), 0);
   }
 
   resetWorkerTimeout(ws: WorkerState) {
diff --git a/src/crypto/workers/nodeThreadWorker.ts b/src/crypto/workers/nodeThreadWorker.ts
index 1247900f9..d289c14b2 100644
--- a/src/crypto/workers/nodeThreadWorker.ts
+++ b/src/crypto/workers/nodeThreadWorker.ts
@@ -19,7 +19,7 @@ import { CryptoWorkerFactory } from "./cryptoApi";
 // tslint:disable:no-var-requires
 
 import { CryptoWorker } from "./cryptoWorker";
-import os = require("os");
+import os from "os";
 import { CryptoImplementation } from "./cryptoImplementation";
 
 const f = __filename;
diff --git a/src/crypto/workers/synchronousWorker.ts b/src/crypto/workers/synchronousWorker.ts
index b453468d5..f4bcf396c 100644
--- a/src/crypto/workers/synchronousWorker.ts
+++ b/src/crypto/workers/synchronousWorker.ts
@@ -93,7 +93,7 @@ export class SynchronousCryptoWorker {
     }
 
     try {
-      setImmediate(() => this.dispatchMessage({ result, id }));
+      setTimeout(() => this.dispatchMessage({ result, id }), 0);
     } catch (e) {
       console.log("got error during dispatch", e);
     }