Commit changes before a long weekend

This commit is contained in:
dannyrb committed 2019-07-05 22:58:25 -04:00
1 parent e250ac0c50
commit f175d4b96b
34 files changed
+679 -230

No files matched your search

-9
View File
@@ -1,9 +0,0 @@
root = true
[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
-16
View File
@@ -1,16 +0,0 @@
{
"extends": [
"react-app",
"eslint:recommended",
"plugin:react/recommended"
],
"parser": "babel-eslint",
"env": {
"jest": true
},
"settings": {
"react": {
"version": "detect",
},
},
}
-26
View File
@@ -1,26 +0,0 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.
# dependencies
node_modules
# builds
build
dist
.rpt2_cache
# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
.env.production.local
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.idea
yalc.lock
.yalc
-4
View File
@@ -1,4 +0,0 @@
language: node_js
node_js:
- 9
- 8
+3 -7
View File
@@ -11,13 +11,9 @@
"npm": ">=5"
},
"scripts": {
"build": "webpack --progress --colors --mode development",
"build:release": "webpack --progress --colors --mode production",
"start": "webpack --watch --progress --colors --mode development",
"prepare": "yarn run build:release",
"predeploy": "cd example && yarn install && yarn run build:release",
"prepublishOnly": "yarn install && yarn run build:release",
"lint": "eslint -c .eslintrc --fix src && prettier --single-quote --write src/**/*.{js,jsx,json,css}"
"lerna:build": "webpack --progress --colors --mode production",
"lerna:dev": "webpack --watch --progress --colors --mode development",
"prepublishOnly": "yarn install && yarn run lerna:build"
},
"peerDependencies": {
"@ohif/i18n": "0.2.2",
+46 -25
View File
@@ -13,15 +13,15 @@ const cssRules = [
{
loader: 'postcss-loader',
options: {
plugins: () => [autoprefixer('last 2 version', 'ie >= 10')]
}
}
]
plugins: () => [autoprefixer('last 2 version', 'ie >= 10')],
},
},
],
},
{
test: /\.glsl$/i,
include: /vtk\.js[\/\\]Sources/,
loader: 'shader-loader'
loader: 'shader-loader',
},
{
test: /\.worker\.js$/,
@@ -29,9 +29,9 @@ const cssRules = [
use: [
{
loader: 'worker-loader',
options: { inline: true, fallback: false }
}
]
options: { inline: true, fallback: false },
},
],
},
{
test: /\.css$/,
@@ -42,17 +42,17 @@ const cssRules = [
loader: 'css-loader',
options: {
localIdentName: '[name]-[local]_[sha512:hash:base64:5]',
modules: true
}
modules: true,
},
},
{
loader: 'postcss-loader',
options: {
plugins: () => [autoprefixer('last 2 version', 'ie >= 10')]
}
}
]
}
plugins: () => [autoprefixer('last 2 version', 'ie >= 10')],
},
},
],
},
];
var entry = path.join(__dirname, './src/index.js');
@@ -66,19 +66,40 @@ module.exports = {
filename: 'index.umd.js',
library: '@ohif/extension-vtk',
libraryTarget: 'umd',
globalObject: 'this'
globalObject: 'this',
},
module: {
rules: [
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: ['babel-loader']
}
].concat(cssRules)
loader: 'babel-loader',
options: {
// Find babel.config.js in monorepo root
// https://babeljs.io/docs/en/options#rootmode
rootMode: 'upward',
presets: [
[
'@babel/preset-env',
{
// Do not transform ES6 modules to another format.
// Webpack will take care of that.
modules: false,
},
],
],
},
},
].concat(cssRules),
},
resolve: {
modules: [path.resolve(__dirname, 'node_modules'), sourcePath]
modules: [
// Modules specific to this package
path.resolve(__dirname, 'node_modules'),
// Hoisted Yarn Workspace Modules
path.resolve(__dirname, '../../node_modules'),
sourcePath,
],
},
externals: [
{
@@ -86,14 +107,14 @@ module.exports = {
commonjs: 'cornerstone-core',
commonjs2: 'cornerstone-core',
amd: 'cornerstone-core',
root: 'cornerstone'
root: 'cornerstone',
},
'cornerstone-math': {
commonjs: 'cornerstone-math',
commonjs2: 'cornerstone-math',
amd: 'cornerstone-math',
root: 'cornerstoneMath'
}
root: 'cornerstoneMath',
},
},
'@ohif/i18n',
'ohif-core',
@@ -104,7 +125,7 @@ module.exports = {
'react-redux', //: 'ReactRedux',
'react-resize-detector', //: 'ReactResizeDetector',
'react-viewerbase', //: 'reactViewerbase',
'prop-types' //: 'PropTypes'
'prop-types', //: 'PropTypes'
/*/\b(vtk.js)/*/
]
],
};