Merge remote-tracking branch 'origin/main' into codemirror

Author: bajrangCoder

package-lock.json

@@ -160,10 +160,10 @@
     "markdown-it-footnote": "^4.0.0",
     "markdown-it-github-alerts": "^1.0.0",
     "markdown-it-task-lists": "^2.1.1",
-    "mime-types": "^3.0.2",
-    "minimatch": "^10.1.1",
+    "mime-types": "^3.0.1",
     "moment": "^2.30.1",
     "mustache": "^4.2.0",
+    "picomatch": "^4.0.3",
     "url-parse": "^1.5.10",
     "vanilla-picker": "^2.12.3",
     "yargs": "^18.0.0"

package.json

@@ -304,26 +304,26 @@
 	"info-scroll-settings": "Pengaturan ini berisi pengaturan gulir termasuk bungkus teks.",
 	"info-animation": "Jika aplikasi terasa lag, nonaktifkan animasi.",
 	"info-quicktoolstriggermode": "Jika tombol dalam alat cepat tidak berfungsi, cobalah untuk mengubah nilai ini.",
-	"info-checkForAppUpdates": "Check for app updates automatically.",
-	"info-quickTools": "Show or hide quick tools.",
-	"info-showHiddenFiles": "Show hidden files and folders. (Start with .)",
-	"info-all_file_access": "Enable access of /sdcard and /storage in terminal.",
-	"info-fontSize": "The font size used to render text.",
-	"info-fontFamily": "The font family used to render text.",
-	"info-theme": "The color theme of the terminal.",
-	"info-cursorStyle": "The style of the cursor when the terminal is focused.",
-	"info-cursorInactiveStyle": "The style of the cursor when the terminal is not focused.",
-	"info-fontWeight": "The font weight used to render non-bold text.",
-	"info-cursorBlink": "Whether the cursor blinks.",
-	"info-scrollback": "The amount of scrollback in the terminal. Scrollback is the amount of rows that are retained when lines are scrolled beyond the initial viewport.",
-	"info-tabStopWidth": "The size of tab stops in the terminal.",
-	"info-letterSpacing": "The spacing in whole pixels between characters.",
-	"info-imageSupport": "Whether images are supported in the terminal.",
-	"info-fontLigatures": "Whether font ligatures are enabled in the terminal.",
-	"info-confirmTabClose": "Ask for confirmation before closing terminal tabs.",
-	"info-backup": "Creates a backup of the terminal installation.",
-	"info-restore": "Restores a backup of the terminal installation.",
-	"info-uninstall": "Uninstalls the terminal installation.",
+	"info-checkForAppUpdates": "Periksa pembaruan aplikasi secara otomatis.",
+	"info-quickTools": "Tampilkan atau sembunyikan alat cepat.",
+	"info-showHiddenFiles": "Tampilkan berkas dan folder tersembunyi. (Berawal dengan .)",
+	"info-all_file_access": "Aktifkan akses ke /sdcard dan /storage di terminal.",
+	"info-fontSize": "Ukuran font yang digunakan untuk menampilkan teks.",
+	"info-fontFamily": "Jenis huruf yang digunakan untuk menampilkan teks.",
+	"info-theme": "Tema warna terminal.",
+	"info-cursorStyle": "Gaya kursor saat terminal sedang aktif.",
+	"info-cursorInactiveStyle": "Gaya kursor saat terminal tidak terfokus.",
+	"info-fontWeight": "Ketebalan font yang digunakan untuk menampilkan teks tidak tebal.",
+	"info-cursorBlink": "Apakah kursor berkedip.",
+	"info-scrollback": "Jumlah scrollback di terminal. Scrollback adalah jumlah baris yang dipertahankan ketika baris digulirkan melampaui tampilan awal.",
+	"info-tabStopWidth": "Ukuran tab berhenti di terminal.",
+	"info-letterSpacing": "Jarak antar karakter dalam piksel penuh.",
+	"info-imageSupport": "Apakah gambar didukung di terminal.",
+	"info-fontLigatures": "Apakah ligatur font diaktifkan di terminal.",
+	"info-confirmTabClose": "Mintalah konfirmasi sebelum menutup tab terminal.",
+	"info-backup": "Membuat cadangan instalasi terminal.",
+	"info-restore": "Mengembalikan cadangan instalasi terminal.",
+	"info-uninstall": "Menghapus instalasi terminal.",
 	"owned": "Dimiliki",
 	"api_error": "API server turun, silakan coba setelah beberapa waktu.",
 	"installed": "Terpasang",
