diff --git a/src/services/SearchStore.ts b/src/services/SearchStore.ts index 9f537f0452..56a742955b 100644 --- a/src/services/SearchStore.ts +++ b/src/services/SearchStore.ts @@ -1,6 +1,17 @@ import { IMenuItem } from './MenuStore'; import { OperationModel } from './models'; -import worker from './SearchWorker.worker'; + +let worker; + +if (typeof URL !== 'undefined') { + try { + worker = require('workerize-loader?inline&fallback=false!./SearchWorker.worker').default; + } catch (e) { + worker = require('./SearchWorker.worker').default; + } +} else { + worker = require('./SearchWorker.worker').default; +} export class SearchStore { searchWorker = new worker(); diff --git a/webpack.config.ts b/webpack.config.ts index 16d976adfc..c1924f2188 100644 --- a/webpack.config.ts +++ b/webpack.config.ts @@ -66,18 +66,6 @@ export default env => { module: { rules: [ - { - test: /\.worker\.ts$/, - use: [ - { - loader: 'workerize-loader', - options: { - inline: true, - fallback: false, - }, - }, - ], - }, { test: /\.tsx?$/, use: [ diff --git a/yarn.lock b/yarn.lock index 6b95a90afa..fda8c6e3ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8357,7 +8357,7 @@ wordwrap@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" -workerize-loader@^1.0.1: +workerize-loader@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/workerize-loader/-/workerize-loader-1.0.2.tgz#ec87bfd2f97a589907172c5ebbcc5c9abbeb7686" dependencies: