Merge branch 'master' into snyk-upgrade-cbef4d997c4e6f26be2616e60200522d

CliClient/package.json

@@ -49,7 +49,7 @@
     "font-awesome-filetypes": "^2.1.0",
     "form-data": "^2.1.4",
     "fs-extra": "^5.0.0",
-    "highlight.js": "^9.17.1",
+    "highlight.js": "^10.4.1",
     "html-entities": "^1.2.1",
     "html-minifier": "^3.5.15",
     "htmlparser2": "^4.1.0",

Clipper/popup/package.json

@@ -5,10 +5,9 @@
   "homepage": ".",
   "dependencies": {
     "@babel/core": "7.8.4",
-    "@svgr/webpack": "4.3.3",
-    "@typescript-eslint/eslint-plugin": "^2.34.0",
-    "@typescript-eslint/parser": "^2.10.0",
-    "babel-eslint": "10.0.3",
+    "@ svgr / webpack" : "4.3.3" ,
+
+    "babel-eslint" : "10.0.3" ,
     "babel-jest": "^24.9.0",
     "babel-loader": "8.0.6",
     "babel-plugin-named-asset-import": "^0.3.6",

Modules/TinyMCE/JoplinLists/.snyk

@@ -0,0 +1,46 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.19.0
+ignore: {}
+# patches apply the minimum changes required to fix a vulnerability
+patch:
+  SNYK-JS-LODASH-567746:
+    - awesome-typescript-loader > lodash:
+        patched: '2021-01-22T21:17:43.160Z'
+    - grunt-webpack > lodash:
+        patched: '2021-01-22T21:17:43.160Z'
+    - grunt-contrib-clean > async > lodash:
+        patched: '2021-01-22T21:17:43.160Z'
+    - grunt > grunt-legacy-log > lodash:
+        patched: '2021-01-22T21:17:43.160Z'
+    - grunt > grunt-legacy-util > lodash:
+        patched: '2021-01-22T21:17:43.160Z'
+    - '@ephox/bedrock > source-map-loader > async > lodash':
+        patched: '2021-01-22T21:17:43.160Z'
+    - webpack-livereload-plugin > portfinder > async > lodash:
+        patched: '2021-01-22T21:17:43.160Z'
+    - '@ephox/bedrock > webpack-dev-server > http-proxy-middleware > lodash':
+        patched: '2021-01-22T21:17:43.160Z'
+    - grunt > grunt-legacy-log > grunt-legacy-log-utils > lodash:
+        patched: '2021-01-22T21:17:43.160Z'
+    - '@ephox/bedrock > istanbul-instrumenter-loader > istanbul-lib-instrument > babel-types > lodash':
+        patched: '2021-01-22T21:17:43.160Z'
+    - '@ephox/bedrock > istanbul-instrumenter-loader > istanbul-lib-instrument > babel-generator > lodash':
+        patched: '2021-01-22T21:17:43.160Z'
+    - '@ephox/bedrock > istanbul-instrumenter-loader > istanbul-lib-instrument > babel-traverse > lodash':
+        patched: '2021-01-22T21:17:43.160Z'
+    - '@ephox/bedrock > istanbul-instrumenter-loader > istanbul-lib-instrument > babel-template > lodash':
+        patched: '2021-01-22T21:17:43.160Z'
+    - '@ephox/bedrock > webdriverio > archiver > async > lodash':
+        patched: '2021-01-22T21:17:43.160Z'
+    - '@ephox/bedrock > webpack-dev-server > portfinder > async > lodash':
+        patched: '2021-01-22T21:17:43.160Z'
+    - '@ephox/bedrock > istanbul-instrumenter-loader > istanbul-lib-instrument > babel-generator > babel-types > lodash':
+        patched: '2021-01-22T21:17:43.160Z'
+    - '@ephox/bedrock > istanbul-instrumenter-loader > istanbul-lib-instrument > babel-traverse > babel-types > lodash':
+        patched: '2021-01-22T21:17:43.160Z'
+    - '@ephox/bedrock > istanbul-instrumenter-loader > istanbul-lib-instrument > babel-template > babel-types > lodash':
+        patched: '2021-01-22T21:17:43.160Z'
+    - '@ephox/bedrock > istanbul-instrumenter-loader > istanbul-lib-instrument > babel-template > babel-traverse > lodash':
+        patched: '2021-01-22T21:17:43.160Z'
+    - '@ephox/bedrock > istanbul-instrumenter-loader > istanbul-lib-instrument > babel-template > babel-traverse > babel-types > lodash':
+        patched: '2021-01-22T21:17:43.160Z'