Merge pull request #12 from WPDevelopers/64396-dev

WordPress 6.6 Compatibility

.babelrc

@@ -8,4 +8,4 @@
 		],
 		"@babel/preset-react"
 	]
-}
+}

assets/js/simple-301-redirects.core.min.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'wp-i18n', 'wp-polyfill'), 'version' => 'd587d386c8c9a1032e7d0ce98fb63c9d');
+<?php return array('dependencies' => array('react', 'react-dom', 'wp-i18n'), 'version' => '373b223831b627d8700c');

includes/Admin/Assets.php

@@ -44,7 +44,7 @@ function () {
 			wp_enqueue_script(
 				'simple-301-redirects-admin-core',
 				SIMPLE301REDIRECTS_ASSETS_URI . 'js/simple-301-redirects.core.min.js',
-				$dependencies['dependencies'],
+				array_merge( $dependencies['dependencies'], ['regenerator-runtime'] ),
 				$dependencies['version'],
 				true
 			);

package.json

@@ -24,8 +24,9 @@
 		"prop-types": "^15.7.2"
 	},
 	"devDependencies": {
-		"@wordpress/dependency-extraction-webpack-plugin": "^4.0.0",
+		"@babel/preset-env": "^7.24.7",
+		"@babel/preset-react": "^7.24.7",
 		"@wordpress/i18n": "^4.16.0",
-		"@wordpress/scripts": "^24.0.0"
+		"@wordpress/scripts": "^27.0.0"
 	}
 }

readme.txt

@@ -1,10 +1,10 @@
 === Simple 301 Redirects By BetterLinks - Easy WordPress Redirect Manager for Redirects, 404 Error Log & More ===
 Contributors: wpdevteam, asif2bd, re_enter_rupok, scottnelle
 Tags: 301 redirect, 404 error log, redirect url, link shortener, url redirects, 301, shortlinks, links, permalink, redirects, seo redirects, url redirect, url, pretty links, short links, link tracking, affiliate links, urls
