Merge branch '1.3' into 1.3-xml2js

Signed-off-by: Anan Zhuang <[email protected]>
ananzh · Sep 14, 2023 · ae071f0 · ae071f0
2 parents bb8b7b3 + 2a386b8
commit ae071f0
Show file tree

Hide file tree

Showing 6 changed files with 251 additions and 382 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ### 🛡 Security
 - [CVE-2023-26136] Bump `word-wrap` from `1.2.3` to `1.2.4` ([#5002](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5002))
+- [CVE-2022-21670] Bump `markdown-it` from `10.0.0` to `12.3.2` ([#5016](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5016))
+- [CVE-2022-33987] Partially fix security issues for `got` by bumping `@elastic/makelogs` from `6.0.0` to `6.1.1` and updating yarn.lock ([#5006](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5006))
+- Bump `yo` from `2.0.6` to `3.1.1` ([#5005]( https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5005))
 - [CVE-2023-0842] Bump `xml2js` from `0.4.22` to `0.6.2` ([#5024](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5024))
 
 ### 📈 Features/Enhancements

diff --git a/package.json b/package.json
@@ -262,7 +262,7 @@
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.2",
     "@elastic/filesaver": "1.1.2",
-    "@elastic/makelogs": "^6.0.0",
+    "@elastic/makelogs": "^6.1.1",
     "@osd/babel-preset": "1.0.0",
     "@osd/dev-utils": "1.0.0",
     "@osd/opensearch": "1.0.0",
@@ -451,7 +451,7 @@
     "listr": "^0.14.1",
     "load-grunt-config": "^3.0.1",
     "load-json-file": "^6.2.0",
-    "markdown-it": "^10.0.0",
+    "markdown-it": "^12.3.2",
     "mocha": "^7.2.0",
     "mock-fs": "^4.12.0",
     "monaco-editor": "~0.17.0",

diff --git a/packages/osd-dev-utils/package.json b/packages/osd-dev-utils/package.json
@@ -24,7 +24,7 @@
     "getopts": "^2.2.5",
     "globby": "^8.0.1",
     "load-json-file": "^6.2.0",
-    "markdown-it": "^10.0.0",
+    "markdown-it": "^12.3.2",
     "moment": "^2.24.0",
     "normalize-path": "^3.0.0",
     "rxjs": "^6.5.5",

diff --git a/packages/osd-release-notes/package.json b/packages/osd-release-notes/package.json
@@ -21,7 +21,7 @@
     "terminal-link": "^2.1.1"
   },
   "devDependencies": {
-    "markdown-it": "^10.0.0",
+    "markdown-it": "^12.3.2",
     "typescript": "4.0.2"
   }
 }
diff --git a/packages/osd-ui-framework/package.json b/packages/osd-ui-framework/package.json
@@ -70,6 +70,6 @@
     "webpack": "^4.41.5",
     "webpack-dev-server": "^3.11.2",
     "yeoman-generator": "^4.13.0",
-    "yo": "2.0.6"
+    "yo": "3.1.1"
   }
 }