Merge pull request #1352 from publishpress/release-3.2.1

Release 3.2.1

.github/ISSUE_TEMPLATE/release-pro-plugin.md

@@ -20,7 +20,8 @@ To release the Pro plugin, ensure you complete all the tasks below.
 - [ ] Inspect GitHub's Dependabot warnings or Pull Requests for relevant issues. Resolve any false positives first, then fix and commit the remaining issues.
 - [ ] If necessary, build JS files for production using `composer build:js` and commit the changes.
 - [ ] Run a WP VIP scan with `composer check:phpcs` to ensure no warnings or errors greater than 5 exist.
-- [ ] Update the `.pot` file executing `composer gen:pot` and include a note in the changelog.
+- [ ] Update the `.pot` file executing `composer build:make-pot` and include a note in the changelog.
+- [ ] Update the JavaScript translations by executing `composer build:js-translations`.
 - [ ] Especially for minor and patch releases, maintain backward compatibility for changes like renamed or moved classes, namespaces, functions, etc. Include deprecation comments and mention this in the changelog. Major releases may remove deprecated code, but always note this in the changelog.
 - [ ] Revise the changelog to include all changes with user-friendly descriptions and ensure the release date is accurate.
 -- [ ] Update the version number in the main plugin file and `readme.txt`, adhering to specifications from our [tech documentation](https://rambleventures.slab.com/posts/version-numbers-58nmrk4b), and commit to the release branch.

.rsync-filters-post-build

@@ -3,3 +3,7 @@
 - /vendor
 - .rsync-filters-pre-build
 - .rsync-filters-pro-build
+- /assets/**/*.jsx
+- /assets/scss
+- /assets/js/main.js
+- /assets/js/settings.js

advanced-gutenberg.php

@@ -3,7 +3,7 @@
  * Plugin Name: PublishPress Blocks
  * Plugin URI: https://publishpress.com/blocks/
  * Description: PublishPress Blocks has everything you need to build professional websites with the Gutenberg editor.
- * Version: 3.2.0
+ * Version: 3.2.1
  * Author: PublishPress
  * Author URI: https://publishpress.com/
  * Text Domain: advanced-gutenberg
@@ -71,7 +71,7 @@
 	define( 'ADVANCED_GUTENBERG_LOADED', true );
 
 	if ( ! defined( 'ADVANCED_GUTENBERG_VERSION' ) ) {
-		define( 'ADVANCED_GUTENBERG_VERSION', '3.2.0' );
+		define( 'ADVANCED_GUTENBERG_VERSION', '3.2.1' );
 	}
 
 	if ( ! defined( 'ADVANCED_GUTENBERG_PLUGIN' ) ) {

assets/blocks/advaccordion/accordion.jsx

@@ -1,4 +1,5 @@
-(function ( wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents, wpCompose ) {
+
+(function ( wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents, wpCompose, lodash ) {
     wpBlockEditor = wp.blockEditor || wp.editor;
     const { __ } = wpI18n;
     const { Fragment, Component } = wpElement;
@@ -663,4 +664,4 @@
             }
         ]
     } )
-})( wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components, wp.compose );
+})( wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components, wp.compose, lodash );

assets/blocks/advaccordion/block.jsx

@@ -1,4 +1,4 @@
-(function ( wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents, wpCompose ) {
+(function ( wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents, wpCompose, lodash ) {
     wpBlockEditor = wp.blockEditor || wp.editor;
     const { __ } = wpI18n;
     const { Component, Fragment } = wpElement;
@@ -520,4 +520,4 @@
             }
         ]
     } )
-})( wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components, wp.compose );
+})( wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components, wp.compose, lodash );

assets/blocks/advicon/block.jsx

@@ -1,7 +1,7 @@
 import {AdvColorControl} from "../0-adv-components/components.jsx";
 import {IconListPopupHook} from "../0-adv-components/icon-class.jsx";
 
-(function ( wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents ) {
+(function ( wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents, lodash ) {
     wpBlockEditor = wp.blockEditor || wp.editor;
     const { __ } = wpI18n;
     const { Component, Fragment } = wpElement;
@@ -732,4 +732,4 @@ import {IconListPopupHook} from "../0-adv-components/icon-class.jsx";
             }
         ]
     });
-}) ( wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components );
+}) ( wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components, lodash );

assets/blocks/advtable/block.jsx

@@ -1,4 +1,4 @@
-(function (wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents) {
+(function (wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents, lodash) {
     wpBlockEditor = wp.blockEditor || wp.editor;
     const {__} = wpI18n;
     const {Component, Fragment} = wpElement;
@@ -1749,4 +1749,4 @@
             }
         ]
     });
-})(wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components);
+})(wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components, lodash);

assets/blocks/advtabs/block.jsx

@@ -1,4 +1,4 @@
-(function ( wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents, wpCompose ) {
+(function ( wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents, wpCompose, lodash ) {
     wpBlockEditor = wp.blockEditor || wp.editor;
     const { __ } = wpI18n;
     const { Component, Fragment } = wpElement;
@@ -1059,4 +1059,4 @@
             }
         ]
     } );
-})( wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components, wp.compose );
+})( wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components, wp.compose, lodash );

assets/blocks/columns/block.jsx

@@ -1,4 +1,5 @@
-(function ( wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents ) {
+
+(function ( wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents, lodash ) {
     wpBlockEditor = wp.blockEditor || wp.editor;
     const { __ } = wpI18n;
     const { Component, Fragment } = wpElement;
@@ -1033,4 +1034,4 @@
             }
         ]
     } );
