fix(build): BUILD_PACKAGES_QUICK PR check (#5160)

modes/usAnnotation/.webpack/webpack.dev.js

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

modes/usAnnotation/.webpack/webpack.prod.js

@@ -1,100 +1,54 @@
+const webpack = require('webpack');
+const { merge } = require('webpack-merge');
 const path = require('path');
-const pkg = require('../package.json');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
-const outputFile = 'index.umd.js';
-const rootDir = path.resolve(__dirname, '../');
-const outputFolder = path.join(__dirname, `../dist/umd/${pkg.name}/`);
+const pkg = require('./../package.json');
+const webpackCommon = require('./../../../.webpack/webpack.base.js');
 
-// Todo: add ESM build for the mode in addition to umd build
-const config = {
-  mode: 'production',
-  entry: rootDir + '/' + pkg.module,
-  devtool: 'source-map',
-  output: {
-    path: outputFolder,
-    filename: outputFile,
-    library: pkg.name,
-    libraryTarget: 'umd',
-    chunkFilename: '[name].chunk.js',
-    umdNamedDefine: true,
-    globalObject: "typeof self !== 'undefined' ? self : this",
-  },
-  externals: [
-    {
-      react: {
-        root: 'React',
-        commonjs2: 'react',
-        commonjs: 'react',
-        amd: 'react',
-      },
-      '@ohif/core': {
-        commonjs2: '@ohif/core',
-        commonjs: '@ohif/core',
-        amd: '@ohif/core',
-        root: '@ohif/core',
-      },
-      '@ohif/ui': {
-        commonjs2: '@ohif/ui',
-        commonjs: '@ohif/ui',
-        amd: '@ohif/ui',
-        root: '@ohif/ui',
-      },
-      '@ohif/mode-longitudinal': {
-        commonjs2: '@ohif/mode-longitudinal',
-        commonjs: '@ohif/mode-longitudinal',
-        amd: '@ohif/mode-longitudinal',
-        root: '@ohif/mode-longitudinal',
-      }
-    },
-  ],
-  module: {
-    rules: [
-      {
-        test: /\.svg?$/,
-        oneOf: [
-          {
-            use: [
-              {
-                loader: '@svgr/webpack',
-                options: {
-                  svgoConfig: {
-                    plugins: [
-                      {
-                        name: 'preset-default',
-                        params: {
-                          overrides: {
-                            removeViewBox: false
-                          },
-                        },
-                      },
-                    ]
-                  },
-                  prettier: false,
-                  svgo: true,
-                  titleProp: true,
-                },
-              },
-            ],
-            issuer: {
-              and: [/\.(ts|tsx|js|jsx|md|mdx)$/],
-            },
-          },
-        ],
-      },
-      {
-        test: /(\.jsx|\.js|\.tsx|\.ts)$/,
-        loader: 'babel-loader',
-        exclude: /(node_modules|bower_components)/,
-        resolve: {
-          extensions: ['.js', '.jsx', '.ts', '.tsx'],
-        },
-      },
-    ],
-  },
-  resolve: {
-    modules: [path.resolve('./node_modules'), path.resolve('./src')],
-    extensions: ['.json', '.js', '.jsx', '.tsx', '.ts'],
-  },
+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 = config;
+module.exports = (env, argv) => {
+  const commonConfig = webpackCommon(env, argv, { SRC_DIR, DIST_DIR, ENTRY });
+
+  return merge(commonConfig, {
+    stats: {
+      colors: true,
+      hash: true,
+      timings: true,
+      assets: true,
+      chunks: false,
+      chunkModules: false,
+      modules: false,
+      children: false,
+      warnings: true,
+    },
+    optimization: {
+      minimize: true,
+      sideEffects: false,
+    },
+    output: {
+      path: ROOT_DIR,
+      library: 'ohif-mode-tmtv',
+      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/[name].css',
+      //   chunkFilename: './dist/[id].css',
+      // }),
+    ],
+  });
+};

modes/usAnnotation/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@ohif/mode-ultrasound-pleura-bline",
-  "version": "3.0.0",
+  "version": "3.11.0-beta.60",
   "description": "Allows users to annotate ultrasound images with pleura B-line annotations.",
   "author": "OHIF",
   "license": "MIT",
-  "main": "dist/umd/usAnnotation/index.umd.js",
+  "main": "dist/ohif-mode-ultrasound-pleura-bline.umd.js",
   "files": [
     "dist/**",
     "public/**",
@@ -14,7 +14,10 @@
   "keywords": [
     "ohif-mode"
   ],
-  "module": "src/index.tsx",
+  "publishConfig": {
+    "access": "public"
+  },
+  "module": "src/index.ts",
   "engines": {
     "node": ">=14",
     "npm": ">=6",
@@ -29,11 +32,15 @@
     "test:unit": "jest --watchAll",
     "test:unit:ci": "jest --ci --runInBand --collectCoverage --passWithNoTests"
   },
-  "peerDependencies": {
-    "@ohif/core": "^3.11.0-beta.34"
-  },
+  "peerDependencies": {},
   "dependencies": {
-    "@babel/runtime": "^7.20.13"
+    "@babel/runtime": "^7.20.13",
+    "i18next": "^17.0.3",
+    "@ohif/extension-cornerstone-dicom-sr": "^3.11.0-beta.34",
+    "@cornerstonejs/core": "^3.16.0",
+    "@cornerstonejs/tools": "^3.16.0",
+    "@ohif/core": "^3.11.0-beta.34",
+    "@ohif/extension-ultrasound-pleura-bline": "^3.11.0-beta.60"
   },
   "devDependencies": {
     "@babel/core": "7.24.7",

modes/usAnnotation/src/index.ts

@@ -3,11 +3,6 @@ import { id } from './id';
 import initToolGroups from './initToolGroups';
 import toolbarButtons from './toolbarButtons';
 import { UltrasoundPleuraBLineTool } from '@cornerstonejs/tools';
-import { showPercentage } from '@ohif/extension-ultrasound-pleura-bline';
-
-// Allow this mode by excluding non-imaging modalities such as SR, SEG
-// Also, SM is not a simple imaging modalities, so exclude it.
-const NON_IMAGE_MODALITIES = ['ECG', 'SEG', 'RTSTRUCT', 'RTPLAN', 'PR'];
 
 const ohif = {
   layout: '@ohif/extension-default.layoutTemplateModule.viewerLayout',
@@ -244,9 +239,6 @@ function modeFactory({ modeConfiguration }) {
               title: 'BLinePleuraPercentage',
               condition: ({ referenceInstance }) => referenceInstance?.Modality.includes('US'),
               contentF: () => {
-                if (!showPercentage) {
-                  return;
-                }
                 const { viewportGridService, toolGroupService, cornerstoneViewportService } =
                   servicesManager.services;
                 const activeViewportId = viewportGridService.getActiveViewportId();