moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'optimize-error-boundary' into 'develop' 

Webpack: optimize ErrorBoundary

See merge request soapbox-pub/soapbox-fe!744
This commit is contained in:
Alex Gleason 2021-09-11 23:46:14 +00:00
parent bc6636e4d7 bf9a6950eb
commit 139b47eb22
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/soapbox/components/error_boundary.js
View File

@ -1,7 +1,6 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import Bowser from 'bowser';
import * as Sentry from '@sentry/browser'; import * as Sentry from '@sentry/browser';
export default class ErrorBoundary extends React.PureComponent { export default class ErrorBoundary extends React.PureComponent {
@ -23,6 +22,14 @@ export default class ErrorBoundary extends React.PureComponent {
error, error,
componentStack: info && info.componentStack, componentStack: info && info.componentStack,
}); });
import(/* webpackChunkName: "error" */'bowser')
.then(({ default: Bowser }) => {
this.setState({
browser: Bowser.getParser(window.navigator.userAgent),
});
})
.catch(() => {});
} }
setTextareaRef = c => { setTextareaRef = c => {
@ -49,9 +56,7 @@ export default class ErrorBoundary extends React.PureComponent {
} }
render() { render() {
const browser = Bowser.getParser(window.navigator.userAgent); const { browser, hasError } = this.state;
const { hasError } = this.state;
if (!hasError) { if (!hasError) {
return this.props.children; return this.props.children;
@ -75,9 +80,9 @@ export default class ErrorBoundary extends React.PureComponent {
onClick={this.handleCopy} onClick={this.handleCopy}
readOnly readOnly
/>} />}
<p className='error-boundary__browser'> {browser && <p className='error-boundary__browser'>
{browser.getBrowserName()} {browser.getBrowserVersion()} {browser.getBrowserName()} {browser.getBrowserVersion()}
</p> </p>}
<p className='help-text'> <p className='help-text'>
<FormattedMessage <FormattedMessage
id='alert.unexpected.help_text' id='alert.unexpected.help_text'