-Requires at least: 5.0
-Tested up to: 6.3
-Requires PHP: 5.4
-Stable tag: 2.0.9
+Requires at least: 5.3
+Tested up to: 6.6
+Requires PHP: 7.4
+Stable tag: 2.0.10
 License: GPL-3.0-or-later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -126,6 +126,10 @@ Visit [WPDeveloper](https://wpdeveloper.net/) to learn more about how to do bett
 
 == Changelog ==
 
+= 2.0.10 - 16/07/2024 =
+* Added: WordPress 6.6 Compatibility 
+* Few minor bug fix and improvements
+
 = 2.0.9 - 27/09/2023 =
 * Fixed: Import Related Issue.
 * Few minor bug fix and improvements

src/components/BetterLinks/index.js

@@ -1,10 +1,8 @@
 import React, { useState } from 'react';
 import { __ } from '@wordpress/i18n';
-import PropTypes from 'prop-types';
 import axios from 'axios';
 import InstallPlugin from './../../components/InstallPlugin';
-const propTypes = {};
-const defaultProps = {};
+
 import { plugin_root_url, s3r_nonce, is_betterlinks_activated, hide_btl_notice } from './../../utils/helper';
 export default function BetterLinks(props) {
 	const [isHideNotice, setHideNotice] = useState(hide_btl_notice);
@@ -19,7 +17,7 @@ export default function BetterLinks(props) {
 			},
 			(error) => {
 				console.log(error);
-			}
+			},
 		);
 	};
 	return (
@@ -32,8 +30,16 @@ export default function BetterLinks(props) {
 					<div className="simple301redirects__betterlinks__content">
 						<h3>{__('BetterLinks – Shorten, Track and Manage any URL', 'simple-301-redirects')}</h3>
 						<h4>
-							{__('Install BetterLinks to get the best out of Simple 301 Redirects and get access to more advanced features. Check out the features below', 'simple-301-redirects')}
-							<img width="18" style={{ transform: 'translateY(6px) scale(1.5)', marginLeft: 8 }} src={plugin_root_url + 'assets/images/pointing-down.svg'} alt="logo" />
+							{__(
+								'Install BetterLinks to get the best out of Simple 301 Redirects and get access to more advanced features. Check out the features below',
+								'simple-301-redirects',
+							)}
+							<img
+								width="18"
+								style={{ transform: 'translateY(6px) scale(1.5)', marginLeft: 8 }}
+								src={plugin_root_url + 'assets/images/pointing-down.svg'}
+								alt="logo"
+							/>
 						</h4>
 						<ul>
 							<li>{__('Easy-to-use & Simple Link Shortener', 'simple-301-redirects')}</li>
@@ -53,5 +59,3 @@ export default function BetterLinks(props) {
 		</React.Fragment>
 	);
 }
-BetterLinks.propTypes = propTypes;
-BetterLinks.defaultProps = defaultProps;

src/components/Documentation/index.js

@@ -1,12 +1,7 @@
 import React, { useState } from 'react';
 import { __ } from '@wordpress/i18n';
-import PropTypes from 'prop-types';
 import { plugin_root_url } from './../../utils/helper';
 
-const propTypes = {};
-
-const defaultProps = {};
-
 export default function Documentation(props) {
 	const [isOpen, setOpen] = useState(false);
 	return (
@@ -97,6 +92,3 @@ export default function Documentation(props) {
 		</React.Fragment>
 	);
 }
-
-Documentation.propTypes = propTypes;
-Documentation.defaultProps = defaultProps;

src/components/InstallPlugin/index.js

@@ -6,11 +6,8 @@ const propTypes = {
 	label: PropTypes.string,
 };
 
-const defaultProps = {
-	label: '',
-};
 
-export default function InstallPlugin({ label }) {
+export default function InstallPlugin({ label = '' }) {
 	const [installButtonMessage, setInstallButtonMessage] = useState(label);
 	const installHandler = async () => {
 		setInstallButtonMessage('Installing...');
@@ -36,4 +33,3 @@ export default function InstallPlugin({ label }) {
 }
 
 InstallPlugin.propTypes = propTypes;
-InstallPlugin.defaultProps = defaultProps;

src/components/Link/index.js

@@ -11,12 +11,7 @@ const propTypes = {
 	isNewLink: PropTypes.bool,
 	clickHandler: PropTypes.func,
 };
-const defaultProps = {
-	request: '',
-	destination: '',
-	isNewLink: false,
-};
-export default function Link({ request, destination, isNewLink, clickHandler }) {
+export default function Link({ request = '', destination = '', isNewLink = false, clickHandler }) {
 	const [localRequest, setLocalRequest] = useState('');
 	const [localDestination, setDestination] = useState('');
 	useEffect(() => {
@@ -121,4 +116,3 @@ export default function Link({ request, destination, isNewLink, clickHandler })
 	);
 }
 Link.propTypes = propTypes;
-Link.defaultProps = defaultProps;

src/components/Tools/index.js

@@ -1,15 +1,9 @@
 import React, { useState, useEffect } from 'react';
 import { __ } from '@wordpress/i18n';
-import PropTypes from 'prop-types';
 import axios from 'axios';
 import { s3r_nonce } from './../../utils/helper';
 
-const propTypes = {};
-
-const defaultProps = {};
-
 export default function Tools(props) {
-	const [isOpen, setOpen] = useState(false);
 	const [importResponse, setImportResponse] = useState(false);
 	useEffect(() => {
 		const urlParams = new URLSearchParams(window.location.search);
@@ -72,7 +66,4 @@ export default function Tools(props) {
 			</div>
 		</React.Fragment>
 	);
-}
-
-Tools.propTypes = propTypes;
-Tools.defaultProps = defaultProps;
+}

src/components/TopBar/index.js

@@ -1,12 +1,7 @@
 import React from 'react';
 import { __ } from '@wordpress/i18n';
-import PropTypes from 'prop-types';
 import { plugin_root_url } from './../../utils/helper';
 
-const propTypes = {};
-
-const defaultProps = {};
-
 export default function TopBar(props) {
 	return (
 		<React.Fragment>
@@ -18,7 +13,4 @@ export default function TopBar(props) {
 			</div>
 		</React.Fragment>
 	);
-}
-
-TopBar.propTypes = propTypes;
-TopBar.defaultProps = defaultProps;
+}

src/components/WildCards/index.js

@@ -1,11 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { __ } from '@wordpress/i18n';
 import axios from 'axios';
-import PropTypes from 'prop-types';
 import { s3r_nonce } from './../../utils/helper';
-const propTypes = {};
-
-const defaultProps = {};
 
 export default function WildCards(props) {
 	const [savedText, setSavedText] = useState('');
@@ -60,7 +56,4 @@ export default function WildCards(props) {
 			)}
 		</React.Fragment>
 	);
-}
-
-WildCards.propTypes = propTypes;
-WildCards.defaultProps = defaultProps;
+}

src/containers/Simple301Redirects.js

@@ -1,13 +1,9 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import TopBar from './../components/TopBar';
 import ManageLinks from './group/ManageLinks';
 import BetterLinks from './../components/BetterLinks';
 import Documentation from './../components/Documentation';
 import Tools from './../components/Tools';
-const propTypes = {};
-
-const defaultProps = {};
 
 export default function Simple301Redirects(props) {
 	return (
@@ -25,7 +21,4 @@ export default function Simple301Redirects(props) {
 			</div>
 		</React.Fragment>
 	);
-}
-
-Simple301Redirects.propTypes = propTypes;
-Simple301Redirects.defaultProps = defaultProps;
+}

src/containers/group/ManageLinks.js

@@ -1,15 +1,10 @@
 import React, { useEffect, useState } from 'react';
 import axios from 'axios';
 import { __ } from '@wordpress/i18n';
-import PropTypes from 'prop-types';
 import { site_url, s3r_nonce, is_betterlinks_activated } from './../../utils/helper';
 import WildCards from './../../components/WildCards';
 import Link from './../../components/Link';
 
-const propTypes = {};
-
-const defaultProps = {};
-
 export default function ManageLinks(props) {
 	const [links, setLinks] = useState({});
 	useEffect(() => {
@@ -125,7 +120,4 @@ export default function ManageLinks(props) {
 			</div>
 		</React.Fragment>
 	);
-}
-
-ManageLinks.propTypes = propTypes;
-ManageLinks.defaultProps = defaultProps;
+}

wp-simple-301-redirects.php

@@ -7,7 +7,7 @@
  * Author URI:      https://wpdeveloper.net/
  * Text Domain:     simple-301-redirects
  * Domain Path:     /languages
- * Version:         2.0.9
+ * Version:         2.0.10
  */
 
 /*  Copyright 2009-2021  WPDeveloper
@@ -69,7 +69,7 @@ public function on_plugins_loaded()
 
 		public function define_constants()
 		{
-			define('SIMPLE301REDIRECTS_VERSION', '2.0.9');
+			define('SIMPLE301REDIRECTS_VERSION', '2.0.10');
 			define('SIMPLE301REDIRECTS_SETTINGS_NAME', '301_redirects');
 			define('SIMPLE301REDIRECTS_PLUGIN_FILE', __FILE__);
 			define('SIMPLE301REDIRECTS_PLUGIN_BASENAME', plugin_basename(__FILE__));
@@ -169,7 +169,7 @@ public function redirect() {
 		 * @return void
 		 */
 		public function get_address() {
-			if( !( isset( $_SERVER['HTTP_HOST'] ) && isset( $_SERVER['REQUEST_URI'] ) ) ) return;
+			if( ! isset( $_SERVER['HTTP_HOST'], $_SERVER['REQUEST_URI'] ) ) return;
 
 			// return the full address
 			return $this->get_protocol().'://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];