chore: import everything from the ExpoConfigPlugins wrapper

Author: thiagobrez

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

@@ -1,6 +1,6 @@
 {
   "name": "@rock-js/plugin-expo-config-plugins",
-  "version": "0.8.2",
+  "version": "0.11.2",
   "type": "module",
   "exports": {
     "types": "./dist/src/index.d.ts",
@@ -19,12 +19,12 @@
   },
   "dependencies": {
     "@expo/config-plugins": "^10.1.2",
-    "@rock-js/tools": "^0.9.2",
+    "@rock-js/tools": "^0.11.2",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "@rock-js/config": "^0.8.2",
-    "@rock-js/test-helpers": "^0.8.2",
+    "@rock-js/config": "^0.11.2",
+    "@rock-js/test-helpers": "^0.11.2",
     "@types/plist": "^3.0.5",
     "plist": "^3.1.0"
   },

packages/plugin-expo-config-plugins/src/__tests__/pluginExpoConfigPlugins.test.ts

@@ -1,15 +1,15 @@
 import * as fs from 'node:fs/promises';
 import path from 'node:path';
+import { cleanup, getTempDirectory } from '@rock-js/test-helpers';
+import * as plist from 'plist';
+import { afterEach, beforeEach, expect, test } from 'vitest';
 import {
+  AndroidConfig,
   evalModsAsync,
   IOSConfig,
   withDefaultBaseMods,
   withPlugins,
-} from '@expo/config-plugins';
-import { AndroidConfig } from '@expo/config-plugins';
-import { cleanup, getTempDirectory } from '@rock-js/test-helpers';
-import * as plist from 'plist';
-import { afterEach, beforeEach, expect, test } from 'vitest';
+} from '../lib/ExpoConfigPlugins.js';
 import { pluginExpoConfigPlugins } from '../lib/pluginExpoConfigPlugins.js';
 import { withAndroidExpoPlugins } from '../lib/plugins/modCompiler.js';
 import { withInternal } from '../lib/plugins/withInternal.js';

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

@@ -1,8 +1,38 @@
 // '@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 type {
+  ConfigPlugin,
+  ExportedConfig,
+  ModPlatform,
+} from '@expo/config-plugins';
 import ExpoConfigPlugins from '@expo/config-plugins';
+import type {
+  BaseModProviderMethods,
+  ForwardedBaseModOptions,
+} from '@expo/config-plugins/build/plugins/createBaseMod';
 
-const { BaseMods, evalModsAsync, withPlugins } = ExpoConfigPlugins;
+const {
+  BaseMods,
+  evalModsAsync,
+  withPlugins,
+  AndroidConfig,
+  IOSConfig,
+  withDefaultBaseMods,
+  compileModsAsync,
+} = ExpoConfigPlugins;
 
-export { BaseMods, evalModsAsync, withPlugins };
+export {
+  type ModPlatform,
+  type BaseModProviderMethods,
+  type ForwardedBaseModOptions,
+  type ConfigPlugin,
+  type ExportedConfig,
+  BaseMods,
+  evalModsAsync,
+  withPlugins,
+  AndroidConfig,
+  IOSConfig,
+  withDefaultBaseMods,
+  compileModsAsync,
+};

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

@@ -1,10 +1,13 @@
-import type {
-  compileModsAsync as expoCompileModsAsync,
-  ConfigPlugin,
-  withDefaultBaseMods as expoWithDefaultBaseMods,
-} from '@expo/config-plugins';
-import configPlugins from '@expo/config-plugins';
-import { BaseMods, evalModsAsync } from '../ExpoConfigPlugins.js';
+import {
+  AndroidConfig,
+  BaseMods,
+  type compileModsAsync as expoCompileModsAsync,
+  type ConfigPlugin,
+  evalModsAsync,
+  IOSConfig,
+  type withDefaultBaseMods as expoWithDefaultBaseMods,
+  withPlugins,
+} from '../ExpoConfigPlugins.js';
 import type { ProjectInfo } from '../types.js';
 import { getAndroidModFileProviders } from './withAndroidBaseMods.js';
 import { getIosModFileProviders } from './withIosBaseMods.js';
@@ -21,8 +24,6 @@ const withDefaultBaseMods: typeof expoWithDefaultBaseMods = (config, props) => {
   return config;
 };
 
