diff --git a/public/app/core/crash/index.ts b/public/app/core/crash/index.ts index 79e64e2b2fb..18f92c39d35 100644 --- a/public/app/core/crash/index.ts +++ b/public/app/core/crash/index.ts @@ -8,7 +8,9 @@ import { corsWorker } from 'app/core/utils/CorsWorker'; import { contextSrv } from '../services/context_srv'; import { corsSharedWorker, sharedWorkersSupported } from '../utils/CorsSharedWorker'; +import clientWorkerUrl from './client.worker?worker&url'; import { isChromePerformance, prepareContext } from './crash.utils'; +import detectorWorkerUrl from './detector.worker?sharedworker&url'; const logger = createMonitoringLogger('core.crash-detection'); @@ -48,7 +50,7 @@ export function initializeCrashDetection() { dbName: 'grafana.crashes', createClientWorker(): Worker { - return corsWorker('./client.worker', { name: 'crash' }); + return corsWorker(clientWorkerUrl, { name: 'crash' }); }, /** @@ -61,7 +63,7 @@ export function initializeCrashDetection() { * We guarantee the type assertion is correct by returning a SharedWorker in CorsSharedWorker constructor. */ createDetectorWorker() { - return corsSharedWorker('./detector.worker', { name: 'crashDetector' }); + return corsSharedWorker(detectorWorkerUrl, { name: 'crashDetector' }); }, reportCrash: async (report) => { diff --git a/public/app/features/alerting/unified/createRouteGroupsMatcherWorker.ts b/public/app/features/alerting/unified/createRouteGroupsMatcherWorker.ts index 831714e6e79..270b2be845a 100644 --- a/public/app/features/alerting/unified/createRouteGroupsMatcherWorker.ts +++ b/public/app/features/alerting/unified/createRouteGroupsMatcherWorker.ts @@ -1,5 +1,7 @@ import { corsWorker } from 'app/core/utils/CorsWorker'; +import matcherWorkerUrl from './routeGroupsMatcher.worker?worker&url'; + // CorsWorker is needed as a workaround for CORS issue caused // by static assets served from an url different from origin -export const createWorker = () => corsWorker('./routeGroupsMatcher.worker.ts', { name: 'routeGroupsMatcher' }); +export const createWorker = () => corsWorker(matcherWorkerUrl, { name: 'routeGroupsMatcher' }); diff --git a/public/app/features/dashboard-scene/saving/createDetectChangesWorker.ts b/public/app/features/dashboard-scene/saving/createDetectChangesWorker.ts index 5a144e2c387..a36fe7d651b 100644 --- a/public/app/features/dashboard-scene/saving/createDetectChangesWorker.ts +++ b/public/app/features/dashboard-scene/saving/createDetectChangesWorker.ts @@ -1,3 +1,5 @@ import { corsWorker } from 'app/core/utils/CorsWorker'; -export const createWorker = () => corsWorker('./DetectChangesWorker.ts', { name: 'detectChanges' }); +import detectChangesWorkerUrl from './DetectChangesWorker?worker&url'; + +export const createWorker = () => corsWorker(detectChangesWorkerUrl, { name: 'detectChanges' }); diff --git a/public/app/features/live/centrifuge/createCentrifugeServiceWorker.ts b/public/app/features/live/centrifuge/createCentrifugeServiceWorker.ts index 6f3914245cf..d0747dc0007 100644 --- a/public/app/features/live/centrifuge/createCentrifugeServiceWorker.ts +++ b/public/app/features/live/centrifuge/createCentrifugeServiceWorker.ts @@ -1,3 +1,5 @@ import { corsWorker } from 'app/core/utils/CorsWorker'; -export const createWorker = () => corsWorker('./service.worker.ts', { name: 'centrifuge' }); +import centrifugeWorkerUrl from './service.worker?worker&url'; + +export const createWorker = () => corsWorker(centrifugeWorkerUrl, { name: 'centrifuge' }); diff --git a/public/app/plugins/panel/nodeGraph/createLayoutWorker.ts b/public/app/plugins/panel/nodeGraph/createLayoutWorker.ts index 9419a3b7104..f9ad1e32463 100644 --- a/public/app/plugins/panel/nodeGraph/createLayoutWorker.ts +++ b/public/app/plugins/panel/nodeGraph/createLayoutWorker.ts @@ -1,4 +1,7 @@ import { corsWorker } from 'app/core/utils/CorsWorker'; -export const createWorker = () => corsWorker('./layout.worker.js', { name: 'nodeGraphLayout' }); -export const createMsaglWorker = () => corsWorker('./layeredLayout.worker.js', { name: 'nodeGraphLayeredLayout' }); +import layeredLayoutWorkerUrl from './layeredLayout.worker?worker&url'; +import layoutWorkerUrl from './layout.worker?worker&url'; + +export const createWorker = () => corsWorker(layoutWorkerUrl, { name: 'nodeGraphLayout' }); +export const createMsaglWorker = () => corsWorker(layeredLayoutWorkerUrl, { name: 'nodeGraphLayeredLayout' });