Added support for import of more plugin configurations

build/admin/wizard.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '66718e0acb5a9e6c03f7');
+<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '3936f8b956d5be2badb3');

readme.txt

@@ -90,6 +90,7 @@ Yes! Pagespeed is one of our main focus points, and we strive to make the plugin
 = 1.X =
 
 Enhancements:
+* Added support for import of more plugin configurations
 
 Bugfixes:
 

src/Installation/PluginDataImport.php

@@ -33,7 +33,7 @@ public function get_all(): array {
 		foreach ( $plugins as $plugin ) {
 			$settings = $this->get( $plugin );
 			if ( ! empty( $settings ) ) {
-				$pluginData[ $plugin ]          = $settings;
+				$pluginData['import_data'][ $plugin ] = $settings;
 				$pluginData['import_available'] = true;
 			}
 		}
@@ -73,6 +73,7 @@ private function get_gtm4wp(): array {
 		}
 
 		return [
+			'name' => 'GTM4WP',
 			'general' => [
 				'gtm_id'         => $options['gtm-code'] ?? '',
 				'datalayer_name' => $options['gtm-datalayer-variable-name'] ?? '',
@@ -117,6 +118,7 @@ private function get_gtm_for_woocommerce(): array {
 		}
 
 		return [
+			'name' => 'GTM for WooCommerce',
 			'general' => [
 				'gtm_id'         => $this->extract_container_id( get_option( 'gtm_ecommerce_woo_gtm_snippet_head', '' ) ),
 			],
@@ -137,11 +139,9 @@ private function get_gtm_for_woocommerce(): array {
 	private function extract_container_id( string $container_script ): string {
 		$container_id = '';
 
-		if (preg_match("/'GTM-\w+'/i", $$container_script, $matches)) {
-			// Remove the single quotes around the ID
+		if (preg_match("/'GTM-\w+'/im", $container_script, $matches)) {
 			$container_id = trim($matches[0], "'");
 		}
-
 		return $container_id;
 	}