Browse Source

Merge branch 'master' into dev-sb-strucmotifwizard

# Conflicts:
#	CHANGELOG.md
#	package-lock.json
JonStargaryen 4 years ago
parent
commit
4d94872b83
6 changed files with 46 additions and 20 deletions
  1. 2 0
      .eslintignore
  2. 18 0
      .github/workflows/lint.yml
  3. 4 0
      CHANGELOG.md
  4. 2 0
      README.md
  5. 19 19
      package.json
  6. 1 1
      src/viewer/index.ts

+ 2 - 0
.eslintignore

@@ -0,0 +1,2 @@
+node_modules/*
+build/*

+ 18 - 0
.github/workflows/lint.yml

@@ -0,0 +1,18 @@
+on:
+  push:
+  pull_request:
+
+jobs:
+  eslint:
+    name: eslint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: install node v12
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - name: yarn install
+        run: yarn install
+      - name: eslint
+        uses: icrawl/action-eslint@v1

+ 4 - 0
CHANGELOG.md

@@ -6,6 +6,10 @@
 ### General
 - structural motif search wizard
 
+## [1.0.34] - 2021-02-05
+### General
+- bumps dependencies
+
 ## [1.0.33] - 2021-02-02
 ### General
 - let's call this the initial release

+ 2 - 0
README.md

@@ -1,3 +1,5 @@
+[![npm version](https://badge.fury.io/js/%40rcsb%2Frcsb-molstar.svg)](https://www.npmjs.com/package/@rcsb/rcsb-molstar)
+[![Changelog](https://img.shields.io/badge/changelog--lightgrey.svg?style=flat)](https://github.com/rcsb/rcsb-molstar/blob/master/CHANGELOG.md)
 [![License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](./LICENSE)
 
 RCSB PDB implementation of [Mol* (/'mol-star/)](https://github.com/molstar/molstar).

+ 19 - 19
package.json

@@ -1,6 +1,6 @@
 {
     "name": "@rcsb/rcsb-molstar",
-    "version": "1.0.33",
+    "version": "1.0.34",
     "description": "RCSB PDB apps and props based on Mol*.",
     "homepage": "https://github.com/rcsb/rcsb-molstar#readme",
     "repository": {
@@ -37,27 +37,27 @@
     "author": "RCSB PDB and Mol* Contributors",
     "license": "MIT",
     "devDependencies": {
-        "@types/react": "^16.9.49",
-        "@types/react-dom": "^16.9.8",
-        "@typescript-eslint/eslint-plugin": "^3.10.1",
-        "@typescript-eslint/parser": "^3.10.1",
+        "@types/react": "^17.0.0",
+        "@types/react-dom": "^17.0.0",
+        "@typescript-eslint/eslint-plugin": "^4.9.1",
+        "@typescript-eslint/parser": "^4.9.1",
         "concurrently": "^5.3.0",
-        "cpx2": "^2.0.0",
-        "css-loader": "^3.6.0",
-        "eslint": "^7.8.1",
+        "cpx2": "^3.0.0",
+        "css-loader": "^5.0.1",
+        "eslint": "^7.15.0",
         "extra-watch-webpack-plugin": "^1.0.3",
-        "file-loader": "^6.1.0",
-        "mini-css-extract-plugin": "^0.9.0",
-        "molstar": "^1.2.3",
-        "node-sass": "^4.14.1",
-        "raw-loader": "^4.0.1",
-        "react": "^16.13.1",
-        "react-dom": "^16.13.1",
+        "file-loader": "^6.2.0",
+        "mini-css-extract-plugin": "^1.3.2",
+        "molstar": "^1.2.15",
+        "node-sass": "^5.0.0",
+        "raw-loader": "^4.0.2",
+        "react": "^17.0.1",
+        "react-dom": "^17.0.1",
         "rxjs": "^6.6.3",
-        "sass-loader": "^8.0.2",
-        "style-loader": "^1.2.1",
-        "tslib": "^2.0.1",
-        "typescript": "4.0.2",
+        "sass-loader": "^10.1.0",
+        "style-loader": "^2.0.0",
+        "tslib": "^2.0.3",
+        "typescript": "4.1.2",
         "webpack": "^4.44.1",
         "webpack-cli": "^3.3.12"
     },

+ 1 - 1
src/viewer/index.ts

@@ -155,7 +155,7 @@ export class Viewer {
         // TODO Check why this.plugin.canvas3d can be null
         // this.plugin.canvas3d can be null. The value is not assigned until React Plugin component is mounted
         // Next wait Promise guarantees that its value is defined
-        const wait: Promise<null> = new Promise<null>((resolve, reject)=>{
+        const wait: Promise<void> = new Promise<void>((resolve, reject)=>{
             const recursive: () => void = () => {
                 if(this.plugin.canvas3d != null){
                     resolve();