Push changes up to switch PCs

This commit is contained in:
dannyrb committed 2019-07-11 13:12:37 -04:00
1 parent c05058a0f5
commit 2fbbb4a8e2
10 files changed
+195 -144

No files matched your search

@@ -18,7 +18,7 @@ module.exports = (env, argv) => {
module: {
rules: [
{
test: /\.jsx?$/,
test: /\.(js|jsx)$/,
exclude: [/node_modules/],
loader: 'babel-loader',
options: {
+2 -2
View File
@@ -17,9 +17,9 @@
"start": "rollup -c -w"
},
"peerDependencies": {
"ohif-core": "^0.6.0",
"react": "^15.0.0 || ^16.0.0",
"react-dom": "^15.0.0 || ^16.0.0",
"ohif-core": "^0.6.0"
"react-dom": "^15.0.0 || ^16.0.0"
},
"devDependencies": {
"gh-pages": "^2.0.1"
+4 -3
View File
@@ -6,14 +6,15 @@
"license": "MIT",
"repository": "OHIF/Viewers",
"main": "dist/index.umd.js",
"module": "src/index.js",
"sideEffects": true,
"engines": {
"node": ">=8",
"npm": ">=5"
},
"scripts": {
"lerna:build": "webpack --progress --colors --mode production",
"lerna:dev": "webpack --watch --progress --colors --mode development",
"prepublishOnly": "yarn install && yarn run lerna:build"
"build": "webpack --progress --colors --mode production",
"dev": "webpack --watch --progress --colors --mode development"
},
"peerDependencies": {
"@ohif/i18n": "0.2.2",
+20 -20
View File
@@ -10,23 +10,23 @@ import copy from 'rollup-plugin-copy';
// Deal with https://github.com/rollup/rollup-plugin-commonjs/issues/297
const globals = {
react: 'React',
'react-dom': 'ReactDOM',
'react-redux': 'ReactRedux',
'react-resize-detector': 'ReactResizeDetector',
'react-viewerbase': 'reactViewerbase',
'prop-types': 'PropTypes',
'cornerstone-core': 'cornerstone',
'cornerstone-wado-image-loader': 'cornerstoneWADOImageLoader',
'cornerstone-math': 'cornerstoneMath',
'cornerstone-tools': 'cornerstoneTools',
dcmjs: 'dcmjs',
'dicom-parser': 'dicomParser',
'ohif-core': 'OHIF',
hammerjs: 'Hammer',
'@ohif/i18n': 'i18n',
};
// const globals = {
// react: 'React',
// 'react-dom': 'ReactDOM',
// 'react-redux': 'ReactRedux',
// 'react-resize-detector': 'ReactResizeDetector',
// 'react-viewerbase': 'reactViewerbase',
// 'prop-types': 'PropTypes',
// 'cornerstone-core': 'cornerstone',
// 'cornerstone-wado-image-loader': 'cornerstoneWADOImageLoader',
// 'cornerstone-math': 'cornerstoneMath',
// 'cornerstone-tools': 'cornerstoneTools',
// dcmjs: 'dcmjs',
// 'dicom-parser': 'dicomParser',
// 'ohif-core': 'OHIF',
// hammerjs: 'Hammer',
// '@ohif/i18n': 'i18n',
// };
export default {
input: 'src/index.js',
@@ -36,13 +36,13 @@ export default {
format: 'umd',
name: 'ohif-vtk-extension',
sourcemap: true,
globals,
// globals,
},
{
file: pkg.module,
format: 'es',
sourcemap: true,
globals,
// globals,
},
],
plugins: [
@@ -63,7 +63,7 @@ export default {
}),
resolve(),
commonjs({
include: ['node_modules/**', '.yalc/**'],
include: ['node_modules/**'],
namedExports: {
'node_modules/react-vtkjs-viewport/dist/index.js': [
'getImageData',
+8 -4
View File
@@ -1,10 +1,10 @@
import OHIFVTKViewport from './OHIFVTKViewport.js';
import commandsModule from './commandsModule.js';
// This feels weird
import loadLocales from './loadLocales';
import toolbarModule from './toolbarModule.js';
// This feels weird
// import loadLocales from './loadLocales';
export default {
const vtkExtension = {
/**
* Only required property. Should be a unique value across all extensions.
*/
@@ -21,4 +21,8 @@ export default {
},
};
loadLocales();
export default vtkExtension;
export { vtkExtension };
// loadLocales();
+106 -98
View File
@@ -1,78 +1,57 @@
var path = require('path');
var webpack = require('webpack');
const path = require('path');
const webpack = require('webpack');
const autoprefixer = require('autoprefixer');
const cssRules = [
{
test: /\.css$/,
exclude: /\.module\.css$/,
use: [
'style-loader',
'css-loader',
{
loader: 'postcss-loader',
options: {
plugins: () => [autoprefixer('last 2 version', 'ie >= 10')],
},
},
],
},
{
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 },
},
],
},
{
test: /\.css$/,
include: /\.module\.css$/,
use: [
{ loader: 'style-loader' },
{
loader: 'css-loader',
options: {
localIdentName: '[name]-[local]_[sha512:hash:base64:5]',
modules: true,
},
},
{
loader: 'postcss-loader',
options: {
plugins: () => [autoprefixer('last 2 version', 'ie >= 10')],
},
},
],
},
];
var entry = path.join(__dirname, './src/index.js');
// const vtkHtmlRules = require('vtk.js/Utilities/config/dependency.js').webpack
// .core.rules;
// Optional if you want to load *.css and *.module.css files
// var cssRules = require('vtk.js/Utilities/config/dependency.js').webpack.css.rules;
const SRC_DIR = path.join(__dirname, './src');
const OUTPUT_DIR = path.join(__dirname, './dist');
module.exports = {
entry,
mode: 'development',
entry: {
app: `${SRC_DIR}/index.js`,
},
context: SRC_DIR,
// ~~~ MODE
output: {
path: OUTPUT_DIR,
filename: 'index.umd.js',
library: '@ohif/extension-vtk',
library: 'ohifVtkExtension',
libraryTarget: 'umd',
globalObject: 'this',
filename: 'index.umd.js',
auxiliaryComment: 'Text VTK Extension Comment',
},
stats: {
colors: true,
hash: true,
timings: true,
assets: true,
chunks: true,
chunkModules: true,
modules: true,
children: true,
warnings: true,
},
optimization: {
minimize: false,
sideEffects: true,
},
// ~~~ END MODE
resolve: {
modules: [
path.resolve(__dirname, 'node_modules'),
path.resolve(__dirname, '../../node_modules'),
SRC_DIR,
],
extensions: ['.js', '.jsx', '.json', '*'],
symlinks: true,
},
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
exclude: [/node_modules/],
loader: 'babel-loader',
options: {
// Find babel.config.js in monorepo root
@@ -90,42 +69,71 @@ module.exports = {
],
},
},
].concat(cssRules),
},
resolve: {
modules: [
// Modules specific to this package
path.resolve(__dirname, 'node_modules'),
// Hoisted Yarn Workspace Modules
path.resolve(__dirname, '../../node_modules'),
SRC_DIR,
/**
*
*/
{
test: /\.css$/,
exclude: /\.module\.css$/,
use: [
'style-loader',
'css-loader',
{
loader: 'postcss-loader',
options: {
plugins: () => [autoprefixer('last 2 version', 'ie >= 10')],
},
},
],
},
/**
*
*/
{
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 },
},
],
},
],
},
externals: [
{
'cornerstone-core': {
commonjs: 'cornerstone-core',
commonjs2: 'cornerstone-core',
amd: 'cornerstone-core',
root: 'cornerstone',
},
'cornerstone-math': {
commonjs: 'cornerstone-math',
commonjs2: 'cornerstone-math',
amd: 'cornerstone-math',
root: 'cornerstoneMath',
},
},
'@ohif/i18n',
'ohif-core',
'dcmjs',
'react-viewerbase',
'react', //: 'React',
'react-dom', //: 'ReactDOM',
'react-redux', //: 'ReactRedux',
'react-resize-detector', //: 'ReactResizeDetector',
'react-viewerbase', //: 'reactViewerbase',
'prop-types', //: 'PropTypes'
/*/\b(vtk.js)/*/
],
// externals: [
// {
// cornerstone: {
// commonjs: 'cornerstone',
// commonjs2: 'cornerstone',
// amd: 'cornerstone',
// root: 'cornerstone',
// },
// 'cornerstone-math': {
// commonjs: 'cornerstone-math',
// commonjs2: 'cornerstone-math',
// amd: 'cornerstone-math',
// root: 'cornerstoneMath',
// },
// },
// '@ohif/i18n',
// 'ohif-core',
// 'dcmjs',
// 'react-viewerbase',
// 'react', //: 'React',
// 'react-dom', //: 'ReactDOM',
// 'react-redux', //: 'ReactRedux',
// 'react-resize-detector', //: 'ReactResizeDetector',
// 'react-viewerbase', //: 'reactViewerbase',
// 'prop-types', //: 'PropTypes'
// /*/\b(vtk.js)/*/
// ],
};