From 83e627e5c9018f694fa839e39f02dc29743f05b1 Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Mon, 15 Jul 2019 13:03:29 -0400
Subject: [PATCH] Fix ESM symlink build for Viewers

---
 extensions/vtk/package.json              |  6 ++----
 package.json                             |  7 ++++---
 platform/viewer/config/webpack.common.js | 21 +++++++++++++++++++++
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/extensions/vtk/package.json b/extensions/vtk/package.json
index 60db45021..26ab0a1f2 100644
--- a/extensions/vtk/package.json
+++ b/extensions/vtk/package.json
@@ -14,7 +14,7 @@
   },
   "scripts": {
     "build": "webpack --progress --colors --mode production",
-    "dev": "webpack --watch --progress --colors --mode development"
+    "lerna:build": "webpack --watch --progress --colors --mode development"
   },
   "peerDependencies": {
     "@ohif/i18n": "0.2.2",
@@ -51,9 +51,7 @@
     "react-i18next": "^10.11.0",
     "react-redux": "^7.1.0",
     "react-viewerbase": "^0.15.1",
-    "redux": "^4.0.1",
-    "shader-loader": "^1.3.1",
-    "worker-loader": "^2.0.0"
+    "redux": "^4.0.1"
   },
   "files": [
     "dist",
diff --git a/package.json b/package.json
index b56eab505..b949cda03 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,7 @@
   ],
   "scripts": {
     "start": "lerna run lerna:start --parallel",
-    "build:magic": "lerna run lerna:build --parallel",
-    "build": "lerna exec --parallel -- babel --root-mode upward src -d lib --ignore **/*.story.js,**/*.spec.js"
+    "build": "lerna run lerna:build --parallel"
   },
   "devDependencies": {
     "@babel/core": "^7.5.0",
@@ -44,6 +43,7 @@
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
     "react-scripts": "^3.0.1",
+    "shader-loader": "^1.3.1",
     "stylelint": "^10.1.0",
     "stylelint-config-recommended": "^2.2.0",
     "stylus": "^0.54.5",
@@ -53,7 +53,8 @@
     "webpack-dev-server": "^3.7.2",
     "webpack-hot-middleware": "^2.25.0",
     "webpack-merge": "^4.2.1",
-    "workbox-webpack-plugin": "^4.3.1"
+    "workbox-webpack-plugin": "^4.3.1",
+    "worker-loader": "^2.0.0"
   },
   "husky": {
     "hooks": {
diff --git a/platform/viewer/config/webpack.common.js b/platform/viewer/config/webpack.common.js
index 4de633a07..825a51d77 100644
--- a/platform/viewer/config/webpack.common.js
+++ b/platform/viewer/config/webpack.common.js
@@ -63,6 +63,27 @@ module.exports = (env, argv) => {
             },
           ],
         },
+        /**
+        *
+        */
+        {
+          test: /\.glsl$/i,
+          include: /vtk\.js[\/\\]Sources/,
+          loader: 'shader-loader',
+        },
+        /**
+        *
+        */
+        {
+          test: /\.worker\.js$/,
+          include: /vtk\.js[\/\\]Sources/,
+          use: [
+            {
+              loader: 'worker-loader',
+              options: { inline: true, fallback: false },
+            },
+          ],
+        },
       ],
     },
     plugins: [