From 01997ffebed9c8cc0430a36310450dacae69e707 Mon Sep 17 00:00:00 2001 From: oltionchampari Date: Thu, 2 Dec 2021 10:57:40 +0100 Subject: [PATCH] Add prefix to worker import path --- dist/workers/WorkerManager.js | 2 +- dist/workers/WorkerManager.js.map | 2 +- src/workers/WorkerManager.ts | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dist/workers/WorkerManager.js b/dist/workers/WorkerManager.js index ef9e85b..a608ba0 100644 --- a/dist/workers/WorkerManager.js +++ b/dist/workers/WorkerManager.js @@ -128,7 +128,7 @@ export class EnrichmentRandomizationWorker extends ATouringWorker { return EnrichmentRandomizationWorker.workers; } getWorkerInstance() { - return new (require('worker-loader?name=EnrichmentScorePermutation.js!./EnrichmentScorePermutation'))(); + return new (require('worker-loader?name=tourdino/EnrichmentScorePermutation.js!./EnrichmentScorePermutation'))(); } } EnrichmentRandomizationWorker.workers = []; diff --git a/dist/workers/WorkerManager.js.map b/dist/workers/WorkerManager.js.map index cf0a62a..06ed002 100644 --- a/dist/workers/WorkerManager.js.map +++ b/dist/workers/WorkerManager.js.map @@ -1 +1 @@ -{"version":3,"file":"WorkerManager.js","sourceRoot":"","sources":["../../src/workers/WorkerManager.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"WorkerManager.js","sourceRoot":"","sources":["../../src/workers/WorkerManager.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/workers/WorkerManager.ts b/src/workers/WorkerManager.ts index 2405d2d..32bbe64 100644 --- a/src/workers/WorkerManager.ts +++ b/src/workers/WorkerManager.ts @@ -12,6 +12,8 @@ interface IWorkerPromise { reject: (value?: Worker) => void; } +const PATH_PREFIX = 'tourdino'; + /** * Allows the concurrent executions of 'window.navigator.hardwareConcurrency' workers. */ @@ -109,7 +111,7 @@ export abstract class ATouringWorker { }; actualWorker.postMessage(data); - } catch(error) { // if the the promise we await is rejected + } catch (error) { // if the the promise we await is rejected reject('Aborted'); // we get no slot ;( } }); @@ -128,7 +130,7 @@ export class JaccardRandomizationWorker extends ATouringWorker { } public getWorkerInstance(): Worker { - return new (require('worker-loader?name=JaccardRandom.js!./JaccardRandom'))(); + return new (require(`worker-loader?name=${PATH_PREFIX}/JaccardRandom.js!./JaccardRandom`))(); } } @@ -142,7 +144,7 @@ export class AdjustedRandRandomizationWorker extends ATouringWorker { } public getWorkerInstance(): Worker { - return new (require('worker-loader?name=AdjRandRandom.js!./AdjRandRandom'))(); + return new (require(`worker-loader?name=${PATH_PREFIX}/AdjRandRandom.js!./AdjRandRandom`))(); } } @@ -156,6 +158,6 @@ export class EnrichmentRandomizationWorker extends ATouringWorker { } public getWorkerInstance(): Worker { - return new (require('worker-loader?name=EnrichmentScorePermutation.js!./EnrichmentScorePermutation'))(); + return new (require(`worker-loader?name=${PATH_PREFIX}/EnrichmentScorePermutation.js!./EnrichmentScorePermutation`))(); } }