back to only expo folder

SocialGouv · Jul 9, 2024 · 8341c9f · 8341c9f
1 parent 2b427a2
commit 8341c9f
Show file tree

Hide file tree

Showing 16 changed files with 168 additions and 3,457 deletions.
diff --git a/app/.env.example b/app/.env.example
@@ -1,14 +1,14 @@
-EXPO_PUBLIC_MATOMO_URL=
-EXPO_PUBLIC_MATOMO_IDSITE_1=
-EXPO_PUBLIC_MATOMO_URL_2=
-EXPO_PUBLIC_MATOMO_IDSITE_2=
-EXPO_PUBLIC_SENTRY_XXX=
-EXPO_PUBLIC_OPEN_FOOD_FACT_PASSWORD=
-EXPO_PUBLIC_OPEN_FOOD_FACT_USER_ID=
-EXPO_PUBLIC_MYAPP_UPLOAD_STORE_FILE=
-EXPO_PUBLIC_MYAPP_UPLOAD_STORE_PASSWORD=
-EXPO_PUBLIC_MYAPP_UPLOAD_KEY_ALIAS=
-EXPO_PUBLIC_MYAPP_UPLOAD_KEY_PASSWORD=
-EXPO_PUBLIC_SCHEME=http
-EXPO_PUBLIC_API_HOST=localhost:3615 # be careful: using android you need to use your local ip, with `ipconfig getifaddr en0` on wifi macOS for instance
-EXPO_PUBLIC_APP_ENV=local
+MATOMO_URL=
+MATOMO_IDSITE_1=
+MATOMO_URL_2=
+MATOMO_IDSITE_2=
+SENTRY_XXX=
+OPEN_FOOD_FACT_PASSWORD=
+OPEN_FOOD_FACT_USER_ID=
+MYAPP_UPLOAD_STORE_FILE=
+MYAPP_UPLOAD_STORE_PASSWORD=
+MYAPP_UPLOAD_KEY_ALIAS=
+MYAPP_UPLOAD_KEY_PASSWORD=
+SCHEME=http
+API_HOST=localhost:3615 # be careful: using android you need to use your local ip, with `ipconfig getifaddr en0` on wifi macOS for instance
+APP_ENV=local
diff --git a/app/.gitignore b/app/.gitignore
@@ -86,8 +86,4 @@ ios/sentry.properties
 !.yarn/plugins
 !.yarn/releases
 !.yarn/sdks
-!.yarn/versions
-# Expo
-.expo
-dist/
-web-build/
+!.yarn/versions
diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
@@ -8,6 +8,8 @@ project.ext.envConfigFiles = [
     release: ".env",
 ]
 
+apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
+
 apply from: "../../node_modules/@sentry/react-native/sentry.gradle"
 
 /**
@@ -57,11 +59,6 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
-    //
-    // Added by install-expo-modules
-    entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", rootDir.getAbsoluteFile().getParentFile().getAbsolutePath(), "android", "absolute"].execute(null, rootDir).text.trim())
-    cliFile = new File(["node", "--print", "require.resolve('@expo/cli')"].execute(null, rootDir).text.trim())
-    bundleCommand = "export:embed"
 }
 
 /**

diff --git a/app/android/app/src/main/java/com/addicto/MainActivity.java b/app/android/app/src/main/java/com/addicto/MainActivity.java
@@ -1,5 +1,4 @@
 package com.addicto;
-import expo.modules.ReactActivityDelegateWrapper;
 
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
@@ -36,10 +35,10 @@ protected void onCreate(Bundle savedInstanceState) {
    */
   @Override
   protected ReactActivityDelegate createReactActivityDelegate() {
-    return new ReactActivityDelegateWrapper(this, BuildConfig.IS_NEW_ARCHITECTURE_ENABLED, new DefaultReactActivityDelegate(
+    return new DefaultReactActivityDelegate(
         this,
         getMainComponentName(),
         // If you opted-in for the New Architecture, we enable the Fabric Renderer.
-        DefaultNewArchitectureEntryPoint.getFabricEnabled()));
+        DefaultNewArchitectureEntryPoint.getFabricEnabled());
   }
 }
diff --git a/app/android/app/src/main/java/com/addicto/MainApplication.java b/app/android/app/src/main/java/com/addicto/MainApplication.java
@@ -1,7 +1,4 @@
 package com.addicto;
-import android.content.res.Configuration;
-import expo.modules.ApplicationLifecycleDispatcher;
-import expo.modules.ReactNativeHostWrapper;
 
 import android.app.Application;
 import com.facebook.react.PackageList;
