Skip to content

Commit 697a721

Browse files
committed
fix: rm expo
1 parent 3e4ec78 commit 697a721

12 files changed

Lines changed: 47 additions & 154 deletions

File tree

example/android/app/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ react {
5050
// The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
5151
// hermesFlags = ["-O", "-output-source-map"]
5252
//
53-
// Added by install-expo-modules
54-
entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", rootDir.getAbsoluteFile().getParentFile().getAbsolutePath(), "android", "absolute"].execute(null, rootDir).text.trim())
55-
cliFile = new File(["node", "--print", "require.resolve('@expo/cli')"].execute(null, rootDir).text.trim())
56-
bundleCommand = "export:embed"
5753
}
5854

5955
/**

example/android/app/src/main/java/com/bsdiffpatchexample/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
package com.bsdiffpatchexample
2-
import expo.modules.ReactActivityDelegateWrapper
32

43
import com.facebook.react.ReactActivity
54
import com.facebook.react.ReactActivityDelegate
@@ -19,5 +18,5 @@ class MainActivity : ReactActivity() {
1918
* which allows you to enable New Architecture with a single boolean flags [fabricEnabled]
2019
*/
2120
override fun createReactActivityDelegate(): ReactActivityDelegate =
22-
ReactActivityDelegateWrapper(this, BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled))
21+
DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
2322
}

example/android/app/src/main/java/com/bsdiffpatchexample/MainApplication.kt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.bsdiffpatchexample
22
import android.content.res.Configuration
3-
import expo.modules.ApplicationLifecycleDispatcher
4-
import expo.modules.ReactNativeHostWrapper
5-
63
import android.app.Application
74
import com.facebook.react.PackageList
85
import com.facebook.react.ReactApplication
@@ -18,7 +15,7 @@ import com.facebook.soloader.SoLoader
1815
class MainApplication : Application(), ReactApplication {
1916

2017
override val reactNativeHost: ReactNativeHost =
21-
ReactNativeHostWrapper(this, object : DefaultReactNativeHost(this) {
18+
object : DefaultReactNativeHost(this) {
2219
override fun getPackages(): List<ReactPackage> =
2320
PackageList(this).packages.apply {
2421
// Packages that cannot be autolinked yet can be added manually here, for example:
@@ -31,7 +28,7 @@ class MainApplication : Application(), ReactApplication {
3128

3229
override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
3330
override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
34-
})
31+
}
3532

3633
override val reactHost: ReactHost
3734
get() = getDefaultReactHost(this.applicationContext, reactNativeHost)
@@ -44,11 +41,5 @@ class MainApplication : Application(), ReactApplication {
4441
load()
4542
}
4643
ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
47-
ApplicationLifecycleDispatcher.onApplicationCreate(this)
48-
}
49-
50-
override fun onConfigurationChanged(newConfig: Configuration) {
51-
super.onConfigurationChanged(newConfig)
52-
ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig)
5344
}
5445
}

example/android/settings.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,3 @@ rootProject.name = 'BsDiffPatchExample'
22
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
33
include ':app'
44
includeBuild('../node_modules/@react-native/gradle-plugin')
5-
6-
apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
7-
useExpoModules()

example/ios/BsDiffPatchExample.xcodeproj/project.pbxproj

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
1313
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
1414
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
15-
5EE8698E7F4F7471CEC9D0C5 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC10EAC007291737BF88876A /* ExpoModulesProvider.swift */; };
1615
7699B88040F8A987B510C191 /* libPods-BsDiffPatchExample-BsDiffPatchExampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-BsDiffPatchExample-BsDiffPatchExampleTests.a */; };
1716
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
18-
D9E40D175E9E1FE9EFB3069A /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4826C7E76BB646B2B7A00CF8 /* ExpoModulesProvider.swift */; };
1917
/* End PBXBuildFile section */
2018

