wip

Author: thymikee

packages/platform-ios/template/ios/Podfile

@@ -1,9 +1,4 @@
-# Resolve react_native_pods.rb with node to allow for hoisting
-require Pod::Executable.execute_command('node', ['-p',
-  'require.resolve(
-    "react-native/scripts/react_native_pods.rb",
-    {paths: [process.argv[1]]},
-  )', __dir__]).strip
+require File.join(File.dirname(`node --print "require.resolve('react-native/package.json')"`), "scripts/react_native_pods")
 
 platform :ios, min_ios_version_supported
 prepare_react_native_project!

packages/plugin-expo-config-plugins/README.md

@@ -1,11 +1 @@
 # plugin-expo-config-plugins
-
-This library was generated with [Nx](https://nx.dev).
-
-## Building
-
-Run `nx build plugin-expo-config-plugins` to build the library.
-
-## Running unit tests
-
-Run `nx test plugin-expo-config-plugins` to execute the unit tests via [Vitest](https://vitest.dev/).

packages/plugin-expo-config-plugins/eslint.config.js

@@ -1,29 +1,31 @@
 {
   "name": "@rnef/plugin-expo-config-plugins",
-  "version": "0.2.0",
+  "version": "0.8.2",
   "type": "module",
   "exports": {
     "types": "./dist/src/index.d.ts",
-    "import": "./dist/src/index.js"
+    "default": "./dist/src/index.js"
   },
   "files": [
     "dist",
     "src",
     "template"
   ],
   "scripts": {
-    "publish:npm": "npm publish --access restricted",
+    "build": "tsc -p tsconfig.lib.json",
+    "dev": "tsc -p tsconfig.lib.json --watch",
+    "publish:npm": "npm publish --access public",
     "publish:verdaccio": "npm publish --registry http://localhost:4873 --userconfig ../../.npmrc"
   },
   "dependencies": {
-    "@rnef/tools": "^0.2.0",
-    "@expo/config-plugins": "^9.0.15",
+    "@rnef/tools": "^0.8.2",
+    "@expo/config-plugins": "^10.1.2",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@rnef/config": "^0.2.0"
+    "@rnef/config": "^0.8.2"
   },
   "publishConfig": {
-    "access": "restricted"
+    "access": "public"
   }
 }

packages/plugin-expo-config-plugins/package.json

@@ -1,9 +1,7 @@
-
-
 // '@expo/config-plugins' is a CommonJS module, which may not support all
 // module.exports as named exports. CommonJS modules can always be imported via
 // the default export.
-import ExpoConfigPlugins from "@expo/config-plugins";
+import ExpoConfigPlugins from '@expo/config-plugins';
 
 const { BaseMods, evalModsAsync, withPlugins } = ExpoConfigPlugins;
 

packages/plugin-expo-config-plugins/project.json

@@ -1,4 +1,3 @@
-
 import * as fs from 'node:fs/promises';
 import { withPlugins } from './ExpoConfigPlugins.js';
 import { compileModsAsync } from './plugins/modCompiler.js';
@@ -17,12 +16,18 @@ export async function applyConfigPlugins({
   }
 
   const content = await fs.readFile(appJsonPath, { encoding: 'utf-8' });
-  const { plugins, ...config } = JSON.parse(content);
-  if (!Array.isArray(plugins) || plugins.length === 0) {
+  const { expo, ...rest } = JSON.parse(content);
+  const appJsonConfig = expo || rest;
+
+  if (
+    !Array.isArray(appJsonConfig.plugins) ||
+    appJsonConfig.plugins.length === 0
+  ) {
     return;
   }
+
   return compileModsAsync(
-    withPlugins(withInternal(config, info), plugins),
+    withPlugins(withInternal(appJsonConfig, info), appJsonConfig.plugins),
     info
   );
 }

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

@@ -13,11 +13,10 @@ export const pluginExpoConfigPlugins =
   (api: PluginApi): PluginOutput => {
     api.registerCommand({
       name: 'apply-config-plugins',
-      description: 'Starts Metro dev server.',
+      description: 'Applies config plugins to the project.',
       action: async (args: ConfigPluginsArgs) => {
         const packageJsonPath = path.join(api.getProjectRoot(), 'package.json');
         const content = fs.readFileSync(packageJsonPath, 'utf-8');
-
         if (!content.includes('"@expo/config-plugins"')) {
           return;
         }

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

@@ -18,12 +18,12 @@ const withDefaultBaseMods: typeof expoWithDefaultBaseMods = (config, props) => {
   return config;
 };
 
-export const compileModsAsync: typeof expoCompileModsAsync = (
+export const compileModsAsync: typeof expoCompileModsAsync = async (
   config,
   props
 ) => {
   if (props.introspect === true) {
-    console.warn('`introspect` is not supported by react-native-test-app');
+    console.warn('`introspect` is not supported');
   }
 
   config = withDefaultBaseMods(config);

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

@@ -1,6 +1,7 @@
 
 import { BaseMods } from "../ExpoConfigPlugins.js";
 import { makeFilePathModifier } from "../provider.js";
+import type { AndroidModFileProviders } from "../types.js";
 
 const modifyFilePath = makeFilePathModifier(
   // @todo rewrite template finding and copying logic
@@ -10,8 +11,7 @@ const modifyFilePath = makeFilePathModifier(
 // https://github.com/expo/expo/blob/sdk-51/packages/%40expo/config-plugins/src/plugins/withAndroidBaseMods.ts
 const expoProviders = BaseMods.getAndroidModFileProviders();
 
-/** @type {typeof expoProviders} */
-const defaultProviders = {
+const defaultProviders: AndroidModFileProviders = {
   dangerous: expoProviders.dangerous,
   finalized: expoProviders.finalized,
   manifest: modifyFilePath(
@@ -44,12 +44,12 @@ const defaultProviders = {
   mainActivity: modifyFilePath(
     expoProviders.mainActivity,
     // @todo rewrite template finding and copying logic
-    "app/src/main/java/com/app76/MainActivity.kt"
+    "app/src/main/java/com/appconfigplugins/MainActivity.kt"
   ),
   mainApplication: modifyFilePath(
     expoProviders.mainApplication,
     // @todo rewrite template finding and copying logic
-    "app/src/main/java/com/app76/MainApplication.kt"
+    "app/src/main/java/com/appconfigplugins/MainApplication.kt"
   ),
 };