Skip to content

Commit

Permalink
Update to React Native 0.76
Browse files Browse the repository at this point in the history
  • Loading branch information
efoken committed Nov 30, 2024
1 parent 0670657 commit 0fe65ef
Show file tree
Hide file tree
Showing 43 changed files with 3,617 additions and 4,022 deletions.
1 change: 1 addition & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"plugins": ["prettier-plugin-packagejson"],
"printWidth": 100,
"singleQuote": true
}
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit"
},
"editor.formatOnSave": true
"editor.formatOnSave": true,
"eslint.useFlatConfig": true,
"typescript.tsdk": "node_modules/typescript/lib"
}
614 changes: 307 additions & 307 deletions .yarn/releases/yarn-4.5.1.cjs → .yarn/releases/yarn-4.5.3.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.5.1.cjs
yarnPath: .yarn/releases/yarn-4.5.3.cjs
14 changes: 2 additions & 12 deletions app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ const config: ExpoConfig = {
slug: 'react-universal-app',
version: '1.0.0',
icon: './assets/icon.png',
// userInterfaceStyle: 'light',
userInterfaceStyle: 'light',
splash: {
image: './assets/splash.png',
resizeMode: 'contain',
backgroundColor: '#ffffff',
},
assetBundlePatterns: ['**/*'],
newArchEnabled: true,
ios: {
supportsTablet: true,
bundleIdentifier: 'com.react-universal.app',
Expand All @@ -34,17 +35,6 @@ const config: ExpoConfig = {
initialOrientation: 'DEFAULT',
},
],
[
'expo-build-properties',
{
ios: {
newArchEnabled: true,
},
android: {
newArchEnabled: true,
},
},
],
],
};

Expand Down
39 changes: 13 additions & 26 deletions app/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,18 @@ podfile_properties = JSON.parse(File.read(File.join(__dir__, 'Podfile.properties
ENV['RCT_NEW_ARCH_ENABLED'] = podfile_properties['newArchEnabled'] == 'true' ? '1' : '0'
ENV['EX_DEV_CLIENT_NETWORK_INSPECTOR'] = podfile_properties['EX_DEV_CLIENT_NETWORK_INSPECTOR']

use_autolinking_method_symbol = ('use' + '_native' + '_modules!').to_sym
origin_autolinking_method = self.method(use_autolinking_method_symbol)
self.define_singleton_method(use_autolinking_method_symbol) do |*args|
if ENV['EXPO_UNSTABLE_CORE_AUTOLINKING'] == '1'
Pod::UI.puts('Using expo-modules-autolinking as core autolinking source'.green)
platform :ios, podfile_properties['ios.deploymentTarget'] || '15.1'
install! 'cocoapods',
:deterministic_uuids => false

prepare_react_native_project!

target 'reactuniversalapp' do
use_expo_modules!

if ENV['EXPO_USE_COMMUNITY_AUTOLINKING'] == '1'
config_command = ['node', '-e', "process.argv=['', '', 'config'];require('@react-native-community/cli').run()"];
else
config_command = [
'node',
'--no-warnings',
Expand All @@ -22,21 +29,9 @@ self.define_singleton_method(use_autolinking_method_symbol) do |*args|
'--platform',
'ios'
]
origin_autolinking_method.call(config_command)
else
origin_autolinking_method.call()
end
end

platform :ios, podfile_properties['ios.deploymentTarget'] || '13.4'
install! 'cocoapods',
:deterministic_uuids => false

prepare_react_native_project!

target 'reactuniversalapp' do
use_expo_modules!
config = use_native_modules!
config = use_native_modules!(config_command)

use_frameworks! :linkage => podfile_properties['ios.useFrameworks'].to_sym if podfile_properties['ios.useFrameworks']
use_frameworks! :linkage => ENV['USE_FRAMEWORKS'].to_sym if ENV['USE_FRAMEWORKS']
Expand Down Expand Up @@ -68,12 +63,4 @@ target 'reactuniversalapp' do
end
end
end

post_integrate do |installer|
begin
expo_patch_react_imports!(installer)
rescue => e
Pod::UI.warn e
end
end
end
Loading

0 comments on commit 0fe65ef

Please sign in to comment.