From 6f842340de12cb922441a7e2d1ec3a379b2f86be Mon Sep 17 00:00:00 2001 From: Godefroy Ponsinet Date: Mon, 7 Oct 2019 14:48:01 +0200 Subject: [PATCH] fix(storybook): force hoist react for hooks compatibility Signed-off-by: Godefroy Ponsinet --- js/Makefile | 8 +- js/lerna.json | 6 - js/packages/berty-app/package.json | 6 +- js/packages/berty-storybook/package.json | 9 +- js/packages/react-native-core/package.json | 3 +- js/packages/react-native-example/package.json | 7 +- js/packages/shared-storybook/package.json | 4 +- js/packages/storybook-mobile/Makefile | 2 +- js/packages/storybook-mobile/ios/Podfile.lock | 304 +++++++------- js/packages/storybook-mobile/metro.config.js | 10 +- js/packages/storybook-mobile/package.json | 14 +- .../storybook-mobile/storybook/storyLoader.js | 12 +- js/yarn.lock | 389 +----------------- 13 files changed, 195 insertions(+), 579 deletions(-) diff --git a/js/Makefile b/js/Makefile index a98261cb3f..561e9e0052 100644 --- a/js/Makefile +++ b/js/Makefile @@ -8,8 +8,6 @@ author = Berty Technologies contributor = $(shell git config --get user.name) <$(shell git config --get user.email)> license = (Apache-2.0 or MIT) -export SHELL = /usr/bin/env bash - global_bin := /usr/local/bin ifeq ($(UNAME_S),Linux) global_bin := /usr/bin @@ -47,7 +45,7 @@ env: .PHONY: deps deps: $(mod) $(pkg_mod) -$(mod): $(PWD)/package.json +$(mod): $(PWD)/package.json $(pkg_desc) $(lerna) $(lerna_flags) init $(lerna) $(lerna_flags) bootstrap touch $(mod) @@ -60,12 +58,10 @@ $(lerna): $(yarn) $(yarn) global add lerna .NOTPARALLEL: $(pkg_mod) $(pkg_mod)/% -$(pkg_mod)/%: $(patsubst %,%/package.json,$(pkg)) +$(pkg_mod)/%: $(patsubst %,%/package.json,$(pkg)) $(mod) mkdir -p $(pkg_mod) touch $(pkg_mod) $@ -$(pkg_desc): $(mod) - .PHONY: yarn yarn $(yarn): ifeq ($(UNAME_S),Darwin) diff --git a/js/lerna.json b/js/lerna.json index c340d67617..3a9c5455cf 100644 --- a/js/lerna.json +++ b/js/lerna.json @@ -4,11 +4,5 @@ "packages": [ "packages/*" ], - "nohoist": [ - "**/react-native", - "**/react-native/**", - "**/react-native-*", - "**/react-native-*/**" - ], "version": "0.0.0" } diff --git a/js/packages/berty-app/package.json b/js/packages/berty-app/package.json index e4ae93bd01..263acd3c74 100644 --- a/js/packages/berty-app/package.json +++ b/js/packages/berty-app/package.json @@ -12,11 +12,9 @@ "@berty-tech/react-native-example": "^1.0.0", "clisim": "^2.4.0", "react": "^16.9.0", - "react-native": "^0.60.5", + "react-native": "0.61.0", "react-native-config": "^0.11.7", - "react-native-reanimated": "^1.3.0", - "react-native-swiper": "^1.5.14", - "react-native-ui-kitten": "^4.1.1" + "react-native-reanimated": "^1.3.0" }, "devDependencies": { "@babel/core": "^7.6.2", diff --git a/js/packages/berty-storybook/package.json b/js/packages/berty-storybook/package.json index fbd22a96aa..3ddc57da2d 100644 --- a/js/packages/berty-storybook/package.json +++ b/js/packages/berty-storybook/package.json @@ -22,13 +22,16 @@ "url": "https://github.com/n0izn0iz/berty/issues" }, "peerDependencies": { - "react": "*", - "react-native": "*" + "react": "^16.9.0", + "react-native": "0.61.0", + "react-native-reanimated": "^1.3.0" + }, + "optionalDependencies": { + "@storybook/addon-links": "^5.2.1" }, "dependencies": { "@berty-tech/shared-storybook": "^0.0.0", "@eva-design/eva": "^1.0.1", - "@storybook/addon-links": "^5.2.1", "react-native-easy-grid": "^0.2.2", "react-native-elements": "^1.2.3", "react-native-swiper": "^1.6.0-rc.1", diff --git a/js/packages/react-native-core/package.json b/js/packages/react-native-core/package.json index d600fc4f01..346c7f13fd 100644 --- a/js/packages/react-native-core/package.json +++ b/js/packages/react-native-core/package.json @@ -23,6 +23,7 @@ "readmeFilename": "README.md", "peerDependencies": { "react": "^16.8.1", - "react-native": ">=0.59.0-rc.0 <1.0.x" + "react-native": "0.61.0" } } + diff --git a/js/packages/react-native-example/package.json b/js/packages/react-native-example/package.json index 9eb31081e5..3cc21491ad 100644 --- a/js/packages/react-native-example/package.json +++ b/js/packages/react-native-example/package.json @@ -19,11 +19,8 @@ "readmeFilename": "README.md", "title": "React Native Example", "peerDependencies": { - "react": "^16.8.1", - "react-native": ">=0.59.0-rc.0 <1.0.x" - }, - "devDependencies": { "react": "^16.9.0", - "react-native": "^0.61.1" + "react-native": "0.61.0" } } + diff --git a/js/packages/shared-storybook/package.json b/js/packages/shared-storybook/package.json index 21e1bb93eb..492b40e239 100644 --- a/js/packages/shared-storybook/package.json +++ b/js/packages/shared-storybook/package.json @@ -22,8 +22,8 @@ "url": "https://github.com/berty/berty/issues" }, "peerDependencies": { - "react": "*", - "react-native": "*" + "react": "^16.9.0", + "react-native": "0.61.0" }, "dependencies": { "react-native-easy-grid": "^0.2.2", diff --git a/js/packages/storybook-mobile/Makefile b/js/packages/storybook-mobile/Makefile index f8d649b5eb..2f2d9b08c7 100644 --- a/js/packages/storybook-mobile/Makefile +++ b/js/packages/storybook-mobile/Makefile @@ -7,7 +7,7 @@ export SHELL ?= env bash deps.storybook.mobile\ deps.storybook.mobile: export PWD := $(PWD) -deps.storybook.mobile: $(PWD)/node_modules $(PWD)/storybook/storyLoader +deps.storybook.mobile: $(PWD)/node_modules $(PWD)/storybook/storyLoader.js cd $(PWD) && lsof -t -i :7007 || echo Y | start-storybook --config-dir storybook & kill $$(lsof -t -i :8081) || true cd $(PWD) && PWD=$(PWD) react-native start --reset-cache & diff --git a/js/packages/storybook-mobile/ios/Podfile.lock b/js/packages/storybook-mobile/ios/Podfile.lock index 4864d44e77..ddf0f20118 100644 --- a/js/packages/storybook-mobile/ios/Podfile.lock +++ b/js/packages/storybook-mobile/ios/Podfile.lock @@ -1,14 +1,14 @@ PODS: - boost-for-react-native (1.63.0) - DoubleConversion (1.1.6) - - FBLazyVector (0.61.2) - - FBReactNativeSpec (0.61.2): + - FBLazyVector (0.61.0) + - FBReactNativeSpec (0.61.0): - Folly (= 2018.10.22.00) - - RCTRequired (= 0.61.2) - - RCTTypeSafety (= 0.61.2) - - React-Core (= 0.61.2) - - React-jsi (= 0.61.2) - - ReactCommon/turbomodule/core (= 0.61.2) + - RCTRequired (= 0.61.0) + - RCTTypeSafety (= 0.61.0) + - React-Core (= 0.61.0) + - React-jsi (= 0.61.0) + - ReactCommon/turbomodule/core (= 0.61.0) - Folly (2018.10.22.00): - boost-for-react-native - DoubleConversion @@ -19,204 +19,204 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - RCTRequired (0.61.2) - - RCTTypeSafety (0.61.2): - - FBLazyVector (= 0.61.2) + - RCTRequired (0.61.0) + - RCTTypeSafety (0.61.0): + - FBLazyVector (= 0.61.0) - Folly (= 2018.10.22.00) - - RCTRequired (= 0.61.2) - - React-Core (= 0.61.2) - - React (0.61.2): - - React-Core (= 0.61.2) - - React-Core/DevSupport (= 0.61.2) - - React-Core/RCTWebSocket (= 0.61.2) - - React-RCTActionSheet (= 0.61.2) - - React-RCTAnimation (= 0.61.2) - - React-RCTBlob (= 0.61.2) - - React-RCTImage (= 0.61.2) - - React-RCTLinking (= 0.61.2) - - React-RCTNetwork (= 0.61.2) - - React-RCTSettings (= 0.61.2) - - React-RCTText (= 0.61.2) - - React-RCTVibration (= 0.61.2) - - React-Core (0.61.2): + - RCTRequired (= 0.61.0) + - React-Core (= 0.61.0) + - React (0.61.0): + - React-Core (= 0.61.0) + - React-Core/DevSupport (= 0.61.0) + - React-Core/RCTWebSocket (= 0.61.0) + - React-RCTActionSheet (= 0.61.0) + - React-RCTAnimation (= 0.61.0) + - React-RCTBlob (= 0.61.0) + - React-RCTImage (= 0.61.0) + - React-RCTLinking (= 0.61.0) + - React-RCTNetwork (= 0.61.0) + - React-RCTSettings (= 0.61.0) + - React-RCTText (= 0.61.0) + - React-RCTVibration (= 0.61.0) + - React-Core (0.61.0): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 0.61.2) - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) + - React-Core/Default (= 0.61.0) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) - Yoga - - React-Core/CoreModulesHeaders (0.61.2): + - React-Core/CoreModulesHeaders (0.61.0): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) - Yoga - - React-Core/Default (0.61.2): + - React-Core/Default (0.61.0): - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) - Yoga - - React-Core/DevSupport (0.61.2): + - React-Core/DevSupport (0.61.0): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 0.61.2) - - React-Core/RCTWebSocket (= 0.61.2) - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) - - React-jsinspector (= 0.61.2) + - React-Core/Default (= 0.61.0) + - React-Core/RCTWebSocket (= 0.61.0) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) + - React-jsinspector (= 0.61.0) - Yoga - - React-Core/RCTActionSheetHeaders (0.61.2): + - React-Core/RCTActionSheetHeaders (0.61.0): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) - Yoga - - React-Core/RCTAnimationHeaders (0.61.2): + - React-Core/RCTAnimationHeaders (0.61.0): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) - Yoga - - React-Core/RCTBlobHeaders (0.61.2): + - React-Core/RCTBlobHeaders (0.61.0): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) - Yoga - - React-Core/RCTImageHeaders (0.61.2): + - React-Core/RCTImageHeaders (0.61.0): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) - Yoga - - React-Core/RCTLinkingHeaders (0.61.2): + - React-Core/RCTLinkingHeaders (0.61.0): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) - Yoga - - React-Core/RCTNetworkHeaders (0.61.2): + - React-Core/RCTNetworkHeaders (0.61.0): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) - Yoga - - React-Core/RCTSettingsHeaders (0.61.2): + - React-Core/RCTSettingsHeaders (0.61.0): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) - Yoga - - React-Core/RCTTextHeaders (0.61.2): + - React-Core/RCTTextHeaders (0.61.0): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) - Yoga - - React-Core/RCTVibrationHeaders (0.61.2): + - React-Core/RCTVibrationHeaders (0.61.0): - Folly (= 2018.10.22.00) - glog - React-Core/Default - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) - Yoga - - React-Core/RCTWebSocket (0.61.2): + - React-Core/RCTWebSocket (0.61.0): - Folly (= 2018.10.22.00) - glog - - React-Core/Default (= 0.61.2) - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsiexecutor (= 0.61.2) + - React-Core/Default (= 0.61.0) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsiexecutor (= 0.61.0) - Yoga - - React-CoreModules (0.61.2): - - FBReactNativeSpec (= 0.61.2) + - React-CoreModules (0.61.0): + - FBReactNativeSpec (= 0.61.0) - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.61.2) - - React-Core/CoreModulesHeaders (= 0.61.2) - - React-RCTImage (= 0.61.2) - - ReactCommon/turbomodule/core (= 0.61.2) - - React-cxxreact (0.61.2): + - RCTTypeSafety (= 0.61.0) + - React-Core/CoreModulesHeaders (= 0.61.0) + - React-RCTImage (= 0.61.0) + - ReactCommon/turbomodule/core (= 0.61.0) + - React-cxxreact (0.61.0): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsinspector (= 0.61.2) - - React-jsi (0.61.2): + - React-jsinspector (= 0.61.0) + - React-jsi (0.61.0): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsi/Default (= 0.61.2) - - React-jsi/Default (0.61.2): + - React-jsi/Default (= 0.61.0) + - React-jsi/Default (0.61.0): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsiexecutor (0.61.2): + - React-jsiexecutor (0.61.0): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - React-jsinspector (0.61.2) - - React-RCTActionSheet (0.61.2): - - React-Core/RCTActionSheetHeaders (= 0.61.2) - - React-RCTAnimation (0.61.2): - - React-Core/RCTAnimationHeaders (= 0.61.2) - - React-RCTBlob (0.61.2): - - React-Core/RCTBlobHeaders (= 0.61.2) - - React-Core/RCTWebSocket (= 0.61.2) - - React-jsi (= 0.61.2) - - React-RCTNetwork (= 0.61.2) - - React-RCTImage (0.61.2): - - React-Core/RCTImageHeaders (= 0.61.2) - - React-RCTNetwork (= 0.61.2) - - React-RCTLinking (0.61.2): - - React-Core/RCTLinkingHeaders (= 0.61.2) - - React-RCTNetwork (0.61.2): - - React-Core/RCTNetworkHeaders (= 0.61.2) - - React-RCTSettings (0.61.2): - - React-Core/RCTSettingsHeaders (= 0.61.2) - - React-RCTText (0.61.2): - - React-Core/RCTTextHeaders (= 0.61.2) - - React-RCTVibration (0.61.2): - - React-Core/RCTVibrationHeaders (= 0.61.2) - - ReactCommon/jscallinvoker (0.61.2): + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - React-jsinspector (0.61.0) + - React-RCTActionSheet (0.61.0): + - React-Core/RCTActionSheetHeaders (= 0.61.0) + - React-RCTAnimation (0.61.0): + - React-Core/RCTAnimationHeaders (= 0.61.0) + - React-RCTBlob (0.61.0): + - React-Core/RCTBlobHeaders (= 0.61.0) + - React-Core/RCTWebSocket (= 0.61.0) + - React-jsi (= 0.61.0) + - React-RCTNetwork (= 0.61.0) + - React-RCTImage (0.61.0): + - React-Core/RCTImageHeaders (= 0.61.0) + - React-RCTNetwork (= 0.61.0) + - React-RCTLinking (0.61.0): + - React-Core/RCTLinkingHeaders (= 0.61.0) + - React-RCTNetwork (0.61.0): + - React-Core/RCTNetworkHeaders (= 0.61.0) + - React-RCTSettings (0.61.0): + - React-Core/RCTSettingsHeaders (= 0.61.0) + - React-RCTText (0.61.0): + - React-Core/RCTTextHeaders (= 0.61.0) + - React-RCTVibration (0.61.0): + - React-Core/RCTVibrationHeaders (= 0.61.0) + - ReactCommon/jscallinvoker (0.61.0): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.61.2) - - ReactCommon/turbomodule/core (0.61.2): + - React-cxxreact (= 0.61.0) + - ReactCommon/turbomodule/core (0.61.0): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-Core (= 0.61.2) - - React-cxxreact (= 0.61.2) - - React-jsi (= 0.61.2) - - ReactCommon/jscallinvoker (= 0.61.2) + - React-Core (= 0.61.0) + - React-cxxreact (= 0.61.0) + - React-jsi (= 0.61.0) + - ReactCommon/jscallinvoker (= 0.61.0) - RNReanimated (1.3.0): - React - Yoga (1.14.0) @@ -313,31 +313,31 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 - FBLazyVector: 68b6a76960fbd8ecd9fb7ce0aadd3329c3340a99 - FBReactNativeSpec: 5a764c60abdc3336a213e5310c40b74741f32839 + FBLazyVector: 815d415da87ffb4308b229ffe4b531799d118c6c + FBReactNativeSpec: a43dfecd1f9e31d5729a38adafba1790c4c6c950 Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 glog: 1f3da668190260b06b429bb211bfbee5cd790c28 - RCTRequired: c639d59ed389cfb1f1203f65c2ea946d8ec586e2 - RCTTypeSafety: dc23fb655d6c77667c78e327bf661bc11e3b8aec - React: 7e586e5d7bec12b91c1a096826b0fc9ab1da7865 - React-Core: 8ddb9770b4a30a6ab4a754e6ed5ec76454e3d699 - React-CoreModules: b3d9eece8ad7df36c917a41f05c1168c52fe0b34 - React-cxxreact: 1f972757c0bd08d962ef78068e06613c27489a3f - React-jsi: 32285a21b1b24c36060493ed3057a34677d58d09 - React-jsiexecutor: 8909917ff7d8f21a57e443a866fd8d4560e50c65 - React-jsinspector: 111d7d342b07a904c400592e02a2b958f1098b60 - React-RCTActionSheet: 89b037c0fb7d2671607cb645760164e7e0c013f6 - React-RCTAnimation: e3cefa93c38c004c318f7ec04b883eb14b8b8235 - React-RCTBlob: d26ac0e313fbf14e7203473fd593ccaaeee8329e - React-RCTImage: 4bdd9588783fa9e48ef669ccd4f747224e208edf - React-RCTLinking: 65f0088ff463babd3d5d567964a65b74141eff3b - React-RCTNetwork: 0c1a73576c1cfeafe68396556de1b17d93c0c595 - React-RCTSettings: 4194f1f0edbddf3fd44d1714dc6578bb20379b60 - React-RCTText: e3ef6191cdb627855ff7fe8fa0c1e14094967fb8 - React-RCTVibration: fb54c732fd20405a76598e431aa2f8c2bf527de9 - ReactCommon: 5848032ed2f274fcb40f6b9ec24067787c42d479 + RCTRequired: 1f0d5c0baf372e291f70b6b1275b19142bdce931 + RCTTypeSafety: 3b7329bbb97065c1f6ff7157f8eaf0da60fdc13d + React: e419a1c0c3afe96300511585756bbea2f9f35e04 + React-Core: 8a505361c3ebe5ad216d52ca5f007a65ef63e5b6 + React-CoreModules: 47a3d75d3afd7089a5d2dd55dab08887ed1afa4c + React-cxxreact: 4c6e3ec3e5f0ffcb659a3612a1e59a2144f21754 + React-jsi: 4b5e521350c455b5eb4be50ea98c02de25b44fad + React-jsiexecutor: 5532ab4389aabbbf1b87904de04c8ddd7dda7036 + React-jsinspector: 99b82aeb51d67d9025ab4eb8ccb8132f8dcebf69 + React-RCTActionSheet: 5f9a1733ec8e380aae8a97877f1166cb058733ae + React-RCTAnimation: 3e0a55305b70b1eb5a5e34230ed8198d4a782da9 + React-RCTBlob: a6ff2220ed7ef4b06e559ec61a0b0f4e80a3716a + React-RCTImage: c814a1f15e26a4736dedc4468748889eb68fdc2c + React-RCTLinking: 2c0e8c6129460aec97a049b63d888392671e87b5 + React-RCTNetwork: e1c46d5a4476c485690bfb9fb59cc9db054ace74 + React-RCTSettings: c7891181cc13b7b47e7669ca533a159dc7039914 + React-RCTText: beb19a6c50072a1a2f617490ea967237c98d1dfc + React-RCTVibration: c8e67f140a83a14a1ad9042950cca08ab29423fd + ReactCommon: 584ef683c340894c1c82be43ce760390493ae8bf RNReanimated: 6abbbae2e5e72609d85aabd92a982a94566885f1 - Yoga: 14927e37bd25376d216b150ab2a561773d57911f + Yoga: 3f70bbd9aa01e04eefec36e2a085b2fc0ff1dd98 PODFILE CHECKSUM: 44d7369b5010fb247eb67d89c07f93ac2507fdb6 diff --git a/js/packages/storybook-mobile/metro.config.js b/js/packages/storybook-mobile/metro.config.js index 9c87af5fef..ece97b3b15 100644 --- a/js/packages/storybook-mobile/metro.config.js +++ b/js/packages/storybook-mobile/metro.config.js @@ -5,6 +5,7 @@ * @format */ +const fs = require('fs') const path = require('path') const glob = require('glob') @@ -27,7 +28,14 @@ module.exports = { extraNodeModules: new Proxy( {}, { - get: (target, name) => path.join(__dirname, `node_modules/${name}`), + get: (target, name) => { + const current = path.join(__dirname, `node_modules/${name}`) + const root = path.join(__dirname, `../node_modules/${name}`) + if (fs.existsSync(current)) { + return current + } + return root + }, } ), }, diff --git a/js/packages/storybook-mobile/package.json b/js/packages/storybook-mobile/package.json index 596925573e..0ba94002dd 100644 --- a/js/packages/storybook-mobile/package.json +++ b/js/packages/storybook-mobile/package.json @@ -14,14 +14,6 @@ "homepage": "https://github.com/berty/berty/tree/master/packages/storybook-mobile#readme", "author": "Berty Technologies ", "keywords": [], - "main": "lib/storybook-mobile.js", - "files": [ - "lib" - ], - "directories": { - "lib": "lib", - "test": "__tests__" - }, "publishConfig": { "access": "restricted" }, @@ -34,7 +26,6 @@ "@berty-tech/shared-storybook": "^0.0.0", "@storybook/addon-links": "^5.2.1", "glob": "^7.1.4", - "react-native-reanimated": "^1.3.0", "react-native-storybook-loader": "^1.8.1", "@babel/core": "^7.6.2", "@babel/runtime": "^7.6.2", @@ -47,7 +38,8 @@ "eslint": "^6.4.0", "jest": "^24.9.0", "react": "^16.9.0", - "react-native": "^0.61.1", - "react-test-renderer": "^16.9.0" + "react-native": "0.61.0", + "react-test-renderer": "^16.9.0", + "react-native-reanimated": "^1.3.0" } } diff --git a/js/packages/storybook-mobile/storybook/storyLoader.js b/js/packages/storybook-mobile/storybook/storyLoader.js index 176f3b5933..6879d71a04 100644 --- a/js/packages/storybook-mobile/storybook/storyLoader.js +++ b/js/packages/storybook-mobile/storybook/storyLoader.js @@ -4,16 +4,16 @@ // https://github.com/elderfo/react-native-storybook-loader.git function loadStories() { - require('../../berty-storybook/storybook') - require('../../shared-storybook/storybook') + require('../../berty-storybook/storybook'); + require('../../shared-storybook/storybook'); } const stories = [ - '../../berty-storybook/storybook', - '../../shared-storybook/storybook', -] + '../../berty-storybook/storybook', + '../../shared-storybook/storybook' +]; module.exports = { loadStories, stories, -} +}; diff --git a/js/yarn.lock b/js/yarn.lock index af8d4645f1..d15aa25493 100644 --- a/js/yarn.lock +++ b/js/yarn.lock @@ -2436,19 +2436,6 @@ react-lifecycles-compat "^3.0.4" warning "^3.0.0" -"@react-native-community/cli-platform-android@^2.6.0", "@react-native-community/cli-platform-android@^2.9.0": - version "2.9.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-2.9.0.tgz#28831e61ce565a2c7d1905852fce1eecfd33cb5e" - integrity sha512-VEQs4Q6R5tnlYFrQIFoPEWjLc43whRHC9HeH+idbFymwDqysLVUffQbb9D6PJUj+C/AvrDhBhU6S3tDjGbSsag== - dependencies: - "@react-native-community/cli-tools" "^2.8.3" - chalk "^2.4.2" - execa "^1.0.0" - jetifier "^1.6.2" - logkitty "^0.6.0" - slash "^3.0.0" - xmldoc "^1.1.2" - "@react-native-community/cli-platform-android@^3.0.0-alpha.1", "@react-native-community/cli-platform-android@^3.0.0-alpha.2": version "3.0.0-alpha.2" resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-3.0.0-alpha.2.tgz#63cb00060c58a87d04b46229ef7140e056551dfa" @@ -2462,15 +2449,6 @@ slash "^3.0.0" xmldoc "^1.1.2" -"@react-native-community/cli-platform-ios@^2.4.1", "@react-native-community/cli-platform-ios@^2.9.0": - version "2.9.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-2.9.0.tgz#21adb8ee813d6ca6fd9d4d9be63f92024f7e2fe7" - integrity sha512-vg6EOamtFaaQ02FiWu+jzJTfeTJ0OVjJSAoR2rhJKNye6RgJLoQlfp0Hg3waF6XrO72a7afYZsPdKSlN3ewlHg== - dependencies: - "@react-native-community/cli-tools" "^2.8.3" - chalk "^2.4.2" - xcode "^2.0.0" - "@react-native-community/cli-platform-ios@^3.0.0-alpha.1", "@react-native-community/cli-platform-ios@^3.0.0-alpha.2": version "3.0.0-alpha.2" resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-3.0.0-alpha.2.tgz#c89e1a164f1dab62a8a024ae38b47eb0281e6ab9" @@ -2490,45 +2468,6 @@ mime "^2.4.1" node-fetch "^2.5.0" -"@react-native-community/cli@^2.6.0": - version "2.9.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-2.9.0.tgz#f0d18dc3e5a8f68e3d6ad353c444dc2f08d3fbdc" - integrity sha512-6TYkrR1pwIEPpiPZnOYscCGr5Xh8RijqBPVAOGTaEdpQQpc/J7GDPrePwbyTzwmCPtiK6XT+T5+1AiAK5bz/sw== - dependencies: - "@hapi/joi" "^15.0.3" - "@react-native-community/cli-platform-android" "^2.9.0" - "@react-native-community/cli-platform-ios" "^2.9.0" - "@react-native-community/cli-tools" "^2.8.3" - chalk "^2.4.2" - commander "^2.19.0" - compression "^1.7.1" - connect "^3.6.5" - cosmiconfig "^5.1.0" - deepmerge "^3.2.0" - envinfo "^7.1.0" - errorhandler "^1.5.0" - execa "^1.0.0" - fs-extra "^7.0.1" - glob "^7.1.1" - graceful-fs "^4.1.3" - inquirer "^3.0.6" - lodash "^4.17.5" - metro "^0.54.1" - metro-config "^0.54.1" - metro-core "^0.54.1" - metro-react-native-babel-transformer "^0.54.1" - minimist "^1.2.0" - mkdirp "^0.5.1" - morgan "^1.9.0" - node-notifier "^5.2.1" - open "^6.2.0" - ora "^3.4.0" - plist "^3.0.0" - semver "^5.0.3" - serve-static "^1.13.1" - shell-quote "1.6.1" - ws "^1.1.0" - "@react-native-community/cli@^3.0.0-alpha.1": version "3.0.0-alpha.2" resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-3.0.0-alpha.2.tgz#0f5b8aad800ab2633e699b3883534420e7926692" @@ -8700,7 +8639,7 @@ global-prefix@^3.0.0: kind-of "^6.0.2" which "^1.3.1" -global@^4.3.0, global@^4.3.2: +global@^4.3.2: version "4.4.0" resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w== @@ -8999,11 +8938,6 @@ hermes-engine@^0.2.1: resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.2.1.tgz#25c0f1ff852512a92cb5c5cc47cf967e1e722ea2" integrity sha512-eNHUQHuadDMJARpaqvlCZoK/Nitpj6oywq3vQ3wCwEsww5morX34mW5PmKWQTO7aU0ck0hgulxR+EVDlXygGxQ== -hermesvm@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/hermesvm/-/hermesvm-0.1.1.tgz#bd1df92b4dc504e261c23df34864daf24b844d03" - integrity sha512-EosSDeUqTTGvlc9vQiy5Y/9GBlucEyo6lYuxg/FnukHCD/CP3NYeDAGV54TyZ19FgSqMEoPgOH9cyxvv8epQ1g== - hex-color-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" @@ -10549,7 +10483,7 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsc-android@245459.0.0, jsc-android@^245459.0.0: +jsc-android@^245459.0.0: version "245459.0.0" resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-245459.0.0.tgz#e584258dd0b04c9159a27fb104cd5d491fd202c9" integrity sha512-wkjURqwaB1daNkDi2OYYbsLnIdC/lUM2nPXQKRs5pqEU9chDg435bjvo+LSaHotDENygHQDHe+ntUkkw2gwMtg== @@ -11124,7 +11058,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -"lodash@>=3.5 <5", lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1, lodash@^4.8.0: +"lodash@>=3.5 <5", lodash@^4.0.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.8.0: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== @@ -11462,24 +11396,6 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -metro-babel-register@0.54.1: - version "0.54.1" - resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.54.1.tgz#7d2bfe444b1ccef8de99aedc7d9330891d806076" - integrity sha512-j3VydgncUG8HP6AZala6GTIt3V01nptodnnOke3JMYLqgk8EJ1LOVOdotK9pXi80o7EmmNKFs/LyyH8z+uAJzQ== - dependencies: - "@babel/core" "^7.0.0" - "@babel/plugin-proposal-class-properties" "^7.0.0" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0" - "@babel/plugin-proposal-object-rest-spread" "^7.0.0" - "@babel/plugin-proposal-optional-catch-binding" "^7.0.0" - "@babel/plugin-proposal-optional-chaining" "^7.0.0" - "@babel/plugin-transform-async-to-generator" "^7.0.0" - "@babel/plugin-transform-flow-strip-types" "^7.0.0" - "@babel/plugin-transform-modules-commonjs" "^7.0.0" - "@babel/register" "^7.0.0" - core-js "^2.2.2" - escape-string-regexp "^1.0.5" - metro-babel-register@0.56.0, metro-babel-register@^0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.56.0.tgz#f5eb41b2d7be4297367292dd545fda898e9158a7" @@ -11498,13 +11414,6 @@ metro-babel-register@0.56.0, metro-babel-register@^0.56.0: core-js "^2.2.2" escape-string-regexp "^1.0.5" -metro-babel-transformer@0.54.1: - version "0.54.1" - resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.54.1.tgz#371ffa2d1118b22cc9e40b3c3ea6738c49dae9dc" - integrity sha512-2aiAnuYBdcLV1VINb8ENAA4keIaJIepHgR9+iRvIde+9GSjKnexqx4nNmJN392285gRDp1fVZ7uY0uQawK/A5g== - dependencies: - "@babel/core" "^7.0.0" - metro-babel-transformer@0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.56.0.tgz#1ee73c7d97aee8671b7f0983a41e928f4802a08e" @@ -11513,23 +11422,6 @@ metro-babel-transformer@0.56.0: "@babel/core" "^7.0.0" metro-source-map "0.56.0" -metro-babel7-plugin-react-transform@0.54.1: - version "0.54.1" - resolved "https://registry.yarnpkg.com/metro-babel7-plugin-react-transform/-/metro-babel7-plugin-react-transform-0.54.1.tgz#5335b810284789724886dc483d5bde9c149a1996" - integrity sha512-jWm5myuMoZAOhoPsa8ItfDxdTcOzKhTTzzhFlbZnRamE7i9qybeMdrZt8KHQpF7i2p/mKzE9Yhf4ouOz5K/jHg== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - -metro-cache@0.54.1: - version "0.54.1" - resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.54.1.tgz#2e9017cbd11106837b8c385c9eb8c8175469a8c1" - integrity sha512-RxCFoNcANHXZYi4MIQNnqh68gUnC3bMpzCFJY5pBoqqdrkkn8ibYglBweA0/DW7hx1OZTJWelwS1Dp8xxmE2CA== - dependencies: - jest-serializer "^24.4.0" - metro-core "0.54.1" - mkdirp "^0.5.1" - rimraf "^2.5.4" - metro-cache@0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.56.0.tgz#213a8d5fad6c695ece841e8ef961285607295511" @@ -11540,18 +11432,6 @@ metro-cache@0.56.0: mkdirp "^0.5.1" rimraf "^2.5.4" -metro-config@0.54.1, metro-config@^0.54.1: - version "0.54.1" - resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.54.1.tgz#808b4e17625d9f4e9afa34232778fdf8e63cc8dd" - integrity sha512-FpxrA+63rGkPGvGI653dvuSreJzU+eOTILItVnnhmqwn2SAK5V00N/qGTOIJe2YIuWEFXwCzw9lXmANrXbwuGg== - dependencies: - cosmiconfig "^5.0.5" - jest-validate "^24.7.0" - metro "0.54.1" - metro-cache "0.54.1" - metro-core "0.54.1" - pretty-format "^24.7.0" - metro-config@0.56.0, metro-config@^0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/metro-config/-/metro-config-0.56.0.tgz#8e4dae8df7bfa3d37b754240bc76db87aebc6348" @@ -11564,16 +11444,6 @@ metro-config@0.56.0, metro-config@^0.56.0: metro-core "0.56.0" pretty-format "^24.7.0" -metro-core@0.54.1, metro-core@^0.54.1: - version "0.54.1" - resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.54.1.tgz#17f6ecc167918da8819d4af5726349e55714954b" - integrity sha512-8oz3Ck7QFBzW9dG9tKFhrXHKPu2Ajx3R7eatf61Gl6Jf/tF7PNouv3wHxPsJW3oXDFiwKLszd89+OgleTGkB5g== - dependencies: - jest-haste-map "^24.7.1" - lodash.throttle "^4.1.1" - metro-resolver "0.54.1" - wordwrap "^1.0.0" - metro-core@0.56.0, metro-core@^0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/metro-core/-/metro-core-0.56.0.tgz#ea1175fdfc1685bc62a28eca33edd48ec0030339" @@ -11584,17 +11454,6 @@ metro-core@0.56.0, metro-core@^0.56.0: metro-resolver "0.56.0" wordwrap "^1.0.0" -metro-inspector-proxy@0.54.1: - version "0.54.1" - resolved "https://registry.yarnpkg.com/metro-inspector-proxy/-/metro-inspector-proxy-0.54.1.tgz#0ef48ee3feb11c6da47aa100151a9bf2a7c358ee" - integrity sha512-sf6kNu7PgFW6U+hU7YGZfbAUKAPVvCJhY8YVu/A1RMKH9nNULrCo+jlWh0gWgmFfWRQiAPCElevROg+5somk8A== - dependencies: - connect "^3.6.5" - debug "^2.2.0" - rxjs "^5.4.3" - ws "^1.1.5" - yargs "^9.0.0" - metro-inspector-proxy@0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/metro-inspector-proxy/-/metro-inspector-proxy-0.56.0.tgz#78a0590f018ea255f86824a425958b7dd74b84df" @@ -11606,13 +11465,6 @@ metro-inspector-proxy@0.56.0: ws "^1.1.5" yargs "^9.0.0" -metro-minify-uglify@0.54.1: - version "0.54.1" - resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.54.1.tgz#54ed1cb349245ce82dba8cc662bbf69fbca142c3" - integrity sha512-z+pOPna/8IxD4OhjW6Xo1mV2EszgqqQHqBm1FdmtdF6IpWkQp33qpDBNEi9NGZTOr7pp2bvcxZnvNJdC2lrK9Q== - dependencies: - uglify-es "^3.1.9" - metro-minify-uglify@0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/metro-minify-uglify/-/metro-minify-uglify-0.56.0.tgz#1a4aa32fb5326deb7c36eb8e0a113dc3daaf287a" @@ -11620,48 +11472,6 @@ metro-minify-uglify@0.56.0: dependencies: uglify-es "^3.1.9" -metro-react-native-babel-preset@0.54.1: - version "0.54.1" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.54.1.tgz#b8f03865c381841d7f8912e7ba46804ea3a928b8" - integrity sha512-Hfr32+u5yYl3qhYQJU8NQ26g4kQlc3yFMg7keVR/3H8rwBIbFqXgsKt8oe0dOrv7WvrMqBHhDtVdU9ls3sSq8g== - dependencies: - "@babel/plugin-proposal-class-properties" "^7.0.0" - "@babel/plugin-proposal-export-default-from" "^7.0.0" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0" - "@babel/plugin-proposal-object-rest-spread" "^7.0.0" - "@babel/plugin-proposal-optional-catch-binding" "^7.0.0" - "@babel/plugin-proposal-optional-chaining" "^7.0.0" - "@babel/plugin-syntax-dynamic-import" "^7.0.0" - "@babel/plugin-syntax-export-default-from" "^7.0.0" - "@babel/plugin-syntax-flow" "^7.2.0" - "@babel/plugin-transform-arrow-functions" "^7.0.0" - "@babel/plugin-transform-block-scoping" "^7.0.0" - "@babel/plugin-transform-classes" "^7.0.0" - "@babel/plugin-transform-computed-properties" "^7.0.0" - "@babel/plugin-transform-destructuring" "^7.0.0" - "@babel/plugin-transform-exponentiation-operator" "^7.0.0" - "@babel/plugin-transform-flow-strip-types" "^7.0.0" - "@babel/plugin-transform-for-of" "^7.0.0" - "@babel/plugin-transform-function-name" "^7.0.0" - "@babel/plugin-transform-literals" "^7.0.0" - "@babel/plugin-transform-modules-commonjs" "^7.0.0" - "@babel/plugin-transform-object-assign" "^7.0.0" - "@babel/plugin-transform-parameters" "^7.0.0" - "@babel/plugin-transform-react-display-name" "^7.0.0" - "@babel/plugin-transform-react-jsx" "^7.0.0" - "@babel/plugin-transform-react-jsx-source" "^7.0.0" - "@babel/plugin-transform-regenerator" "^7.0.0" - "@babel/plugin-transform-runtime" "^7.0.0" - "@babel/plugin-transform-shorthand-properties" "^7.0.0" - "@babel/plugin-transform-spread" "^7.0.0" - "@babel/plugin-transform-sticky-regex" "^7.0.0" - "@babel/plugin-transform-template-literals" "^7.0.0" - "@babel/plugin-transform-typescript" "^7.0.0" - "@babel/plugin-transform-unicode-regex" "^7.0.0" - "@babel/template" "^7.0.0" - metro-babel7-plugin-react-transform "0.54.1" - react-transform-hmr "^1.0.4" - metro-react-native-babel-preset@0.56.0, metro-react-native-babel-preset@^0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.56.0.tgz#fa47dfd5f7678e89cffd1249020b8add6938fc48" @@ -11703,16 +11513,6 @@ metro-react-native-babel-preset@0.56.0, metro-react-native-babel-preset@^0.56.0: "@babel/template" "^7.0.0" react-refresh "^0.4.0" -metro-react-native-babel-transformer@0.54.1, metro-react-native-babel-transformer@^0.54.1: - version "0.54.1" - resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.54.1.tgz#45b56db004421134e10e739f69e8de50775fef17" - integrity sha512-ECw7xG91t8dk/PHdiyoC5SP1s9OQzfmJzG5m0YOZaKtHMe534qTDbncxaKfTI3CP99yti2maXFBRVj+xyvph/g== - dependencies: - "@babel/core" "^7.0.0" - babel-preset-fbjs "^3.1.2" - metro-babel-transformer "0.54.1" - metro-react-native-babel-preset "0.54.1" - metro-react-native-babel-transformer@^0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.56.0.tgz#43198b54d9d88acfc9fa6cbdd22fec0e871966da" @@ -11724,13 +11524,6 @@ metro-react-native-babel-transformer@^0.56.0: metro-react-native-babel-preset "0.56.0" metro-source-map "0.56.0" -metro-resolver@0.54.1: - version "0.54.1" - resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.54.1.tgz#0295b38624b678b88b16bf11d47288845132b087" - integrity sha512-Byv1LIawYAASy9CFRwzrncYnqaFGLe8vpw178EtzStqP05Hu6hXSqkNTrfoXa+3V9bPFGCrVzFx2NY3gFp2btg== - dependencies: - absolute-path "^0.0.0" - metro-resolver@0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.56.0.tgz#e9d69ae2daf8c25c19492f75bc55db85f6ec2b3e" @@ -11738,28 +11531,6 @@ metro-resolver@0.56.0: dependencies: absolute-path "^0.0.0" -metro-source-map@0.54.1: - version "0.54.1" - resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.54.1.tgz#e17bad53c11978197d3c05c9168d799c2e04dcc5" - integrity sha512-E9iSYMSUSq5qYi1R2hTQtxH4Mxjzfgr/jaSmQIWi7h3fG2P1qOZNNSzeaeUeTK+s2N/ksVlkcL5kMikol8CDrQ== - dependencies: - "@babel/traverse" "^7.0.0" - "@babel/types" "^7.0.0" - source-map "^0.5.6" - -metro-source-map@0.55.0, metro-source-map@^0.55.0: - version "0.55.0" - resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.55.0.tgz#1f6289905f08277c398f2b9b9c13e7e0e5a6f540" - integrity sha512-HZODA0KPl5onJNGIztfTHHWurR2nL6Je/X8wwj+bL4ZBB/hSMVeDk7rWReCAvO3twVz7Ztp8Si0jfMmmH4Ruuw== - dependencies: - "@babel/traverse" "^7.0.0" - "@babel/types" "^7.0.0" - invariant "^2.2.4" - metro-symbolicate "0.55.0" - ob1 "0.55.0" - source-map "^0.5.6" - vlq "^1.0.0" - metro-source-map@0.56.0, metro-source-map@^0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.56.0.tgz#dd2db425d8245661563045336d10c52bc8d4b27d" @@ -11773,16 +11544,6 @@ metro-source-map@0.56.0, metro-source-map@^0.56.0: source-map "^0.5.6" vlq "^1.0.0" -metro-symbolicate@0.55.0: - version "0.55.0" - resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.55.0.tgz#4086a2adae54b5e44a4911ca572d8a7b03c71fa1" - integrity sha512-3r3Gpv5L4U7rBGpIqw5S1nun5MelfUMLRiScJsPRGZVTX3WY1w+zpaQKlWBi5yuHf5dMQ+ZUVbhb02IdrfJ2Fg== - dependencies: - metro-source-map "0.55.0" - source-map "^0.5.6" - through2 "^2.0.1" - vlq "^1.0.0" - metro-symbolicate@0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.56.0.tgz#694701faee7dafc53bd4d8488495504546e9c5b4" @@ -11794,65 +11555,6 @@ metro-symbolicate@0.56.0: through2 "^2.0.1" vlq "^1.0.0" -metro@0.54.1, metro@^0.54.1: - version "0.54.1" - resolved "https://registry.yarnpkg.com/metro/-/metro-0.54.1.tgz#a629be00abee5a450a25a8f71c24745f70cc9b44" - integrity sha512-6ODPT4mEo4FCpbExRNnQAcZmf1VeNvYOTMj2Na03FjGqhNODHhI2U/wF/Ul5gqTyJ2dVdkXeyvKW3gl/LrnJRg== - dependencies: - "@babel/core" "^7.0.0" - "@babel/generator" "^7.0.0" - "@babel/parser" "^7.0.0" - "@babel/plugin-external-helpers" "^7.0.0" - "@babel/template" "^7.0.0" - "@babel/traverse" "^7.0.0" - "@babel/types" "^7.0.0" - absolute-path "^0.0.0" - async "^2.4.0" - babel-preset-fbjs "^3.1.2" - buffer-crc32 "^0.2.13" - chalk "^2.4.1" - concat-stream "^1.6.0" - connect "^3.6.5" - debug "^2.2.0" - denodeify "^1.2.1" - eventemitter3 "^3.0.0" - fbjs "^1.0.0" - fs-extra "^1.0.0" - graceful-fs "^4.1.3" - image-size "^0.6.0" - invariant "^2.2.4" - jest-haste-map "^24.7.1" - jest-worker "^24.6.0" - json-stable-stringify "^1.0.1" - lodash.throttle "^4.1.1" - merge-stream "^1.0.1" - metro-babel-register "0.54.1" - metro-babel-transformer "0.54.1" - metro-cache "0.54.1" - metro-config "0.54.1" - metro-core "0.54.1" - metro-inspector-proxy "0.54.1" - metro-minify-uglify "0.54.1" - metro-react-native-babel-preset "0.54.1" - metro-resolver "0.54.1" - metro-source-map "0.54.1" - mime-types "2.1.11" - mkdirp "^0.5.1" - node-fetch "^2.2.0" - nullthrows "^1.1.0" - react-transform-hmr "^1.0.4" - resolve "^1.5.0" - rimraf "^2.5.4" - serialize-error "^2.1.0" - source-map "^0.5.6" - temp "0.8.3" - throat "^4.1.0" - wordwrap "^1.0.0" - write-file-atomic "^1.2.0" - ws "^1.1.5" - xpipe "^1.0.5" - yargs "^9.0.0" - metro@0.56.0, metro@^0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/metro/-/metro-0.56.0.tgz#66b77085ac4cb1e3d72569e851499a3d82d19316" @@ -12632,11 +12334,6 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -ob1@0.55.0: - version "0.55.0" - resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.55.0.tgz#e393b4ae786ef442b3ef2a298ab70d6ec353dbdd" - integrity sha512-pfyiMVsUItl8WiRKMT15eCi662pCRAuYTq2+V3UpE+PpFErJI/TvRh/M/l/9TaLlbFr7krJ7gdl+FXJNcybmvw== - ob1@0.56.0: version "0.56.0" resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.56.0.tgz#70107c65697e617e9e2728fdc03da9e3ab6afef8" @@ -14641,11 +14338,6 @@ react-color@^2.17.0: reactcss "^1.2.0" tinycolor2 "^1.4.1" -react-deep-force-update@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-1.1.2.tgz#3d2ae45c2c9040cbb1772be52f8ea1ade6ca2ee1" - integrity sha512-WUSQJ4P/wWcusaH+zZmbECOk7H5N2pOIl0vzheeornkIMhu+qrNdGFm0bDZLCb0hSF0jf/kH1SgkNGfBdTc4wA== - react-dev-utils@^9.0.0, react-dev-utils@^9.1.0: version "9.1.0" resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.1.0.tgz#3ad2bb8848a32319d760d0a84c56c14bdaae5e81" @@ -14677,7 +14369,7 @@ react-dev-utils@^9.0.0, react-dev-utils@^9.1.0: strip-ansi "5.2.0" text-table "0.2.0" -react-devtools-core@^3.6.1, react-devtools-core@^3.6.3: +react-devtools-core@^3.6.3: version "3.6.3" resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-3.6.3.tgz#977d95b684c6ad28205f0c62e1e12c5f16675814" integrity sha512-+P+eFy/yo8Z/UH9J0DqHZuUM5+RI2wl249TNvMx3J2jpUomLQa4Zxl56GEotGfw3PIP1eI+hVf1s53FlUONStQ== @@ -14852,13 +14544,6 @@ react-native-swipe-gestures@^1.0.3: resolved "https://registry.yarnpkg.com/react-native-swipe-gestures/-/react-native-swipe-gestures-1.0.4.tgz#6a9c6613bfe06cd9014a36a2c4a09f719ff62451" integrity sha512-C/vz0KPHNyqHk3uF4Cz/jzd/0N8z34ZgsjAZUh/RsXPH2FtJJf3Fw73pQDWJSoCMtvVadlztb8xQ+/aEQrll7w== -react-native-swiper@^1.5.14: - version "1.5.14" - resolved "https://registry.yarnpkg.com/react-native-swiper/-/react-native-swiper-1.5.14.tgz#1c6f949ca377186300f972bb0f30d24062c899aa" - integrity sha512-Kn0fxKooN7Shwu1qJYHB+Y8ssXXnvrIwReHXU5jCdyYNfz2QbBv0Cv3sa2Mqzr+XgzORCFFIokc8uCCUITDrVA== - dependencies: - prop-types "^15.5.10" - react-native-swiper@^1.6.0-rc.1: version "1.6.0-rc.1" resolved "https://registry.yarnpkg.com/react-native-swiper/-/react-native-swiper-1.6.0-rc.1.tgz#d97363a9a8d1b7f52ea4491714ee6b48a8669c27" @@ -14906,44 +14591,10 @@ react-native-web@^0.11.7: prop-types "^15.6.0" react-timer-mixin "^0.13.4" -react-native@^0.60.5: - version "0.60.6" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.60.6.tgz#8a13dece1c3f6e01db0833db14d2b01b2d8ccba5" - integrity sha512-eIoHh0fncrmw2WUs42D1KwLfatOuLFLFLOKzJJJ8mOOQtbo9i2rOOa0+2iWjefDoAy8BJH88bQGvDvlrexmhow== - dependencies: - "@babel/runtime" "^7.0.0" - "@react-native-community/cli" "^2.6.0" - "@react-native-community/cli-platform-android" "^2.6.0" - "@react-native-community/cli-platform-ios" "^2.4.1" - abort-controller "^3.0.0" - art "^0.10.0" - base64-js "^1.1.2" - connect "^3.6.5" - create-react-class "^15.6.3" - escape-string-regexp "^1.0.5" - event-target-shim "^5.0.1" - fbjs "^1.0.0" - fbjs-scripts "^1.1.0" - hermesvm "^0.1.0" - invariant "^2.2.4" - jsc-android "245459.0.0" - metro-babel-register "0.54.1" - metro-react-native-babel-transformer "0.54.1" - metro-source-map "^0.55.0" - nullthrows "^1.1.0" - pretty-format "^24.7.0" - promise "^7.1.1" - prop-types "^15.7.2" - react-devtools-core "^3.6.1" - regenerator-runtime "^0.13.2" - scheduler "0.14.0" - stacktrace-parser "^0.1.3" - whatwg-fetch "^3.0.0" - -react-native@^0.61.1: - version "0.61.2" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.61.2.tgz#987b91b063557f8ebec803fdfea2044a24bdbe4d" - integrity sha512-hhd8bYbkkZYHoOndxUwbjJ6Yd9HFn5PvwqqS41uJ1xADdw44rx/svuwmJNA1RKF7jH74uR2jpBViWYGd36zGyg== +react-native@0.61.0: + version "0.61.0" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.61.0.tgz#e9fc06cd9976295b11f7f1f72e4b840f0edd5d8e" + integrity sha512-JCpGS5bADDM4jCp3lylVPEY3ovvmV64VHxesofvpoKuMf8KWiItfQ48+EUP48mciTbSOsC75KCXy9bTPttiOMw== dependencies: "@babel/runtime" "^7.0.0" "@react-native-community/cli" "^3.0.0-alpha.1" @@ -14995,14 +14646,6 @@ react-popper@^1.3.3: typed-styles "^0.0.7" warning "^4.0.2" -react-proxy@^1.1.7: - version "1.1.8" - resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-1.1.8.tgz#9dbfd9d927528c3aa9f444e4558c37830ab8c26a" - integrity sha1-nb/Z2SdSjDqp9ETkVYw3gwq4wmo= - dependencies: - lodash "^4.6.1" - react-deep-force-update "^1.0.0" - react-refresh@^0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.2.tgz#54a277a6caaac2803d88f1d6f13c1dcfbd81e334" @@ -15127,14 +14770,6 @@ react-timer-mixin@^0.13.4: resolved "https://registry.yarnpkg.com/react-timer-mixin/-/react-timer-mixin-0.13.4.tgz#75a00c3c94c13abe29b43d63b4c65a88fc8264d3" integrity sha512-4+ow23tp/Tv7hBM5Az5/Be/eKKF7DIvJ09voz5LyHGQaqqz9WV8YMs31eFvcYQs7d451LSg7kDJV70XYN/Ug/Q== -react-transform-hmr@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/react-transform-hmr/-/react-transform-hmr-1.0.4.tgz#e1a40bd0aaefc72e8dfd7a7cda09af85066397bb" - integrity sha1-4aQL0Krvxy6N/Xp82gmvhQZjl7s= - dependencies: - global "^4.3.0" - react-proxy "^1.1.7" - react-transition-group@^2.2.1: version "2.9.0" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d" @@ -15882,14 +15517,6 @@ saxes@^3.1.9: dependencies: xmlchars "^2.1.1" -scheduler@0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.14.0.tgz#b392c23c9c14bfa2933d4740ad5603cc0d59ea5b" - integrity sha512-9CgbS06Kki2f4R9FjLSITjZo5BZxPsryiRNyL3LpvrM9WxcVmhlqAOc9E+KQbeI2nqej4JIIbOsfdL51cNb4Iw== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler@0.15.0: version "0.15.0" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz#6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e"