From 9d2da836b3f047d15264294ee8e2f6aae7558346 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 21 Sep 2020 22:56:15 -0500 Subject: [PATCH 01/95] Snackbar: allow severity levels --- app/soapbox/actions/snackbar.js | 25 +++++++++++++++++++++++++ app/soapbox/reducers/alerts.js | 1 + app/soapbox/selectors/index.js | 2 ++ app/styles/application.scss | 1 + app/styles/components/snackbar.scss | 5 +++++ 5 files changed, 34 insertions(+) create mode 100644 app/soapbox/actions/snackbar.js create mode 100644 app/styles/components/snackbar.scss diff --git a/app/soapbox/actions/snackbar.js b/app/soapbox/actions/snackbar.js new file mode 100644 index 000000000..bcf0ef5bc --- /dev/null +++ b/app/soapbox/actions/snackbar.js @@ -0,0 +1,25 @@ +import { ALERT_SHOW } from './alerts'; + +const showAlert = (severity, message) => ({ + type: ALERT_SHOW, + message, + severity, +}); + +export function info(message) { + return showAlert('info', message); +}; + +export function success(message) { + return showAlert('success', message); +}; + +export function error(message) { + return showAlert('error', message); +}; + +export default { + info, + success, + error, +}; diff --git a/app/soapbox/reducers/alerts.js b/app/soapbox/reducers/alerts.js index 089d920c3..9a0a7ccaf 100644 --- a/app/soapbox/reducers/alerts.js +++ b/app/soapbox/reducers/alerts.js @@ -14,6 +14,7 @@ export default function alerts(state = initialState, action) { key: state.size > 0 ? state.last().get('key') + 1 : 0, title: action.title, message: action.message, + severity: action.severity || 'info', })); case ALERT_DISMISS: return state.filterNot(item => item.get('key') === action.alert.key); diff --git a/app/soapbox/selectors/index.js b/app/soapbox/selectors/index.js index bbf0b54c5..2a7438955 100644 --- a/app/soapbox/selectors/index.js +++ b/app/soapbox/selectors/index.js @@ -124,6 +124,8 @@ export const getAlerts = createSelector([getAlertsBase], (base) => { message: item.get('message'), title: item.get('title'), key: item.get('key'), + className: `snackbar snackbar--${item.get('severity', 'info')}`, + activeClassName: 'snackbar--active', dismissAfter: 5000, barStyle: { zIndex: 200, diff --git a/app/styles/application.scss b/app/styles/application.scss index fdce329ad..5320e27c7 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -76,3 +76,4 @@ @import 'components/profile_hover_card'; @import 'components/filters'; @import 'components/mfa_form'; +@import 'components/snackbar'; diff --git a/app/styles/components/snackbar.scss b/app/styles/components/snackbar.scss new file mode 100644 index 000000000..4aa32e658 --- /dev/null +++ b/app/styles/components/snackbar.scss @@ -0,0 +1,5 @@ +.snackbar { + &--success { + background-color: $success-green !important; + } +} From 78b4587ce09367b609ff18786b88eb322210aa55 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 28 Sep 2020 18:41:35 -0500 Subject: [PATCH 02/95] Snackbar: improve style --- app/soapbox/actions/snackbar.js | 8 +++--- app/soapbox/selectors/index.js | 3 --- app/styles/components/snackbar.scss | 39 ++++++++++++++++++++++++++++- 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/app/soapbox/actions/snackbar.js b/app/soapbox/actions/snackbar.js index bcf0ef5bc..e6f0a6595 100644 --- a/app/soapbox/actions/snackbar.js +++ b/app/soapbox/actions/snackbar.js @@ -1,21 +1,21 @@ import { ALERT_SHOW } from './alerts'; -const showAlert = (severity, message) => ({ +const show = (severity, message) => ({ type: ALERT_SHOW, message, severity, }); export function info(message) { - return showAlert('info', message); + return show('info', message); }; export function success(message) { - return showAlert('success', message); + return show('success', message); }; export function error(message) { - return showAlert('error', message); + return show('error', message); }; export default { diff --git a/app/soapbox/selectors/index.js b/app/soapbox/selectors/index.js index 2a7438955..30ebcee3f 100644 --- a/app/soapbox/selectors/index.js +++ b/app/soapbox/selectors/index.js @@ -127,9 +127,6 @@ export const getAlerts = createSelector([getAlertsBase], (base) => { className: `snackbar snackbar--${item.get('severity', 'info')}`, activeClassName: 'snackbar--active', dismissAfter: 5000, - barStyle: { - zIndex: 200, - }, }); }); diff --git a/app/styles/components/snackbar.scss b/app/styles/components/snackbar.scss index 4aa32e658..78834ddda 100644 --- a/app/styles/components/snackbar.scss +++ b/app/styles/components/snackbar.scss @@ -1,5 +1,42 @@ .snackbar { + font-size: 16px !important; + padding: 10px 20px 10px 14px !important; + z-index: 9999 !important; + display: flex; + align-items: center; + justify-content: center; + + &::before { + font-family: ForkAwesome; + font-size: 20px; + margin-right: 8px; + } + + &--info { + background-color: blue !important; + + &::before { + content: ''; + } + } + &--success { - background-color: $success-green !important; + background-color: #199e5a !important; + + &::before { + content: ''; + } + } + + &--error { + background-color: red !important; + + &::before { + content: ''; + } + } + + .notification-bar-wrapper { + transform: translateY(1px); } } From bd12226a848595f96104a1595614bb53514f4be2 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 28 Sep 2020 21:58:56 -0500 Subject: [PATCH 03/95] Composer: fixes #419 jumpy cursor --- .../components/autosuggest_textarea.js | 10 ++++++++++ .../compose/components/compose_form.js | 19 ++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/soapbox/components/autosuggest_textarea.js b/app/soapbox/components/autosuggest_textarea.js index d9a044022..f3274c6a2 100644 --- a/app/soapbox/components/autosuggest_textarea.js +++ b/app/soapbox/components/autosuggest_textarea.js @@ -159,6 +159,16 @@ export default class AutosuggestTextarea extends ImmutablePureComponent { this.textarea.focus(); } + shouldComponentUpdate(nextProps, nextState) { + // Skip updating when lastToken changes so the cursor doesn't jump around + // due to re-rendering unnecessarily + if (this.state.lastToken !== nextState.lastToken) { + return false; + } else { + return super.shouldComponentUpdate(nextProps, nextState); + } + } + componentDidUpdate(prevProps, prevState) { const { suggestions } = this.props; if (suggestions !== prevProps.suggestions && suggestions.size > 0 && prevState.suggestionsHidden && prevState.focused) { diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js index af8ce4263..0f3f45f41 100644 --- a/app/soapbox/features/compose/components/compose_form.js +++ b/app/soapbox/features/compose/components/compose_form.js @@ -160,11 +160,6 @@ class ComposeForm extends ImmutablePureComponent { this.props.onChangeSpoilerText(e.target.value); } - doFocus = () => { - if (!this.autosuggestTextarea) return; - this.autosuggestTextarea.textarea.focus(); - } - setCursor = (start, end = start) => { if (!this.autosuggestTextarea) return; this.autosuggestTextarea.textarea.setSelectionRange(start, end); @@ -219,8 +214,22 @@ class ComposeForm extends ImmutablePureComponent { } } + maybeUpdateCursor = prevProps => { + const shouldUpdate = [ + // Autosuggest has been updated and + // the cursor position explicitly set + this.props.focusDate !== prevProps.focusDate, + typeof this.props.caretPosition === 'number', + ].every(Boolean); + + if (shouldUpdate) { + this.setCursor(this.props.caretPosition); + } + } + componentDidUpdate(prevProps) { this.maybeUpdateFocus(prevProps); + this.maybeUpdateCursor(prevProps); } render() { From a7d2692a71d8546fcba4e580a48212c61ac4c21f Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 28 Sep 2020 23:54:47 -0500 Subject: [PATCH 04/95] AutosuggestTextarea: shouldComponentUpdate fixes --- app/soapbox/components/autosuggest_textarea.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/soapbox/components/autosuggest_textarea.js b/app/soapbox/components/autosuggest_textarea.js index f3274c6a2..baaf3e8b0 100644 --- a/app/soapbox/components/autosuggest_textarea.js +++ b/app/soapbox/components/autosuggest_textarea.js @@ -160,9 +160,12 @@ export default class AutosuggestTextarea extends ImmutablePureComponent { } shouldComponentUpdate(nextProps, nextState) { - // Skip updating when lastToken changes so the cursor doesn't jump around - // due to re-rendering unnecessarily - if (this.state.lastToken !== nextState.lastToken) { + // Skip updating when only the lastToken changes so the + // cursor doesn't jump around due to re-rendering unnecessarily + const lastTokenUpdated = this.state.lastToken !== nextState.lastToken; + const valueUpdated = this.props.value !== nextProps.value; + + if (lastTokenUpdated && !valueUpdated) { return false; } else { return super.shouldComponentUpdate(nextProps, nextState); From 1b56fff6cb045eb201252800f00db98cbc6b269a Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 29 Sep 2020 16:50:57 -0500 Subject: [PATCH 05/95] Chats: fix #451 duplicated message --- app/soapbox/actions/streaming.js | 4 +++- app/soapbox/reducers/chat_message_lists.js | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/soapbox/actions/streaming.js b/app/soapbox/actions/streaming.js index b3ca60fb3..3b66a0472 100644 --- a/app/soapbox/actions/streaming.js +++ b/app/soapbox/actions/streaming.js @@ -57,11 +57,13 @@ export function connectTimelineStream(timelineId, path, pollingRefresh = null, a case 'pleroma:chat_update': dispatch((dispatch, getState) => { const chat = JSON.parse(data.payload); - const messageOwned = !(chat.last_message && chat.last_message.account_id !== getState().get('me')); + const me = getState().get('me'); + const messageOwned = !(chat.last_message && chat.last_message.account_id !== me); dispatch({ type: STREAMING_CHAT_UPDATE, chat, + me, // Only play sounds for recipient messages meta: !messageOwned && getSettings(getState()).getIn(['chats', 'sound']) && { sound: 'chat' }, }); diff --git a/app/soapbox/reducers/chat_message_lists.js b/app/soapbox/reducers/chat_message_lists.js index 8848a8389..3a7ec8610 100644 --- a/app/soapbox/reducers/chat_message_lists.js +++ b/app/soapbox/reducers/chat_message_lists.js @@ -39,9 +39,7 @@ const importLastMessages = (state, chats) => })); const replaceMessage = (state, chatId, oldId, newId) => { - const ids = state.get(chatId, ImmutableOrderedSet()); - const newIds = ids.delete(oldId).add(newId).sort(idComparator); - return state.set(chatId, newIds); + return state.update(chatId, chat => chat.delete(oldId).add(newId).sort(idComparator)); }; export default function chatMessageLists(state = initialState, action) { From b782f6ab1a2ad5d4ee39ed8ff5e203fc29eab8e1 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 29 Sep 2020 18:55:05 -0500 Subject: [PATCH 06/95] Snackbar: clean up styles, basic functionality --- app/soapbox/actions/alerts.js | 8 ++++---- app/soapbox/features/security/index.js | 14 +++++++------- .../ui/containers/notifications_container.js | 10 ++++++++++ app/styles/components/snackbar.scss | 4 ++-- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/app/soapbox/actions/alerts.js b/app/soapbox/actions/alerts.js index 33791369f..01fdd3ccf 100644 --- a/app/soapbox/actions/alerts.js +++ b/app/soapbox/actions/alerts.js @@ -1,4 +1,3 @@ -//test import { defineMessages } from 'react-intl'; const messages = defineMessages({ @@ -23,11 +22,12 @@ export function clearAlert() { }; }; -export function showAlert(title = messages.unexpectedTitle, message = messages.unexpectedMessage) { +export function showAlert(title = messages.unexpectedTitle, message = messages.unexpectedMessage, severity = 'info') { return { type: ALERT_SHOW, title, message, + severity, }; }; @@ -47,9 +47,9 @@ export function showAlertForError(error) { message = data.error; } - return showAlert(title, message); + return showAlert(title, message, 'error'); } else { console.error(error); - return showAlert(); + return showAlert(undefined, undefined, 'error'); } } diff --git a/app/soapbox/features/security/index.js b/app/soapbox/features/security/index.js index b13305dd1..f45416518 100644 --- a/app/soapbox/features/security/index.js +++ b/app/soapbox/features/security/index.js @@ -20,7 +20,7 @@ import { deleteAccount, } from 'soapbox/actions/auth'; import { fetchUserMfaSettings } from '../../actions/mfa'; -import { showAlert } from 'soapbox/actions/alerts'; +import snackbar from 'soapbox/actions/snackbar'; import { changeSetting, getSettings } from 'soapbox/actions/settings'; /* @@ -119,10 +119,10 @@ class ChangeEmailForm extends ImmutablePureComponent { this.setState({ isLoading: true }); return dispatch(changeEmail(email, password)).then(() => { this.setState({ email: '', password: '' }); // TODO: Maybe redirect user - dispatch(showAlert('', intl.formatMessage(messages.updateEmailSuccess))); + dispatch(snackbar.success(intl.formatMessage(messages.updateEmailSuccess))); }).catch(error => { this.setState({ password: '' }); - dispatch(showAlert('', intl.formatMessage(messages.updateEmailFail))); + dispatch(snackbar.error(intl.formatMessage(messages.updateEmailFail))); }).then(() => { this.setState({ isLoading: false }); }); @@ -193,10 +193,10 @@ class ChangePasswordForm extends ImmutablePureComponent { this.setState({ isLoading: true }); return dispatch(changePassword(oldPassword, newPassword, confirmation)).then(() => { this.clearForm(); // TODO: Maybe redirect user - dispatch(showAlert('', intl.formatMessage(messages.updatePasswordSuccess))); + dispatch(snackbar.success(intl.formatMessage(messages.updatePasswordSuccess))); }).catch(error => { this.clearForm(); - dispatch(showAlert('', intl.formatMessage(messages.updatePasswordFail))); + dispatch(snackbar.error(intl.formatMessage(messages.updatePasswordFail))); }).then(() => { this.setState({ isLoading: false }); }); @@ -374,10 +374,10 @@ class DeactivateAccount extends ImmutablePureComponent { this.setState({ isLoading: true }); return dispatch(deleteAccount(password)).then(() => { //this.setState({ email: '', password: '' }); // TODO: Maybe redirect user - dispatch(showAlert('', intl.formatMessage(messages.deleteAccountSuccess))); + dispatch(snackbar.success(intl.formatMessage(messages.deleteAccountSuccess))); }).catch(error => { this.setState({ password: '' }); - dispatch(showAlert('', intl.formatMessage(messages.deleteAccountFail))); + dispatch(snackbar.error(intl.formatMessage(messages.deleteAccountFail))); }).then(() => { this.setState({ isLoading: false }); }); diff --git a/app/soapbox/features/ui/containers/notifications_container.js b/app/soapbox/features/ui/containers/notifications_container.js index b60a0216f..0bb26ecf9 100644 --- a/app/soapbox/features/ui/containers/notifications_container.js +++ b/app/soapbox/features/ui/containers/notifications_container.js @@ -4,6 +4,14 @@ import { NotificationStack } from 'react-notification'; import { dismissAlert } from '../../../actions/alerts'; import { getAlerts } from '../../../selectors'; +const defaultBarStyleFactory = (index, style, notification) => { + return Object.assign( + {}, + style, + { bottom: `${14 + index * 12 + index * 42}px` } + ); +}; + const mapStateToProps = (state, { intl }) => { const notifications = getAlerts(state); @@ -23,6 +31,8 @@ const mapDispatchToProps = (dispatch) => { onDismiss: alert => { dispatch(dismissAlert(alert)); }, + barStyleFactory: defaultBarStyleFactory, + activeBarStyleFactory: defaultBarStyleFactory, }; }; diff --git a/app/styles/components/snackbar.scss b/app/styles/components/snackbar.scss index 78834ddda..980ec44c0 100644 --- a/app/styles/components/snackbar.scss +++ b/app/styles/components/snackbar.scss @@ -13,7 +13,7 @@ } &--info { - background-color: blue !important; + background-color: #19759e !important; &::before { content: ''; @@ -29,7 +29,7 @@ } &--error { - background-color: red !important; + background-color: #9e1919 !important; &::before { content: ''; From 14a5d478f355aaec7703fdfcd56944b945f43ce0 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 29 Sep 2020 19:10:57 -0500 Subject: [PATCH 07/95] Snackbar: update (most) existing alerts to snackbars --- app/soapbox/actions/auth.js | 12 ++++++------ app/soapbox/actions/compose.js | 2 +- app/soapbox/actions/filters.js | 6 +++--- app/soapbox/actions/import_data.js | 8 ++++---- app/soapbox/actions/interactions.js | 6 +++--- .../features/auth_login/components/password_reset.js | 4 ++-- app/soapbox/features/edit_profile/index.js | 4 ++-- app/soapbox/features/filters/index.js | 6 +++--- app/soapbox/features/security/mfa_form.js | 10 +++++----- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js index 09a225bf5..3fd9578a0 100644 --- a/app/soapbox/actions/auth.js +++ b/app/soapbox/actions/auth.js @@ -1,5 +1,5 @@ import api from '../api'; -import { showAlert } from 'soapbox/actions/alerts'; +import snackbar from 'soapbox/actions/snackbar'; import { fetchMe } from 'soapbox/actions/me'; export const AUTH_APP_CREATED = 'AUTH_APP_CREATED'; @@ -136,7 +136,7 @@ export function logIn(username, password) { if (error.response.data.error === 'mfa_required') { throw error; } else { - dispatch(showAlert('Login failed.', 'Invalid username or password.')); + dispatch(snackbar.error('Invalid username or password.')); } throw error; }); @@ -156,7 +156,7 @@ export function logOut() { token: state.getIn(['auth', 'user', 'access_token']), }); - dispatch(showAlert('Successfully logged out.', '')); + dispatch(snackbar.success('Logged out.')); }; } @@ -172,9 +172,9 @@ export function register(params) { dispatch({ type: AUTH_REGISTER_SUCCESS, token: response.data }); dispatch(authLoggedIn(response.data)); if (needsConfirmation) { - return dispatch(showAlert('', 'Check your email for further instructions.')); + return dispatch(snackbar.info('You must confirm your email.')); } else if (needsApproval) { - return dispatch(showAlert('', 'Your account has been submitted for approval.')); + return dispatch(snackbar.info('Your account is being reviewed.')); } else { return dispatch(fetchMe()); } @@ -232,7 +232,7 @@ export function deleteAccount(password) { if (response.data.error) throw response.data.error; // This endpoint returns HTTP 200 even on failure dispatch({ type: DELETE_ACCOUNT_SUCCESS, response }); dispatch({ type: AUTH_LOGGED_OUT }); - dispatch(showAlert('Successfully logged out.', '')); + dispatch(snackbar.success('Logged out.')); }).catch(error => { dispatch({ type: DELETE_ACCOUNT_FAIL, error, skipAlert: true }); throw error; diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js index f4a644e87..782dee74a 100644 --- a/app/soapbox/actions/compose.js +++ b/app/soapbox/actions/compose.js @@ -224,7 +224,7 @@ export function uploadCompose(files) { let total = Array.from(files).reduce((a, v) => a + v.size, 0); if (files.length + media.size > uploadLimit) { - dispatch(showAlert(undefined, messages.uploadErrorLimit)); + dispatch(showAlert(undefined, messages.uploadErrorLimit, 'error')); return; } diff --git a/app/soapbox/actions/filters.js b/app/soapbox/actions/filters.js index 3448e391c..e3ad557f5 100644 --- a/app/soapbox/actions/filters.js +++ b/app/soapbox/actions/filters.js @@ -1,5 +1,5 @@ import api from '../api'; -import { showAlert } from 'soapbox/actions/alerts'; +import snackbar from 'soapbox/actions/snackbar'; export const FILTERS_FETCH_REQUEST = 'FILTERS_FETCH_REQUEST'; export const FILTERS_FETCH_SUCCESS = 'FILTERS_FETCH_SUCCESS'; @@ -47,7 +47,7 @@ export function createFilter(phrase, expires_at, context, whole_word, irreversib expires_at, }).then(response => { dispatch({ type: FILTERS_CREATE_SUCCESS, filter: response.data }); - dispatch(showAlert('', 'Filter added')); + dispatch(snackbar.success('Filter added.')); }).catch(error => { dispatch({ type: FILTERS_CREATE_FAIL, error }); }); @@ -60,7 +60,7 @@ export function deleteFilter(id) { dispatch({ type: FILTERS_DELETE_REQUEST }); return api(getState).delete('/api/v1/filters/'+id).then(response => { dispatch({ type: FILTERS_DELETE_SUCCESS, filter: response.data }); - dispatch(showAlert('', 'Filter deleted')); + dispatch(snackbar.success('Filter deleted.')); }).catch(error => { dispatch({ type: FILTERS_DELETE_FAIL, error }); }); diff --git a/app/soapbox/actions/import_data.js b/app/soapbox/actions/import_data.js index 251d2972d..6a0a3c254 100644 --- a/app/soapbox/actions/import_data.js +++ b/app/soapbox/actions/import_data.js @@ -1,5 +1,5 @@ import api from '../api'; -import { showAlert } from 'soapbox/actions/alerts'; +import snackbar from 'soapbox/actions/snackbar'; export const IMPORT_FOLLOWS_REQUEST = 'IMPORT_FOLLOWS_REQUEST'; export const IMPORT_FOLLOWS_SUCCESS = 'IMPORT_FOLLOWS_SUCCESS'; @@ -19,7 +19,7 @@ export function importFollows(params) { return api(getState) .post('/api/pleroma/follow_import', params) .then(response => { - dispatch(showAlert('', 'Followers imported successfully')); + dispatch(snackbar.success('Followers imported successfully')); dispatch({ type: IMPORT_FOLLOWS_SUCCESS, config: response.data }); }).catch(error => { dispatch({ type: IMPORT_FOLLOWS_FAIL, error }); @@ -33,7 +33,7 @@ export function importBlocks(params) { return api(getState) .post('/api/pleroma/blocks_import', params) .then(response => { - dispatch(showAlert('', 'Blocks imported successfully')); + dispatch(snackbar.success('Blocks imported successfully')); dispatch({ type: IMPORT_BLOCKS_SUCCESS, config: response.data }); }).catch(error => { dispatch({ type: IMPORT_BLOCKS_FAIL, error }); @@ -47,7 +47,7 @@ export function importMutes(params) { return api(getState) .post('/api/pleroma/mutes_import', params) .then(response => { - dispatch(showAlert('', 'Mutes imported successfully')); + dispatch(snackbar.success('Mutes imported successfully')); dispatch({ type: IMPORT_MUTES_SUCCESS, config: response.data }); }).catch(error => { dispatch({ type: IMPORT_MUTES_FAIL, error }); diff --git a/app/soapbox/actions/interactions.js b/app/soapbox/actions/interactions.js index 1acfa9c57..b07feac1b 100644 --- a/app/soapbox/actions/interactions.js +++ b/app/soapbox/actions/interactions.js @@ -1,6 +1,6 @@ import api from '../api'; import { importFetchedAccounts, importFetchedStatus } from './importer'; -import { showAlert } from 'soapbox/actions/alerts'; +import snackbar from 'soapbox/actions/snackbar'; export const REBLOG_REQUEST = 'REBLOG_REQUEST'; export const REBLOG_SUCCESS = 'REBLOG_SUCCESS'; @@ -211,7 +211,7 @@ export function bookmark(status) { api(getState).post(`/api/v1/statuses/${status.get('id')}/bookmark`).then(function(response) { dispatch(importFetchedStatus(response.data)); dispatch(bookmarkSuccess(status, response.data)); - dispatch(showAlert('', 'Bookmark added')); + dispatch(snackbar.success('Bookmark added')); }).catch(function(error) { dispatch(bookmarkFail(status, error)); }); @@ -225,7 +225,7 @@ export function unbookmark(status) { api(getState).post(`/api/v1/statuses/${status.get('id')}/unbookmark`).then(response => { dispatch(importFetchedStatus(response.data)); dispatch(unbookmarkSuccess(status, response.data)); - dispatch(showAlert('', 'Bookmark removed')); + dispatch(snackbar.success('Bookmark removed')); }).catch(error => { dispatch(unbookmarkFail(status, error)); }); diff --git a/app/soapbox/features/auth_login/components/password_reset.js b/app/soapbox/features/auth_login/components/password_reset.js index efc1c816c..7dc363a2f 100644 --- a/app/soapbox/features/auth_login/components/password_reset.js +++ b/app/soapbox/features/auth_login/components/password_reset.js @@ -4,7 +4,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component'; import { resetPassword } from 'soapbox/actions/auth'; import { SimpleForm, FieldsGroup, TextInput } from 'soapbox/features/forms'; import { Redirect } from 'react-router-dom'; -import { showAlert } from 'soapbox/actions/alerts'; +import snackbar from 'soapbox/actions/snackbar'; export default @connect() class PasswordReset extends ImmutablePureComponent { @@ -20,7 +20,7 @@ class PasswordReset extends ImmutablePureComponent { this.setState({ isLoading: true }); dispatch(resetPassword(nicknameOrEmail)).then(() => { this.setState({ isLoading: false, success: true }); - dispatch(showAlert('Password reset received. Check your email for further instructions.', '')); + dispatch(snackbar.info('Check your email for confirmation.')); }).catch(error => { this.setState({ isLoading: false }); }); diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js index 41a32419b..75941885d 100644 --- a/app/soapbox/features/edit_profile/index.js +++ b/app/soapbox/features/edit_profile/index.js @@ -4,7 +4,7 @@ import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import ImmutablePureComponent from 'react-immutable-pure-component'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import { showAlert } from 'soapbox/actions/alerts'; +import snackbar from 'soapbox/actions/snackbar'; import Column from '../ui/components/column'; import { SimpleForm, @@ -124,7 +124,7 @@ class EditProfile extends ImmutablePureComponent { const { dispatch } = this.props; dispatch(patchMe(this.getFormdata())).then(() => { this.setState({ isLoading: false }); - dispatch(showAlert('', 'Profile saved!')); + dispatch(snackbar.success('Profile saved!')); }).catch((error) => { this.setState({ isLoading: false }); }); diff --git a/app/soapbox/features/filters/index.js b/app/soapbox/features/filters/index.js index 60b406a82..1573263d8 100644 --- a/app/soapbox/features/filters/index.js +++ b/app/soapbox/features/filters/index.js @@ -14,7 +14,7 @@ import { SelectDropdown, Checkbox, } from 'soapbox/features/forms'; -import { showAlert } from 'soapbox/actions/alerts'; +import snackbar from 'soapbox/actions/snackbar'; import Icon from 'soapbox/components/icon'; import ColumnSubheading from '../ui/components/column_subheading'; @@ -114,7 +114,7 @@ class Filters extends ImmutablePureComponent { dispatch(createFilter(phrase, expires_at, context, whole_word, irreversible)).then(response => { return dispatch(fetchFilters()); }).catch(error => { - dispatch(showAlert('', intl.formatMessage(messages.create_error))); + dispatch(snackbar.error(intl.formatMessage(messages.create_error))); }); } @@ -123,7 +123,7 @@ class Filters extends ImmutablePureComponent { dispatch(deleteFilter(e.currentTarget.dataset.value)).then(response => { return dispatch(fetchFilters()); }).catch(error => { - dispatch(showAlert('', intl.formatMessage(messages.delete_error))); + dispatch(snackbar.error(intl.formatMessage(messages.delete_error))); }); } diff --git a/app/soapbox/features/security/mfa_form.js b/app/soapbox/features/security/mfa_form.js index 572579d53..3f9074f50 100644 --- a/app/soapbox/features/security/mfa_form.js +++ b/app/soapbox/features/security/mfa_form.js @@ -10,7 +10,7 @@ import ColumnSubheading from '../ui/components/column_subheading'; import LoadingIndicator from 'soapbox/components/loading_indicator'; import Button from 'soapbox/components/button'; import { changeSetting, getSettings } from 'soapbox/actions/settings'; -import { showAlert } from 'soapbox/actions/alerts'; +import snackbar from 'soapbox/actions/snackbar'; import { SimpleForm, SimpleInput, @@ -129,7 +129,7 @@ class DisableOtpForm extends ImmutablePureComponent { this.context.router.history.push('../auth/edit'); dispatch(changeSetting(['otpEnabled'], false)); }).catch(error => { - dispatch(showAlert('', intl.formatMessage(messages.disableFail))); + dispatch(snackbar.error(intl.formatMessage(messages.disableFail))); }); } @@ -180,7 +180,7 @@ class EnableOtpForm extends ImmutablePureComponent { dispatch(fetchBackupCodes()).then(response => { this.setState({ backupCodes: response.data.codes }); }).catch(error => { - dispatch(showAlert('', intl.formatMessage(messages.codesFail))); + dispatch(snackbar.error(intl.formatMessage(messages.codesFail))); }); } @@ -261,7 +261,7 @@ class OtpConfirmForm extends ImmutablePureComponent { dispatch(fetchToptSetup()).then(response => { this.setState({ qrCodeURI: response.data.provisioning_uri, confirm_key: response.data.key }); }).catch(error => { - dispatch(showAlert('', intl.formatMessage(messages.qrFail))); + dispatch(snackbar.error(intl.formatMessage(messages.qrFail))); }); } @@ -276,7 +276,7 @@ class OtpConfirmForm extends ImmutablePureComponent { dispatch(confirmToptSetup(code, password)).then(response => { dispatch(changeSetting(['otpEnabled'], true)); }).catch(error => { - dispatch(showAlert('', intl.formatMessage(messages.confirmFail))); + dispatch(snackbar.error(intl.formatMessage(messages.confirmFail))); }); } From 0b8b0b82f7912ff81a87ec86dfcb7f50292d19e9 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 29 Sep 2020 19:31:41 -0500 Subject: [PATCH 08/95] Snackbar: fix auth test --- app/soapbox/actions/__tests__/auth-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/soapbox/actions/__tests__/auth-test.js b/app/soapbox/actions/__tests__/auth-test.js index a013c700f..0e1e3d2b4 100644 --- a/app/soapbox/actions/__tests__/auth-test.js +++ b/app/soapbox/actions/__tests__/auth-test.js @@ -10,7 +10,7 @@ describe('logOut()', () => { it('creates expected actions', () => { const expectedActions = [ { type: AUTH_LOGGED_OUT }, - { type: ALERT_SHOW, title: 'Successfully logged out.', message: '' }, + { type: ALERT_SHOW, message: 'Logged out.', severity: 'success' }, ]; const store = mockStore(ImmutableMap()); From d0496caeb18096335f987008cf4f2d8f186302fe Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 29 Sep 2020 21:29:06 -0500 Subject: [PATCH 09/95] Auth form validation improvements --- .../auth_login/components/login_form.js | 24 +++++++++++++++---- .../auth_login/components/password_reset.js | 1 + .../components/registration_form.js | 3 +++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/soapbox/features/auth_login/components/login_form.js b/app/soapbox/features/auth_login/components/login_form.js index bb616a076..d9933f6d0 100644 --- a/app/soapbox/features/auth_login/components/login_form.js +++ b/app/soapbox/features/auth_login/components/login_form.js @@ -20,11 +20,27 @@ class LoginForm extends ImmutablePureComponent {
-
- +
+
-
- +
+

diff --git a/app/soapbox/features/auth_login/components/password_reset.js b/app/soapbox/features/auth_login/components/password_reset.js index 7dc363a2f..f7ca59712 100644 --- a/app/soapbox/features/auth_login/components/password_reset.js +++ b/app/soapbox/features/auth_login/components/password_reset.js @@ -37,6 +37,7 @@ class PasswordReset extends ImmutablePureComponent { name='nickname_or_email' label='Email or username' placeholder='me@example.com' + required />

diff --git a/app/soapbox/features/landing_page/components/registration_form.js b/app/soapbox/features/landing_page/components/registration_form.js index 0d6a9db71..7a2ada78a 100644 --- a/app/soapbox/features/landing_page/components/registration_form.js +++ b/app/soapbox/features/landing_page/components/registration_form.js @@ -20,6 +20,7 @@ import { getSettings } from 'soapbox/actions/settings'; const messages = defineMessages({ username: { id: 'registration.fields.username_placeholder', defaultMessage: 'Username' }, + username_hint: { id: 'registration.fields.username_hint', defaultMessage: 'Only letters, numbers, and underscores are allowed.' }, email: { id: 'registration.fields.email_placeholder', defaultMessage: 'E-Mail address' }, password: { id: 'registration.fields.password_placeholder', defaultMessage: 'Password' }, confirm: { id: 'registration.fields.confirm_placeholder', defaultMessage: 'Password (again)' }, @@ -109,7 +110,9 @@ class RegistrationForm extends ImmutablePureComponent { From 88c12a72a97f061c6e7c6018478152e09ead9a73 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 29 Sep 2020 21:35:10 -0500 Subject: [PATCH 10/95] Improve login messaging --- app/soapbox/actions/auth.js | 2 +- app/soapbox/selectors/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js index 3fd9578a0..2a252ea23 100644 --- a/app/soapbox/actions/auth.js +++ b/app/soapbox/actions/auth.js @@ -136,7 +136,7 @@ export function logIn(username, password) { if (error.response.data.error === 'mfa_required') { throw error; } else { - dispatch(snackbar.error('Invalid username or password.')); + dispatch(snackbar.error('Wrong username or password')); } throw error; }); diff --git a/app/soapbox/selectors/index.js b/app/soapbox/selectors/index.js index 30ebcee3f..30d3e971f 100644 --- a/app/soapbox/selectors/index.js +++ b/app/soapbox/selectors/index.js @@ -126,7 +126,7 @@ export const getAlerts = createSelector([getAlertsBase], (base) => { key: item.get('key'), className: `snackbar snackbar--${item.get('severity', 'info')}`, activeClassName: 'snackbar--active', - dismissAfter: 5000, + dismissAfter: 6000, }); }); From b9d484623c48dff654dbb919a7b6f460e135a481 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 29 Sep 2020 22:21:16 -0500 Subject: [PATCH 11/95] Add closed registration message fixes #177 --- .../components/registration_form.js | 23 ++++++++++++++++++- app/styles/about.scss | 16 +++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/app/soapbox/features/landing_page/components/registration_form.js b/app/soapbox/features/landing_page/components/registration_form.js index 7a2ada78a..3490e8a50 100644 --- a/app/soapbox/features/landing_page/components/registration_form.js +++ b/app/soapbox/features/landing_page/components/registration_form.js @@ -93,11 +93,32 @@ class RegistrationForm extends ImmutablePureComponent { render() { const { instance, intl } = this.props; + const isOpen = instance.get('registrations'); const isLoading = this.state.captchaLoading || this.state.submissionLoading; + if (isOpen === false) { + return ( +
+

+ +

+
+ {instance.get('title')} }} + /> +
+
+ ); + } + return ( -
+

Date: Tue, 29 Sep 2020 23:12:33 -0500 Subject: [PATCH 12/95] Fallback to BE response in login form --- app/soapbox/actions/auth.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js index 2a252ea23..7c0692c21 100644 --- a/app/soapbox/actions/auth.js +++ b/app/soapbox/actions/auth.js @@ -135,6 +135,8 @@ export function logIn(username, password) { }).catch(error => { if (error.response.data.error === 'mfa_required') { throw error; + } else if(error.response.data.error) { + dispatch(snackbar.error(error.response.data.error)); } else { dispatch(snackbar.error('Wrong username or password')); } From 2b3d86f3901495b5196959144e40975c98f3451a Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 29 Sep 2020 23:18:51 -0500 Subject: [PATCH 13/95] Improve pending account message --- app/soapbox/actions/auth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js index 7c0692c21..f6f5275ae 100644 --- a/app/soapbox/actions/auth.js +++ b/app/soapbox/actions/auth.js @@ -176,7 +176,7 @@ export function register(params) { if (needsConfirmation) { return dispatch(snackbar.info('You must confirm your email.')); } else if (needsApproval) { - return dispatch(snackbar.info('Your account is being reviewed.')); + return dispatch(snackbar.info('Your account is pending review by an admin.')); } else { return dispatch(fetchMe()); } From 1109a000cb6f44db58026faeeae869ea24b73a38 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 29 Sep 2020 23:42:08 -0500 Subject: [PATCH 14/95] Update snapshots --- .../__tests__/__snapshots__/login_form-test.js.snap | 12 ++++++++---- .../__tests__/__snapshots__/login_page-test.js.snap | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap index e78d07cab..e2c336537 100644 --- a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap +++ b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_form-test.js.snap @@ -10,24 +10,28 @@ exports[` renders correctly 1`] = ` className="fields-group" >

diff --git a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap index 6ea6b4aed..c6cdc64e3 100644 --- a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap +++ b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap @@ -13,24 +13,28 @@ exports[` renders correctly on load 1`] = ` className="fields-group" >
From 12bdeac7182516b235bb97b873097da6d30c7b0c Mon Sep 17 00:00:00 2001 From: Mary Kate Date: Wed, 30 Sep 2020 14:09:00 -0500 Subject: [PATCH 15/95] updates to Soapbox Config. Remove unnecessary fields, add accordion component --- app/soapbox/features/soapbox_config/index.js | 37 +++++++------ .../features/ui/components/accordion.js | 54 +++++++++++++++++++ app/soapbox/locales/ar.json | 4 +- app/soapbox/locales/ast.json | 4 +- app/soapbox/locales/bg.json | 4 +- app/soapbox/locales/bn.json | 4 +- app/soapbox/locales/br.json | 4 +- app/soapbox/locales/ca.json | 4 +- app/soapbox/locales/co.json | 4 +- app/soapbox/locales/cs.json | 4 +- app/soapbox/locales/cy.json | 4 +- app/soapbox/locales/da.json | 4 +- app/soapbox/locales/de.json | 4 +- app/soapbox/locales/defaultMessages.json | 4 +- app/soapbox/locales/el.json | 4 +- app/soapbox/locales/en.json | 4 +- app/soapbox/locales/eo.json | 4 +- app/soapbox/locales/es-AR.json | 4 +- app/soapbox/locales/es.json | 4 +- app/soapbox/locales/et.json | 4 +- app/soapbox/locales/eu.json | 4 +- app/soapbox/locales/fa.json | 4 +- app/soapbox/locales/fi.json | 4 +- app/soapbox/locales/fr.json | 4 +- app/soapbox/locales/ga.json | 4 +- app/soapbox/locales/gl.json | 4 +- app/soapbox/locales/he.json | 4 +- app/soapbox/locales/hi.json | 4 +- app/soapbox/locales/hr.json | 4 +- app/soapbox/locales/hu.json | 4 +- app/soapbox/locales/hy.json | 4 +- app/soapbox/locales/id.json | 4 +- app/soapbox/locales/io.json | 4 +- app/soapbox/locales/it.json | 4 +- app/soapbox/locales/ja.json | 4 +- app/soapbox/locales/ka.json | 4 +- app/soapbox/locales/kk.json | 4 +- app/soapbox/locales/ko.json | 4 +- app/soapbox/locales/lt.json | 4 +- app/soapbox/locales/lv.json | 4 +- app/soapbox/locales/mk.json | 4 +- app/soapbox/locales/ms.json | 4 +- app/soapbox/locales/nl.json | 4 +- app/soapbox/locales/nn.json | 4 +- app/soapbox/locales/no.json | 4 +- app/soapbox/locales/oc.json | 4 +- app/soapbox/locales/pl.json | 4 +- app/soapbox/locales/pt-BR.json | 4 +- app/soapbox/locales/pt.json | 4 +- app/soapbox/locales/ro.json | 4 +- app/soapbox/locales/ru.json | 4 +- app/soapbox/locales/sk.json | 4 +- app/soapbox/locales/sl.json | 4 +- app/soapbox/locales/sq.json | 4 +- app/soapbox/locales/sr-Latn.json | 4 +- app/soapbox/locales/sr.json | 4 +- app/soapbox/locales/sv.json | 4 +- app/soapbox/locales/ta.json | 4 +- app/soapbox/locales/te.json | 4 +- app/soapbox/locales/th.json | 4 +- app/soapbox/locales/tr.json | 4 +- app/soapbox/locales/uk.json | 4 +- app/soapbox/locales/zh-CN.json | 4 +- app/soapbox/locales/zh-HK.json | 4 +- app/soapbox/locales/zh-TW.json | 4 +- app/styles/basics.scss | 19 ++++++- app/styles/forms.scss | 22 ++++++++ 67 files changed, 240 insertions(+), 144 deletions(-) create mode 100644 app/soapbox/features/ui/components/accordion.js diff --git a/app/soapbox/features/soapbox_config/index.js b/app/soapbox/features/soapbox_config/index.js index 9b8b1942d..0fa43392a 100644 --- a/app/soapbox/features/soapbox_config/index.js +++ b/app/soapbox/features/soapbox_config/index.js @@ -24,6 +24,7 @@ import { SketchPicker } from 'react-color'; import Overlay from 'react-overlays/lib/Overlay'; import { isMobile } from 'soapbox/is_mobile'; import detectPassiveEvents from 'detect-passive-events'; +import Accordion from '../ui/components/accordion'; const messages = defineMessages({ heading: { id: 'column.soapbox_config', defaultMessage: 'Soapbox config' }, @@ -34,8 +35,8 @@ const messages = defineMessages({ homeFooterItemLabel: { id: 'soapbox_config.home_footer.meta_fields.label_placeholder', defaultMessage: 'Label' }, homeFooterItemURL: { id: 'soapbox_config.home_footer.meta_fields.url_placeholder', defaultMessage: 'URL' }, customCssLabel: { id: 'soapbox_config.custom_css.meta_fields.url_placeholder', defaultMessage: 'URL' }, - rawJSONLabel: { id: 'soapbox_config.raw_json_label', defaultMessage: 'Raw JSON data' }, - rawJSONHint: { id: 'soapbox_config.raw_json_hint', defaultMessage: 'Advanced: Edit the settings data directly.' }, + rawJSONLabel: { id: 'soapbox_config.raw_json_label', defaultMessage: 'Advanced: Edit raw JSON data' }, + rawJSONHint: { id: 'soapbox_config.raw_json_hint', defaultMessage: 'Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click "Save" to apply your changes.' }, }); const listenerOptions = detectPassiveEvents.hasSupport ? { passive: true } : false; @@ -202,7 +203,7 @@ class SoapboxConfig extends ImmutablePureComponent { />
-
+ {/*
@@ -214,7 +215,7 @@ class SoapboxConfig extends ImmutablePureComponent { onChange={this.handleFileChange(['banner'])} />
-
+ */}
@@ -226,7 +227,7 @@ class SoapboxConfig extends ImmutablePureComponent { />
- + {/* } hint={} @@ -236,7 +237,7 @@ class SoapboxConfig extends ImmutablePureComponent { ['extensions', 'patron', 'enabled'], (e) => e.checked, )} /> - + */} */} - -
- -
- + +
+ +
+ } + />
diff --git a/app/soapbox/features/ui/components/accordion.js b/app/soapbox/features/ui/components/accordion.js index a06442ce6..1f372f002 100644 --- a/app/soapbox/features/ui/components/accordion.js +++ b/app/soapbox/features/ui/components/accordion.js @@ -1,19 +1,17 @@ import React from 'react'; import PropTypes from 'prop-types'; import { defineMessages, injectIntl } from 'react-intl'; -import IconButton from 'soapbox/components/icon_button'; import classNames from 'classnames'; const messages = defineMessages({ - collapse: { id: 'accordion.collapse', defaultMessage: 'Collapse accordion' }, - expand: { id: 'accordion.expand', defaultMessage: 'Expand accordion' }, + collapse: { id: 'accordion.collapse', defaultMessage: 'Collapse' }, + expand: { id: 'accordion.expand', defaultMessage: 'Expand' }, }); - export default @injectIntl class Accordion extends React.PureComponent { static propTypes = { - headline: PropTypes.string, + headline: PropTypes.string.isRequired, content: PropTypes.oneOfType([PropTypes.string, PropTypes.element]), intl: PropTypes.object.isRequired, }; @@ -22,8 +20,9 @@ export default @injectIntl class Accordion extends React.PureComponent { expanded: false, } - handleToggleAccordion = () => { + handleToggleAccordion = (e) => { this.setState({ expanded: !this.state.expanded }); + e.preventDefault(); } render() { @@ -31,20 +30,16 @@ export default @injectIntl class Accordion extends React.PureComponent { const { expanded } = this.state; return ( -
- {headline &&
{headline} - -
} -
+ +
{content}
diff --git a/app/styles/application.scss b/app/styles/application.scss index 2e00c036b..d5158761b 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -71,6 +71,7 @@ @import 'components/filters'; @import 'components/mfa_form'; @import 'components/snackbar'; +@import 'components/accordion'; // Holiday @import 'holiday/halloween'; diff --git a/app/styles/basics.scss b/app/styles/basics.scss index 9f42af2d7..621c7bbb2 100644 --- a/app/styles/basics.scss +++ b/app/styles/basics.scss @@ -159,50 +159,6 @@ body { color: #ffffff; } -.explanation-box, -.accordion { - color: var(--primary-text-color); - padding: 15px 20px; - font-size: 14px; - background-color: var(--brand-color--faint); - margin: 5px 20px; - border-radius: 8px; - - &__title { - font-weight: bold; - font-size: 16px; - } - - &__explanation { - margin-top: 1em; - } - - a { - color: var(--brand-color--hicontrast); - text-decoration: underline; - - &:hover { - text-decoration: none; - } - } -} - -.accordion { - margin: 0; - - .accordion_content { - transition-duration: 0.2s; - - &.expanded { - display: block; - } - - &.closed { - display: none; - } - } -} - noscript { text-align: center; diff --git a/app/styles/components/accordion.scss b/app/styles/components/accordion.scss new file mode 100644 index 000000000..366ceb8ea --- /dev/null +++ b/app/styles/components/accordion.scss @@ -0,0 +1,63 @@ +.explanation-box { + margin: 5px 20px; +} + +.explanation-box, +.accordion { + color: var(--primary-text-color); + padding: 15px 20px; + font-size: 14px; + background-color: var(--brand-color--faint); + border-radius: 8px; + margin: 0; + + &__title { + font-weight: bold !important; + font-size: 16px !important; + background: transparent !important; + padding: 0 !important; + margin: 0 !important; + text-transform: none !important; + text-align: left !important; + display: flex !important; + + &::after { + content: ''; + display: block; + font-family: ForkAwesome; + font-size: 20px; + padding-left: 10px; + margin-left: auto; + } + } + + &__content { + height: 0; + overflow: hidden; + } + + &--expanded &__title { + margin-bottom: 10px !important; + + &::after { + content: ''; + } + } + + &--expanded &__content { + height: auto; + } + + &__explanation { + margin-top: 1em; + } + + a { + color: var(--brand-color--hicontrast); + text-decoration: underline; + + &:hover { + text-decoration: none; + } + } +} diff --git a/app/styles/forms.scss b/app/styles/forms.scss index b741d5642..8338f2af3 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -679,14 +679,24 @@ code { max-height: 100px; } -.code-editor textarea { - font-family: monospace; - white-space: pre; -} +.code-editor { + textarea { + font-family: monospace; + white-space: pre; + } -.code-editor--invalid textarea { - border-color: $error-red !important; - color: $error-red; + &--invalid textarea { + border-color: $error-red !important; + color: $error-red; + } + + .input { + margin-bottom: 0; + } + + .hint { + margin-top: 10px; + } } .input .row .fa-times-circle { From 7b6276fa59cbb369ff5bacba98e00db8de9622a4 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 1 Oct 2020 15:54:29 -0500 Subject: [PATCH 20/95] Accordion: replace ExplanationBox with Accordion --- app/soapbox/features/public_timeline/index.js | 44 +++++++++--- app/soapbox/features/soapbox_config/index.js | 7 +- .../features/ui/components/accordion.js | 14 ++-- .../features/ui/components/explanation_box.js | 67 ------------------- app/styles/components/accordion.scss | 9 ++- 5 files changed, 53 insertions(+), 88 deletions(-) delete mode 100644 app/soapbox/features/ui/components/explanation_box.js diff --git a/app/soapbox/features/public_timeline/index.js b/app/soapbox/features/public_timeline/index.js index 1cf8f5ce1..9173274fb 100644 --- a/app/soapbox/features/public_timeline/index.js +++ b/app/soapbox/features/public_timeline/index.js @@ -6,18 +6,19 @@ import StatusListContainer from '../ui/containers/status_list_container'; import Column from '../../components/column'; import ColumnSettingsContainer from './containers/column_settings_container'; import HomeColumnHeader from '../../components/home_column_header'; -import ExplanationBox from '../ui/components/explanation_box'; +import Accordion from 'soapbox/features/ui/components/accordion'; import { expandPublicTimeline } from '../../actions/timelines'; import { connectPublicStream } from '../../actions/streaming'; import { Link } from 'react-router-dom'; -import { getSettings } from 'soapbox/actions/settings'; +import { changeSetting, getSettings } from 'soapbox/actions/settings'; const messages = defineMessages({ title: { id: 'column.public', defaultMessage: 'Federated timeline' }, }); const mapStateToProps = state => { - const onlyMedia = getSettings(state).getIn(['public', 'other', 'onlyMedia']); + const settings = getSettings(state); + const onlyMedia = settings.getIn(['public', 'other', 'onlyMedia']); const timelineId = 'public'; @@ -26,6 +27,7 @@ const mapStateToProps = state => { onlyMedia, hasUnread: state.getIn(['timelines', `${timelineId}${onlyMedia ? ':media' : ''}`, 'unread']) > 0, siteTitle: state.getIn(['instance', 'title']), + explanationBoxExpanded: settings.get('explanationBox'), }; }; @@ -44,6 +46,7 @@ class CommunityTimeline extends React.PureComponent { onlyMedia: PropTypes.bool, timelineId: PropTypes.string, siteTitle: PropTypes.string, + explanationBoxExpanded: PropTypes.bool, }; componentDidMount() { @@ -69,23 +72,48 @@ class CommunityTimeline extends React.PureComponent { } } + toggleExplanationBox = (setting) => { + this.props.dispatch(changeSetting(['explanationBox'], setting)); + } + handleLoadMore = maxId => { const { dispatch, onlyMedia } = this.props; dispatch(expandPublicTimeline({ maxId, onlyMedia })); } render() { - const { intl, hasUnread, onlyMedia, timelineId, siteTitle } = this.props; + const { intl, hasUnread, onlyMedia, timelineId, siteTitle, explanationBoxExpanded } = this.props; return ( - } - explanation={ }} />} - /> +
+ } + content={( + + + + ), + }} + /> + )} + expanded={explanationBoxExpanded} + onToggle={this.toggleExplanationBox} + /> +
this.setState({ jsonEditorExpanded: value }); + componentDidUpdate(prevProps, prevState) { if (prevProps.soapbox !== this.props.soapbox) { this.putConfig(this.props.soapbox); @@ -359,6 +360,8 @@ class SoapboxConfig extends ImmutablePureComponent { />
)} + expanded={this.state.jsonEditorExpanded} + onToggle={this.toggleJSONEditor} />
diff --git a/app/soapbox/features/ui/components/accordion.js b/app/soapbox/features/ui/components/accordion.js index 1f372f002..633309d10 100644 --- a/app/soapbox/features/ui/components/accordion.js +++ b/app/soapbox/features/ui/components/accordion.js @@ -13,28 +13,30 @@ export default @injectIntl class Accordion extends React.PureComponent { static propTypes = { headline: PropTypes.string.isRequired, content: PropTypes.oneOfType([PropTypes.string, PropTypes.element]), + expanded: PropTypes.bool, + onToggle: PropTypes.func, intl: PropTypes.object.isRequired, }; - state = { + static defaultProps = { expanded: false, + onToggle: () => {}, } - handleToggleAccordion = (e) => { - this.setState({ expanded: !this.state.expanded }); + handleToggle = (e) => { + this.props.onToggle(!this.props.expanded); e.preventDefault(); } render() { - const { headline, content, intl } = this.props; - const { expanded } = this.state; + const { headline, content, expanded, intl } = this.props; return (
- {/*
- - - - - { - soapbox.get('customCss').map((field, i) => ( -
- e.target.value)} - /> - -
- )) - } -
-
- - -
-
-
*/} ( .entrySeq() .reduce((acc, cur) => acc + `--${cur[0]}:${cur[1]};`, '') ); + +export const brandColorToCSS = brandColor => themeDataToCss(brandColorToThemeData(brandColor)); diff --git a/app/styles/components/tabs-bar.scss b/app/styles/components/tabs-bar.scss index a9cf3b1d4..808b21fde 100644 --- a/app/styles/components/tabs-bar.scss +++ b/app/styles/components/tabs-bar.scss @@ -5,6 +5,7 @@ flex: 0 0 auto; overflow-y: auto; height: 50px; + width: 100%; position: sticky; top: 0; z-index: 1000; diff --git a/app/styles/forms.scss b/app/styles/forms.scss index 8338f2af3..9829ce280 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -705,3 +705,33 @@ code { cursor: pointer; color: $error-red; } + +.site-preview { + border-radius: 4px; + overflow: hidden; + height: 164px; + border: 1px solid; + margin-bottom: 40px; + background: var(--background-color); + + * { + z-index: 0; + } + + a { + cursor: default; + } + + .ui { + display: flex; + flex-direction: column; + padding: 0; + height: 100%; + } + + .page { + align-items: center; + justify-content: center; + height: 100%; + } +} diff --git a/app/styles/holiday/halloween.scss b/app/styles/holiday/halloween.scss index b63a1ed0f..ad190a18b 100644 --- a/app/styles/holiday/halloween.scss +++ b/app/styles/holiday/halloween.scss @@ -1,4 +1,5 @@ -body.halloween { +.halloween, +.site-preview.halloween { // Set brand color to orange --brand-color_h: 29.727272727272727; --brand-color_s: 100%; @@ -14,8 +15,8 @@ body.halloween { // Full-screen pseudo-elements to hold BG graphics &::before, &::after, - .app-holder::before, - .app-holder::after { + > .app-holder::before, + > .app-holder::after { content: ''; display: block; position: fixed; @@ -42,7 +43,7 @@ body.halloween { animation: halloween-twinkle 200s linear infinite; } - .app-holder { + > .app-holder { // Vignette &::before { background-image: radial-gradient( @@ -58,90 +59,90 @@ body.halloween { background: transparent url("../images/halloween/clouds.png") repeat top center; animation: halloween-clouds 200s linear infinite; } - } - // Dangling spider - .ui .page__top::after, - .ui .page__columns::after { - content: ''; - display: block; - width: 100px; - height: 100px; - right: 20px; - background-image: url('../images/halloween/spider.svg'); - background-size: contain; - background-repeat: no-repeat; - background-position: top right; - z-index: -1; - pointer-events: none; - } - - .ui .page__columns::after { - position: fixed; - top: 50px; - } - - .ui .page__top::after { - position: absolute; - bottom: -100px; - } - - .ui .page__top + .page__columns::after { - display: none; - } - - // Witch emblem - .getting-started__footer::before { - content: ''; - display: block; - background-image: url('../images/halloween/halloween-emblem.svg'); - background-size: contain; - background-position: left; - background-repeat: no-repeat; - width: 100%; - height: 100px; - margin-bottom: 20px; - } - - // Color fixes - // Elements directly over the BG need static colors that don't change - // regardless of the theme-mode - .getting-started__footer { - color: #fff; - - a { - color: hsla(0, 0%, 100%, 0.4); + // Dangling spider + .ui .page__top::after, + .ui .page__columns::after { + content: ''; + display: block; + width: 100px; + height: 100px; + right: 20px; + background-image: url('../images/halloween/spider.svg'); + background-size: contain; + background-repeat: no-repeat; + background-position: top right; + z-index: -1; + pointer-events: none; } - p { - color: hsla(0, 0%, 100%, 0.8); + .ui .page__columns::after { + position: fixed; + top: 50px; } - } - .profile-info-panel { - color: #fff; + .ui .page__top::after { + position: absolute; + bottom: -100px; + } - &-content__name h1 { - span:first-of-type { - color: hsla(0, 0%, 100%, 0.6); + .ui .page__top + .page__columns::after { + display: none; + } + + // Witch emblem + .getting-started__footer::before { + content: ''; + display: block; + background-image: url('../images/halloween/halloween-emblem.svg'); + background-size: contain; + background-position: left; + background-repeat: no-repeat; + width: 100%; + height: 100px; + margin-bottom: 20px; + } + + // Color fixes + // Elements directly over the BG need static colors that don't change + // regardless of the theme-mode + .getting-started__footer { + color: #fff; + + a { + color: hsla(0, 0%, 100%, 0.4); } - small { + p { + color: hsla(0, 0%, 100%, 0.8); + } + } + + .profile-info-panel { + color: #fff; + + &-content__name h1 { + span:first-of-type { + color: hsla(0, 0%, 100%, 0.6); + } + + small { + color: #fff; + } + } + + &-content__bio { color: #fff; } - } - &-content__bio { - color: #fff; - } - - &-content__bio a, - &-content__fields a { - color: hsl( - var(--brand-color_h), - var(--brand-color_s), - calc(var(--brand-color_l) + 8%) - ); + &-content__bio a, + &-content__fields a { + color: hsl( + var(--brand-color_h), + var(--brand-color_s), + calc(var(--brand-color_l) + 8%) + ); + } } } } diff --git a/app/styles/themes.scss b/app/styles/themes.scss index a670b3086..fb7b89bbd 100644 --- a/app/styles/themes.scss +++ b/app/styles/themes.scss @@ -24,7 +24,8 @@ Examples: --primary-text-color--faint */ -body { +body, +.site-preview { // Primary variables --brand-color: hsl(var(--brand-color_hsl)); --accent-color: hsl(var(--accent-color_hsl)); @@ -56,7 +57,7 @@ body { --warning-color--faint: hsla(var(--warning-color_hsl), 0.5); } -body.theme-mode-light { +.theme-mode-light { // Primary variables --foreground-color: #ffffff; --highlight-text-color: hsl( @@ -85,7 +86,7 @@ body.theme-mode-light { ); } -body.theme-mode-dark { +.theme-mode-dark { // Primary variables --foreground-color: #222222; --highlight-text-color: hsl( From 3a0b58315f1958eb28ad7f17759ad566b34b44f5 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 1 Oct 2020 19:33:03 -0500 Subject: [PATCH 24/95] SoapboxConfig: add a default themeMode toggle --- app/soapbox/components/sidebar_menu.js | 2 +- app/soapbox/features/soapbox_config/index.js | 7 +++++++ .../features/ui/components/tabs_bar.js | 2 +- .../features/ui/components/theme_toggle.js | 21 +++---------------- .../ui/components/theme_toggle_container.js | 17 +++++++++++++++ 5 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 app/soapbox/features/ui/components/theme_toggle_container.js diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js index ea9f753d4..f0e407033 100644 --- a/app/soapbox/components/sidebar_menu.js +++ b/app/soapbox/components/sidebar_menu.js @@ -15,7 +15,7 @@ import { shortNumberFormat } from '../utils/numbers'; import { isStaff } from '../utils/accounts'; import { makeGetAccount } from '../selectors'; import { logOut } from 'soapbox/actions/auth'; -import ThemeToggle from '../features/ui/components/theme_toggle'; +import ThemeToggle from '../features/ui/components/theme_toggle_container'; const messages = defineMessages({ followers: { id: 'account.followers', defaultMessage: 'Followers' }, diff --git a/app/soapbox/features/soapbox_config/index.js b/app/soapbox/features/soapbox_config/index.js index 6038f9961..2dd444279 100644 --- a/app/soapbox/features/soapbox_config/index.js +++ b/app/soapbox/features/soapbox_config/index.js @@ -24,6 +24,8 @@ import { isMobile } from 'soapbox/is_mobile'; import detectPassiveEvents from 'detect-passive-events'; import Accordion from '../ui/components/accordion'; import SitePreview from './components/site_preview'; +import ThemeToggle from 'soapbox/features/ui/components/theme_toggle'; +import { defaultSettings } from 'soapbox/actions/settings'; const messages = defineMessages({ heading: { id: 'column.soapbox_config', defaultMessage: 'Soapbox config' }, @@ -186,6 +188,7 @@ class SoapboxConfig extends ImmutablePureComponent { render() { const { intl } = this.props; const soapbox = this.getSoapboxConfig(); + const settings = defaultSettings.mergeDeep(soapbox.get('defaultSettings')); return ( @@ -201,6 +204,10 @@ class SoapboxConfig extends ImmutablePureComponent { value={soapbox.get('brandColor')} onChange={this.handleChange(['brandColor'], (e) => e.hex)} /> + value)} + settings={settings} + />
{ - return { - settings: getSettings(state), - }; -}; - -const mapDispatchToProps = (dispatch) => ({ - toggleTheme(setting) { - dispatch(changeSetting(['themeMode'], setting)); - }, -}); - -export default @connect(mapStateToProps, mapDispatchToProps) -@injectIntl +export default @injectIntl class ThemeToggle extends React.PureComponent { static propTypes = { intl: PropTypes.object.isRequired, settings: ImmutablePropTypes.map.isRequired, - toggleTheme: PropTypes.func, + onToggle: PropTypes.func.isRequired, showLabel: PropTypes.bool, }; handleToggleTheme = () => { - this.props.toggleTheme(this.props.settings.get('themeMode') === 'light' ? 'dark' : 'light'); + this.props.onToggle(this.props.settings.get('themeMode') === 'light' ? 'dark' : 'light'); } render() { diff --git a/app/soapbox/features/ui/components/theme_toggle_container.js b/app/soapbox/features/ui/components/theme_toggle_container.js new file mode 100644 index 000000000..4a2cad1f7 --- /dev/null +++ b/app/soapbox/features/ui/components/theme_toggle_container.js @@ -0,0 +1,17 @@ +import { connect } from 'react-redux'; +import { changeSetting, getSettings } from 'soapbox/actions/settings'; +import ThemeToggle from './theme_toggle'; + +const mapStateToProps = state => { + return { + settings: getSettings(state), + }; +}; + +const mapDispatchToProps = (dispatch) => ({ + onToggle(setting) { + dispatch(changeSetting(['themeMode'], setting)); + }, +}); + +export default connect(mapStateToProps, mapDispatchToProps)(ThemeToggle); From b99bb7bd4b2f87e5d178a0fc727ebcc3d7dbef01 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 1 Oct 2020 19:44:40 -0500 Subject: [PATCH 25/95] SoapboxConfig: improve layout --- app/soapbox/features/soapbox_config/index.js | 130 +++++++++---------- 1 file changed, 64 insertions(+), 66 deletions(-) diff --git a/app/soapbox/features/soapbox_config/index.js b/app/soapbox/features/soapbox_config/index.js index 2dd444279..50ba5257d 100644 --- a/app/soapbox/features/soapbox_config/index.js +++ b/app/soapbox/features/soapbox_config/index.js @@ -229,76 +229,74 @@ class SoapboxConfig extends ImmutablePureComponent { /> -
-
- - - - - - Soapbox Icons List }} /> - - { - soapbox.getIn(['promoPanel', 'items']).map((field, i) => ( -
- - - - -
- )) - } -
-
- - +
+ + + + + + Soapbox Icons List }} /> + + { + soapbox.getIn(['promoPanel', 'items']).map((field, i) => ( +
+ + + +
+ )) + } +
+
+ +
-
- - - - - { - soapbox.getIn(['navlinks', 'homeFooter']).map((field, i) => ( -
- - - -
- )) - } -
-
- - +
+
+ + + + + { + soapbox.getIn(['navlinks', 'homeFooter']).map((field, i) => ( +
+ + +
+ )) + } +
+
+ +
From d65eedb67b4cca7d78420f808ca509777e2071c4 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 1 Oct 2020 20:53:11 -0500 Subject: [PATCH 26/95] SoapboxConfig: style improvements --- app/soapbox/features/soapbox_config/index.js | 15 +++++++++++---- app/styles/forms.scss | 11 +++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app/soapbox/features/soapbox_config/index.js b/app/soapbox/features/soapbox_config/index.js index 50ba5257d..bb81deb33 100644 --- a/app/soapbox/features/soapbox_config/index.js +++ b/app/soapbox/features/soapbox_config/index.js @@ -204,10 +204,15 @@ class SoapboxConfig extends ImmutablePureComponent { value={soapbox.get('brandColor')} onChange={this.handleChange(['brandColor'], (e) => e.hex)} /> - value)} - settings={settings} - /> +
+
+ + value)} + settings={settings} + /> +
+
+ +
diff --git a/app/styles/forms.scss b/app/styles/forms.scss index 9829ce280..85cccb476 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -704,6 +704,7 @@ code { right: 7px; cursor: pointer; color: $error-red; + transform: translateY(9px); } .site-preview { @@ -735,3 +736,13 @@ code { height: 100%; } } + +.input.with_label.toggle .label_input { + display: flex; + font-size: 14px; + align-items: center; + + .theme-toggle { + margin-left: 10px; + } +} From 5d5ca6ed8595b234479830e15d0fe21f6d9cba69 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 1 Oct 2020 21:04:00 -0500 Subject: [PATCH 27/95] Forms: improve select arrow CSS --- app/styles/forms.scss | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/app/styles/forms.scss b/app/styles/forms.scss index 85cccb476..aef92b3d2 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -471,19 +471,23 @@ code { cursor: pointer; } - .select-wrapper::after { - display: block; - font-family: 'ForkAwesome'; - content: ''; - width: 10px; - position: absolute; - right: 12px; - top: 1px; - border-left: 1px solid var(--highlight-text-color); - height: 39px; - padding: 12px; - box-sizing: border-box; - pointer-events: none; + .select-wrapper { + display: flex; + align-items: center; + + &::after { + display: flex; + align-items: center; + font-family: "ForkAwesome"; + content: ""; + position: absolute; + right: 12px; + border-left: 1px solid var(--highlight-text-color); + height: calc(100% - 8px); + padding-left: 12px; + pointer-events: none; + margin-top: 8px; + } } .label_input { From 83a06e2708734bd60e83844b52de68f940e449d8 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 1 Oct 2020 21:26:20 -0500 Subject: [PATCH 28/95] SoapboxConfig: i18n "Default theme" --- app/soapbox/features/soapbox_config/index.js | 2 +- app/soapbox/locales/ar.json | 1 + app/soapbox/locales/ast.json | 1 + app/soapbox/locales/bg.json | 1 + app/soapbox/locales/bn.json | 1 + app/soapbox/locales/br.json | 1 + app/soapbox/locales/ca.json | 1 + app/soapbox/locales/co.json | 1 + app/soapbox/locales/cs.json | 1 + app/soapbox/locales/cy.json | 1 + app/soapbox/locales/da.json | 1 + app/soapbox/locales/de.json | 1 + app/soapbox/locales/defaultMessages.json | 12 ++++++++---- app/soapbox/locales/el.json | 1 + app/soapbox/locales/en.json | 1 + app/soapbox/locales/eo.json | 1 + app/soapbox/locales/es-AR.json | 1 + app/soapbox/locales/es.json | 1 + app/soapbox/locales/et.json | 1 + app/soapbox/locales/eu.json | 1 + app/soapbox/locales/fa.json | 1 + app/soapbox/locales/fi.json | 1 + app/soapbox/locales/fr.json | 1 + app/soapbox/locales/ga.json | 1 + app/soapbox/locales/gl.json | 1 + app/soapbox/locales/he.json | 1 + app/soapbox/locales/hi.json | 1 + app/soapbox/locales/hr.json | 1 + app/soapbox/locales/hu.json | 1 + app/soapbox/locales/hy.json | 1 + app/soapbox/locales/id.json | 1 + app/soapbox/locales/io.json | 1 + app/soapbox/locales/it.json | 1 + app/soapbox/locales/ja.json | 1 + app/soapbox/locales/ka.json | 1 + app/soapbox/locales/kk.json | 1 + app/soapbox/locales/ko.json | 1 + app/soapbox/locales/lt.json | 1 + app/soapbox/locales/lv.json | 1 + app/soapbox/locales/mk.json | 1 + app/soapbox/locales/ms.json | 1 + app/soapbox/locales/nl.json | 1 + app/soapbox/locales/nn.json | 1 + app/soapbox/locales/no.json | 1 + app/soapbox/locales/oc.json | 1 + app/soapbox/locales/pl.json | 1 + app/soapbox/locales/pt-BR.json | 1 + app/soapbox/locales/pt.json | 1 + app/soapbox/locales/ro.json | 1 + app/soapbox/locales/ru.json | 1 + app/soapbox/locales/sk.json | 1 + app/soapbox/locales/sl.json | 1 + app/soapbox/locales/sq.json | 1 + app/soapbox/locales/sr-Latn.json | 1 + app/soapbox/locales/sr.json | 1 + app/soapbox/locales/sv.json | 1 + app/soapbox/locales/ta.json | 1 + app/soapbox/locales/te.json | 1 + app/soapbox/locales/th.json | 1 + app/soapbox/locales/tr.json | 1 + app/soapbox/locales/uk.json | 1 + app/soapbox/locales/zh-CN.json | 1 + app/soapbox/locales/zh-HK.json | 1 + app/soapbox/locales/zh-TW.json | 1 + 64 files changed, 71 insertions(+), 5 deletions(-) diff --git a/app/soapbox/features/soapbox_config/index.js b/app/soapbox/features/soapbox_config/index.js index bb81deb33..718219b75 100644 --- a/app/soapbox/features/soapbox_config/index.js +++ b/app/soapbox/features/soapbox_config/index.js @@ -206,7 +206,7 @@ class SoapboxConfig extends ImmutablePureComponent { />
- + value)} settings={settings} diff --git a/app/soapbox/locales/ar.json b/app/soapbox/locales/ar.json index 0fe8f071e..b3ee0b828 100644 --- a/app/soapbox/locales/ar.json +++ b/app/soapbox/locales/ar.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json index 66d4147a6..3f20bc278 100644 --- a/app/soapbox/locales/ast.json +++ b/app/soapbox/locales/ast.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json index dfbfeb570..2baa171ac 100644 --- a/app/soapbox/locales/bg.json +++ b/app/soapbox/locales/bg.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/bn.json b/app/soapbox/locales/bn.json index 7856c6e07..1e843592e 100644 --- a/app/soapbox/locales/bn.json +++ b/app/soapbox/locales/bn.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json index c07114604..823289649 100644 --- a/app/soapbox/locales/br.json +++ b/app/soapbox/locales/br.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/ca.json b/app/soapbox/locales/ca.json index 2c3d456db..3918ae393 100644 --- a/app/soapbox/locales/ca.json +++ b/app/soapbox/locales/ca.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/co.json b/app/soapbox/locales/co.json index c31c3780b..34b01ea78 100644 --- a/app/soapbox/locales/co.json +++ b/app/soapbox/locales/co.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/cs.json b/app/soapbox/locales/cs.json index 5245d9c97..e1e1b0fe8 100644 --- a/app/soapbox/locales/cs.json +++ b/app/soapbox/locales/cs.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/cy.json b/app/soapbox/locales/cy.json index 6619517ba..ba9230ae7 100644 --- a/app/soapbox/locales/cy.json +++ b/app/soapbox/locales/cy.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/da.json b/app/soapbox/locales/da.json index f67b3b52a..fd42a41cb 100644 --- a/app/soapbox/locales/da.json +++ b/app/soapbox/locales/da.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json index 7e755ef9b..81c6505d1 100644 --- a/app/soapbox/locales/de.json +++ b/app/soapbox/locales/de.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json index e57d1dfdd..52330901c 100644 --- a/app/soapbox/locales/defaultMessages.json +++ b/app/soapbox/locales/defaultMessages.json @@ -2962,6 +2962,14 @@ "defaultMessage": "Edit the settings data directly. Changes made directly to the JSON file will override the form fields above. Click \"Save\" to apply your changes.", "id": "soapbox_config.raw_json_hint" }, + { + "defaultMessage": "Brand color", + "id": "soapbox_config.fields.brand_color_label" + }, + { + "defaultMessage": "Default theme", + "id": "soapbox_config.fields.theme_label" + }, { "defaultMessage": "Logo", "id": "soapbox_config.fields.logo_label" @@ -2970,10 +2978,6 @@ "defaultMessage": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "id": "soapbox_config.hints.logo" }, - { - "defaultMessage": "Brand color", - "id": "soapbox_config.fields.brand_color_label" - }, { "defaultMessage": "Promo panel items", "id": "soapbox_config.fields.promo_panel_fields_label" diff --git a/app/soapbox/locales/el.json b/app/soapbox/locales/el.json index f3ca68153..51729caa8 100644 --- a/app/soapbox/locales/el.json +++ b/app/soapbox/locales/el.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index bc81f8087..ceca18fe5 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/eo.json b/app/soapbox/locales/eo.json index 9cfba9fb3..5248cdc3c 100644 --- a/app/soapbox/locales/eo.json +++ b/app/soapbox/locales/eo.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/es-AR.json b/app/soapbox/locales/es-AR.json index a25d02ed7..726022af3 100644 --- a/app/soapbox/locales/es-AR.json +++ b/app/soapbox/locales/es-AR.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json index b334d2787..c2872327e 100644 --- a/app/soapbox/locales/es.json +++ b/app/soapbox/locales/es.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/et.json b/app/soapbox/locales/et.json index 20b45dadb..893919d99 100644 --- a/app/soapbox/locales/et.json +++ b/app/soapbox/locales/et.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/eu.json b/app/soapbox/locales/eu.json index 6a8c7dc17..d8463776d 100644 --- a/app/soapbox/locales/eu.json +++ b/app/soapbox/locales/eu.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/fa.json b/app/soapbox/locales/fa.json index 1bdd4eb1f..a2cd7e32f 100644 --- a/app/soapbox/locales/fa.json +++ b/app/soapbox/locales/fa.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/fi.json b/app/soapbox/locales/fi.json index 6e72fc01c..615a4c1cb 100644 --- a/app/soapbox/locales/fi.json +++ b/app/soapbox/locales/fi.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/fr.json b/app/soapbox/locales/fr.json index 4dfb3bae7..33c601e3a 100644 --- a/app/soapbox/locales/fr.json +++ b/app/soapbox/locales/fr.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json index 2757e08b8..13c91d080 100644 --- a/app/soapbox/locales/ga.json +++ b/app/soapbox/locales/ga.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/gl.json b/app/soapbox/locales/gl.json index 14c099099..3ecc74803 100644 --- a/app/soapbox/locales/gl.json +++ b/app/soapbox/locales/gl.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/he.json b/app/soapbox/locales/he.json index c71677ce5..6b170b749 100644 --- a/app/soapbox/locales/he.json +++ b/app/soapbox/locales/he.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json index b4194615e..b67dfb507 100644 --- a/app/soapbox/locales/hi.json +++ b/app/soapbox/locales/hi.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json index bc3d2d981..a6ace769e 100644 --- a/app/soapbox/locales/hr.json +++ b/app/soapbox/locales/hr.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/hu.json b/app/soapbox/locales/hu.json index f4b31747f..1bd51ec17 100644 --- a/app/soapbox/locales/hu.json +++ b/app/soapbox/locales/hu.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/hy.json b/app/soapbox/locales/hy.json index f84fd9c13..2c9e6668e 100644 --- a/app/soapbox/locales/hy.json +++ b/app/soapbox/locales/hy.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/id.json b/app/soapbox/locales/id.json index 4ffdfdb08..8510190c5 100644 --- a/app/soapbox/locales/id.json +++ b/app/soapbox/locales/id.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json index 39e618fe1..7671a5bcf 100644 --- a/app/soapbox/locales/io.json +++ b/app/soapbox/locales/io.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json index fd4a3ee14..9c216d015 100644 --- a/app/soapbox/locales/it.json +++ b/app/soapbox/locales/it.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/ja.json b/app/soapbox/locales/ja.json index c283bc2b3..a6905be52 100644 --- a/app/soapbox/locales/ja.json +++ b/app/soapbox/locales/ja.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/ka.json b/app/soapbox/locales/ka.json index a854f0098..95471494e 100644 --- a/app/soapbox/locales/ka.json +++ b/app/soapbox/locales/ka.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/kk.json b/app/soapbox/locales/kk.json index e55f4474a..1b57b29d9 100644 --- a/app/soapbox/locales/kk.json +++ b/app/soapbox/locales/kk.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/ko.json b/app/soapbox/locales/ko.json index fac5b8ab5..2847aa59f 100644 --- a/app/soapbox/locales/ko.json +++ b/app/soapbox/locales/ko.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json index dc27cf125..1cf42c6c3 100644 --- a/app/soapbox/locales/lt.json +++ b/app/soapbox/locales/lt.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/lv.json b/app/soapbox/locales/lv.json index a288904de..f2db9aacc 100644 --- a/app/soapbox/locales/lv.json +++ b/app/soapbox/locales/lv.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/mk.json b/app/soapbox/locales/mk.json index 999d5142c..14e21ca90 100644 --- a/app/soapbox/locales/mk.json +++ b/app/soapbox/locales/mk.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json index 912c1ddc4..a785c8365 100644 --- a/app/soapbox/locales/ms.json +++ b/app/soapbox/locales/ms.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/nl.json b/app/soapbox/locales/nl.json index a855daae8..cbcf8494c 100644 --- a/app/soapbox/locales/nl.json +++ b/app/soapbox/locales/nl.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/nn.json b/app/soapbox/locales/nn.json index c7ef16c7a..e94c4ef34 100644 --- a/app/soapbox/locales/nn.json +++ b/app/soapbox/locales/nn.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/no.json b/app/soapbox/locales/no.json index aaec6ae3f..73a8fb8f5 100644 --- a/app/soapbox/locales/no.json +++ b/app/soapbox/locales/no.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/oc.json b/app/soapbox/locales/oc.json index f0281c11a..aee54c758 100644 --- a/app/soapbox/locales/oc.json +++ b/app/soapbox/locales/oc.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json index f150fb05b..c6e532bc8 100644 --- a/app/soapbox/locales/pl.json +++ b/app/soapbox/locales/pl.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/pt-BR.json b/app/soapbox/locales/pt-BR.json index 591b336ce..d3112b4d1 100644 --- a/app/soapbox/locales/pt-BR.json +++ b/app/soapbox/locales/pt-BR.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/pt.json b/app/soapbox/locales/pt.json index 928010fcb..7abe51c3a 100644 --- a/app/soapbox/locales/pt.json +++ b/app/soapbox/locales/pt.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/ro.json b/app/soapbox/locales/ro.json index 73ed00cd3..e28d0e53f 100644 --- a/app/soapbox/locales/ro.json +++ b/app/soapbox/locales/ro.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json index 3794dd422..87b004265 100644 --- a/app/soapbox/locales/ru.json +++ b/app/soapbox/locales/ru.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/sk.json b/app/soapbox/locales/sk.json index d79e0534a..1eaa0641a 100644 --- a/app/soapbox/locales/sk.json +++ b/app/soapbox/locales/sk.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/sl.json b/app/soapbox/locales/sl.json index 8e9326d0e..6097e4a29 100644 --- a/app/soapbox/locales/sl.json +++ b/app/soapbox/locales/sl.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/sq.json b/app/soapbox/locales/sq.json index 2107f75b1..228381e0a 100644 --- a/app/soapbox/locales/sq.json +++ b/app/soapbox/locales/sq.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/sr-Latn.json b/app/soapbox/locales/sr-Latn.json index ee973b0f1..33792f210 100644 --- a/app/soapbox/locales/sr-Latn.json +++ b/app/soapbox/locales/sr-Latn.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/sr.json b/app/soapbox/locales/sr.json index 3ac2e8c1e..840438409 100644 --- a/app/soapbox/locales/sr.json +++ b/app/soapbox/locales/sr.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/sv.json b/app/soapbox/locales/sv.json index ce1a11556..63884b929 100644 --- a/app/soapbox/locales/sv.json +++ b/app/soapbox/locales/sv.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/ta.json b/app/soapbox/locales/ta.json index 69fcebd55..6fcf3bd91 100644 --- a/app/soapbox/locales/ta.json +++ b/app/soapbox/locales/ta.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/te.json b/app/soapbox/locales/te.json index 824b4921f..369d1f06a 100644 --- a/app/soapbox/locales/te.json +++ b/app/soapbox/locales/te.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/th.json b/app/soapbox/locales/th.json index 96c0debbb..d167f751c 100644 --- a/app/soapbox/locales/th.json +++ b/app/soapbox/locales/th.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/tr.json b/app/soapbox/locales/tr.json index 3a2aa3e23..b9154489e 100644 --- a/app/soapbox/locales/tr.json +++ b/app/soapbox/locales/tr.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json index e0570dce2..e5820729b 100644 --- a/app/soapbox/locales/uk.json +++ b/app/soapbox/locales/uk.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json index a2e6b4fbc..9a8ef65e1 100644 --- a/app/soapbox/locales/zh-CN.json +++ b/app/soapbox/locales/zh-CN.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/zh-HK.json b/app/soapbox/locales/zh-HK.json index eb8e7f45f..8bfc4aaaa 100644 --- a/app/soapbox/locales/zh-HK.json +++ b/app/soapbox/locales/zh-HK.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", diff --git a/app/soapbox/locales/zh-TW.json b/app/soapbox/locales/zh-TW.json index 9a6e29ff8..65d7e63b2 100644 --- a/app/soapbox/locales/zh-TW.json +++ b/app/soapbox/locales/zh-TW.json @@ -513,6 +513,7 @@ "soapbox_config.fields.logo_label": "Logo", "soapbox_config.fields.promo_panel.add": "Add new Promo panel item", "soapbox_config.fields.promo_panel_fields_label": "Promo panel items", + "soapbox_config.fields.theme_label": "Default theme", "soapbox_config.hints.home_footer_fields": "You can have custom defined links displayed on the footer of your static pages", "soapbox_config.hints.logo": "SVG. At most 2 MB. Will be displayed to 50px height, maintaining aspect ratio", "soapbox_config.hints.promo_panel_fields": "You can have custom defined links displayed on the left panel of the timelines page.", From a817deffa04ed22bf288feb39c399b2e6d506a65 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 1 Oct 2020 21:48:24 -0500 Subject: [PATCH 29/95] SoapboxConfig: button styles --- app/soapbox/features/soapbox_config/index.js | 4 ++-- app/styles/forms.scss | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/soapbox/features/soapbox_config/index.js b/app/soapbox/features/soapbox_config/index.js index 718219b75..6c5e08410 100644 --- a/app/soapbox/features/soapbox_config/index.js +++ b/app/soapbox/features/soapbox_config/index.js @@ -267,7 +267,7 @@ class SoapboxConfig extends ImmutablePureComponent {
)) } -
+
@@ -300,7 +300,7 @@ class SoapboxConfig extends ImmutablePureComponent {
)) } -
+
diff --git a/app/styles/forms.scss b/app/styles/forms.scss index aef92b3d2..c5a1dd4c7 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -750,3 +750,16 @@ code { margin-left: 10px; } } + +.actions.add-row { + margin: 10px 0 0; + + .button { + border: 0; + background: transparent; + + &:hover { + color: var(--primary-text-color); + } + } +} From 42fa2eb8b0dd4d401b75e800fe5498bb0d6a0cec Mon Sep 17 00:00:00 2001 From: Curtis Date: Fri, 2 Oct 2020 20:57:26 +0000 Subject: [PATCH 30/95] Update CHANGELOG.md to gear up for V1.1 release --- CHANGELOG.md | 86 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fd983eec..835b74a81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,16 +5,94 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed +- General user interface and ease-of-use improvements for both mobile and desktop +- General loading and performance improvements, including shrinking bundle size +- GIF handling: AutoPlayGif Preference support, including avatars and profile banners +- Sidebar menu browser compatibility +- React 17.x compatibility +- Timeline jumping during scroll +- Collapse of compose modal after privacy scope change +- Media attachment rendering +- Thread view reply post rendering +- Thread view scroll to selected post rendering +- Bookmarking of posts +- Edit Profile: checkbox handling +- Edit Profile: multi-line bio with link support +- Muted Users: posts of muted users now appear in profile view +- Forms: security issue resolved with POST method on all forms +- Internationalization: increased elements that are internationalizable + ### Added -- Audio player for audio uploads. -- Integration with Patron recurring donations platform. +- Chats, currently one-to-one, evolving with Pleroma BE capabilities, including: + - Initiate chat via `Message` button on profile + - Up to 4 open foreground chat windows in desktop, with open/minimize/close and notification counter + - Browser tab notification counter includes total chat and post notifications + - Chats list with total chats notification counter and audio notification toggle + - Unique chat audio notification + - Add attachment + - Delete chat message + - Report chat account + - Chats icon with notification counter in top navbar in mobile view + - Chats marked read on chat hover or on chat key event +- Audio player for audio uploads, including ogg, oga, and wav support +- Integration with Patron recurring donations platform +- Profile hover panels, with click to Follow/Unfollow +- Posts: Favicon of user's home instance included on post +- Soapbox configuration page, including: + - Site preview, including light/dark theme toggle rendering + - Logo + - Brand color using color picker + - Copyright footer + - Promo panel custom links for timeline pages + - Home footer custom links for static pages + - Editable JSON based configuration option +- Themes: Light/dark theme toggle in top navbar +- Themes: Halloween mode in Preferences page +- Markdown support in post composer, as default +- Loading indicator general improvements +- Polls: Add media attachments +- Polls: Mouseover hint on poll compose radiobutton to teach single/multi-choice poll type toggling +- Polls: Remove blank poll by either toggling Poll icon or by removing poll options +- Registration: Support for `Account approval required` setting in Pleroma AdminFE, via dynamic `Why do you want to join?` textarea on registration page +- Filtering: `Muted Words` menu item and page +- Filtering: Direct messages filter toggle on Home timeline +- Floating top navbar during scroll +- Import Data: `Import follows` and `import blocks` +- Profile: Media panel +- Media: Media gallery thumbnails +- Media: Any media type as attachment +- General documentation improvements +- Delete Account feature for user self-deletion in Security page +- Registration: Captcha reload on image click +- Fediverse timeline explanation accordion toggle +- Tests: React reducers tests +- Profile: Max profile meta fields defined by Pleroma BE capability +- Profile: Verified user checkbox +- Admin: Reports counter and top navbar element for admin accounts, linked to Pleroma AdminFE +- [Renovate.json](https://docs.renovatebot.com/configuration-options/) support + +### Changed +- Revoke OAuth token on logout +- Home sidebar rearrangement +- Compose form icons +- User event notifications: improved rendering and added color coding +- Home timeline: `Show reposts` filter toggle default to `off` +- Direct Messages: Changed API usage from `conversations` to `direct` +- Project documentation management system, using CI +- Documentation: site customization and installation on sub-domain +- Redux update + +### Removed +- FontAwesome dependencies, with full switch to ForkAwesome +- Requirement for use of soapbox.json for configuration +- Direct Message links from menus, partial deprecation due to chats + ## [Unreleased patch] ### Fixed - Composer: Forcing the scope to default after settings save. -### Removed -- Removed the app name on statuses. ## [1.0.0] - 2020-06-15 ### Added From 17266e172ffd209c41be7a9ee319f331e725c161 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 2 Oct 2020 20:01:09 -0500 Subject: [PATCH 31/95] Chats: count only unread *chats* not total unread messages for counter --- app/soapbox/components/helmet.js | 8 ++++---- app/soapbox/features/chats/components/chat_panes.js | 2 +- app/soapbox/features/ui/components/chats_counter_icon.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/soapbox/components/helmet.js b/app/soapbox/components/helmet.js index c9c1eb5a6..0fb0e3cb5 100644 --- a/app/soapbox/components/helmet.js +++ b/app/soapbox/components/helmet.js @@ -4,10 +4,10 @@ import PropTypes from 'prop-types'; import { Helmet } from'react-helmet'; const getNotifTotals = state => { - const normNotif = state.getIn(['notifications', 'unread']); - const chatNotif = state.get('chats').reduce((acc, curr) => acc + curr.get('unread'), 0); - const notifTotals = normNotif + chatNotif; - return notifTotals; + const notifications = state.getIn(['notifications', 'unread'], 0); + const chats = state.get('chats').reduce((acc, curr) => acc + Math.min(curr.get('unread', 0), 1), 0); + const reports = state.getIn(['admin', 'open_report_count'], 0); + return notifications + chats + reports; }; const mapStateToProps = state => ({ diff --git a/app/soapbox/features/chats/components/chat_panes.js b/app/soapbox/features/chats/components/chat_panes.js index 876ff9666..6d5e82251 100644 --- a/app/soapbox/features/chats/components/chat_panes.js +++ b/app/soapbox/features/chats/components/chat_panes.js @@ -29,7 +29,7 @@ const mapStateToProps = state => { return { panesData: addChatsToPanes(state, panesData), - unreadCount: state.get('chats').reduce((acc, curr) => acc + curr.get('unread'), 0), + unreadCount: state.get('chats').reduce((acc, curr) => acc + Math.min(curr.get('unread', 0), 1), 0), }; }; diff --git a/app/soapbox/features/ui/components/chats_counter_icon.js b/app/soapbox/features/ui/components/chats_counter_icon.js index d98cabadc..bb6d32907 100644 --- a/app/soapbox/features/ui/components/chats_counter_icon.js +++ b/app/soapbox/features/ui/components/chats_counter_icon.js @@ -2,7 +2,7 @@ import { connect } from 'react-redux'; import IconWithBadge from 'soapbox/components/icon_with_badge'; const mapStateToProps = state => ({ - count: state.get('chats').reduce((acc, curr) => acc + curr.get('unread'), 0), + count: state.get('chats').reduce((acc, curr) => acc + Math.min(curr.get('unread', 0), 1), 0), id: 'comment', }); From 2291e570ce573e6a327bc26a4e6ab5ce6ec85d98 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 4 Oct 2020 22:26:00 -0500 Subject: [PATCH 32/95] Forms: delete left border from select arrow for now --- app/styles/forms.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/styles/forms.scss b/app/styles/forms.scss index c5a1dd4c7..1e469506a 100644 --- a/app/styles/forms.scss +++ b/app/styles/forms.scss @@ -482,7 +482,6 @@ code { content: ""; position: absolute; right: 12px; - border-left: 1px solid var(--highlight-text-color); height: calc(100% - 8px); padding-left: 12px; pointer-events: none; From b8e78ab6a3b6380f4ce4afde3aa1424f81b60dec Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 4 Oct 2020 22:28:34 -0500 Subject: [PATCH 33/95] v1.0.0 --> v1.1.0 --- CHANGELOG.md | 9 ++------- README.md | 2 +- app/soapbox/features/ui/components/link_footer.js | 2 +- docs/administration/install-subdomain.md | 2 +- docs/administration/install-yunohost.md | 2 +- docs/installing.md | 2 +- package.json | 2 +- 7 files changed, 8 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 835b74a81..fe15dd098 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [1.1.0] - 2020-10-05 ### Fixed - General user interface and ease-of-use improvements for both mobile and desktop - General loading and performance improvements, including shrinking bundle size @@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Muted Users: posts of muted users now appear in profile view - Forms: security issue resolved with POST method on all forms - Internationalization: increased elements that are internationalizable +- Composer: Forcing the scope to default after settings save. ### Added - Chats, currently one-to-one, evolving with Pleroma BE capabilities, including: @@ -88,12 +89,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Requirement for use of soapbox.json for configuration - Direct Message links from menus, partial deprecation due to chats - -## [Unreleased patch] -### Fixed -- Composer: Forcing the scope to default after settings save. - - ## [1.0.0] - 2020-06-15 ### Added - Emoji reactions. diff --git a/README.md b/README.md index 584868d7c..0399dc761 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Installing Soapbox FE on an existing Pleroma server is extremely easy. Just ssh into the server and download a .zip of the latest build: ```sh -curl -L https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/v1.0.0/download?job=build-production -o soapbox-fe.zip +curl -L https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/v1.1.0/download?job=build-production -o soapbox-fe.zip ``` Then unpack it into Pleroma's `instance` directory: diff --git a/app/soapbox/features/ui/components/link_footer.js b/app/soapbox/features/ui/components/link_footer.js index 5ceabfe63..68034c076 100644 --- a/app/soapbox/features/ui/components/link_footer.js +++ b/app/soapbox/features/ui/components/link_footer.js @@ -12,7 +12,7 @@ const sourceCode = { name: 'soapbox-fe', url: 'https://gitlab.com/soapbox-pub/soapbox-fe', repository: 'soapbox-pub/soapbox-fe', - version: '1.0.0', + version: '1.1.0', }; const mapStateToProps = state => { diff --git a/docs/administration/install-subdomain.md b/docs/administration/install-subdomain.md index 3fe8707e4..baf8cb2c3 100644 --- a/docs/administration/install-subdomain.md +++ b/docs/administration/install-subdomain.md @@ -13,7 +13,7 @@ mkdir -p /opt/soapbox Fetch the build. ```sh -curl -L https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/v1.0.0/download?job=build-production -o /tmp/soapbox-fe.zip +curl -L https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/v1.1.0/download?job=build-production -o /tmp/soapbox-fe.zip ``` Unzip the build. diff --git a/docs/administration/install-yunohost.md b/docs/administration/install-yunohost.md index d6b64f68c..6f35c0fa9 100644 --- a/docs/administration/install-yunohost.md +++ b/docs/administration/install-yunohost.md @@ -7,7 +7,7 @@ If you want to install Soapbox FE to a Pleroma instance installed using [YunoHos First, download the latest build of Soapbox FE from GitLab. ```sh -curl -L https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/v1.0.0/download?job=build-production -o soapbox-fe.zip +curl -L https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/v1.1.0/download?job=build-production -o soapbox-fe.zip ``` ## 2. Unzip the build diff --git a/docs/installing.md b/docs/installing.md index 9537f51e4..428c1e39b 100644 --- a/docs/installing.md +++ b/docs/installing.md @@ -13,7 +13,7 @@ First, follow the instructions to [install Pleroma](https://docs-develop.pleroma The Soapbox frontend is the main component of Soapbox. Once you've installed Pleroma, installing Soapbox FE is a breeze. -First, ssh into the server and download a .zip of the latest build: ``curl -L https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/v1.0.0/download?job=build-production -o soapbox-fe.zip`` +First, ssh into the server and download a .zip of the latest build: ``curl -L https://gitlab.com/soapbox-pub/soapbox-fe/-/jobs/artifacts/v1.1.0/download?job=build-production -o soapbox-fe.zip`` Then unpack it into Pleroma's ``instance`` directory: ``busybox unzip soapbox-fe.zip -o -d /opt/pleroma/instance`` diff --git a/package.json b/package.json index df7042161..4dd0fbf84 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "soapbox-fe", - "version": "1.0.0", + "version": "1.1.0", "description": "Soapbox frontend for Pleroma.", "homepage": "https://soapbox.pub/", "repository": { From c39419fcec7a712732d557639cd08e99c6e11168 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 5 Oct 2020 13:19:12 -0500 Subject: [PATCH 34/95] Renovate: preserveSemverRanges --- renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index f45d8f110..5fcce1121 100644 --- a/renovate.json +++ b/renovate.json @@ -1,5 +1,6 @@ { "extends": [ - "config:base" + "config:base", + ":preserveSemverRanges" ] } From 7aac683b39bff9cd5dbac862c8c1e6e76cb39c39 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 5 Oct 2020 20:49:14 +0000 Subject: [PATCH 35/95] Update dependency axios to ^0.20.0 --- package.json | 2 +- yarn.lock | 28 ++++++++++------------------ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 4dd0fbf84..f23935beb 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@popperjs/core": "^2.4.4", "array-includes": "^3.0.3", "autoprefixer": "^9.5.1", - "axios": "^0.19.0", + "axios": "^0.20.0", "babel-loader": "^8.0.5", "babel-plugin-lodash": "^3.3.4", "babel-plugin-preval": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index bc1614f09..f28e95c69 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2338,13 +2338,12 @@ axios-mock-adapter@^1.18.1: fast-deep-equal "^3.1.1" is-buffer "^2.0.3" -axios@^0.19.0: - version "0.19.0" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz#8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8" - integrity sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ== +axios@^0.20.0: + version "0.20.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.20.0.tgz#057ba30f04884694993a8cd07fa394cff11c50bd" + integrity sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA== dependencies: - follow-redirects "1.5.10" - is-buffer "^2.0.2" + follow-redirects "^1.10.0" axobject-query@^2.0.2: version "2.0.2" @@ -5159,13 +5158,6 @@ flush-write-stream@^1.0.0: inherits "^2.0.1" readable-stream "^2.0.4" -follow-redirects@1.5.10: - version "1.5.10" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" - integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ== - dependencies: - debug "=3.1.0" - follow-redirects@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.6.0.tgz#d12452c031e8c67eb6637d861bfc7a8090167933" @@ -5173,6 +5165,11 @@ follow-redirects@^1.0.0: dependencies: debug "=3.1.0" +follow-redirects@^1.10.0: + version "1.13.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" + integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== + for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -6175,11 +6172,6 @@ is-buffer@^1.1.5: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== -is-buffer@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725" - integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw== - is-buffer@^2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623" From c788a2f7f5fa7769f4db8ba83d77e1896bf84c0a Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 5 Oct 2020 15:51:58 -0500 Subject: [PATCH 36/95] Renovate: add GitHub access token for release notes --- renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 5fcce1121..63026e46b 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,7 @@ { "extends": [ "config:base", - ":preserveSemverRanges" + ":preserveSemverRanges", + ":githubComToken(fJRNKBmV/ypoAx23PI8I+uTGJ22iSA6DERwiz1WGtXHC/imZV0mOyLfNOfVznOq3QbU9FTbuilgq3XfRQzRVMXx2eTe3ZkzzdH3loqfr2m/mt+9/PQygfkcAOJCQ4BE5Mlhfzxt9miBeG9jvm546oBXNjP39W+j4cdOnppBSMrhh2iofEOjXR41GCPDxCcdnr7RGDtWUCtrIYGyoJm2ypUrkRTUFexVAJy8Q7knX2ACZfzP9j+Uol22SEsU/WRZkvIEp60TqPlgvCFld7LECk2BYnDz9qTcSKF1GhfAsgGleSog9Tyfxow+rH1tB4cMxI5qZP0DTmAf+8fNYSgiKDA==)" ] } From d1e91592fb51f966bcea15e45a6cea82b1f74338 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 5 Oct 2020 15:55:25 -0500 Subject: [PATCH 37/95] Remove @clusterws/cws dependency --- package.json | 1 - yarn.lock | 5 ----- 2 files changed, 6 deletions(-) diff --git a/package.json b/package.json index 4dd0fbf84..46d4cc60a 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,6 @@ "@babel/preset-env": "^7.3.4", "@babel/preset-react": "^7.0.0", "@babel/runtime": "^7.3.4", - "@clusterws/cws": "^0.16.0", "@popperjs/core": "^2.4.4", "array-includes": "^3.0.3", "autoprefixer": "^9.5.1", diff --git a/yarn.lock b/yarn.lock index bc1614f09..00d90e130 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1134,11 +1134,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@clusterws/cws@^0.16.0": - version "0.16.0" - resolved "https://registry.yarnpkg.com/@clusterws/cws/-/cws-0.16.0.tgz#f6116cbf3a8b7ad0657916616ce5f8248746b797" - integrity sha512-YeGpAPIdkBsOnAkmFKVMWEjCKDH900U2if0B+nc1imfv+64AIb2JX2xiTA6BLDLppEgWV5c6bpWESjbHCNblHw== - "@cnakazawa/watch@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef" From 1c31fe6863ea22b345d2de1c7cf403aae4fb2f4a Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 5 Oct 2020 21:36:14 +0000 Subject: [PATCH 38/95] Update ru.json --- app/soapbox/locales/ru.json | 64 ++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json index 87b004265..4046b282a 100644 --- a/app/soapbox/locales/ru.json +++ b/app/soapbox/locales/ru.json @@ -6,8 +6,8 @@ "account.block": "Блокировать", "account.block_domain": "Блокировать все с {domain}", "account.blocked": "Заблокирован(а)", - "account.deactivated": "Deactivated", - "account.deactivated_description": "This account has been deactivated.", + "account.deactivated": "Отключение Аккаунта", + "account.deactivated_description": "Этот аккаунт был отключен.", "account.direct": "Написать @{name}", "account.domain_blocked": "Домен скрыт", "account.edit_profile": "Изменить профиль", @@ -25,15 +25,15 @@ "account.media": "Медиа", "account.member_since": "Member since {date}", "account.mention": "Упомянуть", - "account.message": "Message", + "account.message": "Сообщение", "account.moved_to": "Ищите {name} здесь:", "account.mute": "Скрыть @{name}", "account.mute_notifications": "Скрыть уведомления от @{name}", "account.muted": "Скрыт", "account.posts": "Посты", "account.posts_with_replies": "Посты с ответами", - "account.profile": "Profile", - "account.register": "Sign up", + "account.profile": "Профиль", + "account.register": "Регистрация", "account.report": "Пожаловаться", "account.requested": "Ожидает подтверждения. Нажмите для отмены", "account.requested_small": "Awaiting approval", @@ -45,16 +45,16 @@ "account.unfollow": "Отписаться", "account.unmute": "Снять глушение", "account.unmute_notifications": "Показывать уведомления от @{name}", - "account_gallery.none": "No media to show.", + "account_gallery.none": "Не показывать медия.", "alert.unexpected.message": "Что-то пошло не так.", "alert.unexpected.title": "Ой!", - "audio.close": "Close audio", + "audio.close": "Закрыть аудиоплеер", "audio.expand": "Expand audio", - "audio.hide": "Hide audio", - "audio.mute": "Mute", - "audio.pause": "Pause", - "audio.play": "Play", - "audio.unmute": "Unmute", + "audio.hide": "Спрятать аудиоплеер", + "audio.mute": "Отключить звук", + "audio.pause": "Пауза", + "audio.play": "Воспроизводить аудиоплеер", + "audio.unmute": "Включить звук.", "boost_modal.combo": "Нажмите {combo}, чтобы пропустить это в следующий раз", "bundle_column_error.body": "Что-то пошло не так при загрузке этого компонента.", "bundle_column_error.retry": "Попробовать снова", @@ -62,24 +62,24 @@ "bundle_modal_error.close": "Закрыть", "bundle_modal_error.message": "Что-то пошло не так при загрузке этого компонента.", "bundle_modal_error.retry": "Попробовать снова", - "chat_box.actions.send": "Send", - "chat_box.input.placeholder": "Send a message…", + "chat_box.actions.send": "Отправить", + "chat_box.input.placeholder": "Отправить сообщение…", "chat_panels.main_window.empty": "No chats found. To start a chat, visit a user's profile.", - "chat_panels.main_window.title": "Chats", - "chats.actions.delete": "Delete message", - "chats.actions.more": "More", - "chats.actions.report": "Report user", - "chats.audio_toggle_off": "Audio notification off", - "chats.audio_toggle_on": "Audio notification on", - "chats.dividers.today": "Today", + "chat_panels.main_window.title": "Чаты", + "chats.actions.delete": "Удалить Сообщенип", + "chats.actions.more": "Ещё", + "chats.actions.report": "Пожаловаться на пользователя", + "chats.audio_toggle_off": "Отключить аудио увидомление", + "chats.audio_toggle_on": "Включить аудио увидомление", + "chats.dividers.today": "Сегодня", "column.blocks": "Список блокировки", - "column.bookmarks": "Bookmarks", + "column.bookmarks": "Закладки", "column.chats": "Chats", "column.community": "Локальная лента", "column.direct": "Личные сообщения", "column.domain_blocks": "Скрытые домены", - "column.edit_profile": "Edit profile", - "column.filters": "Muted words", + "column.edit_profile": "Редактирование профиля", + "column.filters": "Скрытые слова", "column.filters.add_new": "Add New Filter", "column.filters.conversations": "Conversations", "column.filters.create_error": "Error adding filter", @@ -109,10 +109,10 @@ "column.mfa_setup": "Proceed to Setup", "column.mutes": "Список скрытых пользователей", "column.notifications": "Уведомления", - "column.preferences": "Preferences", + "column.preferences": "Настройки", "column.public": "Глобальная лента", - "column.security": "Security", - "column.soapbox_config": "Soapbox config", + "column.security": "Настройки безопастности.", + "column.soapbox_config": "Настройка Soapbox", "column_back_button.label": "Назад", "column_header.hide_settings": "Скрыть настройки", "column_header.show_settings": "Показать настройки", @@ -158,12 +158,12 @@ "confirmations.unfollow.confirm": "Отписаться", "confirmations.unfollow.message": "Вы уверены, что хотите отписаться от {name}?", "donate": "Donate", - "edit_profile.fields.avatar_label": "Avatar", - "edit_profile.fields.bio_label": "Bio", - "edit_profile.fields.bot_label": "This is a bot account", - "edit_profile.fields.display_name_label": "Display name", + "edit_profile.fields.avatar_label": "Сменить картинку профиля", + "edit_profile.fields.bio_label": "Описание профиля", + "edit_profile.fields.bot_label": "Отметить аккаунт как бот.", + "edit_profile.fields.display_name_label": "Отображаемое имя(Можно на русском)", "edit_profile.fields.header_label": "Header", - "edit_profile.fields.locked_label": "Lock account", + "edit_profile.fields.locked_label": "Заблокировать аккаунт", "edit_profile.fields.meta_fields.content_placeholder": "Content", "edit_profile.fields.meta_fields.label_placeholder": "Label", "edit_profile.fields.meta_fields_label": "Profile metadata", From d5afc284898a2b1b7e5dffca9ccebf955675c6f0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 5 Oct 2020 22:46:35 +0000 Subject: [PATCH 39/95] Update dependency eslint-plugin-import to ~2.22.0 --- package.json | 2 +- yarn.lock | 171 +++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 152 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index a65772a15..a8bbc3b89 100644 --- a/package.json +++ b/package.json @@ -153,7 +153,7 @@ "enzyme": "^3.8.0", "enzyme-adapter-react-16": "^1.7.1", "eslint": "^6.0.0", - "eslint-plugin-import": "~2.19.0", + "eslint-plugin-import": "~2.22.0", "eslint-plugin-jsx-a11y": "~6.2.3", "eslint-plugin-promise": "~4.2.0", "eslint-plugin-react": "~7.17.0", diff --git a/yarn.lock b/yarn.lock index 17265f4ad..334c1e497 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1633,6 +1633,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339" integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA== +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= + "@types/minimatch@*": version "3.0.3" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" @@ -2194,6 +2199,15 @@ array-includes@^3.0.3: define-properties "^1.1.2" es-abstract "^1.7.0" +array-includes@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" + integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0" + is-string "^1.0.5" + array-union@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" @@ -2220,6 +2234,14 @@ array.prototype.flat@^1.2.1: es-abstract "^1.10.0" function-bind "^1.1.1" +array.prototype.flat@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" + integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -4339,6 +4361,41 @@ es-abstract@^1.15.0: string.prototype.trimleft "^2.1.0" string.prototype.trimright "^2.1.0" +es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.5: + version "1.17.7" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" + integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.2" + is-regex "^1.1.1" + object-inspect "^1.8.0" + object-keys "^1.1.1" + object.assign "^4.1.1" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + +es-abstract@^1.18.0-next.0: + version "1.18.0-next.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" + integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA== + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.2" + is-negative-zero "^2.0.0" + is-regex "^1.1.1" + object-inspect "^1.8.0" + object-keys "^1.1.1" + object.assign "^4.1.1" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + es-to-primitive@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" @@ -4470,18 +4527,18 @@ escope@^3.6.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-import-resolver-node@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" - integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q== +eslint-import-resolver-node@^0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" + integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== dependencies: debug "^2.6.9" - resolve "^1.5.0" + resolve "^1.13.1" -eslint-module-utils@^2.4.1: - version "2.5.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.0.tgz#cdf0b40d623032274ccd2abd7e64c4e524d6e19c" - integrity sha512-kCo8pZaNz2dsAW7nCUjuVoI11EBXXpIzfNxmaoLhXoRDOnqXLC4iSGVRdZPhOitfbdEfMEfKOiENaK6wDPZEGw== +eslint-module-utils@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" + integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== dependencies: debug "^2.6.9" pkg-dir "^2.0.0" @@ -4491,23 +4548,24 @@ eslint-plugin-eslint-plugin@^2.1.0: resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.1.0.tgz#a7a00f15a886957d855feacaafee264f039e62d5" integrity sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg== -eslint-plugin-import@~2.19.0: - version "2.19.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.19.1.tgz#5654e10b7839d064dd0d46cd1b88ec2133a11448" - integrity sha512-x68131aKoCZlCae7rDXKSAQmbT5DQuManyXo2sK6fJJ0aK5CWAkv6A6HJZGgqC8IhjQxYPgo6/IY4Oz8AFsbBw== +eslint-plugin-import@~2.22.0: + version "2.22.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" + integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== dependencies: - array-includes "^3.0.3" - array.prototype.flat "^1.2.1" + array-includes "^3.1.1" + array.prototype.flat "^1.2.3" contains-path "^0.1.0" debug "^2.6.9" doctrine "1.5.0" - eslint-import-resolver-node "^0.3.2" - eslint-module-utils "^2.4.1" + eslint-import-resolver-node "^0.3.4" + eslint-module-utils "^2.6.0" has "^1.0.3" minimatch "^3.0.4" - object.values "^1.1.0" + object.values "^1.1.1" read-pkg-up "^2.0.0" - resolve "^1.12.0" + resolve "^1.17.0" + tsconfig-paths "^3.9.0" eslint-plugin-jsx-a11y@~6.2.3: version "6.2.3" @@ -6184,6 +6242,11 @@ is-callable@^1.1.3, is-callable@^1.1.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== +is-callable@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" + integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA== + is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -6333,6 +6396,11 @@ is-nan@^1.2.1: dependencies: define-properties "^1.1.1" +is-negative-zero@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" + integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE= + is-number-object@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799" @@ -6408,6 +6476,13 @@ is-regex@^1.0.4: dependencies: has "^1.0.1" +is-regex@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" + integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== + dependencies: + has-symbols "^1.0.1" + is-resolvable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" @@ -6428,6 +6503,11 @@ is-string@^1.0.4: resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64" integrity sha1-zDqbaYV9Yh6WNyWiTK7shzuCbmQ= +is-string@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" + integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== + is-subset@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" @@ -8141,6 +8221,11 @@ object-inspect@^1.7.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== +object-inspect@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" + integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA== + object-is@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6" @@ -8173,6 +8258,16 @@ object.assign@^4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" +object.assign@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd" + integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.18.0-next.0" + has-symbols "^1.0.1" + object-keys "^1.1.1" + object.entries@^1.0.4, object.entries@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519" @@ -8218,6 +8313,16 @@ object.values@^1.0.4, object.values@^1.1.0: function-bind "^1.1.1" has "^1.0.3" +object.values@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" + integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + has "^1.0.3" + obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" @@ -10222,7 +10327,7 @@ resolve@^1.17.0: dependencies: path-parse "^1.0.6" -resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1: +resolve@^1.3.2, resolve@^1.8.1: version "1.9.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06" integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ== @@ -11012,6 +11117,14 @@ string.prototype.trim@^1.1.2: es-abstract "^1.5.0" function-bind "^1.0.2" +string.prototype.trimend@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" + integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trimleft@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634" @@ -11028,6 +11141,14 @@ string.prototype.trimright@^2.1.0: define-properties "^1.1.3" function-bind "^1.1.1" +string.prototype.trimstart@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" + integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string_decoder@^1.0.0, string_decoder@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d" @@ -11484,6 +11605,16 @@ tryer@^1.0.0: resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== +tsconfig-paths@^3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" + integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== + dependencies: + "@types/json5" "^0.0.29" + json5 "^1.0.1" + minimist "^1.2.0" + strip-bom "^3.0.0" + tslib@^1.10.0: version "1.13.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" From e401c5045b9ca81e14d8a5dafda734c266c586c6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 5 Oct 2020 23:46:41 +0000 Subject: [PATCH 40/95] Update dependency eslint-plugin-jsx-a11y to ~6.3.0 --- package.json | 2 +- yarn.lock | 120 +++++++++++++++++++++++++++++++-------------------- 2 files changed, 75 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index a8bbc3b89..ef7842141 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ "enzyme-adapter-react-16": "^1.7.1", "eslint": "^6.0.0", "eslint-plugin-import": "~2.22.0", - "eslint-plugin-jsx-a11y": "~6.2.3", + "eslint-plugin-jsx-a11y": "~6.3.0", "eslint-plugin-promise": "~4.2.0", "eslint-plugin-react": "~7.17.0", "eslint-plugin-react-hooks": "^4.0.4", diff --git a/yarn.lock b/yarn.lock index 334c1e497..7a67a7359 100644 --- a/yarn.lock +++ b/yarn.lock @@ -964,6 +964,14 @@ "@babel/plugin-transform-react-jsx-self" "^7.0.0" "@babel/plugin-transform-react-jsx-source" "^7.0.0" +"@babel/runtime-corejs3@^7.10.2": + version "7.11.2" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz#02c3029743150188edeb66541195f54600278419" + integrity sha512-qh5IR+8VgFz83VBa6OkaET6uN/mJOhHONuy3m1sgF0CV6mXdPSEBdA7e1eUbVvyNtANjMbg22JUv71BaDXLY6A== + dependencies: + core-js-pure "^3.0.0" + regenerator-runtime "^0.13.4" + "@babel/runtime@7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c" @@ -985,14 +993,7 @@ dependencies: regenerator-runtime "^0.13.2" -"@babel/runtime@^7.4.5": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz#935122c74c73d2240cafd32ddb5fc2a6cd35cf1f" - integrity sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA== - dependencies: - regenerator-runtime "^0.13.2" - -"@babel/runtime@^7.5.5": +"@babel/runtime@^7.10.2", "@babel/runtime@^7.5.5": version "7.11.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz#f549c13c754cc40b87644b9fa9f09a6a95fe0736" integrity sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw== @@ -2158,13 +2159,13 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" -aria-query@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc" - integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w= +aria-query@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b" + integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA== dependencies: - ast-types-flow "0.0.7" - commander "^2.11.0" + "@babel/runtime" "^7.10.2" + "@babel/runtime-corejs3" "^7.10.2" arr-diff@^4.0.0: version "4.0.0" @@ -2285,7 +2286,7 @@ assign-symbols@^1.0.0: resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= -ast-types-flow@0.0.7, ast-types-flow@^0.0.7: +ast-types-flow@^0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0= @@ -2347,6 +2348,11 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ== +axe-core@^3.5.4: + version "3.5.5" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-3.5.5.tgz#84315073b53fa3c0c51676c588d59da09a192227" + integrity sha512-5P0QZ6J5xGikH780pghEdbEKijCTrruK9KxtPZCFWUpef0f6GipO+xEZ5GKCb020mmqgbiNO6TcA55CriL784Q== + axios-mock-adapter@^1.18.1: version "1.18.1" resolved "https://registry.yarnpkg.com/axios-mock-adapter/-/axios-mock-adapter-1.18.1.tgz#a2ba2638ef513d954793f96bde3e26bd4a1b7940" @@ -2362,12 +2368,10 @@ axios@^0.20.0: dependencies: follow-redirects "^1.10.0" -axobject-query@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9" - integrity sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww== - dependencies: - ast-types-flow "0.0.7" +axobject-query@^2.1.2: + version "2.2.0" + resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be" + integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA== babel-eslint@^10.1.0: version "10.1.0" @@ -3265,7 +3269,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@^2.11.0, commander@^2.18.0, commander@^2.19.0: +commander@^2.18.0, commander@^2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== @@ -3417,6 +3421,11 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= +core-js-pure@^3.0.0: + version "3.6.5" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813" + integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA== + core-js@^1.0.0: version "1.2.7" resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" @@ -3806,10 +3815,10 @@ d@^1.0.1: es5-ext "^0.10.50" type "^1.0.1" -damerau-levenshtein@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514" - integrity sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ= +damerau-levenshtein@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791" + integrity sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug== dashdash@^1.12.0: version "1.14.1" @@ -4211,7 +4220,7 @@ emoji-mart@Gargron/emoji-mart#build: version "2.6.2" resolved "https://codeload.github.com/Gargron/emoji-mart/tar.gz/ff00dc470b5b2d9f145a6d6e977a54de5df2b4c9" -emoji-regex@^7.0.1, emoji-regex@^7.0.2: +emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== @@ -4221,6 +4230,11 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +emoji-regex@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.0.0.tgz#48a2309cc8a1d2e9d23bc6a67c39b63032e76ea4" + integrity sha512-6p1NII1Vm62wni/VR/cUMauVQoxmLVb9csqQlvLz+hO2gk8U2UYDfXHQSUYIBKmZwAKz867IDqG7B+u0mj+M6w== + emojis-list@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" @@ -4567,20 +4581,22 @@ eslint-plugin-import@~2.22.0: resolve "^1.17.0" tsconfig-paths "^3.9.0" -eslint-plugin-jsx-a11y@~6.2.3: - version "6.2.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz#b872a09d5de51af70a97db1eea7dc933043708aa" - integrity sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg== +eslint-plugin-jsx-a11y@~6.3.0: + version "6.3.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.3.1.tgz#99ef7e97f567cc6a5b8dd5ab95a94a67058a2660" + integrity sha512-i1S+P+c3HOlBJzMFORRbC58tHa65Kbo8b52/TwCwSKLohwvpfT5rm2GjGWzOHTEuq4xxf2aRlHHTtmExDQOP+g== dependencies: - "@babel/runtime" "^7.4.5" - aria-query "^3.0.0" - array-includes "^3.0.3" + "@babel/runtime" "^7.10.2" + aria-query "^4.2.2" + array-includes "^3.1.1" ast-types-flow "^0.0.7" - axobject-query "^2.0.2" - damerau-levenshtein "^1.0.4" - emoji-regex "^7.0.2" + axe-core "^3.5.4" + axobject-query "^2.1.2" + damerau-levenshtein "^1.0.6" + emoji-regex "^9.0.0" has "^1.0.3" - jsx-ast-utils "^2.2.1" + jsx-ast-utils "^2.4.1" + language-tags "^1.0.5" eslint-plugin-promise@~4.2.0: version "4.2.1" @@ -7253,14 +7269,6 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jsx-ast-utils@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz#4d4973ebf8b9d2837ee91a8208cc66f3a2776cfb" - integrity sha512-v3FxCcAf20DayI+uxnCuw795+oOIkVu6EnJ1+kSzhqqTZHNkTZ7B66ZgLp4oLJ/gbA64cI0B7WRoHZMSRdyVRQ== - dependencies: - array-includes "^3.0.3" - object.assign "^4.1.0" - jsx-ast-utils@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f" @@ -7269,6 +7277,14 @@ jsx-ast-utils@^2.2.3: array-includes "^3.0.3" object.assign "^4.1.0" +jsx-ast-utils@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz#1114a4c1209481db06c690c2b4f488cc665f657e" + integrity sha512-z1xSldJ6imESSzOjd3NNkieVJKRlKYSOtMG8SFyCj2FIrvSaSuli/WjpBkEzCBoR9bYYYFgqJw61Xhu7Lcgk+w== + dependencies: + array-includes "^3.1.1" + object.assign "^4.1.0" + keycode@^2.1.7: version "2.2.0" resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04" @@ -7318,6 +7334,18 @@ known-css-properties@^0.3.0: resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.3.0.tgz#a3d135bbfc60ee8c6eacf2f7e7e6f2d4755e49a4" integrity sha512-QMQcnKAiQccfQTqtBh/qwquGZ2XK/DXND1jrcN9M8gMMy99Gwla7GQjndVUsEqIaRyP6bsFRuhwRj5poafBGJQ== +language-subtag-registry@~0.3.2: + version "0.3.20" + resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.20.tgz#a00a37121894f224f763268e431c55556b0c0755" + integrity sha512-KPMwROklF4tEx283Xw0pNKtfTj1gZ4UByp4EsIFWLgBavJltF4TiYPc39k06zSTsLzxTVXXDSpbwaQXaFB4Qeg== + +language-tags@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz#d321dbc4da30ba8bf3024e040fa5c14661f9193a" + integrity sha1-0yHbxNowuovzAk4ED6XBRmH5GTo= + dependencies: + language-subtag-registry "~0.3.2" + lcid@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" From 13a8302879b399aa0988774ba7869d1118afbcb4 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 5 Oct 2020 23:47:13 +0000 Subject: [PATCH 41/95] Update dependency intersection-observer to ^0.11.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a8bbc3b89..cc06c66db 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "http-link-header": "^1.0.2", "immutable": "^4.0.0-rc.12", "imports-loader": "^0.8.0", - "intersection-observer": "^0.7.0", + "intersection-observer": "^0.11.0", "intl": "^1.2.5", "intl-messageformat": "^7.0.0", "intl-messageformat-parser": "^3.2.1", diff --git a/yarn.lock b/yarn.lock index 334c1e497..40bee74cd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6090,10 +6090,10 @@ interpret@^1.1.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== -intersection-observer@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.7.0.tgz#ee16bee978db53516ead2f0a8154b09b400bbdc9" - integrity sha512-Id0Fij0HsB/vKWGeBe9PxeY45ttRiBmhFyyt/geBdDHBYNctMRTE3dC1U3ujzz3lap+hVXlEcVaB56kZP/eEUg== +intersection-observer@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.11.0.tgz#f4ea067070326f68393ee161cc0a2ca4c0040c6f" + integrity sha512-KZArj2QVnmdud9zTpKf279m2bbGfG+4/kn16UU0NL3pTVl52ZHiJ9IRNSsnn6jaHrL9EGLFM5eWjTx2fz/+zoQ== intl-format-cache@^4.2.2: version "4.2.2" From bf35c75a60ba4902ba0096431f980c15a7026a4d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 6 Oct 2020 01:31:42 +0000 Subject: [PATCH 42/95] Update dependency eslint-plugin-react to ~7.21.0 --- package.json | 2 +- yarn.lock | 140 +++++++++++++++++++++++++++------------------------ 2 files changed, 74 insertions(+), 68 deletions(-) diff --git a/package.json b/package.json index 4e7dec09c..0ee318ba4 100644 --- a/package.json +++ b/package.json @@ -156,7 +156,7 @@ "eslint-plugin-import": "~2.22.0", "eslint-plugin-jsx-a11y": "~6.3.0", "eslint-plugin-promise": "~4.2.0", - "eslint-plugin-react": "~7.17.0", + "eslint-plugin-react": "~7.21.0", "eslint-plugin-react-hooks": "^4.0.4", "jest": "^26.0.1", "raf": "^3.4.1", diff --git a/yarn.lock b/yarn.lock index f14b12273..965c7db03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2243,6 +2243,15 @@ array.prototype.flat@^1.2.3: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" +array.prototype.flatmap@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz#1c13f84a178566042dd63de4414440db9222e443" + integrity sha512-OOEk+lkePcg+ODXIpvuU9PAryCikCJyo7GlDG1upleEpQRx6mzL9puEBkozQ5iAx20KV0l3DbyQwqciJtqe5Pg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -4359,22 +4368,6 @@ es-abstract@^1.10.0, es-abstract@^1.12.0, es-abstract@^1.5.0, es-abstract@^1.5.1 is-callable "^1.1.3" is-regex "^1.0.4" -es-abstract@^1.15.0: - version "1.16.2" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.2.tgz#4e874331645e9925edef141e74fc4bd144669d34" - integrity sha512-jYo/J8XU2emLXl3OLwfwtuFfuF2w6DYPs+xy9ZfVyPkDcrauu6LYrw/q2TyCtrbc/KUdCiC5e9UajRhgNkVopA== - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.1.4" - is-regex "^1.0.4" - object-inspect "^1.7.0" - object-keys "^1.1.1" - string.prototype.trimleft "^2.1.0" - string.prototype.trimright "^2.1.0" - es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.5: version "1.17.7" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" @@ -4557,11 +4550,6 @@ eslint-module-utils@^2.6.0: debug "^2.6.9" pkg-dir "^2.0.0" -eslint-plugin-eslint-plugin@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-2.1.0.tgz#a7a00f15a886957d855feacaafee264f039e62d5" - integrity sha512-kT3A/ZJftt28gbl/Cv04qezb/NQ1dwYIbi8lyf806XMxkus7DvOVCLIfTXMrorp322Pnoez7+zabXH29tADIDg== - eslint-plugin-import@~2.22.0: version "2.22.1" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" @@ -4608,21 +4596,22 @@ eslint-plugin-react-hooks@^4.0.4: resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.0.4.tgz#aed33b4254a41b045818cacb047b81e6df27fa58" integrity sha512-equAdEIsUETLFNCmmCkiCGq6rkSK5MoJhXFPFYeUebcjKgBmWWcgVOqZyQC8Bv1BwVCnTq9tBxgJFgAJTWoJtA== -eslint-plugin-react@~7.17.0: - version "7.17.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.17.0.tgz#a31b3e134b76046abe3cd278e7482bd35a1d12d7" - integrity sha512-ODB7yg6lxhBVMeiH1c7E95FLD4E/TwmFjltiU+ethv7KPdCwgiFuOZg9zNRHyufStTDLl/dEFqI2Q1VPmCd78A== +eslint-plugin-react@~7.21.0: + version "7.21.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.3.tgz#71655d2af5155b19285ec929dd2cdc67a4470b52" + integrity sha512-OI4GwTCqyIb4ipaOEGLWdaOHCXZZydStAsBEPB2e1ZfNM37bojpgO1BoOQbFb0eLVz3QLDx7b+6kYcrxCuJfhw== dependencies: - array-includes "^3.0.3" + array-includes "^3.1.1" + array.prototype.flatmap "^1.2.3" doctrine "^2.1.0" - eslint-plugin-eslint-plugin "^2.1.0" has "^1.0.3" - jsx-ast-utils "^2.2.3" - object.entries "^1.1.0" - object.fromentries "^2.0.1" - object.values "^1.1.0" + jsx-ast-utils "^2.4.1" + object.entries "^1.1.2" + object.fromentries "^2.0.2" + object.values "^1.1.1" prop-types "^15.7.2" - resolve "^1.13.1" + resolve "^1.17.0" + string.prototype.matchall "^4.0.2" eslint-scope@^4.0.3: version "4.0.3" @@ -6101,6 +6090,15 @@ internal-ip@^4.3.0: default-gateway "^4.2.0" ipaddr.js "^1.9.0" +internal-slot@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3" + integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g== + dependencies: + es-abstract "^1.17.0-next.1" + has "^1.0.3" + side-channel "^1.0.2" + interpret@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" @@ -7269,14 +7267,6 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jsx-ast-utils@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f" - integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA== - dependencies: - array-includes "^3.0.3" - object.assign "^4.1.0" - jsx-ast-utils@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz#1114a4c1209481db06c690c2b4f488cc665f657e" @@ -8244,11 +8234,6 @@ object-inspect@^1.6.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b" integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ== -object-inspect@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" - integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw== - object-inspect@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0" @@ -8296,7 +8281,7 @@ object.assign@^4.1.1: has-symbols "^1.0.1" object-keys "^1.1.1" -object.entries@^1.0.4, object.entries@^1.1.0: +object.entries@^1.0.4: version "1.1.0" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519" integrity sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA== @@ -8306,13 +8291,22 @@ object.entries@^1.0.4, object.entries@^1.1.0: function-bind "^1.1.1" has "^1.0.3" -object.fromentries@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz#050f077855c7af8ae6649f45c80b16ee2d31e704" - integrity sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA== +object.entries@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add" + integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA== dependencies: define-properties "^1.1.3" - es-abstract "^1.15.0" + es-abstract "^1.17.5" + has "^1.0.3" + +object.fromentries@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" + integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" function-bind "^1.1.1" has "^1.0.3" @@ -10120,6 +10114,14 @@ regexp-tree@^0.1.0: resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.5.tgz#7cd71fca17198d04b4176efd79713f2998009397" integrity sha512-nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ== +regexp.prototype.flags@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" + integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" @@ -10776,6 +10778,14 @@ shellwords@^0.1.1: resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== +side-channel@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz#cdc46b057550bbab63706210838df5d4c19519c3" + integrity sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g== + dependencies: + es-abstract "^1.18.0-next.0" + object-inspect "^1.8.0" + signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" @@ -11136,6 +11146,18 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string.prototype.matchall@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" + integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.0" + has-symbols "^1.0.1" + internal-slot "^1.0.2" + regexp.prototype.flags "^1.3.0" + side-channel "^1.0.2" + string.prototype.trim@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea" @@ -11153,22 +11175,6 @@ string.prototype.trimend@^1.0.1: define-properties "^1.1.3" es-abstract "^1.17.5" -string.prototype.trimleft@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634" - integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw== - dependencies: - define-properties "^1.1.3" - function-bind "^1.1.1" - -string.prototype.trimright@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58" - integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg== - dependencies: - define-properties "^1.1.3" - function-bind "^1.1.1" - string.prototype.trimstart@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" From e24d6cef15d348a1eed1f6c3915f466cfc32e074 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 6 Oct 2020 01:31:59 +0000 Subject: [PATCH 43/95] Update dependency mini-css-extract-plugin to ^0.11.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4e7dec09c..bde0c479a 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "lodash": "^4.7.11", "mark-loader": "^0.1.6", "marky": "^1.2.1", - "mini-css-extract-plugin": "^0.8.0", + "mini-css-extract-plugin": "^0.11.0", "mkdirp": "^0.5.1", "npmlog": "^4.1.2", "object-assign": "^4.1.1", diff --git a/yarn.lock b/yarn.lock index f14b12273..28a964e35 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7769,10 +7769,10 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mini-css-extract-plugin@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz#81d41ec4fe58c713a96ad7c723cdb2d0bd4d70e1" - integrity sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw== +mini-css-extract-plugin@^0.11.0: + version "0.11.3" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.3.tgz#15b0910a7f32e62ffde4a7430cfefbd700724ea6" + integrity sha512-n9BA8LonkOkW1/zn+IbLPQmovsL0wMb9yx75fMJQZf2X1Zoec9yTZtyMePcyu19wPkmFbzZZA6fLTotpFhQsOA== dependencies: loader-utils "^1.1.0" normalize-url "1.9.1" From cb05f85a1ec5e95023eff04d2e3b54faf13e54ed Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 6 Oct 2020 01:32:20 +0000 Subject: [PATCH 44/95] Update dependency react-overlays to ^0.9.0 --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 4e7dec09c..f28504cf7 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "react-masonry-infinite": "^1.2.2", "react-motion": "^0.5.2", "react-notification": "^6.8.4", - "react-overlays": "^0.8.3", + "react-overlays": "^0.9.0", "react-popper": "^2.2.3", "react-redux": "^7.2.1", "react-redux-loading-bar": "^4.5.0", diff --git a/yarn.lock b/yarn.lock index f14b12273..e7f151b82 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9725,16 +9725,16 @@ react-notification@^6.8.4: dependencies: prop-types "^15.6.2" -react-overlays@^0.8.3: - version "0.8.3" - resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.8.3.tgz#fad65eea5b24301cca192a169f5dddb0b20d3ac5" - integrity sha512-h6GT3jgy90PgctleP39Yu3eK1v9vaJAW73GOA/UbN9dJ7aAN4BTZD6793eI1D5U+ukMk17qiqN/wl3diK1Z5LA== +react-overlays@^0.9.0: + version "0.9.2" + resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-0.9.2.tgz#51ab1c62ded5af4d279bd3b943999531bbd648da" + integrity sha512-wOi+WqO0acnUAMCbTTW06/GRkYjHdlvIoyX4bYkLvxKrLgl2kX9WzFVyBdwukl2jvN7I7oX7ZXAz7MNOWYdgCA== dependencies: classnames "^2.2.5" dom-helpers "^3.2.1" prop-types "^15.5.10" prop-types-extra "^1.0.1" - react-transition-group "^2.2.0" + react-transition-group "^2.2.1" warning "^3.0.0" react-popper@^2.2.3: @@ -9889,7 +9889,7 @@ react-toggle@^4.0.1: dependencies: classnames "^2.2.5" -react-transition-group@^2.2.0, react-transition-group@^2.2.1: +react-transition-group@^2.2.1: version "2.5.2" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.5.2.tgz#9457166a9ba6ce697a3e1b076b3c049b9fb2c408" integrity sha512-vwHP++S+f6KL7rg8V1mfs62+MBKtbMeZDR8KiNmD7v98Gs3UPGsDZDahPJH2PVprFW5YHJfh6cbNim3zPndaSQ== From f70a1814ec6b0d62c38294485d4cdc3634ee7bbd Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Mon, 5 Oct 2020 21:20:39 -0500 Subject: [PATCH 45/95] Fixes #463 unwanted emoji background --- app/styles/components/status.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/styles/components/status.scss b/app/styles/components/status.scss index ba266870f..a05364f81 100644 --- a/app/styles/components/status.scss +++ b/app/styles/components/status.scss @@ -55,7 +55,8 @@ background-color: var(--background-color); } - img { + /* Markdown images */ + img:not(.emojione) { width: 100%; height: 285.188px; object-fit: contain; @@ -63,6 +64,7 @@ border-radius: 4px; overflow: hidden; margin: 20px 0; + display: block; } } From 98d812b298c09a1c750d7a69130720716461be55 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 6 Oct 2020 08:32:31 +0000 Subject: [PATCH 46/95] Update dependency file-loader to v6 --- package.json | 2 +- yarn.lock | 50 ++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 03e307411..813c6394e 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ "escape-html": "^1.0.3", "exif-js": "^2.3.0", "express": "^4.17.1", - "file-loader": "^4.0.0", + "file-loader": "^6.0.0", "fork-awesome": "^1.1.7", "glob": "^7.1.1", "html-webpack-harddisk-plugin": "^1.0.1", diff --git a/yarn.lock b/yarn.lock index 19998d7ac..b6d015f42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1634,6 +1634,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339" integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA== +"@types/json-schema@^7.0.5": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" + integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== + "@types/json5@^0.0.29": version "0.0.29" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" @@ -2005,6 +2010,11 @@ ajv-keywords@^3.4.1: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== +ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + ajv@^4.7.0: version "4.11.8" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" @@ -2043,6 +2053,16 @@ ajv@^6.12.2: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.12.4: + version "6.12.5" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da" + integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -5077,13 +5097,13 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" -file-loader@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-4.2.0.tgz#5fb124d2369d7075d70a9a5abecd12e60a95215e" - integrity sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ== +file-loader@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.1.0.tgz#65b9fcfb0ea7f65a234a1f10cdd7f1ab9a33f253" + integrity sha512-26qPdHyTsArQ6gU4P1HJbAbnFTyT2r0pG7czh1GFAd9TZbj0n94wWbupgixZH/ET/meqi2/5+F7DhW4OAXD+Lg== dependencies: - loader-utils "^1.2.3" - schema-utils "^2.0.0" + loader-utils "^2.0.0" + schema-utils "^2.7.1" filesize@^3.6.1: version "3.6.1" @@ -7405,6 +7425,15 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: emojis-list "^2.0.0" json5 "^1.0.1" +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -10587,6 +10616,15 @@ schema-utils@^2.0.0, schema-utils@^2.1.0: ajv "^6.10.2" ajv-keywords "^3.4.1" +schema-utils@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== + dependencies: + "@types/json-schema" "^7.0.5" + ajv "^6.12.4" + ajv-keywords "^3.5.2" + scroll-behavior@^0.9.1: version "0.9.9" resolved "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.9.tgz#ebfe0658455b82ad885b66195215416674dacce2" From 5d3907ae9d69cab6cc1f5847c81af44efa62b171 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 6 Oct 2020 09:27:52 +0000 Subject: [PATCH 47/95] Update dependency imports-loader to v1 --- package.json | 2 +- yarn.lock | 55 +++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 03e307411..d0704999e 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "html-webpack-plugin": "^4.3.0", "http-link-header": "^1.0.2", "immutable": "^4.0.0-rc.12", - "imports-loader": "^0.8.0", + "imports-loader": "^1.0.0", "intersection-observer": "^0.11.0", "intl": "^1.2.5", "intl-messageformat": "^7.0.0", diff --git a/yarn.lock b/yarn.lock index 19998d7ac..4def87357 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1634,6 +1634,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339" integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA== +"@types/json-schema@^7.0.5": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" + integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== + "@types/json5@^0.0.29": version "0.0.29" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" @@ -2005,6 +2010,11 @@ ajv-keywords@^3.4.1: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== +ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + ajv@^4.7.0: version "4.11.8" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" @@ -2043,6 +2053,16 @@ ajv@^6.12.2: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.12.4: + version "6.12.5" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da" + integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -5998,13 +6018,15 @@ import-local@^3.0.2: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" -imports-loader@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.8.0.tgz#030ea51b8ca05977c40a3abfd9b4088fe0be9a69" - integrity sha512-kXWL7Scp8KQ4552ZcdVTeaQCZSLW+e6nJfp3cwUMB673T7Hr98Xjx5JK+ql7ADlJUvj1JS5O01RLbKoutN5QDQ== +imports-loader@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-1.1.0.tgz#1c3a388d0c5cd7f9eb08f3646d4aae3b70e57933" + integrity sha512-HcPM6rULdQ6EBLVq+5O+CF9xb7qiUjsRm6V28bTG/c3IU5sQkVZzUDwYY0r4jHvSAmVFdO9WA/vLAURR5WQSeQ== dependencies: - loader-utils "^1.0.2" + loader-utils "^2.0.0" + schema-utils "^2.7.0" source-map "^0.6.1" + strip-comments "^2.0.1" imurmurhash@^0.1.4: version "0.1.4" @@ -7405,6 +7427,15 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: emojis-list "^2.0.0" json5 "^1.0.1" +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -10587,6 +10618,15 @@ schema-utils@^2.0.0, schema-utils@^2.1.0: ajv "^6.10.2" ajv-keywords "^3.4.1" +schema-utils@^2.7.0: + version "2.7.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== + dependencies: + "@types/json-schema" "^7.0.5" + ajv "^6.12.4" + ajv-keywords "^3.5.2" + scroll-behavior@^0.9.1: version "0.9.9" resolved "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.9.tgz#ebfe0658455b82ad885b66195215416674dacce2" @@ -11242,6 +11282,11 @@ strip-bom@^4.0.0: resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== +strip-comments@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b" + integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw== + strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" From 4ded00fe637ff34a523e347dd4b23763a0bb80c6 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 6 Oct 2020 11:57:15 +0000 Subject: [PATCH 48/95] Update ru.json --- app/soapbox/locales/ru.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/soapbox/locales/ru.json b/app/soapbox/locales/ru.json index 4046b282a..e6acb2a81 100644 --- a/app/soapbox/locales/ru.json +++ b/app/soapbox/locales/ru.json @@ -89,10 +89,10 @@ "column.filters.drop_hint": "Filtered posts will disappear irreversibly, even if filter is later removed", "column.filters.expires": "Expire after", "column.filters.expires_hint": "Expiration dates are not currently supported", - "column.filters.home_timeline": "Home timeline", + "column.filters.home_timeline": "Домашняя лента", "column.filters.keyword": "Keyword or phrase", "column.filters.notifications": "Notifications", - "column.filters.public_timeline": "Public timeline", + "column.filters.public_timeline": "Локальная лента", "column.filters.subheading_add_new": "Add New Filter", "column.filters.subheading_filters": "Current Filters", "column.filters.whole_word_header": "Whole word", From 12359c7c790a37ad56480a121e40298a9b3b0987 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 6 Oct 2020 13:36:46 +0000 Subject: [PATCH 49/95] Update dependency react-immutable-pure-component to v2 --- package.json | 2 +- yarn.lock | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 03e307411..b3b51bc5c 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "react-helmet": "^6.0.0", "react-hotkeys": "^1.1.4", "react-immutable-proptypes": "^2.1.0", - "react-immutable-pure-component": "^1.1.1", + "react-immutable-pure-component": "^2.0.0", "react-intl": "^4.6.6", "react-masonry-infinite": "^1.2.2", "react-motion": "^0.5.2", diff --git a/yarn.lock b/yarn.lock index 19998d7ac..987a6da1b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1677,13 +1677,6 @@ "@types/prop-types" "*" csstype "^2.2.0" -"@types/react@16.4.6": - version "16.4.6" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.4.6.tgz#5024957c6bcef4f02823accf5974faba2e54fada" - integrity sha512-9LDZdhsuKSc+DjY65SjBkA958oBWcTWSVWAd2cD9XqKBjhGw1KzAkRhWRw2eIsXvaIE/TOTjjKMFVC+JA1iU4g== - dependencies: - csstype "^2.2.0" - "@types/schema-utils@^2.4.0": version "2.4.0" resolved "https://registry.yarnpkg.com/@types/schema-utils/-/schema-utils-2.4.0.tgz#9983012045d541dcee053e685a27c9c87c840fcd" @@ -9630,12 +9623,10 @@ react-immutable-proptypes@^2.1.0: resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz#023d6f39bb15c97c071e9e60d00d136eac5fa0b4" integrity sha1-Aj1vObsVyXwHHp5g0A0TbqxfoLQ= -react-immutable-pure-component@^1.1.1: - version "1.2.3" - resolved "https://registry.yarnpkg.com/react-immutable-pure-component/-/react-immutable-pure-component-1.2.3.tgz#fa33638df68cfe9f73ccbee1d5861c17f3053f86" - integrity sha512-kNy2A/fDrSuR8TKwB+4ynmItmp1vgF87tWxxfmadwDYo2J3ANipHqTjDIBvJvJ7libvuh76jIbvmK0krjtKH1g== - optionalDependencies: - "@types/react" "16.4.6" +react-immutable-pure-component@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/react-immutable-pure-component/-/react-immutable-pure-component-2.2.2.tgz#3014d3e20cd5a7a4db73b81f1f1464f4d351684b" + integrity sha512-vkgoMJUDqHZfXXnjVlG3keCxSO/U6WeDQ5/Sl0GK2cH8TOxEzQ5jXqDXHEL/jqk6fsNxV05oH5kD7VNMUE2k+A== react-infinite-scroller@^1.0.12: version "1.2.4" From 96a30c85ae67f0d52c5399fe5e9c1850fd6c476d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 6 Oct 2020 15:01:26 +0000 Subject: [PATCH 50/95] Update dependency react-redux-loading-bar to v5 --- package.json | 2 +- yarn.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 03e307411..a989bac2f 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "react-overlays": "^0.9.0", "react-popper": "^2.2.3", "react-redux": "^7.2.1", - "react-redux-loading-bar": "^4.5.0", + "react-redux-loading-bar": "^5.0.0", "react-router-dom": "^4.1.1", "react-router-scroll-4": "^1.0.0-beta.1", "react-select": "^2.4.4", diff --git a/yarn.lock b/yarn.lock index 19998d7ac..2fe912df0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9689,7 +9689,7 @@ react-is@^16.3.2, react-is@^16.6.1, react-is@^16.7.0, react-is@^16.8.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA== -react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4: +react-lifecycles-compat@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== @@ -9739,13 +9739,13 @@ react-popper@^2.2.3: react-fast-compare "^3.0.1" warning "^4.0.2" -react-redux-loading-bar@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-4.5.0.tgz#96538d0ba041463d810e213fb54eadbce9628266" - integrity sha512-I6VN66XUWYUZPFrnwNSNncoAK4hy6p2ECN/MXerBi8NF5YmA8o/+RmJk8LwWbWQ5cIKRo95V3pt9sK3aCaiFxw== +react-redux-loading-bar@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/react-redux-loading-bar/-/react-redux-loading-bar-5.0.0.tgz#fffbc2b893c556b7b4c577743427507ee6dbc1f3" + integrity sha512-orxhhnuTDHUJ8sWBf7NHc9iIvPx8+8LVmMmC9ka3UcXKbMRaPdaYfH2wCikOwVV6gxhRceFA/zaSLSdnGrF41Q== dependencies: - prop-types "^15.6.2" - react-lifecycles-compat "^3.0.2" + prop-types "^15.7.2" + react-lifecycles-compat "^3.0.4" react-redux@^7.2.1: version "7.2.1" From bc79f7747cd7668a2c6b3fcc6858a17dbf54fa9c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 6 Oct 2020 18:36:34 +0000 Subject: [PATCH 51/95] Update dependency react-textarea-autosize to v8 --- package.json | 2 +- yarn.lock | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 03e307411..a147460b7 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,7 @@ "react-select": "^2.4.4", "react-sparklines": "^1.7.0", "react-swipeable-views": "^0.13.0", - "react-textarea-autosize": "^7.1.0", + "react-textarea-autosize": "^8.0.0", "react-toggle": "^4.0.1", "redis": "^2.7.1", "redux": "^4.0.5", diff --git a/yarn.lock b/yarn.lock index 19998d7ac..ac127849a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9868,13 +9868,14 @@ react-test-renderer@^16.13.1: react-is "^16.8.6" scheduler "^0.19.1" -react-textarea-autosize@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-7.1.0.tgz#3132cb77e65d94417558d37c0bfe415a5afd3445" - integrity sha512-c2FlR/fP0qbxmlrW96SdrbgP/v0XZMTupqB90zybvmDVDutytUgPl7beU35klwcTeMepUIQEpQUn3P3bdshGPg== +react-textarea-autosize@^8.0.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.2.0.tgz#fae38653f5ec172a855fd5fffb39e466d56aebdb" + integrity sha512-grajUlVbkx6VdtSxCgzloUIphIZF5bKr21OYMceWPKkniy7H0mRAT/AXPrRtObAe+zUePnNlBwUc4ivVjUGIjw== dependencies: - "@babel/runtime" "^7.1.2" - prop-types "^15.6.0" + "@babel/runtime" "^7.10.2" + use-composed-ref "^1.0.0" + use-latest "^1.0.0" react-toggle@^4.0.1: version "4.0.2" @@ -11639,6 +11640,11 @@ tryer@^1.0.0: resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== +ts-essentials@^2.0.3: + version "2.0.12" + resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745" + integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w== + tsconfig-paths@^3.9.0: version "3.9.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" @@ -11881,6 +11887,25 @@ url@^0.11.0: punycode "1.3.2" querystring "0.2.0" +use-composed-ref@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.0.0.tgz#bb13e8f4a0b873632cde4940abeb88b92d03023a" + integrity sha512-RVqY3NFNjZa0xrmK3bIMWNmQ01QjKPDc7DeWR3xa/N8aliVppuutOE5bZzPkQfvL+5NRWMMp0DJ99Trd974FIw== + dependencies: + ts-essentials "^2.0.3" + +use-isomorphic-layout-effect@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.0.0.tgz#f56b4ed633e1c21cd9fc76fe249002a1c28989fb" + integrity sha512-JMwJ7Vd86NwAt1jH7q+OIozZSIxA4ND0fx6AsOe2q1H8ooBUp5aN6DvVCqZiIaYU6JaMRJGyR0FO7EBCIsb/Rg== + +use-latest@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/use-latest/-/use-latest-1.1.0.tgz#7bf9684555869c3f5f37e10d0884c8accf4d3aa6" + integrity sha512-gF04d0ZMV3AMB8Q7HtfkAWe+oq1tFXP6dZKwBHQF5nVXtGsh2oAYeeqma5ZzxtlpOcW8Ro/tLcfmEodjDeqtuw== + dependencies: + use-isomorphic-layout-effect "^1.0.0" + use@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" From 1870ee62c1316e1d09354d80424fb07ba72ec71b Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 6 Oct 2020 15:41:53 -0500 Subject: [PATCH 52/95] Remove unused deps: mkdirp, redis, pg --- package.json | 3 -- yarn.lock | 116 +-------------------------------------------------- 2 files changed, 1 insertion(+), 118 deletions(-) diff --git a/package.json b/package.json index 03e307411..1fddbce5d 100644 --- a/package.json +++ b/package.json @@ -87,14 +87,12 @@ "mark-loader": "^0.1.6", "marky": "^1.2.1", "mini-css-extract-plugin": "^0.11.0", - "mkdirp": "^0.5.1", "npmlog": "^4.1.2", "object-assign": "^4.1.1", "object-fit-images": "^3.2.3", "object.values": "^1.1.0", "offline-plugin": "^5.0.7", "path-complete-extname": "^1.0.0", - "pg": "^7.0.0", "postcss-loader": "^3.0.0", "postcss-object-fit-images": "^1.1.2", "prop-types": "^15.5.10", @@ -122,7 +120,6 @@ "react-swipeable-views": "^0.13.0", "react-textarea-autosize": "^7.1.0", "react-toggle": "^4.0.1", - "redis": "^2.7.1", "redux": "^4.0.5", "redux-immutable": "^4.0.0", "redux-thunk": "^2.2.0", diff --git a/yarn.lock b/yarn.lock index 19998d7ac..8bd317eff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2841,11 +2841,6 @@ buffer-indexof@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== -buffer-writer@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" - integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw== - buffer-xor@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" @@ -4169,11 +4164,6 @@ dotenv@^8.0.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440" integrity sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg== -double-ended-queue@^2.1.0-0: - version "2.1.0-0" - resolved "https://registry.yarnpkg.com/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz#103d3527fd31528f40188130c841efdd78264e5c" - integrity sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw= - duplexer@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" @@ -8539,11 +8529,6 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1" integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ== -packet-reader@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74" - integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ== - pako@~1.0.5: version "1.0.7" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27" @@ -8761,52 +8746,6 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -pg-connection-string@0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7" - integrity sha1-2hhHsglA5C7hSSvq9l1J2RskXfc= - -pg-int8@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" - integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== - -pg-pool@^2.0.4: - version "2.0.7" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-2.0.7.tgz#f14ecab83507941062c313df23f6adcd9fd0ce54" - integrity sha512-UiJyO5B9zZpu32GSlP0tXy8J2NsJ9EFGFfz5v6PSbdz/1hBLX1rNiiy5+mAm5iJJYwfCv4A0EBcQLGWwjbpzZw== - -pg-types@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3" - integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA== - dependencies: - pg-int8 "1.0.1" - postgres-array "~2.0.0" - postgres-bytea "~1.0.0" - postgres-date "~1.0.4" - postgres-interval "^1.1.0" - -pg@^7.0.0: - version "7.12.1" - resolved "https://registry.yarnpkg.com/pg/-/pg-7.12.1.tgz#880636d46d2efbe0968e64e9fe0eeece8ef72a7e" - integrity sha512-l1UuyfEvoswYfcUe6k+JaxiN+5vkOgYcVSbSuw3FvdLqDbaoa2RJo1zfJKfPsSYPFVERd4GHvX3s2PjG1asSDA== - dependencies: - buffer-writer "2.0.0" - packet-reader "1.0.0" - pg-connection-string "0.1.3" - pg-pool "^2.0.4" - pg-types "^2.1.0" - pgpass "1.x" - semver "4.3.2" - -pgpass@1.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.2.tgz#2a7bb41b6065b67907e91da1b07c1847c877b306" - integrity sha1-Knu0G2BltnkH6R2hsHwYR8h3swY= - dependencies: - split "^1.0.0" - picomatch@^2.0.4, picomatch@^2.0.5: version "2.2.2" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" @@ -9259,28 +9198,6 @@ postcss@^7.0.16, postcss@^7.0.17: source-map "^0.6.1" supports-color "^6.1.0" -postgres-array@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" - integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA== - -postgres-bytea@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" - integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU= - -postgres-date@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.4.tgz#1c2728d62ef1bff49abdd35c1f86d4bdf118a728" - integrity sha512-bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA== - -postgres-interval@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.1.2.tgz#bf71ff902635f21cb241a013fc421d81d1db15a9" - integrity sha512-fC3xNHeTskCxL1dC8KOtxXt7YeFmlbTYtn7ul8MkVERuTmf7pI4DrkAxcw3kh1fQ9uz4wQmd03a1mRiXUZChfQ== - dependencies: - xtend "^4.0.0" - precond@0.2: version "0.2.3" resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac" @@ -10018,25 +9935,6 @@ realpath-native@^1.1.0: dependencies: util.promisify "^1.0.0" -redis-commands@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.4.0.tgz#52f9cf99153efcce56a8f86af986bd04e988602f" - integrity sha512-cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw== - -redis-parser@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/redis-parser/-/redis-parser-2.6.0.tgz#52ed09dacac108f1a631c07e9b69941e7a19504b" - integrity sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs= - -redis@^2.7.1: - version "2.8.0" - resolved "https://registry.yarnpkg.com/redis/-/redis-2.8.0.tgz#202288e3f58c49f6079d97af7a10e1303ae14b02" - integrity sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A== - dependencies: - double-ended-queue "^2.1.0-0" - redis-commands "^1.2.0" - redis-parser "^2.6.0" - redux-immutable@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/redux-immutable/-/redux-immutable-4.0.0.tgz#3a1a32df66366462b63691f0e1dc35e472bbc9f3" @@ -10612,11 +10510,6 @@ selfsigned@^1.10.4: resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== -semver@4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.2.tgz#c7a07158a80bedd052355b770d82d6640f803be7" - integrity sha1-x6BxWKgL7dBSNVt3DYLWZA+AO+c= - semver@^6.0.0, semver@^6.1.2, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -10997,13 +10890,6 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" -split@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" - integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== - dependencies: - through "2" - sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" @@ -11497,7 +11383,7 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" -through@2, through@^2.3.6: +through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= From ed9988b350ef65904223ade9a9ee5ea3aa894563 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 6 Oct 2020 22:22:29 +0000 Subject: [PATCH 53/95] Update dependency eslint to v7 --- package.json | 2 +- yarn.lock | 364 +++++++++++++++++++++++++++------------------------ 2 files changed, 192 insertions(+), 174 deletions(-) diff --git a/package.json b/package.json index 1fddbce5d..6e9009d7a 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "babel-jest": "^24.8.0", "enzyme": "^3.8.0", "enzyme-adapter-react-16": "^1.7.1", - "eslint": "^6.0.0", + "eslint": "^7.0.0", "eslint-plugin-import": "~2.22.0", "eslint-plugin-jsx-a11y": "~6.3.0", "eslint-plugin-promise": "~4.2.0", diff --git a/yarn.lock b/yarn.lock index 8bd317eff..f0b1a6cdb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1190,6 +1190,22 @@ resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc" integrity sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw== +"@eslint/eslintrc@^0.1.3": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085" + integrity sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + lodash "^4.17.19" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + "@formatjs/intl-displaynames@^2.2.4": version "2.2.4" resolved "https://registry.yarnpkg.com/@formatjs/intl-displaynames/-/intl-displaynames-2.2.4.tgz#c85d59b0d157470347fdfe86fb8fba7da998ebe1" @@ -1940,10 +1956,10 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" -acorn-jsx@^5.0.2: - version "5.1.0" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384" - integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw== +acorn-jsx@^5.2.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" + integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== acorn-walk@^6.1.1: version "6.1.1" @@ -1975,16 +1991,16 @@ acorn@^6.2.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e" integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA== -acorn@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c" - integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ== - acorn@^7.1.1: version "7.2.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz#17ea7e40d7c8640ff54a694c889c26f31704effe" integrity sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ== +acorn@^7.4.0: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + ajv-errors@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" @@ -2043,6 +2059,16 @@ ajv@^6.12.2: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.12.4: + version "6.12.5" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da" + integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -2053,16 +2079,16 @@ ansi-colors@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813" integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw== +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + ansi-escapes@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" integrity sha1-06ioOzGapneTZisT52HHkRQiMG4= -ansi-escapes@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" - integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== - ansi-escapes@^4.2.1: version "4.3.1" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" @@ -3028,7 +3054,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -3050,11 +3076,6 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== -chardet@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== - check-types@^7.3.0: version "7.4.0" resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4" @@ -3150,13 +3171,6 @@ cli-cursor@^1.0.1: dependencies: restore-cursor "^1.0.1" -cli-cursor@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" - integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= - dependencies: - restore-cursor "^2.0.0" - cli-width@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" @@ -3546,6 +3560,15 @@ cross-spawn@^7.0.0: shebang-command "^2.0.0" which "^2.0.1" +cross-spawn@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -3903,7 +3926,7 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== -deep-is@~0.1.3: +deep-is@^0.1.3, deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= @@ -4280,6 +4303,13 @@ enhanced-resolve@^4.1.0: memory-fs "^0.4.0" tapable "^1.0.0" +enquirer@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + entities@^1.1.1, entities@~1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" @@ -4611,26 +4641,31 @@ eslint-scope@^4.0.3: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-scope@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9" - integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw== +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== dependencies: - esrecurse "^4.1.0" + esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-utils@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab" - integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q== +eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== dependencies: - eslint-visitor-keys "^1.0.0" + eslint-visitor-keys "^1.1.0" eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== +eslint-visitor-keys@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + eslint@^2.7.0: version "2.13.1" resolved "https://registry.yarnpkg.com/eslint/-/eslint-2.13.1.tgz#e4cc8fa0f009fb829aaae23855a29360be1f6c11" @@ -4670,45 +4705,45 @@ eslint@^2.7.0: text-table "~0.2.0" user-home "^2.0.0" -eslint@^6.0.0: - version "6.5.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.5.1.tgz#828e4c469697d43bb586144be152198b91e96ed6" - integrity sha512-32h99BoLYStT1iq1v2P9uwpyznQ4M2jRiFB6acitKz52Gqn+vPaMDUTB1bYi1WN4Nquj2w+t+bimYUG83DC55A== +eslint@^7.0.0: + version "7.10.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.10.0.tgz#494edb3e4750fb791133ca379e786a8f648c72b9" + integrity sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA== dependencies: "@babel/code-frame" "^7.0.0" + "@eslint/eslintrc" "^0.1.3" ajv "^6.10.0" - chalk "^2.1.0" - cross-spawn "^6.0.5" + chalk "^4.0.0" + cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" - eslint-scope "^5.0.0" - eslint-utils "^1.4.2" - eslint-visitor-keys "^1.1.0" - espree "^6.1.1" - esquery "^1.0.1" + enquirer "^2.3.5" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^1.3.0" + espree "^7.3.0" + esquery "^1.2.0" esutils "^2.0.2" file-entry-cache "^5.0.1" functional-red-black-tree "^1.0.1" glob-parent "^5.0.0" - globals "^11.7.0" + globals "^12.1.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" - inquirer "^6.4.1" is-glob "^4.0.0" js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.3.0" - lodash "^4.17.14" + levn "^0.4.1" + lodash "^4.17.19" minimatch "^3.0.4" - mkdirp "^0.5.1" natural-compare "^1.4.0" - optionator "^0.8.2" + optionator "^0.9.1" progress "^2.0.0" - regexpp "^2.0.1" - semver "^6.1.2" - strip-ansi "^5.2.0" - strip-json-comments "^3.0.1" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" table "^5.2.3" text-table "^0.2.0" v8-compile-cache "^2.0.3" @@ -4721,26 +4756,26 @@ espree@^3.1.6: acorn "^5.5.0" acorn-jsx "^3.0.0" -espree@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz#7f80e5f7257fc47db450022d723e356daeb1e5de" - integrity sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ== +espree@^7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348" + integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw== dependencies: - acorn "^7.0.0" - acorn-jsx "^5.0.2" - eslint-visitor-keys "^1.1.0" + acorn "^7.4.0" + acorn-jsx "^5.2.0" + eslint-visitor-keys "^1.3.0" esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708" - integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA== +esquery@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" + integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== dependencies: - estraverse "^4.0.0" + estraverse "^5.1.0" esrecurse@^4.1.0: version "4.2.1" @@ -4749,11 +4784,23 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM= +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + esutils@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" @@ -4945,15 +4992,6 @@ extend@~3.0.2: resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== -external-editor@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - extglob@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" @@ -4993,7 +5031,7 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= -fast-levenshtein@~2.0.4: +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= @@ -5045,13 +5083,6 @@ figures@^1.3.5: escape-string-regexp "^1.0.5" object-assign "^4.1.0" -figures@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" - integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= - dependencies: - escape-string-regexp "^1.0.5" - file-entry-cache@^1.1.1: version "1.3.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-1.3.1.tgz#44c61ea607ae4be9c1402f41f44270cbfe334ff8" @@ -5485,10 +5516,12 @@ globals@^11.1.0: resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^11.7.0: - version "11.9.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249" - integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg== +globals@^12.1.0: + version "12.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" + integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== + dependencies: + type-fest "^0.8.1" globals@^9.2.0: version "9.18.0" @@ -5896,7 +5929,7 @@ human-signals@^1.1.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -5965,6 +5998,14 @@ import-fresh@^3.0.0: parent-module "^1.0.0" resolve-from "^4.0.0" +import-fresh@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" + integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + import-from@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1" @@ -6053,25 +6094,6 @@ inquirer@^0.12.0: strip-ansi "^3.0.0" through "^2.3.6" -inquirer@^6.4.1: - version "6.5.2" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" - integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== - dependencies: - ansi-escapes "^3.2.0" - chalk "^2.4.2" - cli-cursor "^2.1.0" - cli-width "^2.0.0" - external-editor "^3.0.3" - figures "^2.0.0" - lodash "^4.17.12" - mute-stream "0.0.7" - run-async "^2.2.0" - rxjs "^6.4.0" - string-width "^2.1.0" - strip-ansi "^5.1.0" - through "^2.3.6" - internal-ip@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907" @@ -6463,11 +6485,6 @@ is-potential-custom-element-name@^1.0.0: resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= -is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= - is-property@^1.0.0, is-property@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" @@ -7346,6 +7363,14 @@ levn@^0.3.0, levn@~0.3.0: prelude-ls "~1.1.2" type-check "~0.3.2" +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + lines-and-columns@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" @@ -7488,7 +7513,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.0.0, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.3.0, lodash@~4.17.12: +lodash@^4.0.0, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.3.0, lodash@~4.17.12: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -7503,6 +7528,11 @@ lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.5, lodash@^4.7.11 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== +lodash@^4.17.19: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== + loglevel@^1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.2.tgz#668c77948a03dbd22502a3513ace1f62a80cc372" @@ -7897,11 +7927,6 @@ mute-stream@0.0.5: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" integrity sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA= -mute-stream@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" - integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= - nan@^2.12.1: version "2.14.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" @@ -8375,13 +8400,6 @@ onetime@^1.0.0: resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= -onetime@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" - integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= - dependencies: - mimic-fn "^1.0.0" - onetime@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" @@ -8401,7 +8419,7 @@ opn@^5.5.0: dependencies: is-wsl "^1.1.0" -optionator@^0.8.1, optionator@^0.8.2: +optionator@^0.8.1: version "0.8.2" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q= @@ -8413,6 +8431,18 @@ optionator@^0.8.1, optionator@^0.8.2: type-check "~0.3.2" wordwrap "~1.0.0" +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + original@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f" @@ -8439,7 +8469,7 @@ os-locale@^3.0.0: lcid "^2.0.0" mem "^4.0.0" -os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: +os-tmpdir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= @@ -9203,6 +9233,11 @@ precond@0.2: resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac" integrity sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw= +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -10020,10 +10055,10 @@ regexp.prototype.flags@^1.3.0: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" -regexpp@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" - integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== +regexpp@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" + integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== regexpu-core@^4.1.3, regexpu-core@^4.2.0: version "4.4.0" @@ -10270,14 +10305,6 @@ restore-cursor@^1.0.1: exit-hook "^1.0.0" onetime "^1.0.0" -restore-cursor@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" - integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= - dependencies: - onetime "^2.0.0" - signal-exit "^3.0.2" - ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" @@ -10335,13 +10362,6 @@ run-async@^0.1.0: dependencies: once "^1.3.0" -run-async@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" - integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA= - dependencies: - is-promise "^2.1.0" - run-queue@^1.0.0, run-queue@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" @@ -10354,13 +10374,6 @@ rx-lite@^3.1.2: resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" integrity sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI= -rxjs@^6.4.0: - version "6.5.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a" - integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA== - dependencies: - tslib "^1.9.0" - safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -10510,7 +10523,7 @@ selfsigned@^1.10.4: resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== -semver@^6.0.0, semver@^6.1.2, semver@^6.3.0: +semver@^6.0.0, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -11006,7 +11019,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: +"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -11104,7 +11117,7 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.1.0, strip-ansi@^5.2.0: +strip-ansi@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== @@ -11138,10 +11151,10 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== -strip-json-comments@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" - integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== strip-json-comments@~1.0.1: version "1.0.4" @@ -11425,13 +11438,6 @@ tinycolor2@^1.4.1: resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8" integrity sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g= -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - tmpl@1.0.x: version "1.0.4" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" @@ -11562,6 +11568,13 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" @@ -12191,6 +12204,11 @@ wide-align@^1.1.0: dependencies: string-width "^1.0.2 || 2" +word-wrap@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + wordwrap@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" From bba40291e497bb5e1a16a5a638f4704e3d74890d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 6 Oct 2020 22:23:04 +0000 Subject: [PATCH 54/95] Update dependency sass-loader to v10 --- package.json | 2 +- yarn.lock | 84 ++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 59 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 1fddbce5d..6ecd21b15 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "reselect": "^4.0.0", "rimraf": "^3.0.0", "sass": "^1.20.3", - "sass-loader": "^8.0.0", + "sass-loader": "^10.0.0", "semver": "^7.3.2", "stringz": "^2.0.0", "substring-trie": "^1.0.2", diff --git a/yarn.lock b/yarn.lock index 8bd317eff..47176562f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1634,6 +1634,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339" integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA== +"@types/json-schema@^7.0.5": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" + integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== + "@types/json5@^0.0.29": version "0.0.29" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" @@ -2005,6 +2010,11 @@ ajv-keywords@^3.4.1: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== +ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + ajv@^4.7.0: version "4.11.8" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" @@ -2043,6 +2053,16 @@ ajv@^6.12.2: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.12.4: + version "6.12.5" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da" + integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + alphanum-sort@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -3180,15 +3200,6 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" @@ -7304,6 +7315,11 @@ kleur@^3.0.2: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.2.tgz#83c7ec858a41098b613d5998a7b653962b504f68" integrity sha512-3h7B2WRT5LNXOtQiAaWonilegHcPSf9nLVXlSTci8lu1dZUuui61+EsPEZqSVxY7rXYmB2DVKMQILxaO5WL61Q== +klona@^2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0" + integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA== + knot.js@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/knot.js/-/knot.js-1.1.5.tgz#28e72522f703f50fe98812fde224dd72728fef5d" @@ -7395,6 +7411,15 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3: emojis-list "^2.0.0" json5 "^1.0.1" +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -7964,6 +7989,11 @@ neo-async@^2.6.1: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c" integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw== +neo-async@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + next-tick@1, next-tick@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c" @@ -10413,16 +10443,16 @@ sass-lint@^1.13.1: path-is-absolute "^1.0.0" util "^0.10.3" -sass-loader@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.0.tgz#e7b07a3e357f965e6b03dd45b016b0a9746af797" - integrity sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w== +sass-loader@^10.0.0: + version "10.0.2" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.2.tgz#c7b73010848b264792dd45372eea0b87cba4401e" + integrity sha512-wV6NDUVB8/iEYMalV/+139+vl2LaRFlZGEd5/xmdcdzQcgmis+npyco6NsDTVOlNA3y2NV9Gcz+vHyFMIT+ffg== dependencies: - clone-deep "^4.0.1" - loader-utils "^1.2.3" - neo-async "^2.6.1" - schema-utils "^2.1.0" - semver "^6.3.0" + klona "^2.0.3" + loader-utils "^2.0.0" + neo-async "^2.6.2" + schema-utils "^2.7.1" + semver "^7.3.2" sass@^1.20.3: version "1.20.3" @@ -10477,7 +10507,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.0.0, schema-utils@^2.1.0: +schema-utils@^2.0.0: version "2.5.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz#8f254f618d402cc80257486213c8970edfd7c22f" integrity sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ== @@ -10485,6 +10515,15 @@ schema-utils@^2.0.0, schema-utils@^2.1.0: ajv "^6.10.2" ajv-keywords "^3.4.1" +schema-utils@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" + integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== + dependencies: + "@types/json-schema" "^7.0.5" + ajv "^6.12.4" + ajv-keywords "^3.5.2" + scroll-behavior@^0.9.1: version "0.9.9" resolved "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.9.tgz#ebfe0658455b82ad885b66195215416674dacce2" @@ -10625,13 +10664,6 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - shallow-equal@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/shallow-equal/-/shallow-equal-1.2.1.tgz#4c16abfa56043aa20d050324efa68940b0da79da" From cd4ac3337ba1cfd97b0ac4b2efe5cdaf2cdedf66 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 7 Oct 2020 00:22:20 +0000 Subject: [PATCH 55/95] Update dependency uuid to v8 --- package.json | 2 +- yarn.lock | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1fddbce5d..9bf2b5a28 100644 --- a/package.json +++ b/package.json @@ -135,7 +135,7 @@ "throng": "^4.0.0", "tiny-queue": "^0.2.1", "uglifyjs-webpack-plugin": "^2.2.0", - "uuid": "^3.1.0", + "uuid": "^8.0.0", "webpack": "^4.41.2", "webpack-assets-manifest": "^3.1.1", "webpack-bundle-analyzer": "^3.1.0", diff --git a/yarn.lock b/yarn.lock index 8bd317eff..10f449b6a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11823,7 +11823,7 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= -uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2: +uuid@^3.0.1, uuid@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== @@ -11833,6 +11833,11 @@ uuid@^7.0.3: resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== +uuid@^8.0.0: + version "8.3.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" + integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg== + v8-compile-cache@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c" From 7c54e93893ef098f14545a36f5df0fee35f99258 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 7 Oct 2020 13:02:54 -0500 Subject: [PATCH 56/95] Remove throng --- package.json | 1 - yarn.lock | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/package.json b/package.json index 9bf2b5a28..a717d85cd 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,6 @@ "semver": "^7.3.2", "stringz": "^2.0.0", "substring-trie": "^1.0.2", - "throng": "^4.0.0", "tiny-queue": "^0.2.1", "uglifyjs-webpack-plugin": "^2.2.0", "uuid": "^8.0.0", diff --git a/yarn.lock b/yarn.lock index 10f449b6a..fb66534a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7423,11 +7423,6 @@ lodash.capitalize@^4.1.0: resolved "https://registry.yarnpkg.com/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz#f826c9b4e2a8511d84e3aca29db05e1a4f3b72a9" integrity sha1-+CbJtOKoUR2E46yinbBeGk87cqk= -lodash.defaults@^4.0.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" - integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= - lodash.escape@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98" @@ -11368,13 +11363,6 @@ throat@^5.0.0: resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== -throng@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/throng/-/throng-4.0.0.tgz#983c6ba1993b58eae859998aa687ffe88df84c17" - integrity sha1-mDxroZk7WOroWZmKpof/6I34TBc= - dependencies: - lodash.defaults "^4.0.1" - through2@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" From 0bbdaa4191d28062128f5f0c60e299a885c89887 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 7 Oct 2020 13:08:36 -0500 Subject: [PATCH 57/95] eslint: trailing comma fixes, unused var --- app/soapbox/actions/accounts.js | 2 +- app/soapbox/actions/emoji_reacts.js | 2 +- .../timeline_queue_button_header-test.js | 6 +++--- app/soapbox/components/home_column_header.js | 2 +- .../intersection_observer_article.js | 2 +- app/soapbox/components/media_gallery.js | 2 +- app/soapbox/components/status_action_bar.js | 2 +- .../components/__tests__/captcha-test.js | 4 ++-- .../components/__tests__/login_form-test.js | 2 +- .../components/__tests__/login_page-test.js | 4 ++-- .../components/__tests__/otp_auth_form-test.js | 2 +- .../auth_login/components/login_page.js | 2 +- .../auth_login/components/otp_auth_form.js | 2 +- app/soapbox/features/blocks/index.js | 2 +- .../chats/components/chat_message_list.js | 2 +- .../features/chats/components/chat_panes.js | 2 +- app/soapbox/features/domain_blocks/index.js | 2 +- app/soapbox/features/edit_profile/index.js | 4 ++-- app/soapbox/features/favourites/index.js | 2 +- app/soapbox/features/follow_requests/index.js | 2 +- app/soapbox/features/followers/index.js | 2 +- app/soapbox/features/following/index.js | 2 +- .../features/forms/__tests__/forms-test.js | 18 +++++++++--------- app/soapbox/features/forms/index.js | 2 +- app/soapbox/features/getting_started/index.js | 4 ++-- app/soapbox/features/lists/index.js | 2 +- app/soapbox/features/mutes/index.js | 2 +- .../public_layout/components/header.js | 2 +- app/soapbox/features/reblogs/index.js | 2 +- app/soapbox/features/soapbox_config/index.js | 6 +++--- app/soapbox/features/status/components/card.js | 2 +- .../features/ui/components/funding_panel.js | 2 +- .../ui/components/profile_info_panel.js | 2 +- .../ui/components/profile_media_panel.js | 2 +- .../features/ui/components/promo_panel.js | 2 +- app/soapbox/features/ui/components/tabs_bar.js | 4 ++-- .../features/ui/components/trends_panel.js | 2 +- .../ui/components/who_to_follow_panel.js | 2 +- .../ui/containers/notifications_container.js | 2 +- app/soapbox/reducers/index.js | 2 +- app/soapbox/reducers/notifications.js | 2 +- app/soapbox/reducers/statuses.js | 4 ++-- app/soapbox/reducers/timelines.js | 6 +++--- app/soapbox/selectors/index.js | 4 ++-- .../service_worker/web_push_notifications.js | 2 +- app/soapbox/store/configureStore.js | 2 +- app/soapbox/test_helpers.js | 2 +- app/soapbox/utils/config_db.js | 2 +- app/soapbox/utils/emoji_reacts.js | 8 ++++---- webpack/development.js | 2 +- webpack/production.js | 17 ----------------- webpack/shared.js | 4 ++-- 52 files changed, 76 insertions(+), 93 deletions(-) diff --git a/app/soapbox/actions/accounts.js b/app/soapbox/actions/accounts.js index ec1d1cb6b..55e5926e4 100644 --- a/app/soapbox/actions/accounts.js +++ b/app/soapbox/actions/accounts.js @@ -111,7 +111,7 @@ export function fetchAccount(id) { dispatch, getState, db.transaction('accounts', 'read').objectStore('accounts').index('id'), - id + id, ).then(() => db.close(), error => { db.close(); throw error; diff --git a/app/soapbox/actions/emoji_reacts.js b/app/soapbox/actions/emoji_reacts.js index 9f36e8a21..7b041d4ee 100644 --- a/app/soapbox/actions/emoji_reacts.js +++ b/app/soapbox/actions/emoji_reacts.js @@ -29,7 +29,7 @@ export const simpleEmojiReact = (status, emoji) => { emojiReacts .filter(emojiReact => emojiReact.get('me') === true) .map(emojiReact => dispatch(unEmojiReact(status, emojiReact.get('name')))), - status.get('favourited') && dispatch(unfavourite(status)) + status.get('favourited') && dispatch(unfavourite(status)), ).then(() => { if (emoji === '👍') { dispatch(favourite(status)); diff --git a/app/soapbox/components/__tests__/timeline_queue_button_header-test.js b/app/soapbox/components/__tests__/timeline_queue_button_header-test.js index 4e2ace540..9f0125a46 100644 --- a/app/soapbox/components/__tests__/timeline_queue_button_header-test.js +++ b/app/soapbox/components/__tests__/timeline_queue_button_header-test.js @@ -15,7 +15,7 @@ describe('', () => { onClick={() => {}} // eslint-disable-line react/jsx-no-bind count={0} message={messages.queue} - /> + />, ).toJSON()).toMatchSnapshot(); expect(createComponent( @@ -24,7 +24,7 @@ describe('', () => { onClick={() => {}} // eslint-disable-line react/jsx-no-bind count={1} message={messages.queue} - /> + />, ).toJSON()).toMatchSnapshot(); expect(createComponent( @@ -33,7 +33,7 @@ describe('', () => { onClick={() => {}} // eslint-disable-line react/jsx-no-bind count={9999999} message={messages.queue} - /> + />, ).toJSON()).toMatchSnapshot(); }); }); diff --git a/app/soapbox/components/home_column_header.js b/app/soapbox/components/home_column_header.js index 80cccb808..21bc3d331 100644 --- a/app/soapbox/components/home_column_header.js +++ b/app/soapbox/components/home_column_header.js @@ -130,7 +130,7 @@ class ColumnHeader extends React.PureComponent { } > {list.get('title')} - ) + ), ); } diff --git a/app/soapbox/components/intersection_observer_article.js b/app/soapbox/components/intersection_observer_article.js index 04a64dccd..d21ea2565 100644 --- a/app/soapbox/components/intersection_observer_article.js +++ b/app/soapbox/components/intersection_observer_article.js @@ -44,7 +44,7 @@ export default class IntersectionObserverArticle extends React.Component { intersectionObserverWrapper.observe( id, this.node, - this.handleIntersection + this.handleIntersection, ); this.componentMounted = true; diff --git a/app/soapbox/components/media_gallery.js b/app/soapbox/components/media_gallery.js index 3eda57795..73f14318f 100644 --- a/app/soapbox/components/media_gallery.js +++ b/app/soapbox/components/media_gallery.js @@ -323,7 +323,7 @@ class MediaGallery extends React.PureComponent { let itemsDimensions = []; const ratios = Array(size).fill().map((_, i) => - media.getIn([i, 'meta', 'small', 'aspect']) + media.getIn([i, 'meta', 'small', 'aspect']), ); const [ar1, ar2, ar3, ar4] = ratios; diff --git a/app/soapbox/components/status_action_bar.js b/app/soapbox/components/status_action_bar.js index 1ee84ca00..4f4d97407 100644 --- a/app/soapbox/components/status_action_bar.js +++ b/app/soapbox/components/status_action_bar.js @@ -406,5 +406,5 @@ const mapDispatchToProps = (dispatch) => ({ }); export default injectIntl( - connect(mapStateToProps, mapDispatchToProps, null, { forwardRef: true } + connect(mapStateToProps, mapDispatchToProps, null, { forwardRef: true }, )(StatusActionBar)); diff --git a/app/soapbox/features/auth_login/components/__tests__/captcha-test.js b/app/soapbox/features/auth_login/components/__tests__/captcha-test.js index 332849be3..71117452a 100644 --- a/app/soapbox/features/auth_login/components/__tests__/captcha-test.js +++ b/app/soapbox/features/auth_login/components/__tests__/captcha-test.js @@ -7,7 +7,7 @@ import { Map as ImmutableMap } from 'immutable'; describe('', () => { it('renders null by default', () => { expect(createComponent( - + , ).toJSON()).toMatchSnapshot(); }); }); @@ -25,7 +25,7 @@ describe('', () => { {}} // eslint-disable-line react/jsx-no-bind - /> + />, ).toJSON()).toMatchSnapshot(); }); }); diff --git a/app/soapbox/features/auth_login/components/__tests__/login_form-test.js b/app/soapbox/features/auth_login/components/__tests__/login_form-test.js index c2be4b8a8..6626ef26e 100644 --- a/app/soapbox/features/auth_login/components/__tests__/login_form-test.js +++ b/app/soapbox/features/auth_login/components/__tests__/login_form-test.js @@ -5,7 +5,7 @@ import { createComponent } from 'soapbox/test_helpers'; describe('', () => { it('renders correctly', () => { expect(createComponent( - + , ).toJSON()).toMatchSnapshot(); }); }); diff --git a/app/soapbox/features/auth_login/components/__tests__/login_page-test.js b/app/soapbox/features/auth_login/components/__tests__/login_page-test.js index 27393c6c3..ee4298a52 100644 --- a/app/soapbox/features/auth_login/components/__tests__/login_page-test.js +++ b/app/soapbox/features/auth_login/components/__tests__/login_page-test.js @@ -13,13 +13,13 @@ describe('', () => { it('renders correctly on load', () => { expect(createComponent( - + , ).toJSON()).toMatchSnapshot(); const store = mockStore(ImmutableMap({ me: '1234' })); expect(createComponent( , - { store } + { store }, ).toJSON()).toMatchSnapshot(); }); diff --git a/app/soapbox/features/auth_login/components/__tests__/otp_auth_form-test.js b/app/soapbox/features/auth_login/components/__tests__/otp_auth_form-test.js index 799a5e819..335780280 100644 --- a/app/soapbox/features/auth_login/components/__tests__/otp_auth_form-test.js +++ b/app/soapbox/features/auth_login/components/__tests__/otp_auth_form-test.js @@ -12,7 +12,7 @@ describe('', () => { , - { store } + { store }, ).toJSON(); expect(wrapper).toEqual(expect.objectContaining({ diff --git a/app/soapbox/features/auth_login/components/login_page.js b/app/soapbox/features/auth_login/components/login_page.js index c660c467e..3e2cea0e1 100644 --- a/app/soapbox/features/auth_login/components/login_page.js +++ b/app/soapbox/features/auth_login/components/login_page.js @@ -28,7 +28,7 @@ class LoginPage extends ImmutablePureComponent { getFormData = (form) => { return Object.fromEntries( - Array.from(form).map(i => [i.name, i.value]) + Array.from(form).map(i => [i.name, i.value]), ); } diff --git a/app/soapbox/features/auth_login/components/otp_auth_form.js b/app/soapbox/features/auth_login/components/otp_auth_form.js index 49aa3c735..091d2a48f 100644 --- a/app/soapbox/features/auth_login/components/otp_auth_form.js +++ b/app/soapbox/features/auth_login/components/otp_auth_form.js @@ -29,7 +29,7 @@ class OtpAuthForm extends ImmutablePureComponent { getFormData = (form) => { return Object.fromEntries( - Array.from(form).map(i => [i.name, i.value]) + Array.from(form).map(i => [i.name, i.value]), ); } diff --git a/app/soapbox/features/blocks/index.js b/app/soapbox/features/blocks/index.js index 5b34287dd..a25c6337c 100644 --- a/app/soapbox/features/blocks/index.js +++ b/app/soapbox/features/blocks/index.js @@ -62,7 +62,7 @@ class Blocks extends ImmutablePureComponent { emptyMessage={emptyMessage} > {accountIds.map(id => - + , )} diff --git a/app/soapbox/features/chats/components/chat_message_list.js b/app/soapbox/features/chats/components/chat_message_list.js index af35f216d..c969566fe 100644 --- a/app/soapbox/features/chats/components/chat_message_list.js +++ b/app/soapbox/features/chats/components/chat_message_list.js @@ -87,7 +87,7 @@ class ChatMessageList extends ImmutablePureComponent { day: '2-digit', hour: '2-digit', minute: '2-digit', - } + }, ); }; diff --git a/app/soapbox/features/chats/components/chat_panes.js b/app/soapbox/features/chats/components/chat_panes.js index 6d5e82251..d16a02ee6 100644 --- a/app/soapbox/features/chats/components/chat_panes.js +++ b/app/soapbox/features/chats/components/chat_panes.js @@ -78,7 +78,7 @@ class ChatPanes extends ImmutablePureComponent {
{mainWindowPane} {panes.map((pane, i) => - + , )}
); diff --git a/app/soapbox/features/domain_blocks/index.js b/app/soapbox/features/domain_blocks/index.js index 9c1e313cc..96969f1f8 100644 --- a/app/soapbox/features/domain_blocks/index.js +++ b/app/soapbox/features/domain_blocks/index.js @@ -63,7 +63,7 @@ class Blocks extends ImmutablePureComponent { emptyMessage={emptyMessage} > {domains.map(domain => - + , )} diff --git a/app/soapbox/features/edit_profile/index.js b/app/soapbox/features/edit_profile/index.js index 75941885d..643c19c0f 100644 --- a/app/soapbox/features/edit_profile/index.js +++ b/app/soapbox/features/edit_profile/index.js @@ -40,7 +40,7 @@ const mapStateToProps = state => { // Forces fields to be maxFields size, filling empty values const normalizeFields = (fields, maxFields) => ( ImmutableList(fields).setSize(maxFields).map(field => - field ? field : ImmutableMap({ name: '', value: '' }) + field ? field : ImmutableMap({ name: '', value: '' }), ) ); @@ -91,7 +91,7 @@ class EditProfile extends ImmutablePureComponent { this.state.fields.forEach((f, i) => params = params .set(`fields_attributes[${i}][name]`, f.get('name')) - .set(`fields_attributes[${i}][value]`, f.get('value')) + .set(`fields_attributes[${i}][value]`, f.get('value')), ); return params; } diff --git a/app/soapbox/features/favourites/index.js b/app/soapbox/features/favourites/index.js index 851a4059a..1b91a0c55 100644 --- a/app/soapbox/features/favourites/index.js +++ b/app/soapbox/features/favourites/index.js @@ -56,7 +56,7 @@ class Favourites extends ImmutablePureComponent { emptyMessage={emptyMessage} > {accountIds.map(id => - + , )} diff --git a/app/soapbox/features/follow_requests/index.js b/app/soapbox/features/follow_requests/index.js index b0b5d54b8..f09624cec 100644 --- a/app/soapbox/features/follow_requests/index.js +++ b/app/soapbox/features/follow_requests/index.js @@ -62,7 +62,7 @@ class FollowRequests extends ImmutablePureComponent { emptyMessage={emptyMessage} > {accountIds.map(id => - + , )} diff --git a/app/soapbox/features/followers/index.js b/app/soapbox/features/followers/index.js index 5b7be99a5..ca0d6d2be 100644 --- a/app/soapbox/features/followers/index.js +++ b/app/soapbox/features/followers/index.js @@ -122,7 +122,7 @@ class Followers extends ImmutablePureComponent { emptyMessage={} > {accountIds.map(id => - + , )} diff --git a/app/soapbox/features/following/index.js b/app/soapbox/features/following/index.js index df2f55fb4..6a1d4c461 100644 --- a/app/soapbox/features/following/index.js +++ b/app/soapbox/features/following/index.js @@ -122,7 +122,7 @@ class Following extends ImmutablePureComponent { emptyMessage={} > {accountIds.map(id => - + , )} diff --git a/app/soapbox/features/forms/__tests__/forms-test.js b/app/soapbox/features/forms/__tests__/forms-test.js index ffb30b273..881f6f053 100644 --- a/app/soapbox/features/forms/__tests__/forms-test.js +++ b/app/soapbox/features/forms/__tests__/forms-test.js @@ -15,7 +15,7 @@ import { describe('', () => { it('renders correctly', () => { expect(renderer.create( - + , ).toJSON()).toMatchSnapshot(); }); }); @@ -23,7 +23,7 @@ describe('', () => { describe('', () => { it('renders correctly', () => { expect(renderer.create( - + , ).toJSON()).toMatchSnapshot(); }); }); @@ -31,7 +31,7 @@ describe('', () => { describe('', () => { it('renders correctly', () => { expect(renderer.create( - + , ).toJSON()).toMatchSnapshot(); }); }); @@ -39,7 +39,7 @@ describe('', () => { describe('', () => { it('renders correctly', () => { expect(renderer.create( - + , ).toJSON()).toMatchSnapshot(); }); }); @@ -47,7 +47,7 @@ describe('', () => { describe('', () => { it('renders correctly', () => { expect(renderer.create( - + , ).toJSON()).toMatchSnapshot(); }); }); @@ -55,7 +55,7 @@ describe('', () => { describe('', () => { it('renders correctly', () => { expect(renderer.create( - + , ).toJSON()).toMatchSnapshot(); }); }); @@ -63,7 +63,7 @@ describe('', () => { describe('', () => { it('renders correctly', () => { expect(renderer.create( - + , ).toJSON()).toMatchSnapshot(); }); }); @@ -71,7 +71,7 @@ describe('', () => { describe('', () => { it('renders correctly', () => { expect(renderer.create( - + , ).toJSON()).toMatchSnapshot(); }); }); @@ -79,7 +79,7 @@ describe('', () => { describe('', () => { it('renders correctly', () => { expect(renderer.create( - + , ).toJSON()).toMatchSnapshot(); }); }); diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js index 5c7951ddb..edd4b1ab0 100644 --- a/app/soapbox/features/forms/index.js +++ b/app/soapbox/features/forms/index.js @@ -171,7 +171,7 @@ export class RadioGroup extends ImmutablePureComponent { const { label, children, onChange } = this.props; const childrenWithProps = React.Children.map(children, child => - React.cloneElement(child, { onChange }) + React.cloneElement(child, { onChange }), ); return ( diff --git a/app/soapbox/features/getting_started/index.js b/app/soapbox/features/getting_started/index.js index 7f2c9c0c3..34b1cbc65 100644 --- a/app/soapbox/features/getting_started/index.js +++ b/app/soapbox/features/getting_started/index.js @@ -102,7 +102,7 @@ class GettingStarted extends ImmutablePureComponent { height += 34 + 48*2; navItems.push( - + , ); height += 34; @@ -111,7 +111,7 @@ class GettingStarted extends ImmutablePureComponent { navItems.push( , , - + , ); height += 48*3; diff --git a/app/soapbox/features/lists/index.js b/app/soapbox/features/lists/index.js index 16166047f..f5dbfcf8e 100644 --- a/app/soapbox/features/lists/index.js +++ b/app/soapbox/features/lists/index.js @@ -71,7 +71,7 @@ class Lists extends ImmutablePureComponent { emptyMessage={emptyMessage} > {lists.map(list => - + , )} diff --git a/app/soapbox/features/mutes/index.js b/app/soapbox/features/mutes/index.js index abcfe2ea7..540e9f54f 100644 --- a/app/soapbox/features/mutes/index.js +++ b/app/soapbox/features/mutes/index.js @@ -62,7 +62,7 @@ class Mutes extends ImmutablePureComponent { emptyMessage={emptyMessage} > {accountIds.map(id => - + , )} diff --git a/app/soapbox/features/public_layout/components/header.js b/app/soapbox/features/public_layout/components/header.js index f80c483e7..453be4b1d 100644 --- a/app/soapbox/features/public_layout/components/header.js +++ b/app/soapbox/features/public_layout/components/header.js @@ -44,7 +44,7 @@ class Header extends ImmutablePureComponent { getFormData = (form) => { return Object.fromEntries( - Array.from(form).map(i => [i.name, i.value]) + Array.from(form).map(i => [i.name, i.value]), ); } diff --git a/app/soapbox/features/reblogs/index.js b/app/soapbox/features/reblogs/index.js index 67d36ad24..bf60a10c2 100644 --- a/app/soapbox/features/reblogs/index.js +++ b/app/soapbox/features/reblogs/index.js @@ -77,7 +77,7 @@ class Reblogs extends ImmutablePureComponent { emptyMessage={emptyMessage} > {accountIds.map(id => - + , )} diff --git a/app/soapbox/features/soapbox_config/index.js b/app/soapbox/features/soapbox_config/index.js index 6c5e08410..ded6ef239 100644 --- a/app/soapbox/features/soapbox_config/index.js +++ b/app/soapbox/features/soapbox_config/index.js @@ -140,19 +140,19 @@ class SoapboxConfig extends ImmutablePureComponent { path, (e) => template .merge(field) - .set(key, e.target.value) + .set(key, e.target.value), ); }; handlePromoItemChange = (index, key, field) => { return this.handleItemChange( - ['promoPanel', 'items', index], key, field, templates.promoPanelItem + ['promoPanel', 'items', index], key, field, templates.promoPanelItem, ); }; handleHomeFooterItemChange = (index, key, field) => { return this.handleItemChange( - ['navlinks', 'homeFooter', index], key, field, templates.footerItem + ['navlinks', 'homeFooter', index], key, field, templates.footerItem, ); }; diff --git a/app/soapbox/features/status/components/card.js b/app/soapbox/features/status/components/card.js index f1b5495c0..92ffa99fc 100644 --- a/app/soapbox/features/status/components/card.js +++ b/app/soapbox/features/status/components/card.js @@ -98,7 +98,7 @@ export default class Card extends React.PureComponent { }, }, ]), - 0 + 0, ); }; diff --git a/app/soapbox/features/ui/components/funding_panel.js b/app/soapbox/features/ui/components/funding_panel.js index 6d4084784..5b0b73e8b 100644 --- a/app/soapbox/features/ui/components/funding_panel.js +++ b/app/soapbox/features/ui/components/funding_panel.js @@ -71,5 +71,5 @@ const mapStateToProps = state => { export default injectIntl( connect(mapStateToProps, null, null, { forwardRef: true, - } + }, )(FundingPanel)); diff --git a/app/soapbox/features/ui/components/profile_info_panel.js b/app/soapbox/features/ui/components/profile_info_panel.js index 25034b732..735a4145d 100644 --- a/app/soapbox/features/ui/components/profile_info_panel.js +++ b/app/soapbox/features/ui/components/profile_info_panel.js @@ -150,5 +150,5 @@ const mapStateToProps = (state, { account }) => { export default injectIntl( connect(mapStateToProps, null, null, { forwardRef: true, - } + }, )(ProfileInfoPanel)); diff --git a/app/soapbox/features/ui/components/profile_media_panel.js b/app/soapbox/features/ui/components/profile_media_panel.js index 2927c1a63..d0a861f1d 100644 --- a/app/soapbox/features/ui/components/profile_media_panel.js +++ b/app/soapbox/features/ui/components/profile_media_panel.js @@ -81,5 +81,5 @@ const mapStateToProps = (state, { account }) => ({ export default injectIntl( connect(mapStateToProps, null, null, { forwardRef: true, - } + }, )(ProfileMediaPanel)); diff --git a/app/soapbox/features/ui/components/promo_panel.js b/app/soapbox/features/ui/components/promo_panel.js index b91380bbc..41227dadc 100644 --- a/app/soapbox/features/ui/components/promo_panel.js +++ b/app/soapbox/features/ui/components/promo_panel.js @@ -28,7 +28,7 @@ class PromoPanel extends React.PureComponent { {item.get('text')} -
) +
), )}
diff --git a/app/soapbox/features/ui/components/tabs_bar.js b/app/soapbox/features/ui/components/tabs_bar.js index 46c314500..a87bf7429 100644 --- a/app/soapbox/features/ui/components/tabs_bar.js +++ b/app/soapbox/features/ui/components/tabs_bar.js @@ -94,7 +94,7 @@ class TabsBar extends React.PureComponent { - + , ); return links.map((link) => React.cloneElement(link, { @@ -172,5 +172,5 @@ const mapDispatchToProps = (dispatch) => ({ }); export default injectIntl( - connect(mapStateToProps, mapDispatchToProps, null, { forwardRef: true } + connect(mapStateToProps, mapDispatchToProps, null, { forwardRef: true }, )(TabsBar)); diff --git a/app/soapbox/features/ui/components/trends_panel.js b/app/soapbox/features/ui/components/trends_panel.js index f47390a00..7e15f39f5 100644 --- a/app/soapbox/features/ui/components/trends_panel.js +++ b/app/soapbox/features/ui/components/trends_panel.js @@ -66,5 +66,5 @@ const mapDispatchToProps = dispatch => { export default injectIntl( connect(mapStateToProps, mapDispatchToProps, null, { forwardRef: true, - } + }, )(TrendsPanel)); diff --git a/app/soapbox/features/ui/components/who_to_follow_panel.js b/app/soapbox/features/ui/components/who_to_follow_panel.js index 1ca18a6a3..512f4db63 100644 --- a/app/soapbox/features/ui/components/who_to_follow_panel.js +++ b/app/soapbox/features/ui/components/who_to_follow_panel.js @@ -74,5 +74,5 @@ const mapDispatchToProps = dispatch => { export default injectIntl( connect(mapStateToProps, mapDispatchToProps, null, { forwardRef: true, - } + }, )(WhoToFollowPanel)); diff --git a/app/soapbox/features/ui/containers/notifications_container.js b/app/soapbox/features/ui/containers/notifications_container.js index 0bb26ecf9..79488b1af 100644 --- a/app/soapbox/features/ui/containers/notifications_container.js +++ b/app/soapbox/features/ui/containers/notifications_container.js @@ -8,7 +8,7 @@ const defaultBarStyleFactory = (index, style, notification) => { return Object.assign( {}, style, - { bottom: `${14 + index * 12 + index * 42}px` } + { bottom: `${14 + index * 12 + index * 42}px` }, ); }; diff --git a/app/soapbox/reducers/index.js b/app/soapbox/reducers/index.js index 5ec2b581c..00db40b1e 100644 --- a/app/soapbox/reducers/index.js +++ b/app/soapbox/reducers/index.js @@ -109,7 +109,7 @@ const logOut = (state = ImmutableMap()) => { whitelist.reduce((acc, curr) => { acc[curr] = state.get(curr); return acc; - }, {}) + }, {}), ); }; diff --git a/app/soapbox/reducers/notifications.js b/app/soapbox/reducers/notifications.js index 3d0d14dfb..68cc90c29 100644 --- a/app/soapbox/reducers/notifications.js +++ b/app/soapbox/reducers/notifications.js @@ -70,7 +70,7 @@ const processRawNotifications = notifications => ( ImmutableOrderedMap( notifications .filter(isValid) - .map(n => [n.id, notificationToMap(n)]) + .map(n => [n.id, notificationToMap(n)]), )); const expandNormalizedNotifications = (state, notifications, next) => { diff --git a/app/soapbox/reducers/statuses.js b/app/soapbox/reducers/statuses.js index b7f09ef22..202a36d77 100644 --- a/app/soapbox/reducers/statuses.js +++ b/app/soapbox/reducers/statuses.js @@ -55,13 +55,13 @@ export default function statuses(state = initialState, action) { return state .updateIn( [action.status.get('id'), 'pleroma', 'emoji_reactions'], - emojiReacts => simulateEmojiReact(emojiReacts, action.emoji) + emojiReacts => simulateEmojiReact(emojiReacts, action.emoji), ); case UNEMOJI_REACT_REQUEST: return state .updateIn( [action.status.get('id'), 'pleroma', 'emoji_reactions'], - emojiReacts => simulateUnEmojiReact(emojiReacts, action.emoji) + emojiReacts => simulateUnEmojiReact(emojiReacts, action.emoji), ); case FAVOURITE_FAIL: return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'favourited'], false); diff --git a/app/soapbox/reducers/timelines.js b/app/soapbox/reducers/timelines.js index c86376406..013af81b4 100644 --- a/app/soapbox/reducers/timelines.js +++ b/app/soapbox/reducers/timelines.js @@ -58,7 +58,7 @@ const expandNormalizedTimeline = (state, timeline, statuses, next, isPartial, is return oldIds.take(firstIndex + 1).concat( isPartial && oldIds.get(firstIndex) !== null ? newIds.unshift(null) : newIds, - oldIds.skip(lastIndex) + oldIds.skip(lastIndex), ); }); } @@ -149,7 +149,7 @@ const updateTop = (state, timeline, top) => { const filterTimeline = (timeline, state, relationship, statuses) => state.updateIn([timeline, 'items'], ImmutableList(), list => list.filterNot(statusId => - statuses.getIn([statusId, 'account']) === relationship.id + statuses.getIn([statusId, 'account']) === relationship.id, )); const removeStatusFromGroup = (state, groupId, statusId) => { @@ -190,7 +190,7 @@ export default function timelines(state = initialState, action) { return state.update( action.timeline, initialTimeline, - map => map.set('online', false).update('items', items => items.first() ? items.unshift(null) : items) + map => map.set('online', false).update('items', items => items.first() ? items.unshift(null) : items), ); case GROUP_REMOVE_STATUS_SUCCESS: return removeStatusFromGroup(state, action.groupId, action.id); diff --git a/app/soapbox/selectors/index.js b/app/soapbox/selectors/index.js index 30d3e971f..89d20b209 100644 --- a/app/soapbox/selectors/index.js +++ b/app/soapbox/selectors/index.js @@ -110,7 +110,7 @@ export const makeGetStatus = () => { map.set('account', accountBase); map.set('filtered', filtered); }); - } + }, ); }; @@ -172,6 +172,6 @@ export const makeGetChat = () => { map.set('account', account); map.set('last_message', lastMessage); }); - } + }, ); }; diff --git a/app/soapbox/service_worker/web_push_notifications.js b/app/soapbox/service_worker/web_push_notifications.js index 220f93d09..00e948251 100644 --- a/app/soapbox/service_worker/web_push_notifications.js +++ b/app/soapbox/service_worker/web_push_notifications.js @@ -118,7 +118,7 @@ const handlePush = (event) => { badge: '/badge.png', data: { access_token, preferred_locale, url: '/notifications' }, }); - }) + }), ); }; diff --git a/app/soapbox/store/configureStore.js b/app/soapbox/store/configureStore.js index 7e7472841..e18af842f 100644 --- a/app/soapbox/store/configureStore.js +++ b/app/soapbox/store/configureStore.js @@ -10,6 +10,6 @@ export default function configureStore() { thunk, loadingBarMiddleware({ promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'] }), errorsMiddleware(), - soundsMiddleware() + soundsMiddleware(), ), window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : f => f)); }; diff --git a/app/soapbox/test_helpers.js b/app/soapbox/test_helpers.js index 7f7052ae3..544650141 100644 --- a/app/soapbox/test_helpers.js +++ b/app/soapbox/test_helpers.js @@ -28,6 +28,6 @@ export const createComponent = (children, props = {}) => { {children} - + , ); }; diff --git a/app/soapbox/utils/config_db.js b/app/soapbox/utils/config_db.js index c4661ad00..8a1e78a50 100644 --- a/app/soapbox/utils/config_db.js +++ b/app/soapbox/utils/config_db.js @@ -1,7 +1,7 @@ export const ConfigDB = { find: (configs, group, key) => { return configs.find(config => - config.isSuperset({ group, key }) + config.isSuperset({ group, key }), ); }, }; diff --git a/app/soapbox/utils/emoji_reacts.js b/app/soapbox/utils/emoji_reacts.js index 39c194101..03b80a39a 100644 --- a/app/soapbox/utils/emoji_reacts.js +++ b/app/soapbox/utils/emoji_reacts.js @@ -39,8 +39,8 @@ export const mergeEmojiFavourites = (emojiReacts, favouritesCount, favourited) = const hasMultiReactions = (emojiReacts, account) => ( emojiReacts.filter( e => e.get('accounts').filter( - a => a.get('id') === account.get('id') - ).count() > 0 + a => a.get('id') === account.get('id'), + ).count() > 0, ).count() > 1 ); @@ -72,14 +72,14 @@ export const filterEmoji = (emojiReacts, allowedEmoji=ALLOWED_EMOJI) => ( export const reduceEmoji = (emojiReacts, favouritesCount, favourited, allowedEmoji=ALLOWED_EMOJI) => ( filterEmoji(sortEmoji(mergeEmoji(mergeEmojiFavourites( - emojiReacts, favouritesCount, favourited + emojiReacts, favouritesCount, favourited, ))), allowedEmoji)); export const getReactForStatus = status => { return reduceEmoji( status.getIn(['pleroma', 'emoji_reactions'], ImmutableList()), status.get('favourites_count'), - status.get('favourited') + status.get('favourited'), ).filter(e => e.get('me') === true) .getIn([0, 'name']); }; diff --git a/webpack/development.js b/webpack/development.js index 52a47eaa1..bb59c6a83 100644 --- a/webpack/development.js +++ b/webpack/development.js @@ -89,7 +89,7 @@ module.exports = merge(sharedConfig, { watchOptions: Object.assign( {}, settings.dev_server.watch_options, - watchOptions + watchOptions, ), serveIndex: true, proxy: makeProxyConfig(), diff --git a/webpack/production.js b/webpack/production.js index 9ed66b400..b592c36ce 100644 --- a/webpack/production.js +++ b/webpack/production.js @@ -1,7 +1,6 @@ // Note: You must restart bin/webpack-dev-server for changes to take effect console.log('Running in production mode'); // eslint-disable-line no-console -const { URL } = require('url'); const merge = require('webpack-merge'); const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer'); const OfflinePlugin = require('offline-plugin'); @@ -10,22 +9,6 @@ const CompressionPlugin = require('compression-webpack-plugin'); const { output } = require('./configuration'); const sharedConfig = require('./shared'); -// eslint-disable-next-line no-unused-vars -let attachmentHost; - -if (process.env.S3_ENABLED === 'true') { - if (process.env.S3_ALIAS_HOST || process.env.S3_CLOUDFRONT_HOST) { - attachmentHost = process.env.S3_ALIAS_HOST || process.env.S3_CLOUDFRONT_HOST; - } else { - attachmentHost = process.env.S3_HOSTNAME || `s3-${process.env.S3_REGION || 'us-east-1'}.amazonaws.com`; - } -} else if (process.env.SWIFT_ENABLED === 'true') { - const { host } = new URL(process.env.SWIFT_OBJECT_URL); - attachmentHost = host; -} else { - attachmentHost = null; -} - module.exports = merge(sharedConfig, { mode: 'production', devtool: 'source-map', diff --git a/webpack/shared.js b/webpack/shared.js index 7f6da74e9..f59e28c2b 100644 --- a/webpack/shared.js +++ b/webpack/shared.js @@ -12,7 +12,7 @@ const rules = require('./rules'); module.exports = { entry: Object.assign( { application: resolve('app/application.js') }, - { styles: resolve(join(settings.source_path, 'styles/application.scss')) } + { styles: resolve(join(settings.source_path, 'styles/application.scss')) }, ), output: { @@ -54,7 +54,7 @@ module.exports = { // temporary fix for https://github.com/ReactTraining/react-router/issues/5576 // to reduce bundle size resource.request = resource.request.replace(/^history/, 'history/es'); - } + }, ), new MiniCssExtractPlugin({ filename: 'css/[name]-[contenthash:8].css', From 653c2617f4da1d8c0f1a8bb057ef90f650dd6dc0 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 7 Oct 2020 13:14:10 -0500 Subject: [PATCH 58/95] Remove cross-env --- package.json | 1 - yarn.lock | 7 ------- 2 files changed, 8 deletions(-) diff --git a/package.json b/package.json index 9bf2b5a28..699e75136 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,6 @@ "blurhash": "^1.0.0", "classnames": "^2.2.5", "compression-webpack-plugin": "^3.0.0", - "cross-env": "^6.0.0", "css-loader": "^3.0.0", "cssnano": "^4.1.10", "detect-passive-events": "^1.0.2", diff --git a/yarn.lock b/yarn.lock index 10f449b6a..ddf558389 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3519,13 +3519,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -cross-env@^6.0.0: - version "6.0.3" - resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941" - integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag== - dependencies: - cross-spawn "^7.0.0" - cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" From 376655e6b2f0c42bd88fa393604c3efc5f8897f7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 7 Oct 2020 18:19:21 +0000 Subject: [PATCH 59/95] Update dependency mini-css-extract-plugin to ^0.12.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a717d85cd..1c7a8c0c9 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "lodash": "^4.7.11", "mark-loader": "^0.1.6", "marky": "^1.2.1", - "mini-css-extract-plugin": "^0.11.0", + "mini-css-extract-plugin": "^0.12.0", "npmlog": "^4.1.2", "object-assign": "^4.1.1", "object-fit-images": "^3.2.3", diff --git a/yarn.lock b/yarn.lock index fb66534a7..49502546d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7744,10 +7744,10 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mini-css-extract-plugin@^0.11.0: - version "0.11.3" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.3.tgz#15b0910a7f32e62ffde4a7430cfefbd700724ea6" - integrity sha512-n9BA8LonkOkW1/zn+IbLPQmovsL0wMb9yx75fMJQZf2X1Zoec9yTZtyMePcyu19wPkmFbzZZA6fLTotpFhQsOA== +mini-css-extract-plugin@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.12.0.tgz#ddeb74fd6304ca9f99c1db74acc7d5b507705454" + integrity sha512-z6PQCe9rd1XUwZ8gMaEVwwRyZlrYy8Ba1gRjFP5HcV51HkXX+XlwZ+a1iAYTjSYwgNBXoNR7mhx79mDpOn5fdw== dependencies: loader-utils "^1.1.0" normalize-url "1.9.1" From 3144ba6d83bb0290cfb91033ab36d374646027aa Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 7 Oct 2020 13:25:52 -0500 Subject: [PATCH 60/95] AutosuggestTextarea: inputRef --> ref For upgrade to react-textarea-autosize v8 --- app/soapbox/components/autosuggest_textarea.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/soapbox/components/autosuggest_textarea.js b/app/soapbox/components/autosuggest_textarea.js index baaf3e8b0..ae44d3bfa 100644 --- a/app/soapbox/components/autosuggest_textarea.js +++ b/app/soapbox/components/autosuggest_textarea.js @@ -228,7 +228,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent { {placeholder}