fix(package.json): Bump WADO Image Loader dependency, remove unnecessary worker and codec paths (#727)

Note: had to disable sourcemaps for commonjs modules. This seems to be the only way to prevent memory issues on CircleCI.

docs/latest/deployment/recipes/build-for-production.md

@@ -88,7 +88,6 @@ _/public/config/default.js_
 ```js
 window.config = {
   routerBasename: '/',
-  relativeWebWorkerScriptsPath: '',
   servers: {
     dicomWeb: [
       {

docs/latest/deployment/recipes/embedded-viewer.md

@@ -50,8 +50,6 @@ include tags. Here's how it works:
 window.config = {
   // default: '/'
   routerBasename: '/',
-  // default: ''
-  relativeWebWorkerScriptsPath: '',
   servers: {
     dicomWeb: [
       {

docs/latest/essentials/configuration.md

@@ -24,7 +24,6 @@ _/public/config/default.js_
 ```js
 window.config = {
   routerBasename: '/',
-  relativeWebWorkerScriptsPath: '',
   servers: {
     dicomWeb: [
       {

docs/latest/essentials/data-source.md

@@ -104,7 +104,6 @@ like:
 ```js
 window.config = {
   routerBasename: '/',
-  relativeWebWorkerScriptsPath: '',
   servers: {
     dicomWeb: [
       {

package.json

@@ -33,11 +33,10 @@
     "docs:publish": "./publishStaticSite.sh",
     "start": "yarn run dev",
     "predeploy": "cd example && npm install && yarn run build:package",
-    "preBuild": "yarn run version && yarn run copy:webworkers",
+    "preBuild": "yarn run version",
     "orthanc:up": "docker-compose -f docker/Nginx-Orthanc/docker-compose.yml up",
     "dev:orthanc": "yarn run preBuild && cross-env PORT=5000 REACT_APP_CONFIG=config/docker_nginx-orthanc.js react-scripts start",
     "version": "node -p -e \"'export default \\'' + require('./package.json').version + '\\';'\" > src/version.js",
-    "copy:webworkers": "cpx \"node_modules/cornerstone-wado-image-loader/dist/*.min.js*\" \"public\" -v",
     "cy": "cypress open",
     "cy:run": "cypress run",
     "cy:run:ci": "yarn run cy:run -- --record"
@@ -89,7 +88,7 @@
     "cornerstone-core": "^2.2.8",
     "cornerstone-math": "^0.1.8",
     "cornerstone-tools": "^3.16.0",
-    "cornerstone-wado-image-loader": "^2.2.3",
+    "cornerstone-wado-image-loader": "^3.0.0",
     "dcmjs": "^0.4.7",
     "dicom-parser": "^1.8.3",
     "dicomweb-client": "^0.5.2",

public/config/default.js

@@ -1,8 +1,6 @@
 window.config = {
   // default: '/'
   routerBasename: '/',
-  // default: ''
-  relativeWebWorkerScriptsPath: '',
   showStudyList: true,
   servers: {
     dicomWeb: [

public/config/docker_nginx-orthanc.js

@@ -1,7 +1,6 @@
 window.config = {
   routerBasename: '/',
   showStudyList: true,
-  relativeWebWorkerScriptsPath: '',
   servers: {
     dicomWeb: [
       {

public/config/docker_openresty-orthanc-keycloak.js

@@ -1,7 +1,6 @@
 window.config = {
   routerBasename: '/',
   showStudyList: true,
-  relativeWebWorkerScriptsPath: '',
   servers: {
     // This is an array, but we'll only use the first entry for now
     dicomWeb: [

public/config/docker_openresty-orthanc.js

@@ -1,7 +1,6 @@
 window.config = {
   routerBasename: '/',
   showStudyList: true,
-  relativeWebWorkerScriptsPath: '',
   servers: {
     // This is an array, but we'll only use the first entry for now
     dicomWeb: [

public/config/google.js

@@ -1,6 +1,5 @@
 window.config = {
   routerBasename: '/',
-  relativeWebWorkerScriptsPath: '',
   enableGoogleCloudAdapter: true,
   servers: {
     // This is an array, but we'll only use the first entry for now

public/config/local_dcm4chee.js

@@ -3,7 +3,6 @@ window.config = {
   routerBasename: '/',
   // default: ''
   showStudyList: true,
-  relativeWebWorkerScriptsPath: '',
   servers: {
     dicomWeb: [
       {

rollup.config.js

@@ -50,12 +50,14 @@ export default {
     url(),
     svgr(),
     json(),
-    resolve({ preferBuiltins: true }),
+    builtins(),
+    resolve(),
     babel({
       exclude: 'node_modules/**',
       runtimeHelpers: true,
     }),
     commonjs({
+      sourceMap: false,
       include: 'node_modules/**',
       namedExports: {
         'node_modules/react/index.js': [
@@ -107,7 +109,6 @@ export default {
         'node_modules/prop-types/index.js': ['oneOfType', 'element', 'bool', 'number', 'string', 'shape', 'func', 'any', 'node']
       },
     }),
-    builtins(),
     startServer && serve({
       open: true,
       // Multiple folders to serve from

src/App.js

@@ -105,7 +105,6 @@ function makeAbsoluteIfNecessary(url, base_url) {
 class App extends Component {
   static propTypes = {
     routerBasename: PropTypes.string.isRequired,
-    relativeWebWorkerScriptsPath: PropTypes.string.isRequired,
     servers: PropTypes.object.isRequired,
     oidc: PropTypes.array,
     whiteLabelling: PropTypes.object,
@@ -142,10 +141,7 @@ class App extends Component {
       );
     }
     handleServers(this.props.servers);
-    initWebWorkers(
+    initWebWorkers();
-      this.props.routerBasename,
-      this.props.relativeWebWorkerScriptsPath
-    );
   }
 
   render() {

src/index.js

@@ -11,7 +11,6 @@ export { App };
 window.config = window.config || {};
 const applicationDefaults = {
   routerBasename: '/',
-  relativeWebWorkerScriptsPath: '',
 };
 const applicationProps = Object.assign({}, applicationDefaults, window.config);
 const app = React.createElement(App, applicationProps, null);

src/utils/initWebWorkers.js

@@ -1,32 +1,12 @@
 import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
 
-/**
+export default function initWebWorkers() {  
- *
- * @param {String} baseDirectory
- * @param {String} webWorkScriptsPath
- */
-export default function initWebWorkers(
-  baseDirectory = '/',
-  webWorkScriptsPath = ''
-) {
-  let scriptsPath = `${window.location.protocol}//${
-    window.location.host
-  }${baseDirectory}${webWorkScriptsPath}`;
-
-  // Ensure the last character is a slash
-  if (scriptsPath[scriptsPath.length - 1] !== '/') {
-    scriptsPath += '/';
-  }
-  
   const config = {
     maxWebWorkers: Math.max(navigator.hardwareConcurrency - 1, 1),
     startWebWorkersOnDemand: true,
-    webWorkerPath: `${scriptsPath}cornerstoneWADOImageLoaderWebWorker.min.js`,
     taskConfiguration: {
       decodeTask: {
-        loadCodecsOnStartup: true,
         initializeCodecsOnStartup: false,
-        codecsPath: `${scriptsPath}cornerstoneWADOImageLoaderCodecs.min.js`,
         usePDFJS: false,
         strict: false,
       },

src/utils/initWebWorkers.test.js

@@ -3,10 +3,7 @@ import cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader';
 
 describe('initWebWorkers', () => {
   it("initializes cornerstoneWADOImageLoader's web workers", () => {
-    const basePath = '/';
+    initWebWorkers();
-    const relativeWebWorkerScriptsPath = '';
-
-    initWebWorkers(basePath, relativeWebWorkerScriptsPath);
 
     expect(
       cornerstoneWADOImageLoader.webWorkerManager.initialize

yarn.lock

@@ -3848,12 +3848,13 @@ cornerstone-tools@^3.16.0:
     cornerstone-math "0.1.7"
     debug "4.1.1"
 
-cornerstone-wado-image-loader@^2.2.3:
+cornerstone-wado-image-loader@^3.0.0:
-  version "2.2.3"
+  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-2.2.3.tgz#2d4c06b5c87cd9198b52906c48e2d9dd145de986"
+  resolved "https://registry.yarnpkg.com/cornerstone-wado-image-loader/-/cornerstone-wado-image-loader-3.0.0.tgz#250ba435379096815de52ed80629d6407e016841"
-  integrity sha512-0N5ykSEVoUx3zzfGn5Oaa7OJL/EHOthPUI2Kv8gSnMgf6ipcz5TcK8xGMOfu6grMkKlNb0SFJ/cEqsHR7bddKQ==
+  integrity sha512-T18aPcLBkYn2dg2qVbIgA6FQUVvwJVmyDlBdWXHdfOZgQnhbxd7Gz1V0hHqpGAfAv8mH1nlNzZ9ipFsNYHvXdA==
   dependencies:
-    dicom-parser "^1.8.1"
+    dicom-parser "^1.8.3"
+    pako "^1.0.10"
 
 cosmiconfig@^5.0.0, cosmiconfig@^5.0.1, cosmiconfig@^5.2.0, cosmiconfig@^5.2.1:
   version "5.2.1"
@@ -4565,7 +4566,7 @@ dicom-microscopy-viewer@0.6.1:
     dicomweb-client "^0.5.2"
     ol "^5.3.0"
 
-dicom-parser@^1.8.1, dicom-parser@^1.8.3:
+dicom-parser@^1.8.3:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/dicom-parser/-/dicom-parser-1.8.3.tgz#6e4b862898112304db30143147562011c1ce6a4d"
   integrity sha512-CMeUr+jea7Ml70N+/Z5Pd2MYtvLp6IU+TnvdLe6VRVKzZuTeYLYyuAQa9R+sFK4v4N39hig+hKHN+Wfi9sQ6GA==
@@ -10830,7 +10831,7 @@ pako@1.0.6:
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
   integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
 
-pako@~1.0.2, pako@~1.0.5:
+pako@^1.0.10, pako@~1.0.2, pako@~1.0.5:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
   integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==