Skip to content

Commit

Permalink
Merge release/1.42.0 into main branch (#881)
Browse files Browse the repository at this point in the history
* Revert "button size updates (previously reverted) (#876)" (#880)

* remove Bugsnag (#878)
  • Loading branch information
github-actions[bot] authored Mar 24, 2023
1 parent 75ba506 commit 46235d1
Show file tree
Hide file tree
Showing 8 changed files with 260 additions and 3,592 deletions.
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ jobs:
runs-on: ubuntu-latest
env:
FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
REACT_APP_BUGSNAG_API_KEY_JS: ${{ secrets.REACT_APP_BUGSNAG_API_KEY_JS }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
Expand Down
1 change: 0 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ module.exports = {
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|mdx)$": "<rootDir>/spec/__mocks__/fileMock.js",
'\\.(?:(?!variables).)+.(css|less|scss)$': '<rootDir>/spec/__mocks__/styleMock.js',
'^src/([^\\.]*)$': "<rootDir>/src/$1",
'@bugsnag/js': '@bugsnag/browser',
},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
Expand Down
5 changes: 1 addition & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@user-interviews/ui-design-system",
"version": "1.41.1",
"version": "1.42.0",
"dependencies": {
"react-bootstrap": "^2.5.0",
"react-loading-skeleton": "^3.1.0",
Expand Down Expand Up @@ -39,8 +39,6 @@
]
},
"peerDependencies": {
"@bugsnag/js": "^7.0.0",
"@bugsnag/plugin-react": "^7.0.0",
"@fortawesome/fontawesome-svg-core": "^1.2.28",
"@fortawesome/free-brands-svg-icons": "^5.15.3",
"@fortawesome/pro-regular-svg-icons": "^5.15.3",
Expand Down Expand Up @@ -119,7 +117,6 @@
"react-dom": "^16.12.0",
"react-modal": "^3.12.1",
"react-popper": "^2.2.3",
"react-scripts": "0.2.3",
"react-test-renderer": "^16.12.0",
"react-tracking": "8.1.0",
"sass-loader": "^8.0.2",
Expand Down
112 changes: 112 additions & 0 deletions spec/__snapshots__/Storyshots.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -21689,6 +21689,118 @@ exports[`Storyshots Components/Text Weight 1`] = `
</div>
`;

exports[`Storyshots Components/Toast Default 1`] = `
<div
style={
Object {
"padding": "1rem",
}
}
>
<div
aria-live="polite"
className="Toast"
/>
<div>
<p>
Click the button to see a toast message. Use the knobs to try different types!
</p>
<button
className="Button btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
>
Submit
</button>
</div>
</div>
`;

exports[`Storyshots Components/Toast Manual Dismiss Toast 1`] = `
<div
style={
Object {
"padding": "1rem",
}
}
>
<div
aria-live="polite"
className="Toast"
/>
<div>
<p>
Click the button to see a toast message. Use the knobs to try different types!
</p>
<button
className="Button btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
>
Submit
</button>
</div>
</div>
`;

exports[`Storyshots Components/Toast Toast Custom Message 1`] = `
<div
style={
Object {
"padding": "1rem",
}
}
>
<div
aria-live="polite"
className="Toast"
/>
<div>
<p>
Click the button to see a toast message. Use the knobs to try different types!
</p>
<button
className="Button btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
>
Submit
</button>
</div>
</div>
`;

exports[`Storyshots Components/Toast Toast With Action 1`] = `
<div
style={
Object {
"padding": "1rem",
}
}
>
<div
aria-live="polite"
className="Toast"
/>
<div>
<p>
Click the button to see a toast message. Use the knobs to try different types!
</p>
<button
className="Button btn btn-primary"
disabled={false}
onClick={[Function]}
type="button"
>
Submit
</button>
</div>
</div>
`;

exports[`Storyshots Components/ToggleInput Checked 1`] = `
<div
style={
Expand Down
3 changes: 0 additions & 3 deletions src/Toast/useToast.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { useCallback, useReducer } from 'react';
import { v4 as generateUUID } from 'uuid';
import { bugsnagClient } from '../bugsnag';

const createMessage = (
type,
Expand Down Expand Up @@ -51,8 +50,6 @@ const useToast = (initialMessages = []) => {

const setMessage = useCallback((...options) => {
if (options && typeof options[0] === 'string') {
bugsnagClient.notify(new Error('Toast component argument error, expecting single formatted object'));

dispatch({
type: ACTIONS.SET_MESSAGE,
payload: {
Expand Down
9 changes: 0 additions & 9 deletions src/bugsnag.js

This file was deleted.

2 changes: 0 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ import {
} from 'src/Toast';
import { ToggleInput } from 'src/ToggleInput';
import Tooltip from 'src/Tooltip';
import { bugsnagClient } from './bugsnag';

export {
Accordion,
Expand All @@ -93,7 +92,6 @@ export {
Avatar,
AsyncSelect,
AsyncCreatableSelect,
bugsnagClient,
Button,
BUTTON_GROUP_ORIENTATIONS,
Card,
Expand Down
Loading

0 comments on commit 46235d1

Please sign in to comment.