Merge branch 'master' of https://github.com/molstar/molstar

package.json

@@ -94,27 +94,27 @@
     "@graphql-codegen/typescript-graphql-request": "^1.17.7",
     "@graphql-codegen/typescript-operations": "^1.17.8",
     "@types/cors": "^2.8.7",
-    "@typescript-eslint/eslint-plugin": "^3.9.1",
-    "@typescript-eslint/parser": "^3.9.1",
+    "@typescript-eslint/eslint-plugin": "^3.10.1",
+    "@typescript-eslint/parser": "^3.10.1",
     "benchmark": "^2.1.4",
     "concurrently": "^5.3.0",
     "cpx2": "^2.0.0",
     "css-loader": "^3.6.0",
-    "eslint": "^7.7.0",
+    "eslint": "^7.8.1",
     "extra-watch-webpack-plugin": "^1.0.3",
-    "file-loader": "^6.0.0",
+    "file-loader": "^6.1.0",
     "fs-extra": "^9.0.1",
     "graphql": "^15.3.0",
     "http-server": "^0.12.3",
-    "jest": "^26.4.1",
+    "jest": "^26.4.2",
     "mini-css-extract-plugin": "^0.9.0",
     "node-sass": "^4.14.1",
     "raw-loader": "^4.0.1",
     "sass-loader": "^8.0.2",
-    "simple-git": "^2.19.0",
+    "simple-git": "^2.20.1",
     "style-loader": "^1.2.1",
-    "ts-jest": "^26.2.0",
-    "typescript": "^3.9.7",
+    "ts-jest": "^26.3.0",
+    "typescript": "^4.0.2",
     "webpack": "^4.44.1",
     "webpack-cli": "^3.3.12",
     "webpack-version-file-plugin": "^0.4.0"
@@ -123,11 +123,11 @@
     "@types/argparse": "^1.0.38",
     "@types/benchmark": "^1.0.33",
     "@types/compression": "1.7.0",
-    "@types/express": "^4.17.7",
+    "@types/express": "^4.17.8",
     "@types/jest": "^25.2.3",
-    "@types/node": "^14.6.0",
+    "@types/node": "^14.10.1",
     "@types/node-fetch": "^2.5.7",
-    "@types/react": "^16.9.46",
+    "@types/react": "^16.9.49",
     "@types/react-dom": "^16.9.8",
     "@types/swagger-ui-dist": "3.0.5",
     "argparse": "^1.0.10",
@@ -135,13 +135,13 @@
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "express": "^4.17.1",
-    "immer": "^7.0.7",
+    "immer": "^7.0.9",
     "immutable": "^3.8.2",
     "node-fetch": "^2.6.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "rxjs": "^6.6.2",
-    "swagger-ui-dist": "^3.32.4",
+    "rxjs": "^6.6.3",
+    "swagger-ui-dist": "^3.33.0",
     "tslib": "^2.0.1",
     "util.promisify": "^1.0.1",
     "xhr2": "^0.2.0"

src/servers/model/config.ts

@@ -214,7 +214,8 @@ export const ModelServerConfigTemplate: ModelServerConfig = {
 };
 
 // TODO: include once properly supported
-delete ModelServerConfigTemplate.customProperties;
+// cast to any to prevent "The operand of a 'delete' operator must be optional"
+delete (ModelServerConfigTemplate as any).customProperties;
 
 interface ServerJsonConfig {
     cfg?: string,