Merge branch 'master' into customizable-TS

platform/core/.webpack/webpack.dev.js

@@ -3,6 +3,12 @@ const webpackCommon = require('./../../../.webpack/webpack.base.js');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');
 
-module.exports = (env, argv) => {
-  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+
+const ENTRY = {
+  app: `${SRC_DIR}/index.ts`,
+};
+
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };

platform/core/.webpack/webpack.prod.js

@@ -7,8 +7,12 @@ const ROOT_DIR = path.join(__dirname, './../');
 const SRC_DIR = path.join(__dirname, '../src');
 const DIST_DIR = path.join(__dirname, '../dist');
 
+const ENTRY = {
+  app: `${SRC_DIR}/index.ts`,
+};
+
 module.exports = (env, argv) => {
-  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR });
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 
   return merge(commonConfig, {
     stats: {
@@ -24,23 +28,19 @@ module.exports = (env, argv) => {
     },
     optimization: {
       minimize: true,
-      sideEffects: true,
+      sideEffects: false,
     },
     output: {
       path: ROOT_DIR,
-      library: 'ohifCore',
+      library: 'ohif-core',
       libraryTarget: 'umd',
       filename: pkg.main,
     },
-    externals: [
-      {
-        'cornerstone-math': {
-          commonjs: 'cornerstone-math',
-          commonjs2: 'cornerstone-math',
-          amd: 'cornerstone-math',
-          root: 'cornerstoneMath',
-        },
-      },
+     externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@cornerstonejs/,
     ],
   });
 };

platform/core/jest.config.js

@@ -8,6 +8,6 @@ module.exports = {
   // rootDir: "../.."
   // testMatch: [
   //   //`<rootDir>/platform/${pack.name}/**/*.spec.js`
-  //   "<rootDir>/platform/viewer/**/*.test.js"
+  //   "<rootDir>/platform/app/**/*.test.js"
   // ]
 };

platform/core/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@ohif/core",
-  "version": "3.0.0",
+  "version": "3.6.0-beta.0",
   "description": "Generic business logic for web-based medical imaging applications",
   "author": "OHIF Core Team",
   "license": "MIT",
   "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-core.umd.js",
   "module": "src/index.ts",
   "types": "src/types/index.ts",
   "sideEffects": "false",
@@ -31,26 +31,26 @@
     "test:unit:ci": "jest --ci --runInBand --collectCoverage"
   },
   "peerDependencies": {
-    "cornerstone-math": "0.1.9",
-    "@cornerstonejs/dicom-image-loader": "^0.6.8",
     "@cornerstonejs/codec-charls": "^1.2.3",
     "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2",
     "@cornerstonejs/codec-openjpeg": "^1.2.2",
     "@cornerstonejs/codec-openjph": "^2.4.2",
-    "dicom-parser": "^1.8.21",
-    "@ohif/ui": "^2.0.0"
+    "@cornerstonejs/dicom-image-loader": "^0.6.8",
+    "@ohif/ui": "3.6.0-beta.0",
+    "cornerstone-math": "0.1.9",
+    "dicom-parser": "^1.8.21"
   },
   "dependencies": {
     "@babel/runtime": "^7.20.13",
     "dcmjs": "^0.29.5",
     "dicomweb-client": "^0.10.2",
-    "isomorphic-base64": "^1.0.2",
-    "lodash.merge": "^4.6.1",
-    "lodash.clonedeep": "^4.5.0",
-    "moment": "^2.24.0",
-    "query-string": "^6.14.0",
-    "object-hash": "2.1.1",
     "gl-matrix": "^3.4.3",
+    "isomorphic-base64": "^1.0.2",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.merge": "^4.6.1",
+    "moment": "^2.24.0",
+    "object-hash": "2.1.1",
+    "query-string": "^6.14.0",
     "validate.js": "^0.12.0"
   },
   "devDependencies": {