Merge branch 'release/2.0.2'

pronamic · Sep 16, 2021 · 00bdced · 00bdced
2 parents 4c63fb3 + 54ade8e
commit 00bdced
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased][unreleased]
 
+## [2.0.2] - 2021-09-16
+- Fixed blocks not loading in editor ([pronamic/wp-pronamic-pay#204](https://github.com/pronamic/wp-pronamic-pay/issues/204)).
+
 ## [2.0.1] - 2021-09-03
 - Added block titles ([pronamic/wp-pronamic-pay#185](https://github.com/pronamic/wp-pronamic-pay/issues/185)).
 
@@ -24,7 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## 1.0.0 - 2019-05-06
 - First release.
 
-[unreleased]: https://github.com/wp-pay/fundraising/compare/2.0.1...HEAD
+[unreleased]: https://github.com/wp-pay/fundraising/compare/2.0.2...HEAD
+[2.0.1]: https://github.com/wp-pay/fundraising/compare/2.0.1...2.0.2
 [2.0.1]: https://github.com/wp-pay/fundraising/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/wp-pay/fundraising/compare/1.1.1...2.0.0
 [1.1.1]: https://github.com/wp-pay/fundraising/compare/1.1.0...1.1.1

diff --git a/js/dist/index.asset.php b/js/dist/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'fb44b783c2d5a08cc3630b5036ddc753');
+<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '25219edeefcdc46c94c6a3ec0b98dd50');
diff --git a/js/dist/index.js b/js/dist/index.js
diff --git a/js/src/components/details/index.js b/js/src/components/details/index.js
@@ -40,7 +40,7 @@ export class FundraisingDetails extends Component {
 					onChange={ ( val ) => {
 						setAttributes( { raisedLabel: val } );
 					} }
-					style={ colors.hasOwnProperty( 'raisedLabel' ) && { color: colors.raisedLabel } }
+					style={ colors.hasOwnProperty( 'raisedLabel' ) && { color: colors.raisedLabel } || {} }
 				/>
 
 				<RichText
@@ -61,7 +61,7 @@ export class FundraisingDetails extends Component {
 
 						setAttributes( { raisedAmount: val } );
 					} }
-					style={ colors.hasOwnProperty( 'raisedAmount' ) && { color: colors.raisedAmount } }
+					style={ colors.hasOwnProperty( 'raisedAmount' ) && { color: colors.raisedAmount } || {} }
 				/>
 
 				{ targetAmount &&
@@ -108,7 +108,7 @@ export class FundraisingDetails extends Component {
 							onChange={ ( val ) => {
 								setAttributes( { contributionsValue: val ? val.replace( /[^\d]/g, '' ) : '0' } );
 							} }
-							style={ colors.hasOwnProperty( 'contributionsValue' ) && { color: colors.contributionsValue } }
+							style={ colors.hasOwnProperty( 'contributionsValue' ) && { color: colors.contributionsValue } || {} }
 						/>
 					</>
 				}

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fundraising",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Fundraising add-on for the WordPress payment processing library.",
   "repository": {
     "type": "git",
@@ -36,7 +36,6 @@
   },
   "homepage": "https://www.wp-pay.org/addons/fundraising/",
   "scripts": {
-    "babel": "babel ./js/src -d ./js/dist --source-maps",
     "eslint": "eslint . --ext .json --ext .js",
     "postcss": "postcss css/*.css --use autoprefixer --dir css; postcss css/fundraising.css -o css/fundraising.min.css",
     "sass": "sass scss:css",
@@ -45,29 +44,23 @@
     "build": "wp-scripts build"
   },
   "devDependencies": {
-    "@babel/cli": "^7.8.4",
-    "@babel/core": "^7.9.6",
-    "@babel/preset-env": "^7.9.6",
-    "@babel/preset-react": "^7.9.4",
-    "@types/classnames": "^2.2.10",
-    "@wordpress/block-editor": "^3.11.0",
-    "@wordpress/blocks": "^6.16.0",
-    "@wordpress/components": "^9.6.0",
-    "@wordpress/data": "^4.18.0",
-    "@wordpress/element": "^2.14.0",
-    "@wordpress/i18n": "^3.12.0",
-    "@wordpress/icons": "^2.0.0",
-    "@wordpress/scripts": "9.0.0",
-    "autoprefixer": "^9.7.6",
-    "babel-loader": "^8.1.0",
-    "babel-plugin-inline-json-import": "^0.3.2",
-    "cssnano": "^4.1.10",
-    "eslint": "^7.0.0",
-    "eslint-plugin-json": "^2.1.1",
-    "postcss": "^7.0.30",
-    "postcss-cli": "^7.1.1",
+    "@types/classnames": "^2.3.0",
+    "@wordpress/block-editor": "^7.0.2",
+    "@wordpress/blocks": "^11.1.0",
+    "@wordpress/components": "^17.0.0",
+    "@wordpress/data": "^6.1.0",
+    "@wordpress/element": "^4.0.1",
+    "@wordpress/i18n": "^4.2.2",
+    "@wordpress/icons": "^5.0.2",
+    "@wordpress/scripts": "18.0.1",
+    "autoprefixer": "^10.3.4",
+    "cssnano": "^5.0.8",
+    "eslint": "^7.32.0",
+    "eslint-plugin-json": "^3.1.0",
+    "postcss": "^8.3.6",
+    "postcss-cli": "^8.3.1",
     "postcss-eol": "0.0.8",
-    "sass": "^1.26.5",
+    "sass": "^1.40.1",
     "sass-lint": "^1.13.1"
   }
 }
diff --git a/src/BlockUpdater.php b/src/BlockUpdater.php
@@ -121,8 +121,8 @@ public function update_post( WP_Post $post ) {
 	/**
 	 * Allow unfiltered HTML.
 	 *
-	 * @param array $attributes CSS attributes.
-	 *
+	 * @param array $capabilities Capabilities.
+	 * @param array $capability Capability.
 	 * @return array
 	 */
 	public function allow_unfiltered_html( $capabilities, $capability ) {

diff --git a/src/Blocks.php b/src/Blocks.php
@@ -60,7 +60,8 @@ public function register_scripts() {
 			'pronamic-pay-fundraising-blocks',
 			plugins_url( 'js/dist/index.js', $this->plugin->file ),
 			$asset_file['dependencies'],
-			$asset_file['version']
+			$asset_file['version'],
+			false
 		);
 
 		// Script translations.