From 2fa48d3cc9d11dcd2692f555d99e625b56b10dff Mon Sep 17 00:00:00 2001 From: Nick Oliver Date: Fri, 28 Feb 2020 20:24:49 -0700 Subject: [PATCH] fix(SearchStore): avoid loading issues Blob URLs may be disabled by CORS (ex: #764) but should not block execution when the disableSearch option is true --- src/services/SearchStore.ts | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/services/SearchStore.ts b/src/services/SearchStore.ts index ab80b71c8a..d096debe3f 100644 --- a/src/services/SearchStore.ts +++ b/src/services/SearchStore.ts @@ -4,21 +4,23 @@ import { OperationModel } from './models'; import Worker from './SearchWorker.worker'; -let worker: new () => Worker; - -if (IS_BROWSER) { - try { - // tslint:disable-next-line - worker = require('workerize-loader?inline&fallback=false!./SearchWorker.worker'); - } catch (e) { +function getWorker() { + let worker: new () => Worker; + if (IS_BROWSER) { + try { + // tslint:disable-next-line + worker = require('workerize-loader?inline&fallback=false!./SearchWorker.worker'); + } catch (e) { + worker = require('./SearchWorker.worker').default; + } + } else { worker = require('./SearchWorker.worker').default; } -} else { - worker = require('./SearchWorker.worker').default; + return new worker(); } export class SearchStore { - searchWorker = new worker(); + searchWorker = getWorker(); indexItems(groups: Array) { const recurse = items => {