Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix broken cart & checkout blocks due to inconsistent block names between server side and client side registration (https://github.com/woocommerce/woocommerce-blocks/pull/1353) 

* remove unnecessary suffix on chunk names

* don’t change block name, just add prefix to handle.
This commit is contained in:
Darren Ethier 2019-12-09 15:50:49 -05:00 committed by GitHub
parent a0b4d9b798
commit 0286c2d751
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/woocommerce-blocks/bin/webpack-helpers.js
View File

@ -126,8 +126,8 @@ const mainEntry = {
'./assets/js/base/components/block-error-boundary/style.scss',
// cart & checkout blocks
'cart-block': './assets/js/blocks/cart-checkout/cart/index.js',
'checkout-block': './assets/js/blocks/cart-checkout/checkout/index.js',
cart: './assets/js/blocks/cart-checkout/cart/index.js',
checkout: './assets/js/blocks/cart-checkout/checkout/index.js',
};
const frontEndEntry = {
@ -136,8 +136,8 @@ const frontEndEntry = {
'price-filter': './assets/js/blocks/price-filter/frontend.js',
'attribute-filter': './assets/js/blocks/attribute-filter/frontend.js',
'active-filters': './assets/js/blocks/active-filters/frontend.js',
'checkout-block': './assets/js/blocks/cart-checkout/checkout/frontend.js',
'cart-block': './assets/js/blocks/cart-checkout/cart/frontend.js',
checkout: './assets/js/blocks/cart-checkout/checkout/frontend.js',
cart: './assets/js/blocks/cart-checkout/cart/frontend.js',
};
const getEntryConfig = ( main = true, exclude = [] ) => {

8
plugins/woocommerce-blocks/src/BlockTypes/Cart.php
View File

@ -18,7 +18,7 @@ class Cart extends AbstractBlock {
*
* @var string
*/
protected $block_name = 'cart-block';
protected $block_name = 'cart';
/**
* Registers the block type with WordPress.
@ -28,10 +28,10 @@ class Cart extends AbstractBlock {
$this->namespace . '/' . $this->block_name,
array(
'render_callback' => array( $this, 'render' ),
'editor_script' => 'wc-' . $this->block_name,
'editor_script' => 'wc-' . $this->block_name . '-block',
'editor_style' => 'wc-block-editor',
'style' => 'wc-block-style',
'script' => 'wc-' . $this->block_name . '-frontend',
'script' => 'wc-' . $this->block_name . '-block-frontend',
)
);
}
@ -45,7 +45,7 @@ class Cart extends AbstractBlock {
*/
public function render( $attributes = array(), $content = '' ) {
\Automattic\WooCommerce\Blocks\Assets::register_block_script(
$this->block_name . '-frontend'
$this->block_name . '-block-frontend'
);
return $content;
}

8
plugins/woocommerce-blocks/src/BlockTypes/Checkout.php
View File

@ -19,7 +19,7 @@ class Checkout extends AbstractBlock {
*
* @var string
*/
protected $block_name = 'checkout-block';
protected $block_name = 'checkout';
/**
* Registers the block type with WordPress.
@ -29,10 +29,10 @@ class Checkout extends AbstractBlock {
$this->namespace . '/' . $this->block_name,
array(
'render_callback' => array( $this, 'render' ),
'editor_script' => 'wc-' . $this->block_name,
'editor_script' => 'wc-' . $this->block_name . '-block',
'editor_style' => 'wc-block-editor',
'style' => 'wc-block-style',
'script' => 'wc-' . $this->block_name . '-frontend',
'script' => 'wc-' . $this->block_name . '-block-frontend',
)
);
}
@ -45,7 +45,7 @@ class Checkout extends AbstractBlock {
* @return string Rendered block type output.
*/
public function render( $attributes = array(), $content = '' ) {
\Automattic\WooCommerce\Blocks\Assets::register_block_script( $this->block_name . '-frontend' );
\Automattic\WooCommerce\Blocks\Assets::register_block_script( $this->block_name . '-block-frontend' );
return $content;
}
}

8
plugins/woocommerce-blocks/webpack.config.js
View File

@ -112,8 +112,8 @@ const LegacyBlocksConfig = {
'price-filter',
'attribute-filter',
'active-filters',
'checkout-block',
'cart-block',
'checkout',
'cart',
],
} ),
};
@ -135,8 +135,8 @@ const LegacyFrontendBlocksConfig = {
'price-filter',
'attribute-filter',
'active-filters',
'checkout-block',
'cart-block',
'checkout',
'cart',
],
} ),
};