Skip to content

Commit

Permalink
[Security] Remediate axios vulnerabilities and remove code sandbox …
Browse files Browse the repository at this point in the history
…links (#1152)

* [Security] Remediate `axios` vulnerabilities

Remove vestiges of CodeSandbox integration as follow-up to #164
Add resolution for `wait-on`

Signed-off-by: Josh Romero <rmerqg@amazon.com>

* add changelog

Signed-off-by: Josh Romero <rmerqg@amazon.com>

* restore unintentionally removed guide section code tab

Signed-off-by: Josh Romero <rmerqg@amazon.com>

---------

Signed-off-by: Josh Romero <rmerqg@amazon.com>
  • Loading branch information
joshuarrrr committed Feb 2, 2024
1 parent 04f9c4c commit 077a7b4
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 796 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

- [CVE-2023-46234] Bump `browserify-sign` from `4.0.4` to `4.2.2` ([#1117](https://github.com/opensearch-project/oui/pull/1117))
- Bump `babel-template` from `6.26.0` to `@babel/template` `7.10.4` ([#1095](https://github.com/opensearch-project/oui/pull/1095))
- [CVE-2023-45857] Remediate `axios` vulnerabilities ([#1152](https://github.com/opensearch-project/oui/pull/1152))
- [CVE-2023-45133] Bump `@babel/traverse` from `7.12.10` to `7.23.6` ([#1174](https://github.com/opensearch-project/oui/pull/1174))

### 📈 Features/Enhancements
Expand Down
6 changes: 1 addition & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@
"babel-plugin-inline-react-svg/**/ansi-regex": "^5.0.1",
"babel-plugin-inline-react-svg/svgo/js-yaml": "^3.13.1",
"babel-template/**/ansi-regex": "^5.0.1",
"codesandbox/**/ansi-regex": "^5.0.1",
"codesandbox/**/got": "^11.8.5",
"codesandbox/axios": "^0.22.0",
"codesandbox/pacote": "^12.0.0",
"cssnano/**/css-select/nth-check": "^2.0.1",
"cssnano/**/postcss": "^7.0.39",
"enzyme/cheerio/cheerio-select-tmp/css-select/css-what": "^6.1.0",
Expand All @@ -80,6 +76,7 @@
"sass-lint/front-matter": "^4.0.2",
"sass-lint/merge": "^2.1.1",
"start-server-and-test/**/minimist": "^1.2.6",
"start-server-and-test/wait-on": "^7.1.0",
"webpack-dev-server/**/ansi-regex": "^5.0.1",
"webpack-dev-server/chokidar/glob-parent": "^6.0.1",
"webpack-dev-server/selfsigned": "^2.0.1",
Expand Down Expand Up @@ -174,7 +171,6 @@
"chalk": "^4.1.2",
"chokidar": "^3.5.3",
"circular-dependency-plugin": "^5.2.0",
"codesandbox": "^2.2.3",
"core-js": "^3.29.1",
"cross-env": "^7.0.3",
"css-loader": "^4.2.2",
Expand Down
12 changes: 0 additions & 12 deletions src-docs/src/components/codesandbox/index.js

This file was deleted.

201 changes: 0 additions & 201 deletions src-docs/src/components/codesandbox/link.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@

import React, { FunctionComponent, useState, useEffect } from 'react';
import { OuiCodeBlock } from '../../../../../src/components/code';
import { OuiButtonEmpty } from '../../../../../src/components/button';
// @ts-ignore Not TS
import { CodeSandboxLink } from '../../codesandbox';
// @ts-ignore Not TS
import { renderJsSourceCode } from '../_utils';

Expand All @@ -33,22 +30,11 @@ export const GuideSectionExampleCode: FunctionComponent<GuideSectionExampleCode>
};
}, [code]);

const codeSandboxLink = (
<CodeSandboxLink
className="guideSectionExampleCode__link"
content={code.default}>
<OuiButtonEmpty size="xs" iconType="logoCodesandbox">
Try out this demo on Code Sandbox
</OuiButtonEmpty>
</CodeSandboxLink>
);

return (
<>
<OuiCodeBlock language="jsx" overflowHeight={400} isCopyable>
{codeToRender}
</OuiCodeBlock>
{codeSandboxLink}
</>
);
};
1 change: 0 additions & 1 deletion src-docs/src/views/form_controls/display_toggles.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ DisplayToggles.propTypes = {
canAppend: PropTypes.bool,
canInvalid: PropTypes.bool,
extras: PropTypes.arrayOf(PropTypes.node),
// Manually building the spacer array to avoid having to import Spacer into codesandbox
spacerSize: PropTypes.oneOf(['xs', 's', 'm', 'l', 'xl', 'xxl']),
};

Expand Down
2 changes: 1 addition & 1 deletion src-docs/src/views/header/header_elastic_pattern.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import React, { useState, useEffect } from 'react';
import { Link } from 'react-router-dom';
// Uncomment to use in consuming apps or CodeSandbox
// Uncomment to use in consuming apps
// import theme from '@opensearch-project/oui/dist/oui_theme_light.json';

import {
Expand Down
Loading

0 comments on commit 077a7b4

Please sign in to comment.