@@ -439,8 +439,8 @@
 	"terminal:cursor style": "Gaya Kursor",
 	"terminal:font family": "Keluarga Huruf",
 	"terminal:convert eol": "Konversi Akhir Baris",
-	"terminal:confirm tab close": "Confirm terminal tab close",
-	"terminal:image support": "Image support",
+	"terminal:confirm tab close": "Konfirmasi penutupan tab terminal",
+	"terminal:image support": "Dukungan gambar",
 	"terminal": "Terminal",
 	"allFileAccess": "Semua akses berkas",
 	"fonts": "Huruf",
@@ -455,49 +455,49 @@
 	"keywords": "Kata kunci",
 	"author": "Pembuat",
 	"filtered by": "Disaring oleh",
-	"clean install state": "Clean Install State",
-	"backup created": "Backup created",
-	"restore completed": "Restore completed",
-	"restore will include": "This will restore",
-	"restore warning": "This action cannot be undone. Continue?",
-	"reload to apply": "Reload to apply changes?",
-	"reload app": "Reload app",
-	"preparing backup": "Preparing backup",
-	"collecting settings": "Collecting settings",
-	"collecting key bindings": "Collecting key bindings",
-	"collecting plugins": "Collecting plugin information",
-	"creating backup": "Creating backup file",
-	"validating backup": "Validating backup",
-	"restoring key bindings": "Restoring key bindings",
-	"restoring plugins": "Restoring plugins",
-	"restoring settings": "Restoring settings",
-	"legacy backup warning": "This is an older backup format. Some features may be limited.",
-	"checksum mismatch": "Checksum mismatch - backup file may have been modified or corrupted.",
-	"plugin not found": "Plugin not found in registry",
-	"paid plugin skipped": "Paid plugin - purchase not found",
-	"source not found": "Source file no longer exists",
-	"restored": "Restored",
-	"skipped": "Skipped",
-	"backup not valid object": "Backup file is not a valid object",
-	"backup no data": "Backup file contains no data to restore",
-	"backup legacy warning": "This is an older backup format (v1). Some features may be limited.",
-	"backup missing metadata": "Missing backup metadata - some info may be unavailable",
-	"backup checksum mismatch": "Checksum mismatch - backup file may have been modified or corrupted. Proceed with caution.",
-	"backup checksum verify failed": "Could not verify checksum",
-	"backup invalid settings": "Invalid settings format",
-	"backup invalid keybindings": "Invalid keyBindings format",
-	"backup invalid plugins": "Invalid installedPlugins format",
-	"issues found": "Issues found",
-	"error details": "Error details",
-	"active tools": "Active tools",
-	"available tools": "Available tools",
-	"recent": "Recent Files",
-	"command palette": "Open Command Palette",
-	"change theme": "Change Theme",
-	"documentation": "Documentation",
-	"open in terminal": "Open in Terminal",
-	"developer mode": "Developer Mode",
-	"info-developermode": "Enable developer tools (Eruda) for debugging plugins and inspecting app state. Inspector will be initialized on app start.",
-	"developer mode enabled": "Developer mode enabled. Use command palette to toggle inspector (Ctrl+Shift+I).",
-	"developer mode disabled": "Developer mode disabled"
+	"clean install state": "Bersihkan kondisi instal",
+	"backup created": "Cadangan dibuat",
+	"restore completed": "Pemulihan selesai",
+	"restore will include": "Ini akan memulihkan",
+	"restore warning": "Tindakan ini tidak dapat dibatalkan. Lanjutkan?",
+	"reload to apply": "Muat ulang untuk menerapkan perubahan?",
+	"reload app": "Muat ulang aplikasi",
+	"preparing backup": "Mempersiapkan cadangan",
+	"collecting settings": "Mengumpulkan pengaturan",
+	"collecting key bindings": "Mengumpulkan binding kunci",
+	"collecting plugins": "Mengumpulkan informasi plugin",
+	"creating backup": "Membuat berkas cadangan",
+	"validating backup": "Memvalidasi cadangan",
+	"restoring key bindings": "Mengembalikan binding kunci",
+	"restoring plugins": "Memulihkan plugin",
+	"restoring settings": "Memulihkan pengaturan",
+	"legacy backup warning": "Ini adalah format pencadangan lama. Beberapa fitur mungkin terbatas.",
+	"checksum mismatch": "Ketidakcocokan checksum - berkas cadangan mungkin telah dimodifikasi atau rusak.",
+	"plugin not found": "Plugin tidak ditemukan di registri.",
+	"paid plugin skipped": "Plugin berbayar - pembelian tidak ditemukan",
+	"source not found": "Berkas sumber tidak lagi ada.",
+	"restored": "Dipulihkan",
+	"skipped": "Dilewati",
+	"backup not valid object": "Berkas cadangan bukan objek yang valid",
+	"backup no data": "Berkas cadangan tidak berisi data untuk dipulihkan.",
+	"backup legacy warning": "Ini adalah format pencadangan lama (v1). Beberapa fitur mungkin terbatas.",
+	"backup missing metadata": "Metadata cadangan hilang - beberapa informasi mungkin tidak tersedia.",
+	"backup checksum mismatch": "Ketidakcocokan checksum - berkas cadangan mungkin telah dimodifikasi atau rusak. Lanjutkan dengan hati-hati.",
+	"backup checksum verify failed": "Checksum tidak dapat diverifikasi.",
+	"backup invalid settings": "Format pengaturan tidak valid",
+	"backup invalid keybindings": "Format keyBindings tidak valid",
+	"backup invalid plugins": "Format installedPlugins tidak valid",
+	"issues found": "Masalah ditemukan",
+	"error details": "Detail kesalahan",
+	"active tools": "Alat-alat yang aktif",
+	"available tools": "Alat-alat yang tersedia",
+	"recent": "Berkas terbaru",
+	"command palette": "Buka Palet Perintah",
+	"change theme": "Ganti tema",
+	"documentation": "Dokumentasi",
+	"open in terminal": "Buka di Terminal",
+	"developer mode": "Mode Pengembang",
+	"info-developermode": "Aktifkan alat pengembang (Eruda) untuk men-debug plugin dan memeriksa status aplikasi. Inspektor akan diinisialisasi saat aplikasi dimulai.",
+	"developer mode enabled": "Mode pengembang diaktifkan. Gunakan palet perintah untuk mengaktifkan/menonaktifkan inspektor (Ctrl+Shift+I).",
+	"developer mode disabled": "Mode pengembang dinonaktifkan"
 }

