Merge branch 'develop' into bump/wp-version

.github/workflows/cypress.yml

@@ -37,20 +37,14 @@ jobs:
       run: ls -R
       working-directory: ${{ github.event.repository.name }}
 
-    - name: Cache node_modules
-      id: cache-node-modules
-      uses: actions/cache@v3
-      env:
-        cache-name: cache-node-modules
+    - name: Setup node and npm cache
+      uses: actions/setup-node@v4
       with:
-        path: |
-          node_modules
-          ~/.cache
-          ~/.npm
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+        node-version-file: .nvmrc
+        cache: npm
 
-    - name: Install dependencies
-      run: npm install
+    - name: Install Node dependencies
+      run: npm ci --no-optional
 
     - name: Set the core version and plugins config 
       run: ./tests/bin/set-wp-config.js --core=${{ matrix.core.version }} --plugins=./${{ github.event.repository.name }}

.github/workflows/lint.yml

@@ -1,9 +1,5 @@
 name: Linting
 
-env:
-  COMPOSER_VERSION: "2"
-  COMPOSER_CACHE: "${{ github.workspace }}/.composer-cache"
-
 on:
   push:
     branches:
@@ -17,49 +13,35 @@ jobs:
   eslint:
     name: eslint
     runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v3
-    - name: install node v12
-      uses: actions/setup-node@v1
-      with:
-        node-version: 12
-    - name: npm install
-      run: npm install
-    - name: eslint
-      uses: icrawl/action-eslint@v1
-      with:
-        custom-glob: assets
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  phpcs:
-    name: phpcs
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-    - name: Set standard 10up cache directories
-      run: |
-        composer config -g cache-dir "${{ env.COMPOSER_CACHE }}"
-    - name: Prepare composer cache
-      uses: actions/cache@v2
+    - uses: actions/checkout@v4
+
+    - name: Setup node and npm cache
+      uses: actions/setup-node@v4
       with:
-        path: ${{ env.COMPOSER_CACHE }}
-        key: composer-${{ env.COMPOSER_VERSION }}-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          composer-${{ env.COMPOSER_VERSION }}-
-    - name: Set PHP version
-      uses: shivammathur/setup-php@v2
+        node-version-file: .nvmrc
+        cache: npm
+
+    - name: Install Node dependencies
+      run: npm ci --no-optional
+
+    - name: Get updated JS files
+      id: changed-files
+      uses: tj-actions/changed-files@v42
       with:
