Skip to content
This repository has been archived by the owner on Dec 21, 2023. It is now read-only.

Expo SDK 46 Beta #1307

Merged
merged 2 commits into from
Jul 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 18 additions & 21 deletions apps/expo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"@capsizecss/core": "^3.0.0",
"@ethersproject/shims": "^5.5.0",
"@gorhom/bottom-sheet": "4.3.2",
"@growthbook/growthbook-react": "^0.7.0",
"@hookform/resolvers": "^2.8.5",
"@logrocket/react-native": "^1.2.1",
"@magic-sdk/react-native": "^7.0.0",
Expand All @@ -67,7 +66,6 @@
"@react-three/fiber": "^8.0.12",
"@rudderstack/rudder-sdk-react-native": "^1.4.1",
"@sentry/react-native": "^3.3.0",
"@shopify/react-native-skia": "0.1.123",
"@showtime-xyz/universal.accordion": "^0.0.22",
"@showtime-xyz/universal.activity-indicator": "^0.0.19",
"@showtime-xyz/universal.alert": "^0.0.31",
Expand Down Expand Up @@ -130,30 +128,30 @@
"domain-browser": "^4.22.0",
"dotenv": "^10.0.0",
"events": "^3.3.0",
"expo": "^45.0.2",
"expo": "next",
"expo-app-loading": "~2.0.0",
"expo-application": "~4.1.0",
"expo-av": "~11.2.3",
"expo-blur": "~11.1.0",
"expo-camera": "~12.2.0",
"expo-community-flipper": "^45.0.0",
"expo-constants": "~13.1.1",
"expo-dev-client": "~0.9.5",
"expo-dev-client": "~1.0.1",
"expo-device": "~4.2.0",
"expo-font": "~10.1.0",
"expo-gl": "~11.3.0",
"expo-haptics": "~11.2.0",
"expo-image-picker": "~13.1.1",
"expo-linear-gradient": "~11.3.0",
"expo-linking": "~3.1.0",
"expo-modules-core": "~0.9.2",
"expo-modules-core": "next",
"expo-navigation-bar": "~1.2.0",
"expo-next-react-navigation": "^2.0.2",
"expo-notifications": "~0.15.2",
"expo-notifications": "~0.15.4",
"expo-splash-screen": "~0.15.1",
"expo-status-bar": "~1.3.0",
"expo-system-ui": "~1.2.0",
"expo-updates": "~0.13.1",
"expo-updates": "~0.13.3",
"https-browserify": "~1.0.0",
"inherits": "^2.0.1",
"moti": "^0.17.1",
Expand All @@ -162,10 +160,10 @@
"process": "^0.11.0",
"punycode": "^2.1.1",
"querystring-es3": "~0.2.0",
"react": "18.2.0",
"react": "18.0.0",
"react-dom": "18.2.0",
"react-hook-form": "^7.27.1",
"react-native": "0.68.2",
"react-native": "0.69.1",
"react-native-blob-jsi-helper": "^0.2.1",
"react-native-blurhash": "^1.1.10",
"react-native-cronet": "^0.5.0",
Expand All @@ -189,8 +187,8 @@
"react-native-screens": "~3.11.1",
"react-native-svg": "12.3.0",
"react-native-tab-view-next": "^3.1.3",
"react-native-vision-camera": "2.12.0",
"react-native-web": "0.18.0",
"react-native-vision-camera": "2.14.0",
"react-native-web": "0.18.6",
"react-native-webview": "11.18.1",
"react-string-replace": "^0.4.4",
"readable-stream": "3.6.0",
Expand All @@ -200,7 +198,7 @@
"solito": "^0.0.24",
"stream-browserify": "^3.0.0",
"string_decoder": "~1.3.0",
"three": "^0.139.0",
"three": "^0.142.0",
"timers-browserify": "^2.0.12",
"tty-browserify": "0.0.1",
"twrnc": "^3.3.3",
Expand All @@ -218,7 +216,7 @@
"@babel/core": "^7.16.5",
"@babel/runtime": "^7.16.5",
"@config-plugins/detox": "^1.1.0",
"@expo/xcpretty": "^4.1.0",
"@expo/xcpretty": "^4.2.2",
"@storybook/addon-actions": "~6.3.12",
"@storybook/addon-controls": "~6.3.12",
"@storybook/addon-ondevice-actions": "next",
Expand All @@ -228,21 +226,20 @@
"@storybook/react-native": "next",
"@types/jest": "^27.4.1",
"@types/react": "^18.0.1",
"@types/three": "^0.139.0",
"@types/three": "^0.141.0",
"@types/uuid": "^8.3.4",
"babel-jest": "^28.0.3",
"babel-plugin-dynamic-import-node": "^2.3.3",
"detox": "^19.4.1",
"esbuild": "^0.14.11",
"expo-cli": "^5.4.12",
"jest": "^28.0.3",
"jest-circus": "^28.0.3",
"jest-expo": "^45.0.0-beta.2",
"expo-cli": "^5.5.1",
"jest": "^28.1.3",
"jest-circus": "^28.1.3",
"jest-expo": "^45.0.1",
"jest-next-dynamic": "^1.0.1",
"metro-minify-esbuild": "^0.1.0",
"react-test-renderer": "18.0.0",
"metro-minify-esbuild": "^0.2.0",
"react-test-renderer": "18.2.0",
"semver": "^7.3.5",
"simple-git": "^3.3.0",
"ts-jest": "^27.1.4",
"typescript": "4.7.4",
"zx": "4.3.0"
Expand Down
6 changes: 3 additions & 3 deletions apps/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@biconomy/mexa": "2.0.24",
"@builder.io/partytown": "^0.5.2",
"@coinbase/wallet-sdk": "^3.3.0",
"@growthbook/growthbook-react": "^0.7.0",
"@growthbook/growthbook-react": "^0.9.0",
"@headlessui/react": "^1.6.1",
"@next/bundle-analyzer": "^12.0.4",
"@radix-ui/react-popover": "^0.1.6",
Expand Down Expand Up @@ -47,7 +47,7 @@
"postinstall-postinstall": "^2.1.0",
"raf": "^3.4.1",
"react-native-fast-image": "^8.5.11",
"react-native-web": "0.18.0",
"react-native-web": "0.18.6",
"react-stickynode": "^4.0.0",
"react-string-replace": "^0.4.4",
"remove-markdown": "^0.3.0",
Expand All @@ -60,7 +60,7 @@
},
"devDependencies": {
"@babel/eslint-parser": "^7.16.3",
"@expo/next-adapter": "3.1.7",
"@expo/next-adapter": "4.0.8",
"autoprefixer": "^10.4.7",
"critters": "^0.0.14",
"eslint": "7.32.0",
Expand Down
18 changes: 9 additions & 9 deletions apps/storybook-react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,28 +39,28 @@
"@storybook/addon-ondevice-notes": "next",
"@storybook/react-native": "next",
"design-system": "*",
"expo": "^45.0.2",
"expo": "next",
"expo-asset": "~8.5.0",
"expo-av": "~11.2.3",
"expo-blur": "~11.1.0",
"expo-community-flipper": "^45.0.0",
"expo-constants": "~13.1.1",
"expo-dev-client": "~0.10.0",
"expo-dev-client": "~1.0.1",
"expo-font": "~10.1.0",
"expo-gl": "~11.3.0",
"expo-haptics": "~11.2.0",
"expo-image-picker": "~13.1.1",
"expo-linear-gradient": "~11.3.0",
"expo-linking": "~3.1.0",
"expo-modules-core": "~0.9.2",
"expo-modules-core": "next",
"expo-splash-screen": "~0.15.1",
"expo-status-bar": "~1.3.0",
"expo-system-ui": "~1.2.0",
"expo-updates": "~0.13.2",
"expo-updates": "~0.13.3",
"expo-web-browser": "~10.2.1",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native": "0.68.2",
"react-native": "0.69.1",
"react-native-blob-jsi-helper": "^0.2.1",
"react-native-fast-image": "^8.5.11",
"react-native-flipper": "^0.131.1",
Expand All @@ -75,13 +75,13 @@
"react-native-safe-area-context": "4.2.4",
"react-native-screens": "~3.11.1",
"react-native-svg": "12.3.0",
"react-native-vision-camera": "2.12.0",
"react-native-web": "0.18.0",
"three": "^0.139.0"
"react-native-vision-camera": "2.14.0",
"react-native-web": "0.18.6",
"three": "^0.142.0"
},
"devDependencies": {
"@babel/core": "^7.16.0",
"@types/three": "^0.139.0",
"@types/three": "^0.141.0",
"typescript": "4.7.4"
},
"private": true
Expand Down
2 changes: 1 addition & 1 deletion apps/storybook-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"next": "12.2.3-canary.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-native-web": "0.18.0"
"react-native-web": "0.18.6"
},
"devDependencies": {
"@babel/core": "^7.16.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/app/components/notifications.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
} from "@showtime-xyz/universal.icon";
import { ModalSheet } from "@showtime-xyz/universal.modal-sheet";
import { useRouter } from "@showtime-xyz/universal.router";
import { Spinner } from "@showtime-xyz/universal.spinner/index";
import { Spinner } from "@showtime-xyz/universal.spinner";
import { colors, tw } from "@showtime-xyz/universal.tailwind";
import { Text } from "@showtime-xyz/universal.text";
import { View } from "@showtime-xyz/universal.view";
Expand Down
37 changes: 0 additions & 37 deletions packages/design-system/blurred-background/index.tsx

