From 39635356104ea4bd86b3dc252d96b4225d7d0c8a Mon Sep 17 00:00:00 2001 From: Michel Weststrate Date: Tue, 5 Nov 2019 11:07:49 -0800 Subject: [PATCH] Fix buffer warning when starting CPU / kaois plugin Summary: When the CPU or kaois plugins are started, they show a buffer deprecated warning, caused by the fact that they ship their own adbkit version, which is unpatched. This diff makes sure that the adbkit as shipped with Flipper is used instead. Reviewed By: jknoxville Differential Revision: D18327441 fbshipit-source-id: 9cab23b9701adc070210cc4133fc8760031bd1d7 --- src/dispatcher/plugins.tsx | 2 + src/plugins/cpu/package.json | 3 -- src/plugins/cpu/yarn.lock | 68 -------------------------- src/plugins/kaios-ram/package.json | 1 - src/plugins/kaios-ram/yarn.lock | 69 --------------------------- static/transforms/flipper-requires.js | 2 + 6 files changed, 4 insertions(+), 141 deletions(-) diff --git a/src/dispatcher/plugins.tsx b/src/dispatcher/plugins.tsx index faba36c9a..d2155579c 100644 --- a/src/dispatcher/plugins.tsx +++ b/src/dispatcher/plugins.tsx @@ -13,6 +13,7 @@ import {FlipperPlugin, FlipperDevicePlugin} from '../plugin'; import {State} from '../reducers/plugins'; import React from 'react'; import ReactDOM from 'react-dom'; +import adbkit from 'adbkit'; import * as Flipper from '../index'; import { registerPlugins, @@ -43,6 +44,7 @@ export default (store: Store, logger: Logger) => { globalObject.React = React; globalObject.ReactDOM = ReactDOM; globalObject.Flipper = Flipper; + globalObject.adbkit = adbkit; const gatekeepedPlugins: Array = []; const disabledPlugins: Array = []; diff --git a/src/plugins/cpu/package.json b/src/plugins/cpu/package.json index 77eeb6e32..4bec80132 100644 --- a/src/plugins/cpu/package.json +++ b/src/plugins/cpu/package.json @@ -4,9 +4,6 @@ "main": "index.tsx", "license": "MIT", "keywords": ["flipper-plugin"], - "dependencies": { - "adbkit": "^2.11.1" - }, "title": "CPU", "icon": "underline", "bugs": { diff --git a/src/plugins/cpu/yarn.lock b/src/plugins/cpu/yarn.lock index 6ef24a3db..3ff608aed 100644 --- a/src/plugins/cpu/yarn.lock +++ b/src/plugins/cpu/yarn.lock @@ -2,71 +2,3 @@ # yarn lockfile v1 -adbkit-logcat@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/adbkit-logcat/-/adbkit-logcat-1.1.0.tgz#01d7f9b0cef9093a30bcb3b007efff301508962f" - integrity sha1-Adf5sM75CTowvLOwB+//MBUIli8= - -adbkit-monkey@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/adbkit-monkey/-/adbkit-monkey-1.0.1.tgz#f291be701a2efc567a63fc7aa6afcded31430be1" - integrity sha1-8pG+cBou/FZ6Y/x6pq/N7TFDC+E= - dependencies: - async "~0.2.9" - -adbkit@^2.11.1: - version "2.11.1" - resolved "https://registry.yarnpkg.com/adbkit/-/adbkit-2.11.1.tgz#7da847fe561254f3121088947bc1907ef053e894" - integrity sha512-hDTiRg9NX3HQt7WoDAPCplUpvzr4ZzQa2lq7BdTTJ/iOZ6O7YNAs6UYD8sFAiBEcYHDRIyq3cm9sZP6uZnhvXw== - dependencies: - adbkit-logcat "^1.1.0" - adbkit-monkey "~1.0.1" - bluebird "~2.9.24" - commander "^2.3.0" - debug "~2.6.3" - node-forge "^0.7.1" - split "~0.3.3" - -async@~0.2.9: - version "0.2.10" - resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" - integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E= - -bluebird@~2.9.24: - version "2.9.34" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.9.34.tgz#2f7b4ec80216328a9fddebdf69c8d4942feff7d8" - integrity sha1-L3tOyAIWMoqf3evfacjUlC/v99g= - -commander@^2.3.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" - integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== - -debug@~2.6.3: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -node-forge@^0.7.1: - version "0.7.6" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac" - integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw== - -split@~0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" - integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= - dependencies: - through "2" - -through@2: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= diff --git a/src/plugins/kaios-ram/package.json b/src/plugins/kaios-ram/package.json index 7741ea9c3..30ca28faa 100644 --- a/src/plugins/kaios-ram/package.json +++ b/src/plugins/kaios-ram/package.json @@ -10,7 +10,6 @@ "url": "https://fb.workplace.com/groups/wa.kaios/" }, "dependencies": { - "adbkit": "^2.11.1", "recharts": "1.7.1" }, "devDependencies": { diff --git a/src/plugins/kaios-ram/yarn.lock b/src/plugins/kaios-ram/yarn.lock index 8057950f6..5722e8a50 100644 --- a/src/plugins/kaios-ram/yarn.lock +++ b/src/plugins/kaios-ram/yarn.lock @@ -48,56 +48,16 @@ "@types/react" "*" "@types/recharts-scale" "*" -adbkit-logcat@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/adbkit-logcat/-/adbkit-logcat-1.1.0.tgz#01d7f9b0cef9093a30bcb3b007efff301508962f" - integrity sha1-Adf5sM75CTowvLOwB+//MBUIli8= - -adbkit-monkey@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/adbkit-monkey/-/adbkit-monkey-1.0.1.tgz#f291be701a2efc567a63fc7aa6afcded31430be1" - integrity sha1-8pG+cBou/FZ6Y/x6pq/N7TFDC+E= - dependencies: - async "~0.2.9" - -adbkit@^2.11.1: - version "2.11.1" - resolved "https://registry.yarnpkg.com/adbkit/-/adbkit-2.11.1.tgz#7da847fe561254f3121088947bc1907ef053e894" - integrity sha512-hDTiRg9NX3HQt7WoDAPCplUpvzr4ZzQa2lq7BdTTJ/iOZ6O7YNAs6UYD8sFAiBEcYHDRIyq3cm9sZP6uZnhvXw== - dependencies: - adbkit-logcat "^1.1.0" - adbkit-monkey "~1.0.1" - bluebird "~2.9.24" - commander "^2.3.0" - debug "~2.6.3" - node-forge "^0.7.1" - split "~0.3.3" - -async@~0.2.9: - version "0.2.10" - resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1" - integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E= - balanced-match@^0.4.2: version "0.4.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" integrity sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg= -bluebird@~2.9.24: - version "2.9.34" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.9.34.tgz#2f7b4ec80216328a9fddebdf69c8d4942feff7d8" - integrity sha1-L3tOyAIWMoqf3evfacjUlC/v99g= - classnames@^2.2.5: version "2.2.6" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce" integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q== -commander@^2.3.0: - version "2.20.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" - integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ== - core-js@^2.5.1: version "2.6.9" resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" @@ -171,13 +131,6 @@ d3-time@1: resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.11.tgz#1d831a3e25cd189eb256c17770a666368762bbce" integrity sha512-Z3wpvhPLW4vEScGeIMUckDW7+3hWKOQfAWg/U7PlWBnQmeKQ00gCUsTtWSYulrKNA7ta8hJ+xXc6MHrMuITwEw== -debug@~2.6.3: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - decimal.js-light@^2.4.1: version "2.5.0" resolved "https://registry.yarnpkg.com/decimal.js-light/-/decimal.js-light-2.5.0.tgz#ca7faf504c799326df94b0ab920424fdfc125348" @@ -222,16 +175,6 @@ math-expression-evaluator@^1.2.14: resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac" integrity sha1-3oGf282E3M2PrlnGrreWFbnSZqw= -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -node-forge@^0.7.1: - version "0.7.6" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac" - integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw== - object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -347,15 +290,3 @@ resize-observer-polyfill@^1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== - -split@~0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" - integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= - dependencies: - through "2" - -through@2: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= diff --git a/static/transforms/flipper-requires.js b/static/transforms/flipper-requires.js index 87c87a048..76083e3d4 100644 --- a/static/transforms/flipper-requires.js +++ b/static/transforms/flipper-requires.js @@ -44,6 +44,8 @@ module.exports = ({types: t}) => ({ path.replaceWith(t.identifier('global.React')); } else if (args[0].value === 'react-dom') { path.replaceWith(t.identifier('global.ReactDOM')); + } else if (args[0].value === 'adbkit') { + path.replaceWith(t.identifier('global.adbkit')); } else if ( // require a file not a pacakge args[0].value.indexOf('/') > -1 &&