diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dc4ecd6..faeacf52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [2.0.1] + +### Fixed +- Handled the new firing order of block-editor related hooks in transitioning + from the Gutenberg plugin to WordPress 5.0+. This fixes a PHP warning + and some odd behavior from other plugins that register meta areas + for the block editor. + ## [2.0.0] ### Added @@ -420,6 +428,7 @@ [Unreleased]: https://github.com/moderntribe/bigcommerce/compare/master...develop +[2.0.1]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/2.0.0...2.0.1 [2.0.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/1.6.0...2.0.0 [1.6.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/1.5.0...1.6.0 [1.5.0]: https://github.com/bigcommerce/bigcommerce-for-wordpress/compare/1.4.2...1.5.0 diff --git a/bigcommerce.php b/bigcommerce.php index a1a13624..c5e2901d 100644 --- a/bigcommerce.php +++ b/bigcommerce.php @@ -3,7 +3,7 @@ Plugin Name: BigCommerce for WordPress Description: Scale your ecommerce business with WordPress on the front-end and BigCommerce on the back end. Free up server resources from things like catalog management, processing payments, and managing fulfillment logistics. Author: BigCommerce -Version: 2.0.0 +Version: 2.0.1 Author URI: https://www.bigcommerce.com/wordpress Requires PHP: 5.6.24 Text Domain: bigcommerce diff --git a/build-timestamp.php b/build-timestamp.php index a2cfc282..81eeb276 100644 --- a/build-timestamp.php +++ b/build-timestamp.php @@ -1,2 +1,2 @@ create_callback( 'render_editor_dialog_template', function () use ( $container ) { echo $container[ self::UI_DIALOG ]->render_dialog_once(); } ); - add_action( 'enqueue_block_editor_assets', $render_callback, 10, 0 ); - add_action( 'admin_print_footer_scripts', $render_callback, 10, 0 ); + add_action( 'enqueue_block_editor_assets', $this->create_callback( 'block_editor_enqueue_dialog_template', function() use ( $container, $render_callback ) { + if ( did_action( 'admin_enqueue_scripts' ) ) { // if the Gutenberg plugin is enabled, the action will already be called + $render_callback(); + } else { // if using the Block Editor in WP core, no HTML has been rendered, so delay the output + add_action( 'admin_enqueue_scripts', $render_callback, 10, 0 ); + } + }), 10, 0 ); + add_action( 'admin_print_footer_scripts', $render_callback, 10, 0 ); // if the block editor is disabled, print scripts in the footer add_filter( 'bigcommerce/admin/js_config', $this->create_callback( 'editor_dialog_js_config', function ( $config ) use ( $container ) { return $container[ self::UI_DIALOG ]->js_config( $config, $container[ Rest::PRODUCTS ], $container[ Rest::SHORTCODE ] ); diff --git a/src/BigCommerce/Plugin.php b/src/BigCommerce/Plugin.php index 1f890a8e..c8d1c591 100644 --- a/src/BigCommerce/Plugin.php +++ b/src/BigCommerce/Plugin.php @@ -4,7 +4,7 @@ namespace BigCommerce; class Plugin { - const VERSION = '2.0.0'; + const VERSION = '2.0.1'; protected static $_instance; diff --git a/vendor/autoload.php b/vendor/autoload.php index d8282a04..e9f991ac 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit97fd0ff133d8e9954fc81186a73d62e5::getLoader(); +return ComposerAutoloaderInitae07110915ff3b8dd7e4be3956cac069::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 45d34803..ae6e4fc9 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit97fd0ff133d8e9954fc81186a73d62e5 +class ComposerAutoloaderInitae07110915ff3b8dd7e4be3956cac069 { private static $loader; @@ -19,15 +19,15 @@ public static function getLoader() return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit97fd0ff133d8e9954fc81186a73d62e5', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitae07110915ff3b8dd7e4be3956cac069', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit97fd0ff133d8e9954fc81186a73d62e5', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitae07110915ff3b8dd7e4be3956cac069', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit97fd0ff133d8e9954fc81186a73d62e5::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitae07110915ff3b8dd7e4be3956cac069::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -39,19 +39,19 @@ public static function getLoader() $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit97fd0ff133d8e9954fc81186a73d62e5::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitae07110915ff3b8dd7e4be3956cac069::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire97fd0ff133d8e9954fc81186a73d62e5($fileIdentifier, $file); + composerRequireae07110915ff3b8dd7e4be3956cac069($fileIdentifier, $file); } return $loader; } } -function composerRequire97fd0ff133d8e9954fc81186a73d62e5($fileIdentifier, $file) +function composerRequireae07110915ff3b8dd7e4be3956cac069($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 81718d7b..b79b07fa 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit97fd0ff133d8e9954fc81186a73d62e5 +class ComposerStaticInitae07110915ff3b8dd7e4be3956cac069 { public static $files = array ( '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php', @@ -942,10 +942,10 @@ class ComposerStaticInit97fd0ff133d8e9954fc81186a73d62e5 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit97fd0ff133d8e9954fc81186a73d62e5::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit97fd0ff133d8e9954fc81186a73d62e5::$prefixDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInit97fd0ff133d8e9954fc81186a73d62e5::$prefixesPsr0; - $loader->classMap = ComposerStaticInit97fd0ff133d8e9954fc81186a73d62e5::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitae07110915ff3b8dd7e4be3956cac069::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitae07110915ff3b8dd7e4be3956cac069::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInitae07110915ff3b8dd7e4be3956cac069::$prefixesPsr0; + $loader->classMap = ComposerStaticInitae07110915ff3b8dd7e4be3956cac069::$classMap; }, null, ClassLoader::class); }