-        php-version: '7.4'
-        coverage: none
-        tools: composer:v2, cs2pr
+        files: |
+          **/*.js
+
     - name: composer install
       run: composer install --ignore-platform-reqs
     - name: Check PHPCS standard
       run: ./vendor/bin/phpcs -i
+
     - name: PHPCS check
       id: phpcs
       run: ./vendor/bin/phpcs . --runtime-set testVersion 7.4- --report-checkstyle=${RUNNER_TEMP}/phpcs-report.xml
-    - name: Show PHPCS results in PR
-      if: ${{ always() && steps.phpcs.outcome == 'failure' }}
-      run: cs2pr --graceful-warnings ${RUNNER_TEMP}/phpcs-report.xml
+
+    - name: Run JS linting
+      if: ${{ steps.changed-files.outputs.any_changed == 'true' }}
+      run: ./node_modules/.bin/10up-toolkit lint-js ${{ steps.changed-files.outputs.all_changed_files }}

.nvmrc

@@ -0,0 +1 @@
+v14.21.1

CHANGELOG.md

@@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file, per [the Ke
 
 ## [Unreleased] - TBD
 
+## [1.3.4] - 2024-07-08
+**Note that this release bumps the minimum required version of WordPress from 5.7 to 6.2.**
+
+### Added
+- PHP version check to ensure >= 7.4 support (props [@bmarshall511](https://github.com/bmarshall511), [@faisal-alvi](https://github.com/faisal-alvi), [@ankitguptaindia](https://github.com/ankitguptaindia) via [#165](https://github.com/10up/publisher-media-kit/pull/165)).
+- Margin to the top of Why Digital Group, Padding to Why Digital Group, and Background and text color to even table rows (props [@claytoncollie](https://github.com/claytoncollie), [@faisal-alvi](https://github.com/faisal-alvi) via [#187](https://github.com/10up/publisher-media-kit/pull/187)).
+
+### Changed
+- Bump WordPress minimum to version 6.2 and "tested up to" version 6.5 (props [@dependabot](https://github.com/apps/dependabot), [@faisal-alvi](https://github.com/faisal-alvi), [@dkotter](https://github.com/dkotter), [@jeffpaul](https://github.com/jeffpaul), [@qasumitbagthariya](https://github.com/qasumitbagthariya), [@sudip-md](https://github.com/sudip-md) via [#166](https://github.com/10up/publisher-media-kit/pull/166), [#188](https://github.com/10up/publisher-media-kit/pull/188)).
+
+### Fixed
+- Build editor-style entrypoint (props [@davisshaver](https://github.com/davisshaver), [@dkotter](https://github.com/dkotter) via [#178](https://github.com/10up/publisher-media-kit/pull/178)).
+
+### Security
+- Bump `@cypress/request` from 2.88.12 to 3.0.1 (props [@dependabot](https://github.com/apps/dependabot), [@faisal-alvi](https://github.com/faisal-alvi), [@dkotter](https://github.com/dkotter), [@jeffpaul](https://github.com/jeffpaul) via [#166](https://github.com/10up/publisher-media-kit/pull/166)).
+- Bump `cypress` from 11.2.0 to 13.3.0 (props [@dependabot](https://github.com/apps/dependabot), [@faisal-alvi](https://github.com/faisal-alvi), [@dkotter](https://github.com/dkotter), [@jeffpaul](https://github.com/jeffpaul) via [#166](https://github.com/10up/publisher-media-kit/pull/166)).
+- Bump `follow-redirects` from 1.15.3 to 1.15.4 (props [@dependabot](https://github.com/apps/dependabot), [@faisal-alvi](https://github.com/faisal-alvi) via [#177](https://github.com/10up/publisher-media-kit/pull/177)).
+
+### Developers
+- Updated `CODEOWNERS` (props [@jeffpaul](https://github.com/jeffpaul), [@dkotter](https://github.com/dkotter) via [#176](https://github.com/10up/publisher-media-kit/pull/176)).
+- Disabled auto sync pull requests with target branch (props [@iamdharmesh](https://github.com/iamdharmesh) via [#184](https://github.com/10up/publisher-media-kit/pull/184)).
+- Upgraded `download-artifact` from v3 to v4 (props [@iamdharmesh](https://github.com/iamdharmesh), [@jeffpaul](https://github.com/jeffpaul), [@faisal-alvi](https://github.com/faisal-alvi), [@dkotter](https://github.com/dkotter) via [#182](https://github.com/10up/publisher-media-kit/pull/182)).
+- Added a "Testing" section in the `CONTRIBUTING.md` file (props [@kmgalanakis](https://github.com/kmgalanakis), [@jeffpaul](https://github.com/jeffpaul) via [#189](https://github.com/10up/publisher-media-kit/pull/189)).
+
 ## [1.3.3] - 2023-10-24
 ### Added
 - FAQ on the Media Kit page rename action (props [@kelvinballoo](https://github.com/kelvinballoo), [@faisal-alvi](https://github.com/faisal-alvi), [@jeffpaul](https://github.com/jeffpaul) via [#162](https://github.com/10up/publisher-media-kit/pull/162)).
@@ -111,6 +135,7 @@ All notable changes to this project will be documented in this file, per [the Ke
 - Initial private plugin release 🎉
 
 [Unreleased]: https://github.com/10up/publisher-media-kit/compare/trunk...develop
+[1.3.4]: https://github.com/10up/publisher-media-kit/compare/1.3.3...1.3.4
 [1.3.3]: https://github.com/10up/publisher-media-kit/compare/1.3.2...1.3.3
 [1.3.2]: https://github.com/10up/publisher-media-kit/compare/1.3.1...1.3.2
 [1.3.1]: https://github.com/10up/publisher-media-kit/compare/1.3.0...1.3.1

CREDITS.md

@@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo
 
 Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.
 
-[Katie Wilkerson Rethman (@kmwilkerson)](https://github.com/kmwilkerson), [Stephanie Campbell](https://10up.com), [Tina Castillo Macko (@tinacastillo1)](https://github.com/tinacastillo1), [Lea Alcantara (@lea10up)](https://github.com/lea10up), [Adrian Duffell (@adrianduffell)](https://github.com/adrianduffell), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Maggie Serino (@mserino)](https://github.com/mserino), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Ajay Maurya (@ajmaurya99)](https://github.com/ajmaurya99), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Diana Padron](https://profiles.wordpress.org/dianapadron/), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Mehidi Hassan (@mehidi258)](https://github.com/mehidi258), [David Godleman (@cldhmmr)](https://github.com/cldhmmr), [Trey Kane (@treykane)](https://github.com/treykane), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up), [Karine Do (@kdo)](https://github.com/kdo), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Kelvin Balloo (@kelvinballoo)](https://github.com/kelvinballoo).
+[Katie Wilkerson Rethman (@kmwilkerson)](https://github.com/kmwilkerson), [Stephanie Campbell](https://10up.com), [Tina Castillo Macko (@tinacastillo1)](https://github.com/tinacastillo1), [Lea Alcantara (@lea10up)](https://github.com/lea10up), [Adrian Duffell (@adrianduffell)](https://github.com/adrianduffell), [Ryan Welcher (@ryanwelcher)](https://github.com/ryanwelcher), [Maggie Serino (@mserino)](https://github.com/mserino), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Ajay Maurya (@ajmaurya99)](https://github.com/ajmaurya99), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Diana Padron](https://profiles.wordpress.org/dianapadron/), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Siddharth Thevaril (@Sidsector9)](https://github.com/Sidsector9), [Tung Du (@dinhtungdu)](https://github.com/dinhtungdu), [Mehidi Hassan (@mehidi258)](https://github.com/mehidi258), [David Godleman (@cldhmmr)](https://github.com/cldhmmr), [Trey Kane (@treykane)](https://github.com/treykane), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Ankit K Gupta (@ankitguptaindia)](https://github.com/ankitguptaindia), [Sudip Dadhaniya (@sudip-10up)](https://github.com/sudip-10up), [Karine Do (@kdo)](https://github.com/kdo), [Vikram Moparthy (@vikrampm1)](https://github.com/vikrampm1), [Jayedul Kabir (@jayedul)](https://github.com/jayedul), [Dharmesh Patel (@iamdharmesh)](https://github.com/iamdharmesh), [Kelvin Balloo (@kelvinballoo)](https://github.com/kelvinballoo), [Ben Marshall (@bmarshall511)](https://github.com/bmarshall511), [Clayton Collie (@claytoncollie)](https://github.com/claytoncollie), [Sumit Bagthariya (@qasumitbagthariya)](https://github.com/qasumitbagthariya), [Sudip Dadhaniya (@sudip-md)](https://github.com/sudip-md), [Davis Shaver (@davisshaver)](https://github.com/davisshaver), [Konstantinos Galanakis (@kmgalanakis)](https://github.com/kmgalanakis).
 
 ## Libraries
 

README.md

@@ -20,8 +20,8 @@ Twenty Twenty One default theme | Newspack base theme
 
 ## Requirements
 
-* PHP Requires: 7.4
-* WordPress Requires at least: 6.4
+* PHP Requires: 7.4+
+* WordPress Requires at least: 6.4+
 
 ## Theme Compatibility
 

includes/blocks/block-editor/tabs-item/block.json

@@ -9,6 +9,5 @@
     "reusable": false,
     "html": false
   },
-	"parent":[ "tenup/tabs" ],
-	"editorScript": "file:../../../../dist/blocks/tabs-item-block/editor.js"
+	"parent":[ "tenup/tabs" ]
 }

includes/blocks/block-editor/tabs-item/register.php

@@ -23,6 +23,24 @@ function register() {
 			]
 		);
 	}
+
+	// Enqueue assets.
+	add_action( 'enqueue_block_assets', $n( 'enqueue_block_assets' ) );
+}
+
+/**
+ * Enqueue block assets.
+ */
+function enqueue_block_assets() {
+	$asset_file = include PUBLISHER_MEDIA_KIT_PATH . 'dist/blocks/tabs-item-block.asset.php';
+
+	wp_enqueue_script(
+		'publisher-media-kit-tabs-item-block',
+		PUBLISHER_MEDIA_KIT_URL . '/dist/blocks/tabs-item-block.js',
+		$asset_file['dependencies'],
+		$asset_file['version'],
+		true
+	);
 }
 
 /**

includes/blocks/block-editor/tabs/block.json

@@ -49,8 +49,5 @@
   },
   "supports": {
     "html": false
-  },
-	"editorScript": "file:../../../../dist/blocks/tabs-block/editor.js",
-	"editorStyle": "file:../../../../dist/blocks/tabs-block/editor.css",
-	"style": "file:../../../../dist/blocks/tabs-block/editor.css"
+  }
 }

includes/blocks/block-editor/tabs/register.php

@@ -23,6 +23,31 @@ function register() {
 			]
 		);
 	}
+
+	// Enqueue assets.
+	add_action( 'enqueue_block_assets', $n( 'enqueue_block_assets' ) );
+}
+
+/**
+ * Enqueue block assets.
+ */
+function enqueue_block_assets() {
+	$asset_file = include PUBLISHER_MEDIA_KIT_PATH . 'dist/blocks/tabs-block.asset.php';
+
+	wp_enqueue_script(
+		'publisher-media-kit-tabs-block',
+		PUBLISHER_MEDIA_KIT_URL . '/dist/blocks/tabs-block.js',
+		$asset_file['dependencies'],
+		$asset_file['version'],
+		true
+	);
+
+	wp_enqueue_style(
+		'publisher-media-kit-tabs-block',
+		PUBLISHER_MEDIA_KIT_URL . '/dist/blocks/tabs-block.css',
+		[],
+		$asset_file['version']
+	);
 }
 
 /**