2119
/* Begin PBXContainerItemProxy section */
@@ -40,13 +38,11 @@
4038
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = BsDiffPatchExample/main.m; sourceTree = "<group>"; };
4139
19F6CBCC0A4E27FBF8BF4A61 /* libPods-BsDiffPatchExample-BsDiffPatchExampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-BsDiffPatchExample-BsDiffPatchExampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4240
3B4392A12AC88292D35C810B /* Pods-BsDiffPatchExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BsDiffPatchExample.debug.xcconfig"; path = "Target Support Files/Pods-BsDiffPatchExample/Pods-BsDiffPatchExample.debug.xcconfig"; sourceTree = "<group>"; };
43-
4826C7E76BB646B2B7A00CF8 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-BsDiffPatchExample-BsDiffPatchExampleTests/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
4441
5709B34CF0A7D63546082F79 /* Pods-BsDiffPatchExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BsDiffPatchExample.release.xcconfig"; path = "Target Support Files/Pods-BsDiffPatchExample/Pods-BsDiffPatchExample.release.xcconfig"; sourceTree = "<group>"; };
4542
5B7EB9410499542E8C5724F5 /* Pods-BsDiffPatchExample-BsDiffPatchExampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BsDiffPatchExample-BsDiffPatchExampleTests.debug.xcconfig"; path = "Target Support Files/Pods-BsDiffPatchExample-BsDiffPatchExampleTests/Pods-BsDiffPatchExample-BsDiffPatchExampleTests.debug.xcconfig"; sourceTree = "<group>"; };
4643
5DCACB8F33CDC322A6C60F78 /* libPods-BsDiffPatchExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-BsDiffPatchExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4744
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = BsDiffPatchExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
4845
89C6BE57DB24E9ADA2F236DE /* Pods-BsDiffPatchExample-BsDiffPatchExampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BsDiffPatchExample-BsDiffPatchExampleTests.release.xcconfig"; path = "Target Support Files/Pods-BsDiffPatchExample-BsDiffPatchExampleTests/Pods-BsDiffPatchExample-BsDiffPatchExampleTests.release.xcconfig"; sourceTree = "<group>"; };
49-
DC10EAC007291737BF88876A /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-BsDiffPatchExample/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
5046
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
5147
/* End PBXFileReference section */
5248

@@ -110,14 +106,6 @@
110106
name = Frameworks;
111107
sourceTree = "<group>";
112108
};
113-
598CB65DD0DE741C21ECC4F7 /* BsDiffPatchExample */ = {
114-
isa = PBXGroup;
115-
children = (
116-
DC10EAC007291737BF88876A /* ExpoModulesProvider.swift */,
117-
);
118-
name = BsDiffPatchExample;
119-
sourceTree = "<group>";
120-
};
121109
832341AE1AAA6A7D00B99B32 /* Libraries */ = {
122110
isa = PBXGroup;
123111
children = (
@@ -134,7 +122,6 @@
134122
83CBBA001A601CBA00E9B192 /* Products */,
135123
2D16E6871FA4F8E400B85C8A /* Frameworks */,
136124
BBD78D7AC51CEA395F1C20DB /* Pods */,
137-
D95977803F2787B61912C74A /* ExpoModulesProviders */,
138125
);
139126
indentWidth = 2;
140127
sourceTree = "<group>";
@@ -150,14 +137,6 @@
150137
name = Products;
151138
sourceTree = "<group>";
152139
};
153-
A1A8DF9A26755B5FD9099CF3 /* BsDiffPatchExampleTests */ = {
154-
isa = PBXGroup;
155-
children = (
156-
4826C7E76BB646B2B7A00CF8 /* ExpoModulesProvider.swift */,
157-
);
158-
name = BsDiffPatchExampleTests;
159-
sourceTree = "<group>";
160-
};
161140
BBD78D7AC51CEA395F1C20DB /* Pods */ = {
162141
isa = PBXGroup;
163142
children = (
@@ -169,15 +148,6 @@
169148
path = Pods;
170149
sourceTree = "<group>";
171150
};
172-
D95977803F2787B61912C74A /* ExpoModulesProviders */ = {
173-
isa = PBXGroup;
174-
children = (
175-
598CB65DD0DE741C21ECC4F7 /* BsDiffPatchExample */,
176-
A1A8DF9A26755B5FD9099CF3 /* BsDiffPatchExampleTests */,
177-
);
178-
name = ExpoModulesProviders;
179-
sourceTree = "<group>";
180-
};
181151
/* End PBXGroup section */
182152

183153
/* Begin PBXNativeTarget section */
@@ -208,7 +178,6 @@
208178
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "BsDiffPatchExample" */;
209179
buildPhases = (
210180
C38B50BA6285516D6DCD4F65 /* [CP] Check Pods Manifest.lock */,
211-
740952DAF8462E54F7AA7B3E /* [Expo] Configure project */,
212181
13B07F871A680F5B00A75B9A /* Sources */,
213182
13B07F8C1A680F5B00A75B9A /* Frameworks */,
214183
13B07F8E1A680F5B00A75B9A /* Resources */,
@@ -333,25 +302,6 @@
333302
shellPath = /bin/sh;
334303
shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-BsDiffPatchExample-BsDiffPatchExampleTests/expo-configure-project.sh\"\n";
335304
};
336-
740952DAF8462E54F7AA7B3E /* [Expo] Configure project */ = {
337-
isa = PBXShellScriptBuildPhase;
338-
alwaysOutOfDate = 1;
339-
buildActionMask = 2147483647;
340-
files = (
341-
);
342-
inputFileListPaths = (
343-
);
344-
inputPaths = (
345-
);
346-
name = "[Expo] Configure project";
347-
outputFileListPaths = (
348-
);
349-
outputPaths = (
350-
);
351-
runOnlyForDeploymentPostprocessing = 0;
352-
shellPath = /bin/sh;
353-
shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-BsDiffPatchExample/expo-configure-project.sh\"\n";
354-
};
355305
A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = {
356306
isa = PBXShellScriptBuildPhase;
357307
buildActionMask = 2147483647;
@@ -455,7 +405,6 @@
455405
buildActionMask = 2147483647;
456406
files = (
457407
00E356F31AD99517003FC87E /* BsDiffPatchExampleTests.m in Sources */,
458-
D9E40D175E9E1FE9EFB3069A /* ExpoModulesProvider.swift in Sources */,
459408
);
460409
runOnlyForDeploymentPostprocessing = 0;
461410
};
@@ -465,7 +414,6 @@
465414
files = (
466415
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */,
467416
13B07FC11A68108700A75B9A /* main.m in Sources */,
468-
5EE8698E7F4F7471CEC9D0C5 /* ExpoModulesProvider.swift in Sources */,
469417
);
470418
runOnlyForDeploymentPostprocessing = 0;
471419
};
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#import <RCTAppDelegate.h>
2-
#import <Expo/Expo.h>
32
#import <UIKit/UIKit.h>
43

