From 235b80f9402c1979e4ef673de2ac82b94ea2b265 Mon Sep 17 00:00:00 2001 From: Forrest Li Date: Mon, 23 Apr 2018 15:36:34 -0400 Subject: [PATCH 1/2] chore(webpack): Correctly catch statSync file-not-found errors --- Utilities/helpers/externals.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Utilities/helpers/externals.js b/Utilities/helpers/externals.js index 199b8ce1..7881e097 100644 --- a/Utilities/helpers/externals.js +++ b/Utilities/helpers/externals.js @@ -9,7 +9,11 @@ function getExternals(basePath) { return files.filter((name) => { const dir = path.join(basePath, name); const entry = path.join(dir, 'index.js'); - return fs.statSync(dir).isDirectory() && fs.statSync(entry).isFile(); + try { + return fs.statSync(dir).isDirectory() && fs.statSync(entry).isFile(); + } catch (e) { + return false; + } }); } From a37cabdea1b6b83442b4f5007a9fcc1dc7567aef Mon Sep 17 00:00:00 2001 From: Forrest Li Date: Mon, 23 Apr 2018 15:38:19 -0400 Subject: [PATCH 2/2] chore(deps): Upgrade itkjs and vtkjs Fixes crashing issues when loading more than one itkjs image. --- package-lock.json | 46 ++++++++++++++++++++++++++++++++++++++++------ package.json | 4 ++-- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f0e8cf9..157a72fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2729,6 +2729,16 @@ "integrity": "sha512-j9Q9hP5AhqOARNP6fLdctr3XrGhF921sBSycudf4E+8RCWpFT3rJdTfp/5o8LDp6p0NJTpYWEpBFiM+QEDzA6g==", "dev": true }, + "cardboard-vr-display": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/cardboard-vr-display/-/cardboard-vr-display-1.0.11.tgz", + "integrity": "sha512-G63yklmd1fsce5nJL2LPcpFOSWMEGqjdWeNxowTPkYEpR41RtpBkebR8sjh7Z24rmID3MB7mFjZaIHvrKXCXFw==", + "requires": { + "gl-preserve-state": "1.0.0", + "nosleep.js": "0.7.0", + "webvr-polyfill-dpdb": "1.0.7" + } + }, "cardinal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-1.0.0.tgz", @@ -7199,6 +7209,11 @@ "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-2.3.1.tgz", "integrity": "sha1-LyqzQnwqeAHC/GtCL+SYZgxYwEA=" }, + "gl-preserve-state": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gl-preserve-state/-/gl-preserve-state-1.0.0.tgz", + "integrity": "sha512-zQZ25l3haD4hvgJZ6C9+s0ebdkW9y+7U2qxvGu1uWOJh8a4RU+jURIKEQhf8elIlFpMH6CrAY2tH0mYrRjet3Q==" + }, "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", @@ -9109,9 +9124,9 @@ } }, "itk": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/itk/-/itk-8.1.1.tgz", - "integrity": "sha512-8fT1OFgW2SZaPxU5G317ea96YcXpk0ZGR5ldHbsnEV6dsaLHFskvUEwCMqSqZd8OFGPH8Fc48CY5Jstlws1WSQ==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/itk/-/itk-9.0.0.tgz", + "integrity": "sha512-l+P/elWjeqsac8Q6ATmTcnvFdLl2SKEvRKnLeeR8PZlY+4vgvTr6RUPdoianPkvDNIXE3cTSC41JCrtsVrXtVg==", "dev": true, "requires": { "commander": "2.15.1", @@ -10827,6 +10842,11 @@ "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-8.0.0.tgz", "integrity": "sha512-iXcbM3NWr0XkNyfiSBsoPezi+0V92P9nj84yVV1/UZxRUrGczgX/X91KMAGM0omWLY2+2Q1gKD/XRn4gQRDB2A==" }, + "nosleep.js": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/nosleep.js/-/nosleep.js-0.7.0.tgz", + "integrity": "sha1-z9kZwlUjyg0PSmn7MwXAg62u4ok=" + }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -21389,9 +21409,9 @@ } }, "vtk.js": { - "version": "6.4.16", - "resolved": "https://registry.npmjs.org/vtk.js/-/vtk.js-6.4.16.tgz", - "integrity": "sha512-5wQ9gHmYlelUzisi4K9t+Wxpd38wJWgR1oOv4fd0cvBZTjqvHUvhJ1TkpxIYBtIuOh5P04X+X4VPsLEfDxQ5LQ==", + "version": "6.4.19", + "resolved": "https://registry.npmjs.org/vtk.js/-/vtk.js-6.4.19.tgz", + "integrity": "sha512-v7sS/tRSizIn5pYqadPGiWXl3rG4tWrbED4iMxrQ4xxbyXApl4Nl2Y3MGa2Q2GyD2ZTzi32GO3VutY0zV0Ej0g==", "requires": { "base64-js": "1.2.1", "blueimp-md5": "2.10.0", @@ -21401,6 +21421,7 @@ "pako": "1.0.6", "seedrandom": "2.4.3", "shelljs": "0.7.8", + "webvr-polyfill": "0.10.5", "webworker-promise": "0.4.1" }, "dependencies": { @@ -22567,6 +22588,19 @@ "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", "dev": true }, + "webvr-polyfill": { + "version": "0.10.5", + "resolved": "https://registry.npmjs.org/webvr-polyfill/-/webvr-polyfill-0.10.5.tgz", + "integrity": "sha512-ICgU+A8tXODKXMVlHGyMAIYpH7nWGP8LRAexTO1KeQZ+5HXxoUS7b0IQTiPUkNtpDE/7oe9swUtR6bEOE3Ta9Q==", + "requires": { + "cardboard-vr-display": "1.0.11" + } + }, + "webvr-polyfill-dpdb": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/webvr-polyfill-dpdb/-/webvr-polyfill-dpdb-1.0.7.tgz", + "integrity": "sha512-6G3i48V/0qkvDVfDDi2hYh53afMiE/f0zwY4Ujl23qEiBiJL7rBqMC+muk7ur7JyhNCP9Xs+fbf1PVvAGew4zA==" + }, "webworker-promise": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/webworker-promise/-/webworker-promise-0.4.1.tgz", diff --git a/package.json b/package.json index b3ef9315..98807c9f 100644 --- a/package.json +++ b/package.json @@ -19,13 +19,13 @@ "normalize.css": "^8.0.0", "paraviewweb": "3.0.13", "shelljs": "0.7.8", - "vtk.js": "6.4.16" + "vtk.js": "6.4.19" }, "devDependencies": { "@fortawesome/fontawesome-free-webfonts": "^1.0.4", "copy-webpack-plugin": "^4.4.1", "http-server": "0.10.0", - "itk": "8.1.1", + "itk": "9.0.0", "kw-doc": "1.1.1", "kw-web-suite": "6.0.2", "lodash": "^4.17.4",