fix(storybook): force hoist react for hooks compatibility

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Oct 9, 2019 · 6f84234 · 6f84234
1 parent cbfbecc
commit 6f84234
Show file tree

Hide file tree

Showing 13 changed files with 195 additions and 579 deletions.
diff --git a/js/Makefile b/js/Makefile
@@ -8,8 +8,6 @@ author = Berty Technologies <oss@berty.tech>
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 &