Summary: Bumps [prettier](https://github.com/prettier/prettier) from 2.2.1 to 2.3.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/prettier/prettier/releases">prettier's releases</a>.</em></p> <blockquote> <h2>2.3.0</h2> <p><a href="https://github.com/prettier/prettier/compare/2.2.1...2.3.0">diff</a></p> <p>{emoji:1f517} <a href="https://prettier.io/blog/2021/05/09/2.3.0.html">Release Notes</a></p> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/prettier/prettier/blob/main/CHANGELOG.md">prettier's changelog</a>.</em></p> <blockquote> <h1>2.3.0</h1> <p><a href="https://github.com/prettier/prettier/compare/2.2.1...2.3.0">diff</a></p> <p>{emoji:1f517} <a href="https://prettier.io/blog/2021/05/09/2.3.0.html">Release Notes</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="2afc3b9ae6"><code>2afc3b9</code></a> Release 2.3.0</li> <li><a href="7cfa9aa89b"><code>7cfa9aa</code></a> Fix pre-commit hook setup command (<a href="https://github-redirect.dependabot.com/prettier/prettier/issues/10710">#10710</a>)</li> <li><a href="c8c02b4753"><code>c8c02b4</code></a> Build(deps-dev): Bump concurrently from 6.0.2 to 6.1.0 in /website (<a href="https://github-redirect.dependabot.com/prettier/prettier/issues/10834">#10834</a>)</li> <li><a href="6506e0f50e"><code>6506e0f</code></a> Build(deps-dev): Bump webpack-cli from 4.6.0 to 4.7.0 in /website (<a href="https://github-redirect.dependabot.com/prettier/prettier/issues/10836">#10836</a>)</li> <li><a href="69fae9c291"><code>69fae9c</code></a> Build(deps): Bump flow-parser from 0.150.0 to 0.150.1 (<a href="https://github-redirect.dependabot.com/prettier/prettier/issues/10839">#10839</a>)</li> <li><a href="164a6e2351"><code>164a6e2</code></a> Switch CLI to async (<a href="https://github-redirect.dependabot.com/prettier/prettier/issues/10804">#10804</a>)</li> <li><a href="d3e7e2f634"><code>d3e7e2f</code></a> Build(deps): Bump codecov/codecov-action from v1.4.1 to v1.5.0 (<a href="https://github-redirect.dependabot.com/prettier/prettier/issues/10833">#10833</a>)</li> <li><a href="9e09845da0"><code>9e09845</code></a> Build(deps): Bump <code>@angular/compiler</code> from 11.2.12 to 11.2.13 (<a href="https://github-redirect.dependabot.com/prettier/prettier/issues/10838">#10838</a>)</li> <li><a href="1bfab3d045"><code>1bfab3d</code></a> Build(deps-dev): Bump eslint from 7.25.0 to 7.26.0 (<a href="https://github-redirect.dependabot.com/prettier/prettier/issues/10840">#10840</a>)</li> <li><a href="387fce4ed8"><code>387fce4</code></a> Minor formatting tweaks (<a href="https://github-redirect.dependabot.com/prettier/prettier/issues/10807">#10807</a>)</li> <li>Additional commits viewable in <a href="https://github.com/prettier/prettier/compare/2.2.1...2.3.0">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `dependabot rebase` will rebase this PR - `dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `dependabot merge` will merge this PR after your CI passes on it - `dependabot squash and merge` will squash and merge this PR after your CI passes on it - `dependabot cancel merge` will cancel a previously requested merge and block automerging - `dependabot reopen` will reopen this PR if it is closed - `dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Pull Request resolved: https://github.com/facebook/flipper/pull/2300 Reviewed By: passy Differential Revision: D28323849 Pulled By: cekkaewnumchai fbshipit-source-id: 1842877ccc9a9587af7f0d9ff9432c2075c8ee22
201 lines
6.6 KiB
TypeScript
201 lines
6.6 KiB
TypeScript
/**
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*
|
|
* @format
|
|
*/
|
|
|
|
import {Store} from '../reducers/index';
|
|
import {Logger} from '../fb-interfaces/Logger';
|
|
import {PluginNotification} from '../reducers/notifications';
|
|
import {PluginDefinition} from '../plugin';
|
|
import {ipcRenderer, IpcRendererEvent} from 'electron';
|
|
import {
|
|
setActiveNotifications,
|
|
updatePluginBlocklist,
|
|
updateCategoryBlocklist,
|
|
} from '../reducers/notifications';
|
|
import {textContent} from '../utils/index';
|
|
import {deconstructPluginKey} from '../utils/clientUtils';
|
|
import {getPluginTitle, isSandyPlugin} from '../utils/pluginUtils';
|
|
import {sideEffect} from '../utils/sideEffect';
|
|
import {openNotification} from '../sandy-chrome/notification/Notification';
|
|
|
|
type NotificationEvents = 'show' | 'click' | 'close' | 'reply' | 'action';
|
|
const NOTIFICATION_THROTTLE = 5 * 1000; // in milliseconds
|
|
|
|
export default (store: Store, logger: Logger) => {
|
|
const knownNotifications: Set<string> = new Set();
|
|
const knownPluginStates: Map<string, Object> = new Map();
|
|
const lastNotificationTime: Map<string, number> = new Map();
|
|
|
|
ipcRenderer.on(
|
|
'notificationEvent',
|
|
(
|
|
_event: IpcRendererEvent,
|
|
eventName: NotificationEvents,
|
|
pluginNotification: PluginNotification,
|
|
arg: null | string | number,
|
|
) => {
|
|
if (eventName === 'click' || (eventName === 'action' && arg === 0)) {
|
|
openNotification(store, pluginNotification);
|
|
} else if (eventName === 'action') {
|
|
if (arg === 1 && pluginNotification.notification.category) {
|
|
// Hide similar (category)
|
|
logger.track(
|
|
'usage',
|
|
'notification-hide-category',
|
|
pluginNotification,
|
|
);
|
|
|
|
const {category} = pluginNotification.notification;
|
|
const {blocklistedCategories} = store.getState().notifications;
|
|
if (category && blocklistedCategories.indexOf(category) === -1) {
|
|
store.dispatch(
|
|
updateCategoryBlocklist([...blocklistedCategories, category]),
|
|
);
|
|
}
|
|
} else if (arg === 2) {
|
|
// Hide plugin
|
|
logger.track('usage', 'notification-hide-plugin', pluginNotification);
|
|
|
|
const {blocklistedPlugins} = store.getState().notifications;
|
|
if (blocklistedPlugins.indexOf(pluginNotification.pluginId) === -1) {
|
|
store.dispatch(
|
|
updatePluginBlocklist([
|
|
...blocklistedPlugins,
|
|
pluginNotification.pluginId,
|
|
]),
|
|
);
|
|
}
|
|
}
|
|
}
|
|
},
|
|
);
|
|
|
|
sideEffect(
|
|
store,
|
|
{name: 'notifications', throttleMs: 500},
|
|
({notifications, pluginStates, plugins}) => ({
|
|
notifications,
|
|
pluginStates,
|
|
devicePlugins: plugins.devicePlugins,
|
|
clientPlugins: plugins.clientPlugins,
|
|
}),
|
|
({notifications, pluginStates, devicePlugins, clientPlugins}, store) => {
|
|
function getPlugin(name: string) {
|
|
return devicePlugins.get(name) ?? clientPlugins.get(name);
|
|
}
|
|
|
|
Object.keys(pluginStates).forEach((key) => {
|
|
if (knownPluginStates.get(key) !== pluginStates[key]) {
|
|
knownPluginStates.set(key, pluginStates[key]);
|
|
const plugin = deconstructPluginKey(key);
|
|
const pluginName = plugin.pluginName;
|
|
const client = plugin.client;
|
|
|
|
if (!pluginName) {
|
|
return;
|
|
}
|
|
|
|
const persistingPlugin: undefined | PluginDefinition =
|
|
getPlugin(pluginName);
|
|
if (
|
|
persistingPlugin &&
|
|
!isSandyPlugin(persistingPlugin) &&
|
|
persistingPlugin.getActiveNotifications
|
|
) {
|
|
try {
|
|
const notifications = persistingPlugin.getActiveNotifications(
|
|
pluginStates[key],
|
|
);
|
|
store.dispatch(
|
|
setActiveNotifications({
|
|
notifications,
|
|
client,
|
|
pluginId: pluginName,
|
|
}),
|
|
);
|
|
} catch (e) {
|
|
console.error(
|
|
'Failed to compute notifications for plugin ' + pluginName,
|
|
e,
|
|
);
|
|
}
|
|
}
|
|
}
|
|
});
|
|
|
|
const {activeNotifications, blocklistedPlugins, blocklistedCategories} =
|
|
notifications;
|
|
|
|
activeNotifications
|
|
.map((n) => ({
|
|
...n,
|
|
notification: {
|
|
...n.notification,
|
|
message: textContent(n.notification.message),
|
|
},
|
|
}))
|
|
.forEach((n: PluginNotification) => {
|
|
if (
|
|
store.getState().connections.selectedPlugin !== 'notifications' &&
|
|
!knownNotifications.has(n.notification.id) &&
|
|
blocklistedPlugins.indexOf(n.pluginId) === -1 &&
|
|
(!n.notification.category ||
|
|
blocklistedCategories.indexOf(n.notification.category) === -1)
|
|
) {
|
|
const prevNotificationTime: number =
|
|
lastNotificationTime.get(n.pluginId) || 0;
|
|
lastNotificationTime.set(n.pluginId, new Date().getTime());
|
|
knownNotifications.add(n.notification.id);
|
|
|
|
if (
|
|
new Date().getTime() - prevNotificationTime <
|
|
NOTIFICATION_THROTTLE
|
|
) {
|
|
// Don't send a notification if the plugin has sent a notification
|
|
// within the NOTIFICATION_THROTTLE.
|
|
return;
|
|
}
|
|
const plugin = getPlugin(n.pluginId);
|
|
ipcRenderer.send('sendNotification', {
|
|
payload: {
|
|
title: n.notification.title,
|
|
body: n.notification.message,
|
|
actions: [
|
|
{
|
|
type: 'button',
|
|
text: 'Show',
|
|
},
|
|
{
|
|
type: 'button',
|
|
text: 'Hide similar',
|
|
},
|
|
{
|
|
type: 'button',
|
|
text: `Hide all ${
|
|
plugin != null ? getPluginTitle(plugin) : ''
|
|
}`,
|
|
},
|
|
],
|
|
closeButtonText: 'Hide',
|
|
},
|
|
closeAfter: 10000,
|
|
pluginNotification: n,
|
|
});
|
|
logger.track('usage', 'native-notification', {
|
|
...n.notification,
|
|
message:
|
|
typeof n.notification.message === 'string'
|
|
? n.notification.message
|
|
: '<ReactNode>',
|
|
});
|
|
}
|
|
});
|
|
},
|
|
);
|
|
};
|