Skip to content

Commit

Permalink
Merge branch '1.x' into 1.x-bump-scss-tokenizer
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuarrrr authored Apr 5, 2023
2 parents 2b21918 + 39818e3 commit 9a19c9f
Show file tree
Hide file tree
Showing 6 changed files with 208 additions and 136 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.node_binaries
.native_modules
node_modules
opensearch-dashboards-docker-dev/
!/src/dev/npm/integration_tests/__fixtures__/fixture1/node_modules
!/src/dev/notice/__fixtures__/node_modules
trash
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
### 🛡 Security

- [CVE-2022-25758] Bump scss-tokenizer from `0.3.0` to `0.4.3` ([#3727](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3727))
- [CVE-2021-3765] Update `@microsoft/api-documenter` and `@microsoft/api-extractor` versions to bump validator from `8.2.0` to `13.9.0` ([#3725](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3725))
- [CVE-2022-1537] Bump grunt from `1.4.1` to `1.5.3` ([#3723](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3723))
- [CVE-2022-0436] Bump grunt from `1.4.1` to `1.5.3` ([#3723](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3723))
- [CVE-2021-23382] Bump postcss from `8.2.10` to `8.2.13` ([#3739](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3739))
- [CVE-2021-3803] Bump nth-check from `1.0.2` to `2.0.1` ([#3729](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3729))
- [CVE-2022-25858] Bump terser from `4.8.0` to `4.8.1` ([#3726](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/3726))

### 📈 Features/Enhancements

Expand Down
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@
"**/node-jose": "^2.2.0",
"**/node-jose/node-forge": "^0.10.0",
"**/normalize-url": "^4.5.1",
"**/nth-check": "^2.0.1",
"**/prismjs": "^1.23.0",
"**/qs": "^6.11.0",
"**/react-syntax-highlighter": "^15.3.1",
Expand Down Expand Up @@ -273,8 +274,8 @@
"@osd/test": "1.0.0",
"@osd/test-subj-selector": "0.2.1",
"@osd/utility-types": "1.0.0",
"@microsoft/api-documenter": "7.7.2",
"@microsoft/api-extractor": "7.7.0",
"@microsoft/api-documenter": "^7.13.78",
"@microsoft/api-extractor": "^7.19.3",
"@percy/agent": "^0.28.6",
"@testing-library/dom": "^7.24.2",
"@testing-library/jest-dom": "^5.11.4",
Expand Down Expand Up @@ -415,7 +416,7 @@
"fp-ts": "^2.3.1",
"geckodriver": "^1.21.0",
"getopts": "^2.2.5",
"grunt": "^1.4.1",
"grunt": "~1.5.3",
"grunt-available-tasks": "^0.6.3",
"grunt-cli": "^1.4.3",
"grunt-contrib-watch": "^1.1.0",
Expand Down Expand Up @@ -459,7 +460,7 @@
"nyc": "^14.1.1",
"pixelmatch": "^5.1.0",
"pngjs": "^3.4.0",
"postcss": "^8.2.10",
"postcss": "^8.2.13",
"prettier": "^2.1.1",
"prop-types": "^15.7.2",
"react-grid-layout": "^0.16.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/osd-optimizer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"node-sass": "sass/node-sass#v5",
"normalize-path": "^3.0.0",
"pirates": "^4.0.1",
"postcss": "^8.2.10",
"postcss": "^8.2.13",
"rxjs": "^6.5.5",
"source-map-support": "^0.5.19",
"terser-webpack-plugin": "^2.1.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/osd-ui-framework/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"css-loader": "^3.4.2",
"expose-loader": "^0.7.5",
"file-loader": "^4.2.0",
"grunt": "^1.4.1",
"grunt": "~1.5.3",
"grunt-babel": "^8.0.0",
"grunt-contrib-clean": "^2.0.0",
"grunt-contrib-copy": "^1.0.0",
Expand All @@ -54,7 +54,7 @@
"keymirror": "0.1.1",
"moment": "^2.24.0",
"node-sass": "sass/node-sass#v5",
"postcss": "^8.2.10",
"postcss": "^8.2.13",
"postcss-loader": "^3.0.0",
"raw-loader": "^3.1.0",
"react-dom": "^16.12.0",
Expand Down
Loading

0 comments on commit 9a19c9f

Please sign in to comment.