othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ESM symlink build for Viewers

Browse Source
This commit is contained in:
dannyrb 2019-07-15 13:03:29 -04:00
parent 2fbbb4a8e2
commit 83e627e5c9
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/vtk/package.json
View File

@ -14,7 +14,7 @@
}, },
"scripts": { "scripts": {
"build": "webpack --progress --colors --mode production", "build": "webpack --progress --colors --mode production",
"dev": "webpack --watch --progress --colors --mode development" "lerna:build": "webpack --watch --progress --colors --mode development"
}, },
"peerDependencies": { "peerDependencies": {
"@ohif/i18n": "0.2.2", "@ohif/i18n": "0.2.2",
@ -51,9 +51,7 @@
"react-i18next": "^10.11.0", "react-i18next": "^10.11.0",
"react-redux": "^7.1.0", "react-redux": "^7.1.0",
"react-viewerbase": "^0.15.1", "react-viewerbase": "^0.15.1",
"redux": "^4.0.1", "redux": "^4.0.1"
"shader-loader": "^1.3.1",
"worker-loader": "^2.0.0"
}, },
"files": [ "files": [
"dist", "dist",

7
package.json
View File

@ -7,8 +7,7 @@
], ],
"scripts": { "scripts": {
"start": "lerna run lerna:start --parallel", "start": "lerna run lerna:start --parallel",
"build:magic": "lerna run lerna:build --parallel", "build": "lerna run lerna:build --parallel"
"build": "lerna exec --parallel -- babel --root-mode upward src -d lib --ignore **/*.story.js,**/*.spec.js"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.5.0", "@babel/core": "^7.5.0",
@ -44,6 +43,7 @@
"react": "^16.8.6", "react": "^16.8.6",
"react-dom": "^16.8.6", "react-dom": "^16.8.6",
"react-scripts": "^3.0.1", "react-scripts": "^3.0.1",
"shader-loader": "^1.3.1",
"stylelint": "^10.1.0", "stylelint": "^10.1.0",
"stylelint-config-recommended": "^2.2.0", "stylelint-config-recommended": "^2.2.0",
"stylus": "^0.54.5", "stylus": "^0.54.5",
@ -53,7 +53,8 @@
"webpack-dev-server": "^3.7.2", "webpack-dev-server": "^3.7.2",
"webpack-hot-middleware": "^2.25.0", "webpack-hot-middleware": "^2.25.0",
"webpack-merge": "^4.2.1", "webpack-merge": "^4.2.1",
"workbox-webpack-plugin": "^4.3.1" "workbox-webpack-plugin": "^4.3.1",
"worker-loader": "^2.0.0"
}, },
"husky": { "husky": {
"hooks": { "hooks": {

21
platform/viewer/config/webpack.common.js
View File

@ -63,6 +63,27 @@ module.exports = (env, argv) => {
}, },
], ],
}, },
/**
*
*/
{
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 },
},
],
},
], ],
}, },
plugins: [ plugins: [