Browse Source

updates: packages, molstar, urls

Alexander Rose 5 years ago
parent
commit
5eb2b32e35
3 changed files with 30 additions and 14 deletions
  1. 25 9
      package-lock.json
  2. 1 1
      package.json
  3. 4 4
      src/structure-viewer/index.ts

+ 25 - 9
package-lock.json

@@ -4441,9 +4441,9 @@
             }
         },
         "molstar": {
-            "version": "0.2.11",
-            "resolved": "https://registry.npmjs.org/molstar/-/molstar-0.2.11.tgz",
-            "integrity": "sha512-5SRR19ZgeeSVCZup5RXYu+t2lYycv2Wjz/chTk+JCf8gEDdDHP3gbp1m4LdEgT4QzjVAfLDv50OlPlb+uvDHRg==",
+            "version": "0.2.12",
+            "resolved": "https://registry.npmjs.org/molstar/-/molstar-0.2.12.tgz",
+            "integrity": "sha512-MProo9gKAPqK1wM+lwn0mGA/n88jS/UJoGnqNg+NNpmQ5qRfdwcKdia6fAjErTtRaWcUYQaZl6UMdWrGOzCqXA==",
             "dev": true,
             "requires": {
                 "@types/argparse": "^1.0.36",
@@ -4451,9 +4451,9 @@
                 "@types/compression": "1.0.1",
                 "@types/express": "^4.17.1",
                 "@types/jest": "^24.0.18",
-                "@types/node": "^12.7.5",
-                "@types/node-fetch": "^2.5.1",
-                "@types/react": "^16.9.2",
+                "@types/node": "^12.7.7",
+                "@types/node-fetch": "^2.5.2",
+                "@types/react": "^16.9.3",
                 "@types/react-dom": "^16.9.0",
                 "@types/swagger-ui-dist": "3.0.3",
                 "@types/webgl2": "0.0.5",
@@ -4471,15 +4471,31 @@
                 "xhr2": "^0.2.0"
             },
             "dependencies": {
+                "@types/node": {
+                    "version": "12.7.7",
+                    "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.7.tgz",
+                    "integrity": "sha512-4jUncNe2tj1nmrO/34PsRpZqYVnRV1svbU78cKhuQKkMntKB/AmdLyGgswcZKjFHEHGpiY8pVD8CuVI55nP54w==",
+                    "dev": true
+                },
                 "@types/node-fetch": {
-                    "version": "2.5.1",
-                    "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.1.tgz",
-                    "integrity": "sha512-nYsC20tHanaNa4coFvCDcuIvtdvu8YkQz0XQOoBHL1X1y1QxeNe73dg1PaLGqsJNWiVwK0bjn5Jf+ZQpE6acJg==",
+                    "version": "2.5.2",
+                    "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.2.tgz",
+                    "integrity": "sha512-djYYKmdNRSBtL1x4CiE9UJb9yZhwtI1VC+UxZD0psNznrUj80ywsxKlEGAE+QL1qvLjPbfb24VosjkYM6W4RSQ==",
                     "dev": true,
                     "requires": {
                         "@types/node": "*"
                     }
                 },
+                "@types/react": {
+                    "version": "16.9.3",
+                    "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.3.tgz",
+                    "integrity": "sha512-Ogb2nSn+2qQv5opoCv7Ls5yFxtyrdUYxp5G+SWTrlGk7dmFKw331GiezCgEZj9U7QeXJi1CDtws9pdXU1zUL4g==",
+                    "dev": true,
+                    "requires": {
+                        "@types/prop-types": "*",
+                        "csstype": "^2.2.0"
+                    }
+                },
                 "rxjs": {
                     "version": "6.5.3",
                     "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",

+ 1 - 1
package.json

@@ -40,7 +40,7 @@
         "extra-watch-webpack-plugin": "^1.0.3",
         "file-loader": "^4.2.0",
         "mini-css-extract-plugin": "^0.8.0",
-        "molstar": "^0.2.11",
+        "molstar": "^0.2.12",
         "node-fetch": "^2.6.0",
         "node-sass": "^4.12.0",
         "raw-loader": "^3.1.0",

+ 4 - 4
src/structure-viewer/index.ts

@@ -31,11 +31,11 @@ export const DefaultStructureViewerProps = {
     modelUrlProvider: (pdbId: string) => {
         const id = pdbId.toLowerCase()
         return {
-            // url: `https://files.rcsb.org/download/${id}.cif`,
-            // format: 'cif' as SupportedFormats
-            url: `https://alpha-models.rcsb.org/${id}.bcif`,
+            url: `https://files.rcsb.org/download/${id}.cif`,
+            format: 'cif' as SupportedFormats
+            // url: `https://alpha-models.rcsb.org/${id}.bcif`,
             // url: `https://alpha-models.rcsb.org/models/${id.substr(1, 2)}/${id}.bcif`,
-            format: 'bcif' as SupportedFormats
+            // format: 'bcif' as SupportedFormats
         }
     },
 }