diff --git a/packages/cli-config-android/src/config/__fixtures__/android.ts b/packages/cli-config-android/src/config/__fixtures__/android.ts index f8ba3e141..0148d7180 100644 --- a/packages/cli-config-android/src/config/__fixtures__/android.ts +++ b/packages/cli-config-android/src/config/__fixtures__/android.ts @@ -203,6 +203,10 @@ export const findPackagesClassNameKotlinValid = [ ` class SomeExampleKotlinPackage : TurboReactPackage { + }`, + ` + class SomeExampleKotlinPackage : BaseReactPackage { + }`, ]; @@ -265,6 +269,13 @@ export const findPackagesClassNameJavaValid = [ extends TurboReactPackage { + } + `, + ` + class SomeExampleKotlinPackage + extends + BaseReactPackage { + } `, ` diff --git a/packages/cli-config-android/src/config/findPackageClassName.ts b/packages/cli-config-android/src/config/findPackageClassName.ts index 5903efa62..c9082e735 100644 --- a/packages/cli-config-android/src/config/findPackageClassName.ts +++ b/packages/cli-config-android/src/config/findPackageClassName.ts @@ -76,7 +76,7 @@ export function matchClassName(file: string) { return nativeModuleMatch; } else { return file.match( - /class\s+(\w+[^(\s]*)[\s\w():]*(\s+extends\s+|:)[\s\w():,]*[^{]*TurboReactPackage/, + /class\s+(\w+[^(\s]*)[\s\w():]*(\s+extends\s+|:)[\s\w():,]*[^{]*(Turbo|Base)ReactPackage/, ); } }