src/lang/id-id.json

@@ -1,6 +1,6 @@
 import fsOperation from "fileSystem";
 import toast from "components/toast";
-import { minimatch } from "minimatch";
+import picomatch from "picomatch/posix";
 import Url from "utils/Url";
 import { addedFolder } from "./openFolder";
 import settings from "./settings";
@@ -310,8 +310,10 @@ async function createChildTree(parent, item, root) {
 
 	parent.children.push(file);
 	if (isDirectory) {
-		const ignore = !!settings.value.excludeFolders.find((folder) =>
-			minimatch(Url.join(file.path, ""), folder, { matchBase: true }),
+		const ignore = picomatch.isMatch(
+			Url.join(file.path, ""),
+			settings.value.excludeFolders,
+			{ matchBase: true },
 		);
 		if (ignore) return;
 

src/lib/fileList.js

@@ -1,5 +1,5 @@
 import "core-js/stable";
-import { minimatch } from "minimatch";
+import picomatch from "picomatch/posix";
 
 const resolvers = {};
 
@@ -283,12 +283,8 @@ function Skip({ exclude, include }) {
 	function test(file) {
 		if (!file.path) return false;
 		const match = (pattern) =>
-			minimatch(file.path, pattern, { matchBase: true });
-		const isExcluded = excludeFiles.some(match);
-		const isIncluded = includeFiles.some(match);
-		const userIncluded = include && include.trim().length > 0 && isIncluded;
-		if (userIncluded) return false;
-		return isExcluded || !isIncluded;
+			picomatch.isMatch(file.path, pattern, { matchBase: true });
+		return excludeFiles.some(match) || !includeFiles.some(match);
 	}
 
 	return {