5-
@interface AppDelegate : EXAppDelegateWrapper
4+
@interface AppDelegate : RCTAppDelegate
65

76
@end

example/ios/BsDiffPatchExample/AppDelegate.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
2222
- (NSURL *)getBundleURL
2323
{
2424
#if DEBUG
25-
return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@".expo/.virtual-metro-entry"];
25+
return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"];
2626
#else
2727
return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
2828
#endif

example/ios/Podfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
21
# Resolve react_native_pods.rb with node to allow for hoisting
32
require Pod::Executable.execute_command('node', ['-p',
43
'require.resolve(
@@ -27,7 +26,6 @@ if linkage != nil
2726
end
2827

2928
target 'BsDiffPatchExample' do
30-
use_expo_modules!
3129
post_integrate do |installer|
3230
begin
3331
expo_patch_react_imports!(installer)

example/ios/Podfile.lock

Lines changed: 7 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,6 @@ PODS:
22
- boost (1.83.0)
33
- CocoaAsyncSocket (7.6.5)
44
- DoubleConversion (1.1.6)
5-
- EXConstants (15.4.5):
6-
- ExpoModulesCore
7-
- EXFont (11.10.2):
8-
- ExpoModulesCore
9-
- Expo (50.0.2):
10-
- ExpoModulesCore
11-
- ExpoFileSystem (16.0.4):
12-
- ExpoModulesCore
13-
- ExpoKeepAwake (12.8.2):
14-
- ExpoModulesCore
15-
- ExpoModulesCore (1.11.7):
16-
- glog
17-
- RCT-Folly (= 2022.05.16.00)
18-
- React-Core
19-
- React-NativeModulesApple
20-
- React-RCTAppDelegate
21-
- ReactCommon/turbomodule/core
225
- FBLazyVector (0.73.2)
236
- FBReactNativeSpec (0.73.2):
247
- RCT-Folly (= 2022.05.16.00)
@@ -1095,18 +1078,14 @@ PODS:
10951078
- React-jsi (= 0.73.2)
10961079
- React-logger (= 0.73.2)
10971080
- React-perflogger (= 0.73.2)
1081+
- RNFS (2.20.0):
1082+
- React-Core
10981083
- SocketRocket (0.6.1)
10991084
- Yoga (1.14.0)
11001085

11011086
DEPENDENCIES:
11021087
- boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
11031088
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
1104-
- EXConstants (from `../node_modules/expo-constants/ios`)
1105-
- EXFont (from `../node_modules/expo-font/ios`)
1106-
- Expo (from `../node_modules/expo`)
1107-
- ExpoFileSystem (from `../node_modules/expo-file-system/ios`)
1108-
- ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
1109-
- ExpoModulesCore (from `../node_modules/expo-modules-core`)
11101089
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
11111090
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
11121091
- Flipper (= 0.201.0)
@@ -1176,6 +1155,7 @@ DEPENDENCIES:
11761155
- React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`)
11771156
- React-utils (from `../node_modules/react-native/ReactCommon/react/utils`)
11781157
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
1158+
- RNFS (from `../node_modules/react-native-fs`)
11791159
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
11801160

11811161
SPEC REPOS:
@@ -1199,18 +1179,6 @@ EXTERNAL SOURCES:
11991179
:podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
12001180
DoubleConversion:
12011181
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
1202-
EXConstants:
1203-
:path: "../node_modules/expo-constants/ios"
1204-
EXFont:
1205-
:path: "../node_modules/expo-font/ios"
1206-
Expo:
1207-
:path: "../node_modules/expo"
1208-
ExpoFileSystem:
1209-
:path: "../node_modules/expo-file-system/ios"
1210-
ExpoKeepAwake:
1211-
:path: "../node_modules/expo-keep-awake/ios"
1212-
ExpoModulesCore:
1213-
:path: "../node_modules/expo-modules-core"
12141182
FBLazyVector:
12151183
:path: "../node_modules/react-native/Libraries/FBLazyVector"
12161184
FBReactNativeSpec:
@@ -1301,19 +1269,15 @@ EXTERNAL SOURCES:
13011269
:path: "../node_modules/react-native/ReactCommon/react/utils"
13021270
ReactCommon:
13031271
:path: "../node_modules/react-native/ReactCommon"
1272+
RNFS:
1273+
:path: "../node_modules/react-native-fs"
13041274
Yoga:
13051275
:path: "../node_modules/react-native/ReactCommon/yoga"
13061276

13071277
SPEC CHECKSUMS:
13081278
boost: d3f49c53809116a5d38da093a8aa78bf551aed09
13091279
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
13101280
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
1311-
EXConstants: 988aa430ca0f76b43cd46b66e7fae3287f9cc2fc
1312-
EXFont: 21b9c760abd593ce8f0d5386b558ced76018506f
1313-
Expo: 6c6526e76864e140363431722b22d0fa3cdeafd2
1314-
ExpoFileSystem: 39e454b8e7f2358ae2c8f8ec255fede4c3039493
1315-
ExpoKeepAwake: 0f5cad99603a3268e50af9a6eb8b76d0d9ac956c
1316-
ExpoModulesCore: f103ff1346136b2926e1654f32b3f45ab0b74830
13171281
FBLazyVector: fbc4957d9aa695250b55d879c1d86f79d7e69ab4
13181282
FBReactNativeSpec: 86de768f89901ef6ed3207cd686362189d64ac88
13191283
Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
@@ -1370,9 +1334,10 @@ SPEC CHECKSUMS:
13701334
React-runtimescheduler: 6517c0cdfae3ea29b599759e069ae97746163248
13711335
React-utils: f5bc61e7ea3325c0732ae2d755f4441940163b85
13721336
ReactCommon: a42e89b49d88c3890dfb6fd98a33ac80d555be19
1337+
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
13731338
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
13741339
Yoga: 13c8ef87792450193e117976337b8527b49e8c03
13751340

1376-
PODFILE CHECKSUM: 7cc177e7c9a615383478a68836381c7ec016f0bf
1341+
PODFILE CHECKSUM: 0106c40264c7523f9e5d7d93667c60a889d6711f
13771342

13781343
COCOAPODS: 1.14.3

example/metro.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
const { getDefaultConfig } = require('expo/metro-config');
2-
const { mergeConfig } = require('@react-native/metro-config');
1+
const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config');
32
const path = require('path');
43
const escape = require('escape-string-regexp');
54
const exclusionList = require('metro-config/src/defaults/exclusionList');

0 commit comments

Comments
 (0)