From 59cb7142e3e5cd3cb7df84585e8a7a43ecf5ce12 Mon Sep 17 00:00:00 2001 From: Morten Olsen Date: Fri, 5 Jul 2019 10:07:30 +0200 Subject: [PATCH] cleanup --- demo/App.js | 14 +++++++++++--- demo/babel.config.js | 3 +-- demo/package.json | 3 +-- lib/package.json | 5 ++--- lib/src/components/DevTool/Requests/Details.js | 14 +++++++++++--- lib/src/components/DevTool/Storage/index.js | 6 ++++-- lib/src/components/DevTool/index.js | 6 +++--- lib/src/components/base/Toolbar/Selector.js | 1 + lib/src/components/data/Storage.js | 9 ++++----- lib/src/console.js | 2 -- yarn.lock | 12 +----------- 11 files changed, 39 insertions(+), 36 deletions(-) diff --git a/demo/App.js b/demo/App.js index 60109d7..50ce944 100644 --- a/demo/App.js +++ b/demo/App.js @@ -29,6 +29,14 @@ xhr = new XMLHttpRequest(); xhr.open('GET', 'https://google.com/sdfsfsdfsfdf'); xhr.send(); + +console.log({ + hello: { + world: 1, + earth: 2, + }, +}); + AsyncStorage.setItem('a', 'b'); AsyncStorage.setItem('b', 'c'); AsyncStorage.setItem('c', 'd'); @@ -107,12 +115,12 @@ export default class App extends React.Component { /> - {/* */} - + /> + ); diff --git a/demo/babel.config.js b/demo/babel.config.js index c005fa1..99fd768 100644 --- a/demo/babel.config.js +++ b/demo/babel.config.js @@ -3,9 +3,8 @@ module.exports = function(api) { return { presets: ['babel-preset-expo'], plugins: [ - ['module-resolver', { + [require.resolve('babel-plugin-module-resolver'), { alias: { - //'react-native-debug-console': '../lib', '@babel/runtime': '../node_modules/@babel/runtime', } }] diff --git a/demo/package.json b/demo/package.json index 8f8d7d3..555ef9b 100644 --- a/demo/package.json +++ b/demo/package.json @@ -11,7 +11,6 @@ "postinstall": "expo-yarn-workspaces postinstall" }, "dependencies": { - "@react-native-community/async-storage": "^1.5.0", "expo": "^33.0.0", "react": "16.8.3", "react-dom": "^16.8.6", @@ -24,7 +23,7 @@ "babel-preset-expo": "^5.1.1", "expo-cli": "^2.21.2", "expo-yarn-workspaces": "^1.2.0", - "module-resolver": "^1.0.0" + "babel-plugin-module-resolver": "^3.2.0" }, "private": true } diff --git a/lib/package.json b/lib/package.json index 6dff149..929b72c 100644 --- a/lib/package.json +++ b/lib/package.json @@ -11,10 +11,9 @@ "styled-components": "^4.3.1" }, "peerDependencies": { - "@react-native-community/async-storage": "^1.5.0", "prop-types": "^15.6.0", - "react": "16.8.3", - "react-native": "0.59.8" + "react": "^16.8.3", + "react-native": "^0.59.8" }, "devDependencies": {} } diff --git a/lib/src/components/DevTool/Requests/Details.js b/lib/src/components/DevTool/Requests/Details.js index 251ef1e..e4b6932 100644 --- a/lib/src/components/DevTool/Requests/Details.js +++ b/lib/src/components/DevTool/Requests/Details.js @@ -72,11 +72,19 @@ const Data = ({ Response Headers - {requestHeaders} - {headerInfo && ( + + + {requestHeaders} + + + {headerInfo.length > 0 && ( Request Headers - {headerInfo} + + + {headerInfo} + + )} {args[0] && ( diff --git a/lib/src/components/DevTool/Storage/index.js b/lib/src/components/DevTool/Storage/index.js index f859bdb..6c0a131 100644 --- a/lib/src/components/DevTool/Storage/index.js +++ b/lib/src/components/DevTool/Storage/index.js @@ -13,10 +13,12 @@ const Wrapper = styled.View` flex: 1; `; -const StorageView = () => ( +const StorageView = ({ + provider, +}) => ( {({ selected }, setState) => ( - + {(data, update, removeItem, clear) => ( diff --git a/lib/src/components/DevTool/index.js b/lib/src/components/DevTool/index.js index d1d971e..7bbfe05 100644 --- a/lib/src/components/DevTool/index.js +++ b/lib/src/components/DevTool/index.js @@ -23,9 +23,9 @@ const DevTool = ({ includeStackTrace, onClose, showNetwork = true, - showStorage = true, showConsole = true, additionalTools = [], + storage, }) => { const views = []; @@ -45,10 +45,10 @@ const DevTool = ({ }); } - if (showStorage) { + if (storage) { views.push({ name: 'Storage', - view: , + view: , }); } diff --git a/lib/src/components/base/Toolbar/Selector.js b/lib/src/components/base/Toolbar/Selector.js index a1bdb3e..5ccdede 100644 --- a/lib/src/components/base/Toolbar/Selector.js +++ b/lib/src/components/base/Toolbar/Selector.js @@ -51,6 +51,7 @@ const Selector = ({ /> {options.map((option) => ( { if (!multiSelect) { options.forEach(o => o.selected = false); diff --git a/lib/src/components/data/Storage.js b/lib/src/components/data/Storage.js index 60c3d31..81fd007 100644 --- a/lib/src/components/data/Storage.js +++ b/lib/src/components/data/Storage.js @@ -1,5 +1,4 @@ import { Component } from 'react'; -import AsyncStorage from '@react-native-community/async-storage'; class Storage extends Component { constructor() { @@ -17,19 +16,19 @@ class Storage extends Component { } async removeItem(name) { - await AsyncStorage.removeItem(name); + await this.props.provider.removeItem(name); await this.update(); } async clear() { - await AsyncStorage.clear(); + await this.props.provider.clear(); await this.update(); } async update() { try { - const keys = await AsyncStorage.getAllKeys(); - const values = await Promise.all(keys.map(key => AsyncStorage.getItem(key))); + const keys = await this.props.provider.getAllKeys(); + const values = await Promise.all(keys.map(key => this.props.provider.getItem(key))); const data = {}; for (let i = 0; i < keys.length; i++) { const key = keys[i]; diff --git a/lib/src/console.js b/lib/src/console.js index 66d8e02..8166489 100644 --- a/lib/src/console.js +++ b/lib/src/console.js @@ -1,8 +1,6 @@ import log from './log'; -import AsyncStorage from '@react-native-community/async-storage'; export const context = { - storage: AsyncStorage, log: (...args) => console.log(...args), clear: log.clear, }; \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 1a511b0..b209266 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2011,11 +2011,6 @@ universal-user-agent "^2.0.0" url-template "^2.0.8" -"@react-native-community/async-storage@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@react-native-community/async-storage/-/async-storage-1.5.0.tgz#647ffcd832272068b0be57332e08d73036ed391f" - integrity sha512-2yE4RzQ5IL+UTPhuMY0ykNRKHf1m90jOnmp8fcDPUun5U97cXlorjI4p66ovDgF0FuOv8ZpiUKvunGy3qqBxwg== - "@react-native-community/cli@^1.2.1": version "1.10.0" resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-1.10.0.tgz#66e3c9f407763281f7060c034145650bf0d6786c" @@ -2884,7 +2879,7 @@ babel-plugin-dynamic-import-node@^2.3.0: dependencies: object.assign "^4.1.0" -babel-plugin-module-resolver@^3.1.1: +babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7" integrity sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA== @@ -9145,11 +9140,6 @@ modify-values@^1.0.0: resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== -module-resolver@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/module-resolver/-/module-resolver-1.0.0.tgz#d412c0b66e08588cd39347a60c3c818bc9119fb5" - integrity sha1-1BLAtm4IWIzTk0emDDyBi8kRn7U= - moment@^2.10.6: version "2.24.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"