From bf77b3959a5db4969937157a57b3d13bb6869aa4 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Tue, 10 Sep 2019 15:12:59 -0400 Subject: [PATCH 1/2] chore: bump react peer deps --- extensions/cornerstone/package.json | 4 ++-- extensions/dicom-html/package.json | 4 ++-- extensions/dicom-microscopy/package.json | 4 ++-- extensions/dicom-pdf/package.json | 4 ++-- platform/i18n/package.json | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index cfb5cc1ae..74760a8a6 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -38,8 +38,8 @@ "dicom-parser": "^1.8.3", "hammerjs": "^2.0.8", "prop-types": "^15.6.2", - "react": "^15.0.0 || ^16.0.0", - "react-dom": "^15.0.0 || ^16.0.0", + "react": "^16.8.6", + "react-dom": "^16.8.6", "react-redux": "^6.0.0", "react-resize-detector": "^3.4.0", "redux": "^4.0.1" diff --git a/extensions/dicom-html/package.json b/extensions/dicom-html/package.json index 139e39fc0..b6a38ebf2 100644 --- a/extensions/dicom-html/package.json +++ b/extensions/dicom-html/package.json @@ -31,8 +31,8 @@ "@ohif/core": "^0.50.0", "dcmjs": "^0.6.0", "prop-types": "^15.6.2", - "react": "^15.0.0 || ^16.0.0", - "react-dom": "^15.0.0 || ^16.0.0" + "react": "^16.8.6", + "react-dom": "^16.8.6" }, "dependencies": { "@babel/runtime": "^7.5.5" diff --git a/extensions/dicom-microscopy/package.json b/extensions/dicom-microscopy/package.json index e39e5c947..2ea920a33 100644 --- a/extensions/dicom-microscopy/package.json +++ b/extensions/dicom-microscopy/package.json @@ -29,8 +29,8 @@ }, "peerDependencies": { "@ohif/core": "^0.50.0", - "react": "^15.0.0 || ^16.0.0", - "react-dom": "^15.0.0 || ^16.0.0" + "react": "^16.8.6", + "react-dom": "^16.8.6" }, "dependencies": { "@babel/runtime": "^7.5.5", diff --git a/extensions/dicom-pdf/package.json b/extensions/dicom-pdf/package.json index 78a3e0998..f20611a13 100644 --- a/extensions/dicom-pdf/package.json +++ b/extensions/dicom-pdf/package.json @@ -31,8 +31,8 @@ "@ohif/core": "^0.50.0", "dicom-parser": "^1.8.3", "prop-types": "^15.6.2", - "react": "^15.0.0 || ^16.0.0", - "react-dom": "^15.0.0 || ^16.0.0" + "react": "^16.8.6", + "react-dom": "^16.8.6" }, "dependencies": { "@babel/runtime": "^7.5.5", diff --git a/platform/i18n/package.json b/platform/i18n/package.json index 670e62dec..ae789ba47 100644 --- a/platform/i18n/package.json +++ b/platform/i18n/package.json @@ -32,8 +32,8 @@ "peerDependencies": { "i18next": "^17.0.3", "i18next-browser-languagedetector": "^3.0.1", - "react": "^16.0.0", - "react-dom": "^16.0.0", + "react": "^16.8.6", + "react-dom": "^16.8.6", "react-i18next": "^10.11.0" }, "dependencies": { From ac5dbda3b27e5c9600baa2c9d2b52947282e3399 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Tue, 10 Sep 2019 16:02:08 -0400 Subject: [PATCH 2/2] fix: simplify runtime-extension usage --- extensions/cornerstone/.webpack/webpack.prod.js | 3 ++- extensions/dicom-html/.webpack/webpack.prod.js | 3 ++- extensions/dicom-microscopy/.webpack/webpack.prod.js | 3 ++- extensions/dicom-pdf/.webpack/webpack.prod.js | 3 ++- extensions/vtk/.webpack/webpack.prod.js | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/extensions/cornerstone/.webpack/webpack.prod.js b/extensions/cornerstone/.webpack/webpack.prod.js index 4d0abe0a7..cd89dfcd2 100644 --- a/extensions/cornerstone/.webpack/webpack.prod.js +++ b/extensions/cornerstone/.webpack/webpack.prod.js @@ -29,8 +29,9 @@ module.exports = (env, argv) => { }, output: { path: ROOT_DIR, - library: 'ohifExtensionCornerstone', + library: 'OHIFExtCornerstone', libraryTarget: 'umd', + libraryExport: 'default', filename: pkg.main, }, }); diff --git a/extensions/dicom-html/.webpack/webpack.prod.js b/extensions/dicom-html/.webpack/webpack.prod.js index b788a001d..8a8a33b08 100644 --- a/extensions/dicom-html/.webpack/webpack.prod.js +++ b/extensions/dicom-html/.webpack/webpack.prod.js @@ -29,8 +29,9 @@ module.exports = (env, argv) => { }, output: { path: ROOT_DIR, - library: 'ohifExtensionDicomHtml', + library: 'OHIFExtDicomHtml', libraryTarget: 'umd', + libraryExport: 'default', filename: pkg.main, }, }); diff --git a/extensions/dicom-microscopy/.webpack/webpack.prod.js b/extensions/dicom-microscopy/.webpack/webpack.prod.js index 2a106c37a..8c67e4a18 100644 --- a/extensions/dicom-microscopy/.webpack/webpack.prod.js +++ b/extensions/dicom-microscopy/.webpack/webpack.prod.js @@ -29,8 +29,9 @@ module.exports = (env, argv) => { }, output: { path: ROOT_DIR, - library: 'ohifExtensionDicomMicroscopy', + library: 'OHIFExtDicomMicroscopy', libraryTarget: 'umd', + libraryExport: 'default', filename: pkg.main, }, }); diff --git a/extensions/dicom-pdf/.webpack/webpack.prod.js b/extensions/dicom-pdf/.webpack/webpack.prod.js index 15b9a59d5..febe5cbb4 100644 --- a/extensions/dicom-pdf/.webpack/webpack.prod.js +++ b/extensions/dicom-pdf/.webpack/webpack.prod.js @@ -29,8 +29,9 @@ module.exports = (env, argv) => { }, output: { path: ROOT_DIR, - library: 'ohifExtensionDicomPdf', + library: 'OHIFExtDicomPdf', libraryTarget: 'umd', + libraryExport: 'default', filename: pkg.main, }, }); diff --git a/extensions/vtk/.webpack/webpack.prod.js b/extensions/vtk/.webpack/webpack.prod.js index 307a8eea6..ea474543e 100644 --- a/extensions/vtk/.webpack/webpack.prod.js +++ b/extensions/vtk/.webpack/webpack.prod.js @@ -29,8 +29,9 @@ module.exports = (env, argv) => { }, output: { path: ROOT_DIR, - library: 'ohifExtensionVtk', + library: 'OHIFExtVtk', libraryTarget: 'umd', + libraryExport: 'default', filename: pkg.main, }, });