From 17c65606bf4ffe99a5bbd01e9973a2362c5299f8 Mon Sep 17 00:00:00 2001 From: Katherine Jensen Date: Thu, 14 Nov 2024 15:03:51 -0800 Subject: [PATCH 01/14] Add some spanish localizations --- assets/localization/es.json | 61 +++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 6 deletions(-) diff --git a/assets/localization/es.json b/assets/localization/es.json index 12f9f22a06..4e7b3a0ace 100644 --- a/assets/localization/es.json +++ b/assets/localization/es.json @@ -1,9 +1,20 @@ { "%about_versionLabel_format%": "Versión: {version}", "%about_licenseLabel_format%": "Licencia: {license}", + "%downloadUpdateProjectTab_aria_downloadable%": "proyectos descargables", + "%downloadUpdateProjectTab_aria_downloaded%": "proyectos descargables", + "%downloadUpdateProjectTab_button_delete%": "Eliminar", + "%downloadUpdateProjectTab_listHeader_downloadable%": "Proyectos Descargables", + "%downloadUpdateProjectTab_listHeader_downloaded%": "Proyectos Descargables", + "%downloadUpdateProjectTab_title_downloadUpdate%": "Descargar/Actualizar Proyecto", + "%general_button_submit%": "Enviar", + "%general_cancel%": "Cancelar", + "%general_error_title%": "Error", + "%general_loading%": "Cargando", + "%general_run%": "Ejecutar", "%insertNote%": "Insertar Nota", "%mainMenu_about%": "Acerca de Platform.Bible", - "%mainMenu_downloadSlashInstallResources%": "Descargar/instalar recursos", + "%mainMenu_downloadInstallResources%": "Descargar/instalar recursos", "%mainMenu_downloadSlashUpdateProject%": "Descargar/actualizar proyecto", "%mainMenu_exit%": "Salir", "%mainMenu_help%": "Ayuda", @@ -13,15 +24,53 @@ "%mainMenu_settings%": "Configuración", "%mainMenu_visitSupportBible%": "Visitar Support.Bible", "%mainMenu_window%": "Ventana", + "%menuItemName_wordList%": "Lista de Palabras", + "%product_name%": "Plataforma.Biblia", + "%project_full_name_missing%": "*Falta el Nombre*", + "%project_language_missing%": "*Falta el Idioma*", + "%project_name_missing%": "_SinNombre_", + "%project_settings_platform_fullName_label%": "Nombre Completo del Proyecto", + "%project_settings_platform_group1_description%": "Configuración del proyecto relacionada con el software en general", + "%project_settings_platform_group1_label%": "Configuración de la Plataforma", + "%project_settings_platform_isEditable_label%": "Es Editable", + "%project_settings_platform_isEditable_description%": "Si este proyecto es editable. Un proyecto que no es editable a veces se denomina recurso.", + "%project_settings_platform_language_label%": "Lenguaje Primario del Proyecto", + "%project_settings_platform_name_label%": "Nombre Abreviado del Proyecto", + "%scrollGroup_0%": "A", + "%scrollGroup_1%": "B", + "%scrollGroup_2%": "C", + "%scrollGroup_3%": "D", + "%scrollGroup_4%": "E", + "%scrollGroup_undefined%": "Ø", + "%selectBooks_title_selectBooks%": "Seleccionar libros", + "%selectMultipleProjects_title_selectProjects%": "Seleccionar Proyectos", + "%selectProject_title%": "Seleccionar Proyecto", + "%settings_platform_comments_enabled_description%": "Habilitado la lectura y escritura de comentarios en proyectos. Esta es una característica experimental.", + "%settings_platform_comments_enabled_label%": "Comentarios habilitados (experimental)", + "%settings_defaultMessage_loadingSetting%": "Cargando configuración", + "%settings_defaultSearchText_searchProject%": "Buscar Configuración del Proyecto...", + "%settings_defaultSearchText_searchUserSettings%": "Buscar Configuración del Usuario...", + "%settings_platform_group1_description%": "Configuraciones generales del software fundamental", + "%settings_platform_group1_label%": "Configuración de la Plataforma", + "%settings_platform_interfaceLanguage_description%": "Lista de locales usados al localizar la interfaz en orden descendente de prioridad. 'en' (inglés) siempre se añade al final, de modo que si no se encuentra una traducción en ninguno de los idiomas especificados, aparecerá en inglés.", + "%settings_platform_label_group1%": "Configuraciones de Platform", + "%settings_platform_interfaceLanguage_label%": "Idioma de interfaz", + "%settings_platform_paratextDataLastRegistryDataCachedTimes_label%": "ParatextData Últimos Datos del Registro Almacenados en Caché", + "%settings_platform_ptxUtilsMementoData_label%": "Datos de Recuerdo de PtxUtils", + "%settings_platform_verseRef_description%": "Referencia de Verso Actual para el Grupo de Desplazamiento A. Obsoleto - Por favor use `papi.scrollGroups` y `useWebViewScrollGroupScrRef`", + "%settings_platform_verseRef_label%": "Referencia de Verso Actual para el Grupo de Desplazamiento A (Obsoleto)", + "%settings_title_projectSettings%": "Configuración del Proyecto", + "%settings_title_userSettings%": "Configuración del Usuario", "%some_localization_key%": "Esto es el texto en español para %some_localization_key%.", "%submitButton%": "Enviar", + "%tab_aria_tab%": "Pestaña", + "%tab_title_error%": "Error", + "%tab_title_unknown%": "Desconocido", + "%webView_defaultTitle_webView%": "Vista Web", "%webView_edit%": "Editar", "%webView_openProjectSettings%": "Abrir configuraciones del proyecto", "%webView_project%": "Proyecto", "%webView_projectAssignmentsAndProgress%": "Asignaciones y progreso", - "%wordList%": "Lista de palabras", - "%settings_platform_group1_description%": "Configuraciones generales del software fundamental", - "%settings_platform_interfaceLanguage_description%": "Lista de locales usados al localizar la interfaz en orden descendente de prioridad. 'en' (inglés) siempre se añade al final, de modo que si no se encuentra una traducción en ninguno de los idiomas especificados, aparecerá en inglés.", - "%settings_platform_label_group1%": "Configuraciones de Platform", - "%settings_platform_interfaceLanguage_label%": "Idioma de interfaz" + "%webView_title_type_formatString%": "{type} {defaultTitle}", + "%wordList%": "Lista de palabras" } From 43d6b531205c5209d2c7544dc5a8b6da5df44b8d Mon Sep 17 00:00:00 2001 From: Katherine Jensen Date: Tue, 19 Nov 2024 10:53:14 -0800 Subject: [PATCH 02/14] Add more Spanish Localizations to core --- assets/localization/es.json | 122 ++++++++++++++++++ .../contributions/localizedStrings.json | 43 ++++++ .../contributions/localizedStrings.json | 19 +++ .../src/paratext-registration.web-view.tsx | 2 +- .../contributions/localizedStrings.json | 25 ++++ .../contributions/localizedStrings.json | 62 +++++++++ 6 files changed, 272 insertions(+), 1 deletion(-) diff --git a/assets/localization/es.json b/assets/localization/es.json index 4e7b3a0ace..4c4180c6cd 100644 --- a/assets/localization/es.json +++ b/assets/localization/es.json @@ -1,6 +1,128 @@ { "%about_versionLabel_format%": "Versión: {version}", "%about_licenseLabel_format%": "Licencia: {license}", + "%Book.GEN%": "Génesis", + "%Book.LEV%": "Levítico", + "%Book.NUM%": "Números", + "%Book.DEU%": "Deuteronomio", + "%Book.JOS%": "Josué", + "%Book.JDG%": "Jueces", + "%Book.RUT%": "Rut", + "%Book.1SA%": "1 Samuel", + "%Book.2SA%": "2 Samuel", + "%Book.1KI%": "1 Reyes", + "%Book.2KI%": "2 Reyes", + "%Book.1CH%": "1 Crónicas", + "%Book.2CH%": "2 Crónicas", + "%Book.EZR%": "Esdras", + "%Book.NEH%": "Nehemías", + "%Book.EST%": "Ester (hebreo)", + "%Book.JOB%": "Job", + "%Book.PSA%": "Salmos", + "%Book.PRO%": "Proverbios", + "%Book.ECC%": "Eclesiastés", + "%Book.SNG%": "Cantar de los cantares", + "%Book.ISA%": "Isaías", + "%Book.JER%": "Jeremías", + "%Book.LAM%": "Lamentaciones", + "%Book.EZK%": "Ezequiel", + "%Book.DAN%": "Daniel (hebreo)", + "%Book.HOS%": "Oseas", + "%Book.JOL%": "Joel", + "%Book.AMO%": "Amós", + "%Book.OBA%": "Abdías", + "%Book.JON%": "Jonás", + "%Book.MIC%": "Miqueas", + "%Book.NAM%": "Nahúm", + "%Book.HAB%": "Habacuc", + "%Book.ZEP%": "Sofonías", + "%Book.HAG%": "Hageo", + "%Book.ZEC%": "Zacarías", + "%Book.MAL%": "Malaquías", + "%Book.MAT%": "Mateo", + "%Book.MRK%": "Marcos", + "%Book.LUK%": "Lucas", + "%Book.JHN%": "Juan", + "%Book.ACT%": "Hechos", + "%Book.ROM%": "Romanos", + "%Book.1CO%": "1 Corintios", + "%Book.2CO%": "2 Corintios", + "%Book.GAL%": "Gálatas", + "%Book.EPH%": "Efesios", + "%Book.PHP%": "Filipenses", + "%Book.COL%": "Colosenses", + "%Book.1TH%": "1 Tesalonicenses", + "%Book.2TH%": "2 Tesalonicenses", + "%Book.1TI%": "1 Timoteo", + "%Book.2TI%": "2 Timoteo", + "%Book.TIT%": "Tito", + "%Book.PHM%": "Filemón", + "%Book.HEB%": "Hebreos", + "%Book.JAS%": "Santiago", + "%Book.1PE%": "1 Pedro", + "%Book.2PE%": "2 Pedro", + "%Book.1JN%": "1 Juan", + "%Book.2JN%": "2 Juan", + "%Book.3JN%": "3 Juan", + "%Book.JUD%": "Judas", + "%Book.REV%": "Apocalipsis", + "%Book.TOB%": "Tobías", + "%Book.JDT%": "Judit", + "%Book.ESG%": "Ester (griego)", + "%Book.WIS%": "Sabiduría", + "%Book.SIR%": "Sirach (Eclesiástico)", + "%Book.BAR%": "Baruc", + "%Book.LJE%": "Carta de Jeremías", + "%Book.S3Y%": "Canto de los tres jóvenes", + "%Book.SUS%": "Susana", + "%Book.BEL%": "Bel y la Serpiente", + "%Book.1MA%": "1 Macabeos", + "%Book.2MA%": "2 Macabeos", + "%Book.3MA%": "3 Macabeos", + "%Book.4MA%": "4 Macabeos", + "%Book.1ES%": "1 Esdras (griego)", + "%Book.2ES%": "2 Esdras (Latin)", + "%Book.MAN%": "Oración de Manasés", + "%Book.PS2%": "Salmos de Salomón", + "%Book.ODA%": "Odas", + "%Book.PSS%": "Salmos de Salomón", + "%Book.JSA%": "Josué A. *obsoleto*", + "%Book.JDB%": "Jueces B. *obsoleto*", + "%Book.TBS%": "Tobías S. *obsoleto*", + "%Book.SST%": "Susana Th. *obsoleto*", + "%Book.DNT%": "Daniel Th. *obsoleto*", + "%Book.BLT%": "Bel Th. *obsoleto*", + "%Book.XXA%": "Extra A", + "%Book.XXB%": "Extra B", + "%Book.XXC%": "Extra C", + "%Book.XXD%": "Extra D", + "%Book.XXE%": "Extra E", + "%Book.XXF%": "Extra F", + "%Book.XXG%": "Extra G", + "%Book.FRT%": "Páginas iniciales", + "%Book.BAK%": "Páginas finales", + "%Book.OTH%": "Otra materia", + "%Book.3ES%": "3 Esdras *obsoleto*", + "%Book.EZA%": "Apocalipsis de Esdras", + "%Book.5EZ%": "5 Esdras (Prólogo en Latín)", + "%Book.6EZ%": "6 Esdras (Prólogo en Latín)", + "%Book.INT%": "Introducción", + "%Book.CNC%": "Concordancia ", + "%Book.GLO%": "Glosario ", + "%Book.TDX%": "Índice de temas", + "%Book.NDX%": "Índice de nombres", + "%Book.DAG%": "Daniel griego", + "%Book.PS3%": "Salmos 152-155", + "%Book.2BA%": "2 Baruc (Apocalipsis)", + "%Book.LBA%": "Carta de Baruch", + "%Book.JUB%": "Jubileos", + "%Book.ENO%": "Enoc", + "%Book.1MQ%": "1 Macabeos (Etiópe)", + "%Book.2MQ%": "2 Macabeos (Etiópe)", + "%Book.3MQ%": "3 Macabeos (Etiópe)", + "%Book.REP%": "Re-examinar (Proverbios 25-31)", + "%Book.4BA%": "4 Baruc (El resto de Baruc)", + "%Book.LAO%": "Laodicenos", "%downloadUpdateProjectTab_aria_downloadable%": "proyectos descargables", "%downloadUpdateProjectTab_aria_downloaded%": "proyectos descargables", "%downloadUpdateProjectTab_button_delete%": "Eliminar", diff --git a/extensions/src/hello-world/contributions/localizedStrings.json b/extensions/src/hello-world/contributions/localizedStrings.json index 046659d6d0..29305c7c58 100644 --- a/extensions/src/hello-world/contributions/localizedStrings.json +++ b/extensions/src/hello-world/contributions/localizedStrings.json @@ -50,6 +50,49 @@ "%project_settings_helloWorld_headerSize_description%": "Size of the header font in `em`", "%project_settings_helloWorld_headerColor_label%": "Header Color", "%project_settings_helloWorld_headerColor_description%": "Color of the headers (must be a valid [HTML color name](https://htmlcolorcodes.com/color-names/))" + }, + "es": { + "%mainMenu_helloWorldSubmenu%": "Hola Proyectos del Mundo.", + "%mainMenu_openHelloWorldProject%": "Abrir Hola Proyecto Mundo", + "%mainMenu_createNewHelloWorldProject%": "Crear un Nuevo Proyecto Hola Mundo", + "%mainMenu_deleteHelloWorldProject%": "Eliminar Proyecto Hola Mundo", + "%helloWorld_greetingLoading%": "Cargando Saludo", + "%helloWorld_delete%": "Eliminar", + "%helloWorld_frenchLocalizationSubmit%": "localización Francesa del Botón de Enviar", + "%helloWorld_helloWorld%": "Hola Mundo", + "%helloWorld_listOfSelectedIds%": "Lista de ID de Proyecto Seleccionado(s)", + "%helloWorld_logo%": "Logotipo de Hola Mundo", + "%helloWorld_none%": "Ninguno", + "%helloWorld_openResourceViewer%": "Abierto en el Visor de Recursos", + "%helloWorld_openScriptureEditor%": "Abierto en el Editor de Escrituras", + "%helloWorld_option1%": "Opción 1", + "%helloWorld_option2%": "Opción 2", + "%helloWorld_react%": "React", + "%helloWorld_select_project%": "Seleccionar Proyecto", + "%helloWorld_select_projects%": "Seleccione Proyectos", + "%helloWorld_selected_project%": "Proyecto Seleccionado", + "%helloWorld_table_id%": "ID", + "%helloWorld_table_subtitle%": "Subtítulo", + "%helloWorld_table_title%": "Título", + "%helloWorld_testMe%": "Ponme a Prueba", + "%helloWorld_throw_test_exception%": "Lanzar Excepción de Prueba", + "%helloWorld_webViewMenu_deleteProject%": "Elimine Este Proyecto", + "%helloWorld_webViewMenu_openViewer%": "Abrir Visor", + "%helloWorld_webViewMenu_project%": "Proyecto", + "%helloWorld_webViewMenu_view%": "Vista", + "%helloWorld_loadingLatest%": "Cargando el último texto de las Escrituras...", + "%helloWorld_loadingVerse%": "Cargando Verso", + "%helloWorld_selectProject_prompt%": "Seleccione un proyecto de Escritura para Hola Mundo Vista Web: (Renderizar", + "%helloWorld_selectProject_title%": "Seleccione Proyecto Hola Mundo", + "%helloWorld_selectProjects_prompt%": "Seleccione uno o más proyectos bíblicos para Hola Mundo Vista Web:", + "%helloWorld_selectProjects_title%": "Seleccionar Lista de Proyectos Hola Mundo", + "%settings_hello_world_group1_label%": "Configuración de Hola Mundo", + "%settings_hello_world_personName_label%": "Nombre de la Persona Seleccionada en la Vista Web de Hola Mundo", + "%project_settings_helloWorld_group1_label%": "Configuración del Proyecto Hola Mundo", + "%project_settings_helloWorld_headerSize_label%": "Tamaño del encabezado", + "%project_settings_helloWorld_headerSize_description%": "Tamaño de la fuente del encabezado en `em`", + "%project_settings_helloWorld_headerColor_label%": "Color del Encabezado", + "%project_settings_helloWorld_headerColor_description%": "Color de los encabezados (debe ser un válido [nombre de color HTML](https://htmlcolorcodes.com/color-names/))" } } } diff --git a/extensions/src/paratext-registration/contributions/localizedStrings.json b/extensions/src/paratext-registration/contributions/localizedStrings.json index 2d860f513f..dd7c436bee 100644 --- a/extensions/src/paratext-registration/contributions/localizedStrings.json +++ b/extensions/src/paratext-registration/contributions/localizedStrings.json @@ -26,6 +26,25 @@ "%settings_paratextRegistration_registration_internet_group_description%": "Settings related to the user's Paratext Registry connection and some internet access controls", "%settings_paratextRegistration_shouldShowOnStartup_label%": "Show Paratext Registration Web View on Startup", "%settings_paratextRegistration_shouldShowOnStartup_description%": "Whether to show the form to enter Paratext Registration information when the application starts if it has not been entered previously." + }, + "es": { + "%mainMenu_openParatextRegistration%": "Información de registro de paratexto...", + "%paratextRegistration_alert_updatedRegistration%": "Información de registro de Paratext", + "%paratextRegistration_alert_updatedRegistration_description%": "Cambios aplicados! La aplicación se reiniciará en unos segundos.", + "%paratextRegistration_button_saveAndRestart%": "Guardar y reiniciar", + "%paratextRegistration_commit_comment_changing_user%": "Antes de cambiar de usuario registrado", + "%paratextRegistration_label_registrationName%": "Nombre de registro", + "%paratextRegistration_label_registrationCode%": "Código de registro", + "%paratextRegistration_label_emailAddress%": "Dirección de Correo Electrónico", + "%paratextRegistration_warning_invalid_email%": "Por favor, introduce una dirección de correo electrónico válida.", + "%paratextRegistration_warning_invalid_registration%": "Este código de registro no es correcto para este usuario.", + "%paratextRegistration_webView_title%": "Información de Registro de Paratexto", + "%paratextRegistration_webView_tooltip%": "Ingrese su información de registro de Paratext en este formulario.", + "%paratextRegistration_exception_register_before_accessing_dbl_resources%": "Debe proporcionar un registro de Paratext válido antes de abrir recursos de la Biblioteca Bíblica Digital.", + "%settings_paratextRegistration_registration_internet_group_label%": "Registro de Paratext y Configuración de Internet", + "%settings_paratextRegistration_registration_internet_group_description%": "Configuraciones relacionadas con la conexión del Registro Paratext del usuario y algunos controles de acceso a Internet", + "%settings_paratextRegistration_shouldShowOnStartup_label%": "Mostrar la Vista Web de Registro de Paratext al Iniciar", + "%settings_paratextRegistration_shouldShowOnStartup_description%": "Si se debe mostrar el formulario para ingresar la información de registro de Paratext cuando se inicia la aplicación si no se ha ingresado previamente." } } } diff --git a/extensions/src/paratext-registration/src/paratext-registration.web-view.tsx b/extensions/src/paratext-registration/src/paratext-registration.web-view.tsx index d95b04a933..1d73a5b116 100644 --- a/extensions/src/paratext-registration/src/paratext-registration.web-view.tsx +++ b/extensions/src/paratext-registration/src/paratext-registration.web-view.tsx @@ -85,7 +85,7 @@ globalThis.webViewComponent = function ParatextRegistration({ useWebViewState }: }; }, []); - const [localizedStrings] = useLocalizedStrings(LOCALIZED_STRING_KEYS); + const [localizedStrings] = useLocalizedStrings(useMemo(() => LOCALIZED_STRING_KEYS, [])); const [name, setName] = useWebViewState('name', ''); const [registrationCode, setRegistrationCode] = useWebViewState('registrationCode', ''); diff --git a/extensions/src/platform-scripture-editor/contributions/localizedStrings.json b/extensions/src/platform-scripture-editor/contributions/localizedStrings.json index f9fca13a24..94803085bd 100644 --- a/extensions/src/platform-scripture-editor/contributions/localizedStrings.json +++ b/extensions/src/platform-scripture-editor/contributions/localizedStrings.json @@ -25,6 +25,31 @@ "%platformScriptureEditor_dialog_openResourceViewer_prompt%": "Choose a resource to open:", "%platformScriptureEditor_dialog_openScriptureEditor_title%": "Open Scripture Editor", "%platformScriptureEditor_dialog_openScriptureEditor_prompt%": "Choose a project to open:" + }, + "es": { + "%mainMenu_openPlatformScriptureEditor%": "Abrir el Editor de Escrituras", + "%mainMenu_openPlatformResourceViewer%": "Abrir el Visor de Recursos", + "%webView_platformScriptureEditor_options%": "Opciones", + "%webView_platformScriptureEditor_tools%": "Herramientas", + "%webView_platformScriptureEditor_info%": "Información", + "%webView_platformScriptureEditor_backgroundColor%": "Color de Fondo", + "%webView_platformScriptureEditor_textColor%": "Color del Texto", + "%webView_platformScriptureEditor_thickBorders%": "Bordes Gruesos", + "%webView_platformScriptureEditor_charactersInventory%": "Inventario: Caracteres...", + "%webView_platformScriptureEditor_repeatedWordsInventory%": "Inventario: Palabras Repetidas...", + "%webView_platformScriptureEditor_markersInventory%": "Inventario: Marcadores...", + "%webView_platformScriptureEditor_configureChecks%": "Configurar Verificaciones...", + "%webView_platformScriptureEditor_showCheckResults%": "Mostrar Resultados de Verificación...", + "%webView_platformScriptureEditor_publisherInfo%": "Información del Editor", + "%webView_platformScriptureEditor_copyrightInfo%": "Información de Copyright", + "%webView_platformScriptureEditor_title_editable_indicator%": "(Editable)", + "%webView_platformScriptureEditor_title_readonly_no_project%": "Visor de Recursos", + "%webView_platformScriptureEditor_title_editable_no_project%": "Editor de Escrituras", + "%webView_platformScriptureEditor_title_format%": "{projectId} {editable}", + "%platformScriptureEditor_dialog_openResourceViewer_title%": "Abrir Visor de Recursos", + "%platformScriptureEditor_dialog_openResourceViewer_prompt%": "Elija un recurso para abrir:", + "%platformScriptureEditor_dialog_openScriptureEditor_title%": "Abrir el Editor de Escrituras", + "%platformScriptureEditor_dialog_openScriptureEditor_prompt%": "Elige un proyecto para abrir:" } } } diff --git a/extensions/src/platform-scripture/contributions/localizedStrings.json b/extensions/src/platform-scripture/contributions/localizedStrings.json index b29e4fa06e..e6a5ff5ad2 100644 --- a/extensions/src/platform-scripture/contributions/localizedStrings.json +++ b/extensions/src/platform-scripture/contributions/localizedStrings.json @@ -62,6 +62,68 @@ "%webView_inventory_unknown_marker%": "Unknown Marker", "%webView_inventory_occurrences_table_header_reference%": "Reference", "%webView_inventory_occurrences_table_header_occurrence%": "Occurrence" + }, + "es": { + "%mainMenu_toggleIncludeMyParatext9Projects%": "Alternar Incluir Mis Proyectos de Paratext 9", + "%settings_platformScripture_paratext_group_label%": "Configuraciones Relacionadas con Paratext 9", + "%settings_platformScripture_paratext_group_description%": "Configuraciones relacionadas con cómo Platform.Bible debería interactuar con instalaciones anteriores de Paratext", + "%settings_platformScripture_includeMyParatext9Projects_label%": "Incluir Mis Proyectos de Paratext 9", + "%settings_platformScripture_includeMyParatext9Projects_description%": "Si se deben buscar en la carpeta de almacenamiento de proyectos de Paratext 9 los proyectos de Paratext para cargar (solo Windows). Ubicado en \"C:\\My Paratext 9 Projects\". Nota: debe reiniciar Platform.Bible para que el cambio en esta configuración surta efecto.", + "%project_settings_platformScripture_group1_label%": "Configuración del Proyecto de Escrituras", + "%project_settings_platformScripture_booksPresent_label%": "Libros de las Escrituras Presentes", + "%project_settings_platformScripture_booksPresent_description%": "Qué libros de la Biblia están presentes en este proyecto bíblico", + "%project_settings_platformScripture_versification_label%": "Versificación de las Escrituras", + "%project_settings_platformScripture_versification_description%": "Qué esquema de versificación sigue este proyecto de las Escrituras", + "%project_settings_platformScripture_validCharacters_label%": "Caracteres Válidos", + "%project_settings_platformScripture_validCharacters_description%": "Lista de caracteres que se aceptan en este proyecto.", + "%project_settings_platformScripture_invalidCharacters_label%": "Caracteres no Válidos", + "%project_settings_platformScripture_invalidCharacters_description%": "Lista de caracteres que no son aceptados en este proyecto.", + "%project_settings_platformScripture_repeatableWords_label%": "Palabras Repetibles", + "%project_settings_platformScripture_repeatableWords_description%": "Lista de palabras que se permiten repetir en este proyecto.", + "%project_settings_platformScripture_nonRepeatableWords_label%": "Palabras no Repetibles", + "%project_settings_platformScripture_nonRepeatableWords_description%": "Lista de palabras que no se permite repetir en este proyecto.", + "%project_settings_platformScripture_validMarkers_label%": "Marcadores Válidos", + "%project_settings_platformScripture_validMarkers_description%": "Lista de marcadores que se aceptan en este proyecto.", + "%project_settings_platformScripture_invalidMarkers_label%": "Marcadores Inválidos", + "%project_settings_platformScripture_invalidMarkers_description%": "Lista de marcadores que no son aceptados en este proyecto.", + "%webView_platformScripture_tools%": "Herramientas", + "%webView_platformScripture_showCheckResults%": "Mostrar Resultados de Verificación...", + "%webView_characterInventory_title%": "Inventario de Caracteres: {projectName}", + "%webView_repeatedWordsInventory_title%": "Inventario de Palabras Repetidas: {projectName}", + "%webView_markersInventory_title%": "Inventario de Marcadores: {projectName}", + "%webView_configureChecks_title%": "Configurar Verificaciones: {projectName}", + "%webView_configureChecks_checks%": "Verificaciones", + "%webView_configureChecks_loadingChecks%": "Cargando verificaciones", + "%webView_configureChecks_activeRanges%": "Rango(s) activo(s)", + "%webView_bookSelector_currentBook%": "Libro Actual", + "%webView_bookSelector_selectBooks%": "Seleccionar Libros", + "%webView_bookSelector_selectBooks_prompt%": "Seleccione uno o más libros para ejecutar verificaciones básicas", + "%webView_bookSelector_choose%": "Elegir...", + "%webView_bookSelector_chooseBooks%": "Elegir Libros", + "%webView_checkResultsList_title%": "Resultados de Verificación ({resultsCount}): {projectName}", + "%webView_checkResultsList_unspecifiedCheckId%": "ID de verificación no especificado", + "%webView_checkResultsList_unspecifiedCheckDescription%": "Descripción de verificación no especificada", + "%webView_inventory_all%": "Todos los Elementos", + "%webView_inventory_approved%": "Elementos aprobados", + "%webView_inventory_unapproved%": "Elementos no aprobados", + "%webView_inventory_unknown%": "Desconocido elementos", + "%webView_inventory_scope_currentBook%": "Libro actual", + "%webView_inventory_scope_chapter%": "Capítulo actual", + "%webView_inventory_scope_verse%": "Versículo actual", + "%webView_inventory_filter_text%": "Filtrar el texto...", + "%webView_inventory_show_additional_items%": "Mostrar Elementos Adicionales", + "%webView_inventory_table_header_repeated_words%": "Palabra Repetida", + "%webView_inventory_table_header_character%": "Carácter", + "%webView_inventory_table_header_marker%": "Marcador", + "%webView_inventory_table_header_preceding_marker%": "Marcador Precediendo", + "%webView_inventory_table_header_style_name%": "Nombre de Estilo", + "%webView_inventory_table_header_unicode_value%": "Valor Unicode", + "%webView_inventory_table_header_count%": "Conteo", + "%webView_inventory_table_header_status%": "Estado", + "%webView_inventory_show_preceding_marker%": "Mostrar Marcador Precediendo", + "%webView_inventory_unknown_marker%": "Marcador Desconocido", + "%webView_inventory_occurrences_table_header_reference%": "Referencia", + "%webView_inventory_occurrences_table_header_occurrence%": "Incidencia" } } } From c9f6f2eef5ec87b7766f665bda9df65072802dfc Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:13:24 +1300 Subject: [PATCH 03/14] Squashed 'extensions/' changes from fddfe3be5..c276fc9e7 c276fc9e7 add missing format check (#32) git-subtree-dir: extensions git-subtree-split: c276fc9e7ae34067aff2eaa1d38c956635ef9180 --- .stylelintrc.cjs | 4 ++++ package-lock.json | 21 ++++++++++++++------- package.json | 4 +++- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs index a8534cc879..f959736685 100644 --- a/.stylelintrc.cjs +++ b/.stylelintrc.cjs @@ -13,6 +13,10 @@ module.exports = { }, ], rules: { + // Disable Stylelint's indentation control + '@stylistic/indentation': null, + // Let Prettier handle selector list formatting + '@stylistic/selector-list-comma-newline-after': null, 'color-named': null, 'max-nesting-depth': 2, 'no-descending-specificity': null, diff --git a/package-lock.json b/package-lock.json index 29a7170cb3..ef52130e23 100644 --- a/package-lock.json +++ b/package-lock.json @@ -120,6 +120,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -150,6 +151,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -175,7 +177,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5098,10 +5101,11 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -16614,9 +16618,9 @@ } }, "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -20240,7 +20244,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -20277,6 +20283,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index ff0e9b1bb6..7fe00b42b4 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,8 @@ "watch": "npm run build -- --watch", "build:production": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=false webpack", "watch:production": "npm run build:production -- --watch", + "format": "prettier --write .", + "format:check": "prettier --check .", "zip": "tsx ./lib/zip-extensions.ts", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -21,7 +23,7 @@ "lint:scripts": "cross-env NODE_ENV=development eslint --ext .cjs,.js,.jsx,.ts,.tsx --cache .", "lint:styles": "stylelint **/*.{css,scss}", "lint-fix": "npm run lint-fix:scripts && npm run lint:styles -- --fix", - "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts", + "lint-fix:scripts": "npm run format && npm run lint:scripts", "postinstall": "tsx ./lib/add-remotes.ts", "create-extension": "tsx ./lib/create-extension.ts", "update-from-templates": "tsx ./lib/update-from-templates.ts" From 1b89194c2b261238b05056f2491fc970aa6d23a3 Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:18:53 +1300 Subject: [PATCH 04/14] Squashed 'extensions/src/hello-someone/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/hello-someone git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -13,6 +13,10 @@ module.exports = { }, ], rules: { + // Disable Stylelint's indentation control + '@stylistic/indentation': null, + // Let Prettier handle selector list formatting + '@stylistic/selector-list-comma-newline-after': null, 'color-named': null, 'max-nesting-depth': 2, 'no-descending-specificity': null, diff --git a/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "watch": "npm run build -- --watch", "build:production": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=false webpack", "watch:production": "npm run build:production -- --watch", + "format": "prettier --write .", + "format:check": "prettier --check .", "zip": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "eslint --ext .cjs,.js,.jsx,.ts,.tsx --cache .", "lint:styles": "stylelint **/*.{css,scss}", "lint-fix": "npm run lint-fix:scripts && npm run lint:styles -- --fix", - "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts" + "lint-fix:scripts": "npm run format && npm run lint:scripts" }, "browserslist": [], "peerDependencies": { From 5ab00b5135c2b345320237d0ca545eacbf05e92c Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:22:04 +1300 Subject: [PATCH 05/14] Squashed 'extensions/src/hello-world/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/hello-world git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -13,6 +13,10 @@ module.exports = { }, ], rules: { + // Disable Stylelint's indentation control + '@stylistic/indentation': null, + // Let Prettier handle selector list formatting + '@stylistic/selector-list-comma-newline-after': null, 'color-named': null, 'max-nesting-depth': 2, 'no-descending-specificity': null, diff --git a/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "watch": "npm run build -- --watch", "build:production": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=false webpack", "watch:production": "npm run build:production -- --watch", + "format": "prettier --write .", + "format:check": "prettier --check .", "zip": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "eslint --ext .cjs,.js,.jsx,.ts,.tsx --cache .", "lint:styles": "stylelint **/*.{css,scss}", "lint-fix": "npm run lint-fix:scripts && npm run lint:styles -- --fix", - "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts" + "lint-fix:scripts": "npm run format && npm run lint:scripts" }, "browserslist": [], "peerDependencies": { From 3ebc69740b56f5dd547f4d48fbae9c5ec2fea71c Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:24:42 +1300 Subject: [PATCH 06/14] Squashed 'extensions/src/legacy-comment-manager/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/legacy-comment-manager git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -13,6 +13,10 @@ module.exports = { }, ], rules: { + // Disable Stylelint's indentation control + '@stylistic/indentation': null, + // Let Prettier handle selector list formatting + '@stylistic/selector-list-comma-newline-after': null, 'color-named': null, 'max-nesting-depth': 2, 'no-descending-specificity': null, diff --git a/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "watch": "npm run build -- --watch", "build:production": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=false webpack", "watch:production": "npm run build:production -- --watch", + "format": "prettier --write .", + "format:check": "prettier --check .", "zip": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "eslint --ext .cjs,.js,.jsx,.ts,.tsx --cache .", "lint:styles": "stylelint **/*.{css,scss}", "lint-fix": "npm run lint-fix:scripts && npm run lint:styles -- --fix", - "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts" + "lint-fix:scripts": "npm run format && npm run lint:scripts" }, "browserslist": [], "peerDependencies": { From 1a90198084b8957c68cf98191074fe0bd449a665 Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:26:13 +1300 Subject: [PATCH 07/14] Squashed 'extensions/src/paratext-registration/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/paratext-registration git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -13,6 +13,10 @@ module.exports = { }, ], rules: { + // Disable Stylelint's indentation control + '@stylistic/indentation': null, + // Let Prettier handle selector list formatting + '@stylistic/selector-list-comma-newline-after': null, 'color-named': null, 'max-nesting-depth': 2, 'no-descending-specificity': null, diff --git a/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "watch": "npm run build -- --watch", "build:production": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=false webpack", "watch:production": "npm run build:production -- --watch", + "format": "prettier --write .", + "format:check": "prettier --check .", "zip": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "eslint --ext .cjs,.js,.jsx,.ts,.tsx --cache .", "lint:styles": "stylelint **/*.{css,scss}", "lint-fix": "npm run lint-fix:scripts && npm run lint:styles -- --fix", - "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts" + "lint-fix:scripts": "npm run format && npm run lint:scripts" }, "browserslist": [], "peerDependencies": { From ddb3d23b3385f6650ff7d2f0a435186e7faf0e41 Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:27:14 +1300 Subject: [PATCH 08/14] Squashed 'extensions/src/platform-scripture/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/platform-scripture git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -13,6 +13,10 @@ module.exports = { }, ], rules: { + // Disable Stylelint's indentation control + '@stylistic/indentation': null, + // Let Prettier handle selector list formatting + '@stylistic/selector-list-comma-newline-after': null, 'color-named': null, 'max-nesting-depth': 2, 'no-descending-specificity': null, diff --git a/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "watch": "npm run build -- --watch", "build:production": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=false webpack", "watch:production": "npm run build:production -- --watch", + "format": "prettier --write .", + "format:check": "prettier --check .", "zip": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "eslint --ext .cjs,.js,.jsx,.ts,.tsx --cache .", "lint:styles": "stylelint **/*.{css,scss}", "lint-fix": "npm run lint-fix:scripts && npm run lint:styles -- --fix", - "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts" + "lint-fix:scripts": "npm run format && npm run lint:scripts" }, "browserslist": [], "peerDependencies": { From bf9981d51e35fb703257d9224a557d51f5edf825 Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:34:20 +1300 Subject: [PATCH 09/14] Squashed 'extensions/src/platform-scripture-editor/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/platform-scripture-editor git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -13,6 +13,10 @@ module.exports = { }, ], rules: { + // Disable Stylelint's indentation control + '@stylistic/indentation': null, + // Let Prettier handle selector list formatting + '@stylistic/selector-list-comma-newline-after': null, 'color-named': null, 'max-nesting-depth': 2, 'no-descending-specificity': null, diff --git a/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "watch": "npm run build -- --watch", "build:production": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=false webpack", "watch:production": "npm run build:production -- --watch", + "format": "prettier --write .", + "format:check": "prettier --check .", "zip": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "eslint --ext .cjs,.js,.jsx,.ts,.tsx --cache .", "lint:styles": "stylelint **/*.{css,scss}", "lint-fix": "npm run lint-fix:scripts && npm run lint:styles -- --fix", - "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts" + "lint-fix:scripts": "npm run format && npm run lint:scripts" }, "browserslist": [], "peerDependencies": { From 20a4e718b399153174fdfba9be3e177d9bf6ff01 Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Thu, 21 Nov 2024 07:35:55 +1300 Subject: [PATCH 10/14] Squashed 'extensions/src/quick-verse/' changes from 8902864fa..93d4b0a63 93d4b0a63 add missing format checks (#86) git-subtree-dir: extensions/src/quick-verse git-subtree-split: 93d4b0a6364a69340364e47ddfb3c58e183e49c5 --- .stylelintrc.js | 4 ++++ package-lock.json | 25 ++++++++++++++++++++----- package.json | 4 +++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 7161ad789c..28557519de 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -13,6 +13,10 @@ module.exports = { }, ], rules: { + // Disable Stylelint's indentation control + '@stylistic/indentation': null, + // Let Prettier handle selector list formatting + '@stylistic/selector-list-comma-newline-after': null, 'color-named': null, 'max-nesting-depth': 2, 'no-descending-specificity': null, diff --git a/package-lock.json b/package-lock.json index d66ed4a9f2..fe38e0afde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -162,7 +162,9 @@ "license": "MIT" }, "../paranext-core/lib/papi-dts/node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -592,6 +594,7 @@ "clsx": "^2.1.0", "cmdk": "^1.0.0", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "react-data-grid": ">=7.0.0-beta.42", @@ -622,6 +625,7 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "prettier-plugin-tailwindcss": "^0.6.1", @@ -647,7 +651,8 @@ "version": "0.0.1", "license": "MIT", "dependencies": { - "async-mutex": "^0.4.1" + "async-mutex": "^0.4.1", + "jsonpath-plus": "^10.0.7" }, "devDependencies": { "@types/jest": "^29.5.13", @@ -5409,7 +5414,9 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "license": "MIT", "dependencies": { @@ -18561,7 +18568,9 @@ } }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23016,7 +23025,9 @@ "dev": true }, "cross-spawn": { - "version": "7.0.3", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -23111,6 +23122,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", @@ -23426,7 +23438,9 @@ "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", + "jsonpath-plus": "^10.0.7", "lucide-react": "^0.452.0", + "markdown-to-jsx": "^7.6.2", "next-themes": "^0.3.0", "platform-bible-utils": "file:../platform-bible-utils", "prettier": "^3.3.3", @@ -23463,6 +23477,7 @@ "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", "jest": "^29.7.0", + "jsonpath-plus": "^10.0.7", "prettier": "^3.3.3", "prettier-plugin-jsdoc": "^1.3.0", "stringz": "^2.1.0", diff --git a/package.json b/package.json index 565ff73a45..633654a1d1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ "watch": "npm run build -- --watch", "build:production": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=false webpack", "watch:production": "npm run build:production -- --watch", + "format": "prettier --write .", + "format:check": "prettier --check .", "zip": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", @@ -23,7 +25,7 @@ "lint:scripts": "eslint --ext .cjs,.js,.jsx,.ts,.tsx --cache .", "lint:styles": "stylelint **/*.{css,scss}", "lint-fix": "npm run lint-fix:scripts && npm run lint:styles -- --fix", - "lint-fix:scripts": "prettier --write \"**/*.{ts,tsx,js,jsx,cjs}\" && npm run lint:scripts" + "lint-fix:scripts": "npm run format && npm run lint:scripts" }, "browserslist": [], "peerDependencies": { From d40368d55776cd469cd50d9c6069ae5236c5d288 Mon Sep 17 00:00:00 2001 From: Ira Hopkinson Date: Wed, 20 Nov 2024 09:23:32 +1300 Subject: [PATCH 11/14] add missing format checks - let prettier format CSS & SCSS - fix format errors - also `npm audit fix` --- extensions/src/evil/assets/evil.web-view.html | 2 +- .../src/hello-someone.web-view.html | 2 +- .../src/_commenting.scss | 6 +- .../src/_editor-overrides.scss | 2 +- .../src/_editor.scss | 1 - .../src/_usj-nodes.scss | 192 +++++++++--------- lib/papi-dts/package.json | 2 + lib/platform-bible-react/.babelrc.json | 9 +- lib/platform-bible-react/package.json | 6 +- lib/platform-bible-utils/package.json | 6 +- package-lock.json | 8 +- package.json | 7 +- 12 files changed, 126 insertions(+), 117 deletions(-) diff --git a/extensions/src/evil/assets/evil.web-view.html b/extensions/src/evil/assets/evil.web-view.html index c8d010dfd2..990166a95e 100644 --- a/extensions/src/evil/assets/evil.web-view.html +++ b/extensions/src/evil/assets/evil.web-view.html @@ -1,4 +1,4 @@ - +