Merge pull request #127 from thewtex/vtk-js-bump

ENH: Bump vtk.js to 8.3.0
InsightSoftwareConsortium · Dec 19, 2018 · 5e4ba98 · 5e4ba98
2 parents a19eac1 + d1591c8
commit 5e4ba98
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 22 deletions.
diff --git a/js/.babelrc b/js/.babelrc
@@ -1,9 +1,10 @@
 {
   presets: [
-    ['env', {
+    ['@babel/preset-env', {
       targets: {
         browsers: ['last 2 versions'],
       },
+      modules: 'commonjs',
     }],
   ],
 }
diff --git a/js/lib/viewer.js b/js/lib/viewer.js
@@ -1,4 +1,4 @@
-import 'babel-polyfill'
+import '@babel/polyfill'
 const widgets = require('@jupyter-widgets/base')
 const  _ = require('lodash')
 import {

diff --git a/js/package.json b/js/package.json
@@ -36,32 +36,32 @@
     "watch": "webpack --mode development --watch --progress --colors"
   },
   "devDependencies": {
-    "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.4",
-    "babel-preset-env": "^1.6.1",
-    "css-loader": "^0.28.11",
-    "postcss-loader": "^2.1.2",
-    "raw-loader": "^0.5.1",
+    "@babel/core": "^7.2.2",
+    "@babel/preset-env": "^7.2.0",
+    "babel-loader": "^8.0.4",
+    "css-loader": "^2.0.1",
+    "postcss-loader": "^3.0.0",
+    "raw-loader": "^1.0.0",
     "rimraf": "^2.6.1",
     "shader-loader": "^1.3.1",
-    "style-loader": "^0.20.3",
+    "style-loader": "^0.23.1",
     "url-loader": "^1.0.1",
     "webpack": "^4.16.4",
     "webpack-cli": "^3.1.0",
     "webpack-node-externals": "^1.7.2",
     "worker-loader": "^2.0.0"
   },
   "dependencies": {
+    "@babel/polyfill": "^7.0.0",
     "@jupyter-widgets/base": "^1.1.8",
-    "autoprefixer": "^8.1.0",
-    "babel-polyfill": "^6.26.0",
+    "autoprefixer": "^9.4.3",
     "copy-webpack-plugin": "^4.5.1",
     "css-element-queries": "^1.0.2",
     "itk": "^9.1.1",
-    "itk-vtk-viewer": "^6.5.1",
+    "itk-vtk-viewer": "^6.5.2",
     "jupyter-dataserializers": "^2.0.1",
     "lodash": "^4.17.5",
-    "vtk.js": "7.8.2"
+    "vtk.js": "^8.3.2"
   },
   "jupyterlab": {
     "extension": "dist/labextension"

diff --git a/js/postcss.config.js b/js/postcss.config.js
@@ -0,0 +1,5 @@
+const autoprefix = require('autoprefixer');
+
+module.exports = {
+  plugins: [autoprefix],
+};
diff --git a/js/webpack.config.js b/js/webpack.config.js
@@ -4,26 +4,29 @@ var version = require('./package.json').version;
 const CopyPlugin = require('copy-webpack-plugin');
 const nodeExternals = require('webpack-node-externals');
 
-const vtkRules = require('vtk.js/Utilities/config/rules-vtk.js');
-const commonRules = require('vtk.js/Utilities/config/rules-examples.js');
+const vtkRules = require('vtk.js/Utilities/config/dependency.js').webpack.core.rules;
+const cssRules = require('vtk.js/Utilities/config/dependency.js').webpack.css.rules;
 
 // Custom webpack rules are generally the same for all webpack bundles, hence
 // stored in a separate local variable.
 var rules = [
+  // itk-vtk-viewer
   {
-    test: /\.css$/,
-    use: ['style-loader', 'css-loader'],
+    test: /\.svg$/,
+    use: [{ loader: 'raw-loader' }],
+  },
+  // itk-vtk-viewer
+  {
+    test: /\.(png|jpg)$/,
+    use: 'url-loader?limit=81920'
   },
   {
     test: /\.js$/,
     use: {
-      loader: 'babel-loader',
-      options: {
-        presets: ['env'],
-      },
+      loader: 'babel-loader'
     },
   },
-].concat(vtkRules, commonRules);
+].concat(vtkRules, cssRules);
 
 const resolve = {
   modules: [path.resolve(__dirname, 'node_modules')],