From 510a45ebb61d890fe4ffc87bb58fa8713161b94c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pierzcha=C5=82a?= Date: Tue, 24 Sep 2024 13:32:18 +0200 Subject: [PATCH] chore: use fast-glob for link-assets and scripts --- package.json | 1 - packages/cli-link-assets/package.json | 1 + .../src/tools/helpers/font/androidFontAssetHelpers.ts | 4 ++-- scripts/build.js | 2 +- scripts/linkPackages.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 08f52d28d..8edf47f5c 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,6 @@ "eslint-plugin-import": "^2.25.3", "execa": "^5.0.0", "fast-glob": "^3.3.2", - "glob": "^7.1.3", "husky": "^8.0.2", "jest": "^26.6.2", "jest-circus": "^26.6.2", diff --git a/packages/cli-link-assets/package.json b/packages/cli-link-assets/package.json index 6035b9353..af70046fd 100644 --- a/packages/cli-link-assets/package.json +++ b/packages/cli-link-assets/package.json @@ -14,6 +14,7 @@ "@react-native-community/cli-platform-ios": "15.0.0-alpha.2", "@react-native-community/cli-tools": "15.0.0-alpha.2", "chalk": "^4.1.2", + "fast-glob": "^3.3.2", "fast-xml-parser": "^4.4.1", "opentype.js": "^1.3.4", "plist": "^3.1.0", diff --git a/packages/cli-link-assets/src/tools/helpers/font/androidFontAssetHelpers.ts b/packages/cli-link-assets/src/tools/helpers/font/androidFontAssetHelpers.ts index 66546c903..1862effcb 100644 --- a/packages/cli-link-assets/src/tools/helpers/font/androidFontAssetHelpers.ts +++ b/packages/cli-link-assets/src/tools/helpers/font/androidFontAssetHelpers.ts @@ -2,7 +2,7 @@ import {isProjectUsingKotlin} from '@react-native-community/cli-platform-android import {CLIError, logger} from '@react-native-community/cli-tools'; import {XMLBuilder, XMLParser} from 'fast-xml-parser'; import fs from 'fs-extra'; -import {sync as globSync} from 'glob'; +import glob from 'fast-glob'; import OpenType from 'opentype.js'; import path from 'path'; @@ -77,7 +77,7 @@ function convertToAndroidResourceName(str: string) { function getProjectFilePath(rootPath: string, name: string) { const isUsingKotlin = isProjectUsingKotlin(rootPath); const ext = isUsingKotlin ? 'kt' : 'java'; - const filePath = globSync( + const filePath = glob.sync( path.join(rootPath, `app/src/main/java/**/${name}.${ext}`), )[0]; return filePath; diff --git a/scripts/build.js b/scripts/build.js index 30a977307..9fbad060a 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -20,7 +20,7 @@ const fs = require('fs'); const path = require('path'); -const glob = require('glob'); +const glob = require('fast-glob'); const babel = require('@babel/core'); const chalk = require('chalk'); const micromatch = require('micromatch'); diff --git a/scripts/linkPackages.js b/scripts/linkPackages.js index 407ffb0d0..c0658cd1c 100644 --- a/scripts/linkPackages.js +++ b/scripts/linkPackages.js @@ -1,7 +1,7 @@ const execa = require('execa'); const chalk = require('chalk'); const path = require('path'); -const glob = require('glob'); +const glob = require('fast-glob'); const projects = glob.sync('packages/*/package.json');