release: fixes

- Fixed Navigation block error
- Fixed Starter Sites loading and the problem with saving in the template cloud

Author: vytisbulkevicius

.github/workflows/test-php.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP version
         uses: shivammathur/setup-php@v1
         with:
-          php-version: '7.1'
+          php-version: '7.4'
           extensions: simplexml
           tools: composer:v2.1
       - name: Checkout source code
@@ -52,7 +52,7 @@ jobs:
       - name: Setup PHP version
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.1'
+          php-version: '7.4'
           extensions: simplexml, mysql
           tools: phpunit-polyfills
       - name: Checkout source code

bin/e2e-env.sh

@@ -34,6 +34,12 @@ init_environment(){
     # Install dependent plugins
     docker-compose -f $DOCKER_FILE run --rm -u root cli wp --allow-root plugin install --force --activate otter-blocks
     docker-compose -f $DOCKER_FILE run --rm -u root cli wp --allow-root plugin install --force --activate optimole-wp
+
+    # Disable Neve Onboarding
+    docker-compose -f $DOCKER_FILE run --rm -u root cli wp --allow-root config set TI_ONBOARDING_DISABLED true --raw
+
+    # Disable Otter Onboarding
+    docker-compose -f $DOCKER_FILE run --rm -u root cli wp --allow-root config set ENABLE_OTTER_PRO_DEV true --raw
 }
 
 docker-compose -f $DOCKER_FILE run --rm -u root wordpress mkdir -p /var/www/html/wp-content/uploads

composer.lock

@@ -0,0 +1,24 @@
+describe( 'Gutenberg Editor', () => {
+    beforeEach(() => {
+        cy.visit('/');
+        cy.visit('/wp-admin/post-new.php');
+    });
+
+    it( 'Add a navigation block', () => {
+        cy.intercept({
+            method: 'OPTIONS',
+            url: '/wp-json/wp/v2/navigation/**'
+        }).as('getNavigation');
+
+        cy.window().then( win => {
+            const navBlock = win.wp.blocks.createBlock( 'core/navigation' );
+            win.wp.data.dispatch( 'core/block-editor' ).insertBlocks( navBlock ).then(() => {
+                cy.wait('@getNavigation') // Wait for navigation to pull its data.
+                .then(() => {
+                    // We should have no rendering warning.
+                    cy.get('.block-editor-warning__message').should('not.exist');
+                });
+            })
+        } );
+    } );
+});

e2e-tests/cypress/e2e/editor.spec.ts

@@ -10,7 +10,7 @@ import {
 	TextControl,
 } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
-import { PluginSidebar, PluginSidebarMoreMenuItem } from '@wordpress/edit-site';
+import { PluginSidebar, PluginSidebarMoreMenuItem } from '@wordpress/edit-post';
 import { Fragment, useEffect, useState } from '@wordpress/element';
 import { store as coreStore } from '@wordpress/core-data';
 import api from '@wordpress/api';

editor/src/plugins/site-editor-extension.js

@@ -634,7 +634,7 @@ public function enqueue() {
 			wp_style_add_data( 'tiobObd', 'rtl', 'replace' );
 			wp_enqueue_style( 'tiobObd' );
 
-			wp_register_script( 'tiobObd', TIOB_URL . 'onboarding/build/index.js', array_merge( $onboarding_dependencies['dependencies'], array( 'updates' ) ), $onboarding_dependencies['version'], true );
+			wp_register_script( 'tiobObd', TIOB_URL . 'onboarding/build/index.js', array_merge( $onboarding_dependencies['dependencies'], array( 'updates', 'regenerator-runtime' ) ), $onboarding_dependencies['version'], true );
 			wp_localize_script( 'tiobObd', 'tiobDash', apply_filters( 'neve_dashboard_page_data', $this->get_localization() ) );
 			wp_enqueue_script( 'tiobObd' );
 
@@ -667,7 +667,7 @@ public function enqueue() {
 		wp_style_add_data( 'tiob', 'rtl', 'replace' );
 		wp_enqueue_style( 'tiob' );
 
-		wp_register_script( 'tiob', TIOB_URL . 'assets/build/app.js', array_merge( $dependencies['dependencies'], array( 'updates' ) ), $dependencies['version'], true );
+		wp_register_script( 'tiob', TIOB_URL . 'assets/build/app.js', array_merge( $dependencies['dependencies'], array( 'updates', 'regenerator-runtime' ) ), $dependencies['version'], true );
 		$tiob_dash = apply_filters( 'neve_dashboard_page_data', $this->get_localization() );
 		if ( $is_tiob_page ) {
 			$tiob_dash['hideStarterSites'] = true;

includes/Admin.php

@@ -71,7 +71,7 @@ public function register_block() {
 		wp_register_script(
 			$this->handle,
 			TIOB_URL . 'editor/build/index.js',
-			array_merge( $deps['dependencies'], array( 'wp-api' ) ),
+			array_merge( $deps['dependencies'], array( 'wp-api', 'regenerator-runtime' ) ),
 			$deps['version']
 		);
 

includes/Editor.php

@@ -41,7 +41,7 @@ public static function wpSetUpBeforeClass( $factory ) {
 	/**
 	 * setUp
 	 */
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		wp_set_current_user( self::$admin_id );
 		add_theme_support(

tests/digital-test.php

@@ -14,7 +14,7 @@
  */
 class Import_Test extends WP_UnitTestCase {
 
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		register_taxonomy(
 			'product_type',

tests/import-test.php

@@ -40,7 +40,7 @@ public static function wpSetUpBeforeClass( $factory ) {
 	/**
 	 * setUp
 	 */
-	public function setUp() {
+	public function setUp(): void {
 		parent::setUp();
 		wp_set_current_user( self::$admin_id );
 		add_theme_support( 'themeisle-demo-import', [