Merge branch 'develop' into feature/APP-705-add-connect-module

elementor · Nov 7, 2024 · 3919686 · 3919686
2 parents d89b521 + afdac76
commit 3919686
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/.github/scripts/update-version-in-files.js b/.github/scripts/update-version-in-files.js
@@ -1,6 +1,8 @@
 'use strict';
 
 const fs = require( "fs" );
+const MAIN_FILE_NAME = 'pojo-accessibility.php';
+const VERSION_CONSTANT = 'EA11Y_VERSION';
 
 const { VERSION } = process.env;
  if ( ! VERSION ) {
@@ -39,17 +41,17 @@ const run = async () => {
 			]
 		);
 
-		// update version in image-optimization.php
-		await replaceInFileWithArray( './image-optimization.php',
+		// update version in MAIN_FILE_NAME
+		await replaceInFileWithArray( `./${MAIN_FILE_NAME}`,
 			[
 				{
 					from:  /\* Version: (.*)/m,
 					to: `* Version: ${ VERSION }`,
 				},
 				{
-					from:  /define\( \'IMAGE_OPTIMIZER_VERSION\', \'(.*)\' \)\;/m,
-					to: `define( 'IMAGE_OPTIMIZER_VERSION', '${ VERSION }' );`,
-				},
+					from:  new RegExp(`define\\( '${VERSION_CONSTANT}', '(.*)' \\);`, 'm' ),
+					to: `define( '${VERSION_CONSTANT}', '${VERSION}' );`,
+				}
 			]
 		);
 

diff --git a/classes/logger.php b/classes/logger.php
@@ -19,9 +19,9 @@ private static function log( string $log_level, $message ): void {
 		$function = $backtrace[2]['function'];
 
 		if ( $class ) {
-			$message = '[Site Mailer]: ' . $log_level . ' in ' . "$class$type$function()" . ': ' . $message;
+			$message = '[EA11Y]: ' . $log_level . ' in ' . "$class$type$function()" . ': ' . $message;
 		} else {
-			$message = '[Site Mailer]: ' . $log_level . ' in ' . "$function()" . ': ' . $message;
+			$message = '[EA11Y]: ' . $log_level . ' in ' . "$function()" . ': ' . $message;
 		}
 
 		error_log( $message ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log

diff --git a/classes/utils/assets.php b/classes/utils/assets.php
@@ -2,6 +2,10 @@
 
 namespace EA11y\Classes\Utils;
 
+use const EA11Y_ASSETS_PATH;
+use const EA11Y_ASSETS_URL;
+use const EA11Y_VERSION;
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }

diff --git a/modules/settings/assets/css/style.css b/modules/settings/assets/css/style.css
@@ -1,5 +1,3 @@
-@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
-
 body {
 	background: #fff;
 }

diff --git a/modules/settings/assets/js/hooks/use-auth.js b/modules/settings/assets/js/hooks/use-auth.js
@@ -1,5 +1,6 @@
 import API from '../api';
 import { UPGRADE_LINK } from '../constants';
+import { usePluginSettingsContext } from '../context/plugin-settings-context';
 
 const useAuth = () => {
 	const { subscriptionId } = 123;

diff --git a/modules/settings/module.php b/modules/settings/module.php
@@ -71,7 +71,7 @@ public function enqueue_scripts( $hook ) {
 
 		wp_enqueue_style(
 			'ea11y-admin-fonts',
-			'https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap',
+			'https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap',
 			[],
 			EA11Y_VERSION
 		);
@@ -101,7 +101,6 @@ public static function get_plugin_settings(): array {
 			'isConnected' => Connect::is_connected(),
 		];
 	}
-
 	/**
 	 * Module constructor.
 	 */

diff --git a/ruleset.xml b/ruleset.xml
@@ -4,7 +4,7 @@
 
 	<arg name="parallel" value="8" />
 
-	<config name="text_domain" value="site-mailer" />
+	<config name="text_domain" value="pojo-accessibility" />
 
 	<exclude-pattern>vendor/</exclude-pattern>
 	<exclude-pattern>tmp/</exclude-pattern>