diff --git a/src/chrome/AutoUpdateVersion.js b/src/chrome/AutoUpdateVersion.js index 2cc0bc23b..be94d28f8 100644 --- a/src/chrome/AutoUpdateVersion.js +++ b/src/chrome/AutoUpdateVersion.js @@ -102,7 +102,7 @@ export default class AutoUpdateVersion extends Component<{}, State> { diff --git a/src/chrome/PluginManager.js b/src/chrome/PluginManager.js index dcbb65b7b..186e46ab6 100644 --- a/src/chrome/PluginManager.js +++ b/src/chrome/PluginManager.js @@ -23,7 +23,7 @@ const {spawn} = require('child_process'); const path = require('path'); const {app, shell} = require('electron').remote; -const SONAR_PLUGIN_PATH = path.join(app.getPath('home'), '.flipper'); +const FLIPPER_PLUGIN_PATH = path.join(app.getPath('home'), '.flipper'); const DYNAMIC_PLUGINS = JSON.parse(window.process.env.PLUGINS || '[]'); type NPMModule = { @@ -133,7 +133,7 @@ const getLatestVersion = (name: string): Promise => { const getPluginList = (): Promise> => { return fetch( - 'http://registry.npmjs.org/-/v1/search?text=keywords:sonar&size=250', + 'http://registry.npmjs.org/-/v1/search?text=keywords:flipper&size=250', ) .then(res => res.json()) .then(res => res.objects.map(o => o.package)); @@ -161,7 +161,7 @@ class PluginItem extends PureComponent< const {name, status: initialStatus} = this.props.plugin; this.setState({working: true}); const npm = spawn('npm', [action, name], { - cwd: SONAR_PLUGIN_PATH, + cwd: FLIPPER_PLUGIN_PATH, }); npm.stderr.on('data', e => { @@ -203,7 +203,7 @@ class PluginItem extends PureComponent< {managed ? ( - This plugin is not managed by Sonar, but loaded from{' '} + This plugin is not managed by Flipper, but loaded from{' '} {rootDir} @@ -255,7 +255,7 @@ class PluginManager extends PureComponent { plugins: DYNAMIC_PLUGINS.reduce((acc, plugin) => { acc[plugin.name] = { ...plugin, - managed: !(plugin.entry, '').startsWith(SONAR_PLUGIN_PATH), + managed: !(plugin.entry, '').startsWith(FLIPPER_PLUGIN_PATH), status: 'installed', }; return acc; diff --git a/src/chrome/WelcomeScreen.js b/src/chrome/WelcomeScreen.js index 6ee75d2ab..45a1ef1f9 100644 --- a/src/chrome/WelcomeScreen.js +++ b/src/chrome/WelcomeScreen.js @@ -133,7 +133,7 @@ export default class WelcomeScreen extends PureComponent { onClick={() => shell.openExternal('https://fbflipper.com/docs/understand.html') }> - + Using Flipper @@ -147,7 +147,7 @@ export default class WelcomeScreen extends PureComponent { 'https://fbflipper.com/docs/create-plugin.html', ) }> - + Create your own plugin Get started with these pointers @@ -159,7 +159,7 @@ export default class WelcomeScreen extends PureComponent { 'https://fbflipper.com/docs/getting-started.html', ) }> - + Add Flipper support to your app Get started with these pointers @@ -169,7 +169,7 @@ export default class WelcomeScreen extends PureComponent { onClick={() => shell.openExternal('https://github.com/facebook/flipper/issues') }> - + Contributing and Feedback diff --git a/src/createTablePlugin.js b/src/createTablePlugin.js index 85142d5b5..0461baa63 100644 --- a/src/createTablePlugin.js +++ b/src/createTablePlugin.js @@ -54,7 +54,7 @@ type Actions = AppendAndUpdateAction | ResetAndUpdateAction; * build by calling the `buildRow` function argument. * * An optional resetMethod argument can be provided which will replace the current rows with the - * data provided. This is useful when connecting to sonar for this first time, or reconnecting to + * data provided. This is useful when connecting to Flipper for this first time, or reconnecting to * the client in an unknown state. */ export function createTablePlugin(props: Props) { diff --git a/src/dispatcher/androidDevice.js b/src/dispatcher/androidDevice.js index a6acb7984..b43bad5fb 100644 --- a/src/dispatcher/androidDevice.js +++ b/src/dispatcher/androidDevice.js @@ -86,7 +86,7 @@ export default (store: Store, logger: Logger) => { payload: new Set(deviceIDsToRemove), }); console.error( - 'adb server shutdown. Run `adb start-server` and restart Sonar.', + 'adb server shutdown. Run `adb start-server` and restart Flipper.', ); } else { throw err; diff --git a/src/dispatcher/server.js b/src/dispatcher/server.js index 6c9869a0e..fb856089a 100644 --- a/src/dispatcher/server.js +++ b/src/dispatcher/server.js @@ -30,7 +30,7 @@ export default (store: Store, logger: Logger) => { server.addListener('error', err => { const payload: string = err.code === 'EADDRINUSE' - ? "Couldn't start websocket server. Looks like you have multiple copies of Sonar running." + ? "Couldn't start websocket server. Looks like you have multiple copies of Flipper running." : err.message || 'Unknown error'; store.dispatch({ diff --git a/src/plugins/index.js b/src/plugins/index.js index 215b7e3dc..e994cd81b 100644 --- a/src/plugins/index.js +++ b/src/plugins/index.js @@ -16,7 +16,7 @@ const plugins = new Map(); // $FlowFixMe process.env not defined in electron API spec const remoteEnv = remote.process.env; -// expose Sonar and exact globally for dynamically loaded plugins +// expose Flipper and exact globally for dynamically loaded plugins window.React = React; window.ReactDOM = ReactDOM; window.Flipper = Flipper; diff --git a/src/server.js b/src/server.js index cbc9ec408..335674cdc 100644 --- a/src/server.js +++ b/src/server.js @@ -147,11 +147,11 @@ export default class Server extends EventEmitter { this.emit( 'error', new Error( - "Sonar doesn't currently support physical iOS devices. You can still use it to view logs, but for now to use the majority of the sonar plugins you'll have to use the Simulator.", + "Flipper doesn't currently support physical iOS devices. You can still use it to view logs, but for now to use the majority of the Flipper plugins you'll have to use the Simulator.", ), ); console.warn( - 'Physical iOS device detected. This is not currently supported by sonar.', + 'Physical iOS device detected. This is not currently supported by Flipper.', 'server', ); } @@ -267,7 +267,7 @@ export default class Server extends EventEmitter { ); /* If a device gets disconnected without being cleaned up properly, - * sonar won't be aware until it attempts to reconnect. + * Flipper won't be aware until it attempts to reconnect. * When it does we need to terminate the zombie connection. */ if (this.connections.has(id)) { diff --git a/src/ui/components/colors.js b/src/ui/components/colors.js index 5c932a3ed..c12c39b09 100644 --- a/src/ui/components/colors.js +++ b/src/ui/components/colors.js @@ -269,5 +269,5 @@ export const brandColors = { Facebook: '#4267B2', Messenger: '#0088FA', Instagram: '#E61E68', - Sonar: '#8155cb', + Flipper: '#8155cb', }; diff --git a/src/ui/components/intro/intro.js b/src/ui/components/intro/intro.js index 841e5966d..107a5af0c 100644 --- a/src/ui/components/intro/intro.js +++ b/src/ui/components/intro/intro.js @@ -38,7 +38,7 @@ const TitleRow = styled(FlexRow)({ const Icon = styled(FlexBox)({ justifyContent: 'center', alignItems: 'center', - backgroundColor: brandColors.Sonar, + backgroundColor: brandColors.Flipper, width: 32, height: 32, flexShrink: 0, @@ -57,7 +57,7 @@ const Button = styled(View)({ borderRadius: 6, color: colors.white, border: 'none', - background: brandColors.Sonar, + background: brandColors.Flipper, padding: '10px 30px', fontWeight: 500, fontSize: '1em', diff --git a/src/utils/CertificateProvider.js b/src/utils/CertificateProvider.js index 060cd0514..afceb9ad2 100644 --- a/src/utils/CertificateProvider.js +++ b/src/utils/CertificateProvider.js @@ -54,14 +54,14 @@ export type SecureServerConfig = {| /* * This class is responsible for generating and deploying server and client - * certificates to allow for secure communication between sonar and apps. + * certificates to allow for secure communication between Flipper and apps. * It takes a Certificate Signing Request which was generated by the app, * using the app's public/private keypair. - * With this CSR it uses the sonar CA to sign a client certificate which it + * With this CSR it uses the Flipper CA to sign a client certificate which it * deploys securely to the app. - * It also deploys the sonar CA cert to the app. + * It also deploys the Flipper CA cert to the app. * The app can trust a server if and only if it has a certificate signed by the - * sonar CA. + * Flipper CA. */ export default class CertificateProvider { logger: LogManager; @@ -310,14 +310,14 @@ export default class CertificateProvider { .then(output => { if (output.match(appNotDebuggableRegex)) { const e = new RecurringError( - `Android app ${user} is not debuggable. To use it with sonar, add android:debuggable="true" to the application section of AndroidManifest.xml`, + `Android app ${user} is not debuggable. To use it with Flipper, add android:debuggable="true" to the application section of AndroidManifest.xml`, ); this.server.emit('error', e); throw e; } if (output.toLowerCase().match(operationNotPermittedRegex)) { const e = new RecurringError( - `Your android device (${deviceId}) does not support the adb shell run-as command. We're tracking this at https://github.com/facebook/Sonar/issues/92`, + `Your android device (${deviceId}) does not support the adb shell run-as command. We're tracking this at https://github.com/facebook/flipper/issues/92`, ); this.server.emit('error', e); throw e; diff --git a/static/index.dev.html b/static/index.dev.html index fecdbcfc4..2d3d508dc 100644 --- a/static/index.dev.html +++ b/static/index.dev.html @@ -6,7 +6,7 @@ - Sonar + Flipper