This file was deleted.

27 changes: 0 additions & 27 deletions patches/@shopify+react-native-skia+0.1.123.patch

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,34 @@ index 0000000..361f5fb
+++ b/node_modules/react-native/scripts/.packager.env
@@ -0,0 +1 @@
+export RCT_METRO_PORT=8081
diff --git a/node_modules/react-native/scripts/react_native_pods.rb b/node_modules/react-native/scripts/react_native_pods.rb
index 7f6ebab..0aecbc1 100644
--- a/node_modules/react-native/scripts/react_native_pods.rb
+++ b/node_modules/react-native/scripts/react_native_pods.rb
@@ -259,6 +259,18 @@ def fix_library_search_paths(installer)
end
end

+def fix_react_bridging_header_search_paths(installer)
+ installer.target_installation_results.pod_target_installation_results
+ .each do |pod_name, target_installation_result|
+ target_installation_result.native_target.build_configurations.each do |config|
+ # For third party modules who have React-bridging dependency to search correct headers
+ config.build_settings['HEADER_SEARCH_PATHS'] ||= '$(inherited) '
+ config.build_settings['HEADER_SEARCH_PATHS'] << '"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging" '
+ config.build_settings['HEADER_SEARCH_PATHS'] << '"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers" '
+ end
+ end
+end
+
def set_node_modules_user_settings(installer, react_native_path)
puts "Setting REACT_NATIVE build settings"
projects = installer.aggregate_targets
@@ -282,6 +294,7 @@ def react_native_post_install(installer, react_native_path = "../node_modules/re

exclude_architectures(installer)
fix_library_search_paths(installer)
+ fix_react_bridging_header_search_paths(installer)

cpp_flags = DEFAULT_OTHER_CPLUSPLUSFLAGS
if ENV['RCT_NEW_ARCH_ENABLED'] == '1'
14 changes: 14 additions & 0 deletions patches/three+0.142.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/node_modules/three/package.json b/node_modules/three/package.json
index eed47fe..45cf472 100644
--- a/node_modules/three/package.json
+++ b/node_modules/three/package.json
@@ -12,7 +12,8 @@
},
"./examples/fonts/*": "./examples/fonts/*",
"./examples/jsm/*": "./examples/jsm/*",
- "./src/*": "./src/*"
+ "./src/*": "./src/*",
+ "./package.json": "./package.json"
},
"repository": {
"type": "git",
14 changes: 14 additions & 0 deletions patches/zx+4.3.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/node_modules/zx/package.json b/node_modules/zx/package.json
index 8f0bc55..af17e60 100644
--- a/node_modules/zx/package.json
+++ b/node_modules/zx/package.json
@@ -11,7 +11,8 @@
"./globals": {
"import": "./globals.mjs",
"require": "./dist/globals.cjs"
- }
+ },
+ "./package.json": "./package.json"
},
"types": "index.d.ts",
"bin": {
Loading