move around

Author: thymikee

packages/plugin-expo-config-plugins/src/lib/apply.ts

@@ -21,7 +21,6 @@ export async function applyConfigPlugins({
   if (!Array.isArray(plugins) || plugins.length === 0) {
     return;
   }
-  console.log(withPlugins(withInternal(config, info), plugins));
   return compileModsAsync(
     withPlugins(withInternal(config, info), plugins),
     info

packages/plugin-expo-config-plugins/src/lib/plugins/cocoaBaseMods.ts

@@ -6,10 +6,7 @@ import { BaseMods, evalModsAsync } from '../ExpoConfigPlugins.js';
 import { getAndroidModFileProviders } from './withAndroidBaseMods.js';
 import { getIosModFileProviders } from './withIosBaseMods.js';
 
-export const withDefaultBaseMods: typeof expoWithDefaultBaseMods = (
-  config,
-  props
-) => {
+const withDefaultBaseMods: typeof expoWithDefaultBaseMods = (config, props) => {
   config = BaseMods.withIosBaseMods(config, {
     ...props,
     providers: getIosModFileProviders(),

packages/plugin-expo-config-plugins/src/lib/plugins/modCompiler.ts

@@ -1,9 +1,42 @@
-import { makeFilePathModifier } from '../provider.js';
-import { createModFileProviders } from './cocoaBaseMods.js';
+import { BaseMods } from '../ExpoConfigPlugins.js';
+import { makeFilePathModifier, makeNullProvider } from '../provider.js';
+import type { IosModFileProviders } from '../types.js';
 
 // @todo rewrite template finding and copying logic
 const modifyFilePath = makeFilePathModifier('node_modules/../ios/App76');
-const defaultProviders = createModFileProviders(modifyFilePath);
+
+const nullProvider = makeNullProvider();
+
+// https://github.com/expo/expo/blob/sdk-51/packages/%40expo/config-plugins/src/plugins/withIosBaseMods.ts
+const expoProviders = BaseMods.getIosModFileProviders();
+
+const defaultProviders: IosModFileProviders = {
+  dangerous: expoProviders.dangerous,
+  finalized: expoProviders.finalized,
+  appDelegate: modifyFilePath(
+    expoProviders.appDelegate,
+    // @todo rewrite template finding and copying logic
+    'App76/AppDelegate.swift'
+  ),
+  // @ts-expect-error todo fix
+  expoPlist: nullProvider,
+  xcodeproj: modifyFilePath(
+    expoProviders.xcodeproj,
+    // @todo rewrite template finding and copying logic
+    'App76.xcodeproj/project.pbxproj'
+  ),
+  infoPlist: modifyFilePath(expoProviders.infoPlist, 'Info.plist'),
+  // @ts-expect-error todo fix
+  entitlements: nullProvider,
+  // @ts-expect-error todo fix
+  podfile: makeNullProvider({
+    path: '',
+    language: 'rb' as const,
+    contents: '',
+  }),
+  // @ts-expect-error todo fix
+  podfileProperties: makeNullProvider(),
+};
 
 export function getIosModFileProviders() {
   return defaultProviders;

packages/plugin-expo-config-plugins/src/lib/plugins/withIosBaseMods.ts

@@ -18,7 +18,6 @@ export function makeFilePathModifier(
   actualProjectDir: string
 ): CustomModProvider {
   return function (original, file) {
-    console.log({ original, file });
     return BaseMods.provider({
       ...original,
       getFilePath: async ({ modRequest: { projectRoot } }) => {