From fb075fd19af6da4a69ece3aa9068f3b50094d896 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Wed, 10 Sep 2025 08:28:36 -0700 Subject: [PATCH] chore: simplify glob patterns --- .../src/config/findComponentDescriptors.ts | 4 ++-- .../cli-config-android/src/config/findPackageClassName.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/cli-config-android/src/config/findComponentDescriptors.ts b/packages/cli-config-android/src/config/findComponentDescriptors.ts index cb4fe5afd..b86b38c95 100644 --- a/packages/cli-config-android/src/config/findComponentDescriptors.ts +++ b/packages/cli-config-android/src/config/findComponentDescriptors.ts @@ -16,8 +16,8 @@ export function findComponentDescriptors(packageRoot: string) { // no jsSrcsDir, continue with default glob pattern } const globPattern = jsSrcsDir - ? `${jsSrcsDir}/**/+(*.js|*.jsx|*.ts|*.tsx)` - : '**/+(*.js|*.jsx|*.ts|*.tsx)'; + ? `${jsSrcsDir}/**/*{.js,.jsx,.ts,.tsx}` + : '**/*{.js,.jsx,.ts,.tsx}'; const files = glob.sync(globPattern, { cwd: unixifyPaths(packageRoot), onlyFiles: true, diff --git a/packages/cli-config-android/src/config/findPackageClassName.ts b/packages/cli-config-android/src/config/findPackageClassName.ts index dd8b36050..6a72848b7 100644 --- a/packages/cli-config-android/src/config/findPackageClassName.ts +++ b/packages/cli-config-android/src/config/findPackageClassName.ts @@ -18,12 +18,12 @@ export function getMainActivityFiles( let patternArray = []; if (includePackage) { - patternArray.push('*Package.java', '*Package.kt'); + patternArray.push('Package.java', 'Package.kt'); } else { - patternArray.push('*.java', '*.kt'); + patternArray.push('.java', '.kt'); } - return glob.sync(`**/+(${patternArray.join('|')})`, { + return glob.sync(`**/*{${patternArray.join(',')}}`, { cwd: unixifyPaths(folder), onlyFiles: true, ignore: ['**/.cxx/**'],