fix: Revert "refactor: Reduce bundle size (#1575)" (#1622)

This reverts commit 81dcbe294d.

platform/core/src/classes/StudyLoadingListener.js

@@ -1,10 +1,10 @@
 import cornerstone from 'cornerstone-core';
+import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
 import {
   clearStudyLoadingProgress,
   setStudyLoadingProgress,
 } from '../redux/actions';
 import StackManager from '../utils/StackManager';
-import { getCornerstoneWADOImageLoader } from '../utils/cornerstoneWADOImageLoader';
 
 class BaseLoadingListener {
   constructor(stack, options = {}) {
@@ -103,8 +103,7 @@ class DICOMFileLoadingListener extends BaseLoadingListener {
     this._checkCachedData();
   }
 
-  async _checkCachedData() {
-    const cornerstoneWADOImageLoader = await getCornerstoneWADOImageLoader();
+  _checkCachedData() {
     const dataSet = cornerstoneWADOImageLoader.wadouri.dataSetCacheManager.get(
       this._dataSetUrl
     );

platform/core/src/studies/services/wado/studyInstanceHelpers.js

@@ -1,8 +1,8 @@
 import DICOMWeb from '../../../DICOMWeb';
 import metadataProvider from '../../../classes/MetadataProvider';
 import getWADORSImageId from '../../../utils/getWADORSImageId';
+import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
 import getReferencedSeriesSequence from './getReferencedSeriesSequence';
-import { getCornerstoneWADOImageLoader } from '../../../utils/cornerstoneWADOImageLoader';
 
 /**
  * Create a plain JS object that describes a study (a study descriptor object)
@@ -160,7 +160,6 @@ async function makeSOPInstance(server, study, instance) {
 
     const wadoRSMetadata = Object.assign(instance);
 
-    const cornerstoneWADOImageLoader = await getCornerstoneWADOImageLoader();
     if (sopInstance.NumberOfFrames) {
       for (let i = 0; i < sopInstance.NumberOfFrames; i++) {
         const wadorsImageId = getWADORSImageId(sopInstance, i);

platform/core/src/utils/cornerstoneWADOImageLoader.js

@@ -1,5 +0,0 @@
-export function getCornerstoneWADOImageLoader() {
-  return import(
-    /* webpackChunkName: "CornerstoneWADOImageLoader" */ 'cornerstone-wado-image-loader'
-  );
-}

platform/core/src/utils/dicomLoaderService.js

@@ -1,7 +1,7 @@
 import cornerstone from 'cornerstone-core';
+import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
 import { api } from 'dicomweb-client';
 import DICOMWeb from '../DICOMWeb';
-import { getCornerstoneWADOImageLoader } from './cornerstoneWADOImageLoader';
 
 const getImageId = imageObj => {
   if (!imageObj) {
@@ -86,7 +86,7 @@ const getImageLoaderType = imageId => {
 };
 
 class DicomLoaderService {
-  async getLocalData(dataset, studies) {
+  getLocalData(dataset, studies) {
     if (dataset && dataset.localFile) {
       // Use referenced imageInstance
       const imageInstance = getImageInstance(dataset);
@@ -98,7 +98,6 @@ class DicomLoaderService {
       }
 
       if (!someInvalidStrings(imageId)) {
-        const cornerstoneWADOImageLoader = await getCornerstoneWADOImageLoader();
         return cornerstoneWADOImageLoader.wadouri.loadFileRequest(imageId);
       }
     }
@@ -177,16 +176,16 @@ class DicomLoaderService {
     }
   }
 
-  async *getLoaderIterator(dataset, studies) {
-    yield await this.getLocalData(dataset, studies);
+  *getLoaderIterator(dataset, studies) {
+    yield this.getLocalData(dataset, studies);
     yield this.getDataByImageType(dataset);
     yield this.getDataByDatasetType(dataset);
   }
 
-  async findDicomDataPromise(dataset, studies) {
+  findDicomDataPromise(dataset, studies) {
     const loaderIterator = this.getLoaderIterator(dataset, studies);
     // it returns first valid retriever method.
-    for await (const loader of loaderIterator) {
+    for (const loader of loaderIterator) {
       if (loader) {
         return loader;
       }