@@ -16,7 +13,7 @@
 public class MainApplication extends Application implements ReactApplication {
 
   private final ReactNativeHost mReactNativeHost =
-      new ReactNativeHostWrapper(this, new DefaultReactNativeHost(this) {
+      new DefaultReactNativeHost(this) {
         @Override
         public boolean getUseDeveloperSupport() {
           return BuildConfig.DEBUG;
@@ -33,7 +30,7 @@ protected List<ReactPackage> getPackages() {
 
         @Override
         protected String getJSMainModuleName() {
-          return ".expo/.virtual-metro-entry";
+          return "index";
         }
 
         @Override
@@ -45,7 +42,7 @@ protected boolean isNewArchEnabled() {
         protected Boolean isHermesEnabled() {
           return BuildConfig.IS_HERMES_ENABLED;
         }
-      });
+      };
 
   @Override
   public ReactNativeHost getReactNativeHost() {
@@ -61,12 +58,5 @@ public void onCreate() {
       DefaultNewArchitectureEntryPoint.load();
     }
     ReactNativeFlipper.initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
-    ApplicationLifecycleDispatcher.onApplicationCreate(this);
-  }
-
-  @Override
-  public void onConfigurationChanged(Configuration newConfig) {
-    super.onConfigurationChanged(newConfig);
-    ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig);
   }
 }
diff --git a/app/android/settings.gradle b/app/android/settings.gradle
@@ -2,6 +2,3 @@ rootProject.name = 'oz_ensemble'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
-
-apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
-useExpoModules()
diff --git a/app/babel.config.js b/app/babel.config.js
@@ -1,4 +1,4 @@
 module.exports = {
-  presets: ['babel-preset-expo'],
+  presets: ['module:metro-react-native-babel-preset'],
   plugins: ['react-native-reanimated/plugin', 'nativewind/babel'],
 };
diff --git a/app/ios/Podfile b/app/ios/Podfile
@@ -1,4 +1,3 @@
-require File.join(File.dirname(`node --print "require.resolve('expo/package.json')"`), "scripts/autolinking")
 # Resolve react_native_pods.rb with node to allow for hoisting
 require Pod::Executable.execute_command('node', ['-p',
   'require.resolve(
@@ -30,14 +29,6 @@ if linkage != nil
 end
 
 target 'oz_ensemble' do
-  use_expo_modules!
-  post_integrate do |installer|
-    begin
-      expo_patch_react_imports!(installer)
-    rescue => e
-      Pod::UI.warn e
-    end
-  end
   config = use_native_modules!
   permissions_path = '../node_modules/react-native-permissions/ios'
   # Flags change depending on the env values.

diff --git a/app/ios/Podfile.lock b/app/ios/Podfile.lock
@@ -2,24 +2,6 @@ PODS:
   - BEMCheckBox (1.4.1)
   - boost (1.76.0)
   - DoubleConversion (1.1.6)
-  - EXApplication (5.3.1):
-    - ExpoModulesCore
-  - EXConstants (14.4.2):
-    - ExpoModulesCore
-  - EXFileSystem (15.4.5):
-    - ExpoModulesCore
-  - EXFont (11.4.0):
-    - ExpoModulesCore
-  - Expo (49.0.23):
-    - ExpoModulesCore
-  - ExpoKeepAwake (12.3.0):
-    - ExpoModulesCore
-  - ExpoModulesCore (1.5.13):
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core
-    - React-NativeModulesApple
-    - React-RCTAppDelegate
-    - ReactCommon/turbomodule/core
   - FBLazyVector (0.72.7)
   - FBReactNativeSpec (0.72.7):
     - RCT-Folly (= 2021.07.22.00)
@@ -538,13 +520,6 @@ PODS:
 DEPENDENCIES:
   - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
-  - EXApplication (from `../node_modules/expo-application/ios`)
-  - EXConstants (from `../node_modules/expo-constants/ios`)
-  - EXFileSystem (from `../node_modules/expo-file-system/ios`)
-  - EXFont (from `../node_modules/expo-font/ios`)
-  - Expo (from `../node_modules/expo`)
-  - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`)
-  - ExpoModulesCore (from `../node_modules/expo-modules-core`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
@@ -626,20 +601,6 @@ EXTERNAL SOURCES:
     :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
-  EXApplication:
-    :path: "../node_modules/expo-application/ios"
-  EXConstants:
-    :path: "../node_modules/expo-constants/ios"
-  EXFileSystem:
-    :path: "../node_modules/expo-file-system/ios"
-  EXFont:
-    :path: "../node_modules/expo-font/ios"
-  Expo:
-    :path: "../node_modules/expo"
-  ExpoKeepAwake:
-    :path: "../node_modules/expo-keep-awake/ios"
-  ExpoModulesCore:
-    :path: "../node_modules/expo-modules-core"
   FBLazyVector:
     :path: "../node_modules/react-native/Libraries/FBLazyVector"
   FBReactNativeSpec:
@@ -764,13 +725,6 @@ SPEC CHECKSUMS:
   BEMCheckBox: 5ba6e37ade3d3657b36caecc35c8b75c6c2b1a4e
   boost: 57d2868c099736d80fcd648bf211b4431e51a558
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  EXApplication: 042aa2e3f05258a16962ea1a9914bf288db9c9a1
-  EXConstants: ce5bbea779da8031ac818c36bea41b10e14d04e1
-  EXFileSystem: f8b838a880254de42a5a7da20ed5ce12e2697c1b
-  EXFont: 738c44c390953ebcbab075a4848bfbef025fd9ee
-  Expo: ba9abdf444dc6d2c05a82c4c1b51a2400beb6167
-  ExpoKeepAwake: be4cbd52d9b177cde0fd66daa1913afa3161fc1d
-  ExpoModulesCore: cf14fc49a3d5df3ed3cf2a38fc758d073bfd1c13
   FBLazyVector: 5fbbff1d7734827299274638deb8ba3024f6c597
   FBReactNativeSpec: 638095fe8a01506634d77b260ef8a322019ac671
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
@@ -841,6 +795,6 @@ SPEC CHECKSUMS:
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: 4c3aa327e4a6a23eeacd71f61c81df1bcdf677d5
 
-PODFILE CHECKSUM: e0e326a8cb934e1b4e11233bb75fe8085e3618f7
+PODFILE CHECKSUM: 2ccf777443ddf145166d704b20dcb97941c097d1
 
 COCOAPODS: 1.14.3