Fix merge conflict

.github/workflows/html.yml

@@ -7,8 +7,22 @@ jobs:
     name: Test HTML and accessibility with NU HTML Checker
     runs-on: ubuntu-20.04
 
+    # Test on macOS:
+    # brew install openjdk
+    # sudo ln -sfn $(brew --prefix)/opt/openjdk/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk.jdk
     steps:
-    - name: Run html-validator-cli
+    - name: Install Java
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+
+    - name: Download vnu.jar
+      run: wget https://github.com/validator/validator/releases/download/latest/vnu.jar
+
+    - name: Run vnu validator
       run: |
-        npm i -g html-validator-cli
-         html-validator "https://airwptheme.com/demo" --format=text --ignore='Error: CSS: “padding-top”: only “0” can be a “unit”. You must put a unit after your number.' --quiet
+        java -jar vnu.jar --skip-non-html --errors-only --format text \
+        --filterpattern ".*contain-intrinsic-size.*" \
+        --filterpattern ".*only.*0.*can be a.*unit.*" \
+        "https://airwptheme.com/demo"

.jshintignore

@@ -5,7 +5,6 @@ gulp/*.js
 gulp/*/*.js
 js/prod/*.js
 js/dev/*.js
-js/src/legacy.js
 js/src/modules/lazyload.js
 js/src/modules/sticky-nav.js
 js/src/modules/navigation.js

CHANGELOG.md

@@ -1,8 +1,14 @@
 ### [Unreleased]
 
+* Add debug function to print all available blocks
+
+### 9.4.7: 2024-12-04
+
 * Fix body styles leaking to wp-admin
 * Fix img proportions fallback for images that have width and height set, T-23188
 * Fix image proportions for overlay images due to air-helper 3.1.1, T-23188
+* Change HTML build CI to use vnu-jar instead of outdated html-validator-cli
+* Remove polyfills, T-14767
 
 ### 9.4.6: 2024-11-19
 

README.md

@@ -218,10 +218,6 @@ All .js files in `/js/src/*` is built to production bundles in `/js/prod/` folde
 
 If you want to add a piece of custom JS, create a file under `/js/src/modules/` and import or require it in `/js/src/front-end.js`. If you need a admin-specific JS, add a `/js/src/admin.js` and then enqueue `/js/dist/admin.js` with `enqueue_admin_scripts`
 
-#### Legacy support
-
-Our build uses babel to translate scripts to ES2015 compatible JS, so you can use modern JS syntax without thinking about backwards compatibility. There is a `/js/src/legacy.js` file, which contains the needed polyfills for browsers not supporting the ES2015 syntax and is automatically loaded on the header when such browser is detected.
-
 #### Linter
 
 We use [Airbnb](https://github.com/airbnb/javascript) es-lint presets spiced up with our own flavors.

bin/tasks/additions.sh

@@ -6,7 +6,7 @@ chmod 777 ${PROJECT_PATH}/media
 
 echo "${YELLOW}Generating default README.md...${TXTRESET}"
 
-NEWEST_AIR_VERSION="9.4.6"
+NEWEST_AIR_VERSION="9.4.7"
 NEWEST_WORDPRESS_VERSION="6.7.0"
 NEWEST_PHP_VERSION="8.3"
 CURRENT_DATE=$(LC_TIME=en_US date '+%d %b %Y' |tr ' ' '_');

functions.php

@@ -17,7 +17,7 @@
 /**
  * The current version of the theme.
  */
-define( 'AIR_LIGHT_VERSION', '9.4.6' );
+define( 'AIR_LIGHT_VERSION', '9.4.7' );
 
 // We need to have some defaults as comments or empties so let's allow this:
 // phpcs:disable Squiz.Commenting.InlineComment.SpacingBefore, WordPress.Arrays.ArrayDeclarationSpacing.SpaceInEmptyArray
@@ -141,7 +141,7 @@
     // Accepts both string (all*/none-options only) and array (options + specific blocks)
     'allowed_blocks' => [
       'post' => 'all-core-blocks',
-      'page' => [],
+      'page' => 'all',
       // 'page' => [
       //   'all-acf-blocks',
       //   'core/paragraph',
@@ -168,6 +168,22 @@
   define( 'THEME_SETTINGS', $theme_settings );
 } ); // end action after_setup_theme
 
+/**
+ * Debug function to print all available blocks
+ */
+function debug_print_all_blocks() {
+  $blocks = \WP_Block_Type_Registry::get_instance()->get_all_registered();
+  $block_names = array_map(function( $block ) {
+    return "'" . $block->name . "',";
+  }, $blocks);
+  echo '<pre>' . implode( "\n", $block_names ) . '</pre>'; // phpcs:ignore
+  die();
+}
+
+// Uncomment the following line to see all available blocks:
+// add_action('init', __NAMESPACE__ . '\\debug_print_all_blocks');
+
+
 /**
  * Required files
  */

inc/hooks.php

@@ -29,7 +29,6 @@
  * Scripts and styles associated hooks
  */
 require get_theme_file_path( 'inc/hooks/scripts-styles.php' );
-add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\enqueue_polyfills' );
 add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\enqueue_theme_scripts' );
 
 // NB! If you use ajax functionality in Gravity Forms, remove this line

inc/hooks/gutenberg.php

@@ -11,6 +11,7 @@
  * Restrict blocks to only allowed blocks in the settings
  */
 function allowed_block_types( $allowed_blocks, $editor_context ) { // phpcs:ignore
+
   // If no allowed blocks are defined or it is set to none, return an empty array
   if ( empty( THEME_SETTINGS['allowed_blocks'] ) || 'none' === THEME_SETTINGS['allowed_blocks'] ) {
     return [];

inc/hooks/scripts-styles.php

@@ -61,34 +61,6 @@ function enqueue_theme_scripts() {
   wp_localize_script( 'scripts', 'air_light_externalLinkDomains', THEME_SETTINGS['external_link_domains_exclude'] );
 } // end air_light_scripts
 
-/**
- * Load polyfills for legacy browsers
- */
-function enqueue_polyfills() {
-  // Include polyfills
-  $script = '
-  var supportsES6 = (function () {
-  try {
-    new Function("(a = 0) => a");
-    return true;
-  } catch (err) {
-    return false;
-  }
-  }());
-  var legacyScript ="' . esc_url( get_theme_file_uri( get_asset_file( 'legacy.js' ) ) ) . '";
-  if (!supportsES6) {
-    var script = document.createElement("script");
-    script.src = legacyScript;
-    document.head.appendChild(script);
-  }';
-
-  if ( file_exists( get_theme_file_path( get_asset_file( 'legacy.js' ) ) ) ) {
-    wp_register_script( 'air_light_legacy', '', [], filemtime( get_theme_file_path( get_asset_file( 'legacy.js' ) ) ), false );
-    wp_enqueue_script( 'air_light_legacy' );
-    wp_add_inline_script( 'air_light_legacy', $script, true );
-  }
-} // end enqueue_polyfills
-
 /**
  * Returns the built asset filename and path depending on
  * current environment.