diff --git a/src/PostcodeNl/AddressAutocomplete/BlocksIntegration.php b/src/PostcodeNl/AddressAutocomplete/BlocksIntegration.php index 43c72b2..4cc285e 100644 --- a/src/PostcodeNl/AddressAutocomplete/BlocksIntegration.php +++ b/src/PostcodeNl/AddressAutocomplete/BlocksIntegration.php @@ -41,7 +41,7 @@ private function _register_block_frontend_scripts(): void wp_register_script( $handle, Main::$pluginUrl . '/build/' . $name . '-frontend.js', - $scriptAsset['dependencies'], + array_merge($scriptAsset['dependencies'], [Main::AUTOCOMPLETE_LIBRARY_HANDLE]), $scriptAsset['version'], true ); @@ -63,7 +63,7 @@ private function _register_block_main_integration(): void wp_register_script( $handle, Main::$pluginUrl . '/build/' . $name . '-index.js', - $scriptAsset['dependencies'], + array_merge($scriptAsset['dependencies'], [Main::AUTOCOMPLETE_LIBRARY_HANDLE]), $scriptAsset['version'], true ); diff --git a/src/PostcodeNl/AddressAutocomplete/Main.php b/src/PostcodeNl/AddressAutocomplete/Main.php index 46a737a..1cb103e 100644 --- a/src/PostcodeNl/AddressAutocomplete/Main.php +++ b/src/PostcodeNl/AddressAutocomplete/Main.php @@ -13,6 +13,9 @@ class Main /** @var string The version number of the plugin should be equal to the commented version number in ../../../postcode-eu-address-validation.php */ public const VERSION = '2.4.1'; + /** @var string Script handle of the autocomplete library. */ + public const AUTOCOMPLETE_LIBRARY_HANDLE = 'postcode-eu-autocomplete-address-library'; + /** @var string Path to the plugin directory */ public static $pluginDirPath; @@ -180,7 +183,7 @@ public function enqueueScripts(): void { // CSS wp_enqueue_style( - 'postcode-eu-autocomplete-address-library', + static::AUTOCOMPLETE_LIBRARY_HANDLE, static::$pluginUrl . '/assets/libraries/postcode-eu-autocomplete-address.css', [], static::VERSION @@ -188,13 +191,13 @@ public function enqueueScripts(): void wp_enqueue_style( 'postcode-eu-autofill', static::$pluginUrl . '/assets/css/style.css', - ['postcode-eu-autocomplete-address-library'], + [static::AUTOCOMPLETE_LIBRARY_HANDLE], static::VERSION ); // Javascript wp_enqueue_script( - 'postcode-eu-autocomplete-address-library', + static::AUTOCOMPLETE_LIBRARY_HANDLE, static::$pluginUrl . '/assets/libraries/postcode-eu-autocomplete-address.js', [], static::VERSION, @@ -221,7 +224,7 @@ public function enqueueScripts(): void 'postcode-eu-autofill', static::$pluginUrl . '/assets/js/postcode-eu-autofill.js', [ - 'postcode-eu-autocomplete-address-library', + static::AUTOCOMPLETE_LIBRARY_HANDLE, 'postcode-eu-autocomplete-address-field-mapping', 'postcode-eu-autocomplete-state-mapping', 'wp-i18n',