Merge branch 'master' into customizable-TS

extensions/cornerstone/.webpack/webpack.dev.js

@@ -1,8 +1,12 @@
 const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.js');
+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.tsx`,
+};
+
+module.exports = (env, argv) => {
+  return webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
 };

extensions/cornerstone/.webpack/webpack.prod.js

@@ -1,15 +1,22 @@
 const webpack = require('webpack');
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const path = require('path');
-const webpackCommon = require('./../../../.webpack/webpack.commonjs.js');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+
 const pkg = require('./../package.json');
 
-const ROOT_DIR = path.join(__dirname, './..');
+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.tsx`,
+};
+
+const outputName = `ohif-${pkg.name.split('/').pop()}`;
 
 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: {
@@ -29,15 +36,25 @@ module.exports = (env, argv) => {
     },
     output: {
       path: ROOT_DIR,
-      library: 'OHIFExtCornerstone',
+      library: 'ohif-extension-cornerstone',
       libraryTarget: 'umd',
-      libraryExport: 'default',
       filename: pkg.main,
     },
+    externals: [
+      /\b(vtk.js)/,
+      /\b(dcmjs)/,
+      /\b(gl-matrix)/,
+      /^@ohif/,
+      /^@cornerstonejs/,
+    ],
     plugins: [
       new webpack.optimize.LimitChunkCountPlugin({
         maxChunks: 1,
       }),
+      new MiniCssExtractPlugin({
+        filename: `./dist/${outputName}.css`,
+        chunkFilename: `./dist/${outputName}.css`,
+      }),
     ],
   });
 };

extensions/cornerstone/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"
   // ]
 };

extensions/cornerstone/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@ohif/extension-cornerstone",
-  "version": "3.0.0",
+  "version": "3.6.0-beta.0",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
   "repository": "OHIF/Viewers",
-  "main": "dist/index.umd.js",
+  "main": "dist/ohif-extension-cornerstone.umd.js",
   "module": "src/index.tsx",
   "types": "src/types/index.ts",
   "exports": {
@@ -25,20 +25,20 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --debug --output-pathinfo",
+    "dev": "cross-env NODE_ENV=development webpack --config .webpack/webpack.dev.js --watch --output-pathinfo",
     "dev:cornerstone": "yarn run dev",
-    "build": "cross-env NODE_ENV=production webpack --config .webpack/webpack.prod.js",
-    "build:package": "yarn run build",
+    "build": "cross-env NODE_ENV=production webpack --progress --config .webpack/webpack.prod.js",
+    "build:package-1": "yarn run build",
     "start": "yarn run dev"
   },
   "peerDependencies": {
-    "@ohif/core": "^3.0.0",
-    "@ohif/ui": "^2.0.0",
-    "@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",
+    "@cornerstonejs/dicom-image-loader": "^0.6.8",
+    "@ohif/core": "3.6.0-beta.0",
+    "@ohif/ui": "3.6.0-beta.0",
     "dcmjs": "^0.29.6",
     "dicom-parser": "^1.8.21",
     "hammerjs": "^2.0.8",

extensions/cornerstone/src/services/SegmentationService/SegmentationService.ts

@@ -107,7 +107,7 @@ class SegmentationService extends PubSubService {
 
   /**
    * It adds a segment to a segmentation, basically just setting the properties for
-   * the segment
+   * the segment.
    * @param segmentationId - The ID of the segmentation you want to add a
    * segment to.
    * @param segmentIndex - The index of the segment to add.
@@ -117,7 +117,7 @@ class SegmentationService extends PubSubService {
    * -- opacity: the opacity of the segment
    * -- visibility: the visibility of the segment (boolean)
    * -- isLocked: whether the segment is locked for editing
-   * -- active: whether the segment is currently the active segment to be edited
+   * -- active: whether the segment is currently the active segment to be edited or not
    */
   public addSegment(
     segmentationId: string,