From c93ab83bd9f8b81b8f8c8516561d93e57f66d1a0 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Mon, 17 Sep 2018 06:07:35 -0700 Subject: [PATCH] Back out "[flipper] Export init function" Summary: This seems to break initialization. I'm not quite sure why, but inside the exported function, nothing else from the file appears to be visible. Original commit changeset: 55b2a61186e6 Reviewed By: danielbuechele Differential Revision: D9849812 fbshipit-source-id: d88973721da82040e1f29669acade6c883619ce8 --- src/__mocks__/init.js | 10 ---------- src/index.js | 7 +++---- src/init.js | 28 +++++++++++++--------------- 3 files changed, 16 insertions(+), 29 deletions(-) delete mode 100644 src/__mocks__/init.js diff --git a/src/__mocks__/init.js b/src/__mocks__/init.js deleted file mode 100644 index 9c5f81382..000000000 --- a/src/__mocks__/init.js +++ /dev/null @@ -1,10 +0,0 @@ -/** - * Copyright 2018-present Facebook. - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - * @format - */ - -export default function init() { - // no-op -} diff --git a/src/index.js b/src/index.js index 4575c87b3..a96b95e75 100644 --- a/src/index.js +++ b/src/index.js @@ -14,10 +14,9 @@ export {SonarBasePlugin, SonarPlugin, SonarDevicePlugin} from './plugin.js'; export {createTablePlugin} from './createTablePlugin.js'; export {default as SonarSidebar} from './chrome/SonarSidebar.js'; +export * from './init.js'; +export {default} from './init.js'; + export {default as AndroidDevice} from './devices/AndroidDevice.js'; export {default as Device} from './devices/BaseDevice.js'; export {default as IOSDevice} from './devices/IOSDevice.js'; - -import init from './init.js'; - -init(); diff --git a/src/init.js b/src/init.js index 657489b21..96a47ff8c 100644 --- a/src/init.js +++ b/src/init.js @@ -62,18 +62,16 @@ const AppFrame = () => ( ); -export default function init() { - // $FlowFixMe: this element exists! - ReactDOM.render(, document.getElementById('root')); - // $FlowFixMe: service workers exist! - navigator.serviceWorker - .register( - process.env.NODE_ENV === 'production' - ? path.join(__dirname, 'serviceWorker.js') - : './serviceWorker.js', - ) - .then(r => { - (r.installing || r.active).postMessage({precachedIcons}); - }) - .catch(console.error); -} +// $FlowFixMe: this element exists! +ReactDOM.render(, document.getElementById('root')); +// $FlowFixMe: service workers exist! +navigator.serviceWorker + .register( + process.env.NODE_ENV === 'production' + ? path.join(__dirname, 'serviceWorker.js') + : './serviceWorker.js', + ) + .then(r => { + (r.installing || r.active).postMessage({precachedIcons}); + }) + .catch(console.error);