-})( wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components );
+})( wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components, lodash );

assets/blocks/recent-posts/block.php

@@ -1395,18 +1395,21 @@ function advgbSeriesOrderSort() {
 			if ( function_exists( 'publishpress_multi_series_supported' ) 
 			    && publishpress_multi_series_supported() ) {
 
-			    // We get the terms titles. The same stored in block's taxonomies->series attribute
-			    // @TODO - Store and use term ids instead as attributes
-			    $terms = $query->query_vars['tax_query'][0]['terms'];
-			    $metakeys = [];
-			    if( count( $terms ) ) {
-			        foreach( $terms as $term ) {
-			            // Get the term object and then use the id to get the meta_key 
-			            $term_obj = get_term_by( 'name', $term, 'series' );
-			            $metakeys[] = '_series_part_' . (int) $term_obj->term_id;
-			        }
-			        $query->set( 'meta_key', $metakeys );
-			    }
+			    // Make sure series are selected
+                if( isset( $query->query_vars['tax_query'][0]['terms'] ) 
+                    && count( $query->query_vars['tax_query'][0]['terms'] ) 
+                ) {
+                    // We get the terms titles. The same stored in block's taxonomies->series attribute
+                    // @TODO - Store and use term ids instead as attributes
+                    $terms = $query->query_vars['tax_query'][0]['terms'];
+                    $metakeys = [];
+                    foreach( $terms as $term ) {
+                        // Get the term object and then use the id to get the meta_key 
+                        $term_obj = get_term_by( 'name', $term, 'series' );
+                        $metakeys[] = '_series_part_' . (int) $term_obj->term_id;
+                    }
+                    $query->set( 'meta_key', $metakeys );
+                }
 			} else {
 			    // Series Pro 2.11.3- and Series Free 2.11.2-
 			    $query->set( 'meta_key', '_series_part' );

assets/blocks/recent-posts/query-controls.jsx

@@ -1,8 +1,7 @@
 const { __ } = wp.i18n;
 const { Component, Fragment } = wp.element;
 const { TreeSelect, SelectControl, FormTokenField, RangeControl } = wp.components;
-const { pickBy, isUndefined } = lodash;
-const { groupBy } = lodash;
+const { pickBy, isUndefined, groupBy } = lodash;
 
 /**
  * Returns terms in a tree form.

assets/blocks/testimonial/block.jsx

@@ -1,4 +1,4 @@
-(function ( wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents ) {
+(function ( wpI18n, wpBlocks, wpElement, wpBlockEditor, wpComponents, lodash ) {
     wpBlockEditor = wp.blockEditor || wp.editor;
     const { __ } = wpI18n;
     const { Component, Fragment } = wpElement;
@@ -872,4 +872,4 @@
             }
         ]
     } );
-})( wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components );
+})( wp.i18n, wp.blocks, wp.element, wp.blockEditor, wp.components, lodash );

dev-workspace/build

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-DOCKER_HOST_IP=$(php ./docker/scripts/getip) docker compose -f docker/compose.yaml build
+docker compose -f ./docker/compose.yaml build

dev-workspace/build-push

@@ -2,4 +2,4 @@
 
 # This command requires to be logged in on Docker Hub. Check `docker login --help` for more information.
 
-DOCKER_HOST_IP=$(php ./docker/scripts/getip) docker buildx build --platform linux/amd64,linux/arm64 --push -t publishpress/dev-workspace-terminal:blocks-free-2 ./docker
+docker buildx build --platform linux/amd64,linux/arm64 --push -t publishpress/dev-workspace-terminal:blocks-free-2 ./docker

dev-workspace/docker/Dockerfile

@@ -3,4 +3,19 @@ FROM publishpress/dev-workspace-terminal:generic-2
 ENV PLUGIN_NAME="PublishPress Blocks"
 ENV PLUGIN_TYPE="FREE"
 
+ENV NVM_DIR=/root/.nvm
+ENV NODE_VERSION=15.14.0
+ENV NPM_VERSION=7.7.6
+
+RUN set -ex; \
+    # Install Node.js and NPM
+    . ${NVM_DIR}/nvm.sh && nvm install ${NODE_VERSION}; \
+    . ${NVM_DIR}/nvm.sh && nvm use ${NODE_VERSION}; \
+    . ${NVM_DIR}/nvm.sh && nvm alias default ${NODE_VERSION}; \
+    node --version; \
+    npm install -g npm@${NPM_VERSION}; \
+    npm --version; \
+    echo ". ${NVM_DIR}/nvm.sh && nvm use ${NODE_VERSION}" >> /root/.zshrc; \
+    echo ". ${NVM_DIR}/nvm.sh && nvm alias default ${NODE_VERSION}" >> /root/.zshrc
+
 COPY ./scripts/json_translations.sh /scripts

dev-workspace/docker/compose.yaml

@@ -1,7 +1,7 @@
 name: devworkspace_blocks_free
 services:
     terminal:
-        build: ./docker
+        build: .
         image: publishpress/dev-workspace-terminal:blocks-free-2
         command: ["zsh"]
         stdin_open: true
@@ -17,7 +17,3 @@ services:
             - ../cache/.composer/cache:/root/.composer/cache
             - ../cache/.composer/auth.json:/root/.composer/auth.json
             - /var/run/docker.sock:/var/run/docker.sock
-        extra_hosts:
-            - "dockerhost:${DOCKER_HOST_IP}"
-        environment:
-            - DOCKER_HOST_IP=${DOCKER_HOST_IP}