-const { withPlugins, IOSConfig, AndroidConfig } = configPlugins;
-
 /**
  * Config plugin to apply all of the custom Expo iOS config plugins we support by default.
  * TODO: In the future most of this should go into versioned packages like expo-updates, etc...

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

@@ -1,11 +1,10 @@
-
-import { BaseMods } from "../ExpoConfigPlugins.js";
-import { makeFilePathModifier } from "../provider.js";
-import type { AndroidModFileProviders } from "../types.js";
+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
-  "node_modules/../android"
+  'node_modules/../android',
 );
 
 // https://github.com/expo/expo/blob/sdk-51/packages/%40expo/config-plugins/src/plugins/withAndroidBaseMods.ts
@@ -16,40 +15,40 @@ const defaultProviders: AndroidModFileProviders = {
   finalized: expoProviders.finalized,
   manifest: modifyFilePath(
     expoProviders.manifest,
-    "app/src/main/AndroidManifest.xml"
+    'app/src/main/AndroidManifest.xml',
   ),
   gradleProperties: expoProviders.gradleProperties,
   strings: modifyFilePath(
     expoProviders.strings,
-    "app/src/main/res/values/strings.xml"
+    'app/src/main/res/values/strings.xml',
   ),
   colors: modifyFilePath(
     expoProviders.colors,
-    "app/src/main/res/values/colors.xml"
+    'app/src/main/res/values/colors.xml',
   ),
   colorsNight: modifyFilePath(
     expoProviders.colors,
-    "app/src/main/res/values-night/colors.xml"
+    'app/src/main/res/values-night/colors.xml',
   ),
   styles: modifyFilePath(
     expoProviders.styles,
-    "app/src/main/res/values/styles.xml"
+    'app/src/main/res/values/styles.xml',
   ),
   projectBuildGradle: expoProviders.projectBuildGradle,
   settingsGradle: expoProviders.settingsGradle,
   appBuildGradle: modifyFilePath(
     expoProviders.appBuildGradle,
-    "app/build.gradle"
+    'app/build.gradle',
   ),
   mainActivity: modifyFilePath(
     expoProviders.mainActivity,
     // @todo rewrite template finding and copying logic
-    "app/src/main/java/com/appconfigplugins/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/appconfigplugins/MainApplication.kt"
+    'app/src/main/java/com/appconfigplugins/MainApplication.kt',
   ),
 };
 

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

@@ -1,4 +1,4 @@
-import type { ConfigPlugin } from '@expo/config-plugins';
+import type { ConfigPlugin } from '../ExpoConfigPlugins.js';
 import type { ProjectInfo } from '../types.js';
 type Internals = Omit<ProjectInfo, 'appJsonPath'>;
 

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

@@ -1,7 +1,6 @@
-import { BaseMods } from '../ExpoConfigPlugins.js';
+import { BaseMods, type ExportedConfig } from '../ExpoConfigPlugins.js';
 import { makeFilePathModifier, makeNullProvider } from '../provider.js';
 import type { IosModFileProviders } from '../types.js';
-import configPlugins from '@expo/config-plugins';
 
 // @todo rewrite template finding and copying logic
 const modifyFilePath = makeFilePathModifier('node_modules/../ios');
@@ -12,24 +11,24 @@ const nullProvider = makeNullProvider();
 const expoProviders = BaseMods.getIosModFileProviders();
 
 export function getIosModFileProviders(
-  config: configPlugins.ExportedConfig
+  config: ExportedConfig,
 ): IosModFileProviders {
   return {
     dangerous: expoProviders.dangerous,
     finalized: expoProviders.finalized,
     appDelegate: modifyFilePath(
       expoProviders.appDelegate,
-      `${config._internal?.['iosProjectName']}/AppDelegate.swift`
+      `${config._internal?.['iosProjectName']}/AppDelegate.swift`,
     ),
     // @ts-expect-error todo fix
     expoPlist: nullProvider,
     xcodeproj: modifyFilePath(
       expoProviders.xcodeproj,
-      `${config._internal?.['iosProjectName']}.xcodeproj/project.pbxproj`
+      `${config._internal?.['iosProjectName']}.xcodeproj/project.pbxproj`,
     ),
     infoPlist: modifyFilePath(
       expoProviders.infoPlist,
-      `${config._internal?.['iosProjectName']}/Info.plist`
+      `${config._internal?.['iosProjectName']}/Info.plist`,
     ),
     // @ts-expect-error todo fix
     entitlements: nullProvider,

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

@@ -15,7 +15,7 @@ export function makeNullProvider(defaultRead: object = {}) {
  * Creates a mod modifier that just changes `getFilePath()`.
  */
 export function makeFilePathModifier(
-  actualProjectDir: string
+  actualProjectDir: string,
 ): CustomModProvider {
   return function (original, file) {
     return BaseMods.provider({
@@ -35,7 +35,7 @@ export function makeFilePathModifier(
 function findFile(
   file: string,
   startDir: string = process.cwd(),
-  fs = nodefs
+  fs = nodefs,
 ): string | undefined {
   let currentDir = startDir;
   let candidate = path.join(currentDir, file);

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

@@ -1,8 +1,9 @@
-import type { BaseMods, ModPlatform } from '@expo/config-plugins';
 import type {
   BaseModProviderMethods,
+  BaseMods,
   ForwardedBaseModOptions,
-} from '@expo/config-plugins/build/plugins/createBaseMod';
+  ModPlatform,
+} from './ExpoConfigPlugins.js';
 
 export type CustomModProvider = <
   ModType,