Browse Source

Merge branch 'master' into dev-sb-v2

# Conflicts:
#	CHANGELOG.md
#	package-lock.json
#	package.json
Sebastian Bittrich 3 năm trước cách đây
mục cha
commit
df49f72def
3 tập tin đã thay đổi với 25 bổ sung12 xóa
  1. 2 2
      .github/workflows/lint.yml
  2. 12 0
      CHANGELOG.md
  3. 11 10
      package.json

+ 2 - 2
.github/workflows/lint.yml

@@ -8,10 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: install node v12
+      - name: install node v14
         uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 14
       - name: yarn install
         run: yarn install
       - name: eslint

+ 12 - 0
CHANGELOG.md

@@ -18,6 +18,18 @@
   - The loading configuration includes an optional trajectory preset provider `TrajectoryHierarchyPresetProvider`
 - Remove `alignMotif` methods (& pecos-integration) as the strucmotif service now reports RMSD and transformations for all hits
 
+## [1.9.6] - 2021-11-16
+### General
+- Try to fix packing issues
+
+## [1.9.5] - 2021-11-16
+### General
+- Mol* 2.3.7 (more WebGL fixes)
+
+## [1.9.4] - 2021-11-02
+### General
+- Mol* 2.3.5 and other dependencies (iOS WebGL fixes)
+
 ## [1.9.3] - 2021-10-18
 ### Bug fixes
 - Rewire index parameter of symmetry preset

+ 11 - 10
package.json

@@ -37,33 +37,34 @@
     "author": "RCSB PDB and Mol* Contributors",
     "license": "MIT",
     "devDependencies": {
-        "@types/react": "^17.0.20",
+        "@types/react": "^17.0.27",
         "@types/react-dom": "^17.0.9",
-        "@typescript-eslint/eslint-plugin": "^4.31.0",
-        "@typescript-eslint/parser": "^4.31.0",
+        "@typescript-eslint/eslint-plugin": "^4.32.0",
+        "@typescript-eslint/parser": "^4.32.0",
+        "acorn": "^8.5.0",
         "buffer": "^6.0.3",
-        "concurrently": "^6.2.1",
-        "cpx2": "^3.0.2",
+        "concurrently": "^6.3.0",
+        "cpx2": "^4.0.0",
         "crypto-browserify": "^3.12.0",
-        "css-loader": "^6.2.0",
+        "css-loader": "^6.3.0",
         "eslint": "^7.32.0",
         "extra-watch-webpack-plugin": "^1.0.3",
         "file-loader": "^6.2.0",
         "fs-extra": "^10.0.0",
         "mini-css-extract-plugin": "^2.3.0",
-        "molstar": "^2.3.1",
+        "molstar": "^2.3.7",
         "node-sass": "^6.0.1",
         "path-browserify": "^1.0.1",
         "raw-loader": "^4.0.2",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
-        "rxjs": "^7.3.0",
+        "rxjs": "^7.3.1",
         "sass-loader": "^12.1.0",
         "stream-browserify": "^3.0.0",
-        "style-loader": "^3.2.1",
+        "style-loader": "^3.3.0",
         "tslib": "^2.3.1",
         "typescript": "^4.4.3",
-        "webpack": "^5.52.1",
+        "webpack": "^5.56.0",
         "webpack-cli": "^4.8.0"
     }
 }