diff --git a/package-lock.json b/package-lock.json index fe9ae5131f7aa0dec8396c1e51568b125de9fc70..d1d3e14388db9c8e52ddd3fdcdcb68e49d3ccc96 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index 01ea94f77f792fd5a57857fe69a51ca26ee40189..72dd74f55720e4c2e513614661ceaa78b274da4e 100644 --- a/package.json +++ b/package.json @@ -70,10 +70,10 @@ "@types/benchmark": "^1.0.31", "@types/compression": "0.0.36", "@types/express": "^4.16.0", - "@types/jest": "^23.1.5", - "@types/node": "~10.5.2", - "@types/node-fetch": "^2.1.1", - "@types/react": "^16.4.6", + "@types/jest": "^23.3.1", + "@types/node": "^10.5.4", + "@types/node-fetch": "^2.1.2", + "@types/react": "^16.4.7", "@types/react-dom": "^16.0.6", "benchmark": "^2.1.4", "copyfiles": "^2.0.0", @@ -83,7 +83,7 @@ "file-loader": "^1.1.11", "glslify-import": "^3.1.0", "glslify-loader": "^1.0.2", - "jest": "^23.4.0", + "jest": "^23.4.2", "jest-raw-loader": "^1.0.1", "mini-css-extract-plugin": "^0.4.1", "node-sass": "^4.9.2", @@ -91,22 +91,22 @@ "resolve-url-loader": "^2.3.0", "sass-loader": "^7.0.3", "style-loader": "^0.21.0", - "ts-jest": "^23.0.0", - "tslint": "^5.10.0", - "typescript": "^2.9.2", - "uglify-js": "^3.4.4", + "ts-jest": "^23.0.1", + "tslint": "^5.11.0", + "typescript": "^3.0.0", + "uglify-js": "^3.4.6", "util.promisify": "^1.0.0", - "webpack": "^4.16.0", - "webpack-cli": "^3.0.8" + "webpack": "^4.16.3", + "webpack-cli": "^3.1.0" }, "dependencies": { "argparse": "^1.0.10", - "compression": "^1.7.2", + "compression": "^1.7.3", "express": "^4.16.3", "immutable": "^4.0.0-rc.9", - "node-fetch": "^2.1.2", + "node-fetch": "^2.2.0", "react": "^16.4.1", "react-dom": "^16.4.1", - "rxjs": "^6.2.1" + "rxjs": "^6.2.2" } } diff --git a/src/mol-util/download.ts b/src/mol-util/download.ts index 2e820378ce72dafdb060d158a04fe0a0bdc8eec5..4efa347e544414a8cca1f273b8d56eceab4c3e18 100644 --- a/src/mol-util/download.ts +++ b/src/mol-util/download.ts @@ -33,7 +33,7 @@ export function download (data: Blob|string, downloadName = 'download') { if (data instanceof Blob) { // no downloading of blob urls in Safari const reader = new FileReader() - reader.onloadend = () => open(reader.result) + reader.onloadend = () => open(reader.result as string) reader.readAsDataURL(data) } else { open(data) diff --git a/src/mol-util/read.ts b/src/mol-util/read.ts index b88abd9ebfb5587d9800b7eea9af00d0ce832401..29cc2acf06a6e0a36295a114be29d28b56495b59 100644 --- a/src/mol-util/read.ts +++ b/src/mol-util/read.ts @@ -12,7 +12,7 @@ export const readFileAs = (file: File, isBinary = false) => { reject(new DOMException('Error parsing file.')) } fileReader.onload = () => { - resolve(isBinary ? new Uint8Array(fileReader.result) : fileReader.result) + resolve(isBinary ? new Uint8Array(fileReader.result as ArrayBuffer) : fileReader.result as string) } if (isBinary) { fileReader.readAsArrayBuffer(file)